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/02/13 14:56:21 UTC
svn commit: r1243514 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
css/archiva.css js/archiva/proxy-connectors.js
js/archiva/templates/proxy-connectors.html
Author: olamy
Date: Mon Feb 13 13:56:21 2012
New Revision: 1243514
URL: http://svn.apache.org/viewvc?rev=1243514&view=rev
Log:
[MRM-1576] rewrite proxies connector page
magnify :-) remote repository ordering
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css?rev=1243514&r1=1243513&r2=1243514&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css Mon Feb 13 13:56:21 2012
@@ -48,4 +48,16 @@
.modified td{
border-top:2px solid #fbc7c6;
border:2px solid #fbc7c6;
+}
+
+.draggable-item {
+ cursor: move;
+}
+
+.network-proxy-remote-item{
+ margin-bottom: 12px;
+ min-height: 2px;
+ padding: 12px;
+ border: 2px dotted #ddd;
+ margin-left: 2em
}
\ No newline at end of file
Modified: 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=1243514&r1=1243513&r2=1243514&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Mon Feb 13 13:56:21 2012
@@ -282,7 +282,7 @@ $(function() {
return prx;
}
- updateModifiedProxyConnectors=function(){
+ this.updateModifiedProxyConnectors=function(){
var modifiedProxyConnectors = getModifiedProxyConnectors();
openDialogConfirm(function(){
@@ -405,7 +405,8 @@ $(function() {
var proxyConnectors=findProxyConnectorsWithSourceId(proxyConnector);
$.log("displayOrderEdit:"+proxyConnector.sourceRepoId()+",number:"+proxyConnectors.length);
- var proxyConnectorEditOrderViewModel=new ProxyConnectorEditOrderViewModel(proxyConnectors);
+ var managedRepository = getManagedRepository(proxyConnector.sourceRepoId());
+ var proxyConnectorEditOrderViewModel=new ProxyConnectorEditOrderViewModel(proxyConnectors,self,managedRepository);
ko.applyBindings(proxyConnectorEditOrderViewModel,$("#main-content #proxy-connector-edit-order").get(0));
activateProxyConnectorsEditOrderTab();
}
@@ -442,17 +443,20 @@ $(function() {
$("#proxy-connectors-view-tabs-a-network-proxies-grid").html($.i18n.prop("proxy-connectors.grid.tab.title"));
mainContent.find("#proxy-connectors-view-tabs-li-edit a").html($.i18n.prop("add"));
}
+ if ($(e.target).attr("href")=="#proxy-connectors-edit-order") {
+ activateProxyConnectorsEditOrderTab();
+ }
});
}
}
- ProxyConnectorEditOrderViewModel=function(proxyConnectors,proxyConnectorsViewModel){
+ ProxyConnectorEditOrderViewModel=function(proxyConnectors,proxyConnectorsViewModel,managedRepository){
var self=this;
this.proxyConnectors=ko.observableArray(proxyConnectors);
this.proxyConnectorsViewModel=proxyConnectorsViewModel;
-
+ this.managedRepository=managedRepository;
proxyConnectorMoved=function(arg){
$.log("proxyConnectorMoved:"+arg.sourceIndex+" to " + arg.targetIndex);
// if only 1 move just update two whereas update all with the new order
@@ -466,6 +470,20 @@ $(function() {
}
}
+ this.findRemoteRepository=function(id){
+ $.log("findRemoteRepository:"+id());
+ for(i=0;i<self.proxyConnectorsViewModel.remoteRepositories().length;i++){
+ if (self.proxyConnectorsViewModel.remoteRepositories()[i].id()==id()){
+ return self.proxyConnectorsViewModel.remoteRepositories()[i];
+ }
+ }
+ return null;
+ }
+
+ this.updateModifiedProxyConnectors=function(){
+ self.proxyConnectorsViewModel.updateModifiedProxyConnectors();
+ }
+
}
displayProxyConnectors=function(){
Modified: 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=1243514&r1=1243513&r2=1243514&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html Mon Feb 13 13:56:21 2012
@@ -41,10 +41,11 @@
<div id="proxy-connectorsPagination"></div>
</div>
<div id="proxy-connectors-edit" class="tab-pane"></div>
- <div id="proxy-connector-edit-order" class="tab-pane">
- <ul id="proxy-connector-edit-order-div"
+ <div id="proxy-connector-edit-order" class="tab-pane span8">
+ <div id="proxy-connector-edit-order-managed-repository-div" data-bind='template:{name:"proxy-connector-edit-order-managed-repository-tmpl"}'></div>
+ <div id="proxy-connector-edit-order-div"
data-bind="sortable: { template: 'proxy-connector-edit-order-tmpl', data: proxyConnectors,afterMove: proxyConnectorMoved}">
- </ul>
+ </div>
</div>
</div>
@@ -246,9 +247,34 @@
</script>
<script id="proxy-connector-edit-order-tmpl" type='text/html'>
- <li>
- <a href="#">
- ${sourceRepoId}-${targetRepoId}-${order}
- </a>
- </li>
-</script>
\ No newline at end of file
+ <div class="well draggable-item network-proxy-remote-item">
+ {{var remoteRepository=$parent.findRemoteRepository(targetRepoId)}}
+ <div class="row-fluid">
+ <div class="span1">
+ <img src="images/internet-web-browser.png"/>
+ </div>
+ <div class="span6 pull-left">
+ <p>${targetRepoId}</p>
+ <p>${remoteRepository.name()} (<a href="${remoteRepository.url()}" target="_blank">${remoteRepository.url()}</a>)</p>
+ <!--<p>${order}</p>-->
+ </div>
+ </div>
+ </div>
+</script>
+
+<script id="proxy-connector-edit-order-managed-repository-tmpl" type="text/html">
+ <div class="well row-fluid">
+ <div class="span6">
+ <p>${managedRepository.id}</p>
+ <p>${managedRepository.name}</p>
+ </div>
+ <div class="span2">
+ {{if proxyConnectorsViewModel.bulkSave()}}
+ <p>
+ <a data-bind="click: function(){updateModifiedProxyConnectors()}"
+ href="#" class="btn btn-warning">${$.i18n.prop('save.all')}</a></p>
+ {{/if}}
+ </div>
+ </div>
+</script>
+