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

additional home page redesign changes

Browse source
This commit is contained in:
tworrall 2013-05-02 12:31:54 -04:00
parent 1ca0904911
commit afbf429165
7 changed files with 49 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
webapp/themes/vitro/images/filteredSearch.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
webapp/themes/vitro/images/filteredSearchActive.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
webapp/themes/vitro/images/limit-search.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
webapp/themes/vitro/images/search-field-and-button.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

17
webapp/themes/vitro/templates/page-home.ftl
View file

@ -55,14 +55,17 @@
<@widget name="login" /> <@widget name="login" />
<section id="home-stats" class="home-sections" > <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
<h4>Statistics</h4> <@lh.allClassGroups vClassGroups! />
<ul id="stats">
<@lh.allClassGroups vClassGroups! />
</ul>
</section>
<#include "footer.ftl"> <#include "footer.ftl">
<script>
// this will ensure that the hidden classgroup input is cleared if the back button is used
// to return to the home page from the search results. Not in vitroUtils.js because that
// gets loaded on every page.
$(document).ready(function(){
$('input[name="classgroup"]').val("");
});
</script>
</body> </body>
</html> </html>

1
webapp/web/css/vitro.css
View file

@ -251,6 +251,7 @@ p#mngLabelsText {
/* SEARCH HOME------> */ /* SEARCH HOME------> */
#search-home { #search-home {
margin-top: 2em; margin-top: 2em;
width: 570px;
} }
#search-home h3 { #search-home h3 {

74
webapp/web/templates/freemarker/lib/lib-home-page.ftl
View file

@ -17,49 +17,51 @@
<#-- Loop through classGroups first so we can account for situations when all class groups are empty --> <#-- Loop through classGroups first so we can account for situations when all class groups are empty -->
<#assign selected = 'class="selected" ' /> <#assign selected = 'class="selected" ' />
<#assign classGroupList> <#assign classGroupList>
<#list classGroups as group> <section id="home-stats" class="home-sections" >
<#-- Only display populated class groups --> <h4>Statistics</h4>
<#if (group.individualCount > 0)> <ul id="stats">
<#-- Catch the first populated class group. Will be used later as the default selected class group --> <#assign groupCount = 1>
<#if !firstPopulatedClassGroup??> <#list classGroups as group>
<#assign firstPopulatedClassGroup = group /> <#if (groupCount > 6) >
</#if> <#break/>
<#-- Determine the active (selected) group -->
<#assign activeGroup = "" />
<#if !classGroup??>
<#if group_index == 0>
<#assign activeGroup = selected />
</#if> </#if>
<#elseif classGroup.uri == group.uri> <#-- Only display populated class groups -->
<#assign activeGroup = selected /> <#if (group.individualCount > 0)>
</#if> <#-- Catch the first populated class group. Will be used later as the default selected class group -->
<#if group.displayName != "equipment" && group.displayName != "locations" && group.displayName != "courses" > <#if !firstPopulatedClassGroup??>
<li> <#assign firstPopulatedClassGroup = group />
<a href="#"> </#if>
<p class="stats-count"> <#if group.displayName != "equipment" && group.displayName != "courses" >
<#if (group.individualCount > 10000) > <li>
<#assign overTen = group.individualCount/1000> <a href="#">
${overTen?round}<span>k</span> <p class="stats-count">
<#elseif (group.individualCount > 1000)> <#if (group.individualCount > 10000) >
<#assign underTen = group.individualCount/1000> <#assign overTen = group.individualCount/1000>
${underTen?string("0.#")}<span>k</span> ${overTen?round}<span>k</span>
<#else> <#elseif (group.individualCount > 1000)>
${group.individualCount}<span>&nbsp;</span> <#assign underTen = group.individualCount/1000>
</#if> ${underTen?string("0.#")}<span>k</span>
</p> <#else>
<p class="stats-type">${group.displayName?capitalize}</p> ${group.individualCount}<span>&nbsp;</span>
</a> </#if>
</li> </p>
</#if> <p class="stats-type">${group.displayName?capitalize}</p>
</#if> </a>
</#list> </li>
<#assign groupCount = groupCount + 1>
</#if>
</#if>
</#list>
</ul>
</section>
</#assign> </#assign>
<#-- Display the class group browse only if we have at least one populated class group --> <#-- Display the class group browse only if we have at least one populated class group -->
<#if firstPopulatedClassGroup??> <#if firstPopulatedClassGroup??>
${classGroupList} ${classGroupList}
<#else> <#else>
<h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3> <h3 id="noContentMsg">There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
<#if user.loggedIn> <#if user.loggedIn>
<#if user.hasSiteAdminAccess> <#if user.hasSiteAdminAccess>