x/kloudbuster
Code Issues Proposed changes

Merge "adjust default values in UI"

Browse Source
This commit is contained in:
Jenkins 2016-03-24 21:15:56 +00:00 committed by Gerrit Code Review
commit 3727636ac0
7 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kb_server/public/ui/scripts/scripts.js
View File

File diff suppressed because one or more lines are too long

55
kb_server/public/ui/scripts/vendor.js
View File

File diff suppressed because one or more lines are too long

2
kb_server/public/ui/styles/main.css
View File

File diff suppressed because one or more lines are too long

8
kb_server/public/ui/styles/vendor.css
View File

File diff suppressed because one or more lines are too long

8
kb_web/app/views/config.html
View File

@ -311,12 +311,12 @@
<div class="panel panel-default" style="margin: 0">
<div class="panel-body">
<md-radio-group ng-model="choose_disk_size1" ng-init="choose_disk_size1=0">
<md-radio-group ng-model="choose_disk_size1" ng-init="config.server.flavor.disk==0?choose_disk_size1=0:choose_disk_size1=1">
<md-radio-button value="0" ng-click="config.server.flavor.disk=20" class="md-primary" style="margin:5px">Use default root disk size</md-radio-button>
<md-radio-button value="1" class="md-primary" style="margin:5px">Use specific root disk size</md-radio-button>
</md-radio-group>
<md-content layout-padding ng-if="choose_disk_size1==1">
<md-content layout-padding ng-if="choose_disk_size1==1" ng-init="config.server.flavor.disk==0?config.server.flavor.disk=20:''">
<md-input-container class="col-md-6">
<label>Root Disk Size (GB)</label>
<input type="number" min="1" max="" step="" name="server_disk" id="server_disk"
@ -420,12 +420,12 @@
<div class="panel panel-default" style="margin: 0">
<div class="panel-body">
<md-radio-group ng-model="choose_disk_size2" ng-init="choose_disk_size2=0">
<md-radio-group ng-model="choose_disk_size2" ng-init="config.client.flavor.disk==0?choose_disk_size2=0:choose_disk_size2=1">
<md-radio-button value="0" ng-click="config.client.flavor.disk=20" class="md-primary" style="margin:5px">Use default root disk size</md-radio-button>
<md-radio-button value="1" class="md-primary" style="margin:5px">Use specific root disk size</md-radio-button>
</md-radio-group>
<md-content layout-padding ng-if="choose_disk_size2==1">
<md-content layout-padding ng-if="choose_disk_size2==1" ng-init="config.client.flavor.disk==0?config.client.flavor.disk=20:''">
<md-input-container class="col-md-6">
<label>Root Disk Size (GB)</label>
<input type="number" min="1" max="" step="" name="client_disk" id="client_disk"

7
kb_web/app/views/config_storage.html
View File

@ -129,15 +129,14 @@
</div>
</md-input-container>
</md-content>
<div class="panel panel-default" style="margin: 0">
<div class="panel-body">
<md-radio-group ng-model="choose_disk_size" ng-init="choose_disk_size=0">
<md-radio-button value="0" ng-click="config.client.flavor.disk=20" class="md-primary" style="margin:5px">Use default root disk size</md-radio-button>
<md-radio-group ng-model="choose_disk_size" ng-init="config.client.flavor.disk==0?choose_disk_size=0:choose_disk_size=1">
<md-radio-button value="0" ng-click="config.client.flavor.disk=0" class="md-primary" style="margin:5px">Use default root disk size</md-radio-button>
<md-radio-button value="1" class="md-primary" style="margin:5px">Use specific root disk size</md-radio-button>
</md-radio-group>
<md-content layout-padding ng-if="choose_disk_size==1">
<md-content layout-padding ng-if="choose_disk_size==1" ng-init="config.client.flavor.disk==0?config.client.flavor.disk=20:''">
<md-input-container class="col-md-6">
<label>Root Disk Size (GB)</label>
<input type="number" min="1" max="" step="" name="client_disk" id="client_disk"

3
kb_web/bower.json
View File

@ -32,5 +32,8 @@
"dist/js/bootstrap.js"
]
}
},
"resolutions": {
"angular": ">=1.3.0"
}
}