You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/11 14:11:09 UTC
svn commit: r1324724 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/main.js
Author: olamy
Date: Wed Apr 11 12:11:09 2012
New Revision: 1324724
URL: http://svn.apache.org/viewvc?rev=1324724&view=rev
Log:
add loading modal when loading application on start page
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1324724&r1=1324723&r2=1324724&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Wed Apr 11 12:11:09 2012
@@ -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">×</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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1324724&r1=1324723&r2=1324724&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Wed Apr 11 12:11:09 2012
@@ -340,6 +340,7 @@ function() {
.appendTo( ul );
};
updateAppearanceToolBar();
+
}