From 5fed026bcdaa0724acd2640193e341bb8358980b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 31 Jul 2012 01:24:49 -0400
Subject: reorg templates

---
 templates/alert.hamlet                     |  9 --------
 templates/configurators/intro.hamlet       | 27 ++++++++++++++++++++++++
 templates/dashboard.hamlet                 | 10 ---------
 templates/dashboard/main.hamlet            | 10 +++++++++
 templates/dashboard/metarefresh.hamlet     |  2 ++
 templates/dashboard/transfers.hamlet       | 34 ++++++++++++++++++++++++++++++
 templates/intro.hamlet                     | 27 ------------------------
 templates/longpolling.julius               | 12 -----------
 templates/metarefresh.hamlet               |  2 --
 templates/notifications/longpolling.julius | 12 +++++++++++
 templates/sidebar.hamlet                   |  3 ---
 templates/sidebar/alert.hamlet             |  9 ++++++++
 templates/sidebar/main.hamlet              |  3 +++
 templates/transfers.hamlet                 | 34 ------------------------------
 14 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 templates/alert.hamlet
 create mode 100644 templates/configurators/intro.hamlet
 delete mode 100644 templates/dashboard.hamlet
 create mode 100644 templates/dashboard/main.hamlet
 create mode 100644 templates/dashboard/metarefresh.hamlet
 create mode 100644 templates/dashboard/transfers.hamlet
 delete mode 100644 templates/intro.hamlet
 delete mode 100644 templates/longpolling.julius
 delete mode 100644 templates/metarefresh.hamlet
 create mode 100644 templates/notifications/longpolling.julius
 delete mode 100644 templates/sidebar.hamlet
 create mode 100644 templates/sidebar/alert.hamlet
 create mode 100644 templates/sidebar/main.hamlet
 delete mode 100644 templates/transfers.hamlet

(limited to 'templates')

diff --git a/templates/alert.hamlet b/templates/alert.hamlet
deleted file mode 100644
index 8fa77eac1..000000000
--- a/templates/alert.hamlet
+++ /dev/null
@@ -1,9 +0,0 @@
-<div .alert .fade .in .#{divclass} :block:.alert-block ##{alertid} :closable:onclick="(function( $ ) { $.get('@{closealert}') })( jQuery );">
-  $if closable
-    <a .close data-dismiss="alert">&times;</a>
-  $maybe h <- heading
-    $if block
-      <h4 class="alert-heading">#{h}</h4>
-    $else
-      <strong>#{h}</strong>
-  ^{widget}
diff --git a/templates/configurators/intro.hamlet b/templates/configurators/intro.hamlet
new file mode 100644
index 000000000..ecb15f39c
--- /dev/null
+++ b/templates/configurators/intro.hamlet
@@ -0,0 +1,27 @@
+<div .span9 ##{ident} .hero-unit>
+  <h2>
+    git-annex is watching over your files in <small><tt>#{reldir}</tt></small>
+  <p>
+    It will automatically notice changes, and keep files in sync between #
+    $if notenough
+      repositories on your devices ...
+      <h2>
+        But no other repositories are set up yet.
+      <a .btn .btn-primary .btn-large href="@{AddRepositoryR}">Add another repository</a>
+    $else
+      $if barelyenough
+        <span .badge .badge-warning>#{numrepos}</span>
+      $else
+        <span .badge .badge-success>#{numrepos}</span>
+      \ repositories and devices:
+      <table .table .table-striped .table-condensed>
+        <tbody>
+          $forall (num, name) <- remotelist
+            <tr>
+              <td>
+                #{num}
+              <td>
+                #{name}
+      <a .btn .btn-primary .btn-large href="@{AddRepositoryR}">Add another repository</a>
+      <p>
+        Or just sit back, watch the magic, and get on with using your files.
diff --git a/templates/dashboard.hamlet b/templates/dashboard.hamlet
deleted file mode 100644
index 7bcfce962..000000000
--- a/templates/dashboard.hamlet
+++ /dev/null
@@ -1,10 +0,0 @@
-^{content}
-$if warnNoScript
-  <noscript>
-    <div .navbar .navbar-fixed-bottom>
-      <div .navbar-inner>
-        <div .container>
-          Javascript is disabled; cannot update in real-time.
-          <div .btn-group>
-            <a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
-            <a .btn .btn-primary href="@{NoScriptR}">Manually refresh
diff --git a/templates/dashboard/main.hamlet b/templates/dashboard/main.hamlet
new file mode 100644
index 000000000..7bcfce962
--- /dev/null
+++ b/templates/dashboard/main.hamlet
@@ -0,0 +1,10 @@
+^{content}
+$if warnNoScript
+  <noscript>
+    <div .navbar .navbar-fixed-bottom>
+      <div .navbar-inner>
+        <div .container>
+          Javascript is disabled; cannot update in real-time.
+          <div .btn-group>
+            <a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
+            <a .btn .btn-primary href="@{NoScriptR}">Manually refresh
diff --git a/templates/dashboard/metarefresh.hamlet b/templates/dashboard/metarefresh.hamlet
new file mode 100644
index 000000000..89a2e0b2c
--- /dev/null
+++ b/templates/dashboard/metarefresh.hamlet
@@ -0,0 +1,2 @@
+<noscript>
+  <meta http-equiv="refresh" content="#{show delayseconds}; URL=@{this}">
diff --git a/templates/dashboard/transfers.hamlet b/templates/dashboard/transfers.hamlet
new file mode 100644
index 000000000..e79885fb5
--- /dev/null
+++ b/templates/dashboard/transfers.hamlet
@@ -0,0 +1,34 @@
+<div .span9 ##{ident}>
+  $if null transfers
+  $else
+    <h2>Transfers
+    $forall (transfer, info) <- transfers
+      $with percent <- maybe "unknown" (showPercentage 0) $ percentComplete transfer info
+        <div .row-fluid>
+          <h3>
+            $maybe file <- associatedFile info
+              #{file}
+            $nothing
+              #{show $ transferKey transfer}
+            $case transferDirection transfer
+              $of Upload
+                &rarr;
+              $of Download
+                &larr;
+            <small>#{maybe "unknown" Remote.name $ transferRemote info}</small>
+              $with size <- maybe "unknown" (roughSize dataUnits True) $ keySize $ transferKey transfer
+                $if isJust $ startedTime info
+                    <small .pull-right><b>#{percent} of #{size}</b></small>
+                $else
+                    <small .pull-right>queued (#{size})</small>
+        <div .progress .progress-striped>
+          <div .bar style="width: #{percent};">
+  $if warnNoScript
+    <noscript>
+      <div .navbar .navbar-fixed-bottom>
+        <div .navbar-inner>
+          <div .container>
+            Javascript is disabled; cannot update in real-time.
+            <div .btn-group>
+              <a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
+              <a .btn .btn-primary href="@{NoScriptR}">Manually refresh
diff --git a/templates/intro.hamlet b/templates/intro.hamlet
deleted file mode 100644
index ecb15f39c..000000000
--- a/templates/intro.hamlet
+++ /dev/null
@@ -1,27 +0,0 @@
-<div .span9 ##{ident} .hero-unit>
-  <h2>
-    git-annex is watching over your files in <small><tt>#{reldir}</tt></small>
-  <p>
-    It will automatically notice changes, and keep files in sync between #
-    $if notenough
-      repositories on your devices ...
-      <h2>
-        But no other repositories are set up yet.
-      <a .btn .btn-primary .btn-large href="@{AddRepositoryR}">Add another repository</a>
-    $else
-      $if barelyenough
-        <span .badge .badge-warning>#{numrepos}</span>
-      $else
-        <span .badge .badge-success>#{numrepos}</span>
-      \ repositories and devices:
-      <table .table .table-striped .table-condensed>
-        <tbody>
-          $forall (num, name) <- remotelist
-            <tr>
-              <td>
-                #{num}
-              <td>
-                #{name}
-      <a .btn .btn-primary .btn-large href="@{AddRepositoryR}">Add another repository</a>
-      <p>
-        Or just sit back, watch the magic, and get on with using your files.
diff --git a/templates/longpolling.julius b/templates/longpolling.julius
deleted file mode 100644
index affa50cc8..000000000
--- a/templates/longpolling.julius
+++ /dev/null
@@ -1,12 +0,0 @@
-function longpoll_#{ident}() {
-	longpoll(longpoll_#{ident}_url, '#{ident}'
-		, function() { setTimeout(longpoll_#{ident}, #{delay}); }
-		, function() { webapp_disconnected(); }
-	);
-}
-$(function() {
-	$.get("@{geturl}", function(url){
-		longpoll_#{ident}_url = url;
-		setTimeout(longpoll_#{ident}, #{startdelay});
-	});
-});
diff --git a/templates/metarefresh.hamlet b/templates/metarefresh.hamlet
deleted file mode 100644
index 89a2e0b2c..000000000
--- a/templates/metarefresh.hamlet
+++ /dev/null
@@ -1,2 +0,0 @@
-<noscript>
-  <meta http-equiv="refresh" content="#{show delayseconds}; URL=@{this}">
diff --git a/templates/notifications/longpolling.julius b/templates/notifications/longpolling.julius
new file mode 100644
index 000000000..affa50cc8
--- /dev/null
+++ b/templates/notifications/longpolling.julius
@@ -0,0 +1,12 @@
+function longpoll_#{ident}() {
+	longpoll(longpoll_#{ident}_url, '#{ident}'
+		, function() { setTimeout(longpoll_#{ident}, #{delay}); }
+		, function() { webapp_disconnected(); }
+	);
+}
+$(function() {
+	$.get("@{geturl}", function(url){
+		longpoll_#{ident}_url = url;
+		setTimeout(longpoll_#{ident}, #{startdelay});
+	});
+});
diff --git a/templates/sidebar.hamlet b/templates/sidebar.hamlet
deleted file mode 100644
index 32900b920..000000000
--- a/templates/sidebar.hamlet
+++ /dev/null
@@ -1,3 +0,0 @@
-<div .span3 ##{ident}>
-  <div .sidebar-nav>
-    ^{content}
diff --git a/templates/sidebar/alert.hamlet b/templates/sidebar/alert.hamlet
new file mode 100644
index 000000000..8fa77eac1
--- /dev/null
+++ b/templates/sidebar/alert.hamlet
@@ -0,0 +1,9 @@
+<div .alert .fade .in .#{divclass} :block:.alert-block ##{alertid} :closable:onclick="(function( $ ) { $.get('@{closealert}') })( jQuery );">
+  $if closable
+    <a .close data-dismiss="alert">&times;</a>
+  $maybe h <- heading
+    $if block
+      <h4 class="alert-heading">#{h}</h4>
+    $else
+      <strong>#{h}</strong>
+  ^{widget}
diff --git a/templates/sidebar/main.hamlet b/templates/sidebar/main.hamlet
new file mode 100644
index 000000000..32900b920
--- /dev/null
+++ b/templates/sidebar/main.hamlet
@@ -0,0 +1,3 @@
+<div .span3 ##{ident}>
+  <div .sidebar-nav>
+    ^{content}
diff --git a/templates/transfers.hamlet b/templates/transfers.hamlet
deleted file mode 100644
index e79885fb5..000000000
--- a/templates/transfers.hamlet
+++ /dev/null
@@ -1,34 +0,0 @@
-<div .span9 ##{ident}>
-  $if null transfers
-  $else
-    <h2>Transfers
-    $forall (transfer, info) <- transfers
-      $with percent <- maybe "unknown" (showPercentage 0) $ percentComplete transfer info
-        <div .row-fluid>
-          <h3>
-            $maybe file <- associatedFile info
-              #{file}
-            $nothing
-              #{show $ transferKey transfer}
-            $case transferDirection transfer
-              $of Upload
-                &rarr;
-              $of Download
-                &larr;
-            <small>#{maybe "unknown" Remote.name $ transferRemote info}</small>
-              $with size <- maybe "unknown" (roughSize dataUnits True) $ keySize $ transferKey transfer
-                $if isJust $ startedTime info
-                    <small .pull-right><b>#{percent} of #{size}</b></small>
-                $else
-                    <small .pull-right>queued (#{size})</small>
-        <div .progress .progress-striped>
-          <div .bar style="width: #{percent};">
-  $if warnNoScript
-    <noscript>
-      <div .navbar .navbar-fixed-bottom>
-        <div .navbar-inner>
-          <div .container>
-            Javascript is disabled; cannot update in real-time.
-            <div .btn-group>
-              <a .btn .btn-primary href="@{NoScriptAutoR}">Auto-refresh every 3 seconds #
-              <a .btn .btn-primary href="@{NoScriptR}">Manually refresh
-- 
cgit v1.2.3