From 256a1163491f107a0c30f0708f3a827d0af14d0e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 30 Jan 2012 09:38:17 +0000 Subject: [PATCH] [MRM-1576] add layout for proxy connectors screen. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1237576 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/index.html | 1 + .../src/main/webapp/js/archiva/main-tmpl.js | 6 ++- .../main/webapp/js/archiva/network-proxies.js | 4 -- .../webapp/js/archiva/proxy-connectors.js | 48 +++++++++++++++++++ .../webapp/js/archiva/templates/menu.html | 3 ++ .../archiva/templates/proxy-connectors.html | 23 +++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html index 7581bfdd9..a3cad210a 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html @@ -78,6 +78,7 @@ $.ajax( .script("archiva/main-tmpl.js").wait() .script("archiva/repositories.js").wait() .script("archiva/network-proxies.js").wait() + .script("archiva/proxy-connectors.js").wait() .script("redback/operation.js").wait() .script("redback/redback-tmpl.js").wait() .script("bootstrap-tabs.js") diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js index a49d1d35d..bfd0c8fb8 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js @@ -20,8 +20,9 @@ require(["text!archiva/templates/menu.html?"+timestampNoCache(),"text!archiva/te "text!archiva/templates/message.html?"+timestampNoCache(),"text!archiva/templates/modal.html?"+timestampNoCache(), "text!archiva/templates/grids-generics.html?"+timestampNoCache(), "text!archiva/templates/repositories.html?"+timestampNoCache(), - "text!archiva/templates/network-proxies.html?"+timestampNoCache()], - function(menu,topbar,message,modal,grids_generics,repositories,network_proxies) { + "text!archiva/templates/network-proxies.html?"+timestampNoCache(), + "text!archiva/templates//proxy-connectors.html?"+timestampNoCache()], + function(menu,topbar,message,modal,grids_generics,repositories,network_proxies,proxies_connectors) { // template loading $.tmpl( menu ).appendTo("#html-fragments"); @@ -31,6 +32,7 @@ require(["text!archiva/templates/menu.html?"+timestampNoCache(),"text!archiva/te $("#html-fragments").append(grids_generics); $("#html-fragments").append(repositories); $("#html-fragments").append(network_proxies); + $("#html-fragments").append(proxies_connectors); $.log("main-tmpl.js menu loaded"); } ); \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js index 46cbb03fb..6f93853ff 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js @@ -19,10 +19,6 @@ $(function() { - displayNetworkProxies=function(){ - - } - NetworkProxy=function(id,protocol,host,port,username,password){ //private String id; this.id = ko.observable(id); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js new file mode 100644 index 000000000..e608884de --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +$(function() { + + ProxyConnector=function(sourceRepoId,targetRepoId,proxyId,blackListPatterns,whiteListPatterns,policies,properties, + disabled,order){ + //private String sourceRepoId; + this.sourceRepoId=ko.observable(sourceRepoId); + //private String targetRepoId; + this.targetRepoId=ko.observable(targetRepoId); + //private String proxyId; + this.proxyId=ko.observable(proxyId); + //private List blackListPatterns; + this.blackListPatterns=ko.observableArray(blackListPatterns); + //private List whiteListPatterns; + this.whiteListPatterns=ko.observableArray(whiteListPatterns); + //private Map policies; + + //private Map properties; + + //private boolean disabled = false; + this.disabled=ko.observable(disabled); + //private int order = 0; + this.order=ko.observable(order); + } + + displayProxyConnectors=function(){ + $("#main-content").html($("#proxyConnectorsMain").tmpl()); + $("#main-content").append(smallSpinnerImg()); + } + +}); \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html index 003006f6e..fd4a397d5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html @@ -30,5 +30,8 @@
  • ${$.i18n.prop('menu.network-proxies')}
    • +
  • + ${$.i18n.prop('menu.proxy-connectors')} +
    • diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html new file mode 100644 index 000000000..e8fc03fda --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html @@ -0,0 +1,23 @@ + + \ No newline at end of file -- 2.39.5