reorg templates

Assistant/WebApp/Configurators/Local.hs

@@ -107,8 +107,8 @@ defaultRepositoryPath firstrun = do
 				)
 		else return cwd
 
-localRepositoryForm :: Form RepositoryPath
-localRepositoryForm msg = do
+firstRepositoryForm :: Form RepositoryPath
+firstRepositoryForm msg = do
 	path <- T.pack . addTrailingPathSeparator
 		<$> (liftIO . defaultRepositoryPath =<< lift inFirstRun)
 	(pathRes, pathView) <- mreq (repositoryPathField True) "" (Just path)
@@ -118,7 +118,7 @@ localRepositoryForm msg = do
 		FormSuccess _ -> (False, "")
 	let form = do
 		webAppFormAuthToken
-		$(widgetFile "configurators/localrepositoryform")
+		$(widgetFile "configurators/firstrepository/form")
 	return (RepositoryPath <$> pathRes, form)
 
 {- Making the first repository, when starting the webapp for the first time. -}
@@ -126,7 +126,7 @@ getFirstRepositoryR :: Handler RepHtml
 getFirstRepositoryR = bootstrap (Just Config) $ do
 	sideBarDisplay
 	setTitle "Getting started"
-	((res, form), enctype) <- lift $ runFormGet localRepositoryForm
+	((res, form), enctype) <- lift $ runFormGet firstRepositoryForm
 	case res of
 		FormSuccess (RepositoryPath p) -> lift $
 			startFullAssistant $ T.unpack p

Assistant/WebApp/Configurators/Pairing.hs

@@ -74,7 +74,7 @@ getInprogressPairR :: Text -> Handler RepHtml
 getInprogressPairR secret = bootstrap (Just Config) $ do
 	sideBarDisplay
 	setTitle "Pairing"
-	$(widgetFile "configurators/inprogresspairing")
+	$(widgetFile "configurators/pairing/inprogress")
 #else
 getInprogressPairR _ = noPairing
 #endif
@@ -123,7 +123,7 @@ promptSecret msg cont = bootstrap (Just Config) $ do
 			u <- T.pack <$> liftIO getUserName
 			let sameusername = username == u
                         let authtoken = webAppFormAuthToken
-                        $(widgetFile "configurators/pairing")
+                        $(widgetFile "configurators/pairing/prompt")
 
 {- This counts unicode characters as more than one character,
  - but that's ok; they *do* provide additional entropy. -}
@@ -155,6 +155,6 @@ noPairing :: Handler RepHtml
 noPairing = bootstrap (Just Config) $ do
 	sideBarDisplay
 	setTitle "Pairing"
-	$(widgetFile "configurators/nopairing")
+	$(widgetFile "configurators/pairing/disabled")
 
 #endif

Assistant/WebApp/Configurators/Ssh.hs

@@ -112,7 +112,7 @@ getAddSshR = sshConfigurator $ do
 	where
 		showform form enctype status = do
 			let authtoken = webAppFormAuthToken
-			$(widgetFile "configurators/addssh")
+			$(widgetFile "configurators/ssh/add")
 
 {- Test if we can ssh into the server.
  -
@@ -225,7 +225,7 @@ sshSetup opts input a = do
 
 showSshErr :: String -> Handler RepHtml
 showSshErr msg = sshConfigurator $
-	$(widgetFile "configurators/makessherror")
+	$(widgetFile "configurators/ssh/error")
 
 {- Does ssh have known_hosts data for a hostname? -}
 knownHost :: SshServer -> IO Bool
@@ -240,7 +240,7 @@ knownHost (SshServer { hostname = Just h }) = do
 getConfirmSshR :: SshData -> Handler RepHtml
 getConfirmSshR sshdata = sshConfigurator $ do
 	let authtoken = webAppFormAuthToken
-	$(widgetFile "configurators/confirmssh")
+	$(widgetFile "configurators/ssh/confirm")
 
 getMakeSshGitR :: SshData -> Handler RepHtml
 getMakeSshGitR = makeSsh False