Merge pull request pkp#305 from bozana/1527-layout-fix

pkp/pkp-lib#1527 UI fixes

Author: asmecher

plugins/pubIds/doi/locale/en_US/locale.xml

@@ -52,7 +52,10 @@
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeSubmission">monograph</message>
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeRepresentation">publication format</message>
 	<message key="plugins.pubIds.doi.editor.doiObjectTypeSubmissionFile">file</message>
-	<message key="plugins.pubIds.doi.editor.doiNotYetGenerated">What you see is a preview of the DOI that may be incomplete. A DOI has not yet been generated.</message>
+	<message key="plugins.pubIds.doi.editor.customSuffixMissing">The DOI cannot be assigned because the custom suffix is missing.</message>
+	<message key="plugins.pubIds.doi.editor.patternNotResolved">The DOI cannot be assigned because it contains an unresolved pattern.</message>
+	<message key="plugins.pubIds.doi.editor.canBeAssigned">What you see is a preview of the DOI. Select the checkbox and save the form to assign the DOI.</message>
+	<message key="plugins.pubIds.doi.editor.assigned">The DOI is assigned to this {$pubObjectType}.</message>
 	<message key="plugins.pubIds.doi.editor.doiSuffixCustomIdentifierNotUnique">The given DOI suffix is already in use for another published item. Please enter a unique DOI suffix for each item.</message>
 	<message key="plugins.pubIds.doi.editor.clearObjectsDoi">Clear DOI</message>
 	<message key="plugins.pubIds.doi.editor.clearObjectsDoi.confirm">Are you sure you wish to delete the existing DOI?</message>

plugins/pubIds/doi/templates/doiAssign.tpl

@@ -11,6 +11,7 @@
 {assign var=pubObjectType value=$pubIdPlugin->getPubObjectType($pubObject)}
 {assign var=enableObjectDoi value=$pubIdPlugin->getSetting($currentContext->getId(), "enable`$pubObjectType`Doi")}
 {if $enableObjectDoi}
+	{fbvFormArea id="pubIdDOIFormArea" class="border" title="plugins.pubIds.doi.editor.doi"}
 	{if $pubObject->getStoredPubId($pubIdPlugin->getPubIdType())}
 		{fbvFormSection}
 			<p class="pkp_help">{translate key="plugins.pubIds.doi.editor.assignDoi.assigned" pubId=$pubObject->getStoredPubId($pubIdPlugin->getPubIdType())}</p>
@@ -30,4 +31,5 @@
 			{include file="`$templatePath`doiAssignCheckBox.tpl" pubId=$pubId pubObjectType=$pubObjectType}
 		{/if}
 	{/if}
+	{/fbvFormArea}
 {/if}

plugins/pubIds/doi/templates/doiSuffixEdit.tpl

@@ -24,20 +24,26 @@
 				{if $canBeAssigned}
 					{assign var=templatePath value=$pubIdPlugin->getTemplatePath()}
 					{include file="`$templatePath`doiAssignCheckBox.tpl" pubId="" pubObjectType=$pubObjectType}
+				{else}
+					<p class="pkp_help">{translate key="plugins.pubIds.doi.editor.customSuffixMissing"}</p>
 				{/if}
 			{else} {* stored pub id and clear option *}
 				<p>
 					{$storedPubId|escape}<br />
+					{capture assign=translatedObjectType}{translate key="plugins.pubIds.doi.editor.doiObjectType"|cat:$pubObjectType}{/capture}
+					{capture assign=assignedMessage}{translate key="plugins.pubIds.doi.editor.assigned" pubObjectType=$translatedObjectType}{/capture}
+					<p class="pkp_help">{$assignedMessage}</p>
 					{include file="linkAction/linkAction.tpl" action=$clearPubIdLinkActionDoi contextId="publicIdentifiersForm"}
 				</p>
 			{/if}
 		{else} {* pub id preview *}
 			<p>{$pubIdPlugin->getPubId($pubObject)|escape}</p>
 			{if $canBeAssigned}
+				<p class="pkp_help">{translate key="plugins.pubIds.doi.editor.canBeAssigned"}</p>
 				{assign var=templatePath value=$pubIdPlugin->getTemplatePath()}
 				{include file="`$templatePath`doiAssignCheckBox.tpl" pubId="" pubObjectType=$pubObjectType}
 			{else}
-				<p class="pkp_help">{translate key="plugins.pubIds.doi.editor.doiNotYetGenerated"}</p>
+				<p class="pkp_help">{translate key="plugins.pubIds.doi.editor.patternNotResolved"}</p>
 			{/if}
 		{/if}
 	{/fbvFormArea}