# HG changeset patch
# User bsw
# Date 1331414742 -3600
# Node ID 990432f7dba043cf1dc199d4fdc3572dbaa4b20e
# Parent  85b6ff17d7282d5d1e08dea3c49d9fa1888f5781
Added footer, moved about to footer

diff -r 85b6ff17d728 -r 990432f7dba0 app/main/_filter_view/30_navigation.lua
--- a/app/main/_filter_view/30_navigation.lua	Sat Mar 10 20:29:58 2012 +0100
+++ b/app/main/_filter_view/30_navigation.lua	Sat Mar 10 22:25:42 2012 +0100
@@ -53,11 +53,6 @@
       module = 'index',
       view   = 'reset_password'
     }
-    ui.link{
-      text   = _"About / Impressum",
-      module = 'index',
-      view   = 'about'
-    }
   else 
 
     ui.container{ attr = { class = "member_info" }, content = function()
@@ -102,30 +97,42 @@
         }
       end
       
-      ui.link{
-        text   = _"About",
-        module = 'index',
-        view   = 'about'
-      }
-
-      if app.session.member.admin then
-
-        slot.put(" ")
-
-        ui.link{
-          attr   = { class = { "admin_only" } },
-          text   = _"Admin",
-          module = 'admin',
-          view   = 'index'
-        }
-
-      end
     end }
 
   end
 
 end)
 
+slot.select("footer", function()
+  if app.session.member.admin then
+    ui.link{
+      text   = _"Admin",
+      module = 'admin',
+      view   = 'index'
+    }
+    slot.put(" · ")
+  end
+  ui.link{
+    text   = _"About site",
+    module = 'index',
+    view   = 'about'
+  }
+  slot.put(" · ")
+  ui.link{
+    text   = _"Usage terms",
+    module = 'index',
+    view   = 'usage_terms'
+  }
+  slot.put(" · ")
+  ui.tag{ content = _"This site is using" }
+  slot.put(" ")
+  ui.link{
+    text   = _"LiquidFeedback",
+    external = "http://www.public-software-group.org/liquid_feedback"
+  }
+end)
+
+
 if config.app_logo then
   slot.select("logo", function()
     ui.image{ static = config.app_logo }
diff -r 85b6ff17d728 -r 990432f7dba0 app/main/_layout/default.html
--- a/app/main/_layout/default.html	Sat Mar 10 20:29:58 2012 +0100
+++ b/app/main/_layout/default.html	Sat Mar 10 22:25:42 2012 +0100
@@ -69,9 +69,10 @@
       <div class="main" id="default">
         <!-- WEBMCP SLOT default -->
       </div>
-      <div class="footer" id="footer">
-        <!-- WEBMCP SLOT footer -->
-      </div>
+      <br style="clear: both;" />
+    </div>
+    <div class="footer" id="footer">
+      <!-- WEBMCP SLOT footer -->
     </div>
     <div class="layout_trace" id="layout_trace" style="xdisplay: none">
       <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
diff -r 85b6ff17d728 -r 990432f7dba0 app/main/unit/list.lua
--- a/app/main/unit/list.lua	Sat Mar 10 20:29:58 2012 +0100
+++ b/app/main/unit/list.lua	Sat Mar 10 22:25:42 2012 +0100
@@ -2,6 +2,11 @@
 
 util.help("unit.list", _"Unit list")
 
+slot.put("<br />")
+
 ui.container{ attr = { class = "box" }, content = function()
   execute.view{ module = "unit", view = "_list" }
-end }
\ No newline at end of file
+end }
+
+slot.put("<br />")
+
diff -r 85b6ff17d728 -r 990432f7dba0 static/style.css
--- a/static/style.css	Sat Mar 10 20:29:58 2012 +0100
+++ b/static/style.css	Sat Mar 10 22:25:42 2012 +0100
@@ -1523,4 +1523,19 @@
   -webkit-box-shadow: none;
 }
 
+.slot_footer {
+  margin: 0 1%;
+  border-top: 1px solid #ccc;
+  padding: 1ex;
+  font-size: 80%;
+  text-align: center;
+}
+.slot_footer,
+.slot_footer a {
+  color: #666;
+}
 
+.footer {
+  margin: 0 auto;
+  max-width: 1130px;
+}
\ No newline at end of file