litvinovg/vivo
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:51:19 -05:00
commit 195fda4d3a
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -74,14 +74,7 @@
<#include "individual-iconControls.ftl"> <#include "individual-iconControls.ftl">
</span> </span>
<#if editable && profilePageTypesEnabled > <#if editable && profilePageTypesEnabled >
<div id="profileTypeContainer" <#if !user.hasSiteAdminAccess>style="top:55px"</#if> > <#include "individual-profilePageTypes.ftl">
<!-- The text in this h2 element is set via the wilma.css file -->
<h2>${i18n().profile_type}</h2>
<select id="profilePageType">
<option value="standard" <#if profileType == "standard" || profileType == "none">selected</#if> >${i18n().standard_view}</option>
<option value="quickView" <#if profileType == "quickView">selected</#if> >${i18n().quick_view}</option>
</select>
</div>
</#if> </#if>
</header> </header>
<!-- Positions --> <!-- Positions -->

11
productMods/templates/freemarker/body/partials/individual/individual-profilePageTypes.ftl Normal file
View file

@ -0,0 +1,11 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- profile page type select element on individual 2-column profile page -->
<div id="profileTypeContainer" <#if !user.hasSiteAdminAccess>style="top:55px"</#if> >
<h2>${i18n().profile_type}</h2>
<select id="profilePageType">
<option value="standard" <#if profileType == "standard" || profileType == "none">selected</#if> >${i18n().standard_view}</option>
<option value="quickView" <#if profileType == "quickView">selected</#if> >${i18n().quick_view}</option>
</select>
</div>