1.1 --- a/app/main/_filter_view/30_navigation.lua	Sat Mar 10 20:29:58 2012 +0100
     1.2 +++ b/app/main/_filter_view/30_navigation.lua	Sat Mar 10 22:25:42 2012 +0100
     1.3 @@ -53,11 +53,6 @@
     1.4        module = 'index',
     1.5        view   = 'reset_password'
     1.6      }
     1.7 -    ui.link{
     1.8 -      text   = _"About / Impressum",
     1.9 -      module = 'index',
    1.10 -      view   = 'about'
    1.11 -    }
    1.12    else 
    1.13  
    1.14      ui.container{ attr = { class = "member_info" }, content = function()
    1.15 @@ -102,30 +97,42 @@
    1.16          }
    1.17        end
    1.18        
    1.19 -      ui.link{
    1.20 -        text   = _"About",
    1.21 -        module = 'index',
    1.22 -        view   = 'about'
    1.23 -      }
    1.24 -
    1.25 -      if app.session.member.admin then
    1.26 -
    1.27 -        slot.put(" ")
    1.28 -
    1.29 -        ui.link{
    1.30 -          attr   = { class = { "admin_only" } },
    1.31 -          text   = _"Admin",
    1.32 -          module = 'admin',
    1.33 -          view   = 'index'
    1.34 -        }
    1.35 -
    1.36 -      end
    1.37      end }
    1.38  
    1.39    end
    1.40  
    1.41  end)
    1.42  
    1.43 +slot.select("footer", function()
    1.44 +  if app.session.member.admin then
    1.45 +    ui.link{
    1.46 +      text   = _"Admin",
    1.47 +      module = 'admin',
    1.48 +      view   = 'index'
    1.49 +    }
    1.50 +    slot.put(" · ")
    1.51 +  end
    1.52 +  ui.link{
    1.53 +    text   = _"About site",
    1.54 +    module = 'index',
    1.55 +    view   = 'about'
    1.56 +  }
    1.57 +  slot.put(" · ")
    1.58 +  ui.link{
    1.59 +    text   = _"Usage terms",
    1.60 +    module = 'index',
    1.61 +    view   = 'usage_terms'
    1.62 +  }
    1.63 +  slot.put(" · ")
    1.64 +  ui.tag{ content = _"This site is using" }
    1.65 +  slot.put(" ")
    1.66 +  ui.link{
    1.67 +    text   = _"LiquidFeedback",
    1.68 +    external = "http://www.public-software-group.org/liquid_feedback"
    1.69 +  }
    1.70 +end)
    1.71 +
    1.72 +
    1.73  if config.app_logo then
    1.74    slot.select("logo", function()
    1.75      ui.image{ static = config.app_logo }

     2.1 --- a/app/main/_layout/default.html	Sat Mar 10 20:29:58 2012 +0100
     2.2 +++ b/app/main/_layout/default.html	Sat Mar 10 22:25:42 2012 +0100
     2.3 @@ -69,9 +69,10 @@
     2.4        <div class="main" id="default">
     2.5          <!-- WEBMCP SLOT default -->
     2.6        </div>
     2.7 -      <div class="footer" id="footer">
     2.8 -        <!-- WEBMCP SLOT footer -->
     2.9 -      </div>
    2.10 +      <br style="clear: both;" />
    2.11 +    </div>
    2.12 +    <div class="footer" id="footer">
    2.13 +      <!-- WEBMCP SLOT footer -->
    2.14      </div>
    2.15      <div class="layout_trace" id="layout_trace" style="xdisplay: none">
    2.16        <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>

     3.1 --- a/app/main/unit/list.lua	Sat Mar 10 20:29:58 2012 +0100
     3.2 +++ b/app/main/unit/list.lua	Sat Mar 10 22:25:42 2012 +0100
     3.3 @@ -2,6 +2,11 @@
     3.4  
     3.5  util.help("unit.list", _"Unit list")
     3.6  
     3.7 +slot.put("<br />")
     3.8 +
     3.9  ui.container{ attr = { class = "box" }, content = function()
    3.10    execute.view{ module = "unit", view = "_list" }
    3.11 -end }
    3.12 \ No newline at end of file
    3.13 +end }
    3.14 +
    3.15 +slot.put("<br />")
    3.16 +

     4.1 --- a/static/style.css	Sat Mar 10 20:29:58 2012 +0100
     4.2 +++ b/static/style.css	Sat Mar 10 22:25:42 2012 +0100
     4.3 @@ -1523,4 +1523,19 @@
     4.4    -webkit-box-shadow: none;
     4.5  }
     4.6  
     4.7 +.slot_footer {
     4.8 +  margin: 0 1%;
     4.9 +  border-top: 1px solid #ccc;
    4.10 +  padding: 1ex;
    4.11 +  font-size: 80%;
    4.12 +  text-align: center;
    4.13 +}
    4.14 +.slot_footer,
    4.15 +.slot_footer a {
    4.16 +  color: #666;
    4.17 +}
    4.18  
    4.19 +.footer {
    4.20 +  margin: 0 auto;
    4.21 +  max-width: 1130px;
    4.22 +}
    4.23 \ No newline at end of file