From 9f4544301f8ce4016f8dd948d8bc9a754ff3e5da Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 10:45:50 -0400
Subject: [PATCH] Merge branch 'ticket/140' into develop
---
src/main/java/com/gitblit/wicket/pages/ProjectPage.html | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectPage.html b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html
index 9fbe1b2..d19496b 100644
--- a/src/main/java/com/gitblit/wicket/pages/ProjectPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html
@@ -7,11 +7,11 @@
<body>
<wicket:extend>
<div class="container">
- <div class="row" style="padding-top:5px;">
+ <div class="row">
<div class="span12">
<div class="dashboardTitle">
<span wicket:id="projectTitle"></span>
- <small><span wicket:id="projectDescription"></span></small>
+ <small class="hidden-phone"><span wicket:id="projectDescription"></span></small>
<a
class="hidden-phone hidden-tablet brand"
@@ -25,18 +25,18 @@
<div class="row">
<div class="span7">
- <div class="markdown" style="padding-bottom: 30px;" wicket:id="projectMessage">[project message]</div>
- <div wicket:id="activity">[activity panel]</div>
+ <div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 30px;" wicket:id="projectMessage">[project message]</div>
+ <div ng-non-bindable wicket:id="activity">[activity panel]</div>
</div>
<div class="span5">
- <div class="markdown" wicket:id="repositoriesMessage">[repositories message]</div>
+ <div class="hidden-phone hidden-tablet markdown" wicket:id="repositoriesMessage">[repositories message]</div>
<div wicket:id="repositoryList">[repository list]</div>
</div>
</div>
</div>
<wicket:fragment wicket:id="activityFragment">
- <div class="dashboardTitle"><wicket:message key="gb.recentActivity"></wicket:message> <small><span wicket:id="feedheader"></span></small></div>
+ <div class="dashboardTitle"><span class="hidden-phone hidden-tablet" wicket:id="feedTitle"></span> <small><span wicket:id="feedheader"></span></small></div>
<div class="hidden-phone hidden-tablet" style="text-align:center;">
<div wicket:id="charts"></div>
</div>
@@ -51,25 +51,7 @@
</tr>
</table>
</wicket:fragment>
-
-<wicket:fragment wicket:id="repositoryListFragment">
- <div ng-controller="repositoryListCtrl" style="border: 1px solid #ddd;border-radius: 4px;margin-bottom: 20px;">
- <div class="header" style="padding: 5px;border: none;"><img style="vertical-align: middle;" src="git-black-16x16.png"/> <wicket:message key="gb.repositories"></wicket:message> ({{repositoryList.length}})
- <div style="padding: 5px 0px 0px;">
- <input type="text" ng-model="query.r" class="input-large" wicket:message="placeholder:gb.filter" style="border-radius: 14px; padding: 3px 14px;margin: 0px;"></input>
- </div>
- </div>
-
- <div ng-repeat="item in repositoryList | filter:query" style="padding: 3px;border-top: 1px solid #ddd;">
- <b><span class="repositorySwatch" style="background-color:{{item.c}};"><span ng-show="item.wc">!</span><span ng-show="!item.wc"> </span></span></b>
- <a href="summary/?r={{item.r}}" title="{{item.i}}">{{item.p}}<b>{{item.n}}</b></a>
- <span class="link hidden-tablet hidden-phone" style="color: #bbb;" title="{{item.d}}">{{item.t}}</span>
- <span ng-show="item.s" class="pull-right">
- <span style="padding: 0px 5px;color: #888;font-weight:bold;vertical-align:middle;">{{item.s | number}} <i style="vertical-align:baseline;" class="iconic-star"></i></span>
- </span>
- </div>
- </div>
-</wicket:fragment>
- </wicket:extend>
+
+</wicket:extend>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1