Merge branch 'maint-rel-1.6' into develop

webapp/web/css/vitro.css

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

webapp/web/js/developer/developerPanel.js

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

webapp/web/templates/freemarker/page/partials/developerPanel.ftl

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