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/26 23:57:15 UTC
svn commit: r1236434 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/main-tmpl.js js/archiva/network-proxies.js
js/archiva/templates/menu.html js/archiva/templates/network-proxies.html
Author: olamy
Date: Thu Jan 26 22:57:15 2012
New Revision: 1236434
URL: http://svn.apache.org/viewvc?rev=1236434&view=rev
Log:
[MRM-1578] add layout
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.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/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=1236434&r1=1236433&r2=1236434&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 Thu Jan 26 22:57:15 2012
@@ -70,6 +70,7 @@ $.ajax(
.script("jquery.json-2.3.min.js").wait()
.script("archiva/main-tmpl.js").wait()
.script("archiva/repositories.js").wait()
+ .script("archiva/network-proxies.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=1236434&r1=1236433&r2=1236434&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 Thu Jan 26 22:57:15 2012
@@ -19,8 +19,9 @@
require(["text!archiva/templates/menu.html?"+timestampNoCache(),"text!archiva/templates/topbar.html?"+timestampNoCache(),
"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()],
- function(menu,topbar,message,modal,grids_generics,repositories) {
+ "text!archiva/templates/repositories.html?"+timestampNoCache(),
+ "text!archiva/templates/network-proxies.html?"+timestampNoCache()],
+ function(menu,topbar,message,modal,grids_generics,repositories,network_proxies) {
// template loading
$.tmpl( menu ).appendTo("#html-fragments");
@@ -29,6 +30,7 @@ require(["text!archiva/templates/menu.ht
$.tmpl( modal ).appendTo("#html-fragments");
$("#html-fragments").append(grids_generics);
$("#html-fragments").append(repositories);
+ $("#html-fragments").append(network_proxies);
$.log("main-tmpl.js menu loaded");
}
);
\ No newline at end of file
Added: 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=1236434&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Thu Jan 26 22:57:15 2012
@@ -0,0 +1,94 @@
+/*
+ * 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() {
+
+
+ displayNetworkProxies=function(){
+
+ }
+
+ NetworkProxy=function(id,protocol,host,port,username,password){
+ //private String id;
+ this.id = ko.observable(id);
+
+ //private String protocol = "http";
+ this.protocol=ko.observable(protocol);
+
+ //private String host;
+ this.host=ko.observable(host);
+
+ //private int port = 8080;
+ this.port=ko.observable(port);
+
+ //private String username;
+ this.username=ko.observable(username);
+
+ //private String password;
+ this.password=ko.observable(password);
+ }
+
+ NetworkProxyViewModel=function(networkProxy, update, networkProxiesViewModel){
+ this.update=update;
+ this.networkProxy=networkProxy;
+ this.networkProxiesViewModel=networkProxiesViewModel;
+ var self=this;
+
+ save=function(){
+
+ }
+
+ displayGrid=function(){
+
+ }
+ }
+
+ NetworkProxiesViewModel=function(){
+ this.networkProxies=ko.observableArray([]);
+
+ var self=this;
+
+ editNetworkProxy=function(networkProxy){
+
+ }
+
+ removeNetworkProxy=function(networkProxy){
+
+ }
+ }
+
+
+ displayNetworkProxies=function(){
+ var networkProxiesViewModel = new NetworkProxiesViewModel();
+ }
+
+ mapNetworkProxy=function(data){
+ if (data==null){
+ return null;
+ }
+ return new NetworkProxy(data.id,data.protocol,data.host,data.port,data.username,data.password);
+ }
+
+ mapNetworkProxies=function(data){
+ var mappedNetworkProxies = $.map(data.networkProxy, function(item) {
+ return mapNetworkProxy(item);
+ });
+ return mappedNetworkProxies;
+ }
+
+});
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.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=1236434&r1=1236433&r2=1236434&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 Thu Jan 26 22:57:15 2012
@@ -27,5 +27,8 @@
<li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
<a href="#" id="menu-repositories-list-a" onclick="displayRepositoriesGrid()">${$.i18n.prop('repositories.list')}</a>
</li>
+ <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+ <a href="#" id="menu-network-proxies-list-a" onclick="displayNetworkProxies()">${$.i18n.prop('repositories.list')}</a>
+ </li>
</ul>
</div>
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1236434&view=auto
==============================================================================
(empty)
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision