litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3062 Merged r8856 from maint-rel-vivo-1.3 branch.

Browse source
This commit is contained in:
cappadona 2011-07-26 21:08:34 +00:00
parent fc029333b9
commit b97cbb60e3
2 changed files with 39 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
webapp/web/js/menupage/menumanagement_edit.js
View file

@ -5,7 +5,6 @@ var menuManagementEdit = {
this.initObjects();
this.bindEventListeners();
this.toggleClassSelection();
//this.validateMenuItemForm();
},
initObjects: function() {
this.defaultTemplateRadio = $('input.default-template');
@ -17,7 +16,6 @@ var menuManagementEdit = {
this.selectClassGroupDropdown = $('#selectClassGroup');
this.classesForClassGroup = $('#classesInSelectedGroup');
this.selectedGroupForPage = $('#selectedContentTypeValue');
// this.selectClassesMessage = $('#selectClassesMessage');
this.allClassesSelectedCheckbox = $('#allSelected');
this.displayInternalMessage = $('#internal-class label em');
},
@ -31,9 +29,6 @@ var menuManagementEdit = {
this.selectClassGroupDropdown.change(function() {
menuManagementEdit.chooseClassGroup();
});
// this.allClassesSelectedCheckbox.change(function() {
// menuManagementEdit.toggleClassSelection();
// });
// Listeners for template field
this.defaultTemplateRadio.click(function(){
@ -77,18 +72,8 @@ var menuManagementEdit = {
},
toggleClassSelection: function() {
/*To do: please fix so selecting all selects all classes and deselecting
* any class will deselect all
*/
/*
if(this.allClassesSelectedCheckbox.is(':checked')) {
$('#classInClassGroup').attr('checked', 'checked');
} else {
$('#classInClassGroup').removeAttr('checked');
}*/
// Check/unckeck all classes for selection
$('input:checkbox[name=allSelected]').click(function(){
// alert($('input:checkbox[name=classInClassGroup]'));
if ( this.checked ) {
// if checked, select all the checkboxes
$('input:checkbox[name=classInClassGroup]').attr('checked','checked');
@ -116,7 +101,7 @@ var menuManagementEdit = {
}
if ($("input:radio[name=selectedTemplate]:checked").val() == "custom") {
if($("input[name=customTemplate]").val() == "") {
if ($("input[name=customTemplate]").val() == "") {
validationError += "You must supply a template<br />";
}
}
@ -126,10 +111,11 @@ var menuManagementEdit = {
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;
if(noClassesSelected == 0) {
if (allSelected == 0 && noClassesSelected == 0) {
//at least one class should be selected
validationError += "You must supply some content to display<br />";
validationError += "You must select the type of content to display<br />";
}
}

9
webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
View file

@ -5,7 +5,8 @@
<#-- some additional processing here which shows or hides the class group selection and classes based on initial action-->
<#assign existingClassGroupStyle = " " />
<#assign selectClassGroupStyle = 'class="hidden"' />
<#if menuAction = "Add">
<#-- Reveal the class group and hide the class selects if adding a new menu item or editing an existing menu item with an empty class group (no classes)-->
<#if menuAction == "Add" || !classGroup?has_content>
<#assign existingClassGroupStyle = 'class="hidden"' />
<#assign selectClassGroupStyle = " " />
</#if>
@ -38,7 +39,7 @@
<label class="inline" for="custom"> Custom template</label>
<section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
<input type="text" name="customTemplate" value="${customTemplate!}" size="30" role="input" /><span class="requiredHint"> *</span>
<input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>
</section>
<section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
@ -61,8 +62,6 @@
</select>
</section>
<section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
<#-- Select classes in a class group -->
<p id="selectClassesMessage" name="selectClassesMessage">Select content to display<span class="requiredHint"> *</span></p>
@ -71,7 +70,7 @@
<ul id="selectedClasses" name="selectedClasses" role="menu">
<#--Adding a default class for "ALL" in case all classes selected-->
<li class="ui-state-default" role="menuitem">
<input type="checkbox" name="allSelected" id="allSelected" value="all" <#if isClassGroupPage = true || includeAllClasses = true>checked</#if> />
<input type="checkbox" name="allSelected" id="allSelected" value="all" <#if !isIndividualsForClassesPage?has_content>checked</#if> />
<label class="inline" for="All"> All</label>
</li>
<#list classGroup as classInClassGroup>