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

merging r10033 to the trunk

Browse source
This commit is contained in:
tworrall 2012-09-06 14:52:54 +00:00
parent 0a4262d876
commit 5d950625c2
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@
</li>
</#list>
</ul><br />
<input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
<input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
<#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>

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

@ -6,7 +6,7 @@
<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>
<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="Save this content" class="doneWithContent" />
<#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>

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

@ -8,7 +8,7 @@
<input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
<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 />
<input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
<input type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
<#if menuAction == "Add">
<span id="cancelContent"> or <a class="cancel" href="javascript:" id="cancelContentLink" >Cancel</a></span>
</#if>

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

@ -12,7 +12,8 @@
<#assign menuLinkText = "" />
<#assign menuPosition = pageData.highestMenuPosition />
<#assign addMenuItem = "" />
<#assign pageHeading = "Add Page" />
<#assign pageHeading = "Add New Page" />
<#assign saveBtnText = "Save new page" />
<#if pageData.addMenuItem?has_content>
<#assign addMenuItem = pageData.addMenuItem />
</#if>
@ -26,7 +27,8 @@
<#assign menuLinkText = lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/>
<#assign pageHeading = "Edit Page" />
<#assign pageHeading = "Edit ${pageName} Page" />
<#assign saveBtnText = "Save changes" />
<#if customTemplate?has_content>
<#if selfContainedTemplate?has_content>
<#assign selectedTemplateType = "selfContained" />
@ -128,7 +130,7 @@
</section>
</div>
<section >
<span id="saveButton" ><input id="pageSave" type="submit" name="submit-Add" value="Save changes" class="submit" role="input" /> or </span>
<span id="saveButton" ><input id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span>
<a class="cancel" href="${cancelUrl!}" id="cancelPage" >Cancel</a>
<br />
<p class="requiredHint">* required fields</p>