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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-18 11:48:42 -05:00
commit e6e71fe06a
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/web/css/vitro.css
View file

@ -120,11 +120,13 @@
text-align: left; text-align: left;
} }
.searchTOC ul li { .searchTOC ul li {
display: block;
border-bottom: 1px solid #dde4e3; border-bottom: 1px solid #dde4e3;
display: block;
font-size: 14px; font-size: 14px;
margin-left: 20px;
padding-top: .5em; padding-top: .5em;
padding-bottom: .5em; padding-bottom: .5em;
width: 150px;
} }
.searchTOC ul li:hover { .searchTOC ul li:hover {
background-color:#f7f9f9; background-color:#f7f9f9;
@ -134,7 +136,6 @@
} }
.searchTOC ul a { .searchTOC ul a {
display: inline; display: inline;
padding-left: 25px;
} }
.searchTOC ul span { .searchTOC ul span {

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

@ -40,6 +40,7 @@ function DeveloperPanel(developerAjaxUrl) {
function updateDisabledFields() { function updateDisabledFields() {
var developerEnabled = document.getElementById("developerEnabled").checked; var developerEnabled = document.getElementById("developerEnabled").checked;
document.getElementById("developerPermitAnonymousControl").disabled = !developerEnabled;
document.getElementById("developerDefeatFreemarkerCache").disabled = !developerEnabled; document.getElementById("developerDefeatFreemarkerCache").disabled = !developerEnabled;
document.getElementById("developerInsertFreemarkerDelimiters").disabled = !developerEnabled; document.getElementById("developerInsertFreemarkerDelimiters").disabled = !developerEnabled;
document.getElementById("developerPageContentsLogCustomListView").disabled = !developerEnabled; document.getElementById("developerPageContentsLogCustomListView").disabled = !developerEnabled;
@ -57,6 +58,7 @@ function DeveloperPanel(developerAjaxUrl) {
function collectFormData() { function collectFormData() {
var data = new Object(); var data = new Object();
getCheckbox("developerEnabled", data); getCheckbox("developerEnabled", data);
getCheckbox("developerPermitAnonymousControl", data);
getCheckbox("developerDefeatFreemarkerCache", data); getCheckbox("developerDefeatFreemarkerCache", data);
getCheckbox("developerInsertFreemarkerDelimiters", data); getCheckbox("developerInsertFreemarkerDelimiters", data);
getCheckbox("developerPageContentsLogCustomListView", data); getCheckbox("developerPageContentsLogCustomListView", data);

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

@ -25,6 +25,10 @@
<@showCheckbox "developerEnabled" /> <@showCheckbox "developerEnabled" />
Enable developer mode Enable developer mode
</label> </label>
<label>
<@showCheckbox "developerPermitAnonymousControl" />
Allow anonymous user to see and modify developer settings
</label>
</div> </div>
<div class="devright"> <div class="devright">