reorg templates

Assistant/WebApp/Configurators.hs

@@ -38,7 +38,7 @@ introDisplay ident = do
 	let notenough = n < 2
 	let barelyenough = n == 2
 	let morethanenough = n > 2
-	$(widgetFile "intro")
+	$(widgetFile "configurators/intro")
 	lift $ modifyWebAppState $ \s -> s { showIntro = False }
 	where
 		counter = map show ([1..] :: [Int])

Assistant/WebApp/DashBoard.hs

@@ -45,9 +45,9 @@ transfersDisplay warnNoScript = do
 	if null transfers
 		then ifM (lift $ showIntro <$> getWebAppState)
 			( introDisplay ident
-			, $(widgetFile "transfers")
+			, $(widgetFile "dashboard/transfers")
 			)
-		else $(widgetFile "transfers")
+		else $(widgetFile "dashboard/transfers")
 
 {- Called by client to get a display of currently in process transfers.
  -
@@ -69,7 +69,7 @@ dashboard :: Bool -> Widget
 dashboard warnNoScript = do
 	sideBarDisplay
 	let content = transfersDisplay warnNoScript
-	$(widgetFile "dashboard")
+	$(widgetFile "dashboard/main")
 
 getHomeR :: Handler RepHtml
 getHomeR = defaultLayout $ dashboard True
@@ -80,7 +80,7 @@ getNoScriptAutoR = defaultLayout $ do
 	let ident = NoScriptR
 	let delayseconds = 3 :: Int
 	let this = NoScriptAutoR
-	toWidgetHead $(hamletFile $ hamletTemplate "metarefresh")
+	toWidgetHead $(hamletFile $ hamletTemplate "dashboard/metarefresh")
 	dashboard False
 
 {- Same as HomeR, except no autorefresh at all (and no noscript warning). -}

Assistant/WebApp/Notifications.hs

@@ -34,7 +34,7 @@ autoUpdate ident geturl ms_delay ms_startdelay = do
 	let delay = show ms_delay
 	let startdelay = show ms_startdelay
 	addScript $ StaticR longpolling_js
-	$(widgetFile "longpolling")
+	$(widgetFile "notifications/longpolling")
 
 {- Notifier urls are requested by the javascript, to avoid allocation
  - of NotificationIds when noscript pages are loaded. This constructs a

Assistant/WebApp/SideBar.hs

@@ -34,7 +34,7 @@ sideBarDisplay = do
 		mapM_ renderalert $
 			take displayAlerts $ reverse $ sortAlertPairs alertpairs
 	let ident = "sidebar"
-	$(widgetFile "sidebar")
+	$(widgetFile "sidebar/main")
 	autoUpdate ident NotifierSideBarR (10 :: Int) (10 :: Int)
 	where
 		bootstrapclass Activity = "alert-info"
@@ -60,7 +60,7 @@ sideBarDisplay = do
 		addalert i closable block divclass heading widget = do
 			let alertid = show i
 			let closealert = CloseAlert i
-			$(widgetFile "alert")
+			$(widgetFile "sidebar/alert")
 
 {- Called by client to get a sidebar display.
  -