Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl

@@ -6,8 +6,9 @@
 <#if (rangeOptions?keys?size > 0)>
 	<#assign rangeOptionsExist = true/>
 </#if>
+<#assign rangeUri = editConfiguration.objectPredicateProperty.rangeVClassURI!"" />
 <#assign formTitle = editConfiguration.formTitle />
-<#if editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")>
+<#if rangeUri?contains("IAO_0000030")>
     <#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
 </#if>
 <h2>${formTitle}</h2>

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

@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<div id="developerPanel" > </div>
+<script>developerAjaxUrl = '${urls.developerAjax}'</script>
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/developer/developerPanel.js"></script>')}   

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

@@ -0,0 +1,91 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+
+<#macro showCheckbox key>
+	<input type="checkbox" id="${key}" <#if settings[key]>checked</#if>>
+</#macro>
+
+<#macro showTextbox key>
+	<input type="text" id="${key}" size="40" value="${settings[key]}" >
+</#macro>
+
+
+<style>
+div.developer {
+	background-color: #f7dd8a; 
+	padding: 0px 10px 0px 10px;
+	font-size: small;
+	font-variant: small-caps;
+}
+
+div.developer #developerPanelBody {
+	display: none;
+}
+
+div.developer .container {
+	border: thin groove black
+}
+</style>
+
+<#if !settings.developerEnabled>
+<#elseif !settings.mayControl>
+	<div class="developer">
+		<h1>${siteName} is running in developer mode.</h1>
+	</div>
+<#else>
+	<div class="developer">
+		<h1 id="developerPanelClickMe">${siteName} is running in developer mode.  
+			<span id="developerPanelClickText">(click for Options)</span>
+		</h1>
+		<div id="developerPanelBody">
+			<form>
+				<label>
+					<@showCheckbox "developerEnabled" />
+					Enable developer mode
+				</label>
+				
+				<div class="container">
+					Freemarker templates
+					<label>
+						<@showCheckbox "developerDefeatFreemarkerCache" />
+						Defeat the template cache
+					</label>
+					<label>
+						<@showCheckbox "developerInsertFreemarkerDelimiters" />
+						Insert HTML comments at start and end of templates
+					</label>
+				</div>
+				
+				<div class="container">
+					SPARQL Queries
+					<label>
+						<@showCheckbox "developerLoggingRDFServiceEnable" />
+						Log each query 
+					</label>
+					<label>
+						<@showCheckbox "developerLoggingRDFServiceStackTrace" />
+						Add stack trace
+					</label>
+					<label>
+						Restrict by calling stack
+						<@showTextbox "developerLoggingRDFServiceRestriction" />
+					</label>
+				</div>
+
+				<div class="container">
+					Language support
+					<label>
+						<@showCheckbox "developerI18nDefeatCache" />
+						Defeat the cache of language property files
+					</label>
+					<label>
+						<@showCheckbox "developerI18nLogStringRequests" />
+						Log the retrieval of language strings
+					</label>
+				</div>
+
+				<input type="button" id="developerPanelSaveButton" value="Save Settings" name="foo" />
+			</form>
+		</div>
+	</div>
+</#if>	

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

@@ -6,11 +6,11 @@
   What was the right way to do this?
  -->
 
-<#-- This is included by identity.ftl --> 
+<#-- This is included by identity.ftl  --> 
 <#if selectLocale??>    
     <#list selectLocale.locales as locale>
         <li>
-            <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}">
+            <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}" <#if locale.selected>style="padding-bottom:1px;border-bottom: 1px solid #ccdfe6"</#if>>
                 <img src="${locale.imageUrl}" height="15" style="vertical-align:middle" alt="${locale.label}"/>
             </a>
         </li>

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

@@ -1,5 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#include "developer.ftl">
+
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>