summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-04-25 13:34:11 +0000
committerOlivier Lamy <olamy@apache.org>2012-04-25 13:34:11 +0000
commit5a2f89785d4dd59d406f8bdaf2bd17d5fece421d (patch)
treefd2fe6d74ee06e933acac6be71922f0e1bd3154f /archiva-modules
parentddc56845b19a315c28f9fa42a55bde1f475ba8c0 (diff)
downloadarchiva-5a2f89785d4dd59d406f8bdaf2bd17d5fece421d.tar.gz
archiva-5a2f89785d4dd59d406f8bdaf2bd17d5fece421d.zip
add a better application loader
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1330285 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css23
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html11
2 files changed, 33 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
index ab0eb1aa9..b7827bde0 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
@@ -110,3 +110,26 @@ footer {
padding-bottom: 30px;
padding-top: 10px;
}
+
+
+/* CSS for loading message */
+#loadingDiv {
+ position: absolute;
+ left: 45%;
+ bottom: 50%;
+ z-index: 20001;
+ height: auto;
+ border: 1px solid #ccc;
+}
+#loadingDiv a {
+ color: #225588;
+}
+
+#loadingDiv .loading-indicator {
+ background: white;
+ color: #444;
+ font: bold 12px tahoma;
+ padding: 10px;
+ margin: 0;
+ height: auto;
+}
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 1f9d59cf0..8c95ebf02 100644
--- 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
@@ -29,7 +29,7 @@
<div class="span10 columns">
<div class="content">
<div id="user-messages"></div>
- <div id="main-content"><img src="images/medium-spinner.gif"/></div>
+ <div id="main-content"></div>
</div>
</div>
</div>
@@ -135,6 +135,7 @@
require(['order!domReady','archiva/main'],function (domReady) {
domReady.withResources(function () {
startArchivaApplication();
+ $("#loadingDiv").hide();
})
})
@@ -150,6 +151,14 @@
</script>
+
+<div id="loadingDiv">
+ <div class="loading-indicator">
+ <img src="img/loading.gif" />
+ <span id="loading-msg">Loading</span>
+ </div>
+</div>
+
<div id="dialog-spinner-modal" class="modal fade" style="display: block;">
<div class="modal-header">
<a class="close" href="#" data-dismiss="modal">&#215;</a>