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

NIHVIVO-1073 Fairly significant refactoring of markup and styles for menu pages. Got rid of duplication between the default template and template for people class group.

Browse source
This commit is contained in:
nac26 2011-01-26 14:16:57 +00:00
parent 4e16f872b6
commit 1d51f94d56
3 changed files with 62 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

7
productMods/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
View file

@ -3,15 +3,15 @@
<#include "menupage-checkForData.ftl"> <#include "menupage-checkForData.ftl">
<#if !noData> <#if !noData>
<section id="intro-menupage" role="region"> <section id="menupage-intro" role="region">
<h3>${page.title}</h3> <h3>${page.title}</h3>
<section id="content-foaf-person" role="region"> <section id="menupage-content" class="people" role="region">
<h4>Visual Graph</h4> <h4>Visual Graph</h4>
<#include "menupage-vClassesInClassgroup.ftl"> <#include "menupage-vClassesInClassgroup.ftl">
<section id="foaf-person-graph" role="region"> <section id="menupage-graph" class="people" role="region">
<img src="${urls.images}/menupage/visual-graph.jpg" alt="" /> <img src="${urls.images}/menupage/visual-graph.jpg" alt="" />
</section> </section>
</section> </section>
@ -30,7 +30,6 @@
<li><a href="${urls.base}/individuallist?vclassId=${courseUri?url}">Courses</a></li> <li><a href="${urls.base}/individuallist?vclassId=${courseUri?url}">Courses</a></li>
</ul> </ul>
</nav> </nav>
</section> </section>
</section> </section>

21
themes/wilma/css/ie6.css
View file

@ -40,26 +40,23 @@ ul#browse-classgroups a.selected {
background-position-y: 12px; background-position-y: 12px;
} }
/* Fix for menupages */ /* Fix for menupages */
ul#foaf-person-childClasses { ul#vgraph-classes {
float: left; float: left;
width: 265px; width: 265px;
margin-left: 15px; margin-left: 15px;
} }
ul#browse-childClasses { ul#browse-classes {
width: 284px; width: 284px;
margin-left: 0; margin-left: 0;
padding-left: 10px; padding-left: 10px;
margin-left: 15px; margin-left: 15px;
} }
#individuals-in-childClass { #individuals-in-class {
width: 450px; width: 450px;
} }
#individuals-in-childClass h3 { article.foaf-person {
padding: 10px 0 10px 30px; width: 400px;
margin: 0; margin-left:10px;
}
article.individual-foaf-person {
width: 400px margin-left:10px;
margin-right: 10px; margin-right: 10px;
padding: 0; padding: 0;
margin-bottom: 10px; margin-bottom: 10px;
@ -94,16 +91,16 @@ article.individual-foaf-person {
width: auto; width: auto;
} }
/* Fix for menupages */ /* Fix for menupages */
ul#alpha-browse-childClass { ul#alpha-browse-individuals {
width: 545px; width: 545px;
} }
ul#alpha-browse-childClass a { ul#alpha-browse-individuals a {
height: 30px; height: 30px;
margin-left: 0; margin-left: 0;
padding-left: 6px; padding-left: 6px;
width: 8px; width: 8px;
} }
#individuals-in-childClass{ #individuals-in-class{
width: 550px; width: 550px;
} }
/* Fix for photo upload */ /* Fix for photo upload */

108
themes/wilma/css/wilma.css
View file

@ -682,9 +682,6 @@ p{
.pagination li.selectedNavPage{ .pagination li.selectedNavPage{
color: #91b039; color: #91b039;
} }
.rdfLink {
border-left: 1px solid #a6b1b0;
}
.rdfLink a { .rdfLink a {
color: #84a655; color: #84a655;
} }
@ -694,7 +691,8 @@ p{
.individualList ul { .individualList ul {
margin-left: 0; margin-left: 0;
} }
.individualList li { .individualList li,
.individualList li span {
color: #9c9c9c; color: #9c9c9c;
} }
.individualList li a { .individualList li a {
@ -706,88 +704,54 @@ p{
/* MENU PAGES --------------------------------------> */ /* MENU PAGES --------------------------------------> */
/* -------------------------------------------------> */ /* -------------------------------------------------> */
/* VISUAL GRAPH FOAF:PERSON------> */ /* VISUAL GRAPH------> */
#intro-menupage { #menupage-intro {
width: 920px; width: 920px;
background: #fff; background: #fff;
} }
#intro-menupage h3 { #menupage-intro h3 {
font-size: 1.5em; font-size: 1.5em;
color: #002b44; color: #002b44;
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #f3f3f4; border-bottom: 1px solid #f3f3f4;
} }
#content-foaf-person { #menupage-content.people {
width: 620px;
border-right: 1px solid #e8ece9; border-right: 1px solid #e8ece9;
} }
#content-foaf-person h4 { #menupage-content {
font-size: 1.25em;
color: #2485ae;
font-weight: normal;
}
ul#foaf-person-childClasses li {
border-bottom: 1px solid #dde4e3;
font-size: 1em;
}
ul#foaf-person-childClasses a {
color: #5e6363;
text-decoration: none;
}
ul#foaf-person-childClasses a:hover {
background: url(../images/arrow.gif) 0 12px no-repeat;
color: #2ea0cf;
}
ul#foaf-person-childClasses a.selected {
color: #2ea0cf;
background: url(../images/arrow.gif) 0 12px no-repeat;
}
ul#foaf-person-childClasses .count-classes {
font-size: .75em;
}
/* VISUAL GRAPH CLASS:GENERIC (ORGANIZATION, RESEARCH, EVENT) ------> */
#content-generic-class {
width: 900px; width: 900px;
} }
#content-generic-class h3 { #menupage-content h3 {
font-size: 1.5em; font-size: 1.5em;
color: #002b44; color: #002b44;
font-weight: normal; font-weight: normal;
border-bottom: 1px solid #f3f3f4; border-bottom: 1px solid #f3f3f4;
} }
#content-generic-class h4 { #menupage-content h4 {
font-size: 1.25em; font-size: 1.25em;
color: #2485ae; color: #2485ae;
font-weight: normal; font-weight: normal;
} }
ul#vgraph-childClasses { ul#vgraph-classes li {
float: left;
width: 265px;
margin-left: 35px;
}
ul#vgraph-childClasses li {
border-bottom: 1px solid #dde4e3; border-bottom: 1px solid #dde4e3;
font-size: 1em; font-size: 1em;
} }
ul#vgraph-childClasses a { ul#vgraph-classes a {
color: #5e6363; color: #5e6363;
text-decoration: none; text-decoration: none;
} }
ul#vgraph-childClasses a:hover { ul#vgraph-classes a:hover {
background: url(../images/arrow.gif) 0 12px no-repeat; background: url(../images/arrow.gif) 0 12px no-repeat;
color: #2ea0cf; color: #2ea0cf;
} }
ul#vgraph-childClasses a.selected { ul#vgraph-classes a.selected {
color: #2ea0cf; color: #2ea0cf;
background: url(../images/arrow.gif) 0 12px no-repeat; background: url(../images/arrow.gif) 0 12px no-repeat;
} }
ul#vgraph-childClasses .count-classes { ul#vgraph-classes .count-classes {
font-size: .75em; font-size: .75em;
} }
#generic-class-graph {
border: 1px dotted #ccc;
}
/* FIND BY ------> */ /* FIND BY ------> */
#find-by { #find-by {
border: 1 solid #749A02; border: 1 solid #749A02;
@ -884,80 +848,82 @@ ul#find-filters a.selected {
color: #fff; color: #fff;
} }
/* BROWSE CLASSES ------> */ /* BROWSE CLASSES ------> */
ul#browse-childClasses { ul#browse-classes {
border: 1px solid #dde4e3; border: 1px solid #dde4e3;
border-right: 0; border-right: 0;
background-color: #f1f2ee; background-color: #f1f2ee;
} }
ul#browse-childClasses li { ul#browse-classes li {
border-bottom: 1px solid #dde4e3; border-bottom: 1px solid #dde4e3;
font-size: 1em; font-size: 1em;
} }
ul#browse-childClasses a { ul#browse-classes a {
color: #5e6363; color: #5e6363;
text-decoration: none; text-decoration: none;
} }
ul#browse-childClasses a:hover { ul#browse-classes a:hover {
background: url(../images/arrow.gif) 0 12px no-repeat; background: url(../images/arrow.gif) 0 12px no-repeat;
color: #2ea0cf; color: #2ea0cf;
} }
ul#browse-childClasses a.selected { ul#browse-classes a.selected {
color: #2ea0cf; color: #2ea0cf;
background: url(../images/arrow.gif) 0 12px no-repeat; background: url(../images/arrow.gif) 0 12px no-repeat;
} }
ul#browse-childClasses .count-classes { ul#browse-classes .count-classes {
font-size: 12px; font-size: 12px;
} }
/* ALPHA BROWSE------> */ /* ALPHA BROWSE------> */
ul#alpha-browse-childClass { ul#alpha-browse-individuals {
border: 1px solid #dde4e3; border: 1px solid #dde4e3;
background-color: #fff; background-color: #fff;
border-left: 1px solid #dde4e3; border-left: 1px solid #dde4e3;
border-bottom: none; border-bottom: none;
} }
ul#alpha-browse-childClass li { ul#alpha-browse-individuals li {
font-size: .8em; font-size: .8em;
} }
ul#alpha-browse-childClass a { ul#alpha-browse-individuals a {
color: #5e6363; color: #5e6363;
text-decoration: none; text-decoration: none;
} }
ul#alpha-browse-childClass a:hover { ul#alpha-browse-individuals a:hover {
background: url(../images/arrowSmall.gif) -3px 7px no-repeat; background: url(../images/arrowSmall.gif) -3px 7px no-repeat;
color: #2ea0cf; color: #2ea0cf;
} }
ul#alpha-browse-childClass a.selected { ul#alpha-browse-individuals a.selected {
color: #2ea0cf; color: #2ea0cf;
background: url(../images/arrowSmall.gif) -3px 7px no-repeat; background: url(../images/arrowSmall.gif) -3px 7px no-repeat;
margin-right: 3px; margin-right: 3px;
margin-left: 5px; margin-left: 5px;
} }
ul#alpha-browse-childClass .count-classes { ul#alpha-browse-individuals .count-classes {
font-size: .75em; font-size: .75em;
} }
.alphaIndex { .alphaIndex {
font-size: 0.8em; font-size: 0.8em;
} }
/* BROWSE INDIVIDUALS------> */ /* BROWSE INDIVIDUALS------> */
#individuals-in-childClass { #individuals-in-class {
width: 630px; width: 630px;
border: 1px solid #dde4e3; border: 1px solid #dde4e3;
background-color: #fff; background-color: #fff;
} }
#individuals-in-childClass h3 { #individuals-in-class li.individual {
font-size: 1.68em;
color: #2485ae;
}
#individuals-in-childClass li {
border-bottom: 1px solid #dde4e3; border-bottom: 1px solid #dde4e3;
} }
#individuals-in-childClass li img { #individuals-in-class li img {
border: 2px solid #dde4e3; border: 2px solid #dde4e3;
} }
#individuals-in-childClass li h1 { #individuals-in-class li h1 {
color: #5e6363; color: #5e6363;
font-size: 1em; font-size: 1em;
} }
nav.pagination.menupage{
font-size: 0.8em;
}
nav.pagination.menupage a{
text-decoration: none;
}
/* -------------------------------------------------> */ /* -------------------------------------------------> */
/* IMAGE UPLOAD-------------------------------------> */ /* IMAGE UPLOAD-------------------------------------> */
@ -998,7 +964,7 @@ ul#alpha-browse-childClass .count-classes {
background: #2485AE; background: #2485AE;
} }
/* INDIVIDUAL INTRO FOR PERSON ------> */ /* INDIVIDUAL INTRO FOR PERSON ------> */
.foaf-person{ .preferred{
padding-top: .2em; padding-top: .2em;
} }
/* INDIVIDUAL INTRO FOR ANY CLASS ------> */ /* INDIVIDUAL INTRO FOR ANY CLASS ------> */