Changeset 7318

Timestamp:

03/02/09 10:43:14 (17 months ago)

Author:

josowski

Message:

Article Page Redesign, this changeset has four parts

1 - Article Level Metrics
2 - Fetch Article refactor
3 - Article Page redesign with new tabbed interface
4 - A new context based annotation menu

FetchArticle? no longer requires a chain of action classes in struts. The fetchArticle action now handles all the calls needed to the service tier to populate the freemarker template. There are regular expressions in the urlrewrite.xml file to handle these new action classes

Moved certain common functions from the ratings action classes to the articleOTMService. Moved a function from the abstract rating class to the rating service class.

TODO: Remove / refactor abstract rating action class as there are NO abstract methods.

References #1115

Location:

head/ambra

Files:

• journals/journal-overlay/src/main/resources/struts/journals/overlayJournal/css/screen.css (modified) (29 diffs)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/article/article_content.ftl (deleted)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/article/browse.ftl (modified) (1 diff)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/global/global_topbanner.ftl (modified) (1 diff)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/images/button_info.png (added)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/images/dialog_pb.gif (modified) (previous)
• journals/journal-plosone/src/main/resources/struts/journals/plosone/javascript/init_global.js (added)
• libs/js/src/main/scripts/ambra/alm.js (added)
• libs/js/src/main/scripts/ambra/displayAnnotationContext.js (added)
• libs/js/src/main/scripts/ambra.profile.js (modified) (2 diffs)
• libs/js/src/main/scripts/ambra/widget/ContextAction.js (added)
• libs/js/src/main/scripts/ambra/widget/templates/ContextAction.html (added)
• webapp/src/main/java/org/topazproject/ambra/article/action/FetchArticleAction.java (modified) (8 diffs)
• webapp/src/main/java/org/topazproject/ambra/article/service/ArticleOtmService.java (modified) (8 diffs)
• webapp/src/main/java/org/topazproject/ambra/rating/action/AbstractRatingAction.java (modified) (4 diffs)
• webapp/src/main/java/org/topazproject/ambra/rating/action/GetArticleRatingsAction.java (modified) (9 diffs)
• webapp/src/main/java/org/topazproject/ambra/rating/action/GetAverageRatingsAction.java (modified) (6 diffs)
• webapp/src/main/java/org/topazproject/ambra/rating/action/RateAction.java (modified) (1 diff)
• webapp/src/main/java/org/topazproject/ambra/rating/service/RatingsService.java (modified) (6 diffs)
• webapp/src/main/resources/struts.xml (modified) (4 diffs)
• webapp/src/main/resources/viewnlm-v2.xsl (modified) (1 diff)
• webapp/src/main/webapp/article/article_body.ftl (modified) (3 diffs)
• webapp/src/main/webapp/article/article_comments.ftl (added)
• webapp/src/main/webapp/article/article_content.ftl (modified) (2 diffs)
• webapp/src/main/webapp/article/article_related.ftl (added)
• webapp/src/main/webapp/article/article_rhc.ftl (modified) (2 diffs)
• webapp/src/main/webapp/article/article_rhc_rating.ftl (modified) (5 diffs)
• webapp/src/main/webapp/article/article_tabs.ftl (added)
• webapp/src/main/webapp/article/article_variables.ftl (added)
• webapp/src/main/webapp/article/browse.ftl (modified) (1 diff)
• webapp/src/main/webapp/css/annotation.css (modified) (3 diffs)
• webapp/src/main/webapp/css/rating.css (modified) (1 diff)
• webapp/src/main/webapp/css/screen.css (modified) (9 diffs)
• webapp/src/main/webapp/javascript/init_article.js (modified) (8 diffs)
• webapp/src/main/webapp/javascript/init_ratings.js (added)
• webapp/src/main/webapp/javascript/init_related.js (added)
• webapp/src/main/webapp/journals/plosJournals/article/article_body.ftl (modified) (3 diffs)
• webapp/src/main/webapp/journals/plosJournals/article/article_content.ftl (modified) (2 diffs)
• webapp/src/main/webapp/WEB-INF/urlrewrite.xml (modified) (1 diff)
• webapp/src/main/webapp/widget/contextAction.ftl (added)

head/ambra/journals/journal-overlay/src/main/resources/struts/journals/overlayJournal/css/screen.css

@@ -3 +3 @@
  * $Id$
  *
- * Copyright (c) 2006-2008 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -20 +20 @@
 /*      -------------------------------------------------------------
 
-        GLOBAL STYLE SHEET FOR : Overlay Journal
+        GLOBAL STYLE SHEET FOR : Ambra Journal
         CREATED ON  : 08-26-2006
         CREATED BY      : MARGARET SHEAR
@@ -31 +31 @@
 
 html            { margin: 0 0 1px 0; min-height: 100%; /* set margin and height to eliminate the scroll bar page shift on mozilla and safari */ background: transparent url(../images/html_bg.gif) 0 0 repeat-x; } /*changed background color to transparent to partially fix IE7 repaint bug of homepage body background image -SWT */
-body            { font: 82.5% Verdana, Arial, Helvetica, sans-serif; color: #00131D; margin: 0; border-bottom: 6px solid #202020; min-height: 100%; }
-a:link          { color: #369; text-decoration: underline; }
-a:visited       { color: #66c; }
-a:hover         { color: #39f; text-decoration: none;}
+body            { font: 82.5% Verdana, Arial, Helvetica, sans-serif; color: #303030; margin: 0; border-bottom: 6px solid #202020; min-height: 100%; }
+a:link          { color: #c60; text-decoration: underline; }
+a:visited       { color: #a25100; }
+a:hover         { color: #f60; text-decoration: none;}
 a:active        { }
 :active, :focus { outline-style: none; -moz-outline-style:none; }
@@ -65 +65 @@
 dd                      { margin: 0; }
 table           { margin: 20px; border: none;}
-th                      { padding: 6px; color:#fff; background-color: #666; border: 4px solid #FFF; border-width: 0 3px 3px 0; font-weight: bold;}
-td                      { padding: 6px; background-color: #ccc; border: 4px solid #FFF; border-width: 0 3px 3px 0; }
+th                      { padding: 6px; background-color: #fdae7a; border: 4px solid #FFF; border-width: 0 3px 3px 0; font-weight: bold;}
+td                      { padding: 6px; background-color: #fcd3b8; border: 4px solid #FFF; border-width: 0 3px 3px 0; }
 /* Default Headings */
 h1, h2, h3      { font-family: Georgia, "Times New Roman", Times, serif; color: #333; /*position: relative; Note: this was causing links in floated articleMenu to be covered up and unclickable in Firefox2 */ }
@@ -80 +80 @@
 ----------------------------------------------------------
 */
-.noshow { line-height:0; } /* can be applied to elements that need to be present in the flow but not impact vertical spacing, e.g. in-page anchors */
-.clearer  { clear:both; line-height:0; }
+.noshow { display:block; height:0px; line-height:0em; } /* can be applied to elements that need to be present in the flow but not impact vertical spacing, e.g. in-page anchors */
+.clearer  { clear:both; line-height:0; height:0; display:none; }
+.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.clearfix { zoom:1; } /*zoom allows self-clearing floats to work in IE*/
 
 /* Global : Icons and Links
@@ -91 +93 @@
 a.trackback:visited,
 a.rating:visited,
-a.annotation:visited,   
+a.annotation:visited,
 a.user:visited,
 a.instructions:visited,
 a.addannotation:visited,
-a.corrections:visited { color: #369; }
+a.corrections:visited { color: #c60; }
 
 a.tooltip,
@@ -110 +112 @@
 
 a.rating      { padding: 0 0 2px 5px; border: none; background: transparent; }
-h6 a.rating { font-size: .9em; }
 
 /* portions of this icon set have been adapted Mark Jame's Silk icon set available under a Creative Commons Attribution 2.5 license at http://www.famfamfam.com/lab/icons/silk/ */
@@ -185 +186 @@
 div.pane div.post a:hover       { background-color: #393; }
 
-/* div.rating div.close a { border-left: 2px solid #069; border-bottom: 2px solid #069;} */
+/* div.rating div.close a { border-left: 2px solid #c60; border-bottom: 2px solid #c60;} */
 
 /* Main Container: Main Menu : Elements
@@ -194 +195 @@
 #container                      { position: relative; }
 #container, #hdr        { margin: 0 auto; min-width: 675px; max-width: 930px; }
-#content                        { margin: 50px 4px 50px 22px; line-height: 1.8em; font-size: .9em; }
+#content                        { margin: 30px 4px 50px 22px; line-height: 1.8em; font-size: .9em; }
 
 /* Horizontal Advertising Banners : Top & Bottom Slots
@@ -215 +216 @@
 div#hdr                         { height: 150px; position: relative; z-index: 997;}
 #hdr #logo                      { background: transparent url(../images/hdr_logo.gif) no-repeat top left; color: #039; }
-#hdr #logo                      { width: 501px; height: 128px; position: absolute; top: 26px; left: 8px; margin: 0; font-size: 1.6em; }
+#hdr #logo                      { width: 501px; height: 128px; position: absolute; top: 16px; left: 8px; margin: 0; font-size: 1.6em; }
 #hdr #logo a            { width: 300px; height: 90px; display: block; position:relative; }
 #hdr #logo span,
@@ -232 +233 @@
 ul#nav          { font-size: .85em; height:1.9em; margin: 0; padding: 0; position: absolute; bottom: 0; left: 14px; top:129px; list-style-type: none; z-index: 800; width: 100%; }
 ul#nav li       { float: left; position: relative; list-style-type: none; margin: 0; padding: 0; }
-#nav li a, 
+#nav li a,
 #nav li a:visited
                         { font-weight: bold;display:block; text-decoration:none; width: auto; padding: 5px .6em .1em .6em; float:left; height: 1.6em; line-height:normal; color:#fff; }
 #nav li li      { width: 100%; position: relative; z-index: 802;}
 #nav li ul      { visibility:hidden; position:absolute; top:1.5em; left:0; height:0; overflow:hidden; text-align: left; margin: 0; padding: 0; background-color: #fff; z-index: 801;}
-/* first line style for IE7 and non-IE browsers and the second line for IE5.5 and IE6 */
+/*#nav table    { margin:-1px; border-collapse:collapse; } what table? -SWT */
+/* fist line style for IE7 and non-IE browsers and the second line for IE5.5 and IE6 */
 /* Note that class li.over is dynamically written into html from init_navigation.js -SWT */
 #nav li.over a,
 #nav li:hover a,
-#nav li a:hover                                 { background-color: #369; color: #FFF!important; }
+#nav li a:hover                                 { background-color: #c60; color: #FFF!important; }
 #nav li.over ul,
 #nav li:hover ul,
-#nav li a:hover ul                              { visibility:visible; display:block; height:auto; width:16.6em; top:2.1em; overflow:visible; border: 1px solid #369;}
+#nav li a:hover ul                              { visibility:visible; display:block; height:auto; width:16.6em; top:2.1em; overflow:visible; border: 1px solid #c60;}
 
 #nav li.over li a,
 #nav li:hover ul li a,
-#nav li a:hover ul li a                 { display:block; font-weight:normal!important; background:transparent; text-decoration:none; height:auto; line-height: 1.5em;padding:0.2em 0.2em 0.2em 0.6em; width:15.8em; border-top: 0; color: #369!important; }
+#nav li a:hover ul li a                 { display:block; font-weight:normal!important; background:transparent; text-decoration:none; height:auto; line-height: 1.5em;padding:0.2em 0.2em 0.2em 0.6em; width:15.8em; border-top: 0; color:#c60!important; }
 
 #nav li.over ul li a:hover,
 #nav li:hover ul li a:hover,
-#nav li a:hover ul li a:hover   { border-top: 0; color: #369!important; background-color: #fff;text-decoration: underline;}
+#nav li a:hover ul li a:hover   { border-top: 0; color:#c60!important; background-color: #fff;text-decoration: underline;}
 #nav li.journalnav                              { float: right; margin-right: 14px;}
 
 
 /* Search Dashboard */
-#db { padding: 0; text-align: center; font-size: .8em; position: absolute; top: 50px; right: -20px; padding: 0; border-width: 0; color: #888; background: url(../images/db_bg.gif) no-repeat top left; padding: 8px 15px 10px 11px;}
+#db                     { padding: 0; text-align: center; font-size: .8em; position: absolute; top: 50px; right: -20px; padding: 0; border-width: 0; color: #888; background: url(../images/db_bg.gif) no-repeat top left; padding: 8px 15px 10px 11px;}
 #db fieldset    { padding: 0; margin: 0; background-color: transparent; vertical-align: top; width: 327px; border: none; }
 #db fieldset div{ position: relative; }
@@ -293 +295 @@
 #user ul li { list-style-type: none;display: inline; }
 #user li a:link,
-#user li a:visited      { padding: 0; margin-left:0 2px; text-decoration: none;}
+#user li a:visited      { padding: 0; margin:0 2px; text-decoration: none; }
 #user a:link,
-#user a:visited {  color: #369!important; }
+#user a:visited {  color: #c60!important; }
 #hdr #user a:hover { text-decoration: underline; }
 
@@ -317 +319 @@
 div#ftr ul              { margin: 0; padding: 0; list-style-type: none; }
 div#ftr ul li   { margin: 0 5px; display: inline; }
-/*div#ftr ul a, div#ftr ul a:visited { color: #c00;}*/
 div#ftr img     { margin: 0 10px -8px 10px; display: inline; }
 div#ftr p               { margin: 0 0 10px 0; padding: 10px; background-color: #FFF; border-bottom: 1px solid #003956; white-space: nowrap; }
-div#ftr p span  { display: inline; background: #FFF url(../images/user_ftr_cc_logo.png) no-repeat left center; padding: 8px 8px 8px 25px; }
+div#ftr p span  { display: inline; background-color:#fff; padding: 8px 8px 8px 25px; }
 div#ftr div.powered { background-color: #202020; color: #bbb; font-size: .9em; padding: 10px 0 4px 0; letter-spacing: .03em; margin-top: 10px; border-top: 1px solid #fff;}
 div.powered a:link,
-div.powered a:visited,
-div.powered a:hover { color: #ccc; font-weight: bold;}
+div.powered a:visited { color: #fff; font-weight: bold; }
+div.powered a:hover { text-decoration:none; }
 
 /* Research Article : Elements
 ----------------------------------------------------------=
 */
-div#rhc                 { float: right; width: 240px; position: relative; }
+
+/*TEMP STYLE: suppresses 2nd instance of research article title on the article page*/
+div#articleMenu + h1 { display:none; }
+
+/* article page tabs */
+div.horizontalTabs      { position:relative; border:0; margin-top:15px; padding:0; background:transparent; width:100%; }
+div.horizontalTabs:after  { content:"."; display: block; height:0; clear:left; visibility:hidden; }
+/*div#articleContainer div#researchArticle*/ ul#tabsContainer  { float:left;  margin:0!important; padding:0 0 0 10px!important; /* "!important" required for IE7 */ line-height:normal; background:transparent url("../images/tab_bg.gif") repeat-x bottom; width:640px; }
+ul#tabsContainer ul { margin:0; padding:10px 10px 0; }
+ul#tabsContainer li             { cursor:pointer; float:left; background:url("../images/tab_left.gif") no-repeat 0% 0%; margin:0 2px; padding:0 0 0 8px; list-style:none; font-size:.9em; font-weight:bold; color:#666; }
+ul#tabsContainer li a { display:block; float:left; background:url("../images/tab_right.gif") no-repeat 100% 0%;  padding:8px 16px 8px 8px!important; /* "!important" required for IE7 */ color:#666; text-decoration:none; }
+ul#tabsContainer li a:hover { color:#f60 }
+ul#tabsContainer li.active { background-position:0% -40px; }
+ul#tabsContainer li.active a { background-position:100% -40px; padding-bottom: 9px!important; }
+
+div#rhc                 { float: right; width: 240px; position: relative; margin-top:8px; }
+div.browse div#rhc { padding:0; }
 div.content     { margin-right: 255px; }
 
@@ -338 +355 @@
 
 div.static h1,
-div.search h1           { padding-top: 10px; border-top: 6px solid #666; }
-div.pageerror h1        { background-color: #666; color:#fff; padding: 8px;}
+div.search h1           { padding-top: 10px; border-top: 6px solid #f60; }
+div.pageerror h1        { background-color: #f60; color:#fff; padding: 8px;}
 div.pageerror p         { margin-left: 8px; }
 div.content h2  { /* article sub-title */ margin: 10px 0; font-style: italic; font-size: 1.5em; background: none; padding: 0;}
@@ -377 +394 @@
 div.content dd p { margin:0; }
 
-div#contentHeader { /* open access image */ position: relative; top:0; height:34px; margin:0; background:#666 url(../images/content_oa.gif) no-repeat 100% 0; }
+div#contentHeader { /* open access image */ position: relative; top:0; height:34px; margin:0; background:#c60 url(../images/content_oa.gif) no-repeat 100% 0; }
 div#contentHeader p { margin: 0; padding:0; text-indent: -9999px; }
 div#contentHeader p#articleType { text-transform:uppercase; text-indent:7px; margin-top:-13px; font-weight:bold; color:#fff; background-color:transparent; }
 
-div#publisher { border-bottom:1px dashed #369; background-color:#fff; } /* background color allows bottom border to display in IE6 */
+div#publisher { border-bottom:1px dashed #c60; background-color:#fff; } /* background color allows bottom border to display in IE6 */
 div#publisher p { margin:0 0 2px 0; }
 div#publisher p a { font-weight:bold; font-style:italic; }
@@ -389 +406 @@
 ol.references a.find { font-size: .9em; text-transform: uppercase; font-weight: bold; margin-left: 4px;}
 
-p.oa-banner             { margin: 0; padding: 5px 0;font-size: .85em; border-bottom: 8px solid #069; color: #666; }
+p.oa-banner             { margin: 0; padding: 5px 0;font-size: .85em; border-bottom: 8px solid #c60; color: #666; }
 p.authors               { margin: 10px 0 0 0; font-weight: bold; font-size: 1.1em; }
 p.affiliations  { font-size: .85em; margin: 0; }
@@ -401 +418 @@
 div.abstract h3 { font-size: 1.3em; margin: 20px 0 0 0; padding:0; border-bottom:0; color: #333; font-family: Georgia, "Times New Roman", Times, serif; font-weight: bold; }
 span.pullquote  { font-size: 2em; line-height: 1em; width: 55%; padding: 10px; float: right; letter-spacing: -.05em; font-style: italic; margin: 5px; }
-div.box { color: #000; margin:10px 0; padding: 10px; background-color: #efefef; }
+div.box                 { color: #000; padding: 10px; background-color: #fcd3b8; margin: 10px 0; }
 div.content div.box h3,
 div.content div.box h4 { margin:0; }
@@ -407 +424 @@
 
 /* Menu next to article title containing download links, print link, etc. */
-div#articleMenu { float:right; width:165px!important; margin:10px 0 20px 10px; padding:0 0 12px 10px; background:#fff; }
-div#articleMenu ul { list-style-type:none; margin:0 15px 0 0; padding:0; background:none; position:static!important; } /* position:static fixes display issues in IE6 */
-div#articleMenu ul li { border-bottom: 1px solid #ccc; margin:0; padding:1px 0; font-size:.85em; background:none; }
-div#articleMenu ul li a:link,
-div#articleMenu ul li a:visited { background-color:transparent; background-position:5% 50%; background-repeat:no-repeat; padding:2px 0 2px 25px; color:#666; text-decoration:none; }
-div#articleMenu ul li a:hover { text-decoration:underline; color:#f00; }
-
-/* Related articles at top of right column on article pages */
-dl#relatedArticles { margin:0 0 20px 0; padding:9px 0 .5em 0; border-bottom:1px solid #666; background-color:#fff; }
-dl#relatedArticles dt { font-size:1em; color:#303030; margin-bottom:.5em; }
-dl#relatedArticles dd { line-height:1.2em; margin-bottom:.5em; }
-dl#relatedArticles dd a:link,
-dl#relatedArticles dd a:visited { font-size:.95em; text-decoration:none; }
-dl#relatedArticles dd a:hover { text-decoration:underline; }
-
-#rhc ul li a,
-#rhc ul li a:visited    { display: block; font-size: .85em; padding: 0 5px; text-decoration: none; color: #333; }
-#rhc ul li a,
-#rhc ul li a:visited    { background-color: transparent; background-position: 5% 50%; background-repeat: no-repeat; padding:1px 0 2px 0; padding-left:30px; border-bottom: 1px solid #ccc; margin: 0 3px; }
-#rhc ul li a:hover              { background-color: #ddd; color: #000;}
-#rhc ul li a.last               { border-bottom-width: 0; }
-#rhc ol li a.commentary { background-image: none; display:block; margin-top:5px; padding: 2px 0 2px 0; font-weight: bold; }
-#rhc ol li a.corrections { display:inline; background-position:left 0%; }
-/* Valid use of child selector to hide these from IE6 which doubles bottom margin. Results in no bottom margin display for IE6 */ 
-div#rhc > div#sideNav > div#postcomment > div.commentview > ol > li > a.corrections,
-div#rhc > div#sideNav > div#postcommentfloat > div.commentview > ol > li > a.corrections/*for Safari*/ { display:block; margin-bottom:5px; background-position:left 0.2em; }
-
-ul#dcCount1 { margin-bottom:5px; } /* increases spacing below note and comment counts to help block view/join discussion section */
+div.content div#articleMenu { float:right; width:200px; margin:18px 0 0 15px; padding-bottom:15px; background:#fcd3b8 url(../images/articleMenu_btm.gif) no-repeat bottom left; font-size:0.9em; zoom:1; }
+div.content div#articleMenu div.wrap { background:#fcd3b8 url(../images/articleMenu_top.gif) no-repeat top left; margin-bottom:8px; padding-top:8px; zoom:1; }
+div.content div#articleMenu p { margin-bottom:0; padding:0 8px 0 23px; }
+div.content div#articleMenu ul { margin:0; padding:0 8px 0 23px; position:static!important; } /* position:static fixes display issues in IE6 */
+div.content div#articleMenu ul li { background-image:none; padding:2px 0; line-height:1.5em; }
+div.content div#articleMenu ul li.annotation,
+div.content div#articleMenu ul li.discuss { background-position:0 2px; background-repeat:no-repeat; padding-left:18px; }
+div.content div#articleMenu ul li.annotation    { background-image: url(../images/icon_annotation.gif); }
+div.content div#articleMenu ul li.discuss       { background-image: url(../images/icon_discuss.gif); }
+
+/* Related articles in right column on article pages */
+div#sideNav dl.related { margin:0 0 20px 0; padding:9px 0 .5em 0; border-bottom:1px solid #999; background-color:#fff; }
+div#sideNav dl.related dt { font-size:1em; text-transform:uppercase; color:#303030; margin-bottom:.5em; }
+div#sideNav dl.related dt em { text-transform:none; font-style:normal }
+div#sideNav dl.related dd { line-height:1.2em; margin-bottom:.5em; }
+div#sideNav dl.related dd a:link,
+div#sideNav dl.related dd a:visited { font-size:.95em; text-decoration:none; }
+div#sideNav dl.related dd a:hover { text-decoration:underline; }
+
+/* Right column on article pages */
+#rhc { font-size:0.9em; line-height:1.5em; }
+#rhc h6 { font-size:1em; }
+#rhc h6 a.info { display:inline-block; background:url(../images/button_info.png) no-repeat bottom left; text-indent:-9999px; height:15px; width:14px; }
+#rhc p { margin:3px 5px 5px 5px; }
+#rhc div.rhcBox_type1 { margin-bottom:18px; padding-bottom:8px; background:#fcd3b8 url(../images/rhcBox_btm.gif) no-repeat bottom left; zoom:1; }
+#rhc div.rhcBox_type1 div.wrap { background:#fcd3b8 url(../images/rhcBox_top.gif) no-repeat top left; padding-top:8px; }
+#rhc div.rhcBox_type2 { margin-bottom:8px; border:1px solid #bababa; }
+#rhc div.rhcBox_type2 h6 { margin:0; padding:1px 5px; color:#fff; background-color:#cc6600; }
+#rhc div.rhcBox_type2 div.more { text-align:right; margin:bottom:0; }
+#rhc div.rhcBox_type2 div.more a { display:block; float:right; background:transparent url(../images/rhcBox_more.gif) no-repeat top left; width:4em; text-decoration:none; font-weight:bold; line-height:2em; padding:0 5px 0 0; text-align:right; }
+#rhc div.rhcBox_type2 div.more > a { float:right; text-align:right; }  /* for non-IE6 browers */
+
+#rhc div#download ul,
+#rhc div#share ul  { margin:0 5px 0 8px; padding:0; }
+#rhc div#download ul li,
+#rhc div#share ul { background-image:none; padding:2px 0; line-height:1.8em; list-style-type:none; }
+#rhc div#download ul li.download,
+#rhc div#download ul li.print,
+#rhc div#share ul li.email,
+#rhc div#share ul li.twitter { background-position:0 3px; background-repeat:no-repeat; padding-left:21px; }
+#rhc div#download ul li.download        { background-image: url(../images/icon_download.gif); }
+#rhc div#download ul li.print   { background-image: url(../images/icon_print.gif); }
+#rhc div#share ul li.email { background-image: url(../images/icon_email.gif); }
+#rhc div#share ul li.twitter  { background-image: url(../images/icon_twitter.gif); }
+#rhc div#share div.bookmarklets { display:inline-block; }
+#rhc div#share li.bookmarklets { height:2em; margin-top:3px; }
+#rhc div#share li.bookmarklets div { display:inline-block; }
+#rhc div#share li.bookmarklets img,
+#rhc div#share li.bookmarklets iframe { margin-bottom:-0.3em; } /*iframe for digg.com bookmarklet*/
 
 /* correction article type styles */
@@ -441 +479 @@
 /* correction note types, header, and associated page styles */
 div#discussionContainer div.corrections td.title { background-color: #fff4f0; }/* "correction" name space conflict: see line #393 above and line #594 below. Resolved by using "corrections". */
-div#discussionContainer div.corrections div.original div.hd h3 { text-indent:20px; color:#ff0000; } 
+div#discussionContainer div.corrections div.original div.hd h3 { text-indent:20px; color:#ff0000; }
 
 div.corrections td.title a,
@@ -450 +488 @@
 div.fch p.fch,
 div.corrections td.title a,
+a.corrections,
 div#discussionContainer div.corrections div.original div.hd h3 { background:url(../images/icon_correction.gif) left 0% no-repeat; }
 div.fch p.fch { margin:8px 8px 0; text-indent:20px; }
@@ -458 +497 @@
 div.fch ol li p a:visited { font-weight:normal; color:#004e9c; }
 
-
-/* rhc rounded containers : top */
-div.links,
-div.tools                               { background-position: bottom; background-repeat: no-repeat; padding: 0 0 8px 0; margin: 0 0 6px 0; }
-div.links                               { background-image: url(../images/sidenav_bg.gif); position: relative;}
-div.tools                               { background-image: url(../images/tools_bg.gif);}
-
-
-/* rhc rounded containers : bottom */
-div.links ul,
-div.tools ul                    { background-repeat: no-repeat; background-position: top; padding: 8px 0 0 0; margin: 0; list-style-type: none; }
-div.links ul                    { background-image: url(../images/sidenav_bg.gif);}
-div.tools ul                    { background-image: url(../images/tools_bg.gif); padding-bottom: 2px;}
-div.links li
-div.tools li                    { list-style-type: none; margin: 0; padding: 0; }                               
-
-/* rhc square box */
-div.rhcBox { position:relative; top:0pt; width:240px; border:3px solid #999999; margin:0; padding:0; }
-
-div.commentview                 { padding: 5px; border: 3px solid #999; margin: 8px 0; background: url(../images/toolbar_bg.gif) repeat-x top;}
-div.commentview div#ratingAverages { border: 1px solid #ccc; border-width: 1px 0; margin: 5px -5px; padding: 10px; background-color: #eee; position: relative; width:214px; }
-div.commentview  li     { font-size: .9em; }
-div.commentview h6,
-div.rhcBox h6 { margin: 0; }
-div.commentview ol,
-div.commentview li              { margin: 0; padding: 0; list-style-type: none; }
-div.commentview  div#ratingAverages li  { font-weight: bold; position: relative; }
-div.commentview label   { font-weight: normal; }
-div.commentview li ul   { margin: 0; padding: 0; list-style-type: none; }
-div.commentview li ul li        { background: url(../images/tools_li.gif) no-repeat 0 2px; font-weight: bold; padding-left: 14px; margin-left: 20px; font-size: 1em; color: #666;}
+div#ratingRhc1 { margin-bottom:5px;}
+div#ratingRhc1 ol,
+div#ratingRhc1 li { margin:0; padding:0; list-style-type: none; }
+div#rhc div#ratingRhc1 h6 { font-weight:bold; margin-top:2px; margin-bottom:3px; color:#303030; background-color:transparent; } /*when the Impact tab is put in and the ratings box becomes part of the Impact box, this header should be changed to a h7 or p*/
+div#ratingRhc1 div#ratingAverages li    { font-weight: bold; position: relative; }
+div#ratingRhc1 label { font-weight: normal; }
+div#ratingRhc1 a.rating { white-space:nowrap; }
+div#ratingRhc1 div#ratingAverages { background-color:#EEEEEE; border-color:#CCCCCC; border-style:solid; border-width:1px 0; margin:3px 0; padding:10px;}
 
 ol.ratingAvgs { padding: 0; margin: 0; }
 ol.ratingAvgs,
 ol.ratingAvgs ul { list-style: none; }
-ol.ratingAvgs li { padding: 0 0 0 10px; margin: 0; height: 2em; } 
-ol.ratingAvgs label {  }
-ol.ratingAvgs ul { left: 8em; top: -2em;}
+ol.ratingAvgs li { padding: 0 0 0 10px; margin: 0; height: 2em;}
 ol.ratingAvgs li ul li { display: inline; background: none; margin: 0; padding: 0; width: auto;}
-
-#postcomment, #postcommentfloat { width: 240px; top: 0; position: relative; }
-#postcommentfloat { position: fixed; display: none; }
-.fixed { position: fixed !important; }
-
-#sectionNav ul li a,
-#sectionNavTop ul li a,
-#sectionNavTopFloat ul li a, /* sectionNavTopFloat style is for Safari only*/
-#sectionNav ul li a:visited,
-#sectionNavTop ul li a:visited,
-#sectionNavTopFloat ul li a:visited { padding-right:5px; background: transparent url(../images/sectionnav_li_bg.gif) no-repeat 5% .7em; border-color: #999;}
-
-#sectionNav                     { width: 240px; top: 20px; background-color: #FFF; position: fixed; /* hide temporarily until js is implemented */ display: none; }
-
 
 div.buttons                             { margin: 6px 0; padding: 0; background: url(../images/buttons_bg.gif) no-repeat; background-position: 0 -32px; position: relative;}
@@ -520 +521 @@
 
 
-div.figure                              { background-color: #efefef; padding: 10px; font-size: .85em; margin: 10px 0;}
+div.figure                              { background-color: #fcd3b8; padding: 10px; font-size: .85em; margin: 10px 0;}
 div.figure:after                { content: ".";  display: block;  height: 0; clear: both; visibility: hidden; }
 div.figure h5                   { float:none; margin: 0; color: #000;}
@@ -526 +527 @@
 #content div.figure img.thumbnail       { margin: 0 10px 10px 0; float: left;} /* only thumbnails will float, not in-line images */
 div.figure a img.thumbnail              { border: 2px solid #FFF; } /* only thumbnails will float, not in-line images */
-div.figure a:hover img  { border: 2px solid #069; }
+div.figure a:hover img  { border: 2px solid #c60; }
 
 span.equation          { width: 100%; margin: 20px 0; font-weight: bold; font-size: .85em; text-align: right; padding: 0 10px; }
@@ -539 +540 @@
 a.bug,
 a:visited.bug {
-  position:relative; 
+  position:relative;
         top:-5px;
   margin-right:2px;
         padding:1px 11px 1px 4px;
-        color:#fff; 
-  text-decoration:none; 
-  font-size:.85em; 
+        color:#fff;
+  text-decoration:none;
+  font-size:.85em;
         font-weight:bold;
   background:url(../images/annotation_bug.gif) top right no-repeat;
@@ -595 +596 @@
 
 /* ------ User Profile Page Styles ------*/
-div#content.profile     { border: 2px solid #666; border-width: 2px 0; background: #e8e8e8 url(../images/forms_bg.gif) repeat-x top; padding: 20px 0; width: 70%; margin-left: auto; margin-right: auto; position: relative;}
+div#content.profile     { border: 2px solid #f90; border-width: 2px 0; background: #fcd3b8 url(../images/forms_bg.gif) repeat-x top; padding: 20px 0; width: 70%; margin-left: auto; margin-right: auto; position: relative;}
 div.profile img { float: left; margin: 20px 0 0 20px;}
 div.profile h1  { position: absolute; left: 120px; margin: 0; padding-bottom: 10px; padding-top: 10px;top: 60px;}
 div.profile h2  { background-image: none; clear: left; }
 div.profile ol { list-style-type: none; margin: 25px 0px 0px; padding: 0px; clear: left; padding-top: 20px; }
-div.profile ol li { list-style: none; display: block; padding: 0 20px 10px 20px; padding-left: 20px; border-bottom-color: #ccc; border-bottom-style: solid;border-bottom-width: 2px; background-color: transparent; background-image: none; padding-top: 5px; clear: both; }
+div.profile ol li { list-style: none; display: block; padding: 0 20px 10px 20px; padding-left: 20px; border-bottom-color: #b8f0a9; border-bottom-style: solid;border-bottom-width: 2px; background-color: transparent; background-image: none; padding-top: 5px; clear: both; }
 div.profile li em{ color: #555; font-size: .9em;}
 div.profile ol li span.heading{ font-weight: bold; display: block; }
-div.profile ol li input { width: 200px; border: 1px solid #ACF1FF; padding: 2px; }
-div.profile ol li .long-input { width: 324px; } 
-div.profile ol li select { width: 206px; border: 1px solid #ACF1FF; padding: 2px; }
+div.profile ol li input { width: 200px; border: 1px solid #fdae7a; padding: 2px; }
+div.profile ol li .long-input { width: 324px; }
+div.profile ol li select { width: 206px; border: 1px solid #fdae7a; padding: 2px; }
 div.profile ol li .radio { width: 14px;}
 div.profile ol li .checkbox { width: 14px;}
-div.profile textarea {width: 324px; border: 1px solid #ACF1FF; }
+div.profile textarea {width: 324px; border: 1px solid #fdae7a; }
 div.profile #submit, .pone-form #cancel {margin-top: 15px; margin-left: 10px; }
-
-div.horizontalTabs              { position: relative; border-width: 0;}
-.horizontalTabs ul,
-.horizontalTabs ul li   { list-style-type: none; margin: 0; padding: 0; font-weight: bold; color: #069;}
-.horizontalTabs ul              { display: block; margin-bottom: 5px; z-index: 10; border-bottom: 2px solid #ACF1FF; }
-.horizontalTabs ul li   { cursor: pointer; padding: 6px; background-color: transparent; margin: 5px 2px 3px 2px; display: inline; }
-.horizontalTabs ul li.active    { font-weight: bold;background: url(../images/forms_bg.gif) repeat-x bottom; border-bottom-color: #fff; text-decoration: none; color: #000;}
-.horizontalTabs .contentwrap {margin: 0; border: 2px solid #fff; padding: 0;position: relative; }
 
 /* ------ EdBoard Styles ----*/
 .edboard dl { text-align: right; margin: 0 240px 0 0; }
 .edboard dt { font-weight: bold; display: block; float: left; padding-left: 5px; margin-top: 5px; position: relative;}
-.edboard dd { margin: 0 0 5px 0; padding: 0 5px 5px 5px; background-color: #D2F7FF; border-top: 6px solid #D2F7FF; font-size: .85em; text-indent: 10px; }
-
-.static p.intro,
-.static div.intro
-{ border: 2px solid #ccc; padding: 10px; background: url(../images/toolbar_bg.gif) repeat-x bottom; color: #000;}
-.static div.intro { margin:10px 0; padding-top:0 }
+.edboard dd { margin: 0 0 5px 0; padding: 0 5px 5px 5px; background-color: #fcd3b8; border-top: 6px solid #fcd3b8; font-size: .85em; text-indent: 10px; }
+
+.static p.intro                                 { border: 2px solid #ccc; padding: 10px; background: url(../images/toolbar_bg.gif) repeat-x bottom; color: #000;}
 
 /* ------ Search Styles ----*/
@@ -643 +633 @@
 div.source                      { padding: 0; font-size: 1.3em; font-weight:bold; margin: 10px 0; }
 div.source a.article{ background-image: url(../images/icon_source.gif); background-position: 0 4px;padding-left: 20px;display: block; font-family:Georgia,"Times New Roman",Times,serif; text-decoration: none;  border-bottom: 1px solid #ccc; }
-div.source a:visited { color:#369; }
-div.source a:hover      { color:#39f; text-decoration:underline; }
+div.source a:visited { color:#c60; }
+div.source a:hover      { color:#f60; text-decoration:underline; }
 div.source a:hover span.inline-rating { text-decoration:none; background-color:#fff; }
 /* span wraps original article label */
@@ -681 +671 @@
 
 /*--- Browse by TOC and Journal Archive ---*/
-p#issueNav { margin:0; padding:0; position:relative; top:-12px }
-div.toc div#rhc { padding-top:0; }
+p#issueNav { margin:0; padding:0; position:relative; font-size:0.9em; }
+p#issueNav a:link,
+p#issueNav a:visited { text-decoration:none; }
+p#issueNav a:hover { text-decoration:underline; }
+div.toc div#rhc { margin-top:-9px; padding-top:0; }
 div.toc div#rhc div#floatMarker { line-height:0; margin:0; padding:0; display:none; } /* see floatingMenu.js */
 div.toc h1,
-div.archive h1  { width:99%; margin-bottom: 20px; padding-top: 10px; border-top: 6px solid #666; }
+div.archive h1  { width:99%; margin-bottom: 20px; padding-top: 10px; border-top: 6px solid #f60; }
 div#issueImage { margin:30px 0 15px 0; }
 div#issueImage h4 { display:inline; font-size:0.9em; font-style:italic; font-family:Verdana, Arial, Helvetica, sans-serif; margin:0; padding:0; }
@@ -700 +693 @@
 div.toc #search-results { margin-top:0; padding:0; }
 div.toc h2,
-div.archive h2  { margin:15px 0 0 0; font-size:170%; font-style:normal; border-bottom:1px solid #666 }
+div.archive h2  { margin:15px 0 0 0; font-size:170%; font-style:normal; border-bottom:1px solid #c60 }
 div.toc div.article { margin-bottom:20px; padding-bottom:10px; border-bottom:1px solid #ccc; background:white; } /* white background allows bottom border to render in IE6 - wierd */
 div.toc h3,
@@ -712 +705 @@
 div.toc dl.related dt,
 div.toc dl.related dd { margin-bottom:.2em; font-size:.9em; line-height:1.5em; }
-div.toc dl.related dt { color:#666 }
+div.toc dl.related dt { float:none; color:#666 }
 div.toc dl.related dt em { font-style:normal }
 

head/ambra/journals/journal-plosone/src/main/resources/struts/journals/plosone/article/browse.ftl

@@ -101 +101 @@
           <span class="date">Published ${art.date?string("dd MMM yyyy")}</span>
           <@s.url id="fetchArticleURL" action="fetchArticle" namespace="/article" articleURI="${art.id}" includeParams="none"/>
-          <span class="article"><@s.a href="%{fetchArticleURL}" title="Read Open Access Article">${art.title}</@s.a></span>
+          <span class="article"><@s.a href="%{fetchArticleURL}" title="Read Open Access Article"><@articleFormat>${art.title}</@articleFormat></@s.a></span>
           <span class="authors">
             <#list art.authors as auth><#if auth_index gt 0>, </#if>${auth}</#list>

head/ambra/journals/journal-plosone/src/main/resources/struts/journals/plosone/global/global_topbanner.ftl

@@ -38 +38 @@
 <!-- begin : left banner slot -->
 <div class="left">
-  <iframe frameborder="0" scrolling="no" width="468px" height="60px" marginheight="0" marginwidth="0" src="http://comparenetworks.com/partnerAds/IFrameAd.aspx?adid=0&adtypeid=2&siteid=35&subsiteid=0&pagetypeid=0&pageid=0&subpageid=0">
+  <iframe frameborder="0" scrolling="no" width="468px" height="60px" marginheight="0" marginwidth="0" id="compareNetworksBanner">
   </iframe>
 </div>

head/ambra/libs/js/src/main/scripts/ambra.profile.js

@@ -11 +11 @@
         "dijit.layout.TabContainer",
         "dojox.data.dom",
+        "ambra.alm",
         "ambra.general",
         "ambra.domUtil",
@@ -22 +23 @@
         "ambra.annotation",
         "ambra.corrections",
+        "ambra.displayAnnotationContext",
         "ambra.displayComment",
         "ambra.responsePanel",

head/ambra/webapp/src/main/java/org/topazproject/ambra/article/action/FetchArticleAction.java

@@ -19 +19 @@
 package org.topazproject.ambra.article.action;
 
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Set;
+import org.topazproject.ambra.action.BaseSessionAwareActionSupport;
+import org.topazproject.ambra.model.article.ArticleInfo;
+import org.topazproject.ambra.model.article.ArticleType;
+import org.topazproject.ambra.rating.service.RatingsService;
+import org.topazproject.ambra.article.service.BrowseService;
+import org.topazproject.ambra.article.service.ArticleOtmService;
+import org.topazproject.ambra.article.service.NoSuchArticleIdException;
+import org.topazproject.ambra.article.service.FetchArticleService;
+import org.topazproject.ambra.journal.JournalService;
+import org.topazproject.ambra.models.Journal;
+import org.topazproject.ambra.models.Article;
+import org.topazproject.ambra.models.Retraction;
+import org.topazproject.ambra.models.ArticleAnnotation;
+import org.topazproject.ambra.models.MinorCorrection;
+import org.topazproject.ambra.models.FormalCorrection;
+import org.topazproject.ambra.ApplicationException;
+import org.topazproject.ambra.annotation.service.AnnotationService;
+import org.topazproject.ambra.annotation.service.WebAnnotation;
+import org.topazproject.ambra.annotation.service.AnnotationConverter;
+import org.topazproject.ambra.annotation.service.ReplyService;
+import org.topazproject.ambra.annotation.Commentary;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Transactional;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.beans.factory.annotation.Required;
-import org.springframework.transaction.annotation.Transactional;
-
-import org.topazproject.ambra.action.BaseActionSupport;
-import org.topazproject.ambra.annotation.service.AnnotationService;
-import org.topazproject.ambra.article.service.BrowseService;
-import org.topazproject.ambra.article.service.FetchArticleService;
-import org.topazproject.ambra.article.service.NoSuchArticleIdException;
-import org.topazproject.ambra.article.service.ArticleOtmService;
-import org.topazproject.ambra.journal.JournalService;
-import org.topazproject.ambra.model.article.ArticleInfo;
-import org.topazproject.ambra.model.article.ArticleType;
-import org.topazproject.ambra.models.Article;
-import org.topazproject.ambra.models.ArticleAnnotation;
-import org.topazproject.ambra.models.FormalCorrection;
-import org.topazproject.ambra.models.Journal;
-import org.topazproject.ambra.models.MinorCorrection;
-import org.topazproject.ambra.models.Retraction;
+import java.net.URI;
+import java.util.Set;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
 
 /**
- * Fetch article action.
+ * This class fetches the information from the service tier for the artcle
+ * Tabs.  Common data is defined in the setCommonData.  One method is defined
+ * for each tab.
+ *
+ * Freemarker builds rest like URLs, inbound and outbound as
+ * defined in the /WEB-INF/urlrewrite.xml file. These URLS then map to the
+ * methods are referenced in the struts.xml file.
+ *
+ * ex: http://localhost/article/related/info%3Adoi%2F10.1371%2Fjournal.pone.0299
+ *
+ * Gets rewritten to:
+ *
+ * http://localhost/fetchRelatedArticle.action&articleURI=info%3Adoi%2F10.1371%2Fjournal.pone.0299
+ *
+ * Struts picks this up and translates it call the FetchArticleRelated method
+ * ex: <action name="fetchRelatedArticle"
+ *    class="org.topazproject.ambra.article.action.FetchArticleAction"
+ *    method="FetchArticleRelated">
+ * 
  */
-@SuppressWarnings("serial")
-public class FetchArticleAction extends BaseActionSupport {
+public class FetchArticleAction extends BaseSessionAwareActionSupport {
+  private static final Log log = LogFactory.getLog(FetchArticleAction.class);
+  private final ArrayList<String> messages = new ArrayList<String>();
+
   private String articleURI;
+  private String transformedArticle;
   private String annotationId = "";
 
-  private final ArrayList<String> messages = new ArrayList<String>();
-  private static final Log log = LogFactory.getLog(FetchArticleAction.class);
-  private BrowseService browseService;
-  private FetchArticleService fetchArticleService;
-  private ArticleOtmService articleOtmService;
-  private JournalService journalService;
-  private Set<Journal> journalList;
+  private int numDiscussions = 0;
+  private int numMinorCorrections = 0;
+  private int numComments = 0;
+  private int numFormalCorrections = 0;
+  private int numRetractions = 0;
+
+  private boolean isResearchArticle;
+  private boolean hasRated;
+
+  private ArticleInfo articleInfoX;
   private Article articleInfo;
   private ArticleType articleType;
-  private ArticleInfo articleInfoX;
-  private String transformedArticle;
-  // Displayed article type (assigned default)
-  private final String articleTypeHeading = "Research Article";
+  private Commentary[] commentary;
+
+  private ReplyService replyService;
+  private AnnotationConverter annotationConverter;
+  private FetchArticleService fetchArticleService;
   private AnnotationService annotationService;
-  private int numDiscussions = 0;
-  private int numMinorCorrections = 0;
-  private int numFormalCorrections = 0;
-  private int numRetractions = 0;
-  /**
-   * Represents the number of notes that are not corrections from  a UI stand point
-   */
-  private int numComments = 0;
-
-
-  @Override
+  private BrowseService browseService;
+  private JournalService journalService;
+  private RatingsService ratingsService;
+  private ArticleOtmService articleOtmService;
+
+  private Set<Journal> journalList;
+  private RatingsService.AverageRatings averageRatings;
+
+  /**
+   * Fetch common data the article HTML text
+   * @return "success" on succes, "error" on error
+   */
   @Transactional(readOnly = true)
-  public String execute() {
+  public String FetchArticle() {
     try {
-      setTransformedArticle(fetchArticleService.getURIAsHTML(articleURI));
-
-      ArticleAnnotation anns[] = annotationService.listAnnotations(articleURI, null);
-      // Tally the total number of each type of correction.
-      for (ArticleAnnotation a : anns) {
-        if (a.getContext() == null) {
-          numDiscussions ++;
-        } else {
-          if (a instanceof MinorCorrection) {
-            numMinorCorrections++;
-          } else if (a instanceof FormalCorrection) {
-            numFormalCorrections++;
-          } else if (a instanceof Retraction) {
-            numRetractions++;
-          } else {
-            numComments++;
-          }
-        }
-      }
-
-      Article artInfo = articleOtmService.getArticle(URI.create(articleURI));
-
-      setArticleInfo(artInfo);
-
-      articleType = ArticleType.getDefaultArticleType();
-      for (URI artTypeUri : artInfo.getArticleType()) {
-        if (ArticleType.getKnownArticleTypeForURI(artTypeUri)!= null) {
-          articleType = ArticleType.getKnownArticleTypeForURI(artTypeUri);
-          break;
-        }
-      }
-
-      // get the alternate ArticleInfo, e.g. contains RelatedArticles
-      articleInfoX = browseService.getArticleInfo(URI.create(articleURI));
-
-      journalList  = journalService.getJournalsForObject(URI.create(articleURI));
+      setCommonData();
+
+      transformedArticle = fetchArticleService.getURIAsHTML(articleURI);
+
     } catch (NoSuchArticleIdException e) {
       messages.add("No article found for id: " + articleURI);
@@ -132 +132 @@
 
   /**
-   * A struts Action method used to display the annotated article. 
-   * The transformedArticle field is populated with the annotated articleURI content. 
-   * 
-   * @return Annotated Article XML String
+   * Fetch common data and annotations
+   * @return "success" on succes, "error" on error
    */
   @Transactional(readOnly = true)
-  public String displayAnnotatedArticle() {
+  public String FetchArticleComments() {
     try {
-      setTransformedArticle(fetchArticleService.getAnnotatedContent(articleURI));
+      setCommonData();
+      setAnnotations(annotationService.COMMENT_SET);
+
+    } catch (NoSuchArticleIdException e) {
+      messages.add("No article found for id: " + articleURI);
+      log.info("Could not find article: " + articleURI, e);
+      return ERROR;
     } catch (Exception e) {
-      log.error ("Could not get annotated article:" + articleURI, e);
+      messages.add(e.getMessage());
+      log.error("Error retrieving article: " + articleURI, e);
       return ERROR;
     }
@@ -149 +154 @@
 
   /**
-   * @return transformed output
-   */
-  public String getTransformedArticle() {
-    return transformedArticle;
-  }
-
-  private void setTransformedArticle(final String transformedArticle) {
-    this.transformedArticle = transformedArticle;
+   * Fetch common data and article corrections
+   * @return "success" on succes, "error" on error
+   */
+  @Transactional(readOnly = true)
+  public String FetchArticleCorrections() {
+    try {
+      setCommonData();
+      setAnnotations(annotationService.CORRECTION_SET);
+
+    } catch (NoSuchArticleIdException e) {
+      messages.add("No article found for id: " + articleURI);
+      log.info("Could not find article: " + articleURI, e);
+      return ERROR;
+    } catch (Exception e) {
+      messages.add(e.getMessage());
+      log.error("Error retrieving article: " + articleURI, e);
+      return ERROR;
+    }
+    return SUCCESS;
+  }
+
+  /**
+   * Fetches common data and nothing else
+   * @return "success" on succes, "error" on error
+   */
+  @Transactional(readOnly = true)
+  public String FetchArticleRelated() {
+    try {
+      setCommonData();
+
+    } catch (NoSuchArticleIdException e) {
+      messages.add("No article found for id: " + articleURI);
+      log.info("Could not find article: " + articleURI, e);
+      return ERROR;
+    } catch (Exception e) {
+      messages.add(e.getMessage());
+      log.error("Error retrieving article: " + articleURI, e);
+      return ERROR;
+    }
+    return SUCCESS;
+  }
+
+  /**
+   * Sets up data used by the right hand column in the freemarker templates
+   *
+   * @throws ApplicationException when there is an error talking to the OTM
+   * @throws NoSuchArticleIdException when the article can not be found
+   */
+  private void setCommonData() throws ApplicationException, NoSuchArticleIdException {
+    articleInfoX = browseService.getArticleInfo(URI.create(articleURI));
+    averageRatings = ratingsService.getAverageRatings(articleURI);
+    journalList  = journalService.getJournalsForObject(URI.create(articleURI));
+    isResearchArticle = articleOtmService.isResearchArticle(articleURI);
+    hasRated = ratingsService.hasRated(articleURI, getCurrentUser());
+
+    ArticleAnnotation anns[] = annotationService.listAnnotations(articleURI, null);
+
+    //Tally the total number of each type of correction
+    for (ArticleAnnotation a : anns) {
+      if (a.getContext() == null) {
+        numDiscussions++;
+      } else {
+        if (a instanceof MinorCorrection) {
+          numMinorCorrections++;
+        } else if (a instanceof FormalCorrection) {
+          numFormalCorrections++;
+        } else if (a instanceof Retraction) {
+                numRetractions++;
+        } else {
+          numComments++;
+        }
+      }
+    }
+
+    Article artInfo = articleOtmService.getArticle(URI.create(articleURI));
+    artInfo.getCategories();
+
+    this.articleInfo = artInfo;
+
+    articleType = ArticleType.getDefaultArticleType();
+    for (URI artTypeUri : artInfo.getArticleType()) {
+      if (ArticleType.getKnownArticleTypeForURI(artTypeUri)!= null) {
+        articleType = ArticleType.getKnownArticleTypeForURI(artTypeUri);
+        break;
+      }
+    }
+  }
+
+  /**
+   * Grabs annotations from the service tier
+   * @param annotationTypeClasses The type of annotation to grab.
+   */
+  private void setAnnotations(Set<Class<? extends ArticleAnnotation>> annotationTypeClasses) {
+    WebAnnotation[] annotations =
+        annotationConverter.convert(annotationService.listAnnotations(articleURI, annotationTypeClasses), true, false);
+
+    commentary = new Commentary[annotations.length];
+    Commentary com;
+
+    if (annotations.length > 0) {
+      for (int i = 0; i < annotations.length; i++) {
+        com = new Commentary();
+        com.setAnnotation(annotations[i]);
+
+        try {
+          annotationConverter.convert(replyService.listAllReplies(annotations[i].getId(),
+                                                        annotations[i].getId()), com, false,
+                                                         false);
+        } catch (SecurityException t) {
+          // don't error if you can't list the replies
+          com.setNumReplies(0);
+          com.setReplies(null);
+        }
+        commentary[i] = com;
+      }
+      Arrays.sort(commentary, new Commentary.Sorter());
+    }
   }
 
   /** Set the fetch article service
+   * @param articleOtmService ArticleOtmService
+   */
+  @Required
+  public void setArticleOtmService(ArticleOtmService articleOtmService) {
+    this.articleOtmService = articleOtmService;
+  }
+
+    /** Set the fetch article service
    * @param fetchArticleService fetchArticleService
    */
@@ -167 +289 @@
   }
 
-  /** Set the fetch article service
-   * @param articleOtmService ArticleOtmService
-   */
-  @Required
-  public void setArticleOtmService(ArticleOtmService articleOtmService) {
-    this.articleOtmService = articleOtmService;
-  }
+  /**
+   * @param browseService The browseService to set.
+   */
+  @Required
+  public void setBrowseService(BrowseService browseService) {
+    this.browseService = browseService;
+  }
+
+  @Required
+  public void setReplyService(final ReplyService replyService) {
+    this.replyService = replyService;
+  }
+
+  @Required
+  public void setAnnotationConverter(AnnotationConverter annotationConverter) {
+    this.annotationConverter = annotationConverter;
+  }
+
+  /**
+   * Set the ratings service.
+   *
+   * @param ratingsService the ratings service
+   */
+  @Required
+  public void setRatingsService(final RatingsService ratingsService) {
+    this.ratingsService = ratingsService;
+  }
+
+  /**
+   * @param annotationService The annotationService to set.
+   */
+  @Required
+  public void setAnnotationService(AnnotationService annotationService) {
+    this.annotationService = annotationService;
+  }
+
+  /**
+   * @param journalService The journalService to set.
+   */
+  @Required
+  public void setJournalService(JournalService journalService) {
+    this.journalService = journalService;
+  }
+
 
   /**
@@ -191 +350 @@
   }
 
-  public ArrayList<String> getMessages() {
-    return messages;
-  }
-
-  /**
-   * @return Returns the annotationId.
-   */
-  public String getAnnotationId() {
-    return annotationId;
-  }
-
-  /**
-   * @param annotationId The annotationId to set.
-   */
-  public void setAnnotationId(String annotationId) {
-    this.annotationId = annotationId;
-  }
-
-  /**
-   * @return Returns the annotationService.
-   */
-  public AnnotationService getAnnotationService() {
-    return annotationService;
-  }
-
-  /**
-   * @param annotationService The annotationService to set.
-   */
-  public void setAnnotationService(AnnotationService annotationService) {
-    this.annotationService = annotationService;
-  }
-
-  /**
-   * @return Returns the numDiscussions.
-   */
-  public int getNumDiscussions() {
-    return numDiscussions;
-  }
-
-  /**
-   * @return Returns the numComments.
-   */
-  public int getNumComments() {
-    return numComments;
-  }
-
-  /**
-   * @return Returns the numMinorCorrections.
-   */
-  public int getNumMinorCorrections() {
-    return numMinorCorrections;
-  }
-
-  /**
-   * @return Returns the numFormalCorrections.
-   */
-  public int getNumFormalCorrections() {
-    return numFormalCorrections;
-  }
-
-  /**
-   * Zero if this Article has not been retracted.  One if this Article has been retracted.
-   * Having multiple Retractions for a single Article does not make sense.
-   *
-   * @return Returns the number of Retractions that have been associated to this Article.
-   */
-  public int getNumRetractions() {
-    return numRetractions;
-  }
-
-  /**
-   * @return Returns the calculated number of notes.
-   */
-  public int getNumNotes() {
-    return numComments + numMinorCorrections + numFormalCorrections + numRetractions;
-  }
-
-  /**
-   * @return Returns the total number of corrections.
-   */
-  public int getNumCorrections() {
-    return numMinorCorrections + numFormalCorrections + numRetractions;
+  /**
+   * @return transformed output
+   */
+  public String getTransformedArticle() {
+    return transformedArticle;
   }
 
@@ -291 +373 @@
 
   /**
-   * @return Returns the articleInfo.
+   * @return Returns the annotationId.
+   */
+  public String getAnnotationId() {
+    return annotationId;
+  }
+
+  /**
+   * @param annotationId The annotationId to set.
+   */
+  public void setAnnotationId(String annotationId) {
+    this.annotationId = annotationId;
+  }
+
+  /**
+   * Get the article object
+   * @return Returns article.
    */
   public Article getArticleInfo() {
@@ -298 +395 @@
 
   /**
-   * The article type displayed by article_content.ftl as per #693
-   *
-   * @return the article type heading
-   */
-  public String getArticleTypeHeading() {
-    return articleTypeHeading;
-  }
-
-  /**
-   * @param articleInfo The articleInfo to set.
-   */
-  private void setArticleInfo(Article articleInfo) {
-    this.articleInfo = articleInfo;
-  }
-
-  /**
-   * @param journalService The journalService to set.
-   */
-  @Required
-  public void setJournalService(JournalService journalService) {
-    this.journalService = journalService;
+   * Gets the article Type
+   * @return Returns articleType
+   */
+  public ArticleType getArticleType() {
+    return articleType;
+  }
+
+  public ArrayList<String> getMessages() {
+    return messages;
   }
 
@@ -329 +414 @@
 
   /**
-   * @param browseService The browseService to set.
-   */
-  @Required
-  public void setBrowseService(BrowseService browseService) {
-    this.browseService = browseService;
-  }
-
-  public ArticleType getArticleType() {
-    return articleType;
+   * Tests if this article has been rated by the current user
+   *
+   * @return Returns the hasRated.
+   */
+  public boolean getHasRated() {
+    return hasRated;
+  }
+
+  /**
+   * @return the isResearchArticle
+   */
+  public boolean getIsResearchArticle() {
+    return isResearchArticle;
+  }
+
+  /*
+  * Gets averageRatings info
+  *
+  * @return returns averageRatings info
+  * */
+  public RatingsService.AverageRatings getAverageRatings()
+  {
+    return averageRatings;
+  }
+
+  /**
+   * Get the total number of user comments
+   * @return total number of user comments
+   */
+  public int getTotalComments()
+  {
+    return numDiscussions + numComments + numMinorCorrections + numFormalCorrections + numRetractions;
+  }
+
+  /**
+   * Zero if this Article has not been retracted.  One if this Article has been retracted.
+   * Having multiple Retractions for a single Article does not make sense.
+   *
+   * @return Returns the number of Retractions that have been associated to this Article.
+   */ 
+  public int getNumRetractions() {
+    return numRetractions;
+  }
+
+  /**
+   * @return Returns the numDiscussions.
+   */
+  public int getNumDiscussions() {
+    return numDiscussions;
+  }
+
+  /**
+   * @return Returns the numComments.
+   */
+  public int getNumComments() {
+    return numComments;
+  }
+
+  /**
+   * @return Returns the numMinorCorrections.
+   */
+  public int getNumMinorCorrections() {
+    return numMinorCorrections;
+  }
+
+  /**
+   * @return Returns the numFormalCorrections.
+   */
+  public int getNumFormalCorrections() {
+    return numFormalCorrections;
+  }
+
+  /**
+   * @return The commentary array
+   */
+  public Commentary[] getCommentary() {
+    return commentary;
   }
 }

head/ambra/webapp/src/main/java/org/topazproject/ambra/article/service/ArticleOtmService.java

@@ -27 +27 @@
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.Iterator;
 
 import javax.activation.DataSource;
@@ -38 +40 @@
 import org.springframework.transaction.annotation.Transactional;
 
+import org.topazproject.ambra.ApplicationException;
+import org.topazproject.ambra.cache.Cache;
+import org.topazproject.ambra.rating.action.ArticleRatingSummary;
 import org.topazproject.ambra.models.Article;
 import org.topazproject.ambra.models.ObjectInfo;
 import org.topazproject.ambra.models.Representation;
+import org.topazproject.ambra.models.RatingSummary;
+import org.topazproject.ambra.models.Rating;
+import org.topazproject.ambra.models.UserAccount;
+import org.topazproject.ambra.models.Trackback;
+import org.topazproject.ambra.models.Category;
+import org.topazproject.ambra.model.article.ArticleType;
 import org.topazproject.ambra.permission.service.PermissionsService;
 import org.topazproject.otm.Session;
 import org.topazproject.otm.Query;
+import org.topazproject.otm.OtmException;
+import org.topazproject.otm.criterion.Restrictions;
+import org.topazproject.otm.criterion.Order;
 import org.topazproject.otm.query.Results;
 
@@ -53 +67 @@
 public class ArticleOtmService {
   private static final Log log = LogFactory.getLog(ArticleOtmService.class);
+  private static final String TRACK_BACKS_KEY = "Trackbacks-";
 
   private String smallImageRep;
@@ -61 +76 @@
   private Session session;
   private PermissionsService permissionsService;
+  private Cache articleAnnotationCache;
   private Configuration configuration;
 
@@ -394 +410 @@
    * @param articleIds  list of article id's
    * @return <code>List&lt;Article&gt;</code> of articles requested
-   * @throws ParseException
-   */
-  @Transactional(readOnly = true)
-  public List<Article> getArticles(List<String> articleIds) throws ParseException {
+   * @throws ParseException  when article ids are invalid
+   * @throws OtmException when session.get fails.
+   */
+  @Transactional(readOnly = true)
+  public List<Article> getArticles(List<String> articleIds) throws OtmException,ParseException {
     List<Article> articleList = new ArrayList<Article>();
     for (String id : articleIds)
@@ -466 +483 @@
     return convertedObjectInfos;
   }
+
+  /**
+   * Determines if the articleURI is of type researchArticle
+   * @param articleURI The URI of the article
+   * @return True if the article is a research article
+   * @throws ApplicationException if there was a problem talking to the OTM
+   * @throws NoSuchArticleIdException When the article does not exist
+   */
+  public boolean isResearchArticle(String articleURI)
+    throws ApplicationException, NoSuchArticleIdException {
+    // resolve article type and supported properties
+    Article artInfo = getArticle(URI.create(articleURI));
+    ArticleType articleType = ArticleType.getDefaultArticleType();
+
+    for (URI artTypeUri : artInfo.getArticleType()) {
+      if (ArticleType.getKnownArticleTypeForURI(artTypeUri) != null) {
+        articleType = ArticleType.getKnownArticleTypeForURI(artTypeUri);
+        break;
+      }
+    }
+
+    if (articleType == null) {
+      throw new ApplicationException("Unable to resolve article type for: " + articleURI);
+    }
+    return ArticleType.isResearchArticle(articleType);
+  }  
 
   /**
@@ -513 +556 @@
   }
 
+  /**
+   * Get rating summaries for the passed in articleURI 
+   *
+   * @param articleURI articleURI to get rating summaries for
+   * @return List<RatingSummary> of rating Summaries
+   */
+  @Transactional(readOnly = true)
+  public List<RatingSummary> getRatingSummaries(URI articleURI) {
+    /* assume if valid RatingsPEP.GET_RATINGS, OK to GET_STATS
+     * RatingSummary for this Article
+     */
+    return session.createCriteria(RatingSummary.class).add(
+        Restrictions.eq("annotates", articleURI)).list();
+  }
+
+  /**
+   * Get article rating summaries for the passed in articleURI
+   *
+   * @param articleURI articleURI to get rating summaries for
+   * @return List<ArticleRatingSummary> of rating Summaries
+   */
+  @Transactional(readOnly = true)
+  public List<ArticleRatingSummary> getArticleRatingSummaries(URI articleURI)
+  {
+    List<ArticleRatingSummary> articleRatingSummaries = new ArrayList<ArticleRatingSummary>();
+
+    List<Rating> articleRatings = session.createCriteria(Rating.class).add(
+        Restrictions.eq("annotates", articleURI)).addOrder(new Order("created", true)).list();
+
+    // create ArticleRatingSummary(s)
+    for (Rating rating : articleRatings) {
+      ArticleRatingSummary summary = new ArticleRatingSummary(articleURI.toString(), null);
+      summary.setRating(rating);
+      summary.setCreated(rating.getCreated());
+      summary.setArticleURI(articleURI.toString());
+      summary.setCreatorURI(rating.getCreator());
+
+      // get public 'name' for user
+      UserAccount ua = session.get(UserAccount.class, rating.getCreator());
+      if (ua != null) {
+        summary.setCreatorName(ua.getProfile().getDisplayName());
+      } else {
+        summary.setCreatorName("Unknown");
+        log.error("Unable to look up UserAccount for " + rating.getCreator() +
+                  " for Rating " + rating.getId());
+      }
+      articleRatingSummaries.add(summary);
+    }
+
+    return articleRatingSummaries;
+  }
+
+  /**
+   * Get track backs for a given trackbackId
+   *
+   * @param trackbackId
+   * @return List<Trackback> List of track backs
+   */
+  @Transactional(readOnly = true)
+  public List<Trackback> getTrackbacks(String trackbackId) {
+    final String fTrackbackId = trackbackId;
+    
+    List<String> ids = articleAnnotationCache.get(TRACK_BACKS_KEY  + trackbackId, -1,
+            new Cache.SynchronizedLookup<List<String>, OtmException>(trackbackId.intern()) {
+              public List<String> lookup() throws OtmException {
+                return getIds(fTrackbackId);
+              }
+            });
+
+    List<Trackback> trackbackList = new ArrayList<Trackback>(ids.size());
+
+    for (String id : ids) {
+      Trackback t = session.get(Trackback.class, id);
+      trackbackList.add(t);
+
+      t.getBlog_name(); // for lazy load
+    }
+
+    return trackbackList;
+  }
+
+  /**
+   * Return a list of track backs for a particular track back ID
+   * @param trackbackId The Trackback ID
+   * @return a list of IDs for track back records
+   * @throws OtmException When there is an error talking to the OTM
+   */
+  private List<String> getIds(String trackbackId) throws OtmException {
+    if (log.isDebugEnabled())
+      log.debug("retrieving trackbacks for: " + trackbackId);
+
+    List<String> ids = new ArrayList<String>();
+    Results r = session.createQuery("select t.id, t.created created from Trackback t where "
+       + "t.annotates = :id order by created desc;").setParameter("id", trackbackId).execute();
+
+    while (r.next())
+      ids.add(r.getString(0));
+
+    return ids;
+  }
+
   private SecondaryObject convert(final ObjectInfo objectInfo) {
     return new SecondaryObject(objectInfo, smallImageRep, mediumImageRep, largeImageRep);
@@ -577 +721 @@
   }
 
+  /**
+   * @param articleAnnotationCache The Article(transformed)/ArticleInfo/Annotation/Citation cache
+   *   to use.
+   */
+  @Required
+  public void setArticleAnnotationCache(Cache articleAnnotationCache) {
+    this.articleAnnotationCache = articleAnnotationCache;
+  }
 
   private static class ByteArrayDataSource implements DataSource {

head/ambra/webapp/src/main/java/org/topazproject/ambra/rating/action/AbstractRatingAction.java

@@ -19 +19 @@
 package org.topazproject.ambra.rating.action;
 
-import java.net.URI;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -26 +24 @@
 import org.springframework.beans.factory.annotation.Required;
 
-import org.topazproject.ambra.ApplicationException;
 import org.topazproject.ambra.action.BaseSessionAwareActionSupport;
 import org.topazproject.ambra.article.service.ArticleOtmService;
-import org.topazproject.ambra.article.service.NoSuchArticleIdException;
-import org.topazproject.ambra.model.article.ArticleType;
-import org.topazproject.ambra.models.Article;
 
 /**
@@ -45 +39 @@
 
   /**
+   * Sets the article OTM service for any sub classes to call
+   * 
    * @param articleOtmService the ArticleOtmService to set
    */
@@ -51 +47 @@
     this.articleOtmService = articleOtmService;
   }
-
-  /**
-   * Determines if an article is a research type article.
-   *
-   * @param articleURI The URI of the article.
-   * @return true/false
-   * @throws NoSuchArticleIdException When no article resolvable for the articleURI. 
-   * @throws ApplicationException When no article type is resolvable for the article.
-   */
-  protected final boolean isResearchArticle(String articleURI)
-    throws ApplicationException, NoSuchArticleIdException {
-    // resolve article type and supported properties
-    Article artInfo = articleOtmService.getArticle(URI.create(articleURI));
-    ArticleType articleType = ArticleType.getDefaultArticleType();
-    for (URI artTypeUri : artInfo.getArticleType()) {
-      if (ArticleType.getKnownArticleTypeForURI(artTypeUri) != null) {
-        articleType = ArticleType.getKnownArticleTypeForURI(artTypeUri);
-        break;
-      }
-    }
-    if (articleType == null)
-      throw new ApplicationException("Unable to resolve article type for: " + articleURI);
-    return ArticleType.isResearchArticle(articleType);
-  }
 }

head/ambra/webapp/src/main/java/org/topazproject/ambra/rating/action/GetArticleRatingsAction.java

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2007-2008 by Topaz, Inc.
+ * Copyright (c) 2007-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -35 +35 @@
 import org.topazproject.ambra.models.UserAccount;
 import org.topazproject.ambra.rating.service.RatingsPEP;
+import org.topazproject.ambra.rating.service.RatingsService;
+import org.topazproject.ambra.rating.service.RatingsService.AverageRatings;
 import org.topazproject.otm.Session;
 import org.topazproject.otm.criterion.Order;
@@ -49 +51 @@
 public class GetArticleRatingsAction extends AbstractRatingAction {
   protected static final Log log = LogFactory.getLog(GetArticleRatingsAction.class);
-
-  private Session                          session;
-  private String                           articleURI;
-  private String                           articleTitle;
-  private String                           articleDescription;
-  private boolean                          isResearchArticle;
-  private boolean                          hasRated = false;
+  private RatingsService ratingsService;
+
+  private Session session;
+  private String articleURI;
+  private String  articleTitle;
+  private String articleDescription;
+  private boolean isResearchArticle;
+  private AverageRatings averageRatings;
   private final List<ArticleRatingSummary> articleRatingSummaries =
                                              new ArrayList<ArticleRatingSummary>();
-  private double                           articleOverall = 0;
-  private double                           articleSingleRating = 0;
-  private RatingsPEP                       pep;
+  private double articleOverall = 0;
+  private double articleSingleRating = 0;
+  private RatingsPEP pep;
 
   private RatingsPEP getPEP() {
@@ -89 +92 @@
     articleTitle = article.getDublinCore().getTitle();
     articleDescription = article.getDublinCore().getDescription();
-
-    isResearchArticle = isResearchArticle(articleURI);
+    averageRatings = ratingsService.getAverageRatings(articleURI);
+
+    isResearchArticle = articleOtmService.isResearchArticle(articleURI);
 
     // assume if valid RatingsPEP.GET_RATINGS, OK to GET_STATS
@@ -117 +121 @@
     // create ArticleRatingSummary(s)
     for (Rating rating : articleRatings) {
-      ArticleRatingSummary summary = new ArticleRatingSummary(
-          getArticleURI(), getArticleTitle());
+      ArticleRatingSummary summary = new ArticleRatingSummary(getArticleURI(), getArticleTitle());
       summary.setRating(rating);
       summary.setCreated(rating.getCreated());
@@ -136 +139 @@
     }
 
-    if(articleRatingSummaries.size() > 0) {
-      hasRated = true;
-    }
-
     if(log.isDebugEnabled()) {
       log.debug("created ArticleRatingSummaries, " + articleRatingSummaries.size() +
@@ -239 +238 @@
 
   /**
+   * Set the ratings service.
+   *
+   * @param ratingsService the ratings service
+   */
+  @Required
+  public void setRatingsService(final RatingsService ratingsService) {
+    this.ratingsService = ratingsService;
+  }
+
+  /**
    * Set the OTM session. Called by spring's bean wiring.
    *
@@ -249 +258 @@
 
   /**
-   * Tests if this article has been rated.
-   *
-   * @return Returns the hasRated.
-   */
-  public boolean isHasRated() {
-    return hasRated;
-  }
-
-  /**
-   * Sets a flag to indicate that an article has been rated.
-   *
-   * @param hasRated The hasRated to set.
-   */
-  public void setHasRated(boolean hasRated) {
-    this.hasRated = hasRated;
-  }
-
-  /**
    * Gets all ratings for the Article.
    *
@@ -274 +265 @@
     return articleRatingSummaries;
   }
+
+  /*
+  * Gets averageRatings info
+  *
+  * @return returns averageRatings info
+  */
+  public RatingsService.AverageRatings getAverageRatings() {
+    return averageRatings;
+  }
+
+ /**
+  * Has this article been rated?
+  *
+  * @return true if the article has been rated
+  */
+  public boolean getHasRated() {
+    return (articleRatingSummaries.size() > 0);
+  }
 }

head/ambra/webapp/src/main/java/org/topazproject/ambra/rating/action/GetAverageRatingsAction.java

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2007-2008 by Topaz, Inc.
+ * Copyright (c) 2007-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -21 +21 @@
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.transaction.annotation.Transactional;
-
 import org.topazproject.ambra.rating.service.RatingsService;
-import org.topazproject.ambra.user.AmbraUser;
+import org.topazproject.ambra.rating.service.RatingsService.AverageRatings;
 
 /**
@@ -32 +31 @@
 @SuppressWarnings("serial")
 public class GetAverageRatingsAction extends AbstractRatingAction {
-  private RatingsService                  ratingsService;
-  private RatingsService.AverageRatings   avg;
-  private String                          articleURI;
-  private boolean                         isResearchArticle;
-  private boolean                         hasRated = false;
+  private RatingsService  ratingsService;
+  private AverageRatings averageRatings;
+  private String articleURI;
+  private boolean isResearchArticle;
+  private boolean hasRated = false;
 
   /**
@@ -46 +45 @@
   @Transactional(readOnly = true)
   public String execute() throws Exception {
-    avg = ratingsService.getAverageRatings(articleURI);
+    averageRatings = ratingsService.getAverageRatings(articleURI);
     hasRated = ratingsService.hasRated(articleURI, getCurrentUser());
-    isResearchArticle = isResearchArticle(articleURI);
+    isResearchArticle = articleOtmService.isResearchArticle(articleURI);
     return SUCCESS;
   }
@@ -87 +86 @@
   }
 
-  /**
-   * Gets the insight ratings average.
-   *
-   * @return Returns the insightAverage.
-   */
-  public double getInsightAverage() {
-    return avg.insight.average;
-  }
-
-  /**
-   * Gets the count of insight ratings.
-   *
-   * @return Returns the numInsightRatings.
-   */
-  public int getNumInsightRatings() {
-    return avg.insight.count;
-  }
-
-  /**
-   * Gets the count of reliability ratings.
-   *
-   * @return Returns the numReliabilityRatings.
-   */
-  public int getNumReliabilityRatings() {
-    return avg.reliability.count;
-  }
-
-  /**
-   * @return the numSingleRatingRatings
-   */
-  public int getNumSingleRatingRatings() {
-    return avg.single.count;
-  }
-
-  /**
-   * Gets the count of style ratings.
-   *
-   * @return Returns the numStyleRatings.
-   */
-  public int getNumStyleRatings() {
-    return avg.style.count;
-  }
-
-
-  /**
-   * Gets the overall average ratings.
-   *
-   * @return Returns the overallAverage.
-   */
-  public double getOverallAverage() {
-    return avg.overall;
-  }
-
-  /**
-   * Gets the reliability ratings average.
-   *
-   * @return Returns the reliabilityAverage.
-   */
-  public double getReliabilityAverage() {
-    return avg.reliability.average;
-  }
-
-  /**
-   * Gets the style ratings average.
-   *
-   * @return Returns the styleAverage.
-   */
-  public double getStyleAverage() {
-    return avg.style.average;
-  }
-
-  /**
-   * @return the singleRatingAverage
-   */
-  public double getSingleRatingAverage() {
-    return avg.single.average;
-  }
-
-
-  /**
-   * Gets the total on insight ratings.
-   *
-   * @return Returns the totalInsight.
-   */
-  public double getTotalInsight() {
-    return avg.insight.total;
-  }
-
-  /**
-   * Gets the total on reliability ratings.
-   *
-   * @return Returns the totalReliability.
-   */
-  public double getTotalReliability() {
-    return avg.reliability.total;
-  }
-
-  /**
-   * @return the totalSingleRating
-   */
-  public double getTotalSingleRating() {
-    return avg.single.total;
-  }
-
-  /**
-   * Gets the total on style ratings.
-   *
-   * @return Returns the totalStyle.
-   */
-  public double getTotalStyle() {
-    return avg.style.total;
+  /*
+  * Gets averageRatings info
+  *
+  * @return returns averageRatings info
+  * */
+  public RatingsService.AverageRatings getAverageRatings() {
+    return averageRatings;
   }
 
@@ -205 +100 @@
    * @return Returns the hasRated.
    */
-  public boolean isHasRated() {
+  public boolean getHasRated() {
     return hasRated;
   }
-
-  /**
-   * Gets the rounded average on insight ratings.
-   *
-   * @return Returns the insightRoundedAverage.
-   */
-  public double getInsightRoundedAverage() {
-    return avg.insight.rounded;
-  }
-
-  /**
-   * Gets the overall rounded average.
-   *
-   * @return Returns the overallRoundedAverage.
-   */
-  public double getOverallRoundedAverage() {
-    return avg.roundedOverall;
-  }
-
-  /**
-   * Gets the rounded average on reliability ratings.
-   *
-   * @return Returns the reliabilityRoundedAverage.
-   */
-  public double getReliabilityRoundedAverage() {
-    return avg.reliability.rounded;
-  }
-
-  /**
-   * @return the singleRatingRoundedAverage
-   */
-  public double getSingleRatingRoundedAverage() {
-    return avg.single.rounded;
-  }
-
-  /**
-   * Gets the rounded average on style ratings.
-   *
-   * @return Returns the styleRoundedAverage.
-   */
-  public double getStyleRoundedAverage() {
-    return avg.style.rounded;
-  }
-
-  /**
-   * Gets the number of users that rated.
-   *
-   * @return Number of users that rated.
-   */
-  public int getNumUsersThatRated() {
-    return avg.numUsersThatRated;
-  }
 }

head/ambra/webapp/src/main/java/org/topazproject/ambra/rating/action/RateAction.java

@@ -110 +110 @@
 
     try {
-      isResearchArticle = isResearchArticle(articleURI);
+      isResearchArticle = articleOtmService.isResearchArticle(articleURI);
     } catch (Exception ae) {
       log.info("Could not get article info for: " + articleURI, ae);

head/ambra/webapp/src/main/java/org/topazproject/ambra/rating/service/RatingsService.java

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006-2008 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -127 +127 @@
    *
    * @param ratingId Rating Id
-   *
-   * @param user
+   * @param user current ambra user
    * @return Rating
    */
@@ -253 +252 @@
     private static final long serialVersionUID = -2890067268188424471L;
 
-    public final double total;
-    public final int    count;
-    public final double average;
-    public final double rounded;
+    private final double total;
+    private final int    count;
+    private final double average;
+    private final double rounded;
 
     Average(double total, int count) {
@@ -270 +269 @@
              ", rounded = " + rounded;
     }
+
+    public double getTotal() {
+      return total;
+    }
+
+    public int getCount() {
+      return count;
+    }
+
+    public double getAverage() {
+      return average;
+    }
+
+    public double getRounded() {
+      return rounded;
+    }    
   }
 
@@ -275 +290 @@
     private static final long serialVersionUID = -1666766336307635633L;
 
-    public final Average style;
-    public final Average insight;
-    public final Average reliability;
-    public final Average single;
-    public final int     numUsersThatRated;
-    public final double  overall;
-    public final double  roundedOverall;
+    private final Average style;
+    private final Average insight;
+    private final Average reliability;
+    private final Average single;
+    private final int     numUsersThatRated;
+    private final double  overall;
+    private final double  roundedOverall;
 
     AverageRatings() {
@@ -318 +333 @@
              ", roundedOverall = " + roundedOverall;
     }
+
+    public Average getStyle() {
+      return style;
+    }
+
+    public Average getInsight() {
+      return insight;
+    }
+
+    public Average getReliability() {
+      return reliability;
+    }
+
+    public Average getSingle() {
+      return single;
+    }
+
+    public int getNumUsersThatRated() {
+      return numUsersThatRated;
+    }
+
+    public double getOverall() {
+      return overall;
+    }
+
+    public double getRoundedOverall()
+    {
+      return roundedOverall;
+    }      
   }
 

head/ambra/webapp/src/main/resources/struts.xml

@@ -260 +260 @@
 
     <default-action-ref name="pageNotFound" />
-
-    <action name="getAverageRatingsForArticle" class="org.topazproject.ambra.rating.action.GetAverageRatingsAction">
-      <interceptor-ref name="chain">
-        <param name="excludes">targetSource, callbacks, exposeProxy</param>
-      </interceptor-ref>
-      <interceptor-ref name="ambraUserStack"/>
-      <result name="success" type="ambraFreemarker">
-        <param name="templateFile">/article/article_body.ftl</param>
-        <param name="noCache">true</param>
-      </result>
-    </action>
     <action name="getAverageRatings" class="org.topazproject.ambra.rating.action.GetAverageRatingsAction">
       <result name="success">/WEB-INF/pages/article/articleRatings.ftl</result>
@@ -346 +335 @@
     </action>
 
-    <action name="getNumTrackbacksForArticle" class="org.topazproject.ambra.action.TrackbackAction" method="getTrackbackCount">
-      <interceptor-ref name="chain">
-        <param name="excludes">targetSource, callbacks, exposeProxy</param>
-      </interceptor-ref>
-      <interceptor-ref name="ambraUserStack"/>
-      <result type="chain">
-        <param name="actionName">getAverageRatingsForArticle</param>
-        <param name="namespace">/rate</param>
-      </result>
-    </action>
-
-    <action name="fetchArticle" class="org.topazproject.ambra.article.action.FetchArticleAction">
-      <result type="chain">
-        <param name="actionName">getNumTrackbacksForArticle</param>
-        <param name="namespace">/article</param>
+    <action name="fetchArticle" class="org.topazproject.ambra.article.action.FetchArticleAction" method="FetchArticle">
+      <result name="success" type="ambraFreemarker">
+        <param name="templateFile">/article/article_body.ftl</param>
+      </result>
+    </action>
+
+    <action name="fetchArticleComments" class="org.topazproject.ambra.article.action.FetchArticleAction" method="FetchArticleComments">
+      <result name="success" type="ambraFreemarker">
+        <param name="templateFile">/article/article_comments.ftl</param>
+      </result>
+    </action>
+
+    <action name="fetchArticleCorrections" class="org.topazproject.ambra.article.action.FetchArticleAction" method="FetchArticleCorrections">
+      <result name="success" type="ambraFreemarker">
+        <param name="templateFile">/article/article_comments.ftl</param>
+      </result>
+    </action>
+
+    <action name="fetchRelatedArticle" class="org.topazproject.ambra.article.action.FetchArticleAction" method="FetchArticleRelated">
+      <result name="success" type="ambraFreemarker">
+        <param name="templateFile">/article/article_related.ftl</param>
       </result>
     </action>
@@ -398 +393 @@
     </action>
 
-    <action name="fetchBody" class="org.topazproject.ambra.article.action.FetchArticleAction">
+    <action name="fetchBody" class="org.topazproject.ambra.article.action.FetchArticleAction" method="fetchArticle">
       <result name="success" type="ambraFreemarker">
         <param name="location">/article/article_content.ftl</param>
@@ -405 +400 @@
     </action>
 
-    <action name="fetchArticleRhc" class="org.topazproject.ambra.article.action.FetchArticleAction">
+    <action name="fetchArticleRhc" class="org.topazproject.ambra.article.action.FetchArticleAction" method="fetchArticle">
       <result name="success" type="ambraFreemarker">
         <param name="location">/article/article_rhc_count.ftl</param>

head/ambra/webapp/src/main/resources/viewnlm-v2.xsl

@@ -2011 +2011 @@
     <xsl:apply-templates select="label"/>
   </xsl:element>
-  <xsl:apply-templates select="caption/title"/>
+  <!--xsl:apply-templates select="caption/title"/-->
   </strong>
 

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

@@ -3 +3 @@
   $Id$
   
-  Copyright (c) 2007-2008 by Topaz, Inc.
+  Copyright (c) 2007-2009 by Topaz, Inc.
   http://topazproject.org
   
@@ -18 +18 @@
   limitations under the License.
 -->
+<#include "article_variables.ftl">
 <div id="content" class="article" style="visibility:visible;">
 <#include "article_rhc.ftl">
@@ -31 +32 @@
 <div style="visibility:hidden">
 <#include "/widget/annotation_add.ftl">
+<#include "/widget/contextAction.ftl">
 <#include "/widget/commentDialog.ftl">
 <#include "/widget/ratingDialog.ftl">

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

@@ -2 +2 @@
   $HeadURL::                                                                            $
   $Id$
-  
+
   Copyright (c) 2007-2009 by Topaz, Inc.
   http://topazproject.org
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -18 +18 @@
   limitations under the License.
 -->
-<#assign publisher=""/>
-<#if Request[freemarker_config.journalContextAttributeKey]?exists>
-  <#assign journalContext = Request[freemarker_config.journalContextAttributeKey].journal>
-<#else>
-  <#assign journalContext = "">
-</#if>
-<#list journalList as jour>
-  <#if (articleInfo.eIssn = jour.eIssn) && (jour.key != journalContext) >
-    <#assign publisher = "Published in <em><a href=\"" + freemarker_config.getJournalUrl(jour.key)
-                         + "\">"+ jour.dublinCore.title + "</a></em>" />
-    <#break/>
-  <#else>
-    <#if jour.key != journalContext> 
-      <#assign jourAnchor = "<a href=\"" + freemarker_config.getJournalUrl(jour.key) + "\">"/>
-      <#if publisher?length gt 0>
-        <#assign publisher = publisher + ", " + jourAnchor + jour.dublinCore.title + "</a>" />
-      <#else>
-        <#assign publisher = publisher + "Featured in " + jourAnchor + jour.dublinCore.title + "</a>" />
-      </#if>
-    </#if>
-  </#if>
-</#list>
-  <div id="researchArticle" class="content">
-    <a id="top" name="top" toc="top" title="Top"></a>
-    <@s.url id="thisPageURL" includeParams="get" includeContext="true" encode="false"/>
-    <@s.url id="feedbackURL" includeParams="none" namespace="/" action="feedbackCreate" page="${thisPageURL?url}"/>
-    <div id="contentHeader">
-      <p>Open Access</p>
-      <p id="articleType">${articleType.heading}</p>
+<@s.url id="createDiscussionURL" namespace="/annotation/secure" action="startDiscussion" includeParams="none" target="${articleURI}" />
+<div id="researchArticle" class="content">
+  <a id="top" name="top" toc="top" title="Top"></a>
+  <@s.url id="thisPageURL" includeParams="get" includeContext="true" encode="false"/>
+  <@s.url id="feedbackURL" includeParams="none" namespace="/" action="feedbackCreate" page="${thisPageURL?url}"/>
+  <div id="contentHeader" xpathLocation="noSelect"><p>Open Access</p><p id="articleType">${articleType.heading}</p></div>
+  <h1 xpathLocation="noSelect">${articleInfoX.title}</h1>
+  <#assign tab="article" />
+  <#include "article_tabs.ftl">
+        <div id="retractionHtmlId" class="retractionHtmlId" style="display:none;" xpathLocation="noSelect">
+          <p class="retractionHtmlId"><strong> Retraction:</strong> This article has been <em>retracted</em> due to the following:
+            <span id="retractionlist" class="retractionHtmlId"></span>
+    </p>
+  </div>   
+  <div id="fch" class="fch" style="display:none;" xpathLocation="noSelect">
+    <p class="fch"><strong> Formal Correction:</strong> This article has been <em>formally corrected</em> to address the following errors.</p>
+    <ol id="fclist" class="fclist"></ol>
+  </div>
+  <div id="articleMenu" xpathLocation="noSelect">
+    <div class="wrap">
+      <ul>
+        <li class="annotation icon">To <strong>add a note</strong>, highlight some text. <a href="#" onclick="toggleAnnotation(this, 'public'); return false;" title="Click to turn notes on/off">Hide notes</a></li>
+        <li class="discuss icon">
+          <#if Session[freemarker_config.userAttributeKey]?exists>
+            <a href="${createDiscussionURL}" class="discuss icon">Make a general comment</a>
+          <#else>
+            <a href="${freemarker_config.context}/user/secure/secureRedirect.action?goTo=${thisPage}">Make a general comment</a>
+          </#if>
+        </li>
+        </ul>
+      <p><strong>Jump to</strong></p>
+      <div id="sectionNavTop" class="tools"></div>
     </div>
-    <#if publisher != "">
-      <div id="publisher"><p>${publisher}</p></div>
-    </#if>
-    <div id="retractionHtmlId" class="retractionHtmlId" style="display:none;">
-      <p class="retractionHtmlId"><strong> Retraction:</strong> This article has been <em>retracted</em> due to the following:
-        <span id="retractionlist" class="retractionHtmlId"></span>
-      </p>
-    </div>
-    <div id="fch" class="fch" style="display:none;">
-          <p class="fch"><strong> Formal Correction:</strong> This article has been <em>formally corrected</em> to address the following errors.</p>
-          <ol id="fclist" class="fclist"></ol>
-    </div>
-        <div id="articleMenu"> 
-                <ul> 
-                        <@s.url id="articleArticleRepXML"  namespace="/article" action="fetchObjectAttachment" includeParams="none" uri="${articleURI}"> 
-                                <@s.param name="representation" value="%{'XML'}"/> 
-                        </@s.url> 
-                        <li><a href="${articleArticleRepXML}" class="xml" title="Download XML">Download Article XML</a></li> 
-                        <#if articleType.heading != 'Issue Image'>
-                                <@s.url id="articleArticleRepPDF"  namespace="/article" action="fetchObjectAttachment" includeParams="none" uri="${articleURI}"> 
-                                        <@s.param name="representation" value="%{'PDF'}"/> 
-                                </@s.url> 
-                                <li><a href="${articleArticleRepPDF}" class="pdf" title="Download PDF">Download Article PDF</a></li>
-                        </#if>
-                        <@s.url id="articleCitationURL"  namespace="/article" action="citationList" includeParams="none" articleURI="${articleURI}" /> 
-                        <li><@s.a href="%{articleCitationURL}"  cssClass="citation" title="Download Citation">Download Citation</@s.a></li> 
-                        <@s.url id="emailArticleURL" namespace="/article" action="emailArticle" articleURI="${articleURI}"/> 
-                        <li><@s.a href="%{emailArticleURL}"  cssClass="email" title="E-mail This Article to a Friend or Colleague">E-mail this Article</@s.a></li>
-                        <li><a href="#" onclick="window.print();return false;" class="print last" title="Print this article">Print this Article</a></li> 
-                </ul> 
-        </div> 
-    <@s.property value="transformedArticle" escape="false"/>
   </div>
+  <@s.property value="transformedArticle" escape="false"/>
+</div>

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

@@ -2 +2 @@
   $HeadURL::                                                                            $
   $Id$
-  
+
   Copyright (c) 2007-2009 by Topaz, Inc.
   http://topazproject.org
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -19 +19 @@
 -->
 <!-- begin : right hand column -->
-<div id="rhc">
+<@s.url id="articleArticleRepXML"  namespace="/article" action="fetchObjectAttachment" includeParams="none" uri="${articleURI}">
+  <@s.param name="representation" value="%{'XML'}"/>
+</@s.url>
+<@s.url id="articleArticleRepPDF"  namespace="/article" action="fetchObjectAttachment" includeParams="none" uri="${articleURI}">
+  <@s.param name="representation" value="%{'PDF'}"/>
+</@s.url>
+<@s.url id="articleCitationURL"  namespace="/article" action="citationList" includeParams="none" articleURI="${articleURI}" />
+<@s.url id="emailArticleURL" namespace="/article" action="emailArticle" articleURI="${articleURI}"/>
+<@s.url id="relatedArticleURL" namespace="/article" action="fetchRelatedArticle" articleURI="${articleURI}"/>
 
-<div id="sideNav">
+<div id="rhc" xpathLocation="noDialog">
+ 
+  <div id="download" class="rhcBox_type1">
+    <div class="wrap">
+      <ul>
+        <li class="download icon"><strong>Download:</strong> <a href="${articleArticleRepPDF}">PDF</a> | <a href="${articleCitationURL}">Citation</a> | <a href="${articleArticleRepXML}">XML</a></li>
+        <li class="print icon"><a href="#" onclick="window.print();return false;"><strong>Print article</strong></a></li>
+      </ul>
+    </div>
+  </div>
 
-        <#if articleInfoX?? && articleInfoX.relatedArticles?size gt 0>
-                <dl class="related">
-                        <dt>Related <em>${freemarker_config.orgName}</em> Articles</dt>
-                        <#list articleInfoX.relatedArticles as ra>
-                        <@s.url id="fetchArticleURL" action="fetchArticle" namespace="/article" articleURI="${ra.uri}" includeParams="none"/>
-                        <dd><@s.a href="%{fetchArticleURL}" title="Read Open Access Article">${ra.title}</@s.a></dd>
-                        </#list>
-                </dl>
-        </#if>
-  
-  <div id="floatMarker"></div>
+  <#if publisher != "">
+    <div id="published" xpathLocation="noSelect" class="rhcBox_type2">
+      <p>${publisher}</p>
+    </div>
+  </#if>
 
-  <div id="postcomment">
-    <div class="commentview">
-      <h6>Start a discussion on this article</h6>
-      <ol>
-        <#if Session[freemarker_config.userAttributeKey]?exists>
-            <li><a href="#" id="addAnnotation" class="addannotation icon" title="First select text, then click here" onmousedown="createAnnotationOnMouseDown();">Add a note to the text</a></li>
-        <#else>
-            <li><a href="${freemarker_config.context}/user/secure/secureRedirect.action?goTo=${thisPage}" id="addAnnotation" class="addannotation icon">Add a note to the text</a></li>
-        </#if>
-
-        <!-- begin : expanded block -->
-        <!--  <fieldset>
-            <form>
-            <ol id="toggleAnnotations">
-              <li>Yours  <div><input class="input" type="radio" title="Choose from one of the options" name="yours" value="On" checked>
-                    <label for="yours">On</label>
-                    <input class="input" type="radio" title="Choose from one of the options" name="yours" value="Off">
-                    <label for="yours">Off</label></div>
-              </li>
-              <li>Authors  <div><input class="input" type="radio" title="Choose from one of the options" name="authors" value="On" checked>
-                    <label for="authors">On</label>
-                    <input class="input" type="radio" title="Choose from one of the options" name="authors" value="Off">
-                    <label for="authors">Off</label></div>
-              </li>
-              <li>All Public
-                    <div><input class="input" type="radio" title="Choose from one of the options" name="public" value="On" checked>
-                    <label for="public">On</label>
-                    <input class="input" type="radio" title="Choose from one of the options" name="public" value="Off">
-                    <label for="public">Off</label></div>
-              </li>
-            </ol>
-            </form>
-          </fieldset>-->
-        <!-- end : expanded block -->
-        
-        <@s.url id="createDiscussionURL" namespace="/annotation/secure" action="startDiscussion" includeParams="none" target="${articleURI}" />
-
-        <#if Session[freemarker_config.userAttributeKey]?exists>
-                <li><a href="${createDiscussionURL}" class="discuss icon">Make a general comment</a></li>
-        <#else>
-            <li><a href="${freemarker_config.context}/user/secure/secureRedirect.action?goTo=${thisPage}" class="discuss icon">Make a general comment</a></li>
-        </#if>
-
-        <@s.url id="commentsURL" namespace="/annotation" action="getCommentary" includeParams="none" target="${articleURI}"/>
-        <li><a href="${commentsURL}" class="commentary icon">View/join ongoing discussions</a>
-          <ul id="dcCount1">
-            <#include "/article/article_rhc_count.ftl">
-          </ul>
-        </li>
-
-        <#if numCorrections gt 0>
-        <@s.url id="correctionsURL" namespace="/annotation" action="getCorrectionsCommentary" includeParams="none" target="${articleURI}"/>
-        <li><a href="${correctionsURL}" class="corrections icon">View all corrections</a></li>
-        </#if>
-        
-        <li><a href="#" onclick="toggleAnnotation(this, 'public'); return false;" class="collapse tooltip" title="Click to turn notes on/off">Hide notes</a></li>
-
-        <@s.url id="trackbackURL" namespace="/article" action="listTrackbacks" includeParams="none" trackbackId="${articleURI}"/>
-        <li><a href="${trackbackURL}" class="trackback icon">Trackbacks (${trackbackList?size})</a></li>
-
-  <!-- show this if there is no commentary at all <li>Be the first to <a href="${createDiscussionURL}" class="discuss icon">start a discussion</a> or use the tools above to add your annotation!</li> -->
-      </ol>
-    </div>
-
-
-    <div class="commentview" id="ratingRhc1">
+  <div id="impact" class="rhcBox_type2">
+    <div id="ratingRhc1">
       <#include "/article/article_rhc_rating.ftl">
     </div>
+  </div>
 
-    <div id="sectionNavTop" class="tools"></div>
+  <div id="related" class="rhcBox_type2">
+    <h6>Related Content</h6>
+  <#if articleInfoX?? && articleInfoX.relatedArticles?size gt 0>
+    <dl class="related">
+      <dt>Related <em>${freemarker_config.orgName}</em> Articles</dt>
+      <#list articleInfoX.relatedArticles as ra>
+      <@s.url id="fetchArticleURL" action="fetchArticle" namespace="/article" articleURI="${ra.uri}" includeParams="none"/>
+      <dd><@s.a href="%{fetchArticleURL}" title="Read Open Access Article">${ra.title}</@s.a></dd>
+      </#list>
+    </dl>
+  </#if>
+    <p><strong>Related subject categories</strong><br/>
+    <#list articleInfo.categories as cat>
+      <a href="browse.action?catName=${cat.mainCategory?url}">${cat.mainCategory}</a><#if cat_has_next>, </#if>
+    </#list></p>
+
+    <div class="more clearfix"><a href="${relatedArticleURL}">More</a></div>
+  </div>
+
+  <div id="share" class="rhcBox_type2">
+    <h6>Share this Article <a href="#" class="info">info</a></h6>
+    <ul>
+      <li class="bookmarklets">Bookmark:
+
+          <#-- StumbleUpon -->
+          <a href="http://www.stumbleupon.com/submit?url=${jDocURL}" target="_new"> <img border=0 src="http://cdn.stumble-upon.com/images/16x16_su_solid.gif" alt="StumbleUpon" title="Add to StumbleUpon"></a>
+          <#-- for more info, see http://www.stumbleupon.com/buttons.php -->
+          <#-- Facebook -->
+          <script>function fbs_click() {u='${docURL}';t='${articleInfoX.title?url}';window.open('http://www.facebook.com/sharer.php?u='+encodeURIComponent(u)+'&t='+encodeURIComponent(t),'sharer','toolbar=0,status=0,width=626,height=436');return false;}</script><a href="http://www.facebook.com/share.php?u=${docURL?url}" onclick="return fbs_click()"><img src="http://static.ak.fbcdn.net/images/share/facebook_share_icon.gif" alt="Facebook" title="Add to Facebook" /></a>       <!-- for mor info, see http://www.facebook.com/share_partners.php -->
+          <#-- Connotea -->
+          <script type="text/javascript">
+            function bookmark_in_connotea(u) {
+                a=false; x=window; e=x.encodeURIComponent; d=document;
+                w=open('http://www.connotea.org/addpopup?continue=confirm&uri='+e(u),
+                    'add', 'width=600, height=400, scrollbars, resizable');
+                void(x.setTimeout('w.focus()',200));
+            }
+          </script>
+          <a style='cursor: pointer;' onclick='javascript:bookmark_in_connotea("${docURL}");'><img src='${freemarker_config.getContext()}/journals/plosJournals/images/icon_connotea_16x16.gif' alt="Connotea" title="Add to Connotea"/></a>
+          <#-- See: http://www.connotea.org/wiki/AddToConnoteaButton -->
+          <#-- Citeulike -->
+          <a href="http://www.citeulike.org/posturl?url=${docURL?url}&title=${articleInfoX.title?url}" target="_new"><img src='${freemarker_config.getContext()}/journals/plosJournals/images/icon_citeulike_16x16.gif' alt="CiteULike" title="Add to CiteULike" /></a>
+          <#-- For more info see http://www.citeulike.org/faq/all.adp -->
+          <#-- Digg
+            TODO:Eventually we should be passing the abstract as the bodytext to digg.  We could also switch up and
+            start figuring out and sending a topic as well
+            -->
+          <script type="text/javascript">
+          digg_url = '${jDocURL}';
+          digg_skin = 'icon';
+          digg_title = '${articleInfoX.title?replace("'","\\'")}';
+          digg_bodytext = '';
+          digg_topic = '';
+          digg_media = 'news';
+          digg_window = 'new';
+
+          </script>
+          <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
+          <#-- for more info see http://digg.com/tools/integrate -->
+
+      </li>
+      <li class="email icon"><a href="${emailArticleURL}">Email this article</a></li>
+      <li class="twitter icon"><a href="http://twitter.com/home/?status=${"Check+out+this+article%3A+" + docURL?url}" title="Tweet about this article">Tweet about this article</a></li>
+    </ul>
   </div>
 </div>
-
-
-</div>
 <!-- end : right hand column -->

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

@@ -3 +3 @@
   $Id$
   
-  Copyright (c) 2007-2008 by Topaz, Inc.
+  Copyright (c) 2007-2009 by Topaz, Inc.
   http://topazproject.org
   
@@ -18 +18 @@
   limitations under the License.
 -->
-            <#if numUsersThatRated != 1>
+            <#if (averageRatings.numUsersThatRated != 1)>
               <#assign char = "s">
             <#else>
@@ -24 +24 @@
             </#if>
             <@s.url id="ratingsURL" namespace="/rate" action="getArticleRatings" includeParams="none" articleURI="${articleURI}"/>
-            <h6>Average Rating <a href="${ratingsURL}" class="rating">(${numUsersThatRated} User Rating${char})</a></h6>
+            <h6>Average Rating <a href="${ratingsURL}" class="rating">(${averageRatings.numUsersThatRated} User Rating${char})</a></h6>
             <ol>
               <li>
               <#if isResearchArticle == true>
                 <ul class="star-rating rating inline-rating-rhc" title="overall">
-                    <#assign overallPct = (20 * overallRoundedAverage)?string("##0")>
-                    <li class="current-rating overall-rating pct${overallPct}">Currently ${overallRoundedAverage?string("0.#")}/5 Stars.</li>
+                    <#assign overallPct = (20 * averageRatings.roundedOverall)?string("##0")>
+                    <li class="current-rating overall-rating pct${overallPct}">Currently ${averageRatings.roundedOverall?string("0.#")}/5 Stars.</li>
                 </ul>
                 <a href="javascript:void(0);" onclick="return ambra.domUtil.swapDisplayTextMode(this, 'ratingAverages', null, 'Hide all categories', 'See all categories');" class="rating catAvg">See all categories</a>
                 <div id="ratingAverages">
-                  <ol class="ratingAvgs">
+                  <ol class="ratingaverageRatings.">
                     <li><label for="insight">Insight</label>
                       <ul class="star-rating rating" title="insight">
-                        <#assign insightPct = (20 * insightRoundedAverage)?string("##0")>
-                        <li class="current-rating average pct${insightPct}">Currently ${insightAverage?string("0.#")}/5 Stars.</li>
+                        <#assign insightPct = (20 * averageRatings.insight.rounded)?string("##0")>
+                        <li class="current-rating average pct${insightPct}">Currently ${averageRatings.insight.average?string("0.#")}/5 Stars.</li>
                       </ul>
                     </li>
                     <li><label for="reliability">Reliability</label>
                       <ul class="star-rating rating" title="reliability">
-                        <#assign reliabilityPct = (20 * reliabilityRoundedAverage)?string("##0")>
-                        <li class="current-rating average pct${reliabilityPct}">Currently ${reliabilityAverage?string("0.#")}/5 Stars.</li>
+                        <#assign reliabilityPct = (20 * averageRatings.reliability.rounded)?string("##0")>
+                        <li class="current-rating average pct${reliabilityPct}">Currently ${averageRatings.reliability.average?string("0.#")}/5 Stars.</li>
                       </ul>
                     </li>
                     <li><label for="style">Style</label>
                       <ul class="star-rating rating" title="style">
-                        <#assign stylePct = (20 * styleRoundedAverage)?string("##0")>
-                        <li class="current-rating average pct${stylePct}">Currently ${styleAverage?string("0.#")}/5 Stars.</li>
+                        <#assign stylePct = (20 * averageRatings.style.rounded)?string("##0")>
+                        <li class="current-rating average pct${stylePct}">Currently ${averageRatings.style.average?string("0.#")}/5 Stars.</li>
                       </ul>
                     </li>
@@ -57 +57 @@
                 <#else>
                 <ul class="star-rating rating inline-rating-rhc" title="average">
-                    <#assign averagePct = (20 * singleRatingRoundedAverage)?string("##0")>
-                    <li class="current-rating single-rating pct${averagePct}">Currently ${singleRatingRoundedAverage?string("0.#")}/5 Stars.</li>
+                    <#assign averagePct = (20 * averageRatings.single.rounded)?string("##0")>
+                    <li class="current-rating single-rating pct${averagePct}">Currently ${averageRatings.single.rounded?string("0.#")}/5 Stars.</li>
                 </ul>
               </#if>
               <#if Session[freemarker_config.userAttributeKey]?exists>
-                <#if hasRated>
+                <#if HasRated>
                   <a href="javascript:void(0);" onclick="return ambra.rating.show('edit');" class="rating">Edit My Rating</a>
                 <#else>
@@ -72 +72 @@
               </li>
             </ol>
+            

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

@@ -73 +73 @@
           <span class="date">Published ${art.date?string("dd MMM yyyy")}</span>
           <@s.url id="fetchArticleURL" action="fetchArticle" namespace="/article" articleURI="${art.id}" includeParams="none"/>
-          <span class="article"><@s.a href="%{fetchArticleURL}" title="Read Open Access Article">${art.title}</@s.a></span>
+          <span class="article"><@s.a href="%{fetchArticleURL}" title="Read Open Access Article"><@articleFormat>${art.title}</@articleFormat></@s.a></span>
           <span class="authors">
             <#list art.authors as auth><#if auth_index gt 0>, </#if>${auth}</#list>

head/ambra/webapp/src/main/webapp/css/annotation.css

@@ -3 +3 @@
  * $Id$
  *
- * Copyright (c) 2006-2008 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -18 +18 @@
  * limitations under the License.
  */
-/*      -------------------------------------------------------------
-
-        Annotation Style Sheet
-        
-        CREATED ON      : 08-26-2006
-        MODIFIED ON     : 08-02-2007
-        
-        CREATED BY      : MARGARET SHEAR
-        MODIFIED BY     : SEBASTIAN TOOMEY
- 
-        ------------------------------------------------------------- */        
 
 /* detail wraps annotation post details such as date and posting time and username */
@@ -96 +85 @@
 .annotate{ width: 42em; border: 3px solid #0bf; background: #fff url(../images/forms_bg.gif) repeat-x bottom; position:relative;}
 
+div.contextActionDialog { padding:0;margin:0; }
+div.context div.tip { background:transparent url(../images/dialog_pb.gif) no-repeat 0px 0px; width:39px; height:22px; position:absolute; bottom: -22px; left:22px; }
+div.context div.tipu { background:transparent url(../images/dialog_pt.gif) no-repeat 0px 0px; width:39px; height:22px; position:absolute; top: -22px; left:22px; }
+
+div.context{ width:22em; border:3px solid #666; background:#fff url(../images/forms_bg.gif) repeat-x bottom; position:relative;}
+div.context div.contextActionContent { border:0px; margin:4px; line-height:1.1em; }
+div.context div.contextActionContent h5 { padding:0px 0px 3px 0px; margin:0px;}
+div.context div.contextActionContent ul { padding:5px 0px 0px 0px; margin:0px; list-style-type:dot;}
+div.context div.contextActionContent li { padding:0px; margin:0px 0px 0px 17px; }
+div.context div.contextActionContent input { padding:0px; margin:0px; float:right; }
+div.context div.contextActionContent form { padding-top:5px; }
+div.dijitTooltipContainer { border:0px; }
+
 .loadingCycler { z-index: 99998 !important; }
 .loadingCycler img { z-index: 99999 !important; }

head/ambra/webapp/src/main/webapp/css/rating.css

@@ -69 +69 @@
 
 /* Special for the inline overall rating appearing in the right-hand column widget */
-.inline-rating-rhc { float:left; margin-top:3px !important; position:static; } 
+.inline-rating-rhc { float:left; position:static; } 
 .inline-rating-rhc .current-rating { float:none; position:static; }
 .inline-rating-rhc .overall-rating { margin-left:0; }

head/ambra/webapp/src/main/webapp/css/screen.css

@@ -82 +82 @@
 .noshow { display:block; height:0px; line-height:0em; } /* can be applied to elements that need to be present in the flow but not impact vertical spacing, e.g. in-page anchors */
 .clearer  { clear:both; line-height:0; height:0; display:none; }
+.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.clearfix { zoom:1; } /*zoom allows self-clearing floats to work in IE*/
 
 /* Global : Icons and Links
@@ -110 +112 @@
 
 a.rating      { padding: 0 0 2px 5px; border: none; background: transparent; }
-h6 a.rating { font-size: .9em; }
 
 /* portions of this icon set have been adapted Mark Jame's Silk icon set available under a Creative Commons Attribution 2.5 license at http://www.famfamfam.com/lab/icons/silk/ */
@@ -194 +195 @@
 #container                      { position: relative; }
 #container, #hdr        { margin: 0 auto; min-width: 675px; max-width: 930px; }
-#content                        { margin: 50px 4px 50px 22px; line-height: 1.8em; font-size: .9em; }
+#content                        { margin: 30px 4px 50px 22px; line-height: 1.8em; font-size: .9em; }
 
 /* Horizontal Advertising Banners : Top & Bottom Slots
@@ -329 +330 @@
 ----------------------------------------------------------=
 */
-div#rhc                 { float: right; width: 240px; position: relative; }
+
+/*TEMP STYLE: suppresses 2nd instance of research article title on the article page*/
+div#articleMenu + h1 { display:none; }
+
+/* article page tabs */
+div.horizontalTabs      { position:relative; border:0; margin-top:15px; padding:0; background:transparent; width:100%; }
+div.horizontalTabs:after  { content:"."; display: block; height:0; clear:left; visibility:hidden; }
+/*div#articleContainer div#researchArticle*/ ul#tabsContainer  { float:left;  margin:0!important; padding:0 0 0 10px!important; /* "!important" required for IE7 */ line-height:normal; background:transparent url("../images/tab_bg.gif") repeat-x bottom; width:640px; }
+ul#tabsContainer ul { margin:0; padding:10px 10px 0; }
+ul#tabsContainer li             { cursor:pointer; float:left; background:url("../images/tab_left.gif") no-repeat 0% 0%; margin:0 2px; padding:0 0 0 8px; list-style:none; font-size:.9em; font-weight:bold; color:#666; }
+ul#tabsContainer li a { display:block; float:left; background:url("../images/tab_right.gif") no-repeat 100% 0%;  padding:8px 16px 8px 8px!important; /* "!important" required for IE7 */ color:#666; text-decoration:none; }
+ul#tabsContainer li a:hover { color:#f60 }
+ul#tabsContainer li.active { background-position:0% -40px; }
+ul#tabsContainer li.active a { background-position:100% -40px; padding-bottom: 9px!important; }
+
+div#rhc                 { float: right; width: 240px; position: relative; margin-top:8px; }
 div.browse div#rhc { padding:0; }
 div.content     { margin-right: 255px; }
@@ -408 +424 @@
 
 /* Menu next to article title containing download links, print link, etc. */
-div#articleMenu { float:right; width:165px!important; margin:10px 0 20px 10px; padding:0 0 12px 10px; background:#fff; }
-div#articleMenu ul { list-style-type:none; margin:0 15px 0 0; padding:0; background:none; position:static!important; } /* position:static fixes display issues in IE6 */