This commit is contained in:
tworrall 2013-10-23 13:11:46 -04:00
parent 3c89678522
commit 4ce41fb6ed
2 changed files with 35 additions and 30 deletions

View file

@ -4,7 +4,6 @@
<#import "lib-properties.ftl" as p> <#import "lib-properties.ftl" as p>
<#assign subjectUri = individual.controlPanelUrl()?split("=") > <#assign subjectUri = individual.controlPanelUrl()?split("=") >
<#assign nameForOtherGroup = nameForOtherGroup!"other">
<#if (propertyGroups.all)??> <#if (propertyGroups.all)??>
<#assign groups = propertyGroups.all> <#assign groups = propertyGroups.all>
@ -13,6 +12,7 @@
<nav id="property-group-menu" role="navigation"> <nav id="property-group-menu" role="navigation">
<ul role="list"> <ul role="list">
<#list groups as group> <#list groups as group>
<#if (group.properties?size > 0) >
<#assign groupname = group.getName(nameForOtherGroup)> <#assign groupname = group.getName(nameForOtherGroup)>
<#if groupname?has_content> <#if groupname?has_content>
<#--create property group html id is the function that will replace all spaces with underscore to make a valid id--> <#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
@ -21,13 +21,15 @@
function to capitalize all except function words. --> 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}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
</#if> </#if>
</#if>
</#list> </#list>
</ul> </ul>
</nav> </nav>
</#if> </#if>
</#if> </#if>
</#if> </#if>
<#list propertyGroups.all as group> <#list propertyGroups.all as group>
<#if (group.properties?size > 0)>
<#assign groupName = group.getName(nameForOtherGroup)> <#assign groupName = group.getName(nameForOtherGroup)>
<#assign verbose = (verbosePropertySwitch.currentValue)!false> <#assign verbose = (verbosePropertySwitch.currentValue)!false>
@ -50,4 +52,5 @@
<#-- List the properties in the group --> <#-- List the properties in the group -->
<#include "individual-properties.ftl"> <#include "individual-properties.ftl">
</section> <!-- end property-group --> </section> <!-- end property-group -->
</#if>
</#list> </#list>

View file

@ -11,14 +11,14 @@
<li class="groupTabSpacer">&nbsp;</li> <li class="groupTabSpacer">&nbsp;</li>
<#list propertyGroups.all as groupTabs> <#list propertyGroups.all as groupTabs>
<#if ( groupTabs.properties?size > 0 ) > <#if ( groupTabs.properties?size > 0 ) >
<#assign groupName = groupTabs.getName(nameForOtherGroup)> <#assign groupName = groupTabs.getName(nameForOtherGroup)>
<#if groupName?has_content> <#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu--> <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<#else> <#else>
<#assign groupName = "${i18n().properties_capitalized}"> <#assign groupName = "${i18n().properties_capitalized}">
<#assign groupNameHtmlId = "${i18n().properties}" > <#assign groupNameHtmlId = "${i18n().properties}" >
</#if> </#if>
<#if tabCount = 1 > <#if tabCount = 1 >
<li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li> <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
<li class="groupTabSpacer">&nbsp;</li> <li class="groupTabSpacer">&nbsp;</li>
@ -35,30 +35,32 @@
</#if> </#if>
</ul> </ul>
<#list propertyGroups.all as group> <#list propertyGroups.all as group>
<#assign groupName = group.getName(nameForOtherGroup)> <#if (group.properties?size > 0)>
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > <#assign groupName = group.getName(nameForOtherGroup)>
<#assign verbose = (verbosePropertySwitch.currentValue)!false> <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>"> <#assign verbose = (verbosePropertySwitch.currentValue)!false>
<nav id="scroller" class="scroll-up hidden" role="navigation"> <section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
<a href="#branding" title="${i18n().scroll_to_menus}" > <nav id="scroller" class="scroll-up hidden" role="navigation">
<img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" /> <a href="#branding" title="${i18n().scroll_to_menus}" >
</a> <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
</nav> </a>
</nav>
<#-- Display the group heading --> <#-- Display the group heading -->
<#if groupName?has_content> <#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu--> <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
<h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2> <h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
<#else> <#else>
<h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2> <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
</#if> </#if>
<div id="${groupNameHtmlId}Group" > <div id="${groupNameHtmlId}Group" >
<#-- List the properties in the group --> <#-- List the properties in the group -->
<#include "individual-properties.ftl"> <#include "individual-properties.ftl">
</div> </div>
</section> <!-- end property-group --> </section> <!-- end property-group -->
<#assign sectionCount = 2 > <#assign sectionCount = 2 >
</#if>
</#list> </#list>
<script> <script>
var individualLocalName = "${individual.localName}"; var individualLocalName = "${individual.localName}";