From 7ea00cd5a8036506c1a5d3710c67530f6cfec97c Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 25 Jun 2012 19:59:18 +0000
Subject: [PATCH] pagemanagement - added cancel button to main content type
 sections

---
 webapp/web/css/menupage/pageManagement.css       |  6 +++++-
 webapp/web/js/menupage/pageManagementUtils.js    | 16 +++++++++++++---
 .../pageManagement--browseClassGroupsScripts.ftl |  4 ++--
 .../edit/forms/pageManagement--fixedHtml.ftl     |  1 +
 .../edit/forms/pageManagement--sparqlQuery.ftl   |  1 +
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/webapp/web/css/menupage/pageManagement.css b/webapp/web/css/menupage/pageManagement.css
index 0f40b4af6..c0798f957 100644
--- a/webapp/web/css/menupage/pageManagement.css
+++ b/webapp/web/css/menupage/pageManagement.css
@@ -133,4 +133,8 @@ form#managePage textarea {
     margin-bottom: .8em;
     width: 65%;
 }
-
+.disabledSubmit {
+    color: #ede ! important;
+    background-color: #b2d15a ! important;
+    cursor: default ! important;
+}
diff --git a/webapp/web/js/menupage/pageManagementUtils.js b/webapp/web/js/menupage/pageManagementUtils.js
index 3d17001a7..63af344b3 100644
--- a/webapp/web/js/menupage/pageManagementUtils.js
+++ b/webapp/web/js/menupage/pageManagementUtils.js
@@ -118,6 +118,7 @@ var pageManagementUtils = {
         this.pageContentSubmissionInputs = $("#pageContentSubmissionInputs");
         this.headerBar = $("section#headerBar");
         this.doneButton =  $("input#doneWithContent");
+        this.cancelLink =  $("a#cancelContentLink");
         this.isMenuCheckbox = $("input#menuCheckbox");
         this.menuLinkText = $("input#menuLinkText");
         this.menuSection = $("section#menu");
@@ -181,6 +182,15 @@ var pageManagementUtils = {
 	       pageManagementUtils.handleClickDone();
 	    });
 	
+	    this.cancelLink.click( function() {
+	        pageManagementUtils.clearSourceTemplateValues();
+	        pageManagementUtils.headerBar.hide();
+            pageManagementUtils.classGroupSection.hide();
+            pageManagementUtils.fixedHTMLSection.hide();
+            pageManagementUtils.sparqlQuerySection.hide();
+            pageManagementUtils.contentTypeSelectOptions.eq(0).attr('selected', 'selected');
+            pageManagementUtils.contentTypeSelect.focus();
+	    });
 	    //replacing with menu management edit version which is extended with some of the logic below
 	    this.selectClassGroupDropdown.change(function() {
             pageManagementUtils.chooseClassGroup();
@@ -266,7 +276,6 @@ var pageManagementUtils = {
             pageManagementUtils.classGroupSection.show();
             pageManagementUtils.fixedHTMLSection.hide();
             pageManagementUtils.sparqlQuerySection.hide();
-// tlw72            pageManagementUtils.moreContentButton.hide();
             pageManagementUtils.headerBar.text("Browse Class Group - ");
             pageManagementUtils.headerBar.show();
         }
@@ -286,13 +295,11 @@ var pageManagementUtils = {
            
             pageManagementUtils.headerBar.show();
             pageManagementUtils.classesForClassGroup.addClass('hidden');
-// tlw72            pageManagementUtils.moreContentButton.show();
         }
         if ( _this.contentTypeSelect.val() == "" ) {
         	pageManagementUtils.classGroupSection.hide();
         	pageManagementUtils.fixedHTMLSection.hide();
         	pageManagementUtils.sparqlQuerySection.hide();
-// tlw72            pageManagementUtils.moreContentButton.hide();            
             pageManagementUtils.classesForClassGroup.addClass('hidden');
             pageManagementUtils.headerBar.hide();
             pageManagementUtils.headerBar.text("");
@@ -351,6 +358,9 @@ var pageManagementUtils = {
         
         //Clone the object, renaming ids and copying text area values as well
         $newContentObj = pageManagementUtils.createCloneObject(contentType, counter);
+
+        // Get rid of the cancel link; it'll be replaced by a delete link
+        $newContentObj.find('span#cancelContent' + counter).html('');
         
         if ( contentType == "sparqlQuery" || contentType == "fixedHtml") {
         	varOrClass = $newContentObj.find('input[name="saveToVar"]').val();
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
index 558ac87d7..51b361c19 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#-- Scripts for class group browsing -->
+<#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes-->
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processClassGroupDataGetterContent.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processIndividualsForClassesDataGetterContent.js"></script>')}
-<#--Setting up script with class group URIs and labels for editing purposes-->
\ No newline at end of file
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processInternalClassDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
index 0afd396db..307a8e797 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
@@ -7,5 +7,6 @@
     <label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
     <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
     <input  type="button" id="doneWithContent" name="doneWithContent" value="Done" class="doneWithContent" />
+    <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
index 3fb639911..311c9a083 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
@@ -9,5 +9,6 @@
     <label id="queryLabel" for="queryLabel"><span id="querySpan">Enter SPARQL query here</span><span class="requiredHint"> *</span></label>
     <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
     <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
+    <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}