Index: /main/trunk/model-cols-dev/peijones/etc/collectionConfig.bak
===================================================================
--- /main/trunk/model-cols-dev/peijones/etc/collectionConfig.bak	(revision 24892)
+++ /main/trunk/model-cols-dev/peijones/etc/collectionConfig.bak	(revision 24893)
@@ -1,84 +1,445 @@
 <?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">
-    <metadataList>
-        <metadata lang="en" name="creator"/>
-        <metadata lang="en" name="maintainer"/>
-        <metadata lang="en" name="public">true</metadata>
-    </metadataList>
-    <displayItemList>
-        <displayItem assigned="true" lang="en" name="name">Pei-Jones-Flat</displayItem>
-    </displayItemList>
-    <search type="mgpp">
-        <level name="document">
-            <displayItem lang="en" name="name">document</displayItem>
-        </level>
-        <level name="section">
-            <displayItem lang="en" name="name">section</displayItem>
-        </level>
-        <defaultLevel name="section"/>
-        <index name="text">
-            <displayItem lang="en" name="name">text</displayItem>
-        </index>
-        <index name="Title">
-            <displayItem lang="en" name="name">titles</displayItem>
-        </index>
-        <index name="Source">
-            <displayItem lang="en" name="name">filenames</displayItem>
-        </index>
-        <index name="Plugin"/>
-        <defaultIndex name="text"/>
-        <indexOption>
-            <option name="accentfold"/>
-            <option name="casefold"/>
-            <option name="stem"/>
-        </indexOption>
-        <searchType name="plain"/>
-        <searchType name="simpleform"/>
-        <searchType name="advancedform"/>
-        <format><gsf:template match="documentNode"><td valign="top"><gsf:link type="document"><gsf:icon type="document"/></gsf:link></td><td><gsf:switch><gsf:metadata name="Title" select="ancestors" separator=": "/><gsf:when test="exists"><gsf:metadata name="Title" select="ancestors" separator=": "/>:</gsf:when></gsf:switch><gsf:link type="document"><gsf:metadata name="Title"/></gsf:link></td></gsf:template> </format>
-    </search>
-    <infodb type="gdbm"/>
-    <import>
-        <pluginList>
-            <plugin name="ZIPPlugin"/>
-            <plugin name="GreenstoneXMLPlugin"/>
-            <plugin name="TextPlugin"/>
-            <plugin name="HTMLPlugin"/>
-            <plugin name="EmailPlugin"/>
-            <plugin name="PDFPlugin"/>
-            <plugin name="RTFPlugin"/>
-            <plugin name="WordPlugin"/>
-            <plugin name="PostScriptPlugin"/>
-            <plugin name="PowerPointPlugin"/>
-            <plugin name="ExcelPlugin"/>
-            <plugin name="ImagePlugin"/>
-            <plugin name="ISISPlugin"/>
-            <plugin name="NulPlugin"/>
-            <plugin name="OAIPlugin"/>
-            <plugin name="HTMLImagePlugin"/>
-            <plugin name="MetadataXMLPlugin"/>
-            <plugin name="ArchivesInfPlugin"/>
-            <plugin name="DirectoryPlugin"/>
-        </pluginList>
-    </import>
-    <browse>
-        <classifier name="List">
-            <option name="-metadata" value="dc.Title;Title"/>
-            <option name="-partition_type_within_level" value="approximate_size"/>
-            <option name="-bookshelf_type" value="never"/>
-        </classifier>
-        <classifier name="AZCompactList">
-            <option name="-metadata" value="Source"/>
-            <option name="-removesuffix" value="(?i)\\..*"/>
-            <option name="-buttonname" value="Source"/>
-        </classifier>
-        <format><gsf:template match="documentNode">     <td valign="top">      <gsf:link type="document">       <gsf:icon type="document"/>      </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:choose-metadata>       <gsf:metadata name="dc.Title"/>       <gsf:metadata name="exp.Title"/>       <gsf:metadata name="Title"/>       <gsf:default>Untitled</gsf:default>      </gsf:choose-metadata>      <gsf:switch>       <gsf:metadata name="Source"/>       <gsf:when test="exists">        <br/><i>(<gsf:metadata name="Source"/>)</i>       </gsf:when>      </gsf:switch>     </td>    </gsf:template>        <gsf:template match="classifierNode">     <td valign="top">      <gsf:link type="classifier">       <gsf:icon type="classifier"/>      </gsf:link>     </td>     <td valign="top">      <gsf:metadata name="srclink"/>      <gsf:choose-metadata>       <gsf:metadata name="thumbicon"/>       <gsf:metadata name="srcicon"/>      </gsf:choose-metadata>      <gsf:metadata name="/srclink"/>     </td>     <td valign="top">      <gsf:choose-metadata>       <gsf:metadata name="dc.Title"/>       <gsf:metadata name="exp.Title"/>       <gsf:metadata name="Title"/>       <gsf:default>Untitled</gsf:default>      </gsf:choose-metadata>      <gsf:switch>       <gsf:metadata name="Source"/>       <gsf:when test="exists">        <br/><i>(<gsf:metadata name="Source"/>)</i>       </gsf:when>      </gsf:switch>     </td>    </gsf:template>        <gsf:template match="classifierNode" mode="horizontal">     <gsf:link type="horizontal">      <gsf:metadata name="Title"/>     </gsf:link>    </gsf:template>   </format>
-    </browse>
-    <display>
-        <format><gsf:option name="sideBar" value="false"/>    <xsl:template name="additionalHeaderContent">     <#comment/>     <script src="sites/localsite/collect/peijones/js/annotator/lib/vendor/jquery.js"><xsl:text> </xsl:text></script>      <#comment/>     <script src="sites/localsite/collect/peijones/js/annotator/lib/vendor/json2.js"><xsl:text> </xsl:text></script>      <script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator-full.min.js"><xsl:text> </xsl:text></script>     <#comment/>     <#comment/>      <#comment/>     <link href="sites/localsite/collect/peijones/js/annotator/pkg/annotator.min.css" rel="stylesheet" type="text/css"/>      <#comment/>      <#comment/>     <#comment/>      <#comment/>     <#comment/>     <#comment/>     <#comment/>      <#comment/>     <#comment/>      <#comment/>     <#comment/>     <#comment/>           <#comment/>     <script src="sites/localsite/collect/peijones/js/documentmaker/BrowserDetect.js" type="text/javascript"><xsl:text> </xsl:text></script>     <script src="sites/localsite/collect/peijones/js/documentmaker/PhotoNotes-1.5.js" type="text/javascript"><xsl:text> </xsl:text></script>     <link href="sites/localsite/collect/peijones/style/PhotoNotes-1.5.css" rel="stylesheet" type="text/css"/>          <#comment/>     <#comment/>     <script src="sites/localsite/collect/peijones/js/documentmaker/zoomer.jquery.js" type="text/javascript"><xsl:text> </xsl:text></script>    <link href="sites/localsite/collect/peijones/style/style.css" rel="stylesheet" type="text/css"/>     <script type="text/javascript">      <xsl:text disable-output-escaping="yes">       _zoomEnabled = true;       function readyImagesForZoom()             {         var noZoom = document.getElementById("noZoom");        var wrap = document.getElementById("wrap");        if(!noZoom || !wrap)        {         return;        }        var smallImageDiv = document.getElementById("small");        var smallImage = smallImageDiv.getElementsByTagName("img")[0];        smallImageDiv.style.width = smallImageWidth + "px";         smallImageDiv.style.height = smallImageHeight + "px";        var multiplier = largeImageHeight / smallImageHeight;        $("#wrap").anythingZoomer({                 expansionSize:50,           speedMultiplier:multiplier           });             noZoom.onclick = function(){addZoom();}        document.getElementById("overlay").onclick = function(){removeZoom();}                       removeZoom();       }                   function addZoom()         {        if(!_zoomEnabled)        {         return;        }                var wrapper = document.getElementById("wrap");          var noZoom = document.getElementById("noZoom");                 if(!noZoom || !wrapper)        {         return;        }                noZoom.style.display = "none";          wrapper.style.display = "block";         var option = document.getElementById("zoomOption");        if(option)        {         option.setAttribute("onclick", "removeZoom();");          }       }                  function removeZoom()       {        if(!_zoomEnabled)        {         return;        }               var wrapper = document.getElementById("wrap");        var noZoom = document.getElementById("noZoom");                if(!noZoom || !wrapper)        {         return;        }                wrapper.style.display = "none";        noZoom.style.display = "block";        var option = document.getElementById("zoomOption");        if(option)        {         option.setAttribute("onclick", "addZoom();");        }       }          </xsl:text>         </script>     <script text="text/javascript">      <xsl:text disable-output-escaping="yes">              var _posCount = 0;       var _notes;       function initNotes()       {        /* create the Photo Note Container */        _notes = new PhotoNoteContainer(document.getElementById("noZoom"));        getNotes();       }              function deleteFunction(note)       {        var callback =        {         success: function(response)         {          var updateURL = gs.siteMetadata.siteURL.replace("8080","9090") + gs.xsltParams.library_name + "?a=s&sa=c";                   var updateCallback =           {           success: function(response){},           failed: function(){alert("Failed in deleteFunction() to update Greenstone server with: " + updateURL);}          };                        YAHOO.util.Connect.asyncRequest("GET", updateURL, updateCallback);         },         failed: function(){ alert("Failed in deleteFunction() with note id: " + note.id)},        };                var status = true;                if (note && note.id && note.id > 0) {         var metaposStr =  note.id - 1;                 var url = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=remove-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metapos=" + metaposStr;         YAHOO.util.Connect.asyncRequest("GET", url, callback);        }        else {         alert("Failed to find valid note data to delete");         status = false;        }                return status;       }              function saveFunction(note)       {        var callback =         {         success: function(response)         {          var updateURL = gs.siteMetadata.siteURL.replace("8080","9090") + gs.xsltParams.library_name + "?a=s&sa=c";                   var updateCallback =           {           success: function(response){},           failed: function(reponse){ alert("Failed in saveFunction() to update Greenstone server with: " + updateURL);}          };                              YAHOO.util.Connect.asyncRequest("GET", updateURL, updateCallback);         },         failed: function(reponse){ alert("Failed in saveFunction() with note id: " + note.id)},        };                var jsonVal = '{"caption":"' + note.text + '", "area":{"x":' + note.rect.left + ', "y":' + note.rect.top + ', "width":' + note.rect.width + ', "height":' + note.rect.height + '}}';        var metaposStr = (note && note.id && note.id > 0) ? note.id - 1 : _posCount;                var saveURL = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=set-metadata&site=localsite&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&metaname=gsimg.photoNote&metavalue=" + jsonVal + "&metapos=" + metaposStr;        YAHOO.util.Connect.asyncRequest("GET", saveURL, callback);                return 1;       }                  function getNotes()       {        if(gs.variables.photoNotes == null || gs.variables.photoNotes == undefined)        {         console.log("No photo notes");         return;        }                for(var i = 0; i < gs.variables.photoNotes.length; i++)        {         var note = gs.variables.photoNotes[i];         if(!note)         {          continue;         }         var newNote = new PhotoNote(note.caption, i+1, new PhotoNoteRect(note.area.x,note.area.y,note.area.width,note.area.height));         newNote.onsave = saveFunction;         newNote.ondelete = deleteFunction;         _notes.AddNote(newNote);         _posCount++;        }                addNoteOverAndOutHandlers();       }              function AddNote()       {        var newNote = new PhotoNote('Add note text here...',_posCount+1,new PhotoNoteRect(10,10,50,50));        newNote.onsave = saveFunction;        newNote.ondelete = deleteFunction;        _notes.AddNote(newNote);        _posCount++;                addNoteOverAndOutHandlers();        newNote.Select();       }              function addNoteOverAndOutHandlers()       {        var divs = document.getElementsByTagName("DIV");        for(var i = 0; i < divs.length; i++)        {         if(divs[i].getAttribute("class") && divs[i].getAttribute("class").search("fn-area") != -1)         {          divs[i].onmouseover = function(){_zoomEnabled = false;}          divs[i].onmouseout = function(){_zoomEnabled = true;}         }        }       }              window.onload = function(){initNotes(); readyImagesForZoom(); initAnnotator();};      </xsl:text>     </script>          <script text="text/javascript">      <xsl:text disable-output-escaping="yes">       function initAnnotator()       {          jQuery(function ($) {         if (typeof $.fn.annotator !== 'function') {          alert("Ooops! it looks like you haven't built the Annotator concatenation file. " + "Either download a tagged release from GitHub, or modify the Cakefile to point " + "at your copy of the YUI compressor and run `cake package`.");         } else {           /*          jQuery('#gs-document-text').annotator()          .annotator('addPlugin', 'Store', {           prefix: 'http://annotateit.org/api',           annotationData: {'uri':document.URL}          })          .annotator('addPlugin', 'Auth', {           userId: 'papitha',          // Your AnnotateIt username           consumerKey: '39fc339cf058bd22176771b3e33c5dac',           // Your Account Key           authToken: '852b7fc25396d2aedf9aeb44dd58518faa679dbf027892164bfb81900bd09741' // Your Auth Token          });          */            jQuery(function ($) {           // Include AnnotateIt credentials to load the store plugin.           $('#gs-document-text').annotator().annotator('setupPlugins', {            userId:    'papitha',            userName:  'Papitha',            accountId: '39fc339cf058bd22176771b3e33c5dac',            authToken: '852b7fc25396d2aedf9aeb44dd58518faa679dbf027892164bfb81900bd09741',            }, {            //Store: {annotationData: {'uri':document.URL}}           });          });         }        });       }      </xsl:text>     </script>    </xsl:template>        <xsl:template name="documentImage">     <#comment/>     <gsf:variable-struct name="photoNotes">      <gsf:metadata multiple="true" name="gsimg.photoNote" separator=", "/>     </gsf:variable-struct>          <#comment/>     <h3>         <gsf:choose-metadata>       <gsf:metadata name="dc.Title"/>       <gsf:metadata name="ex.Title"/>      </gsf:choose-metadata>     </h3>     <xsl:variable name="imageWidth">      <gsf:choose-metadata>       <gsf:metadata name="ImageWidth"/>        <gsf:default>-1</gsf:default>              </gsf:choose-metadata>     </xsl:variable>     <xsl:variable name="imageHeight">      <gsf:choose-metadata>       <gsf:metadata name="ImageHeight"/>        <gsf:default>-1</gsf:default>              </gsf:choose-metadata>     </xsl:variable>     <xsl:variable name="screenImageWidth">      <gsf:choose-metadata>       <gsf:metadata name="ScreenWidth"/>        <gsf:default>-1</gsf:default>              </gsf:choose-metadata>     </xsl:variable>     <xsl:variable name="screenImageHeight">      <gsf:choose-metadata>       <gsf:metadata name="ScreenHeight"/>        <gsf:default>-1</gsf:default>              </gsf:choose-metadata>     </xsl:variable>     <script type="text/javascript">      <xsl:text>largeImageHeight =</xsl:text><xsl:value-of select="$imageHeight"/><xsl:text>;</xsl:text>      <xsl:text>largeImageWidth =</xsl:text><xsl:value-of select="$imageWidth"/><xsl:text>;</xsl:text>      <xsl:text>smallImageHeight =</xsl:text><xsl:value-of select="$screenImageHeight"/><xsl:text>;</xsl:text>      <xsl:text>smallImageWidth =</xsl:text><xsl:value-of select="$screenImageWidth"/><xsl:text>;</xsl:text>     </script>     <div id="noZoom" style="display:block;">      <gsf:metadata name="screenicon"/>     </div>     <#comment/>      <div id="wrap" style="display:none; width: {$screenImageWidth}; height: {$screenImageHeight};">       <div id="small" style="width: {$screenImageWidth}; height: {$screenImageHeight};"><gsf:metadata name="screenicon"/></div>       <div id="mover">        <div id="overlay"><xsl:text> </xsl:text></div>        <div id="large">         <img style="width: {$imageWidth}; height: {$imageHeight};">          <xsl:attribute name="src">           <xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath"/>/<gsf:metadata name="srclinkFile"/>          </xsl:attribute>         </img>        </div>       </div>      </div>      <input onclick="AddNote();" style="margin-left:30px;" type="button" value="Tag Photo!"/>     <#comment/>    </xsl:template>       </format>
-    </display>
-    <replaceListRef id="gs2-standard"/>
-    <replaceListRef id="gs2-image"/>
-    <serviceRackList>
+<metadataList><metadata lang="en" name="creator"></metadata><metadata lang="en" name="maintainer"></metadata><metadata lang="en" name="public">true</metadata></metadataList><displayItemList><displayItem assigned="true" lang="en" name="name">Pei-Jones-Flat</displayItem></displayItemList><search type="mgpp"><level name="document"><displayItem lang="en" name="name">document</displayItem></level><level name="section"><displayItem lang="en" name="name">section</displayItem></level><defaultLevel name="section"/><index name="text"><displayItem lang="en" name="name">text</displayItem></index><index name="Title"><displayItem lang="en" name="name">titles</displayItem></index><index name="Source"><displayItem lang="en" name="name">filenames</displayItem></index><index name="Plugin"/><defaultIndex name="text"/><indexOption><option name="accentfold"/><option name="casefold"/><option name="stem"/></indexOption><searchType name="plain"/><searchType name="simpleform"/><searchType name="advancedform"/><format><gsf:template match="documentNode"><td valign="top"><gsf:link type="document"><gsf:icon type="document"/></gsf:link></td><td><gsf:switch><gsf:metadata name="Title" select="ancestors" separator=": "/><gsf:when test="exists"><gsf:metadata name="Title" select="ancestors" separator=": "/>:</gsf:when></gsf:switch><gsf:link type="document"><gsf:metadata name="Title"/></gsf:link></td></gsf:template> </format></search><infodb type="gdbm"/><import><pluginList><plugin name="ZIPPlugin"/><plugin name="GreenstoneXMLPlugin"/><plugin name="TextPlugin"/><plugin name="HTMLPlugin"><option name="-process_exp" value="(timeglider.*)(?i)(\.html?)$"/><option name="-block_exp" value="(timeglider.*)(?i)(\.jpe?g|\.png|\.gif)$"/><option name="-keep_head"/></plugin><plugin name="EmailPlugin"/><plugin name="PDFPlugin"/><plugin name="RTFPlugin"/><plugin name="WordPlugin"/><plugin name="PostScriptPlugin"/><plugin name="PowerPointPlugin"/><plugin name="ExcelPlugin"/><plugin name="PagedImagePlugin"/><plugin name="ImagePlugin"/><plugin name="ISISPlugin"/><plugin name="NulPlugin"/><plugin name="OAIPlugin"/><plugin name="HTMLImagePlugin"/><plugin name="MetadataXMLPlugin"/><plugin name="ArchivesInfPlugin"/><plugin name="DirectoryPlugin"/></pluginList></import><browse><classifier name="List"><option name="-metadata" value="dc.Title;Title"/><option name="-partition_type_within_level" value="approximate_size"/><option name="-bookshelf_type" value="never"/></classifier><classifier name="AZCompactList"><option name="-metadata" value="Source"/><option name="-removesuffix" value="(?i)\\..*"/><option name="-buttonname" value="Source"/></classifier><format>
+			<gsf:template match="documentNode">
+				<td valign="top">
+					<gsf:link type="document">
+						<gsf:icon type="document"/>
+					</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:choose-metadata>
+						<gsf:metadata name="dc.Title"/>
+						<gsf:metadata name="exp.Title"/>
+						<gsf:metadata name="Title"/>
+						<gsf:default>Untitled</gsf:default>
+					</gsf:choose-metadata>
+					<gsf:switch>
+						<gsf:metadata name="Source"/>
+						<gsf:when test="exists">
+							<br/><i>(<gsf:metadata name="Source"/>)</i>
+						</gsf:when>
+					</gsf:switch>
+				</td>
+			</gsf:template>
+			
+			<gsf:template match="classifierNode">
+				<td valign="top">
+					<gsf:link type="classifier">
+						<gsf:icon type="classifier"/>
+					</gsf:link>
+				</td>
+				<td valign="top">
+					<gsf:metadata name="srclink"/>
+					<gsf:choose-metadata>
+						<gsf:metadata name="thumbicon"/>
+						<gsf:metadata name="srcicon"/>
+					</gsf:choose-metadata>
+					<gsf:metadata name="/srclink"/>
+				</td>
+				<td valign="top">
+					<gsf:choose-metadata>
+						<gsf:metadata name="dc.Title"/>
+						<gsf:metadata name="exp.Title"/>
+						<gsf:metadata name="Title"/>
+						<gsf:default>Untitled</gsf:default>
+					</gsf:choose-metadata>
+					<gsf:switch>
+						<gsf:metadata name="Source"/>
+						<gsf:when test="exists">
+							<br/><i>(<gsf:metadata name="Source"/>)</i>
+						</gsf:when>
+					</gsf:switch>
+				</td>
+			</gsf:template>
+			
+			<gsf:template match="classifierNode" mode="horizontal">
+				<gsf:link type="horizontal">
+					<gsf:metadata name="Title"/>
+				</gsf:link>
+			</gsf:template>
+		</format></browse><display><format>
+			<gsf:option name="sideBar" value="false"/>
+			<xsl:template name="additionalHeaderContent">
+				<!-- jQuery must be included before Annotator -->
+				<script src="sites/localsite/collect/peijones/js/annotator/lib/vendor/jquery.js"><xsl:text> </xsl:text></script>
+
+				<!-- If you're sure your users will only be using browsers modern
+					 enough to have their own JSON.parse and JSON.stringify
+					 implementations you can skip this -->
+				<script src="sites/localsite/collect/peijones/js/annotator/lib/vendor/json2.js"><xsl:text> </xsl:text></script>
+
+				<script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator-full.min.js"><xsl:text> </xsl:text></script>
+				<!-- The main Annotator script -->
+				<!--<script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.min.js"><xsl:text> </xsl:text></script> -->
+
+				<!-- Annotator's styling and images -->
+				<link href="sites/localsite/collect/peijones/js/annotator/pkg/annotator.min.css" rel="stylesheet" type="text/css"/>
+
+				<!-- The following plugins are entirely optional -->
+
+				<!-- The Store plugin. Saves annotations to a remote backend -->
+				<!-- <script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.store.min.js"><xsl:text> </xsl:text></script> -->
+
+				<!-- The Auth plugin. Allows users of Annotator to authenticate themselves
+					 to the remote backend -->
+				<!--<script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.auth.min.js"><xsl:text> </xsl:text></script> -->
+				<!-- The Permissions plugin. See who created which annotation and create
+					 annotations as a specified user -->
+				<!--<script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.permissions.min.js"><xsl:text> </xsl:text></script> -->
+
+				<!-- The Tags plugin. Edit and display tag keywords on annotations -->
+				<!--<script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.tags.min.js"><xsl:text> </xsl:text></script> -->
+
+				<!-- The Markdown plugin. Treat annotation text as Markdown -->
+				<!-- <script src="sites/localsite/collect/peijones/js/annotator/lib/vendor/showdown.js"><xsl:text> </xsl:text></script> -->
+				<!-- <script src="sites/localsite/collect/peijones/js/annotator/pkg/annotator.markdown.min.js"><xsl:text> </xsl:text></script> --> 
+				
+				<!-- Photo note scripts -->
+				<script src="sites/localsite/collect/peijones/js/documentmaker/BrowserDetect.js" type="text/javascript"><xsl:text> </xsl:text></script>
+				<script src="sites/localsite/collect/peijones/js/documentmaker/PhotoNotes-1.5.js" type="text/javascript"><xsl:text> </xsl:text></script>
+				<link href="sites/localsite/collect/peijones/style/PhotoNotes-1.5.css" rel="stylesheet" type="text/css"/>
+				
+				<!-- Zoom scripts -->
+				<!--<script src="interfaces/{$interface_name}/js/jquery-1.4.2.js" type="text/javascript"><xsl:text> </xsl:text></script>-->
+				<script src="sites/localsite/collect/peijones/js/documentmaker/zoomer.jquery.js" type="text/javascript"><xsl:text> </xsl:text></script>    <link href="sites/localsite/collect/peijones/style/style.css" rel="stylesheet" type="text/css"/>
+				<script type="text/javascript">
+					<xsl:text disable-output-escaping="yes">
+						_zoomEnabled = true;
+						function readyImagesForZoom()      
+						{ 
+							var noZoom = document.getElementById("noZoom");
+							var wrap = document.getElementById("wrap");
+							if(!noZoom || !wrap)
+							{
+								return;
+							}
+							var smallImageDiv = document.getElementById("small");
+							var smallImage = smallImageDiv.getElementsByTagName("img")[0];
+							smallImageDiv.style.width = smallImageWidth + "px"; 
+							smallImageDiv.style.height = smallImageHeight + "px";
+							var multiplier = largeImageHeight / smallImageHeight;
+							$("#wrap").anythingZoomer({        
+								expansionSize:50,  
+								speedMultiplier:multiplier   
+							});   	
+
+							noZoom.onclick = function(){addZoom();}
+							document.getElementById("overlay").onclick = function(){removeZoom();}							
+							
+							removeZoom();
+						}            
+						function addZoom()  
+						{
+							if(!_zoomEnabled)
+							{
+								return;
+							}
+							
+							var wrapper = document.getElementById("wrap");  
+							var noZoom = document.getElementById("noZoom"); 
+							
+							if(!noZoom || !wrapper)
+							{
+								return;
+							}
+							
+							noZoom.style.display = "none";  
+							wrapper.style.display = "block"; 
+							var option = document.getElementById("zoomOption");
+							if(option)
+							{
+								option.setAttribute("onclick", "removeZoom();");  
+							}
+						}           
+						function removeZoom()
+						{
+							if(!_zoomEnabled)
+							{
+								return;
+							}
+						
+							var wrapper = document.getElementById("wrap");
+							var noZoom = document.getElementById("noZoom");
+							
+							if(!noZoom || !wrapper)
+							{
+								return;
+							}
+							
+							wrapper.style.display = "none";
+							noZoom.style.display = "block";
+							var option = document.getElementById("zoomOption");
+							if(option)
+							{
+								option.setAttribute("onclick", "addZoom();");
+							}
+						}    
+					</xsl:text>    
+				</script>
+				<script text="text/javascript">
+					<xsl:text disable-output-escaping="yes">
+						
+						var _posCount = 0;
+						var _notes;
+						function initNotes()
+						{
+							/* create the Photo Note Container */
+							_notes = new PhotoNoteContainer(document.getElementById("noZoom"));
+							getNotes();
+						}
+						
+						function deleteFunction(note)
+						{
+							var callback =
+							{
+								success: function(response)
+								{
+									var updateURL = gs.siteMetadata.siteURL.replace("8080","9090") + gs.xsltParams.library_name + "?a=s&amp;sa=c";
+								
+									var updateCallback = 
+									{
+										success: function(response){},
+										failed: function(){alert("Failed in deleteFunction() to update Greenstone server with: " + updateURL);}
+									};
+									
+			
+									YAHOO.util.Connect.asyncRequest("GET", updateURL, updateCallback);
+								},
+								failed: function(){ alert("Failed in deleteFunction() with note id: " + note.id)},
+							};
+							
+							var status = true;
+							
+							if (note &amp;&amp; note.id &amp;&amp; note.id &gt; 0) {
+								var metaposStr =  note.id - 1;
+							
+								var url = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=remove-metadata&amp;site=localsite&amp;c=" + gs.cgiParams.c + "&amp;d=" + gs.cgiParams.d + "&amp;metaname=gsimg.photoNote&amp;metapos=" + metaposStr;
+								YAHOO.util.Connect.asyncRequest("GET", url, callback);
+							}
+							else {
+								alert("Failed to find valid note data to delete");
+								status = false;
+							}
+							
+							return status;
+						}
+						
+						function saveFunction(note)
+						{
+							var callback = 
+							{
+								success: function(response)
+								{
+									var updateURL = gs.siteMetadata.siteURL.replace("8080","9090") + gs.xsltParams.library_name + "?a=s&amp;sa=c";
+								
+									var updateCallback = 
+									{
+										success: function(response){},
+										failed: function(reponse){ alert("Failed in saveFunction() to update Greenstone server with: " + updateURL);}
+									};
+									
+									
+									YAHOO.util.Connect.asyncRequest("GET", updateURL, updateCallback);
+								},
+								failed: function(reponse){ alert("Failed in saveFunction() with note id: " + note.id)},
+							};
+							
+							var jsonVal = '{"caption":"' + note.text + '", "area":{"x":' + note.rect.left + ', "y":' + note.rect.top + ', "width":' + note.rect.width + ', "height":' + note.rect.height + '}}';
+							var metaposStr = (note &amp;&amp; note.id &amp;&amp; note.id &gt; 0) ? note.id - 1 : _posCount;
+							
+							var saveURL = gs.siteMetadata.siteURL.replace("8080","9090") + "cgi-bin/metadata-server.pl?a=set-metadata&amp;site=localsite&amp;c=" + gs.cgiParams.c + "&amp;d=" + gs.cgiParams.d + "&amp;metaname=gsimg.photoNote&amp;metavalue=" + jsonVal + "&amp;metapos=" + metaposStr;
+							YAHOO.util.Connect.asyncRequest("GET", saveURL, callback);
+							
+							return 1;
+						}				
+						
+						function getNotes()
+						{
+							if(gs.variables.photoNotes == null || gs.variables.photoNotes == undefined)
+							{
+								console.log("No photo notes");
+								return;
+							}
+							
+							for(var i = 0; i &lt; gs.variables.photoNotes.length; i++)
+							{
+								var note = gs.variables.photoNotes[i];
+								if(!note)
+								{
+									continue;
+								}
+								var newNote = new PhotoNote(note.caption, i+1, new PhotoNoteRect(note.area.x,note.area.y,note.area.width,note.area.height));
+								newNote.onsave = saveFunction;
+								newNote.ondelete = deleteFunction;
+								_notes.AddNote(newNote);
+								_posCount++;
+							}
+							
+							addNoteOverAndOutHandlers();
+						}
+						
+						function AddNote()
+						{
+							var newNote = new PhotoNote('Add note text here...',_posCount+1,new PhotoNoteRect(10,10,50,50));
+							newNote.onsave = saveFunction;
+							newNote.ondelete = deleteFunction;
+							_notes.AddNote(newNote);
+							_posCount++;
+							
+							addNoteOverAndOutHandlers();
+							newNote.Select();
+						}
+						
+						function addNoteOverAndOutHandlers()
+						{
+							var divs = document.getElementsByTagName("DIV");
+							for(var i = 0; i &lt; divs.length; i++)
+							{
+								if(divs[i].getAttribute("class") &amp;&amp; divs[i].getAttribute("class").search("fn-area") != -1)
+								{
+									divs[i].onmouseover = function(){_zoomEnabled = false;}
+									divs[i].onmouseout = function(){_zoomEnabled = true;}
+								}
+							}
+						}
+						
+						window.onload = function(){initNotes(); readyImagesForZoom(); initAnnotator();};
+					</xsl:text>
+				</script>
+				
+				<script text="text/javascript">
+					<xsl:text disable-output-escaping="yes">
+						function initAnnotator()
+						{		
+							jQuery(function ($) {
+								if (typeof $.fn.annotator !== 'function') {
+									alert("Ooops! it looks like you haven't built the Annotator concatenation file. " + "Either download a tagged release from GitHub, or modify the Cakefile to point " + "at your copy of the YUI compressor and run `cake package`.");
+								} else {	
+									/*
+									jQuery('#gs-document-text').annotator()
+									.annotator('addPlugin', 'Store', {
+										prefix: 'http://annotateit.org/api',
+										annotationData: {'uri':document.URL}
+									})
+									.annotator('addPlugin', 'Auth', {
+										userId: 'papitha',          // Your AnnotateIt username
+										consumerKey: '39fc339cf058bd22176771b3e33c5dac',           // Your Account Key
+										authToken: '852b7fc25396d2aedf9aeb44dd58518faa679dbf027892164bfb81900bd09741' // Your Auth Token
+									});
+									*/	
+
+									jQuery(function ($) {
+										// Include AnnotateIt credentials to load the store plugin.
+										$('#gs-document-text').annotator().annotator('setupPlugins', {
+											userId:    'papitha',
+											userName:  'Papitha',
+											accountId: '39fc339cf058bd22176771b3e33c5dac',
+											authToken: '852b7fc25396d2aedf9aeb44dd58518faa679dbf027892164bfb81900bd09741',	
+										}, {
+											Store: 
+											{
+												prefix: 'http://localhost:5000',
+												annotationData: {'uri':gs.cgiParams.c + "-" + gs.cgiParams.d},
+												loadFromSearch: {'uri':gs.cgiParams.c + "-" + gs.cgiParams.d}
+											}
+										});
+									});
+								}
+							});
+						}
+					</xsl:text>
+				</script>
+			</xsl:template>
+			
+			<xsl:template name="documentImage">
+				<!-- Get the photo notes for this document node -->
+				<gsf:variable-struct name="photoNotes">
+					<gsf:metadata multiple="true" name="gsimg.photoNote" separator=", "/>
+				</gsf:variable-struct>
+				
+				<!-- Get details about the image for zooming -->
+				<h3>   
+					<gsf:choose-metadata>
+						<gsf:metadata name="dc.Title"/>
+						<gsf:metadata name="ex.Title"/>
+					</gsf:choose-metadata>
+				</h3>
+				<xsl:variable name="imageWidth">
+					<gsf:choose-metadata>
+						<gsf:metadata name="ImageWidth"/> 
+						<gsf:default>-1</gsf:default>  						
+					</gsf:choose-metadata>
+				</xsl:variable>
+				<xsl:variable name="imageHeight">
+					<gsf:choose-metadata>
+						<gsf:metadata name="ImageHeight"/> 
+						<gsf:default>-1</gsf:default>  						
+					</gsf:choose-metadata>
+				</xsl:variable>
+				<xsl:variable name="screenImageWidth">
+					<gsf:choose-metadata>
+						<gsf:metadata name="ScreenWidth"/> 
+						<gsf:default>-1</gsf:default>  						
+					</gsf:choose-metadata>
+				</xsl:variable>
+				<xsl:variable name="screenImageHeight">
+					<gsf:choose-metadata>
+						<gsf:metadata name="ScreenHeight"/> 
+						<gsf:default>-1</gsf:default>  						
+					</gsf:choose-metadata>
+				</xsl:variable>
+				<script type="text/javascript">
+					<xsl:text>largeImageHeight =</xsl:text><xsl:value-of select="$imageHeight"/><xsl:text>;</xsl:text>
+					<xsl:text>largeImageWidth =</xsl:text><xsl:value-of select="$imageWidth"/><xsl:text>;</xsl:text>
+					<xsl:text>smallImageHeight =</xsl:text><xsl:value-of select="$screenImageHeight"/><xsl:text>;</xsl:text>
+					<xsl:text>smallImageWidth =</xsl:text><xsl:value-of select="$screenImageWidth"/><xsl:text>;</xsl:text>
+				</script>
+				<div id="noZoom" style="display:block;">
+					<img style="width: {$screenImageWidth}; height: {$screenImageHeight};">
+									<xsl:attribute name="src">
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="Screen"/>
+									</xsl:attribute>
+					</img>
+						<!--		
+					<gsf:metadata name="screenicon"/>
+					-->
+				</div>
+				<!--<xsl:if test="$imageHeight != -1">-->
+					<div id="wrap" style="display:none; width: {$screenImageWidth}; height: {$screenImageHeight};">
+						<div id="small" style="width: {$screenImageWidth}; height: {$screenImageHeight};">
+						<!--
+							<gsf:metadata name="screenicon"/>
+							-->
+							<img style="width: {$screenImageWidth}; height: {$screenImageHeight};">
+									<xsl:attribute name="src">
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="Screen"/>
+									</xsl:attribute>
+							</img>	
+						</div>
+						<div id="mover">
+							<div id="overlay"><xsl:text> </xsl:text></div>
+							<div id="large">
+								<img style="width: {$imageWidth}; height: {$imageHeight};">
+									<xsl:attribute name="src">
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="srclinkFile"/>
+									</xsl:attribute>
+								</img>
+							</div>
+						</div>
+					</div>
+					<input onclick="AddNote();" style="margin-left:30px;" type="button" value="Tag Photo!"/>
+				<!--</xsl:if>-->
+			</xsl:template>
+			
+		</format></display><replaceListRef id="gs2-standard"/><replaceListRef id="gs2-image"/><serviceRackList>
         <!-- comment out the following serviceRack if you want to disable OAI for this collection -->
         <serviceRack name="OAIPMH">
@@ -111,4 +472,3 @@
             </ListMetadataFormats>
         </serviceRack>
-    </serviceRackList>
-</CollectionConfig>
+    </serviceRackList></CollectionConfig>
Index: /main/trunk/model-cols-dev/peijones/etc/collectionConfig.xml
===================================================================
--- /main/trunk/model-cols-dev/peijones/etc/collectionConfig.xml	(revision 24892)
+++ /main/trunk/model-cols-dev/peijones/etc/collectionConfig.xml	(revision 24893)
@@ -1,78 +1,5 @@
 <?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">
-    <metadataList>
-        <metadata lang="en" name="creator"/>
-        <metadata lang="en" name="maintainer"/>
-        <metadata lang="en" name="public">true</metadata>
-    </metadataList>
-    <displayItemList>
-        <displayItem assigned="true" lang="en" name="name">Pei-Jones-Flat</displayItem>
-    </displayItemList>
-    <search type="mgpp">
-        <level name="document">
-            <displayItem lang="en" name="name">document</displayItem>
-        </level>
-        <level name="section">
-            <displayItem lang="en" name="name">section</displayItem>
-        </level>
-        <defaultLevel name="section"/>
-        <index name="text">
-            <displayItem lang="en" name="name">text</displayItem>
-        </index>
-        <index name="Title">
-            <displayItem lang="en" name="name">titles</displayItem>
-        </index>
-        <index name="Source">
-            <displayItem lang="en" name="name">filenames</displayItem>
-        </index>
-        <index name="Plugin"/>
-        <defaultIndex name="text"/>
-        <indexOption>
-            <option name="accentfold"/>
-            <option name="casefold"/>
-            <option name="stem"/>
-        </indexOption>
-        <searchType name="plain"/>
-        <searchType name="simpleform"/>
-        <searchType name="advancedform"/>
-        <format><gsf:template match="documentNode"><td valign="top"><gsf:link type="document"><gsf:icon type="document"/></gsf:link></td><td><gsf:switch><gsf:metadata name="Title" select="ancestors" separator=": "/><gsf:when test="exists"><gsf:metadata name="Title" select="ancestors" separator=": "/>:</gsf:when></gsf:switch><gsf:link type="document"><gsf:metadata name="Title"/></gsf:link></td></gsf:template> </format>
-    </search>
-    <infodb type="gdbm"/>
-    <import>
-        <pluginList>
-            <plugin name="ZIPPlugin"/>
-            <plugin name="GreenstoneXMLPlugin"/>
-            <plugin name="TextPlugin"/>
-            <plugin name="HTMLPlugin"/>
-            <plugin name="EmailPlugin"/>
-            <plugin name="PDFPlugin"/>
-            <plugin name="RTFPlugin"/>
-            <plugin name="WordPlugin"/>
-            <plugin name="PostScriptPlugin"/>
-            <plugin name="PowerPointPlugin"/>
-            <plugin name="ExcelPlugin"/>
-			<plugin name="PagedImagePlugin"/>
-            <plugin name="ImagePlugin"/>
-            <plugin name="ISISPlugin"/>
-            <plugin name="NulPlugin"/>
-            <plugin name="OAIPlugin"/>
-            <plugin name="HTMLImagePlugin"/>
-            <plugin name="MetadataXMLPlugin"/>
-            <plugin name="ArchivesInfPlugin"/>
-            <plugin name="DirectoryPlugin"/>
-        </pluginList>
-    </import>
-    <browse>
-        <classifier name="List">
-            <option name="-metadata" value="dc.Title;Title"/>
-            <option name="-partition_type_within_level" value="approximate_size"/>
-            <option name="-bookshelf_type" value="never"/>
-        </classifier>
-        <classifier name="AZCompactList">
-            <option name="-metadata" value="Source"/>
-            <option name="-removesuffix" value="(?i)\\..*"/>
-            <option name="-buttonname" value="Source"/>
-        </classifier>
-        <format>
+<metadataList><metadata lang="en" name="creator"></metadata><metadata lang="en" name="maintainer"></metadata><metadata lang="en" name="public">true</metadata></metadataList><displayItemList><displayItem assigned="true" lang="en" name="name">Pei-Jones-Flat</displayItem></displayItemList><search type="mgpp"><level name="document"><displayItem lang="en" name="name">document</displayItem></level><level name="section"><displayItem lang="en" name="name">section</displayItem></level><defaultLevel name="section"/><index name="text"><displayItem lang="en" name="name">text</displayItem></index><index name="Title"><displayItem lang="en" name="name">titles</displayItem></index><index name="Source"><displayItem lang="en" name="name">filenames</displayItem></index><index name="Plugin"/><defaultIndex name="text"/><indexOption><option name="accentfold"/><option name="casefold"/><option name="stem"/></indexOption><searchType name="plain"/><searchType name="simpleform"/><searchType name="advancedform"/><format><gsf:template match="documentNode"><td valign="top"><gsf:link type="document"><gsf:icon type="document"/></gsf:link></td><td><gsf:switch><gsf:metadata name="Title" select="ancestors" separator=": "/><gsf:when test="exists"><gsf:metadata name="Title" select="ancestors" separator=": "/>:</gsf:when></gsf:switch><gsf:link type="document"><gsf:metadata name="Title"/></gsf:link></td></gsf:template> </format></search><infodb type="gdbm"/><import><pluginList><plugin name="ZIPPlugin"/><plugin name="GreenstoneXMLPlugin"/><plugin name="TextPlugin"/><plugin name="HTMLPlugin"><option name="-process_exp" value="(timeglider.*)(?i)(\.html?)$"/><option name="-block_exp" value="(timeglider.*)(?i)(\.jpe?g|\.png|\.gif)$"/><option name="-keep_head"/></plugin><plugin name="EmailPlugin"/><plugin name="PDFPlugin"/><plugin name="RTFPlugin"/><plugin name="WordPlugin"/><plugin name="PostScriptPlugin"/><plugin name="PowerPointPlugin"/><plugin name="ExcelPlugin"/><plugin name="PagedImagePlugin"/><plugin name="ImagePlugin"/><plugin name="ISISPlugin"/><plugin name="NulPlugin"/><plugin name="OAIPlugin"/><plugin name="HTMLImagePlugin"/><plugin name="MetadataXMLPlugin"/><plugin name="ArchivesInfPlugin"/><plugin name="DirectoryPlugin"/></pluginList></import><browse><classifier name="List"><option name="-metadata" value="dc.Title;Title"/><option name="-partition_type_within_level" value="approximate_size"/><option name="-bookshelf_type" value="never"/></classifier><classifier name="AZCompactList"><option name="-metadata" value="Source"/><option name="-removesuffix" value="(?i)\\..*"/><option name="-buttonname" value="Source"/></classifier><format>
 			<gsf:template match="documentNode">
 				<td valign="top">
@@ -140,8 +67,5 @@
 				</gsf:link>
 			</gsf:template>
-		</format>
-    </browse>
-    <display>
-        <format>
+		</format></browse><display><format>
 			<gsf:option name="sideBar" value="false"/>
 			<xsl:template name="additionalHeaderContent">
@@ -159,5 +83,5 @@
 
 				<!-- Annotator's styling and images -->
-				<link rel="stylesheet" type="text/css" href="sites/localsite/collect/peijones/js/annotator/pkg/annotator.min.css"/>
+				<link href="sites/localsite/collect/peijones/js/annotator/pkg/annotator.min.css" rel="stylesheet" type="text/css"/>
 
 				<!-- The following plugins are entirely optional -->
@@ -181,7 +105,7 @@
 				
 				<!-- Photo note scripts -->
-				<script type="text/javascript" src="sites/localsite/collect/peijones/js/documentmaker/BrowserDetect.js"><xsl:text> </xsl:text></script>
-				<script type="text/javascript" src="sites/localsite/collect/peijones/js/documentmaker/PhotoNotes-1.5.js"><xsl:text> </xsl:text></script>
-				<link rel="stylesheet" type="text/css" href="sites/localsite/collect/peijones/style/PhotoNotes-1.5.css"/>
+				<script src="sites/localsite/collect/peijones/js/documentmaker/BrowserDetect.js" type="text/javascript"><xsl:text> </xsl:text></script>
+				<script src="sites/localsite/collect/peijones/js/documentmaker/PhotoNotes-1.5.js" type="text/javascript"><xsl:text> </xsl:text></script>
+				<link href="sites/localsite/collect/peijones/style/PhotoNotes-1.5.css" rel="stylesheet" type="text/css"/>
 				
 				<!-- Zoom scripts -->
@@ -483,5 +407,5 @@
 					<img style="width: {$screenImageWidth}; height: {$screenImageHeight};">
 									<xsl:attribute name="src">
-										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata select="root" name="assocfilepath"/>/<gsf:metadata name="Screen"/>
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="Screen"/>
 									</xsl:attribute>
 					</img>
@@ -498,5 +422,5 @@
 							<img style="width: {$screenImageWidth}; height: {$screenImageHeight};">
 									<xsl:attribute name="src">
-										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata select="root" name="assocfilepath"/>/<gsf:metadata name="Screen"/>
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="Screen"/>
 									</xsl:attribute>
 							</img>	
@@ -507,5 +431,5 @@
 								<img style="width: {$imageWidth}; height: {$imageHeight};">
 									<xsl:attribute name="src">
-										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata select="root" name="assocfilepath"/>/<gsf:metadata name="srclinkFile"/>
+										<xsl:value-of disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<gsf:metadata name="assocfilepath" select="root"/>/<gsf:metadata name="srclinkFile"/>
 									</xsl:attribute>
 								</img>
@@ -513,13 +437,9 @@
 						</div>
 					</div>
-					<input type="button" value="Tag Photo!" style="margin-left:30px;" onclick="AddNote();" />
+					<input onclick="AddNote();" style="margin-left:30px;" type="button" value="Tag Photo!"/>
 				<!--</xsl:if>-->
 			</xsl:template>
 			
-		</format>
-    </display>
-    <replaceListRef id="gs2-standard"/>
-    <replaceListRef id="gs2-image"/>
-    <serviceRackList>
+		</format></display><replaceListRef id="gs2-standard"/><replaceListRef id="gs2-image"/><serviceRackList>
         <!-- comment out the following serviceRack if you want to disable OAI for this collection -->
         <serviceRack name="OAIPMH">
@@ -552,4 +472,3 @@
             </ListMetadataFormats>
         </serviceRack>
-    </serviceRackList>
-</CollectionConfig>
+    </serviceRackList></CollectionConfig>
Index: /main/trunk/model-cols-dev/peijones/gli.col
===================================================================
--- /main/trunk/model-cols-dev/peijones/gli.col	(revision 24892)
+++ /main/trunk/model-cols-dev/peijones/gli.col	(revision 24893)
@@ -12,13 +12,3 @@
 				enabled           CDATA "true">
 ]>
-<GathererCollection>
-    <Argument name="built">false</Argument>
-    <Argument name="imported">true</Argument>
-    <Argument name="skimfile">true</Argument>
-    <GathererConfig/>
-    <BuildConfig>
-        <Build/>
-        <Import/>
-        <Schedule/>
-    </BuildConfig>
-</GathererCollection>
+<GathererCollection><Argument name="built">false</Argument><Argument name="imported">true</Argument><Argument name="skimfile">true</Argument><GathererConfig/><BuildConfig><Build/><Import/><Schedule/></BuildConfig></GathererCollection>
