cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/4.2 to 21761d8
Date Tue, 30 Jul 2013 18:10:20 GMT
Updated Branches:
  refs/heads/4.2 50046c577 -> 21761d8f2


CLOUDSTACK-3531: Add isrouting checkbox to register template dialog


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21761d8f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21761d8f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21761d8f

Branch: refs/heads/4.2
Commit: 21761d8f211b8a570ff6822a5dee995047963b0c
Parents: 50046c5
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Jul 30 11:09:47 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Jul 30 11:10:06 2013 -0700

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties |  1 +
 ui/dictionary.jsp                                    |  1 +
 ui/scripts/sharedFunctions.js                        |  1 +
 ui/scripts/templates.js                              | 11 +++++++++++
 4 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21761d8f/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 3e775e0..342a134 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.routing=Routing
 label.about=About
 label.app.name=CloudStack
 label.about.app=About CloudStack

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21761d8f/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index eec0264..a323bff 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'label.routing': '<fmt:message key="label.routing" />',
 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters"
/>',
 'label.about': '<fmt:message key="label.about" />',
 'label.about.app': '<fmt:message key="label.about.app" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21761d8f/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 6c1b009..8ddaeaf 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -797,6 +797,7 @@ cloudStack.preFilter = {
         if (isAdmin()) {
             args.$form.find('.form-item[rel=isPublic]').css('display', 'inline-block');
             args.$form.find('.form-item[rel=isFeatured]').css('display', 'inline-block');
+            args.$form.find('.form-item[rel=isrouting]').css('display', 'inline-block');
         } else {
             if (g_userPublicTemplateEnabled == "true") {
                 args.$form.find('.form-item[rel=isPublic]').css('display', 'inline-block');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21761d8f/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 40ca2e6..70f4755 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -384,6 +384,11 @@
                                         docID: 'helpRegisterTemplateFeatured',
                                         isBoolean: true,
                                         isHidden: true
+                                    },
+                                    isrouting: {
+                                        label: 'label.routing',
+                                        isBoolean: true,
+                                        isHidden: true
                                     }
                                 }
                             },
@@ -414,6 +419,12 @@
                                     });
                                 }
 
+                                if (args.$form.find('.form-item[rel=isrouting]').is(':visible'))
{
+                                    $.extend(data, {
+                                        isrouting: (args.data.isrouting === 'on')
+                                    });
+                                }
+
                                 //VMware only (starts here)
                                 if (args.$form.find('.form-item[rel=rootDiskControllerType]').css("display")
!= "none" && args.data.rootDiskControllerType != "") {
                                     $.extend(data, {


Mime
View raw message