Fixed bug in http://github.com/broquaint/Gitalist/issues#issue/2.

Marked up the footer in the layout.
Dropped project summary on the summary page. I think the info is redundant
and /summary could do with being tightened up anyhow.
(cherry picked from commit 04da9e76d8fdda89d3298de8187edff26cbf5100)

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index c880cbf..025a8fe 100644 (file)
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -112,17 +112,19 @@ sub summary : Local {
   my ( $self, $c ) = @_;
   my $project = $c->stash->{Project};
   my $commit = $self->_get_commit($c);
+  my @heads  = $project->heads;
+  my $maxitems = Gitalist->config->{paging}{summary} || 10;
   $c->stash(
     commit    => $commit,
     info      => $project->info,
     log_lines => [$project->list_revs(
         sha1 => $commit->sha1,
-        count => Gitalist->config->{paging}{summary} || 10
+        count => $maxitems,
     )],
     refs      => $project->references,
-    heads     => [$project->heads],
+    heads     => [ @heads[0 .. $maxitems] ],
     action    => 'summary',
-);
+  );
 }
 
 =head2 heads

diff --git a/root/default.tt2 b/root/default.tt2
index 72665d7..09a3104 100644 (file)
--- a/root/default.tt2
+++ b/root/default.tt2
@@ -64,7 +64,7 @@
 
 [%- # git_footer_html
 -%]
-<div class="page-footer">
+<div id="page-footer">
 [% IF project AND project_description %]
   <div class="page_footer_text">[% project_description | html %]</div>
 [% END %]

diff --git a/root/static/css/site.css b/root/static/css/site.css
index 3775fa6..fd4b2fc 100644 (file)
--- a/root/static/css/site.css
+++ b/root/static/css/site.css
@@ -32,6 +32,30 @@ div.chroma-hash {
   font-family: "Trebuchet MS", "Lucida Grande", serif;
 }
 
+/* header */
+#page-header {
+  height: 25px;
+  padding: 8px;
+  font-size: 1.5em;
+  font-weight: bold;
+  background-color: #d9d8d1;
+}
+
+img.logo {
+  float: right;
+  border-width: 0px;
+}
+
+/* footer */
+#page-footer {
+  height: 20px;
+  padding: 8px;
+  margin-top: 10px;
+  font-style: italic;
+  background-color: #d9d8d1;
+  border-top: solid 1px #777;
+}
+
 /* actions include */
 .actions {
   padding-bottom: 4px 0;
@@ -156,18 +180,6 @@ pre.blob {
  * from gitweb.css
  * XXX These can be rejigged once gitweb.css has gone away.
  */
-#page-header {
-  height: 25px;
-  padding: 8px;
-  font-size: 1.5em;
-  font-weight: bold;
-  background-color: #d9d8d1;
-}
-
-img.logo {
-  float: right;
-  border-width: 0px;
-}
 
 span.refs span {
   padding: 0px 4px;

diff --git a/root/summary.tt2 b/root/summary.tt2
index f603631..a792220 100644 (file)
--- a/root/summary.tt2
+++ b/root/summary.tt2
@@ -1,13 +1,5 @@
 [% PROCESS 'nav/actions.tt2' object = head %]
 
-<div class='summary'>
-<dl>
-<dt>description</dt><dd>[% info.description %]</dd>
-<dt>owner</dt><dd>[% info.owner %]</dd>
-<dt>last change</dt><dd>[% info.last_change %]</dd>
-</dl>
-</div>
-
 <h2><a href='[% c.uri_for("shortlog") %]'>shortlog</a></h2>
 [% INCLUDE '_shortlog.tt2' %]