Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/allHeadings.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/allHeadings.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/allHeadings.jsp (revision 687)
@@ -26,9 +26,4 @@
 	  <h:outputText value="#{generalMessages.assessment}" />
     </h:commandLink>
-    <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminAssessment}"/>
-    <h:commandLink accesskey="#{generalMessages.a_template}" title="#{generalMessages.t_template}" action="template" immediate="true" rendered="#{authorization.adminTemplate}">
-      <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-      <h:outputText value="#{generalMessages.template}" />
-    </h:commandLink>
     <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminTemplate}"/>
     <h:commandLink id="questionPoolsLink" accesskey="#{generalMessages.a_pool}" title="#{generalMessages.t_questionPool}" action="poolList" immediate="true" rendered="#{authorization.adminQuestionPool}">
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp (revision 687)
@@ -60,9 +60,4 @@
     <h:commandLink title="#{generalMessages.t_assessment}" action="author" immediate="true">
       <h:outputText value="#{generalMessages.assessment}" />
-    </h:commandLink>
-    <h:outputText value="#{generalMessages.separator} " />
-    <h:commandLink title="#{generalMessages.t_template}" action="template" immediate="true">
-      <h:outputText value="#{generalMessages.template}" />
-      <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
     </h:commandLink>
     <h:outputText value="#{generalMessages.separator} " />
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/evaluation/evaluationHeadings.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/evaluation/evaluationHeadings.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/evaluation/evaluationHeadings.jsp (revision 687)
@@ -28,9 +28,4 @@
       <h:outputText value="#{generalMessages.assessment}" />
     </h:commandLink>
-    <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminTemplate}" />
-    <h:commandLink title="#{generalMessages.t_template}" action="template" immediate="true" rendered="#{authorization.adminTemplate}">
-      <h:outputText value="#{generalMessages.template}" />
-      <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-    </h:commandLink>
     <h:outputText value=" #{generalMessages.separator} "  rendered="#{authorization.adminQuestionPool}"/>
     <h:commandLink id="questionPoolsLink" title="#{generalMessages.t_questionPool}" action="poolList" immediate="true"  rendered="#{authorization.adminQuestionPool}">
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/poolList.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/poolList.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/poolList.jsp (revision 687)
@@ -61,10 +61,4 @@
    </h:commandLink>
 
-<h:outputText value=" #{generalMessages.separator} " />
-
-   <h:commandLink title="#{generalMessages.t_template}" rendered="#{questionpool.importToAuthoring == 'false'}" action="template" immediate="true">
-        <h:outputText value="#{generalMessages.template}"/>
-      <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-   </h:commandLink>
 
    <h:commandLink title="#{generalMessages.t_questionPool}" rendered="#{questionpool.importToAuthoring == 'true'}" action="template" immediate="true">
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/questionpoolHeadings.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/questionpoolHeadings.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/questionpoolHeadings.jsp (revision 687)
@@ -30,11 +30,4 @@
 
 
-<h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminAssessment}"/>
-
-
-    <h:commandLink accesskey="#{generalMessages.a_template}" title="#{generalMessages.t_template}" action="template" immediate="true" rendered="#{authorization.adminQuestionPool}">
-      <h:outputText value="#{generalMessages.template}" />
-      <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-    </h:commandLink>
     <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminQuestionPool}"/>
     <h:commandLink accesskey="#{generalMessages.a_pool}" title=" #{generalMessages.t_questionPool} " action="poolList" immediate="true">
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/sharePool.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/sharePool.jsp (revision 389)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/questionpool/sharePool.jsp (revision 687)
@@ -88,11 +88,4 @@
    	</h:commandLink>
 
-	<h:outputText value=" #{generalMessages.separator} " />
-
-   	<h:commandLink title="#{generalMessages.t_template}" action="template" immediate="true">
-        <h:outputText value="#{generalMessages.template}"/>
-      	<f:actionListener 
-      		type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-   	</h:commandLink>
 
 	<h:outputText value=" #{generalMessages.separator} " />
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateEditor.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateEditor.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateEditor.jsp (revision 687)
@@ -47,10 +47,4 @@
          type="org.sakaiproject.tool.assessment.ui.listener.author.AuthorActionListener" />
    </h:commandLink>
-    <h:outputText value=" #{generalMessages.separator} " />
-    <h:commandLink title="#{generalMessages.t_template}" action="template" id="templateLink" immediate="true">
-      <h:outputText value="#{generalMessages.template}" />
-       <f:actionListener
-         type="org.sakaiproject.tool.assessment.ui.listener.author.TemplateListener" />
-    </h:commandLink>
     <h:outputText value=" #{generalMessages.separator} " />
     <h:commandLink title="#{generalMessages.t_questionPool}" action="poolList" id="poolLink" immediate="true">
Index: branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateHeadings.jsp
===================================================================
--- branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateHeadings.jsp (revision 387)
+++ branches/Cambro_Sakai_2-6-0/sam/samigo-app/src/webapp/jsf/template/templateHeadings.jsp (revision 687)
@@ -27,6 +27,4 @@
          type="org.sakaiproject.tool.assessment.ui.listener.author.AuthorActionListener" />
    </h:commandLink>
-    <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminAssessment}"/>
-      <h:outputText value="#{generalMessages.template}" />
     <h:outputText value=" #{generalMessages.separator} " rendered="#{authorization.adminQuestionPool}"/>
     <h:commandLink id="questionPoolsLink" accesskey="#{generalMessages.a_pool}" title="#{generalMessages.t_questionPool}" action="poolList" immediate="true" rendered="#{authorization.adminQuestionPool}">