final design tidy up - handing over now

diff --git a/root/fragment/ref/blame.tt2 b/root/fragment/ref/blame.tt2
old mode 100644 (file)
new mode 100755 (executable)
index 47fc8f7..af465d4
--- a/root/fragment/ref/blame.tt2
+++ b/root/fragment/ref/blame.tt2
@@ -7,14 +7,15 @@
        styleinfo = " style='border-top: solid 3px #" _ linecolour _ ";'"; -%]
    <td nowrap class='author'[% styleinfo %]>[% info.commit.author %]</td>
    <td nowrap class='date'[% styleinfo %]>[% info.commit.author_dt.ymd %]</td>
-   <td nowrap class='commit-info chroma-hash'[% styleinfo %]><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for_action('/ref/commit', [Repository.name, info.commit.sha1]) %]'>[% linecolour %]</td>
+   <td nowrap class='sha1 commit-info chroma-hash'[% styleinfo %]><a title="[% info.commit.author %] on [% info.commit.author_dt %]" href='[% c.uri_for_action('/ref/commit', [Repository.name, info.commit.sha1]) %]'>[% INCLUDE 'inc/chroma_hash.tt2' sha1 = info.commit.sha1.substr(0, 7) %]</a>
+[%# linecolour %]</td>
      [%- ELSE -%]
      <td nowrap class='author'></td>
      <td nowrap class='date'></td>
      <td nowrap class='commit-info'></td>
      [%- END -%]
    <td nowrap class='lineno' id='l[% info.meta.lineno %]' style='border-right: solid 3px #[% linecolour %]; border-left: solid 3px #[% linecolour %];'><tt><a href='[% c.uri_for_action('/ref/blame', [Repository.name, info.commit.sha1], filename.to_path ) %]#l[% info.meta.orig_lineno %]'>[% info.meta.lineno %]</a></tt></td>
-   <td nowrap class='data'><pre>[% blame_lines.${loop.index} %]</pre></td>
+   <td nowrap class='data'><pre>[% blame_lines.${loop.index} | html %]</pre></td>
    [% lastsha1 = info.commit.sha1 %]
  </tr>
  [% END %]

diff --git a/root/fragment/ref/diff_fancy.tt2 b/root/fragment/ref/diff_fancy.tt2
index 9554934..7cba200 100755 (executable)
--- a/root/fragment/ref/diff_fancy.tt2
+++ b/root/fragment/ref/diff_fancy.tt2
@@ -7,7 +7,7 @@
     INCLUDE '_diff.tt2';
   ELSE
   %]
-  <div class='no-difference'>
+  <p class='msg'>
   [%
     IF commit && commit.parents > 1;
       'Trivial merge';
@@ -15,6 +15,6 @@
       'No differences found';
     END;
   %]
-  </div>
+  </p>
   [% END %]
 

diff --git a/root/fragment/ref/history.tt2 b/root/fragment/ref/history.tt2
index 868a4de..92b22b1 100755 (executable)
--- a/root/fragment/ref/history.tt2
+++ b/root/fragment/ref/history.tt2
@@ -24,13 +24,13 @@
          <td class='author'>[% line.author.name | html %]</td>
      <td class='action-list'>
      [% IF filetype == 'tree' %]
-       <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1], filename) %]">blob</a>
+       <a href="[% c.uri_for_action("/ref/tree", [Repository.name, line.sha1], filename) %]" title="Blob" class="button blob">blob</a>
       [% ELSIF filetype == 'blob' %]
-       <a href="[% c.uri_for_action("/ref/blob", [Repository.name, line.sha1], filename) %]">blob</a>
+       <a href="[% c.uri_for_action("/ref/blob", [Repository.name, line.sha1], filename) %]" title="Blob" class="button blob">blob</a>
       [% END %]
-       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]">commitdiff</a>
+       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1]) %]" title="Commit diff" class="button diff">commitdiff</a>
       [% IF filetype == 'blob' %]
-       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1], 'HEAD', filename) %]">diff to current</a>
+       <a href="[% c.uri_for_action("/ref/diff_fancy", [Repository.name, line.sha1], 'HEAD', filename) %]" title="Diff to current" class="button diffcurrent">diff to current</a>
        [% END %]
      </td>
     </tr>

diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2
index 2ce0339..69c5766 100755 (executable)
--- a/root/fragment/repository/heads.tt2
+++ b/root/fragment/repository/heads.tt2
@@ -1,16 +1,15 @@
 [% BLOCK repository_heads_headfoot %]
 [% SET cell = type == 'head' ? 'th' : 'td' %]
-<tr>
+<tr class="header">
    <[% cell %]>HEAD</[% cell %]>
-   <[% cell %]>age</[% cell %]>
-   <[% cell %]>branch</[% cell %]>
-   <[% cell %]>actions</[% cell %]>
+   <[% cell %]>Last change</[% cell %]>
+   <[% cell %]>Branch</[% cell %]>
+   <[% cell %]>Actions</[% cell %]>
 </tr>
 [% END %]
+
 <table class='[% action %] listing'>
  <thead>[% PROCESS repository_heads_headfoot type = 'head' %]</thead>
- <tfoot>[% PROCESS repository_heads_headfoot type = 'foot' %]</tfoot>
-
  <tbody>
  [% FOREACH head IN heads %]
   <tr>
@@ -18,9 +17,9 @@
    <td class='time-since' title='[% head.last_change %]'>[% time_since(head.last_change) %]</td>
    <td class='head[% head.sha1 == HEAD ? ' current' : '' %]'>[% head.name %]</td>
    <td class='action-list'>[%# FIXME %]
-     <a href="[% c.uri_for_action('/ref/shortlog', [Repository.name, head.name]) %]">shortlog</a>
-     <a href="[% c.uri_for_action('/ref/longlog', [Repository.name, head.name]) %]">log</a>
-     <a href="[% c.uri_for_action('/ref/tree', [Repository.name, head.name]) %]">tree</a>
+     <a href="[% c.uri_for_action('/ref/shortlog', [Repository.name, head.name]) %]" title="Short log" class="button shortlog">shortlog</a>
+     <a href="[% c.uri_for_action('/ref/longlog', [Repository.name, head.name]) %]" title="Long log" class="button longlog">log</a>
+     <a href="[% c.uri_for_action('/ref/tree', [Repository.name, head.name]) %]" title="Tree" class="button tree">tree</a>
    </td>
   </tr>
  [% END %]

diff --git a/root/fragment/repository/longlog.tt2 b/root/fragment/repository/longlog.tt2
index aefca13..33c9b88 100755 (executable)
--- a/root/fragment/repository/longlog.tt2
+++ b/root/fragment/repository/longlog.tt2
@@ -1 +1,5 @@
-[% INCLUDE 'fragment/repository/shortlog.tt2' longlogformat = 1 %]
\ No newline at end of file
+[% INCLUDE 'fragment/repository/shortlog.tt2' longlogformat = 1 %]
+
+
+<h2>Branches</h2>
+[% subinclude('/fragment/repository/heads', c.req.captures) %]
\ No newline at end of file

diff --git a/root/ref/blame.tt2 b/root/ref/blame.tt2
old mode 100644 (file)
new mode 100755 (executable)
index 009b2d3..f943636
--- a/root/ref/blame.tt2
+++ b/root/ref/blame.tt2
@@ -1,36 +1,37 @@
 [%- BLOCK blame_table_headfoot %]
 <tr>
- <td>author</td>
- <td>date</td>
- <td>sha1</td>
- <td></td>
- <td class='data'>data</td>
+ <th>Author</th>
+ <th>Date</th>
+ <th width="80" nowrap="nowrap">ID (sha1)</thd>
+ <th></tdh>
+ <th class='data'>Data</th>
 </tr>
 [% END -%]
+
 [%- INCLUDE inc/syntax_highlight_css.tt2 -%]
 
-<div class='content'>
 
-[% IF object.type == 'commit' %]
-<div class='commit-message'>[% short_cmt(head.comment) %]</div>
-[% END %]
 
-[% INCLUDE 'nav/path.tt2' %]
+
+
+
 
 <div id='blame'>
-<table>
+<table class="listing">
  <thead>
   [% PROCESS blame_table_headfoot %]
  </thead>
 
- <tfoot>
-   [% PROCESS blame_table_headfoot %]
- </tfoot>
-
  <tbody>
  [% subinclude('/fragment/ref/blame', c.req.captures, c.req.arguments.to_path ) %]
  </tbody>
 </table>
 </div>
 
-</div>
+<h2>[% INCLUDE 'nav/path.tt2' %]</h2>
+
+
+[% IF object.type == 'commit' %]
+<div class='commit-message'>[% short_cmt(head.comment) %]</div>
+[% END %]
+

diff --git a/root/repository/shortlog.tt2 b/root/repository/shortlog.tt2
old mode 100644 (file)
new mode 100755 (executable)
index a0c9f4b..33aa93c
--- a/root/repository/shortlog.tt2
+++ b/root/repository/shortlog.tt2
@@ -1 +1,4 @@
 [% subinclude('/fragment/' _ c.action, c.req.captures, c.req.parameters) %]
+
+<h2>Branches</h2>
+[% subinclude('/fragment/repository/heads', c.req.captures) %]
\ No newline at end of file

diff --git a/root/repository/summary.tt2 b/root/repository/summary.tt2
index 9554c0f..a0646e8 100755 (executable)
--- a/root/repository/summary.tt2
+++ b/root/repository/summary.tt2
@@ -1,15 +1,15 @@
 
-<div class='summary content'>
+
   <!-- [% subinclude('/fragment/repository/summary', c.req.captures) %]
 
  <h2><a href='[% c.uri_for(c.controller.action_for('shortlog'), c.req.captures) %]'>shortlog</a></h2> -->
   [% subinclude('/fragment/repository/shortlog', c.req.captures) %]
 
-  <h2><a href='[% c.uri_for(c.controller.action_for('heads'), c.req.captures) %]'>branches</a></h2>
+  <h2><a href='[% c.uri_for(c.controller.action_for('heads'), c.req.captures) %]'>Branches</a></h2>
   [% subinclude('/fragment/repository/heads', c.req.captures) %]
 
   [% IF Repository.tags.size > 0 %]
-  <h2><a href='[% c.uri_for(c.controller.action_for('tags'), c.req.captures) %]'>tags</a></h2>
+  <h2><a href='[% c.uri_for(c.controller.action_for('tags'), c.req.captures) %]'>Tags</a></h2>
   [% subinclude('/fragment/repository/tags', c.req.captures) %]
   [% END %]
-</div>
+

diff --git a/root/static/css/core.css b/root/static/css/core.css
index ce3442d..1018603 100755 (executable)
--- a/root/static/css/core.css
+++ b/root/static/css/core.css
@@ -52,11 +52,14 @@ a img{
        float:right;
        margin-right:15px;
 }
-
+#footer_holder{
+       margin-bottom:100px;
+}
 #footer p{
        margin-left:15px;
 }
 #debug_holder{
+       display:none;
        clear:both;
        padding-top:30px;
        margin:30px 0;
@@ -182,6 +185,9 @@ a.commit{
 a.diff{
        background:transparent url(/static/i/icons/diff.png) no-repeat;
 }
+a.diffcurrent{
+       background:transparent url(/static/i/icons/diffcurrent.png) no-repeat;
+}
 a.tree{
        background:transparent url(/static/i/icons/tree.png) no-repeat;
 }
@@ -213,7 +219,12 @@ a.raw{
        padding-top:2px;
        float:left;
 }
-
+.msg{
+       padding:5px 10px 5px 35px;
+       background:#f0f0f0 url(/static/i/icons/attention.png) no-repeat 10px center;
+       border:1px solid #ddd;
+       margin:30px 15px;
+}
 
 a.rss_logo {
   float: right;
@@ -290,6 +301,9 @@ th a{
 tr.invert{
        background-color:#f0f0f0;
 }
+tr.header{
+       background-color:#666;
+}
 .sha1{
        width:80px;
 }
@@ -366,16 +380,17 @@ table.listing{
 /* /blame */
 #blame pre, #blame tt {
   margin: 0;
-  font-size: 0.9em;
+  font-size: 12px;
 }
 #blame .commit-info {
+
 }
 #blame .lineno {
   text-align: right;
   padding: 0 8px;
 }
 #blame a {
-  text-decoration: none;
+ atext-decoration: none;
 }
 #blame {
     overflow-x: scroll;
@@ -387,7 +402,8 @@ table.listing{
   background-color: #fefeaa;
 }
 #blame td {
-  padding: 0 0.2em;
+       vertical-align:middle;
+       padding: 3px;
 }
 #blame td.lineno {
   background-color: #eee;
@@ -409,6 +425,7 @@ pre.blob {
   padding-left: 15px;
   margin: 20px 15px 20px;
   overflow:auto;
+  font-size:12px;
 }
 
 /* /blobdiff etc */

diff --git a/root/static/i/icons/attention.png b/root/static/i/icons/attention.png
new file mode 100755 (executable)
index 0000000..db00074
Binary files /dev/null and b/root/static/i/icons/attention.png differ

diff --git a/root/static/i/icons/diffcurrent.png b/root/static/i/icons/diffcurrent.png
new file mode 100755 (executable)
index 0000000..8f4827f
Binary files /dev/null and b/root/static/i/icons/diffcurrent.png differ

diff --git a/root/wrapper.tt2 b/root/wrapper.tt2
index ebcdeab..593246a 100755 (executable)
--- a/root/wrapper.tt2
+++ b/root/wrapper.tt2
@@ -46,6 +46,7 @@
                <div id="nav_logs" [% 'style="visibility:hidden"' IF c.action.name == "index" %]>
                        <ul>
                                [% IF c.req.captures.size == 1; SET path = 'repository'; ELSE; SET path = 'ref'; END %]
+                               
                                <li [% 'class="selected"' IF c.action.name.match('longlog') %]><a href="[% c.uri_for_action('/' _ path _ '/longlog', c.req.captures) %]" id="log_full">Long log</a></li>
                                <li [% 'class="selected"' IF c.action.name.match('shortlog') %]><a href="[% c.uri_for_action('/' _ path _ '/shortlog', c.req.captures) %]" id="log_short">Short log</a></li>
                        </ul>
@@ -80,8 +81,6 @@
  [% content %]
 
  
- 
-  [%# INCLUDE 'nav/actions.tt2' %]
                </div>
        </div>
 </div>