*5908* Improving style and structure of article visualization

pkp · Jan 7, 2013 · 86105ed · 86105ed
1 parent 4787469
commit 86105ed
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/templates/article/article.tpl b/templates/article/article.tpl
@@ -63,27 +63,15 @@
 		</div>
 	{/if}
 
-	{if $citationFactory->getCount()}
-		<div id="articleCitations">
-		<h4>{translate key="submission.citations"}</h4>
-		<br />
-		<div>
-			{iterate from=citationFactory item=citation}
-				<p>{$citation->getRawCitation()|strip_unsafe_html}</p>
-			{/iterate}
-		</div>
-		<br />
-		</div>
-	{/if}
-
 	{if (!$subscriptionRequired || $article->getAccessStatus() == $smarty.const.ARTICLE_ACCESS_OPEN || $subscribedUser || $subscribedDomain)}
 		{assign var=hasAccess value=1}
 	{else}
 		{assign var=hasAccess value=0}
 	{/if}
 
 	{if $galleys}
-		{translate key="reader.fullText"}
+		<div id="articleFullText">
+		<h4>{translate key="reader.fullText"}</h4>
 		{if $hasAccess || ($subscriptionRequired && $showGalleyLinks)}
 			{foreach from=$article->getGalleys() item=galley name=galleyList}
 				<a href="{url page="article" op="view" path=$article->getBestArticleId($currentJournal)|to_array:$galley->getBestGalleyId($currentJournal)}" class="file" target="_parent">{$galley->getGalleyLabel()|escape}</a>
@@ -105,6 +93,20 @@
 		{else}
 			&nbsp;<a href="{url page="about" op="subscriptions"}" target="_parent">{translate key="reader.subscribersOnly"}</a>
 		{/if}
+		</div>
+	{/if}
+
+	{if $citationFactory->getCount()}
+		<div id="articleCitations">
+		<h4>{translate key="submission.citations"}</h4>
+		<br />
+		<div>
+			{iterate from=citationFactory item=citation}
+				<p>{$citation->getRawCitation()|strip_unsafe_html}</p>
+			{/iterate}
+		</div>
+		<br />
+		</div>
 	{/if}
 {/if}