Merge pull request #151 from NateWr/i836_about_announcement_styles

pkp/pkp-lib#836 Update and style the about and announcement page templates
pkp · Oct 28, 2015 · 1240896 · 1240896
2 parents 14df8b9 + fd9e116
commit 1240896
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 74 deletions.
diff --git a/lib/pkp b/lib/pkp
diff --git a/plugins/themes/default/styles/components.less b/plugins/themes/default/styles/components.less
@@ -141,6 +141,7 @@
 	display: inline-block;
 	margin-left: 1em;
 	font-size: @font-sml;
+	font-weight: @normal;
 	line-height: 1; // Try not to disrupt parent line height
 	vertical-align: middle;
 	text-decoration: none;

diff --git a/plugins/themes/default/styles/main.less b/plugins/themes/default/styles/main.less
@@ -59,6 +59,7 @@
 	}
 
 	p {
+		line-height: @line-base-large;
 		margin: @line-base 0;
 	}
 
@@ -68,6 +69,13 @@
 
 	.page {
 
+	    // Edit link that isn't nested in a section
+	    > .cmp_edit_link {
+	        float: right;
+	        padding: @half 0;
+	        line-height: @triple;
+	    }
+
 		// Count of catalog entries on the current page
 		// used in catalog, category, series and search pages
 		.monograph_count {

diff --git a/plugins/themes/default/styles/objects/announcement_summary.less b/plugins/themes/default/styles/objects/announcement_summary.less
@@ -12,8 +12,8 @@
 
 	h4 {
 		margin: 0;
-		font-size: @font-bump;
-		line-height: @line-bump;
+		font-size: @font-base;
+		line-height: @line-base;
 	}
 
 	.date {

diff --git a/plugins/themes/default/styles/pages/about.less b/plugins/themes/default/styles/pages/about.less
@@ -11,9 +11,9 @@
 .page_about {
 
     h3 {
-        font-size: @font-bump;
-        line-height: @line-bump;
-        margin-bottom: @base;
+        font-size: @font-base;
+        line-height: @line-base;
+        margin: @double 0 @base;
     }
 
     .address,
@@ -41,11 +41,6 @@
         margin-top: @double * 2;
     }
 
-    // Sponsor and Contributor lists
-    ul {
-        &:extend(.pkp_unstyled_list);
-    }
-
     @media(min-width: @screen-tablet) {
 
         .contact_section {
@@ -63,10 +58,6 @@
             &.support {
                 margin-top: 0;
             }
-
-            h3 {
-                margin-top: 0;
-            }
         }
     }
 }
diff --git a/plugins/themes/default/styles/pages/announcements.less b/plugins/themes/default/styles/pages/announcements.less
@@ -12,14 +12,38 @@
 
 	.announcements {
 		&:extend(.pkp_unstyled_list);
+		margin-left: -@base;
+		margin-right: -@base;
+		border-top: @bg-border;
 
 		> li {
-			margin-bottom: @double * 2;
+			padding: @triple @base;
+			border-bottom: @bg-border;
 
 			&:last-child {
-				margin-bottom: 0;
+				border-bottom: none;
+			}
+		}
+
+		@media(min-width: @screen-phone) {
+			margin-left: -@double;
+			margin-right: -@double;
+
+			> li {
+				padding-left: @double;
+				padding-right: @double;
 			}
 		}
-	}
 
+		@media(min-width: @screen-desktop) {
+			margin-left: -@triple;
+			margin-right: -@triple;
+
+			> li {
+				padding-left: @triple;
+				padding-right: @triple;
+			}
+
+		}
+	}
 }
diff --git a/plugins/themes/default/styles/variables.less b/plugins/themes/default/styles/variables.less
@@ -64,6 +64,7 @@
 @line-sml:               @double;
 @font-base:              14px;
 @line-base:              @double;
+@line-base-large:        @line-base + 5; // large blocks of text
 @font-bump:              16px;
 @line-bump:              @double;
 @font-lead:              18px;

diff --git a/templates/frontend/components/breadcrumbs.tpl b/templates/frontend/components/breadcrumbs.tpl
diff --git a/templates/frontend/pages/about.tpl b/templates/frontend/pages/about.tpl
@@ -18,10 +18,8 @@
 {include file="common/frontend/header.tpl" pageTitle="about.aboutThePress"}
 
 <div class="page page_about">
-	<h1 class="page_title">
-		{translate key="about.aboutThePress"}
-		{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="masthead" sectionTitleKey="about.aboutThePress"}
-	</h1>
+	{include file="frontend/components/breadcrumbs.tpl" currentTitleKey="about.aboutThePress"}
+	{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="masthead" sectionTitleKey="about.aboutThePress"}
 
 	{if $description}
 	<div class="description">
@@ -131,9 +129,9 @@
 				{translate key="about.focusAndScope"}
 				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitleKey="about.focusAndScope"}
 			</h2>
-			<div>
-				{$editorialPolicies.focusScopeDesc|strip_unsafe_html}
-			</div>
+			<p>
+				{$editorialPolicies.focusScopeDesc|nl2br|strip_unsafe_html}
+			</p>
 		</div>
 	{/if}
 
@@ -143,7 +141,9 @@
 				{translate key="about.reviewPolicy"}
 				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitleKey="about.reviewPolicy"}
 			</h2>
-			{$editorialPolicies.reviewPolicy|nl2br|strip_unsafe_html}
+			<p>
+				{$editorialPolicies.reviewPolicy|nl2br|strip_unsafe_html}
+			</p>
 		</div>
 	{/if}
 
@@ -153,7 +153,9 @@
 				{translate key="about.openAccessPolicy"}
 				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitleKey="about.openAccessPolicy"}
 			</h2>
-			{$editorialPolicies.openAccessPolicy|nl2br|strip_unsafe_html}
+			<p>
+				{$editorialPolicies.openAccessPolicy|nl2br|strip_unsafe_html}
+			</p>
 		</div>
 	{/if}
 
@@ -164,7 +166,9 @@
 					{$customAboutItem.title|escape}
 					{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitle=$customAboutItem.title|escape}
 				</h2>
-				{$customAboutItem.content|nl2br|strip_unsafe_html}
+				<p>
+					{$customAboutItem.content|nl2br|strip_unsafe_html}
+				</p>
 			</div>
 		{/if}
 	{/foreach}

diff --git a/templates/frontend/pages/editorialTeam.tpl b/templates/frontend/pages/editorialTeam.tpl
@@ -13,12 +13,10 @@
 {include file="common/frontend/header.tpl" pageTitle="about.editorialTeam"}
 
 <div class="page page_editorial_team">
-	<h1 class="page_title">
-		{translate key="about.editorialTeam"}
-		{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="masthead" sectionTitleKey="about.editorialTeam"}
-	</h1>
+	{include file="frontend/components/breadcrumbs.tpl" currentTitleKey="about.editorialTeam"}
+	{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="masthead" sectionTitleKey="about.editorialTeam"}
 
-	{$editorialTeam}
+	{$editorialTeam|strip_unsafe_html}
 
 </div><!-- .page -->
 

diff --git a/templates/frontend/pages/submissions.tpl b/templates/frontend/pages/submissions.tpl
@@ -12,10 +12,8 @@
 {include file="common/frontend/header.tpl" pageTitle="about.submissions"}
 
 <div class="page page_submissions">
-	<h1 class="page_title">
-		{translate key="about.submissions"}
-		{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="guidelines" sectionTitleKey="about.submissions"}
-	</h1>
+	{include file="frontend/components/breadcrumbs.tpl" currentTitleKey="about.submissions"}
+	{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="guidelines" sectionTitleKey="about.submissions"}
 
 	{* Login/register prompt *}
 	{capture assign="login"}
@@ -72,7 +70,9 @@
 				{translate key="about.privacyStatement"}
 				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitleKey="about.privacyStatement"}
 			</h2>
-			{$submissionInfo.privacyStatement|nl2br|strip_unsafe_html}
+			<p>
+				{$submissionInfo.privacyStatement|nl2br|strip_unsafe_html}
+			</p>
 		</div>
 	{/if}
 
@@ -82,7 +82,9 @@
 				{translate key="about.reviewPolicy"}
 				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="press" anchor="policies" sectionTitleKey="about.reviewPolicy"}
 			</h2>
-			{$submissionInfo.reviewPolicy|nl2br|strip_unsafe_html}
+			<p>
+				{$submissionInfo.reviewPolicy|nl2br|strip_unsafe_html}
+			</p>
 		</div>
 	{/if}
+35 −0		templates/frontend/components/breadcrumbs.tpl
+1 −3		templates/frontend/pages/announcements.tpl