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

VIVO-541 Tweaks to the .ftl and .js

Browse source
This commit is contained in:
j2blake 2013-11-18 18:13:09 -05:00
parent 818962d0a6
commit 09dacc8e5a
4 changed files with 102 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
webapp/web/js/developer/developerPanel.js
View file

@ -34,34 +34,33 @@
document.getElementById("developerPanelSaveButton").onclick = function() {
updateDeveloperPanel(collectFormData());
}
document.getElementById("developer.enabled").onchange = updateDisabledFields
document.getElementById("developer.loggingRDFService.enable").onchange = updateDisabledFields
document.getElementById("developerEnabled").onchange = updateDisabledFields
document.getElementById("developerLoggingRDFServiceEnable").onchange = updateDisabledFields
}
function updateDisabledFields() {
var developerEnabled = document.getElementById("developer.enabled").checked;
document.getElementById("developer.defeatFreemarkerCache").disabled = !developerEnabled;
document.getElementById("developer.insertFreemarkerDelimiters").disabled = !developerEnabled;
document.getElementById("developer.i18n.defeatCache").disabled = !developerEnabled;
document.getElementById("developer.i18n.logStringRequests").disabled = !developerEnabled;
document.getElementById("developer.loggingRDFService.enable").disabled = !developerEnabled;
var developerEnabled = document.getElementById("developerEnabled").checked;
document.getElementById("developerDefeatFreemarkerCache").disabled = !developerEnabled;
document.getElementById("developerInsertFreemarkerDelimiters").disabled = !developerEnabled;
document.getElementById("developerI18nDefeatCache").disabled = !developerEnabled;
document.getElementById("developerI18nLogStringRequests").disabled = !developerEnabled;
document.getElementById("developerLoggingRDFServiceEnable").disabled = !developerEnabled;
var rdfServiceEnabled = developerEnabled && document.getElementById("developer.loggingRDFService.enable").checked;
document.getElementById("developer.loggingRDFService.stackTrace").disabled = !rdfServiceEnabled;
document.getElementById("developer.loggingRDFService.restriction").disabled = !rdfServiceEnabled;
var rdfServiceEnabled = developerEnabled && document.getElementById("developerLoggingRDFServiceEnable").checked;
document.getElementById("developerLoggingRDFServiceStackTrace").disabled = !rdfServiceEnabled;
document.getElementById("developerLoggingRDFServiceRestriction").disabled = !rdfServiceEnabled;
}
function collectFormData() {
var data = new Object();
data["developer.panelOpen"] = false;
getCheckbox("developer.enabled", data);
getCheckbox("developer.defeatFreemarkerCache", data);
getCheckbox("developer.insertFreemarkerDelimiters", data);
getCheckbox("developer.i18n.defeatCache", data);
getCheckbox("developer.i18n.logStringRequests", data);
getCheckbox("developer.loggingRDFService.enable", data);
getCheckbox("developer.loggingRDFService.stackTrace", data);
getText("developer.loggingRDFService.restriction", data);
getCheckbox("developerEnabled", data);
getCheckbox("developerDefeatFreemarkerCache", data);
getCheckbox("developerInsertFreemarkerDelimiters", data);
getCheckbox("developerI18nDefeatCache", data);
getCheckbox("developerI18nLogStringRequests", data);
getCheckbox("developerLoggingRDFServiceEnable", data);
getCheckbox("developerLoggingRDFServiceStackTrace", data);
getText("developerLoggingRDFServiceRestriction", data);
return data;
}

20
webapp/web/templates/freemarker/page/partials/developerPanel.ftl
View file

@ -27,8 +27,8 @@ div.developer .container {
}
</style>
<#if !settings["developer.enabled"]>
<#elseif !settings["mayControl"]>
<#if !settings.developerEnabled>
<#elseif !settings.mayControl>
<div class="developer">
<h1>${siteName} is running in developer mode.</h1>
</div>
@ -40,18 +40,18 @@ div.developer .container {
<div id="developerPanelBody">
<form>
<label>
<@showCheckbox "developer.enabled" />
<@showCheckbox "developerEnabled" />
Enable developer mode
</label>
<div class="container">
Freemarker templates
<label>
<@showCheckbox "developer.defeatFreemarkerCache" />
<@showCheckbox "developerDefeatFreemarkerCache" />
Defeat the template cache
</label>
<label>
<@showCheckbox "developer.insertFreemarkerDelimiters" />
<@showCheckbox "developerInsertFreemarkerDelimiters" />
Insert HTML comments at start and end of templates
</label>
</div>
@ -59,27 +59,27 @@ div.developer .container {
<div class="container">
SPARQL Queries
<label>
<@showCheckbox "developer.loggingRDFService.enable" />
<@showCheckbox "developerLoggingRDFServiceEnable" />
Log each query
</label>
<label>
<@showCheckbox "developer.loggingRDFService.stackTrace" />
<@showCheckbox "developerLoggingRDFServiceStackTrace" />
Add stack trace
</label>
<label>
Restrict by calling stack
<@showTextbox "developer.loggingRDFService.restriction" />
<@showTextbox "developerLoggingRDFServiceRestriction" />
</label>
</div>
<div class="container">
Language support
<label>
<@showCheckbox "developer.i18n.defeatCache" />
<@showCheckbox "developerI18nDefeatCache" />
Defeat the cache of language property files
</label>
<label>
<@showCheckbox "developer.i18n.logStringRequests" />
<@showCheckbox "developerI18nLogStringRequests" />
Log the retrieval of language strings
</label>
</div>