Mercurial > kallithea
changeset 110:ad2500720b02
added images updated htl added tags,branches display
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 26 Apr 2010 22:32:27 +0200 |
| parents | 7b778f90a871 |
| children | 70b1e5d1e20d |
| files | pylons_app/public/css/monoblue_custom.css pylons_app/public/images/document_16.png pylons_app/public/images/folder_16.png pylons_app/public/images/label_16.png pylons_app/public/images/left_16.png pylons_app/templates/shortlog_data.html pylons_app/templates/summary.html |
| diffstat | 7 files changed, 33 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/public/css/monoblue_custom.css Mon Apr 26 21:03:04 2010 +0200 +++ b/pylons_app/public/css/monoblue_custom.css Mon Apr 26 22:32:27 2010 +0200 @@ -140,7 +140,7 @@ } h2.no-border { color: #FFF; - background: #006699; + background: #556CB5; border: 0; } h2 a { @@ -229,24 +229,22 @@ } span.logtags span { - padding: 2px 6px; - font-weight: normal; - font-size: 11px; - border: 1px solid; - background-color: #ffaaff; - border-color: #ffccff #ff00ee #ff00ee #ffccff; + background-repeat:no-repeat; + height:16px; + padding-left:20px; + padding-top:0px; + text-align:left; + font-weight: bold; } span.logtags span.tagtag { - background-color: #ffffaa; - border-color: #ffffcc #ffee00 #ffee00 #ffffcc; + background-image:url("/images/label_16.png"); } span.logtags span.branchtag { - background-color: #aaffaa; - border-color: #ccffcc #00cc33 #00cc33 #ccffcc; + background-image:url("/images/left_16.png"); + color: #628F53; } span.logtags span.inbranchtag { - background-color: #d5dde6; - border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4; + background-image:url("/images/left_16.png"); } div.diff pre { @@ -516,21 +514,21 @@ } .browser-file { - background-image:url("/images/file.png"); + background-image:url("/images/document_16.png"); background-repeat:no-repeat; display:block; height:16px; padding-left:20px; - padding-top:5px; + padding-top:0px; text-align:left; } .browser-dir { - background-image:url("/images/folder.png"); + background-image:url("/images/folder_16.png"); background-repeat:no-repeat; display:block; height:16px; padding-left:20px; - padding-top:5px; + padding-top:0px; text-align:left; }
--- a/pylons_app/templates/shortlog_data.html Mon Apr 26 21:03:04 2010 +0200 +++ b/pylons_app/templates/shortlog_data.html Mon Apr 26 22:32:27 2010 +0200 @@ -7,7 +7,14 @@ <tr class="parity${cnt%2}"> <td>${cs._ctx.date()|n,filters.age}</td> <td title="${cs.author}">${cs.author|n,filters.person}</td> - <td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td> + <td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} + <span class="logtags"> + <span class="branchtag">${cs.branch}</span> + %for tag in cs.tags: + <span class="tagtag">${tag}</span> + %endfor + </span> + </td> <td class="nowrap"> ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} |
--- a/pylons_app/templates/summary.html Mon Apr 26 21:03:04 2010 +0200 +++ b/pylons_app/templates/summary.html Mon Apr 26 22:32:27 2010 +0200 @@ -53,7 +53,16 @@ <tr class="parity${cnt%2}"> <td>${cs._ctx.date()|n,filters.age}</td> <td>${cs.author}</td> - <td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td> + <td> + + ${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} + <span class="logtags"> + <span class="branchtag">${cs.branch}</span> + %for tag in cs.tags: + <span class="tagtag">${tag}</span> + %endfor + </span> + </td> <td class="nowrap"> ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} |