Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-30 06:18:02 +02:00
Code Issues Projects Releases Wiki Activity

updates for page style refinements.

Browse Source
This commit is contained in:
kunw 2016-07-07 01:12:20 +08:00
parent d68be63585
commit b612b42c24
13 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
static/resources/css/index.css
View File

@ -33,15 +33,15 @@ body {
background-color: #EFEFEF;
width: 100%;
height: 100%;
min-width: 1px;
overflow: auto;
min-width: 1024px;
overflow-y: auto;
min-height: 1px;
}
.up-section {
position: relative;
padding: 15px 15px 15px;
margin: 20px -10px 0 0;
margin: 20px 0 0 -15px;
background-color: #FFFFFF;
height: 277px;
}
@ -50,6 +50,11 @@ body {
margin-left: 5px;
}
.right-part {
padding-right: 0;
margin-right: -15px;
}
.thumbnail {
margin-top: 10px;
display: inline-block;
@ -57,16 +62,21 @@ body {
padding: 2px;
box-shadow: none;
width: 30%;
vertical-align: top;
}
.down-section {
position: relative;
padding: 15px 15px 15px;
margin: 20px -10px 0 0;
margin: 20px -15px 0 -15px;
background-color: #FFFFFF;
height: 350px;
}
.down-section-left {
margin-right: 0;
}
.down-section ul {
padding: 0;
margin-left: 30px;

17
static/resources/css/project.css
View File

@ -5,8 +5,8 @@
.extend-height {
height: 100%;
min-height: 1px;
min-width: 1024px;
padding-left: 0;
padding-right: 0;
}
.section {
@ -14,8 +14,8 @@
margin-top: 20px;
background-color: #FFFFFF;
height: 100%;
min-height: 640px;
width: 100%;
min-height: 579px;
}
.search-pane {
@ -53,6 +53,11 @@
min-height: 1px;
}
.tab-pane {
min-height: 1px;
max-height: 1px;
}
.sub-pane {
margin: 15px;
min-height: 380px;
@ -60,11 +65,11 @@
}
.well-custom {
position: absolute;
width: 1064px;
width: 100%;
background-color: #f5f5f5;
background-image: none;
margin: 0 10px;
z-index: 10;
}

8
static/resources/css/repository.css
View File

@ -129,10 +129,12 @@
}
.alert-custom {
position: fixed;
bottom: 24px;
position: relative;
bottom: 42px;
z-index: 99;
width: 1110px;
width: 1140px;
margin-left: auto;
margin-right: auto;
padding: 10px;
background-color: #f2dede;
background-image: none;

3
static/resources/js/components/element-height/element-height.inspector.js
View File

@ -30,9 +30,10 @@
scope.$watch(scope.getDimension, function(current) {
if(current) {
var h = current.h;
element.css({'height': (h - scope.subsHeight) + 'px'});
element.find('.section').css({'height': (h - scope.subsHeight - scope.subsSection) + 'px'});
element.find('.sub-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane) + 'px'});
element.find('.tab-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane) + 'px'});
element.find('.tab-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane - scope.subsSection -100) + 'px'});
// var subPaneHeight = element.find('.sub-pane').height();
// element.find('.table-body-container').css({'height': (subPaneHeight - scope.subsTblBody) + 'px'});
}

4
static/resources/js/components/log/advanced-search.directive.js
View File

@ -111,7 +111,7 @@
}
}
function advancedSearch() {
function advancedSearch(I18nService) {
var directive = {
'restrict': 'E',
'templateUrl': '/static/resources/js/components/log/advanced-search.directive.html',
@ -133,7 +133,7 @@
function link(scope, element, attrs, ctrl) {
element.find('.datetimepicker').datetimepicker({
locale: 'en-US',
locale: I18nService().getCurrentLanguage(),
ignoreReadonly: true,
format: 'L',
showClear: true

2
static/resources/js/components/replication/create-policy.directive.html
View File

@ -11,7 +11,7 @@
<div class="col-md-12" ng-show="vm.toggleErrorMessage">
<div class="pull-right clearfix" style="padding: 5px 10px;"><a href="javascript:void(0);" ng-click="vm.closeError()"><span class="glyphicon glyphicon-remove"></span></a></div>
<div class="bg-danger dialog-message">
<ul class="list-unstyled" style="color: red; margin: 0;" ng-repeat="msg in vm.errorMessages">
<ul class="list-unstyled" style="color: red; margin: 0;" ng-repeat="msg in vm.errorMessages track by $index">
<li>// msg //</li>
</ul>
</div>

8
static/resources/js/components/replication/create-policy.directive.js
View File

@ -139,6 +139,7 @@
};
if(vm.checkedAddTarget){
CreateDestinationService(target.name, target.endpoint, target.username, target.password)
.success(createDestinationSuccess)
.error(createDestinationFailed);
@ -172,7 +173,6 @@
if(vm.targetEditable) {
vm.policy.targetId = vm1.selection.id;
saveDestination();
saveOrUpdatePolicy();
}
}
@ -278,11 +278,7 @@
}
function updateReplicationPolicyFailed(data, status) {
vm.saveTIP = false;
if(status === 409) {
vm.errorMessages.push($filter('tr')('policy_already_exists'));
}else{
vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data);
}
vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data);
console.log('Failed to update replication policy.');
}
function createDestinationSuccess(data, status, headers) {

4
static/resources/js/components/replication/list-replication.directive.js
View File

@ -212,7 +212,7 @@
}
function listReplication($timeout) {
function listReplication($timeout, I18nService) {
var directive = {
'restrict': 'E',
'templateUrl': '/static/resources/js/components/replication/list-replication.directive.html',
@ -296,7 +296,7 @@
}
element.find('.datetimepicker').datetimepicker({
locale: 'en-US',
locale: I18nService().getCurrentLanguage(),
ignoreReadonly: true,
format: 'L',
showClear: true

12
static/resources/js/layout/index/index.controller.js
View File

@ -33,12 +33,12 @@
indexDesc +
'</p>' +
'<ul>' +
'<li class="long-line">▪︎ ' + indexDesc1 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc2 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc3 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc4 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc5 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc6 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc1 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc2 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc3 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc4 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc5 + '</li>' +
'<li class="long-line">▪︎ ' + indexDesc6 + '</li>' +
'</ul>');
var emitInfo = {
'contentType': 'text/html',

2
views/dashboard.htm
View File

@ -10,7 +10,7 @@
</div>
</div>
<div class="col-xs-8 col-md-8">
<div class="up-section">
<div class="up-section right-part">
<top-repository custom-body-height="vm.customBodyHeight"></top-repository>
</div>
</div>

4
views/index.htm
View File

@ -13,7 +13,7 @@
</div>
</div>
<div class="col-md-8">
<div class="up-section">
<div class="up-section right-part">
<h4 class="page-header display-inline-block">// 'its_easy_to_get_started' | tr //</h4>
<div class="page-content">
<div style="margin-left: auto; margin-right: auto; width: 100%;">
@ -39,7 +39,7 @@
<div class="row">
<div class="col-md-4">
<div class="row">
<div class="down-section">
<div class="down-section down-section-left">
<h4 class="page-header underlined">// 'why_use_harbor' | tr //</h4>
<p class="page-content text-justify" style="line-height: 2em; height: 70%;">
// 'index_desc' | tr //

1
views/repository.htm
View File

@ -26,7 +26,6 @@
<list-log ng-if="vm.target === 'logs'" section-height="vm.sectionHeight" target="vm.target" publicity="vm.publicity"></list-log>
</div>
</div>
<dismissable-alerts></dismissable-alerts>
</div>
</div>
</div>

1
views/sections/footer-content.htm
View File

@ -1,3 +1,4 @@
<dismissable-alerts></dismissable-alerts>
<div class="footer-absolute footer" ng-controller="FooterController as vm">
<p>// 'copyright' | tr // © 2015-2016 VMware, Inc. // 'all_rights_reserved' | tr //</p>
</div>