]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88b86ed)
add loading modal when loading application on start page
authorOlivier Lamy <olamy@apache.org>
Wed, 11 Apr 2012 12:11:09 +0000 (12:11 +0000)
committerOlivier Lamy <olamy@apache.org>
Wed, 11 Apr 2012 12:11:09 +0000 (12:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1324724 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html patch | blob | history
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js patch | blob | history

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 588802afedad3e0962f5d70e2944531f747729a7..5de43b3b6c3cd5d36eb5588ae3ef28e78b6cbe2f 100644 (file)
--- 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
@@ -12,12 +12,13 @@
   <script type="text/javascript" src="js/jquery-1.7.2.js"></script>
 
   <script type="text/javascript" src="js/require.1.0.7.js"></script>
+  <script type="text/javascript" src="js/bootstrap.2.0.2.js"></script>
 
   <title>Apache Archiva</title>
 
 </head>
 
-<body style="padding-top: 42px;">
+<body id="body_content" style="padding-top: 42px;">
 
 <div id="topbar-menu-container"></div>
 
@@ -48,7 +49,6 @@
 
 <script type="text/javascript">
 
-
     appendArchivaVersion=function(){
       return "_archivaVersion="+window.archivaRuntimeInfo.version;
     }
@@ -74,6 +74,9 @@
         cache: false,
         success:function(data){
 
+            window.modalLoading=$("#dialog-spinner-modal").modal();
+            window.modalLoading.modal('show');
+
             window.archivaDevMode=data.devMode;
             window.archivaJavascriptLog=data.javascriptLog;
             window.archivaRuntimeInfo=data;
@@ -136,6 +139,7 @@
                               require(['order!domReady','archiva/main'],function (domReady) {
                                   domReady.withResources(function () {
                                       startArchivaApplication();
+                                      window.modalLoading.modal('hide');
                                   })
                               })
 
@@ -151,5 +155,16 @@
 
 
 </script>
+<div id="dialog-spinner-modal" class="modal fade" style="display: block;">
+  <div class="modal-header">
+    <a class="close" href="#" data-dismiss="modal">&#215;</a>
+    <h3 id="dialog-spinner-modal-header-title">Apache Archiva Loading</h3>
+  </div>
+  <div class="modal-body">
+   <div id="dialog-spinner-modal-body-text" style="text-align: center">
+     <img width="80px" src="img/loading.gif"/>
+   </div>
+  </div>
+</div>
 </body>
 </html>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index dc5f778cea3570cacf5b649a21f058a24ee8e5fd..bb99f2c9f51682b9165caaae960c06f6f97c971e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -340,6 +340,7 @@ function() {
                                                                .appendTo( ul );
                                                };
     updateAppearanceToolBar();
+
   }
 
 
Apache Archiva Repository: https://github.com/apache/archiva