Author: olamy
Date: Mon Feb 13 15:57:54 2012
New Revision: 1243570
URL: http://svn.apache.org/viewvc?rev=1243570&view=rev
Log:
fix hidden div place in the table to prevent weird screen issue
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=1243570&r1=1243569&r2=1243570&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:57:54 2012
@@ -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(
{
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=1243570&r1=1243569&r2=1243570&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:57:54 2012
@@ -72,15 +72,17 @@
<tr data-bind="css:{ 'modified': row.modified()}">
<td>${row.sourceRepoId()}</td>
<td>${row.targetRepoId()}</td>
- <td><img src="images/utilities-system-monitor-22-22.png"
id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
+ <td>
+ <img src="images/utilities-system-monitor-22-22.png"
id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
- data-bind="event: { mouseover: function(){
showSettings(row)},}"></td>
+ data-bind="event: { mouseover: function(){
showSettings(row)},}">
+ <div
id="proxy-connectors-grid-remoterepo-settings-content-${row.sourceRepoId()}-${row.targetRepoId()}"
+ style="display:none"></div>
+ </td>
<td>
<a data-bind="click: function(){ editProxyConnector(row)}" href="#">
${$.i18n.prop('edit')}
</a>
- <div
id="proxy-connectors-grid-remoterepo-settings-content-${row.sourceRepoId()}-${row.targetRepoId()}"
- style="display:none"></div>
</td>
<td>
<a href="#" data-bind="click: function(){ deleteProxyConnector(row)}">
