Updated Branches: refs/heads/master 6070a8b37 -> 4e3dc2622
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/4e3dc262 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e3dc262 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e3dc262 Branch: refs/heads/master Commit: 4e3dc2622d29c1ae941c7b16909b9e5279be2274 Parents: 6070a8b Author: Brian Federle <[email protected]> Authored: Tue Jul 30 11:09:47 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Jul 30 11:09:47 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/4e3dc262/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/4e3dc262/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/4e3dc262/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/4e3dc262/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, {
