Index: main/trunk/model-cols/niupepa/etc/collectionConfig.xml
===================================================================
--- main/trunk/model-cols/niupepa/etc/collectionConfig.xml	(revision 26295)
+++ main/trunk/model-cols/niupepa/etc/collectionConfig.xml	(revision 26300)
@@ -11,36 +11,36 @@
 	</displayItemList>
 	<format>
-			<gsf:template name="choose-icon">
-				<gsf:switch>
-					<gsf:metadata name="DocType"/>
-					<gsf:when test="equals" test-value="Commentary">
-						<gsf:icon file="icomm.gif" select="collection"/>
-					</gsf:when>
-					<gsf:when test="equals" test-value="Abstract">
-						<gsf:icon file="iabstr.gif" select="collection"/>
-					</gsf:when>
-					<gsf:when test="equals" test-value="Niupepa">
-						<gsf:icon file="np.gif" select="collection"/>
-					</gsf:when>
-					<gsf:otherwise>
-						<gsf:icon type="document"/>
-					</gsf:otherwise>
-				</gsf:switch>
-			</gsf:template>
-    <gsf:template name="title-plain">
-      <gsf:choose-metadata>
-	<gsf:metadata name="Series" select="root"/>
-	<gsf:metadata name="Series"/>
-      </gsf:choose-metadata>
-      <xsl:text>: </xsl:text>
-      <gsf:switch>
-	<gsf:metadata name="Title" select="ancestors"/>
-	<gsf:when test="exists">
-	  <gsf:metadata name="Title" select="ancestors"/><xsl:text>: </xsl:text>
-	</gsf:when>
-      </gsf:switch>
-	<gsf:metadata name="Title"/>
-    </gsf:template>
-		</format>
+		<gsf:template name="choose-icon">
+			<gsf:switch>
+				<gsf:metadata name="DocType"/>
+				<gsf:when test="equals" test-value="Commentary">
+					<gsf:icon file="icomm.gif" select="collection"/>
+				</gsf:when>
+				<gsf:when test="equals" test-value="Abstract">
+					<gsf:icon file="iabstr.gif" select="collection"/>
+				</gsf:when>
+				<gsf:when test="equals" test-value="Niupepa">
+					<gsf:icon file="np.gif" select="collection"/>
+				</gsf:when>
+				<gsf:otherwise>
+					<gsf:icon type="document"/>
+				</gsf:otherwise>
+			</gsf:switch>
+		</gsf:template>
+		<gsf:template name="title-plain">
+			<gsf:choose-metadata>
+				<gsf:metadata name="Series" select="root"/>
+				<gsf:metadata name="Series"/>
+			</gsf:choose-metadata>
+			<xsl:text>: </xsl:text>
+			<gsf:switch>
+				<gsf:metadata name="Title" select="ancestors"/>
+				<gsf:when test="exists">
+					<gsf:metadata name="Title" select="ancestors"/><xsl:text>: </xsl:text>
+				</gsf:when>
+			</gsf:switch>
+			<gsf:metadata name="Title"/>
+		</gsf:template>
+	</format>
 	<search type="mgpp">
 		<level name="section">
@@ -58,19 +58,19 @@
 		</indexOption>
 		<indexSubcollection name="abstract,commentary,niupepa">
-      <displayItem lang="en" name="name">papers, commentaries and abstracts</displayItem>
-      <displayItem lang="mi" name="name">ngÄ niupepa, kupu whakataki, me ngÄ rÄpopoto</displayItem>
-    </indexSubcollection>
+			<displayItem lang="en" name="name">papers, commentaries and abstracts</displayItem>
+			<displayItem lang="mi" name="name">ngÄ niupepa, kupu whakataki, me ngÄ rÄpopoto</displayItem>
+		</indexSubcollection>
 		<indexSubcollection name="niupepa">
-      <displayItem lang="en" name="name">newspapers</displayItem>
-      <displayItem lang="mi" name="name">ngÄ niupepa anake</displayItem>
-      </indexSubcollection>
+			<displayItem lang="en" name="name">newspapers</displayItem>
+			<displayItem lang="mi" name="name">ngÄ niupepa anake</displayItem>
+		</indexSubcollection>
 		<indexSubcollection name="commentary">
-      <displayItem lang="en" name="name">bibliographic commentaries</displayItem>
-      <displayItem lang="mi" name="name">ngÄ kupu whakataki anake</displayItem>0
-    </indexSubcollection>
+			<displayItem lang="en" name="name">bibliographic commentaries</displayItem>
+			<displayItem lang="mi" name="name">ngÄ kupu whakataki anake</displayItem>0
+		</indexSubcollection>
 		<indexSubcollection name="abstract">
-      <displayItem lang="en" name="name">english abstracts</displayItem>
-      <displayItem lang="mi" name="name">ngÄ rÄpopoto reo PÄkehÄ anake</displayItem>
-      </indexSubcollection>
+			<displayItem lang="en" name="name">english abstracts</displayItem>
+			<displayItem lang="mi" name="name">ngÄ rÄpopoto reo PÄkehÄ anake</displayItem>
+		</indexSubcollection>
 		<subcollection filter="DocType/Commentary/" name="commentary"/>
 		<subcollection filter="DocType/Abstract/" name="abstract"/>
@@ -78,21 +78,20 @@
 		<searchType name="plain"/>
 		<format>
-    <gsf:template name="title-with-link">
-      <gsf:choose-metadata>
-	<gsf:metadata name="Series" select="root"/>
-	<gsf:metadata name="Series"/>
-      </gsf:choose-metadata>
-      <xsl:text>: </xsl:text>
-      <gsf:switch>
-	<gsf:metadata name="Title" select="ancestors"/>
-	<gsf:when test="exists">
-	  <gsf:metadata name="Title" select="ancestors"/><xsl:text>: </xsl:text>
-	</gsf:when>
-      </gsf:switch>
-      <gsf:link type="document">
-	<gsf:metadata name="Title"/>
-      </gsf:link>
-    </gsf:template>
-
+			<gsf:template name="title-with-link">
+				<gsf:choose-metadata>
+					<gsf:metadata name="Series" select="root"/>
+					<gsf:metadata name="Series"/>
+				</gsf:choose-metadata>
+				<xsl:text>: </xsl:text>
+				<gsf:switch>
+					<gsf:metadata name="Title" select="ancestors"/>
+					<gsf:when test="exists">
+						<gsf:metadata name="Title" select="ancestors"/><xsl:text>: </xsl:text>
+					</gsf:when>
+				</gsf:switch>
+				<gsf:link type="document">
+					<gsf:metadata name="Title"/>
+				</gsf:link>
+			</gsf:template>
 			<gsf:template match="documentNode">
 				<td valign="top">
@@ -102,5 +101,5 @@
 				</td>
 				<td>
-	                            <xsl:call-template name="title-with-link"/>
+					<xsl:call-template name="title-with-link"/>
 				</td>
 			</gsf:template>
@@ -132,7 +131,46 @@
 			<option name="-bookshelf_type" value="always"/>
 			<option name="-partition_type_within_level" value="none"/>
-      <option name="-filter_metadata" value="DocType"/>
-      <option name="-filter_regex" value="(?i)(niupepa|commentary)"/>
+			<option name="-filter_metadata" value="DocType"/>
+			<option name="-filter_regex" value="(?i)(niupepa|commentary)"/>
 			<format>
+				<gsf:template match="documentNode">
+					<td valign="top">
+						<gsf:switch>
+							<gsf:metadata name="abstract"/>
+							<gsf:when test="exists">
+								<gsf:link OIDmetadata="abstract" type="document">
+									<gsf:icon file="iabstr.gif" select="collection"/>
+								</gsf:link>
+							</gsf:when>
+						</gsf:switch>
+					</td>
+					<td valign="top">
+						<gsf:link type="document">
+							<xsl:call-template name="choose-icon"/>
+						</gsf:link>
+					</td>
+					<td valign="top">
+						<gsf:metadata name="Title"/>
+						<xsl:text>					</xsl:text>					<i><gsf:metadata format="formatDate" name="Date"/></i>
+					</td>
+				</gsf:template>
+				<gsf:template match="classifierNode[@classifierStyle = 'VList']">
+					<td valign="top">
+						<gsf:link type="classifier">
+							<gsf:icon type="classifier"/>
+						</gsf:link>
+					</td>
+					<td valign="top">
+						<gsf:metadata name="Title"/>
+						<xsl:text>					</xsl:text>					<i>(<gsf:metadata name="numleafdocs"/> issues)</i>
+					</td>
+				</gsf:template>
+			</format>
+		</classifier>
+		<classifier name="DateList">
+			<option name="-metadata" value="Date"/>
+			<option name="-nogroup"/>
+		</classifier>
+		<format>
 			<gsf:template match="documentNode">
 				<td valign="top">
@@ -148,33 +186,4 @@
 				<td valign="top">
 					<gsf:link type="document">
-						<xsl:call-template name="choose-icon"/>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<gsf:metadata name="Title"/>
-					<xsl:text>					</xsl:text>					<i><gsf:metadata format="formatDate" name="Date"/></i>
-				</td>
-			</gsf:template>
-			<gsf:template match="classifierNode[@classifierStyle = 'VList']">
-				<td valign="top">
-					<gsf:link type="classifier">
-						<gsf:icon type="classifier"/>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<gsf:metadata name="Title"/>
-					<xsl:text>					</xsl:text>					<i>(<gsf:metadata name="numleafdocs"/> issues)</i>
-				</td>
-			</gsf:template>
-		</format>
-		</classifier>
-		<classifier name="DateList">
-			<option name="-metadata" value="Date"/>
-			<option name="-nogroup"/>
-		</classifier>
-		<format>
-			<gsf:template match="documentNode">
-				<td valign="top">
-					<gsf:link type="document">
 						<gsf:icon type="document"/>
 					</gsf:link>
@@ -190,7 +199,7 @@
 				<td valign="top">
 					<gsf:link type="document">
-<!--
-Defined in the global format statement
--->
+						<!--
+						Defined in the global format statement
+						-->
 						<xsl:call-template name="title-plain"/>
 					</gsf:link>
@@ -212,7 +221,7 @@
 				</td>
 				<td valign="top">
-<!--
-Defined in the global format statement
--->
+					<!--
+					Defined in the global format statement
+					-->
 					<xsl:call-template name="title-plain"/>
 					<gsf:switch>
