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 16:58:25 UTC
svn commit: r1243571 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
proxy-connectors.js templates/proxy-connectors.html
Author: olamy
Date: Mon Feb 13 15:58:24 2012
New Revision: 1243571
URL: http://svn.apache.org/viewvc?rev=1243571&view=rev
Log:
add proxy connector settings popover in order edit tab
Modified:
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/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=1243571&r1=1243570&r2=1243571&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 15:58:24 2012
@@ -346,27 +346,33 @@ $(function() {
}
getProxyConnector=function(sourceRepoId,targetRepoId){
- var proxyConnector=$.grep(self.proxyConnectors(),
+ var proxyConnectors=$.grep(self.proxyConnectors(),
function(proxyConnector,idx){
return proxyConnector.sourceRepoId()==sourceRepoId
- && proxyConnector.targetRepoId==targetRepoId;
+ && proxyConnector.targetRepoId()==targetRepoId;
}
);
- var res = ($.isArray(proxyConnector) && proxyConnector.length>0) ? proxyConnector[0]:new ProxyConnector();
+ var res = ($.isArray(proxyConnectors) && proxyConnectors.length>0) ? proxyConnectors[0]:new ProxyConnector();
return res;
}
- showSettings=function(proxyConnector,targetContentStartId, targetImgStartId){
- //proxyConnector=getProxyConnector(proxyConnector.sourceRepoId(),proxyConnector.targetRepoId());
- var targetContent = $( (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
- +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId());
+ showSettings=function(proxyConnector,targetContentStartId, targetImgStartId,theProxyConnectorsViewModel){
+ $.log("proxyConnector:"+proxyConnector.sourceRepoId()+":"+proxyConnector.targetRepoId());
+ var id = (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
+ +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId();
+
+ var targetContent = $(id);
targetContent.html("");
- targetContent.append($("#proxy-connectors-remote-settings-popover-tmpl")
- .tmpl({
- proxyConnectorsViewModel: self,
- proxyConnector:ko.toJS(proxyConnector)
- }));
+ var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl")
+ .tmpl({
+ proxyConnectorsViewModel: self,
+ proxyConnector:ko.toJS(proxyConnector)
+ } ).html();
+
+ $.log("tmpl:"+tmplHtml);
+ targetContent.append(tmplHtml);
+ $.log("showSettings#targetContent:"+id+","+targetContent.length+","+targetContent.attr("id")+",html:"+targetContent.html());
var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-")
+proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId());
targetImg.attr("data-content",targetContent.html());
@@ -381,6 +387,11 @@ $(function() {
}
+ this.displaySettings=function(sourceRepoId,targetRepoId,targetContentStartId, targetImgStartId){
+ var proxyConnector=getProxyConnector(sourceRepoId,targetRepoId);
+ showSettings(proxyConnector,targetContentStartId,targetImgStartId);
+ }
+
this.findPolicyInformationName=function(id){
for(i=0;i<self.policyInformations().length;i++){
if (id==self.policyInformations()[i].id()){
@@ -484,6 +495,13 @@ $(function() {
self.proxyConnectorsViewModel.updateModifiedProxyConnectors();
}
+ displaySettings=function(sourceRepoId,targetRepoId){
+ $.log("ProxyConnectorEditOrderViewModel#showSettings:"+sourceRepoId+"-"+targetRepoId);
+ self.proxyConnectorsViewModel.displaySettings(sourceRepoId,targetRepoId,
+ "#proxy-connectors-order-remoterepo-settings-content-",
+ "#proxy-connectors-order-remoterepo-settings-edit-");
+ }
+
}
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=1243571&r1=1243570&r2=1243571&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 15:58:24 2012
@@ -254,6 +254,13 @@
<div class="row-fluid">
<div class="span1">
<img src="images/system-software-update-32-32.png"/>
+ <br/>
+ <img src="images/utilities-system-monitor-22-22.png"
+ id="proxy-connectors-order-remoterepo-settings-edit-${sourceRepoId()}-${targetRepoId()}"
+ data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+ data-bind="event: { mouseover: function(){ displaySettings(sourceRepoId(),targetRepoId())},}">
+ <div id="proxy-connectors-order-remoterepo-settings-content-${sourceRepoId()}-${targetRepoId()}"
+ style="display:none"></div>
</div>
<div class="span6 pull-left">
<blockquote>