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 <jessicaw...@apache.org> Authored: Thu Jan 22 13:22:05 2015 -0800 Committer: Jessica Wang <jessicaw...@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: {
