You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2015/01/22 22:23:20 UTC
[1/2] git commit: updated refs/heads/volume-upload to 26acdd7
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload 0aded6b95 -> 26acdd7f6
volume-upload: volumes > (1) Shorten action label to make all items in header to fit into one line, otherwise search box will be pushed out of place. (2) Add dialog: move URL field to the top.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26acdd7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26acdd7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26acdd7f
Branch: refs/heads/volume-upload
Commit: 26acdd7f6c4ff458af9d54e4edafcc10789d1fd9
Parents: 48a66ac
Author: Jessica Wang <je...@apache.org>
Authored: Thu Jan 22 13:23:00 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Jan 22 13:23:08 2015 -0800
----------------------------------------------------------------------
ui/scripts/storage.js | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26acdd7f/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index c754e3c..bf832c2 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -68,7 +68,7 @@
actions: {
// Add volume
add: {
- label: 'label.add.volume',
+ label: 'Add',
preFilter: function(args) {
return !args.context.instances;
@@ -255,18 +255,25 @@
uploadVolume: {
isHeader: true,
- label: 'label.upload.volume',
+ label: 'Upload',
preFilter: function(args) {
return !args.context.instances;
},
messages: {
notification: function() {
- return 'label.upload.volume';
+ return 'Upload Volume from URL';
}
},
createForm: {
- title: 'label.upload.volume',
+ title: 'Upload Volume from URL',
fields: {
+ url: {
+ label: 'label.url',
+ docID: 'helpUploadVolumeURL',
+ validation: {
+ required: true
+ }
+ },
name: {
label: 'label.name',
validation: {
@@ -321,14 +328,7 @@
data: items
});
}
- },
- url: {
- label: 'label.url',
- docID: 'helpUploadVolumeURL',
- validation: {
- required: true
- }
- },
+ },
checksum: {
docID: 'helpUploadVolumeChecksum',
label: 'label.md5.checksum'
@@ -380,7 +380,7 @@
uploadVolumefromLocal: {
isHeader: true,
- label: 'Upload Volume from Local',
+ label: 'Upload from Local',
preFilter: function(args) {
return !args.context.instances;
},
@@ -445,7 +445,10 @@
fields: {
volumeFileUpload: {
label: 'local file',
- isFileUpload: true
+ isFileUpload: true,
+ validation: {
+ required: true
+ }
},
name: {
label: 'label.name',
[2/2] git commit: updated refs/heads/volume-upload to 26acdd7
Posted by je...@apache.org.
volume-upload: templates > (1) Shorten action label to make all items in header to fit into one line, otherwise search box will be pushed out of place. (2) Register Template dialog: move URL field to the top.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/48a66ace
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48a66ace
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48a66ace
Branch: refs/heads/volume-upload
Commit: 48a66ace6c8eff5a7563300e5759c110b9797054
Parents: 0aded6b
Author: Jessica Wang <je...@apache.org>
Authored: Thu Jan 22 13:22:05 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Jan 22 13:23:08 2015 -0800
----------------------------------------------------------------------
ui/scripts/templates.js | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48a66ace/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index e5d8df0..4fe0944 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -100,17 +100,24 @@
reorder: cloudStack.api.actions.sort('updateTemplate', 'templates'),
actions: {
add: {
- label: 'label.action.register.template',
+ label: 'Add',
messages: {
notification: function(args) {
- return 'label.action.register.template';
+ return 'Register Template from URL';
}
},
createForm: {
- title: 'label.action.register.template',
+ title: 'Register Template from URL',
docID: 'helpNetworkOfferingName',
preFilter: cloudStack.preFilter.createTemplate,
fields: {
+ url: {
+ label: 'label.url',
+ docID: 'helpRegisterTemplateURL',
+ validation: {
+ required: true
+ }
+ },
name: {
label: 'label.name',
docID: 'helpRegisterTemplateName',
@@ -124,14 +131,7 @@
validation: {
required: true
}
- },
- url: {
- label: 'label.url',
- docID: 'helpRegisterTemplateURL',
- validation: {
- required: true
- }
- },
+ },
zone: {
label: 'label.zone',
docID: 'helpRegisterTemplateZone',
@@ -582,7 +582,7 @@
uploadTemplateFromLocal: {
isHeader: true,
- label: 'Upload Template from Local',
+ label: 'Upload from Local',
messages: {
notification: function(args) {
return 'Upload Template from Local';
@@ -683,7 +683,10 @@
fields: {
templateFileUpload: {
label: 'local file',
- isFileUpload: true
+ isFileUpload: true,
+ validation: {
+ required: true
+ }
},
name: {