merging 9989 to the trunk
This commit is contained in:
parent
083678f5b2
commit
6a63de6144
6 changed files with 79 additions and 26 deletions
|
@ -17,7 +17,7 @@
|
|||
|
||||
|
||||
<#--HTML Portion-->
|
||||
<section id="browseClassGroup" style="background-color:#f9f9f9;padding-left:6px;padding-top:2px;border-width:1px;border-style:solid;border-color:#ccc;">
|
||||
<section id="browseClassGroup" class="contentSectionContainer">
|
||||
|
||||
<section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
<#--This contains the template for the fixed HTML content type that is to be cloned and used in page management-->
|
||||
|
||||
<section id="fixedHtml" class="sparqlHtmlContent">
|
||||
<section id="fixedHtml" class="contentSectionContainer">
|
||||
<label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">Variable Name<span class="requiredHint"> *</span></label>
|
||||
<input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
|
||||
<label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
<#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
|
||||
<section id="sparqlQuery" class="sparqlHtmlContent">
|
||||
<section id="sparqlQuery" class="contentSectionContainer">
|
||||
<label id="variableLabel" for="variable">Variable Name<span class="requiredHint"> *</span></label>
|
||||
<input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
|
||||
<#--Hiding query model for now-->
|
||||
|
|
|
@ -25,9 +25,14 @@
|
|||
<#assign menuItem = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuItem")/>
|
||||
<#assign menuLinkText = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
|
||||
<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
|
||||
<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "selfContainedTemplate")/>
|
||||
<#assign pageHeading = "Edit Page" />
|
||||
<#if customTemplate?has_content>
|
||||
<#assign selectedTemplateType = "custom" />
|
||||
<#if selfContainedTemplate?has_content>
|
||||
<#assign selectedTemplateType = "selfContained" />
|
||||
<#else>
|
||||
<#assign selectedTemplateType = "custom" />
|
||||
</#if>
|
||||
</#if>
|
||||
<#assign editMenuPosition = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuPosition")/>
|
||||
<#--if menu position exists for a menu item, then use that, otherwise use the highest available menu position number from page data-->
|
||||
|
@ -64,13 +69,13 @@
|
|||
<section id="floatRight">
|
||||
<div id="rightSide">
|
||||
<section id="addPageOne" role="region" >
|
||||
<label for="last-name">Content Type<span class="requiredHint"> *</span></label>
|
||||
<select id="typeSelect" name="typeSelect" >
|
||||
<option value="" selected="selected">Select one</option>
|
||||
<option value="browseClassGroup">Browse Class Group</option>
|
||||
<option value="fixedHtml">Fixed HTML</option>
|
||||
<option value="sparqlQuery">SPARQL Query Results</option>
|
||||
</select> <span class="note">Add one or more content types</span>
|
||||
<label for="contentType">Content Type<span class="requiredHint"> *</span></label>
|
||||
<select id="typeSelect" name="typeSelect" >
|
||||
<option value="" selected="selected">Select a type</option>
|
||||
<option value="browseClassGroup">Browse Class Group</option>
|
||||
<option value="fixedHtml">Fixed HTML</option>
|
||||
<option value="sparqlQuery">SPARQL Query Results</option>
|
||||
</select> <span class="note">Add one or more types</span>
|
||||
</section>
|
||||
<section id="contentDivs"></section>
|
||||
<section id="headerBar" >
|
||||
|
@ -95,11 +100,15 @@
|
|||
<label class="inline" for="default"> Default</label>
|
||||
<br />
|
||||
<input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> role="input" />
|
||||
<label class="inline" for="custom"> Custom template</label>
|
||||
<label class="inline" for="custom"> Custom template requiring content</label>
|
||||
<br /><div id="selfContainedDiv">
|
||||
<input type="radio" name="selectedTemplate" class="selfContained-template" value="selfContained" <#if selectedTemplateType = "selfContained">checked="checked"</#if> role="input" />
|
||||
<label class="inline" for="selfContained"> Custom template containing all content</label></div>
|
||||
<section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
|
||||
<input type="text" name="customTemplate" value="${customTemplate!''}" size="33" role="input" /><span class="requiredHint"> *</span>
|
||||
<input type="hidden" name="selfContainedTemplate" value="${selfContainedTemplate!''}"/>
|
||||
</section>
|
||||
<p id="checkboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
|
||||
<p id="menuCheckboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
|
||||
<#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if>
|
||||
> This is a menu page</p>
|
||||
<section id="menu" role="region"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue