From: Olivier Lamy Date: Mon, 13 Feb 2012 15:57:54 +0000 (+0000) Subject: fix hidden div place in the table to prevent weird screen issue X-Git-Tag: archiva-1.4-M3~1300 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc5d74bd12506fd432f91f3f41a78923cb295fab;p=archiva.git fix hidden div place in the table to prevent weird screen issue git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1243570 13f79535-47bb-0310-9956-ffa450edef68 --- 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 index e8c03f751..9b8b13ee2 100644 --- 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 @@ -356,9 +356,9 @@ $(function() { return res; } - showSettings=function(proxyConnector){ + showSettings=function(proxyConnector,targetContentStartId, targetImgStartId){ //proxyConnector=getProxyConnector(proxyConnector.sourceRepoId(),proxyConnector.targetRepoId()); - var targetContent = $("#proxy-connectors-grid-remoterepo-settings-content-" + var targetContent = $( (targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-") +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId()); targetContent.html(""); targetContent.append($("#proxy-connectors-remote-settings-popover-tmpl") @@ -367,8 +367,8 @@ $(function() { proxyConnector:ko.toJS(proxyConnector) })); - var targetImg = $("#proxy-connectors-grid-remoterepo-settings-edit-"+proxyConnector.sourceRepoId() - +"-"+proxyConnector.targetRepoId()); + var targetImg = $((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-") + +proxyConnector.sourceRepoId()+"-"+proxyConnector.targetRepoId()); targetImg.attr("data-content",targetContent.html()); targetImg.popover( { 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 index 09e19650b..db7a441ac 100644 --- 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 @@ -72,15 +72,17 @@ ${row.sourceRepoId()} ${row.targetRepoId()} - + + data-bind="event: { mouseover: function(){ showSettings(row)},}"> + + ${$.i18n.prop('edit')} -