From cb5e6c2c5adc63c65a8517e19e16b20d35b671c6 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 09 May 2014 08:06:21 -0400 Subject: [PATCH] Merged #69 "Update Korean translation" --- src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html | 93 +++------------------------------------------- 1 files changed, 7 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html index a9fd1ba..ed3754e 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyDashboardPage.html @@ -8,10 +8,10 @@ <wicket:extend> <div class="container"> - <div class="row" style="padding-top:5px;"> + <div class="row" style="padding-top:10px;"> <div class="span7"> - <div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 30px;" wicket:id="repositoriesMessage">[repositories message]</div> - <div wicket:id="activity"></div> + <div class="hidden-phone hidden-tablet markdown" style="padding-bottom: 10px;" wicket:id="repositoriesMessage">[repositories message]</div> + <div ng-non-bindable wicket:id="activity"></div> </div> <div class="span5"> <div wicket:id="repositoryTabs"></div> @@ -29,7 +29,7 @@ <div wicket:id="active">[recently active]</div> </div> <div class="tab-pane" id="projects"> - <div wicket:id="projectList">[all projects]</div> + <div wicket:id="projects">[all projects]</div> </div> </div> </wicket:fragment> @@ -52,7 +52,7 @@ <div wicket:id="active">[recently active]</div> </div> <div class="tab-pane" id="projects"> - <div wicket:id="projectList">[all projects]</div> + <div wicket:id="projects">[all projects]</div> </div> </div> </wicket:fragment> @@ -68,89 +68,10 @@ <wicket:fragment wicket:id="chartsFragment"> <table> <tr> - <td><div id="chartRepositories" style="display:inline-block;width: 175px; height:175px"></div></td> - <td><div id="chartAuthors" style="display:inline-block;width: 175px; height: 175px;"></div></td> + <td><div id="chartRepositories" style="display:inline-block;width: 250px; height:175px"></div></td> + <td><div id="chartAuthors" style="display:inline-block;width: 250px; height: 175px;"></div></td> </tr> </table> -</wicket:fragment> - -<wicket:fragment wicket:id="starredListFragment"> - <div ng-controller="starredCtrl" style="border: 1px solid #ddd;border-radius: 4px;margin-bottom: 20px;"> - <div class="header" style="padding: 5px;border: none;"><i class="icon-star"></i> <wicket:message key="gb.starredRepositories"></wicket:message> ({{starred.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 starred | 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: #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 style="vertical-align:baseline;" class="iconic-star"></i></span> - </span> - </div> - - </div> -</wicket:fragment> - -<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="hidden-phone pull-right"> - <span wicket:id="create"></span> - </div> - <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 owned | 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:fragment wicket:id="activeListFragment"> - <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> - </div> - </div> - - <div ng-repeat="item in active | 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:fragment wicket:id="projectListFragment"> - <div ng-controller="projectListCtrl" style="border: 1px solid #ddd;border-radius: 4px;margin-bottom: 20px;"> - <div class="header" style="padding: 5px;border: none;"><i class="icon-folder-close"></i> <wicket:message key="gb.projects"></wicket:message> ({{projectList.length}}) - <div style="padding: 5px 0px 0px;"> - <input type="text" ng-model="query.n" 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 projectList | filter:query" style="padding: 3px;border-top: 1px solid #ddd;"> - <a href="project/{{item.p}}" title="{{item.i}}"><b>{{item.n}}</b></a> - <span class="link hidden-tablet hidden-phone" style="color: #bbb;" title="{{item.d}}">{{item.t}}</span> - <span class="pull-right"> - <span style="padding: 0px 5px;color: #888;font-weight:bold;vertical-align:middle;" wicket:message="title:gb.repositories">{{item.c | number}}</span> - </span> - </div> - </div> </wicket:fragment> </wicket:extend> -- Gitblit v1.9.1