Fix UI mistakes

Buttons in modal to call correct btn class.
Help on 'row count' in report page to be displayed on left

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391086 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
index 2327b74fdeef2815f0dab9f619e242123e7c9b91..22a0f8ddcfc6a5f99e05ad01699511a39940234d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
@@ -757,7 +757,8 @@
 
                           <a class="btn btn-warning btn-mini" id="rowcount-info-button"
                                   data-original-title="${$.i18n.prop('report.statistics.rowCount.explanations-title')}"
-                                  data-content="${$.i18n.prop('report.statistics.rowCount.explanations')}">
+                                  data-content="${$.i18n.prop('report.statistics.rowCount.explanations')}"
+                                  data-placement="left" data-toggle="button">
                               <i class="icon-question-sign icon-white"></i>
                           </a>
                       </div>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
index e447e9a44cbe87078a0202428e781528764d0fd3..8389d23d0b1a3f67ce359aa8e10bac52f0533c8c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
@@ -25,8 +25,8 @@
    <p id="dialog-confirm-modal-body-text"></p>
   </div>
   <div class="modal-footer">
-    <a class="btn secondary" id="dialog-confirm-modal-cancel" href="#">${$.i18n.prop('cancel')}</a>
-    <a class="btn primary" id="dialog-confirm-modal-ok" href="#">${$.i18n.prop('ok')}</a>
+    <a class="btn btn-secondary" id="dialog-confirm-modal-cancel" href="#">${$.i18n.prop('cancel')}</a>
+    <a class="btn btn-primary" id="dialog-confirm-modal-ok" href="#">${$.i18n.prop('ok')}</a>
   </div>
 </div>
 
@@ -38,4 +38,4 @@
     <div class="modal-body" id="dialog-modal-merge-repo-body-text">>
     </div>
 
-</div>
\ No newline at end of file
+</div>