From ba6ae959b8e21c714c69f66254e82837d45a3ed2 Mon Sep 17 00:00:00 2001 From: mschaefers <mschaefers@scoop-gmbh.de> Date: Mon, 03 Dec 2012 03:49:23 -0500 Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap --- src/com/gitblit/wicket/pages/TreePage.html | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html index 3eda96b..b7e55ed 100644 --- a/src/com/gitblit/wicket/pages/TreePage.html +++ b/src/com/gitblit/wicket/pages/TreePage.html @@ -7,16 +7,13 @@ <body> <wicket:extend> - <!-- page nav links --> - <div wicket:id="pageLinks">[page links]</div> - <!-- blob nav links --> <div class="page_nav2"> - <span wicket:id="historyLink">[history link]</span> | <span wicket:id="headLink">[head link]</span> + <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a> | <span wicket:id="compressedLinks"></span> </div> - <!-- shortlog header --> - <div class="header" wicket:id="shortlog">[shortlog header]</div> + <!-- commit header --> + <div wicket:id="commitHeader">[commit header]</div> <!-- breadcrumbs --> <div wicket:id="breadcrumbs">[breadcrumbs]</div> @@ -24,25 +21,33 @@ <!-- changed paths --> <table style="width:100%" class="pretty"> <tr wicket:id="changedPath"> + <td class="icon"><img wicket:id="pathIcon" /></td> <td><span wicket:id="pathName"></span></td> - <td class="size"><span wicket:id="pathSize">[path size]</span></td> - <td class="mode"><span wicket:id="pathPermissions">[path permissions]</span></td> - <td class="rightAlign"><span wicket:id="pathLinks">[path links]</span></td> + <td class="hidden-phone size"><span wicket:id="pathSize">[path size]</span></td> + <td class="hidden-phone mode"><span wicket:id="pathPermissions">[path permissions]</span></td> + <td class="treeLinks"><span wicket:id="pathLinks">[path links]</span></td> </tr> </table> + <!-- submodule links --> + <wicket:fragment wicket:id="submoduleLinks"> + <span class="link"> + <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <span class="hidden-phone"><a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | </span><a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> | <span wicket:id="compressedLinks"></span> + </span> + </wicket:fragment> + <!-- tree links --> <wicket:fragment wicket:id="treeLinks"> - <div class="link"> - <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> - </div> + <span class="link"> + <span class="hidden-phone"><a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | </span><a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> | <span wicket:id="compressedLinks"></span> + </span> </wicket:fragment> <!-- blob links --> <wicket:fragment wicket:id="blobLinks"> - <div class="link"> - <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> - </div> + <span class="link"> + <span class="hidden-phone"><a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | </span> <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> + </span> </wicket:fragment> </wicket:extend> -- Gitblit v1.9.1