@@ -90,7 +90,7 @@ hr { | |||
background-image: url(arrow_page.png); | |||
background-position: center bottom; | |||
outline: 0; | |||
padding-bottom:2px; | |||
padding-bottom:3px; | |||
} | |||
.navbar .active a { | |||
@@ -649,7 +649,7 @@ table.plain { | |||
table.plain th, table.plain td { | |||
white-space: nowrap; | |||
padding: 1px 6px; | |||
padding: 1px 3px; | |||
border: 0; | |||
} | |||
@@ -6,7 +6,7 @@ | |||
<body> | |||
<wicket:extend> | |||
<div class="pageTitle"> | |||
<h2><wicket:message key="gb.recentActivity"></wicket:message><small> / <span wicket:id="subheader">[days back]</span></small></h2> | |||
<h2><wicket:message key="gb.recentActivity"></wicket:message><small> <span class="hidden-phone">/ <span wicket:id="subheader">[days back]</span></span></small></h2> | |||
</div> | |||
<div class="hidden-phone" style="height: 155px;text-align: center;"> | |||
<table> |
@@ -53,8 +53,10 @@ | |||
<wicket:fragment wicket:id="userFragment"> | |||
<span class="userPanel" wicket:id="username"></span> | |||
<span class="userPanel" wicket:id="loginLink"></span> | |||
<span class="userPanel" wicket:id="separator"></span> | |||
<span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span> | |||
<span class="hidden-phone"> | |||
<span class="userPanel" wicket:id="separator"></span> | |||
<span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span> | |||
</span> | |||
</wicket:fragment> | |||
</html> |
@@ -25,15 +25,15 @@ | |||
<tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span class="sha1" wicket:id="commitAuthor">[author</span></td></tr> | |||
<tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr> | |||
<tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr> | |||
<tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr> | |||
<tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr> | |||
<tr><th><wicket:message key="gb.tree">tree</wicket:message></th> | |||
<tr class="hidden-phone"><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr> | |||
<tr class="hidden-phone"><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr> | |||
<tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th> | |||
<td><span class="sha1" wicket:id="commitTree">[commit tree]</span> | |||
<span class="link"> | |||
<a wicket:id="treeLink"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="zipLink"><wicket:message key="gb.zip"></wicket:message></a> | |||
</span> | |||
</td></tr> | |||
<tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> | |||
<tr class="hidden-phone"><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> | |||
<td> | |||
<span wicket:id="commitParents"> | |||
<span class="sha1" wicket:id="commitParent">[commit parents]</span> |
@@ -23,10 +23,10 @@ | |||
<h3><wicket:message key="gb.repositories"></wicket:message></h3> | |||
<select wicket:id="repositories" ></select> | |||
</div> | |||
<div class="span9"> | |||
<div class="span9" style="margin-left:10px"> | |||
<div> | |||
<h3><wicket:message key="gb.query"></wicket:message></h3> | |||
<input class="span8" id="query" wicket:id="query" placeholder="enter search text"></input> | |||
<input class="span8" id="query" type="text" wicket:id="query" placeholder="enter search text"></input> | |||
<button class="btn btn-primary" type="submit" value="Search"><wicket:message key="gb.search"></wicket:message></button> | |||
</div> | |||
<div style="margin-top:10px;"> |
@@ -13,13 +13,13 @@ | |||
</div> | |||
<!-- Repository info --> | |||
<div style="padding-bottom: 10px;"> | |||
<div class="hidden-phone" style="padding-bottom: 10px;"> | |||
<table class="plain"> | |||
<tr><th><wicket:message key="gb.description">[description]</wicket:message></th><td><span wicket:id="repositoryDescription">[repository description]</span></td></tr> | |||
<tr><th><wicket:message key="gb.owner">[owner]</wicket:message></th><td><span wicket:id="repositoryOwner">[repository owner]</span></td></tr> | |||
<tr class="hidden-phone"><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr> | |||
<tr class="hidden-phone"><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr> | |||
<tr><th valign="middle"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message></th><td><img style="vertical-align: middle;" wicket:id="accessRestrictionIcon" /><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls" style="margin-left:20px;"></div></td></tr> | |||
<tr><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr> | |||
<tr><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr> | |||
<tr><th style="vertical-align:top;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message> <img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th><td><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls"></div></td></tr> | |||
</table> | |||
</div> | |||
</div> |
@@ -23,7 +23,7 @@ | |||
<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="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> | |||
@@ -32,14 +32,14 @@ | |||
<!-- tree links --> | |||
<wicket:fragment wicket:id="treeLinks"> | |||
<span 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> | <a wicket:id="zip"><wicket:message key="gb.zip"></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> | <a wicket:id="zip"><wicket:message key="gb.zip"></wicket:message></a> | |||
</span> | |||
</wicket:fragment> | |||
<!-- blob links --> | |||
<wicket:fragment wicket:id="blobLinks"> | |||
<span 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="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> | |||
<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> | |||
@@ -15,13 +15,13 @@ | |||
<td style="width:10em;text-align:left;vertical-align: middle;"> | |||
<span wicket:id="repository" class="repositorySwatch">[repository link]</span> | |||
</td> | |||
<td class="hidden-phone" style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td> | |||
<td style="vertical-align: middle;"> | |||
<img wicket:id="commitIcon" style="vertical-align: middle;"></img> | |||
<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" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span> | |||
<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 style="text-align:right;vertical-align: middle;"> | |||
<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;"> |
@@ -71,14 +71,14 @@ public class ActivityPanel extends BasePanel { | |||
.getWhen(), getTimeZone(), getTimeUtils())); | |||
// avatar | |||
commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36)); | |||
commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40)); | |||
// merge icon | |||
if (commit.getParentCount() > 1) { | |||
commitItem.add(WicketUtils.newImage("commitIcon", | |||
"commit_merge_16x16.png")); | |||
} else { | |||
commitItem.add(WicketUtils.newBlankImage("commitIcon")); | |||
commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false)); | |||
} | |||
// author search link |
@@ -15,15 +15,15 @@ | |||
<img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="users_16x16.png"/> | |||
<wicket:message key="gb.teams">[teams]</wicket:message> | |||
</th> | |||
<th style="width:140px;"><wicket:message key="gb.teamMembers">[team members]</wicket:message></th> | |||
<th style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th> | |||
<th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMembers">[team members]</wicket:message></th> | |||
<th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th> | |||
<th style="width:80px;" class="right"></th> | |||
</tr> | |||
<tbody> | |||
<tr wicket:id="teamRow"> | |||
<td class="left" ><div class="list" wicket:id="teamname">[teamname]</div></td> | |||
<td class="left" ><div class="list" wicket:id="members">[members]</div></td> | |||
<td class="left" ><div class="list" wicket:id="repositories">[repositories]</div></td> | |||
<td class="hidden-phone left" ><div class="list" wicket:id="members">[members]</div></td> | |||
<td class="hidden-phone left" ><div class="list" wicket:id="repositories">[repositories]</div></td> | |||
<td class="rightAlign"><span wicket:id="teamLinks"></span></td> | |||
</tr> | |||
</tbody> |
@@ -16,8 +16,8 @@ | |||
<wicket:message key="gb.users">[users]</wicket:message> | |||
</th> | |||
<th class="hidden-phone hidden-tablet left"><wicket:message key="gb.displayName">[display name]</wicket:message></th> | |||
<th style="width:120px;"><wicket:message key="gb.accessLevel">[access level]</wicket:message></th> | |||
<th style="width:140px;"><wicket:message key="gb.teamMemberships">[team memberships]</wicket:message></th> | |||
<th class="hidden-phone" style="width:120px;"><wicket:message key="gb.accessLevel">[access level]</wicket:message></th> | |||
<th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMemberships">[team memberships]</wicket:message></th> | |||
<th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th> | |||
<th style="width:80px;" class="right"></th> | |||
</tr> | |||
@@ -25,8 +25,8 @@ | |||
<tr wicket:id="userRow"> | |||
<td class="left" ><span class="list" wicket:id="username">[username]</span></td> | |||
<td class="hidden-phone hidden-tablet left" ><span class="list" wicket:id="displayName">[display name]</span></td> | |||
<td class="left" ><span class="list" wicket:id="accesslevel">[access level]</span></td> | |||
<td class="left" ><span class="list" wicket:id="teams">[team memberships]</span></td> | |||
<td class="hidden-phone left" ><span class="list" wicket:id="accesslevel">[access level]</span></td> | |||
<td class="hidden-phone left" ><span class="list" wicket:id="teams">[team memberships]</span></td> | |||
<td class="hidden-phone left" ><span class="list" wicket:id="repositories">[repositories]</span></td> | |||
<td class="rightAlign"><span wicket:id="userLinks"></span></td> | |||
</tr> |