From d0f6f2599eecb06c76739c7fab3c581fa031e75b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 30 May 2013 23:15:13 -0400 Subject: [PATCH] Added locale user preference, still requires ui --- src/main/java/com/gitblit/wicket/panels/PushesPanel.html | 37 +++++++++++++++++++------------------ 1 files changed, 19 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..cad5932 100644 --- a/src/main/java/com/gitblit/wicket/panels/PushesPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/PushesPanel.html @@ -6,32 +6,33 @@ <body> <wicket:panel> -<div wicket:id="push"> +<div wicket:id="push" style="border-bottom: 1px solid #ddd;margin-bottom: 15px;"> <table style="padding: 3px 0px;"> <tr> - <td class="hidden-phone" style="vertical-align: top;"><span wicket:id="whoAvatar"></span></td> + <td class="hidden-phone" style="vertical-align: top;padding-top:10px"><i style="font-size:3.25em;color:#bbb;" wicket:id="pushIcon"></i></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> + <span 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></div> + <div style="padding: 10px 0px 5px;"> + <table> + <tr wicket:id="commit"> + <td style="vertical-align:top;"><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;"><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