From e4022bac6631bcf7fd5a24ba0e2fc2c94d428739 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 17 Sep 2012 09:15:07 +0000
Subject: [PATCH] fix popover doc for remote repository

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1386520 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-docs/src/site/apt/adminguide/repositories.apt       | 2 +-
 .../src/main/webapp/js/archiva/repositories.js              | 2 ++
 .../src/main/webapp/js/templates/archiva/repositories.html  | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/archiva-docs/src/site/apt/adminguide/repositories.apt b/archiva-docs/src/site/apt/adminguide/repositories.apt
index 83a8c5a5f..33426601f 100644
--- a/archiva-docs/src/site/apt/adminguide/repositories.apt
+++ b/archiva-docs/src/site/apt/adminguide/repositories.apt
@@ -4,7 +4,7 @@
  Maria Odea Ching
  Olivier Lamy
  ------
- 2011-09-29
+ 2012-09-17
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index 5a8b91c19..92324d83f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -728,6 +728,7 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery
             activateRemoteRepositoryEditTab();
             mainContent.find("#remote-repository-edit-li a").html($.i18n.prop('edit'));
             activateRemoteRepositoryFormValidation();
+            activatePopoverDoc();
           }
       })
 
@@ -979,6 +980,7 @@ define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery
               viewModel.networkProxies(mapNetworkProxies(data));
               ko.applyBindings(viewModel,$("#main-content" ).find("#remote-repository-edit").get(0));
               activateRemoteRepositoryFormValidation();
+              activatePopoverDoc();
             }
         })
       }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index fa4fb6e05..630b25b6f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -362,6 +362,7 @@ <h2>POM Snippet</h2></div>
         <th>${$.i18n.prop('edit')}</th>
         <th>${$.i18n.prop('delete')}</th>
         <th>${$.i18n.prop('modified')}</th>
+        <th>${$.i18n.prop('description')}</th>
         <th>${$.i18n.prop('remoterepository.downloadremoteindex')}</th>
       </tr>
   </thead>
@@ -483,6 +484,11 @@ <h2>POM Snippet</h2></div>
           <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
           <div class="controls">
             <input type="text" id="cronExpression" name="cronExpression" size="40" data-bind="value: remoteRepository.cronExpression"/>
+            <a class="btn btn-warning btn-mini popover-doc" id="cronExpression-info-button"
+               data-original-title="${$.i18n.prop('cronExpression.help.title')}"
+               data-content="${$.i18n.prop('cronExpression.help.content')}">
+                <i class="icon-question-sign icon-white"></i>
+            </a>
           </div>
         </div>
         <div class="control-group">