From 1b260b2e67ef28eaaa2617e331488d5d8938f327 Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 27 Jul 2011 12:46:35 +0000
Subject: [PATCH] NIHVIVO-3066 Merged r8868 from maint-rel-vivo-1.3 branch.

---
 webapp/web/js/menupage/menumanagement_edit.js | 24 +++++++++++--------
 .../freemarker/edit/forms/menuManagement.ftl  |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/webapp/web/js/menupage/menumanagement_edit.js b/webapp/web/js/menupage/menumanagement_edit.js
index fc7ca7d53..c9c7bc255 100644
--- a/webapp/web/js/menupage/menumanagement_edit.js
+++ b/webapp/web/js/menupage/menumanagement_edit.js
@@ -91,28 +91,32 @@ var menuManagementEdit = {
     validateMenuItemForm: function() {
         var validationError = "";
         
-        //Check menu name
-        if ($("input[type=text][name=menuName]").val() == ""){
+        // Check menu name
+        if ($('input[type=text][name=menuName]').val() == "") {
             validationError += "You must supply a name<br />";
             }
-        //Check pretty url     
-        if ($("input[type=text][name=prettyUrl]").val() == ""){
+        // Check pretty url     
+        if ($('input[type=text][name=prettyUrl]').val() == "") {
             validationError += "You must supply a pretty URL<br />";
         }
-          
-        if ($("input:radio[name=selectedTemplate]:checked").val() == "custom") {
-            if ($("input[name=customTemplate]").val() == "") {
+        if ($('input[type=text][name=prettyUrl]').val().charAt(0) != "/") {
+            validationError += "The pretty URL must begin with a leading forward slash<br />";
+        }
+        
+        // Check custom template
+        if ($('input:radio[name=selectedTemplate]:checked').val() == "custom") {
+            if ($('input[name=customTemplate]').val() == "") {
                 validationError += "You must supply a template<br />"; 
             }
         }
         
-        //if no class group selected, this is an error
-        if ($("#selectClassGroup").val() =='-1'){
+        // if no class group selected, this is an error
+        if ($('#selectClassGroup').val() =='-1') {
             validationError += "You must supply a content type<br />"; 
         } else {
             //class group has been selected, make sure there is at least one class selected
             var allSelected = $('input[name="allSelected"]:checked').length;
-            var noClassesSelected = $("input[name='classInClassGroup']:checked").length;
+            var noClassesSelected = $('input[name="classInClassGroup"]:checked').length;
             if (allSelected == 0 && noClassesSelected == 0) {
                 //at least one class should be selected
                 validationError += "You must select the type of content to display<br />";
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index f1e020156..ef7c8c363 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -28,7 +28,7 @@
 
         <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
         <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
-        <p class="note">(Format: /<prettyURL> - e.g., /people)</p>
+        <p class="note">Must begin with a leading forward slash: / (e.g., /people)</p>
         
         <p>Template<span class="requiredHint"> *</span></p>