From 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Nov 2012 17:13:03 -0500 Subject: [PATCH] Added short commit id column to log and history tables (issue 168) --- src/com/gitblit/wicket/panels/ActivityPanel.html | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html index 668e7c9..f4d1409 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.html +++ b/src/com/gitblit/wicket/panels/ActivityPanel.html @@ -7,34 +7,31 @@ <body> <wicket:panel> - <div wicket:id="activity"> - <div class="header"><span wicket:id="title">[title]</span></div> - <table wicket:id="commits"> - <tr wicket:id="commit"></tr> + <div wicket:id="activity" style="padding-bottom:10px;"> + <div class="header"><i class="icon-refresh" style="vertical-align: middle;"></i> <span style="font-weight:bold;" wicket:id="title">[title]</span></div> + <table class="activity"> + <tr wicket:id="commit"> + <td class="hidden-phone date" style="width:60px; vertical-align: middle;text-align: right;padding-right:10px;" ><span wicket:id="time">[time of day]</span></td> + <td style="width:10em;text-align:left;vertical-align: middle;"> + <span wicket:id="repository" class="repositorySwatch">[repository link]</span> + </td> + <td class="hidden-phone hidden-tablet" style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td> + <td style="vertical-align: middle;padding-left:15px;"> + <img class="hidden-phone hidden-tablet" wicket:id="commitIcon" style="vertical-align: top;"></img> + <span wicket:id="message">[shortlog commit link]</span><br/> + <span wicket:id="author">[author link]</span> <span class="hidden-phone"><wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span></span> on <span wicket:id="branch"></span> + </td> + <td class="hidden-phone" style="text-align:right;vertical-align: middle;"> + <div wicket:id="commitRefs">[commit refs]</div> + </td> + <td class="hidden-phone rightAlign" style="width:7em;vertical-align: middle;"> + <span class="link"> + <a wicket:id="view" target="_blank"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff" target="_blank"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree" target="_blank"><wicket:message key="gb.tree"></wicket:message></a> + </span> + </td> + </tr> </table> </div> - - <wicket:fragment wicket:id="commitFragment"> - <td class="date" style="width:40px; vertical-align: middle;" ><span wicket:id="time">[time of day]</span></td> - <td style="width:10em;text-align:left;vertical-align: middle;"> - <span wicket:id="repository" class="repositorySwatch">[repository link]</span> - </td> - <td style="width:30px;vertical-align: middle;"><img wicket:id="avatar" style="vertical-align: middle;"></img></td> - <td class="author" style="vertical-align: middle;"> - <img wicket:id="commitIcon" style="vertical-align: middle;"></img> - <span wicket:id="message">[shortlog commit link]</span><br/> - <span wicket:id="author" style="padding-left:20px;">[author link]</span> committed <span wicket:id="commitid">[commit id]</span> to <span wicket:id="branch"></span> - </td> - <td style="text-align:right;vertical-align: middle;"> - <div wicket:id="commitRefs">[commit refs]</div> - </td> - <td class="rightAlign" style="width:7em;vertical-align: middle;"> - <span class="link"> - <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> - </span> - </td> - </wicket:fragment> - </wicket:panel> </body> </html> \ No newline at end of file -- Gitblit v1.9.1