From 92b2b98183420b4446093f9d628e724776c6e040 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 28 Dec 2012 21:41:00 +0000 Subject: [PATCH] format code git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426644 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/webapp/js/archiva/general-admin.js | 186 +++++++++--------- .../src/main/webapp/js/archiva/main.js | 30 +-- 2 files changed, 109 insertions(+), 107 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js index dbbbed316..4ae328a90 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js @@ -574,6 +574,100 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" } + //--------------------------- + // organisation/appearance configuration part + //--------------------------- + OrganisationInformation=function(name,url,logoLocation){ + this.name=ko.observable(name); + this.url=ko.observable(url); + this.logoLocation=ko.observable(logoLocation); + } + mapOrganisationInformation=function(data){ + return new OrganisationInformation(data.name, data.url, data.logoLocation); + } + mapOrganisationInformations=function(data){ + if (data!=null){ + return $.isArray(data)? $.map(data, function(item){ + return mapOrganisationInformation(item); + }):[mapOrganisationInformation(data)]; + } + } + activateOrganisationInformationFormValidation=function(){ + var validate = $("#main-content" ).find("#appearance-configuration-form-id") + .validate({ + rules: { + name: { + required: true + }, + url: { + required:true, + url:true + }, + logoLocation: { + required:false, + url:true + } + }, + showErrors: function(validator, errorMap, errorList) { + customShowError("#main-content #appearance-configuration-form-id", validator, errorMap, errorMap); + } + }); + } + OrganisationInformationViewModel=function(organisationInformation){ + activateOrganisationInformationFormValidation(); + this.organisationInformation=ko.observable(organisationInformation); + + this.save=function(){ + var mainContent=$("#main-content" ); + if (!mainContent.find("#appearance-configuration-form-id").valid()) { + return; + } + clearUserMessages(); + var userMessages=$("#user-messages"); + userMessages.html(mediumSpinnerImg()); + mainContent.find("#appearance-configuration-btn-save" ).button('loading'); + $.ajax("restServices/archivaServices/archivaAdministrationService/setOrganisationInformation", { + type: "POST", + contentType: "application/json", + data: ko.toJSON(this.organisationInformation), + dataType: "json", + success: function(data){ + displaySuccessMessage($.i18n.prop('appearance-configuration.updated')); + updateAppearanceToolBar(); + }, + error: function(data){ + displayErrorMessage($.i18n.prop('appearance-configuration.updating-error')); + }, + complete: function(){ + removeMediumSpinnerImg(userMessages); + mainContent.find("#appearance-configuration-btn-save" ).button('reset'); + } + }); + } + } + displayAppearanceConfiguration=function(){ + screenChange(); + var mainContent=$("#main-content"); + mainContent.html(mediumSpinnerImg()); + + $.ajax("restServices/archivaServices/archivaAdministrationService/getOrganisationInformation", { + type: "GET", + dataType: 'json', + success: function(data) { + mainContent.html($("#changeAppearance").tmpl()); + var organisationInformation=new OrganisationInformation(data.name,data.url,data.logoLocation); + var organisationInformationViewModel=new OrganisationInformationViewModel(organisationInformation); + ko.applyBindings(organisationInformationViewModel, mainContent.get(0)); + var validator = $("#main-content" ).find("#appearance-configuration-form-id") + .validate({ + showErrors: function(validator,errorMap,errorList) { + customShowError(mainContent.find("#appearance-configuration-form-id").get(0),validator,errorMap,errorMap); + } + }); + } + }); + } + //--------------------------- // UiConfiguration part //--------------------------- @@ -818,98 +912,6 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" displayServerTime(); } - //--------------------------- - // network configuration part - //--------------------------- - OrganisationInformation=function(name,url,logoLocation){ - this.name=ko.observable(name); - this.url=ko.observable(url); - this.logoLocation=ko.observable(logoLocation); - } - mapOrganisationInformation=function(data){ - return new OrganisationInformation(data.name, data.url, data.logoLocation); - } - mapOrganisationInformations=function(data){ - if (data!=null){ - return $.isArray(data)? $.map(data, function(item){ - return mapOrganisationInformation(item); - }):[mapOrganisationInformation(data)]; - } - } - activateOrganisationInformationFormValidation=function(){ - var validate = $("#main-content" ).find("#appearance-configuration-form-id").validate({ - rules: { - name: { - required: true - }, - url: { - required:true, - url:true - }, - logoLocation: { - required:false, - url:true - } - }, - showErrors: function(validator, errorMap, errorList) { - customShowError("#main-content #appearance-configuration-form-id", validator, errorMap, errorMap); - } - }) - } - OrganisationInformationViewModel=function(organisationInformation){ - activateOrganisationInformationFormValidation(); - this.organisationInformation=ko.observable(organisationInformation); - - this.save=function(){ - var mainContent=$("#main-content" ); - if (!mainContent.find("#appearance-configuration-form-id").valid()) { - return; - } - clearUserMessages(); - var userMessages=$("#user-messages"); - userMessages.html(mediumSpinnerImg()); - mainContent.find("#appearance-configuration-btn-save" ).button('loading'); - $.ajax("restServices/archivaServices/archivaAdministrationService/setOrganisationInformation", { - type: "POST", - contentType: "application/json", - data: ko.toJSON(this.organisationInformation), - dataType: "json", - success: function(data){ - displaySuccessMessage($.i18n.prop('appearance-configuration.updated')); - updateAppearanceToolBar(); - }, - error: function(data){ - displayErrorMessage($.i18n.prop('appearance-configuration.updating-error')); - }, - complete: function(){ - removeMediumSpinnerImg(userMessages); - mainContent.find("#appearance-configuration-btn-save" ).button('reset'); - } - }); - } - } - displayAppearanceConfiguration=function(){ - screenChange(); - var mainContent=$("#main-content"); - mainContent.html(mediumSpinnerImg()); - - $.ajax("restServices/archivaServices/archivaAdministrationService/getOrganisationInformation", { - type: "GET", - dataType: 'json', - success: function(data) { - mainContent.html($("#changeAppearance").tmpl()); - var organisationInformation=new OrganisationInformation(data.name,data.url,data.logoLocation); - var organisationInformationViewModel=new OrganisationInformationViewModel(organisationInformation); - ko.applyBindings(organisationInformationViewModel, mainContent.get(0)); - var validator = $("#main-content" ).find("#appearance-configuration-form-id").validate({ - showErrors: function(validator,errorMap,errorList) { - customShowError(mainContent.find("#appearance-configuration-form-id").get(0),validator,errorMap,errorMap); - } - }); - } - }); - } - //--------------------------- // report configuration page //--------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js index 653cb6590..e29bb008e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js @@ -219,30 +219,30 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa ]); this.administrationMenuItems = ko.observableArray([ { text : $.i18n.prop('menu.administration') , id: null}, - { text : $.i18n.prop('menu.repository.groups') , id: "menu-repository-groups-list-a" , href: "#repositorygroup" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryGroups()}}, - { text : $.i18n.prop('menu.repositories') , id: "menu-repositories-list-a" , href: "#repositorylist" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoriesGrid()}}, - { text : $.i18n.prop('menu.proxy-connectors') , id: "menu-proxy-connectors-list-a" , href: "#proxyconnectors" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayProxyConnectors()}}, + { text : $.i18n.prop('menu.repository.groups') , id: "menu-repository-groups-list-a" , href: "#repositorygroup" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryGroups()}}, + { text : $.i18n.prop('menu.repositories') , id: "menu-repositories-list-a" , href: "#repositorylist" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoriesGrid()}}, + { text : $.i18n.prop('menu.proxy-connectors') , id: "menu-proxy-connectors-list-a" , href: "#proxyconnectors" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayProxyConnectors()}}, { text : $.i18n.prop('menu.proxy-connectors-rules') , id: "menu.proxy-connectors-rules-list-a" , href: "#proxyconnectorsrules" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayProxyConnectorsRules()}}, - { text : $.i18n.prop('menu.network-proxies') , id: "menu-network-proxies-list-a" , href: "#networkproxies" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkProxies()}}, - { text : $.i18n.prop('menu.legacy-artifact-support') , id: "menu-legacy-support-list-a" , href: "#legacy" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayLegacyArtifactPathSupport()}}, - { text : $.i18n.prop('menu.repository-scanning') , id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning()}}, - { text : $.i18n.prop('menu.network-configuration') , id: "menu-network-configuration-list-a" , href: "#network" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkConfiguration()}}, - { text : $.i18n.prop('menu.system-status') , id: "menu-system-status-list-a" , href: "#status" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySystemStatus()}}, - { text : $.i18n.prop('menu.appearance-configuration') , id: "menu-appearance-list-a" , href: "#appearance" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayAppearanceConfiguration()}}, - { text : $.i18n.prop('menu.ui-configuration') , id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration()}}, - { text : $.i18n.prop('menu.reports') , id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage()}} + { text : $.i18n.prop('menu.network-proxies') , id: "menu-network-proxies-list-a" , href: "#networkproxies" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkProxies()}}, + { text : $.i18n.prop('menu.legacy-artifact-support') , id: "menu-legacy-support-list-a" , href: "#legacy" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayLegacyArtifactPathSupport()}}, + { text : $.i18n.prop('menu.repository-scanning') , id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning()}}, + { text : $.i18n.prop('menu.network-configuration') , id: "menu-network-configuration-list-a" , href: "#network" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayNetworkConfiguration()}}, + { text : $.i18n.prop('menu.system-status') , id: "menu-system-status-list-a" , href: "#status" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySystemStatus()}}, + { text : $.i18n.prop('menu.appearance-configuration') , id: "menu-appearance-list-a" , href: "#appearance" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayAppearanceConfiguration()}}, + { text : $.i18n.prop('menu.ui-configuration') , id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration()}}, + { text : $.i18n.prop('menu.reports') , id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage()}} ]); this.usersMenuItems = ko.observableArray([ { text : $.i18n.prop('menu.users') , id: null}, - { text : $.i18n.prop('menu.users.manage') , id: "menu-users-list-a", href: "#users" , redback: "{permissions: ['archiva-manage-users']}", func: function(){displayUsersGrid()}}, - { text : $.i18n.prop('menu.users.roles') , id: "menu-roles-list-a", href: "#roles" , redback: "{permissions: ['archiva-manage-users']}", func: function(){displayRolesGrid()}}, - { text : $.i18n.prop('menu.runtime-configuration') , id: "menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRuntimeConfiguration()}} + { text : $.i18n.prop('menu.users.manage') , id: "menu-users-list-a" , href: "#users" , redback: "{permissions: ['archiva-manage-users']}", func: function(){displayUsersGrid()}}, + { text : $.i18n.prop('menu.users.roles') , id: "menu-roles-list-a" , href: "#roles" , redback: "{permissions: ['archiva-manage-users']}", func: function(){displayRolesGrid()}}, + { text : $.i18n.prop('menu.runtime-configuration') , id: "menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRuntimeConfiguration()}} ]); this.docsMenuItems = ko.observableArray([ { text : $.i18n.prop('menu.docs') , id: null}, - { text : $.i18n.prop('menu.docs.rest') , id: "menu-docs-rest-list-a", href: "#docs-rest", target: "", func: function(){displayRestDocs()}}, + { text : $.i18n.prop('menu.docs.rest') , id: "menu-docs-rest-list-a" , href: "#docs-rest", target: "", func: function(){displayRestDocs()}}, { text : $.i18n.prop('menu.docs.users') , id: "menu-docs-users-list-a", href: "http://archiva.apache.org/docs/"+window.archivaRuntimeInfo.version, target: "_blank", func: function(){displayUsersDocs()}} ]); -- 2.39.5