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

3
webapp/web/css/menupage/pageManagement.css
View file

@ -66,6 +66,7 @@ section#floatRight {
} }
select#typeSelect { select#typeSelect {
margin-top:0px; margin-top:0px;
margin-bottom:20px;
} }
section#headerBar { section#headerBar {
background-color:#f5f5f5; background-color:#f5f5f5;
@ -130,7 +131,7 @@ input#contentCheckbox {
} }
span.deleteLinkContainer { span.deleteLinkContainer {
float:left; float:left;
margin-left:100px; margin-left:170px;
margin-top:-36px; margin-top:-36px;
} }
form#managePage textarea { form#managePage textarea {

14
webapp/web/js/menupage/pageManagementUtils.js
View file

@ -282,6 +282,11 @@ var pageManagementUtils = {
var pageName = pageManagementUtils.pageNameInput.val(); var pageName = pageManagementUtils.pageNameInput.val();
pageManagementUtils.menuLinkText.val(pageName); pageManagementUtils.menuLinkText.val(pageName);
} }
if(!isMenu && linkText.length > 0) {
// if the isMenuCheckbox is unchecked, we need to clear the
// menuLinkText field; otherwise, the page remains a menu
pageManagementUtils.menuLinkText.val("");
}
}, },
//Select content type //Select content type
@ -414,7 +419,7 @@ var pageManagementUtils = {
"class": "pageContentContainer", "class": "pageContentContainer",
html: "<span class='pageContentTypeLabel'>" + contentTypeLabel + " - " + varOrClass html: "<span class='pageContentTypeLabel'>" + contentTypeLabel + " - " + varOrClass
+ "</span><span id='clickable" + counter + "</span><span id='clickable" + counter
+ "' class='pageContentExpand'><div class='arrow expandArrow'></div></span><div id='innerContainer" + counter + "' class='pageContentExpand'><div id='woof' class='arrow expandArrow'></div></span><div id='innerContainer" + counter
+ "' class='pageContentWrapper'><span class='deleteLinkContainer'>&nbsp;or&nbsp;<a id='remove" + counter // changed button to a link + "' class='pageContentWrapper'><span class='deleteLinkContainer'>&nbsp;or&nbsp;<a id='remove" + counter // changed button to a link
+ "' href='' >delete</a></span></div>" + "' href='' >delete</a></span></div>"
}); });
@ -432,17 +437,18 @@ var pageManagementUtils = {
//Done button should just collapse the cloned content //Done button should just collapse the cloned content
$newContentObj.find("input[name='doneWithContent']").click(function() { $newContentObj.find("input[name='doneWithContent']").click(function() {
var thisInnerDiv = $(this).closest("div.pageContentWrapper"); var thisInnerDiv = $(this).closest("div.pageContentWrapper");
thisInnerDiv.slideUp(222); var thisClickableSpan = thisInnerDiv.prev("span.pageContentExpand");
var thisClickableSpan = $(this).closest("span.pageContentExpand");
var thisArrowDiv = thisClickableSpan.find('div.arrow'); var thisArrowDiv = thisClickableSpan.find('div.arrow');
thisInnerDiv.slideUp(222);
thisArrowDiv.removeClass("collapseArrow"); thisArrowDiv.removeClass("collapseArrow");
thisArrowDiv.addClass("expandArrow"); thisArrowDiv.addClass("expandArrow");
window.setTimeout('pageManagementUtils.adjustSaveButtonHeight()', 223);
}); });
}, },
bindClonedContentContainerEvents:function($newDivContainer, counter) { bindClonedContentContainerEvents:function($newDivContainer, counter) {
var $clickableSpan = $newDivContainer.children('span#clickable' + counter); var $clickableSpan = $newDivContainer.children('span#clickable' + counter);
var $innerDiv = $newDivContainer.children('div#innerContainer' + counter); var $innerDiv = $newDivContainer.children('div#innerContainer' + counter);
//Expand/collapse toggle //Expand/collapse toggle
$clickableSpan.click(function() { $clickableSpan.click(function() {
if ( $innerDiv.is(':visible') ) { if ( $innerDiv.is(':visible') ) {

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

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

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

@ -12,7 +12,8 @@
<#assign menuLinkText = "" /> <#assign menuLinkText = "" />
<#assign menuPosition = pageData.highestMenuPosition /> <#assign menuPosition = pageData.highestMenuPosition />
<#assign addMenuItem = "" /> <#assign addMenuItem = "" />
<#assign pageHeading = "Add Page" /> <#assign pageHeading = "Add New Page" />
<#assign saveBtnText = "Save new page" />
<#if pageData.addMenuItem?has_content> <#if pageData.addMenuItem?has_content>
<#assign addMenuItem = pageData.addMenuItem /> <#assign addMenuItem = pageData.addMenuItem />
</#if> </#if>
@ -26,7 +27,8 @@
<#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 selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/> <#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 customTemplate?has_content>
<#if selfContainedTemplate?has_content> <#if selfContainedTemplate?has_content>
<#assign selectedTemplateType = "selfContained" /> <#assign selectedTemplateType = "selfContained" />
@ -128,7 +130,7 @@
</section> </section>
</div> </div>
<section > <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> <a class="cancel" href="${cancelUrl!}" id="cancelPage" >Cancel</a>
<br /> <br />
<p class="requiredHint">* required fields</p> <p class="requiredHint">* required fields</p>