From 02c1e298dc86f69b3e2a7b37048152ea55b3fa8c Mon Sep 17 00:00:00 2001 From: Mrbytes <eguervos@msn.com> Date: Thu, 04 Oct 2012 06:40:24 -0400 Subject: [PATCH] GitBlitWebApp_es.properties: Updated with the new "fork" changes Other small corrections of syntax --- src/com/gitblit/wicket/pages/RepositoryPage.html | 82 +++++++++++++++++++++++++++++++++-------- 1 files changed, 66 insertions(+), 16 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index 0e0ce47..3dff36a 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,26 +6,76 @@ <body> <wicket:extend> - <!-- page header bar --> - <div> - <!-- floating search form on right --> - <form wicket:id="searchForm"> - <div class="search"> - <select wicket:id="searchType"/> - <input type="text" id="searchBox" wicket:id="searchBox" size="25" value=""/> + <!-- page nav links --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + <a class="brand" wicket:id="rootLink"> + <img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/> + </a> + + <div class="nav-collapse" wicket:id="navPanel"></div> + + <a class="hidden-phone hidden-tablet brand" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed"> + <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> + </a> + + <form class="hidden-phone hidden-tablet pull-right" style="margin-top:10px;" wicket:id="searchForm"> + <span class="search"> + <select class="small" wicket:id="searchType"/> + <input type="text" id="searchBox" wicket:id="searchBox" value=""/> + </span> + </form> </div> - </form> - - <!-- page nav links --> - <div class="page_nav"> - <a wicket:id="summary"><wicket:message key="gb.summary"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="branches"><wicket:message key="gb.branches"></wicket:message></a> | <a wicket:id="tags"><wicket:message key="gb.tags"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> <span wicket:id="extra"><span wicket:id="extraSeparator"></span><span wicket:id="extraLink"></span></span> </div> </div> - - <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div> - + <!-- page content --> - <wicket:child /> + <div class="container"> + <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div> + + <!-- page header --> + <div class="pageTitle"> + <div class="row"> + <div class="controls"> + <span wicket:id="workingCopyIndicator"></span> + <span class="hidden-phone hidden-tablet" wicket:id="forksProhibitedIndicator"></span> + <div class="hidden-phone btn-group pull-right"> + <!-- future spot for other repo buttons --> + <a class="btn" wicket:id="myForkLink"><i class="icon-random"></i> <wicket:message key="gb.myFork"></wicket:message></a> + <a class="btn" wicket:id="forkLink"><i class="icon-random"></i> <wicket:message key="gb.fork"></wicket:message></a> + </div> + </div> + <div class="span7"> + <div><span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div> + <span wicket:id="originRepository">[origin repository]</span> + </div> + </div> + </div> + + <wicket:child /> + </div> + + <wicket:fragment wicket:id="originFragment"> + <p class="originRepository"><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p> + </wicket:fragment> + + <wicket:fragment wicket:id="workingCopyFragment"> + <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> + <span class="alert alert-info" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-exclamation-sign"></i> <span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span> + </div> + </wicket:fragment> + + <wicket:fragment wicket:id="forksProhibitedFragment"> + <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> + <span class="alert alert-error" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-ban-circle"></i> <span class="hidden-phone" wicket:id="forksProhibited" style="font-weight:bold;">[forks prohibited]</span></span> + </div> + </wicket:fragment> </wicket:extend> </body> -- Gitblit v1.9.1