reorg templates

11 files changed, 8 insertions, 8 deletions

diff --git a/Assistant/WebApp/Configurators.hs b/Assistant/WebApp/Configurators.hs
index be6f12db3..e3f0275d9 100644
--- a/Assistant/WebApp/Configurators.hs
+++ b/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])
diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs
index 5df68c93b..2961dabd3 100644
--- a/Assistant/WebApp/DashBoard.hs
+++ b/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). -}
diff --git a/Assistant/WebApp/Notifications.hs b/Assistant/WebApp/Notifications.hs
index 1e7c0176a..3aa56424a 100644
--- a/Assistant/WebApp/Notifications.hs
+++ b/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
diff --git a/Assistant/WebApp/SideBar.hs b/Assistant/WebApp/SideBar.hs
index 4df0c8d55..2c630324c 100644
--- a/Assistant/WebApp/SideBar.hs
+++ b/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.
  -
diff --git a/templates/intro.hamlet b/templates/configurators/intro.hamlet
index ecb15f39c..ecb15f39c 100644
--- a/templates/intro.hamlet
+++ b/templates/configurators/intro.hamlet
diff --git a/templates/dashboard.hamlet b/templates/dashboard/main.hamlet
index 7bcfce962..7bcfce962 100644
--- a/templates/dashboard.hamlet
+++ b/templates/dashboard/main.hamlet
diff --git a/templates/metarefresh.hamlet b/templates/dashboard/metarefresh.hamlet
index 89a2e0b2c..89a2e0b2c 100644
--- a/templates/metarefresh.hamlet
+++ b/templates/dashboard/metarefresh.hamlet
diff --git a/templates/transfers.hamlet b/templates/dashboard/transfers.hamlet
index e79885fb5..e79885fb5 100644
--- a/templates/transfers.hamlet
+++ b/templates/dashboard/transfers.hamlet
diff --git a/templates/longpolling.julius b/templates/notifications/longpolling.julius
index affa50cc8..affa50cc8 100644
--- a/templates/longpolling.julius
+++ b/templates/notifications/longpolling.julius
diff --git a/templates/alert.hamlet b/templates/sidebar/alert.hamlet
index 8fa77eac1..8fa77eac1 100644
--- a/templates/alert.hamlet
+++ b/templates/sidebar/alert.hamlet
diff --git a/templates/sidebar.hamlet b/templates/sidebar/main.hamlet
index 32900b920..32900b920 100644
--- a/templates/sidebar.hamlet
+++ b/templates/sidebar/main.hamlet