From db106d08d7a37fae72cc25e570801898ab4532ee Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 30 Jan 2012 22:14:43 +0000
Subject: [PATCH] [MRM-1576] display settings in a popover.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1238041 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/archiva/i18n/default.properties    |  8 ++++-
 .../src/main/webapp/index.html                |  2 +-
 .../webapp/js/archiva/proxy-connectors.js     | 34 ++++++++++++++++---
 .../archiva/templates/proxy-connectors.html   | 31 +++++++++++++++++
 4 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index c739e0452..80155453e 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -23,6 +23,7 @@
 #default common
 id=id
 warning.not.undone.operation=WARNING: This operation can not be undone.
+none=none
 
 managedrepository.delete.content=Delete Content too ?
 
@@ -43,4 +44,9 @@ managedrepository.stats.newFileCount=New Files Found
 
 
 # remote repositories screen
-remoterepository.downloadremoteindex.now=Download Remote Index Now
\ No newline at end of file
+remoterepository.downloadremoteindex.now=Download Remote Index Now
+
+
+#proxy connector
+proxy-connectors.grid.remoterepo.settings.popover.title=Settings
+proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index 62a42ad6d..762200e10 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -18,7 +18,7 @@
 
 <div id="topbar-menu-container"></div>
 
-<div class="container-fluid" style="min-height: 400px">
+<div class="container-fluid" style="min-height: 450px">
   <div class="sidebar" id="sidebar-content"></div>
 
   <div class="content">
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 5cb613e2c..c1ca22454 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
@@ -98,7 +98,7 @@ $(function() {
                                         return repo.id()==id;
                                       }
                             );
-      return ($.isArray(managedRepository) && managedRepository.length>0) ?managedRepository[0]:new ManagedRepository();
+      return ($.isArray(managedRepository) && managedRepository.length>0) ? managedRepository[0]:new ManagedRepository();
     }
 
     getRemoteRepository=function(id){
@@ -107,11 +107,37 @@ $(function() {
                                         return repo.id()==id;
                                       }
                             );
-      return ($.isArray(remoteRepository) && remoteRepository.length>0) ?remoteRepository[0]:new RemoteRepository();
+      return ($.isArray(remoteRepository) && remoteRepository.length>0) ? remoteRepository[0]:new RemoteRepository();
     }
 
-    getProxyConnector=function(sourceRepoId,targetRepoId){
-      ici
+    this.getProxyConnector=function(sourceRepoId,targetRepoId){
+      var proxyConnector=$.grep(self.proxyConnectors(),
+                                      function(proxyConnector,idx){
+                                        return proxyConnector.sourceRepoId()==sourceRepoId
+                                            && proxyConnector.targetRepoId==targetRepoId;
+                                      }
+                                  );
+      return ($.isArray(proxyConnector) && proxyConnector.length>0) ? proxyConnector[0]:new ProxyConnector();
+    }
+
+    showSettings=function(sourceRepoId,targetRepoId){
+      //proxy-connectors-grid-remoterepo-settings-edit-internal-central
+      var targetImgId="#proxy-connectors-grid-remoterepo-settings-edit-"+sourceRepoId+"-"+targetRepoId;
+      //proxy-connectors.grid-remoterepo-settings-content-internal-central
+      var targetContentId="#proxy-connectors-grid-remoterepo-settings-content-"+sourceRepoId+"-"+targetRepoId;
+      $(targetContentId).html("");
+      $(targetContentId).append($("#proxy-connectors-remote-settings-popover-tmpl").tmpl(self.getProxyConnector(sourceRepoId,targetRepoId)));
+      $(targetImgId).attr("data-content",$(targetContentId).html());
+      $(targetImgId).popover(
+          {
+            placement: "left",
+            html: true,
+            title: "popover-title"
+          }
+      );
+
+      $(targetImgId).popover('show');
+
     }
 
     this.displayGrid=function(){
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 61192c540..a50422086 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
@@ -68,9 +68,40 @@
             <p>${targetRepoId}</p>
             <p>${getRemoteRepository(targetRepoId).name()}</p>
             <p>${getRemoteRepository(targetRepoId).url()}</p>
+            <p>
+              <a popover-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+                 data-bind="event: { mouseover: function(){ showSettings(val,targetRepoId)},}"
+                 id="proxy-connectors-grid-remoterepo-settings-edit-${val}-${targetRepoId}" href="#">
+                  ${$.i18n.prop('edit')}
+                 </a>
+              <div id="proxy-connectors-grid-remoterepo-settings-content-${val}-${targetRepoId}" style="display:none"></div>
+            </p>
           </blockquote>
           {{/each}}
       </td>
     </tr>
   {{/each}}
+</script>
+
+<script id='proxy-connectors-remote-settings-popover-tmpl' type='text/x-jquery-tmpl'>
+  <div>
+    {{if proxyId()}}
+      ${$.i18n.prop('proxy-connectors.remoterepo.settings.networkproxy')}: ${proxyId()}
+    {{else}}
+      ${$.i18n.prop('proxy-connectors.remoterepo.settings.networkproxy')}: ${$.i18n.prop('none')}
+    {{/if}}
+    <table>
+      <thead>
+        <th colspan="2">Policies</th>
+      </thead>
+      <tbody>
+        {{each policies().entry}}
+        <tr>
+          <td>${$value.key}</td>
+          <td>${$value.value}</td>
+        </tr>
+        {{/each}}
+      </tbody>
+    </table>
+  </div>
 </script>
\ No newline at end of file
-- 
2.39.5