From: Olivier Lamy <olamy@apache.org>
Date: Mon, 21 May 2012 22:06:55 +0000 (+0000)
Subject: add small spinner when loading content
X-Git-Tag: archiva-1.4-M3~700
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=792ae88606fa249ea92117711f2781a4077aacea;p=archiva.git

add small spinner when loading content

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/directory.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/directory.png
deleted file mode 100755
index 784e8fa48..000000000
Binary files a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/directory.png and /dev/null differ
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder-closed.gif b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder-closed.gif
new file mode 100755
index 000000000..541107888
Binary files /dev/null and b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder-closed.gif differ
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder.gif b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder.gif
new file mode 100755
index 000000000..2b31631ca
Binary files /dev/null and b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder.gif differ
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder_open.png b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder_open.png
deleted file mode 100755
index 4e3548352..000000000
Binary files a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder_open.png and /dev/null differ
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css
index 01ff50e1e..073d1fdec 100755
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css
@@ -26,8 +26,8 @@ UL.jqueryFileTree A:hover {
 }
 
 /* Core Styles */
-.jqueryFileTree LI.directory { background: url(images/directory.png) left top no-repeat; }
-.jqueryFileTree LI.expanded { background: url(images/folder_open.png) left top no-repeat; }
+.jqueryFileTree LI.directory { background: url(images/folder-closed.gif) left top no-repeat; }
+.jqueryFileTree LI.expanded { background: url(images/folder.gif) left top no-repeat; }
 .jqueryFileTree LI.file { background: url(images/file.png) left top no-repeat; }
 .jqueryFileTree LI.wait { background: url(images/spinner.gif) left top no-repeat; }
 /* File Extensions*/
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index a1443da03..c2c3ec4d2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -271,8 +271,7 @@ define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knock
                 }
 
                 if ($(e.target).attr("href")=="#artifact-details-files-content") {
-                  $.log("file content:"+self.groupId+":"+self.artifactId+":"+self.version);
-
+                  mainContent.find("#artifact-details-files-content" ).html(smallSpinnerImg());
                   var artifactDownloadInfosUrl = "restServices/archivaServices/browseService/artifactDownloadInfos/"+encodeURIComponent(self.groupId);
                   artifactDownloadInfosUrl+="/"+encodeURIComponent(self.artifactId)+"/"+encodeURIComponent(self.version);
                   artifactDownloadInfosUrl+="?repositoryId="+encodeURIComponent(getSelectedBrowsingRepository());
@@ -292,6 +291,7 @@ define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knock
                         pomContentUrl+="/"+encodeURIComponent(self.artifactId)+"/"+encodeURIComponent(self.version);
                         pomContentUrl+="?repositoryId="+encodeURIComponent(getSelectedBrowsingRepository());
                         pomContentUrl+="&t=pom";
+                        mainContent.find("#artifact-content-text" ).html(smallSpinnerImg());
                         $.ajax({
                           url: pomContentUrl,
                           dataType: "text",
@@ -333,6 +333,7 @@ define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knock
                              $.log("data:"+data);
                              var text = data.replace(/</g,'&lt;');
                              text=text.replace(/>/g,"&gt;");
+                             mainContent.find("#artifact-content-text" ).html(smallSpinnerImg());
                              mainContent.find("#artifact-content-text" ).html(text);
                              goToAnchor("artifact-content-text-header");
                            }