From 48a66ace6c8eff5a7563300e5759c110b9797054 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Thu, 22 Jan 2015 13:22:05 -0800
Subject: [PATCH] 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.

---
 ui/scripts/templates.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index e5d8df0127d..4fe09442c5e 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: {