archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1386520 - in /archiva/trunk: archiva-docs/src/site/apt/adminguide/ archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/ archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/
Date Mon, 17 Sep 2012 09:15:08 GMT
Author: olamy
Date: Mon Sep 17 09:15:07 2012
New Revision: 1386520

URL: http://svn.apache.org/viewvc?rev=1386520&view=rev
Log:
fix popover doc for remote repository

Modified:
    archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt
    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/templates/archiva/repositories.html

Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt?rev=1386520&r1=1386519&r2=1386520&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/repositories.apt Mon Sep 17 09:15:07
2012
@@ -4,7 +4,7 @@
  Maria Odea Ching
  Olivier Lamy
  ------
- 2011-09-29
+ 2012-09-17
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one

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=1386520&r1=1386519&r2=1386520&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 17 09:15:07 2012
@@ -728,6 +728,7 @@ define("archiva.repositories",["jquery",
             activateRemoteRepositoryEditTab();
             mainContent.find("#remote-repository-edit-li a").html($.i18n.prop('edit'));
             activateRemoteRepositoryFormValidation();
+            activatePopoverDoc();
           }
       })
 
@@ -979,6 +980,7 @@ define("archiva.repositories",["jquery",
               viewModel.networkProxies(mapNetworkProxies(data));
               ko.applyBindings(viewModel,$("#main-content" ).find("#remote-repository-edit").get(0));
               activateRemoteRepositoryFormValidation();
+              activatePopoverDoc();
             }
         })
       }

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=1386520&r1=1386519&r2=1386520&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 17 09:15:07 2012
@@ -362,6 +362,7 @@
         <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 @@
           <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">



Mime
View raw message