Index: main/trunk/model-cols/niupepa/etc/collectionConfig.xml
===================================================================
--- main/trunk/model-cols/niupepa/etc/collectionConfig.xml	(revision 26300)
+++ main/trunk/model-cols/niupepa/etc/collectionConfig.xml	(revision 26319)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CollectionConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<CollectionConfig xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  >
 	<metadataList>
 		<metadata lang="en" name="creator"/>
@@ -163,5 +163,5 @@
 					<td valign="top">
 						<gsf:metadata name="Title"/>
-						<xsl:text>					</xsl:text>					<i>(<gsf:metadata name="numleafdocs"/> issues)</i>
+						<xsl:text>					</xsl:text>					<i>(<gsf:switch><gsf:metadata name="numleafdocs"/><gsf:when test="equals" test-value="1"><gsf:collectionText name="oneissue"/></gsf:when><gsf:otherwise><xsl:variable name="args"><gsf:metadata name="numleafdocs"/></xsl:variable><xsl:value-of disable-output-escaping="yes" select="util:getCollectionText($collName, $site_name, /page/@lang, 'numissues', $args)"/></gsf:otherwise></gsf:switch>)</i>
 					</td>
 				</gsf:template>
@@ -186,22 +186,12 @@
 				<td valign="top">
 					<gsf:link type="document">
-						<gsf:icon type="document"/>
+						<xsl:call-template name="choose-icon"/>
 					</gsf:link>
 				</td>
 				<td valign="top">
-					<gsf:link type="source">
-						<gsf:choose-metadata>
-							<gsf:metadata name="thumbicon"/>
-							<gsf:metadata name="srcicon"/>
-						</gsf:choose-metadata>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<gsf:link type="document">
 						<!--
 						Defined in the global format statement
 						-->
 						<xsl:call-template name="title-plain"/>
-					</gsf:link>
 				</td>
 			</gsf:template>
@@ -213,23 +203,5 @@
 				</td>
 				<td valign="top">
-					<gsf:link type="source">
-						<gsf:choose-metadata>
-							<gsf:metadata name="thumbicon"/>
-							<gsf:metadata name="srcicon"/>
-						</gsf:choose-metadata>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<!--
-					Defined in the global format statement
-					-->
-					<xsl:call-template name="title-plain"/>
-					<gsf:switch>
-						<gsf:metadata name="Source"/>
-						<gsf:when test="exists">
-							<br/>
-							<i>(<gsf:metadata name="Source"/>)</i>
-						</gsf:when>
-					</gsf:switch>
+	                           <gsf:metadata name="Title"/>
 				</td>
 			</gsf:template>
@@ -271,10 +243,16 @@
 				<span style="font-weight:bold; font-size: 120%;">
 					<xsl:call-template name="title-plain"/>
-				</span>
-				<gsf:switch>
+	<gsf:switch>
 					<gsf:metadata name="DocType"/>
 					<gsf:when test="equals" test-value="Abstract">
-						<gsf:collectionText name="abstract"/>
+						<xsl:text>: </xsl:text><gsf:collectionText name="abstract"/>
 					</gsf:when>
+				</gsf:switch>
+				</span>
+			<gsf:switch>
+					<gsf:metadata name="DocType"/>
+					<gsf:when test="equals" test-value="Abstract">
+	    <div style="text-align:right;"><gsf:link type="page" page="abexpl" titlekey="abexpl.linktitle"><gsf:collectionText name="abexpl"/></gsf:link></div>
+</gsf:when>
 				</gsf:switch>
 			</gsf:template>
@@ -292,11 +270,16 @@
 -->
 			<gsf:template name="sectionHeading">
-				<xsl:call-template name="title-plain"/>
-				<gsf:metadata name="Date" format="formatDate"/>
+	<gsf:switch><gsf:metadata name="Series"/><gsf:when test="exists">
+				<xsl:call-template name="title-plain"/><xsl:text>. </xsl:text><gsf:metadata name="Date" format="formatDate"/>
+</gsf:when>
+<gsf:otherwise>
+	      <gsf:metadata name="Title"/>
+</gsf:otherwise>
+</gsf:switch>
 			</gsf:template>
 
 			<gsf:template name="pageTitle">
 				<xsl:for-each select="/page/pageResponse/document/documentNode">
-					<xsl:call-template name="title-plain"/>
+					<xsl:call-template name="title-plain"/><xsl:text>. </xsl:text>
 					<gsf:metadata name="Date" format="formatDate"/>
 				</xsl:for-each>
@@ -305,10 +288,9 @@
 Overwriting this template can be used to change the content of the top-level section.
 -->
-<!--
+
 <gsf:template name="topLevelSectionContent">
-<xsl:call-template name="wrappedSectionImage"/>
-<xsl:call-template name="wrappedSectionText"/>
+<div style="text-align:right;"><gsf:link type="document" OIDmetadata="abstract"><gsf:icon file="iabstr.gif" select="collection"/><gsf:collectionText name="abstract"/></gsf:link>, <gsf:link type="document" OIDmetadata="commentary"><gsf:icon file="icomm.gif" select="collection"/><gsf:collectionText name="commentary"/></gsf:link></div>
 </gsf:template>
--->
+
 <!--
 Overwriting this template can be used to change the content of sections.
