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

Merge commit 'a83c1e5e4f' into feature/TDBfromRDB2

Browse source
This commit is contained in:
Jim Blake 2014-06-11 16:50:58 -04:00
commit 66fbf81034
15 changed files with 35 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/edit/specific/renameResource_retry.jsp
View file

@ -11,7 +11,7 @@
<tr class="editformcell">
<td>
<br/>
<b>New URI</b>&nbsp;<span class="note"> (must begin with http:// or htts://)</span>
<b>New URI</b>&nbsp;<span class="note"> (must begin with http:// or https://)</span>
<br/>
<span class="warning"><strong>${epo.attributeMap['errorMsg']}</strong></span>
<input type="text" size="95%" name="newURI" value='<%=request.getParameter("oldURI")%>'/>

2
webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
View file

@ -31,7 +31,7 @@
<label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
<input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
<p class="note">${strings.minimum_password_length(minimumLength)}</p>
<p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
<label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />

2
webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
View file

@ -30,7 +30,7 @@
<textarea name="s34gfd88p9x1" rows="10" cols="90">${comments!}</textarea>
<p><label class="realpersonLabel">${i18n().enter_in_security_field}:</label>
<p><label class="realpersonLabel">${i18n().enter_in_security_field}:<span class="requiredHint"> *</span></label>
<input type="text" id="defaultReal" name="defaultReal"></p>

4
webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
View file

@ -19,7 +19,7 @@
<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
<#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
function to capitalize all except function words. -->
<li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
<li role="listitem"><a href="#${groupnameHtmlId?replace("/","-")}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
</#if>
</#if>
</#list>
@ -44,7 +44,7 @@
<#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
<h2 id="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</h2>
<#else>
<h2 id="properties">${i18n().properties_capitalized}</h2>
</#if>

10
webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
View file

@ -20,11 +20,11 @@
<#assign groupNameHtmlId = "${i18n().properties}" >
</#if>
<#if tabCount = 1 >
<li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
<li class="selectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</li>
<li class="groupTabSpacer">&nbsp;</li>
<#assign tabCount = 2>
<#else>
<li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
<li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName?capitalize}</li>
<li class="groupTabSpacer">&nbsp;</li>
</#if>
</#if>
@ -39,7 +39,7 @@
<#assign groupName = group.getName(nameForOtherGroup)>
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<#assign verbose = (verbosePropertySwitch.currentValue)!false>
<section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
<section id="${groupNameHtmlId?replace("/","-")}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
<nav id="scroller" class="scroll-up hidden" role="navigation">
<a href="#branding" title="${i18n().scroll_to_menus}" >
<img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
@ -50,11 +50,11 @@
<#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
<h2 id="${groupNameHtmlId?replace("/","-")}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
<#else>
<h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
</#if>
<div id="${groupNameHtmlId}Group" >
<div id="${groupNameHtmlId?replace("/","-")}Group" >
<#-- List the properties in the group -->
<#include "individual-properties.ftl">
</div>

12
webapp/web/templates/freemarker/page/partials/headScripts.ftl
View file

@ -15,15 +15,3 @@ var i18nStrings = {
<![endif]-->
${headScripts.list()}
<!--[if lt IE 7]>
<script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
<![endif]-->
<!--[if lt IE 7]>
<link rel="stylesheet" href="${urls.base}/css/vitroIE6.css" />
<![endif]-->
<!--[if IE 7]>
<link rel="stylesheet" href="${urls.base}/css/vitroIE7.css" />
<![endif]-->