svn commit: r1382942 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/repositories.js archiva/utils.js templates/archiva/repositories.html

[ol...@apache.org]

Author: olamy
Date: Mon Sep 10 15:32:00 2012
New Revision: 1382942

URL: http://svn.apache.org/viewvc?rev=1382942&view=rev
Log:
add a method to call activatePopoverDoc which will select class from #main-content and activate:
* popover-doc: popover on click and destroy on mouseover.
* tooltip-doc: tooltip with hover trigger.

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.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/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1382942&r1=1382941&r2=1382942&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Mon Sep 10 15:32:00 2012
@@ -177,6 +177,10 @@ define("archiva.repositories",["jquery",
 
     this.availableLayouts = window.managedRepositoryTypes;
 
+    showCronExpressionDoc=function(){
+      //$.log("showCronExpressionDoc") ;
+    }
+
     this.save=function(){
       var valid = $("#main-content").find("#managed-repository-edit-form").valid();
       if (valid==false) {
@@ -308,6 +312,7 @@ define("archiva.repositories",["jquery",
       activateManagedRepositoryEditTab();
       mainContent.find("#managed-repository-edit-li a").html($.i18n.prop('edit'));
       activateManagedRepositoryFormValidation();
+      activatePopoverDoc();
     }
 
     scanNow=function(managedRepository){
@@ -946,6 +951,7 @@ define("archiva.repositories",["jquery",
         var viewModel = new ManagedRepositoryViewModel(new ManagedRepository(),false,managedRepositoriesViewModel);
         ko.applyBindings(viewModel,mainContent.find("#managed-repository-edit").get(0));
         activateManagedRepositoryFormValidation();
+        activatePopoverDoc();
       }
       if ($(e.target).attr("href")=="#managed-repositories-view") {
         mainContent.find("#managed-repository-edit-li a").html($.i18n.prop("add"));

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1382942&r1=1382941&r2=1382942&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Mon Sep 10 15:32:00 2012
@@ -440,6 +440,20 @@ require(["jquery","jquery.tmpl","i18n"],
     return str.replace(/\./g,"\\\.");
   }
 
+  activatePopoverDoc=function(){
+    var mainContent=$("#main-content");
+    mainContent.find(".popover-doc" ).popover({html: true, trigger: 'manual'});
+    mainContent.find(".popover-doc" ).on("click",function(){
+      $(this).popover("show");
+    });
+
+    mainContent.find(".popover-doc" ).mouseover(function(){
+      $(this).popover("destroy");
+    });
+
+    mainContent.find(".tooltip-doc" ).tooltip({html: true, trigger: 'hover'});
+  }
+
   //-----------------------------------------
   // extends jquery tmpl to support var def
   //-----------------------------------------

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=1382942&r1=1382941&r2=1382942&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 Mon Sep 10 15:32:00 2012
@@ -207,6 +207,11 @@
           <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
           <div class="controls">
             <input type="text" id="cronExpression" class="required" name="cronExpression" size="40" data-bind="value: managedRepository.cronExpression"/>
+            <a class="btn btn-warning btn-mini popover-doc" id="rowcount-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">