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

NIHVIVO-2232: Moved internal class display section above the select list choosing classes in a class group.

Browse source
This commit is contained in:
manolobevia 2011-07-14 22:15:17 +00:00
parent f98cead6d4
commit 18416c5773
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/css/menupage/testmenupage.css
View file

@ -37,7 +37,6 @@ ul#selectedClasses {
margin-top: 20px;
}
#internal-class {
margin-top: 20px;
margin-bottom: 10px;
padding: 0.8em 1em;
background: #f4f4f4;
@ -53,4 +52,7 @@ ul#selectedClasses {
}
ul#selectedClasses li {
margin-left: .4em;
}
#selectClassesMessage {
padding-top: 15px;
}

31
webapp/web/templates/freemarker/edit/forms/testMenuManagement.ftl
View file

@ -61,6 +61,23 @@
<p id="selectClassesMessage" name="selectClassesMessage" ${existingClassGroupStyle}>Select content to display</p>
<section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
<ul id="selectedClasses" name="selectedClasses" role="menu">
<section id="internal-class" role="region">
<#if internalClass?has_content>
<#assign enableInternalClass = '' />
<#assign disableClass = 'class="inline"' />
<#else>
<#assign enableInternalClass = '<p class="note">To enable this option, you must first select an <a href="${urls.base}/processInstitutionalInternalClass">institutional internal class</a> for your instance</p>' />
<#assign disableClass = 'class="disable inline" disabled="disabled"' />
</#if>
<input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if pageInternalOnly?has_content>checked</#if> role="input" />
<label ${disableClass} class="inline" for="display-internalClass">Only display <em>${associatedPage}</em> within my institution</label>
${enableInternalClass}
</section>
<#--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> />
@ -83,20 +100,6 @@
</ul>
</section>
<section id="internal-class" role="region">
<#if internalClass?has_content>
<#assign enableInternalClass = '' />
<#assign disableClass = 'class="inline"' />
<#else>
<#assign enableInternalClass = '<p class="note">To enable this option, you must first select an <a href="${urls.base}/processInstitutionalInternalClass">institutional internal class</a> for your instance</p>' />
<#assign disableClass = 'class="disable inline" disabled="disabled"' />
</#if>
<input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if pageInternalOnly?has_content>checked</#if> role="input" />
<label ${disableClass} class="inline" for="display-internalClass">Only display <em>${associatedPage}</em> within my institution</label>
${enableInternalClass}
</section>
<input type="submit" name="submit-${menuAction}" value="Save changes" class="submit" role="input" /> or <a class="cancel" href="${cancelUrl}">Cancel</a>
<p class="requiredHint">* required fields</p>