You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/30 10:38:17 UTC
svn commit: r1237576 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
./ js/archiva/ js/archiva/templates/
Author: olamy
Date: Mon Jan 30 09:38:17 2012
New Revision: 1237576
URL: http://svn.apache.org/viewvc?rev=1237576&view=rev
Log:
[MRM-1576] add layout for proxy connectors screen.
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1237576&r1=1237575&r2=1237576&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Mon Jan 30 09:38:17 2012
@@ -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")
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1237576&r1=1237575&r2=1237576&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js Mon Jan 30 09:38:17 2012
@@ -20,8 +20,9 @@ require(["text!archiva/templates/menu.ht
"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.ht
$("#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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1237576&r1=1237575&r2=1237576&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Mon Jan 30 09:38:17 2012
@@ -19,10 +19,6 @@
$(function() {
- displayNetworkProxies=function(){
-
- }
-
NetworkProxy=function(id,protocol,host,port,username,password){
//private String id;
this.id = ko.observable(id);
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1237576&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Mon Jan 30 09:38:17 2012
@@ -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<String> blackListPatterns;
+ this.blackListPatterns=ko.observableArray(blackListPatterns);
+ //private List<String> whiteListPatterns;
+ this.whiteListPatterns=ko.observableArray(whiteListPatterns);
+ //private Map<String, String> policies;
+
+ //private Map<String, String> 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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html?rev=1237576&r1=1237575&r2=1237576&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html Mon Jan 30 09:38:17 2012
@@ -30,5 +30,8 @@
<li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
<a href="#" id="menu-network-proxies-list-a" onclick="displayNetworkProxies()">${$.i18n.prop('menu.network-proxies')}</a>
</li>
+ <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+ <a href="#" id="menu-proxy-connectors-list-a" onclick="displayProxyConnectors()">${$.i18n.prop('menu.proxy-connectors')}</a>
+ </li>
</ul>
</div>
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1237576&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html Mon Jan 30 09:38:17 2012
@@ -0,0 +1,23 @@
+<!--
+ ~ 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.
+-->
+<script id="proxyConnectorsMain" type="text/x-jquery-tmpl">
+ <div class="page-header">
+ <h2>${$.i18n.prop('proxy-connectors.list')}</h2>
+ </div>
+</script>
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision