From f5359b93f1c68f76c00f7efc3746a227ba5249bc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 18 Jun 2013 21:57:42 -0400 Subject: [PATCH] Set default days back as 7 in WicketUtils --- src/main/java/com/gitblit/wicket/pages/DashboardPage.html | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.html b/src/main/java/com/gitblit/wicket/pages/DashboardPage.html index d2516f0..1da7ef4 100644 --- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.html +++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.html @@ -7,10 +7,11 @@ <body> <wicket:extend> <div class="container"> - <div class="markdown" style="padding-bottom:5px;" wicket:id="repositoriesMessage">[repositories message]</div> + <div class="hidden-phone markdown" style="padding-bottom:5px;" wicket:id="repositoriesMessage">[repositories message]</div> <div class="row"> <div class="span7"> + <div style="color:#888;font-size:1.75em;padding-bottom:5px;" wicket:id="feedheader"></div> <div class="hidden-phone hidden-tablet" style="text-align:center;"> <table> <tr> @@ -19,7 +20,7 @@ </tr> </table> </div> - <div wicket:id="pushes"></div> + <div wicket:id="digests"></div> </div> <div class="span5"> <div wicket:id="active">[active]</div> @@ -44,9 +45,9 @@ <div ng-repeat="item in starred | limitTo: 20 | 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}}">{{item.p}}<b>{{item.n}}</b></a> - <span class="link hidden-tablet hidden-phone" style="color: #bbb;" title="{{item.d}}">{{item.t}}</span> + <span class="link hidden-tablet hidden-phone" style="color: #aaa;" 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 class="iconic-star"></i></span> + <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> @@ -56,7 +57,7 @@ <wicket:fragment wicket:id="ownedListFragment"> <div ng-controller="ownedCtrl" style="border: 1px solid #ddd;border-radius: 4px;"> <div class="header" style="padding: 5px;border: none;"><i class="icon-user"></i> <wicket:message key="gb.myRepositories"></wicket:message> ({{owned.length}}) - <div class="pull-right"> + <div class="hidden-phone pull-right"> <span wicket:id="create"></span> </div> <div style="padding: 5px 0px 0px;"> @@ -69,14 +70,14 @@ <a href="summary/?r={{item.r}}">{{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 class="iconic-star"></i></span> + <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:fragment wicket:id="activeListFragment"> - <div ng-controller="activeCtrl" style="border: 1px solid #ddd;border-radius: 4px;"> + <div ng-controller="activeCtrl" style="border: 1px solid #ddd;border-radius: 4px;margin-bottom: 20px;"> <div class="header" style="padding: 5px;border: none;"><i class="icon-user"></i> <wicket:message key="gb.activeRepositories"></wicket:message> ({{active.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> @@ -88,7 +89,7 @@ <a href="summary/?r={{item.r}}">{{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 class="iconic-star"></i></span> + <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> -- Gitblit v1.9.1