From 9e919f500360949c6ddb9deb2b7abb0dfaa1a3a1 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 03 Jun 2013 07:33:37 -0400 Subject: [PATCH] Merge pull request #91 from uphy/master --- src/main/java/com/gitblit/wicket/panels/PushesPanel.html | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/PushesPanel.html b/src/main/java/com/gitblit/wicket/panels/PushesPanel.html index 5bdc30a..fb67cfc 100644 --- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.html @@ -6,32 +6,38 @@ <body> <wicket:panel> -<div wicket:id="push"> +<div wicket:id="push" class="push"> <table style="padding: 3px 0px;"> <tr> - <td class="hidden-phone" style="vertical-align: top;"><span wicket:id="whoAvatar"></span></td> + <td class="icon hidden-phone"><i wicket:id="pushIcon"></i></td> + <td style="padding-left: 7px;vertical-align:middle;"> + <div> + <span style="color:#aaa;" wicket:id="whenPushed"></span> <span wicket:id="refRewind" class="alert alert-error" style="padding: 1px 5px;font-size: 10px;font-weight: bold;margin-left: 10px;">[rewind]</span> + </div> + <div style="font-weight:bold;"><span wicket:id="whoPushed">[pusher]</span> <span wicket:id="whatPushed"></span><span wicket:id="refPushed"></span> <span wicket:id="repoPreposition"></span> <span wicket:id="repoPushed"></span> <span wicket:id="byAuthors"></span></div> + </td> + </tr> + <tr> + <td class="hidden-phone"></td> <td style="padding-left: 7px;"> - <div><span wicket:id="whoPushed">[pusher]</span> <span wicket:id="whatPushed"></span><span wicket:id="wherePushed"></span></div> - <div wicket:id="whenPushed"></div> - <button type="button" class="btn btn-mini" style="padding: 1px 3px;line-height: 12px;" data-toggle="collapse" data-target="#demo"><span class="caret"></span></button> - <div id="demo" class="collapse"> - <div style="padding: 10px 0px;"> - <table> - <tr wicket:id="commit" style="border-left: 1px solid #ddd;"> - <td style="vertical-align:top;"><span wicket:id="hashLink" style="padding-left: 10px;">[hash link]</span></td> - <td><img wicket:id="commitIcon" /></td> - <td style="vertical-align:top;"> - <div wicket:id="commitShortMessage">[commit short message]</div> - <div wicket:id="commitRefs">[commit refs]</div> - </td> - </tr> - </table> - </div> + <div> + <table> + <tr wicket:id="commit"> + <td class="hidden-phone hidden-tablet" style="vertical-align:top;padding-left:7px;"><span wicket:id="commitAuthor"></span></td> + <td style="vertical-align:top;"><span wicket:id="hashLink" style="padding-left: 5px;">[hash link]</span></td> + <td style="vertical-align:top;padding-left:5px;"><img wicket:id="commitIcon" /></td> + <td style="vertical-align:top;"> + <span wicket:id="commitShortMessage">[commit short message]</span> + </td> + </tr> + </table> + <span class="link" wicket:id="compareLink"></span> </div> </td> </tr> </table> </div> +<div wicket:id="morePushes">[more...]</div> </wicket:panel> </body> </html> \ No newline at end of file -- Gitblit v1.9.1