Author: olamy
Date: Tue Aug 28 13:51:01 2012
New Revision: 1378137
URL: http://svn.apache.org/viewvc?rev=1378137&view=rev
Log:
use a static popover mode with button instead of mouseover which is ugly
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/templates/archiva/repositories.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=1378137&r1=1378136&r2=1378137&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
Tue Aug 28 13:51:01 2012
@@ -369,36 +369,30 @@ define("archiva.proxy-connectors",["jque
}
showSettings=function(proxyConnector,targetContentStartId,
targetImgStartId,theProxyConnectorsViewModel){
- var id =
(targetContentStartId?targetContentStartId:"#proxy-connectors-grid-remoterepo-settings-content-")
-
+proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId()
- .replace(/\./g,"\\\.");
-
+ $.log("showSettings");
+ }
- var targetContent = $(id);
- targetContent.html("");
+ hideSettings=function(proxyConnector){
+ $("#body_content" ).find(".popover" ).hide();
+ }
+ buildSettings=function(proxyConnector){
var tmplHtml = $("#proxy-connectors-remote-settings-popover-tmpl")
.tmpl({
proxyConnectorsViewModel: self,
proxyConnector:ko.toJS(proxyConnector)
} ).html();
- var targetImg =
$((targetImgStartId?targetImgStartId:"#proxy-connectors-grid-remoterepo-settings-edit-")
+ var targetImg = $(("#proxy-connectors-grid-remoterepo-settings-edit-")
+proxyConnector.sourceRepoId().replace(/\./g,"\\\.")+"-"+proxyConnector.targetRepoId().replace(/\./g,"\\\."));
- targetImg.attr("data-content",tmplHtml);
- targetImg.popover(
- {
- placement: "left",
- html: true
- }
- );
- targetImg.popover('show');
- }
- hideSettings=function(proxyConnector){
- $("#body_content" ).find(".popover" ).hide();
+ //targetImg.popover();
+
+ //targetImg.popover('show');
+
+ return tmplHtml;
}
this.displaySettings=function(sourceRepoId,targetRepoId,targetContentStartId,
targetImgStartId){
@@ -447,7 +441,11 @@ define("archiva.proxy-connectors",["jque
var mainContent = $("#main-content");
ko.applyBindings(this,mainContent.find("#proxy-connectors-view").get(0));
- removeSmallSpinnerImg("#main-content");
+ var
prxGrids=mainContent.find("[id^='proxy-connectors-grid-remoterepo-settings-edit-']");
+
+ $.log("prxGrids:"+prxGrids.length);
+ prxGrids.popover();
+ removeSmallSpinnerImg();
mainContent.find("#proxy-connectors-view-tabs
#proxy-connectors-view-tabs-a-network-proxies-grid").tab('show');
mainContent.find("#proxy-connectors-view-tabs").on('show', function (e) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1378137&r1=1378136&r2=1378137&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Tue Aug 28 13:51:01 2012
@@ -714,9 +714,12 @@
<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()}"
-
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
- data-bind="event: { mouseover: function(){
showSettings(row)},mouseout: function(){hideSettings(row)},}">
+ <a class="btn btn-info btn-mini"
id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
+
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+ data-content="${buildSettings(row)}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
+
</td>
<td>
<a data-bind="click: function(){ editProxyConnector(row)}" href="#">
