Changeset 7343

Timestamp:

03/04/09 15:05:32 (17 months ago)

Author:

josowski

Message:

Minor changes related to the article page redesign

References #1115

Location:

head/ambra/webapp/src/main/webapp

Files:

• article/article_comments.ftl (modified) (1 diff)
• article/article_related.ftl (modified) (1 diff)
• javascript/init_related.js (modified) (5 diffs)

head/ambra/webapp/src/main/webapp/article/article_comments.ftl

@@ -52 +52 @@
         <ul>
         <#if corrections == true>
-          <li><a href="${commentsURL}" title="View all corrections" class="discuss icon">View all Comments</a></li>
+          <li><a href="${commentsURL}" title="View all Comments" class="discuss icon">View all Comments</a></li>
         <#else>
+          <#if ((numFormalCorrections + numMinorCorrections) > 0)>
           <li><a href="${correctionsURL}" title="View all corrections" class="corrections icon">View all corrections</a></li>
+          </#if>
         </#if>
           <li><a href="${startDiscussionUrl}" title="Click to make a new comment on this article" class="discuss icon">Make a new comment on this article</a></li>

head/ambra/webapp/src/main/webapp/article/article_related.ftl

@@ -45 +45 @@
 
       <h3>Related Articles on the web <img id="relatedArticlesSpinner" src="../../images/loading.gif" height="20" width="20" class="loading" /></h3>
+      <div id="pubMedRelatedErr" style="display:none;"></div>
       <ul>
         <li><a href="http://scholar.google.com/scholar?hl=en&lr=&q=related:${docURL?url}&btnG=Search">Google Scholar</a></li>

head/ambra/webapp/src/main/webapp/javascript/init_related.js

@@ -22 +22 @@
 dojo.addOnLoad(function()
   {
+    //TODO: Move this server setting to a configuration file
     var almService = new ambra.alm('alm-dev.plos.org');
     var doi = escape(dojo.byId('doi').value);
@@ -36 +37 @@
 {
   dojo.fadeOut({ node:'relatedArticlesSpinner', duration: 1000 }).play();
-
+  
   if(response == null)
   {
-    setError('relatedArticlesSpinner');
+    setError('pubMedRelatedErr');
     return;
   }
@@ -54 +55 @@
 function setCites(response, args)
 {
+  dojo.byId('relatedCites').style.display = 'none';
   dojo.fadeOut({ node:'relatedCitesSpinner', duration: 1000 }).play();
-  dojo.byId('relatedCites').style.display = 'none';
 
   if(response == null)
   {
-    setError('relatedCitesSpinner');
+    setError('relatedCites');
     return;
   }
@@ -84 +85 @@
   var html = "";
 
+  dojo.byId('relatedBlogPosts').style.display = 'none';
   dojo.fadeOut({ node:'relatedBlogSpinner', duration: 1000 }).play();
-  dojo.byId('relatedBlogPosts').style.display = 'none';
 
   if(response == null)
   {
-    setError('relatedBlogSpinner');
+    setError('relatedBlogPosts');
     return;
   }
@@ -110 +111 @@
 }
 
-function setError(id)
+function setError(textID)
 {
-  dojo.byId(id).src = 'broken.jpg';
-  dojo.byId(id).title = 'An error occured requesting the';
+  dojo.byId(textID).innerHTML = '<span class="inlineError"><img src="../../images/icon_error.gif"/>&nbsp;Unable to retrieve this data at this time.</span>';
+  dojo.fx.wipeIn({ node:textID, duration: 1000 }).play();
 }