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

merging 9985 to the trunk

Browse source
This commit is contained in:
tworrall 2012-07-19 15:49:18 +00:00
parent 1b98d5025d
commit 473680c3d2
5 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
webapp/web/images/checkMark.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

3
webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
View file

@ -52,6 +52,9 @@
</#list> </#list>
</ul><br /> </ul><br />
<input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" /> <input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
<#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>
</section> </section>
</section> </section>
<#--Include JavaScript specific to the types of data getters related to this content--> <#--Include JavaScript specific to the types of data getters related to this content-->

4
webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
View file

@ -7,6 +7,8 @@
<label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label> <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 /> <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" /> <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> <#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>
</section> </section>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}

4
webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
View file

@ -9,6 +9,8 @@
<label id="queryLabel" for="queryLabel"><span id="querySpan">Enter SPARQL query here</span><span class="requiredHint"> *</span></label> <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 /> <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" /> <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> <#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>
</section> </section>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}

6
webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
View file

@ -12,6 +12,7 @@
<#assign menuLinkText = "" /> <#assign menuLinkText = "" />
<#assign menuPosition = pageData.highestMenuPosition /> <#assign menuPosition = pageData.highestMenuPosition />
<#assign addMenuItem = "" /> <#assign addMenuItem = "" />
<#assign pageHeading = "Add Page" />
<#if pageData.addMenuItem?has_content> <#if pageData.addMenuItem?has_content>
<#assign addMenuItem = pageData.addMenuItem /> <#assign addMenuItem = pageData.addMenuItem />
</#if> </#if>
@ -24,6 +25,7 @@
<#assign menuItem = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuItem")/> <#assign menuItem = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuItem")/>
<#assign menuLinkText = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/> <#assign menuLinkText = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/> <#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
<#assign pageHeading = "Edit Page" />
<#if customTemplate?has_content> <#if customTemplate?has_content>
<#assign selectedTemplateType = "custom" /> <#assign selectedTemplateType = "custom" />
</#if> </#if>
@ -57,7 +59,7 @@
<input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" /> <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" />
<input type="hidden" id="editKey" name="editKey" value="${editKey}" /> <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
<input type="hidden" id="menuItem" name="menuItem" value="${menuItem}"/> <input type="hidden" id="menuItem" name="menuItem" value="${menuItem}"/>
<h2>Add Page</h2> <h2>${pageHeading}</h2>
<!--Drop down for the types of content possible--> <!--Drop down for the types of content possible-->
<section id="floatRight"> <section id="floatRight">
<div id="rightSide"> <div id="rightSide">
@ -95,7 +97,7 @@
<input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> role="input" /> <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</label>
<section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region"> <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
<input type="text" name="customTemplate" value="${customTemplate!''}" size="40" role="input" /><span class="requiredHint"> *</span> <input type="text" name="customTemplate" value="${customTemplate!''}" size="33" role="input" /><span class="requiredHint"> *</span>
</section> </section>
<p id="checkboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox" <p id="checkboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
<#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if> <#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if>