diff --git a/webapp/src/main/webapp/css/individual/individual-2column-view.css b/webapp/src/main/webapp/css/individual/individual-2column-view.css
index e1c35dcb33..0b5ee925b1 100644
--- a/webapp/src/main/webapp/css/individual/individual-2column-view.css
+++ b/webapp/src/main/webapp/css/individual/individual-2column-view.css
@@ -93,7 +93,7 @@ div#profileTypeContainer select {
display:inline-block;
padding: .5em;
background: none repeat scroll 0 0 #FFFFFF;
- border: 1px solid #E0DFDF;
+ border: 1px solid #898989;
border-radius: 5px 5px 5px 5px;
font-size: 14px;
margin-bottom: 0.8em;
@@ -231,7 +231,7 @@ div#contactPhoneDiv {
text-align:right;
}
/* <------ RESEARCH AREA */
-ul#individual-hasResearchArea li {
+ul.individual-hasResearchArea li {
float: left;
padding-right: 10px;
margin-right: 10px;
@@ -269,7 +269,7 @@ span#quickViewLink img {
padding-top:18px;
}
#individual-info div#contactContainer h3{
- color:#8aa149;
+ color:#536520;
}
ul#individual-personInPosition li {
padding-bottom:12px;
@@ -280,5 +280,5 @@ ul#individual-personInPosition li:last-child {
padding-bottom: 0;
}
td#totalPubs {
- color: #2485AE;
+ color: #12739D;
}
diff --git a/webapp/src/main/webapp/css/individual/individual-quick-view.css b/webapp/src/main/webapp/css/individual/individual-quick-view.css
index fb3e132f0b..75deca5322 100644
--- a/webapp/src/main/webapp/css/individual/individual-quick-view.css
+++ b/webapp/src/main/webapp/css/individual/individual-quick-view.css
@@ -166,7 +166,7 @@ div#profileTypeContainer select {
display:inline-block;
padding: .5em;
background: none repeat scroll 0 0 #FFFFFF;
- border: 1px solid #E0DFDF;
+ border: 1px solid #898989;
border-radius: 5px 5px 5px 5px;
font-size: 14px;
margin-bottom: 0.8em;
@@ -193,7 +193,7 @@ ul#individual-personInPosition {
padding-left: 10px;
margin: 10px 0 0 0;
}
-ul#individual-hasResearchArea li {
+ul.individual-hasResearchArea li {
float: left;
padding-right: 10px;
margin-right: 10px;
@@ -201,7 +201,7 @@ ul#individual-hasResearchArea li {
border-right: 1px solid #5e6363 ;
white-space:nowrap !important;
}
-ul#individual-hasResearchArea li:last-child {
+ul.individual-hasResearchArea li:last-child {
white-space:nowrap !important;
}
diff --git a/webapp/src/main/webapp/css/individual/individual-vivo.css b/webapp/src/main/webapp/css/individual/individual-vivo.css
index 3881dbcd24..976ee03ea7 100644
--- a/webapp/src/main/webapp/css/individual/individual-vivo.css
+++ b/webapp/src/main/webapp/css/individual/individual-vivo.css
@@ -197,7 +197,7 @@ ul#individual-personInPosition li:last-child {
}
/* <------ RESEARCH AREA */
-ul#individual-hasResearchArea li,
+ul.individual-hasResearchArea li,
ul#individual-facultyMemberships li {
float: left;
padding-right: 10px;
diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
index 51cb46c9b1..a09f9ca738 100755
--- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
+++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
@@ -23,7 +23,7 @@ body {
-webkit-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3);
-moz-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3);
-o-text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3);
- background-color: #8BAB2E;
+ background-color: #536520;
// background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#446791), to(#164682));
// background-image: -moz-linear-gradient(top, #446791, #164682);
width: auto;
@@ -58,7 +58,7 @@ body {
top:0;
}
-ul#log_printout {
+#log_printout {
display: block;
height: 330px;
overflow: scroll
@@ -309,8 +309,18 @@ hr {
.tabs ul.titles li.activeTab a,
.tabs ul.titles li.activeTab a:hover {
- background-color: #fff;
+ background-color: #13739D;
+ color: white;
}
+
+/* Focus styles for tab links */
+.tabs ul.titles li a:focus {
+ outline: 2px solid #0078d7; /* 2px box around focused element */
+ font-weight: bold; /* Make text bold */
+ position: relative;
+ z-index: 1;
+}
+
.smalllogo {
margin-left:-5px;
vertical-align:middle;
diff --git a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
index 073fa0468e..a8e91bb164 100644
--- a/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
+++ b/webapp/src/main/webapp/css/visualization/entitycomparison/layout.css
@@ -44,7 +44,7 @@ for the message is getting set to 50%, hence we need to override it here.
}
.filter-option {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
/*padding-right: 5px;*/
text-decoration: underline;
@@ -118,7 +118,7 @@ img#copy-vis-viewlink-icon {
}
a.temporalGraphLinks {
- background-color: #2485AE;
+ background-color: #12739D;
color: white;
cursor: pointer;
font-weight: bold;
@@ -146,7 +146,7 @@ a.clear-selected-entities,
vertical-align: sub;
}
#reset-search {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
margin-left: 10px;
}
@@ -215,7 +215,7 @@ a.clear-selected-entities,
font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica,
sans-serif;
font-size: 1.5275em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
@@ -230,7 +230,7 @@ sans-serif;
margin-left: 10px;
display: inline-block;
text-decoration: underline;
- color: #2485AE;
+ color: #12739D;
}
.ellipsis.multiline {
white-space: normal;
@@ -301,14 +301,14 @@ p.displayCounter{
#entitylevelheading,
#comparisonParameter,
#headerText {
- color: #2485ae;
+ color: #12739D;
}
/* --------------------------------------------------------------> */
/* SPECIAL STYLES FOR THE entityComparisonErrorCommonBody.ftl FILE */
/* --------------------------------------------------------------> */
#noPubsOrGrants-header {
font-size: 1.375em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
diff --git a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
index 7267f874de..30431e59f2 100644
--- a/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
+++ b/webapp/src/main/webapp/css/visualization/mapofscience/layout.css
@@ -50,7 +50,7 @@
#header-entity-label {
font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
font-size: 1.5275em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
@@ -108,7 +108,7 @@ a.clear-selected-entities {
/* filter */
.filter-option, .comparison-filter-option {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
/*padding-right: 5px;*/
text-decoration: underline;
@@ -161,7 +161,7 @@ a.clear-selected-entities {
}
#reset-search, #comparison-reset-search {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
margin-left: 10px;
}
@@ -178,7 +178,7 @@ th#percentage-activity-column {
.corner-triangle {
border-left: 10px solid #F6F6F6;
- border-top: 10px solid #2485AE;
+ border-top: 10px solid #12739D;
float: right;
font-size: 0;
line-height: 0;
@@ -228,13 +228,13 @@ a.map-of-science-links {
text-align: center;
height: 25px;
max-width: 260px;
- background-color: #2485AE;
+ background-color: #12739D;
height: 20px;
padding: 4px 5px 3px;
}
#download-unlocated-journal-info {
- background-color: #2485AE;
+ background-color: #12739D;
height: 20px;
margin-top: 10px;
max-width: 260px;
@@ -268,7 +268,7 @@ a.map-of-science-links {
.subpaginatedtabs span {
padding-right: 5px;
cursor: pointer;
- color: #2485AE;
+ color: #12739D;
}
.visCommonControllTooltip {
@@ -286,7 +286,7 @@ a.map-of-science-links {
#noPublications-header {
font-size: 1.375em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
diff --git a/webapp/src/main/webapp/css/visualization/personlevel/page.css b/webapp/src/main/webapp/css/visualization/personlevel/page.css
index 857983d207..62c3790da4 100644
--- a/webapp/src/main/webapp/css/visualization/personlevel/page.css
+++ b/webapp/src/main/webapp/css/visualization/personlevel/page.css
@@ -75,12 +75,12 @@ p.datatable {
.author_name,
.neutral_investigator_name,
.neutral_author_name {
- color: #2485AE;
+ color: #12739D;
font-weight: bold;
}
.investigator_moniker,
.author_moniker {
- color: #9C9C9C;
+ color: #656565;
}
.sub_headings {
color: #121b3c;
@@ -216,7 +216,7 @@ table.sparkline_wrapper_table td, th {
}
#dataPanel .bold {
font-weight: bold;
- color: #2485AE;
+ color: #12739D;
font-size: 14px;
}
#dataPanel .investigator_stats .numbers,
@@ -249,7 +249,7 @@ table.sparkline_wrapper_table td, th {
font-size: .9em;
}
#profileTitle {
- background-color: #2485AE;
+ background-color: #12739D;
color: white;
font-weight: bold;
line-height: 1em !important;
diff --git a/webapp/src/main/webapp/css/visualization/visualization.css b/webapp/src/main/webapp/css/visualization/visualization.css
index 23a1010043..791b7062ff 100644
--- a/webapp/src/main/webapp/css/visualization/visualization.css
+++ b/webapp/src/main/webapp/css/visualization/visualization.css
@@ -40,7 +40,7 @@ span.incomplete-data-holder,
padding-bottom: 0 !important;
}
.collaboratorship-link h3 a {
- color: #2485AE;
+ color: #12739D;
font-size: .9em !important;
text-decoration: underline;
}
diff --git a/webapp/src/main/webapp/images/individual/uriIcon_darkened.gif b/webapp/src/main/webapp/images/individual/uriIcon_darkened.gif
new file mode 100644
index 0000000000..a4e3d6d127
Binary files /dev/null and b/webapp/src/main/webapp/images/individual/uriIcon_darkened.gif differ
diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
index fd68b331fe..11925401bf 100755
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
@@ -45,10 +45,10 @@ if (typeof i18nStringsCap == 'undefined')
var schemes = {
"white" : {
"backgroundcolor" : "#FFFFFF",
- "capabilitycolor" : "#FFA500",
+ "capabilitycolor" : "#A46A00",
"nodestroke" : "#FFFFFF",
"fontcolor" : "#555",
- "linkcolor" : "#B8B8B8",
+ "linkcolor" : "#676767",
"gradient" : function(percent) {
return percent
}
@@ -58,7 +58,7 @@ var schemes = {
"capabilitycolor" : "#FFA500",
"nodestroke" : "#333333",
"fontcolor" : "#FFF",
- "linkcolor" : "#777",
+ "linkcolor" : "#9b9b9b",
"gradient" : function(percent) {
return -percent + 125;
}
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
index 487a054918..280933333f 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css
@@ -27,7 +27,7 @@
.paginatedtabs span {
padding-right: 5px;
cursor: pointer;
- color: #2485AE;
+ color: #12739D;
}
.paginate-nav-text {
@@ -35,9 +35,9 @@
}
.datatablewrapper td, th {
- border-bottom: 1px #F1F2EE solid;
- border-right: 1px #F1F2EE solid;
- border-left: 1px #F1F2EE solid;
+ border-bottom: 1px #F5F5F5 solid;
+ border-right: 1px #F5F5F5 solid;
+ border-left: 1px #F5F5F5 solid;
text-align: left;
padding: 5px;
font-size: 12px;
@@ -59,7 +59,7 @@
.datatablewrapper th {
border-top: 1px #3D454E solid;
- background:#F1F2ee;
+ background:#F5F5F5;
font-weight:bold;
font-size:12px;
padding-bottom: 3px;
diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
index 6e67fbe576..7b9e3d0d81 100644
--- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
+++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js
@@ -1294,7 +1294,7 @@ function removeStopWords(val) {
function setEntityLevel(entityLevel){
$('#entityleveltext').text(' ' + entityLevel.toLowerCase()).css('font-style', 'italic');
$('#entityHeader').text(entityLevel).css('font-weight', 'bold');
- $('#headerText').css("color", "#2485ae");
+ $('#headerText').css("color", "#12739D");
}
function toCamelCase(string){
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
index 8bc7b4ad15..6a6ea5cc57 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -53,7 +53,7 @@
<#if isInvestigator>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
index c21c6c05a7..bfb7adcd92 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationQuickView.ftl
@@ -42,7 +42,7 @@
#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
index 677706c7fe..2cee630e53 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
@@ -11,9 +11,9 @@
${statement.value!"ORCID iD not found"}
<#if orcidInfo??>
<#if (orcidInfo.orcids[statement.value])!false>
- (confirmed)
+ (confirmed)
<#else>
- (pending confirmation)
+ (pending confirmation)
#if>
#if>
#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
index 82227de9ec..ae43b8ccd8 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/addConcept.css
@@ -84,5 +84,5 @@ a.more-less {
}
a:hover.more-less {
color: #fff;
- background: #888;
+ background: #656565;
}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
index b3562895fa..f584cb5435 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
@@ -140,7 +140,7 @@
var pubDisplay = "${i18n().co_authors?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
");
var sparksText = ' ${i18n().within_last_10_years?js_string}';
@@ -169,7 +169,7 @@
var pubDisplay = "${i18n().co_authors?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
");
var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}'
+ ' - ${sparklineVO.latestRenderedPublicationYear?c}';
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
index 5fcd564644..1e7652c7d6 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
@@ -142,7 +142,7 @@
var grantDisplay = "${i18n().co_investigators?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
var sparksText = ' ${i18n().within_last_10_years?js_string}';
@@ -171,7 +171,7 @@
var grantDisplay = "${i18n().co_investigators?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}'
+ ' through ${sparklineVO.latestRenderedGrantYear?c}';
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
index 4217546432..ede70b542f 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
@@ -44,7 +44,7 @@
-
+
@@ -74,7 +74,7 @@
${i18n().organizations_capitalized} |
${i18n().people_capitalized} |
${i18n().view_all}
-
@@ -104,7 +104,7 @@
${i18n().you_have_selected} 0 ${i18n().of_a_maximum}
10 ${i18n().schools}.
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
index 049adb4526..42b514c3c1 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
@@ -135,7 +135,7 @@
var grantDisplay = "${i18n().grants?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + " ${i18n().grant_info_for_all_years} ${i18n().grant_info_for_all_years}
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
var sparksText = ' ${i18n().within_last_10_years?js_string}';
@@ -164,7 +164,7 @@
var grantDisplay = "${i18n().grants?js_string}";
}
- $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
");
var sparksText = ' from ${sparklineVO.earliestYearConsidered?c}'
+ ' through ${sparklineVO.latestRenderedGrantYear?c}';
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
index 950ecc58cc..9f43d41570 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
@@ -47,7 +47,7 @@ var mapOfScienceImageFolderPrefix = imageFolderPrefix + "mapofscience/";
var disciplineLabelImageUrlPrefix = mapOfScienceImageFolderPrefix + "labels/";
var disciplineBlackLabelImageUrlPrefix = disciplineLabelImageUrlPrefix + "black/";
-var infoIconUrl = "${urls.images}/iconInfo.png";
+var infoIconUrl = "${urls.images}/iconInfo-darkened.png";
var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png";
var entityLabel = '${entityLabel}';
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
index 410ae4a28c..618d282520 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl
@@ -20,7 +20,7 @@ corresponding changes in the included Templates. -->
${entityLabel}
@@ -45,9 +45,9 @@ corresponding changes in the included Templates. -->
<#-- VIEW TYPE FILTER -->
![]()
+ ![]()
${i18n().compare_organizations} <#--/ people -->
- ![]()
+ ![]()
+
${i18n().tables_capitalized}
![]()
![]()
");
+ $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).attr("class", "grey-text").append(" "+ pubDisplay +"
");
var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}'
+ ' - ${sparklineVO.latestRenderedPublicationYear?c}';
diff --git a/webapp/src/main/webapp/themes/nemo/css/layout.css b/webapp/src/main/webapp/themes/nemo/css/layout.css
index bc5d3d9d12..46901d1df1 100644
--- a/webapp/src/main/webapp/themes/nemo/css/layout.css
+++ b/webapp/src/main/webapp/themes/nemo/css/layout.css
@@ -50,7 +50,7 @@
#header-entity-label {
font-family: "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
font-size: 1.5275em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
@@ -108,7 +108,7 @@ a.clear-selected-entities {
/* filter */
.filter-option, .comparison-filter-option {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
/*padding-right: 5px;*/
text-decoration: underline;
@@ -161,7 +161,7 @@ a.clear-selected-entities {
}
#reset-search, #comparison-reset-search {
- color: #2485AE;
+ color: #12739D;
cursor: pointer;
margin-left: 10px;
}
@@ -178,7 +178,7 @@ th#percentage-activity-column {
.corner-triangle {
border-left: 10px solid #F6F6F6;
- border-top: 10px solid #2485AE;
+ border-top: 10px solid #12739D;
float: right;
font-size: 0;
line-height: 0;
@@ -228,13 +228,13 @@ a.map-of-science-links {
text-align: center;
height: 25px;
max-width: 260px;
- background-color: #2485AE;
+ background-color: #12739D;
height: 20px;
padding: 4px 5px 3px;
}
#download-unlocated-journal-info {
- background-color: #2485AE;
+ background-color: #12739D;
height: 20px;
margin-top: 10px;
max-width: 260px;
@@ -268,7 +268,7 @@ a.map-of-science-links {
.subpaginatedtabs span {
padding-right: 5px;
cursor: pointer;
- color: #2485AE;
+ color: #12739D;
}
.visCommonControllTooltip {
@@ -286,7 +286,7 @@ a.map-of-science-links {
#noPublications-header {
font-size: 1.375em;
- color: #2485ae;
+ color: #12739D;
line-height: 1.3em;
padding-top:15px;
padding-bottom:10px;
diff --git a/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css
index 719230fafe..ec71b040a4 100644
--- a/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css
+++ b/webapp/src/main/webapp/themes/nemo/css/openSocial/gadgets.css
@@ -37,7 +37,7 @@
.gadgets-gadget-title-bar {
padding: 4px 4px 2px;
background-color: #EEEBE5;
- background-color: #f1f2ee; /* #e5ecf9; */
+ background-color: #F5F5F5; /* #e5ecf9; */
}
/*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */
.gadgets-gadget-title-bar img,
@@ -49,7 +49,7 @@
.gadgets-gadget-title a, .gadgets-gadget-title a:hover, .gadgets-gadget-title a:visited {
/* font-weight: bold; */
font-size: 16px; /*14px*/
- color: #2485AE; /*#CA7C29*/
+ color: #12739D; /*#CA7C29*/
padding-left:8px; /*tlw72*/
text-decoration: none; /*tlw72*/
}
diff --git a/webapp/src/main/webapp/themes/nemo/css/wilma.css b/webapp/src/main/webapp/themes/nemo/css/wilma.css
index 3612a0cb81..d38c33aca1 100644
--- a/webapp/src/main/webapp/themes/nemo/css/wilma.css
+++ b/webapp/src/main/webapp/themes/nemo/css/wilma.css
@@ -30,7 +30,7 @@ body {
background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
}
a {
- color: #2485AE;
+ color: #12739D;
}
a:hover,
h2 a:hover,
@@ -52,7 +52,7 @@ h2 {
line-height: 1.5em;
}
h2 a {
- color: #2485ae;
+ color: #12739D;
}
h2 a:link,
h2 a:visited {
@@ -86,7 +86,7 @@ input[type="password"] {
font-size: 14px;
padding: .5em;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -128,7 +128,7 @@ input.form-button:visited {
position: relative;
border: 0;
margin: 0;
- background-color: #749a02;
+ background-color: #405503;
color: #fff;
font-size: 14px;
font-weight: normal;
@@ -176,7 +176,7 @@ input.submit:hover,
input#submit:hover,
input.form-button:hover {
color: #fff;
- background-color: #b2d15a;
+ background-color: #435A00;
}
input.delete:hover,
input#delete:hover {
@@ -197,7 +197,7 @@ section.accounts input.delete:active {
top: 1px;
}
form textarea {
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -214,7 +214,7 @@ form a:visited.cancel,
a.return:link,
a.return:visited {
text-decoration: underline;
- color: #f70;
+ color: #B50;
border-color: none;
padding-left: 3px;
}
@@ -225,7 +225,7 @@ a.return:visited {
form a:hover.cancel,
form a:active.cancel {
text-decoration: none;
- color: #f70;
+ color: #B50;
background: none;
}
.validationError {
@@ -244,13 +244,13 @@ p.submit {
padding: 3px;
}
.editingForm .entryFormHead {
- background-color: #f1f2ee;
+ background-color: #F5F5F5;
border-color: #dfe6e6;
}
.form-item {
margin-top:.3em;
background-color: #fff;
- border-color: #e0dfdf;
+ border-color: #898989;
font-size: .8em;
border-width: 1px;
color: #595B5B;
@@ -259,12 +259,12 @@ p.submit {
a.return:hover,
a.return:active {
text-decoration: none;
- color: #f70;
+ color: #B50;
background: none;
}
.database_header {
- background-color: #f1f2ee;
- color: #2485ae;
+ background-color: #F5F5F5;
+ color: #12739D;
font-size: 1em;
}
.database_upperleftcorner {
@@ -278,7 +278,7 @@ a.return:active {
}
.rownumheader,
.rownum {
- background-color: #F1F2EE;
+ background-color: #F5F5F5;
color: #5F6464;
font-size: 1em;
}
@@ -365,7 +365,7 @@ form select {
font-size: 14px;
padding: .5em;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -382,7 +382,7 @@ a.ingestMenu:visited,
a.account-menu:link,
a.account-menu:visited {
text-decoration: none;
- color: #2485AE;
+ color: #12739D;
}
a.ingestMenu:hover,
a.ingestMenu:active,
@@ -451,7 +451,7 @@ hr.formDivider {
margin: 0 auto;
}
/* BRANDING ------> */
-h1.vivo-logo {
+.vivo-logo {
position: absolute;
width: 442px;
height: 59px;
@@ -459,7 +459,7 @@ h1.vivo-logo {
left: 0;
background: url(../images/VIVO-logo.png) 0 0 no-repeat;
}
-h1.vivo-logo a {
+.vivo-logo a {
display: block;
width: 386px;
height: 59px;
@@ -489,7 +489,7 @@ ul#header-nav li:last-child {
ul#header-nav a:hover,
ul#header-nav a:active {
text-decoration: none;
- color: #999;
+ color: #656565;
}
ul#header-nav a.log-out {
padding-left: 10px;
@@ -506,7 +506,7 @@ ul#header-nav a.log-out {
#search-field {
width: 396px;
height: 38px;
- background: url(../images/search-interior-pages.png) 0 0 no-repeat;
+ background: url(../images/search-interior-pages-darkened.png) 0 0 no-repeat;
}
#search-field input.search {
text-decoration: none;
@@ -561,7 +561,7 @@ ul#main-nav {
}
#main-nav li a.selected {
color: #002b44;
- background: url(../images/selected-main-nav.jpg) left -1px no-repeat;
+ background: url(../images/selected-main-nav.png) left -1px no-repeat;
margin-left: 18px;
}
/* WRAPPER CONTENT------> */
@@ -585,7 +585,7 @@ body.loggedIn #intro {
#intro h2 {
padding: 35px 0 12px 24px;
border-bottom: none;
- color: #2485AE;
+ color: #12739D;
}
#intro p {
font-size: 16px;
@@ -603,7 +603,7 @@ p.forgot-password a,
ul#individual-personInPosition li a,
ul.individual-urls li a,
ul.individual-urls-people li a {
- color: #2485ae
+ color: #12739D
}
/* LOG IN------> */
#login {
@@ -621,13 +621,13 @@ body.login #login {
}
#login h2 {
font-size: 22px;
- color: #2485ae;
+ color: #12739D;
padding-left: 15px;
padding-top: 18px;
border-bottom: none;
}
h3.internal-auth:hover {
- color: #47B6D0;
+ color: #267C90;
}
#error-alert {
margin-left: 0;
@@ -664,7 +664,7 @@ h3.internal-auth:hover {
height: 24px;
margin-left: 38px;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -768,13 +768,13 @@ p.external-auth a.blue:hover {
padding: 0;
font-size: 22px;
margin-bottom: 15px;
- color: #2485AE;
+ color: #12739D;
padding-left: 24px;
}
#search-home-field {
width: 483px;
height: 44px;
- background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
+ background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat;
}
#search-home-field input.search {
text-decoration: none;
@@ -801,7 +801,7 @@ input.search-home-vivo {
/* SEARCH HOME------> */
#search-home-field {
- background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
+ background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat;
width: 520px;
}
#search-home-field input.search {
@@ -816,7 +816,6 @@ input.search-homepage {
border: 0;
background-color: #f9fafa;
background-position: right;
- opacity: .5;
text-align:right;
}
@@ -860,11 +859,11 @@ ul#classes-in-classgroup a:hover,
ul#classes-in-classgroup a.selected,
ul#vgraph-classes a:hover,
ul#vgraph-classes a.selected {
- background: url(../images/arrow.gif) 0 10px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 0 10px no-repeat;
+ color: #0C5E7F;
}
svg text:hover {
- color: #2EA0CF;
+ color: #0C5E7F;
}
p.view-all {
clear: both;
@@ -1101,7 +1100,7 @@ p {
.green,
ul#individual-tools li a,
ul#individual-tools-people li a {
- color: #b2d15a;
+ color: #435A00;
}
.small.button,
.small.button:visited {
@@ -1115,11 +1114,11 @@ ul#individual-tools-people li a {
}
.green.button,
.green.button:visited {
- background-color: #749a02;
+ background-color: #405503;
color: #fff;
}
.green.button:hover {
- background-color: #b2d15a;
+ background-color: #435A00;
}
.blue.button,
.blue.button:visited {
@@ -1147,11 +1146,11 @@ ul#individual-tools-people li a {
}
.individualList li,
.individualList li span {
- color: #9c9c9c;
+ color: #656565;
}
.individualList li a {
font-weight: normal;
- color: #2485AE;
+ color: #12739D;
}
/* -------------------------------------------------> */
@@ -1190,13 +1189,13 @@ ul#individual-tools-people li a {
}
#find-by h3 {
font-size: 1.125em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
}
ul#find-filters a:hover,
ul#find-filters a.selected {
- background: url(../images/arrow.gif) 0 6px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 0 6px no-repeat;
+ color: #0C5E7F;
}
/* RESEARCHERS ------> */
#researchers {
@@ -1206,9 +1205,9 @@ ul#find-filters a.selected {
}
#researchers h3 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
- background: url(../images/arrow.gif) 140px 27px no-repeat;
+ background: url(../images/arrow_darkened.gif) 140px 27px no-repeat;
}
#researchers p {
font-size: 1.125em;
@@ -1222,7 +1221,7 @@ ul#find-filters a.selected {
font-size: 4.375em;
text-align: center;
float: left;
- color: #2485ae;
+ color: #12739D;
border-right: 1px dotted #dde4e3;
font-weight: bold;
}
@@ -1234,7 +1233,7 @@ ul#find-filters a.selected {
}
#nav-display p {
font-size: 26px;
- color: #2485ae;
+ color: #12739D;
}
#nav-display img {
border-left: 1px solid #e8e8e8;
@@ -1252,7 +1251,7 @@ ul#find-filters a.selected {
ul#browse-classes {
border: 1px solid #dde4e3;
border-right: 0;
- background-color: #f1f2ee;
+ background-color: #F5F5F5;
}
ul#browse-classes li,
ul#vgraph-classes li {
@@ -1261,8 +1260,8 @@ ul#vgraph-classes li {
}
ul#browse-classes a:hover,
ul#browse-classes a.selected {
- background: url(../images/arrow.gif) 4px 5px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 4px 5px no-repeat;
+ color: #0C5E7F;
}
ul#browse-classes .count-classes {
font-size: 12px;
@@ -1273,8 +1272,8 @@ ul#alpha-browse-individuals {
}
ul#alpha-browse-individuals a:hover,
ul#alpha-browse-individuals a.selected {
- background: url(../images/arrowSmall.gif) -3px 7px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrowSmall-darkened.gif) -3px 7px no-repeat;
+ color: #0C5E7F;
}
ul#alpha-browse-individuals .count-classes,
ul#vgraph-classes .count-classes {
@@ -1352,7 +1351,7 @@ article.property ul.property-list {
background-color: #f2f9fb;
}
#admin h3 {
- background: #2485AE;
+ background: #12739D;
color: #fff;
}
#admin .uri-link,
@@ -1360,7 +1359,7 @@ article.property ul.property-list {
color: #888c8c;
}
#admin a {
- color: #2a98bc;
+ color: #12739D;
}
/* INDIVIDUAL INTRO FOR ANY CLASS ------> */
.preferred {
@@ -1368,7 +1367,7 @@ article.property ul.property-list {
}
#individual-intro h1 {
font-size: 1.375em;
- color: #2485ae;
+ color: #12739D;
}
#individual-intro span.display-title,
h1.fn .display-title {
@@ -1377,7 +1376,7 @@ h1.fn .display-title {
border-left: 1px solid #a6b1b0;
}
ul#individual-tools {
- color: #8AA149;
+ color: #536520;
}
h2#webpage {
font-weight: bold;
@@ -1391,7 +1390,7 @@ img.individual-photo {
display: block;
}
ul#individual-tools {
- color: #8AA149
+ color: #536520
}
#share-contact a.email,
#share-contact a.tel,
@@ -1465,7 +1464,7 @@ a.all-vivo-publications {
/* <------ TEMPORAL GRAPH and MAP O' SCIENCE */
#temporal-graph h3 a,
#map-of-science h3 a {
- color: #2485AE;
+ color: #12739D;
font-size: .8em !important;
text-decoration: underline;
vertical-align:text-top;
@@ -1477,12 +1476,12 @@ img.co-author {
#co-authors h3,
#right-hand-column h3 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
}
/* PROPERTY GROUP MENU ------> */
#property-group-menu {
width: 920px;
- background: #f1f2ee;
+ background: #F5F5F5;
}
#property-group-menu li {
background: url(../../../images/individual/separator-property-group-nav.jpg) right 10px no-repeat;
@@ -1497,7 +1496,7 @@ img.co-author {
section.property-group h2,
#menupage-content h4 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
}
article.property {
@@ -1506,7 +1505,7 @@ article.property {
article.property h3 {
background: #fafaf9;
font-size: 1.063em;
- color: #8aa149;
+ color: #536520;
}
article.property ul.property-list li.subclass h3 {
font-size: 1.063em;
@@ -1518,7 +1517,7 @@ article.property .data-property-statement {
color: #5e6363;
}
article.property ul.property-list li a {
- /*color: #2485ae;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */
+ /*color: #12739D;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */
line-height: 1.6em;
}
/* MISCELLANEOUS ------> */
@@ -1543,7 +1542,7 @@ p.address-line {
}
/* EDITING DISPLAY------> */
.edit-individual {
- border-left: 1px dotted #B2D15A;
+ border-left: 1px dotted #435A00;
}
/* -------------------------------------------------> */
/* SITE ADMIN DASHBOARD ----------------------------> */
@@ -1587,7 +1586,7 @@ p.address-line {
}
#revision-levels caption {
font-size: 18px;
- color: #2485ae;
+ color: #12739D;
}
#revision-levels th {
font-weight: bold;
@@ -1640,7 +1639,7 @@ form.customForm p {
section.accounts input.delete,
section.accounts input.delete:visited {
background-color: #FFF;
- color: #2485AE;
+ color: #12739D;
border: 1px solid #96c5da;
}
section.accounts input.delete:hover {
@@ -1661,7 +1660,7 @@ input.add-account:hover {
}
.disabledSubmit {
color: #ede ! important;
- background-color: #b2d15a ! important;
+ background-color: #435A00 ! important;
cursor: default ! important;
}
/* -------------------------------------------------> */
diff --git a/webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif b/webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif
new file mode 100644
index 0000000000..2ed7e47d12
Binary files /dev/null and b/webapp/src/main/webapp/themes/nemo/images/arrowSmall-darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/nemo/images/arrow_darkened.gif b/webapp/src/main/webapp/themes/nemo/images/arrow_darkened.gif
new file mode 100644
index 0000000000..bed5473dca
Binary files /dev/null and b/webapp/src/main/webapp/themes/nemo/images/arrow_darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/nemo/images/search-field-and-button-darkened.gif b/webapp/src/main/webapp/themes/nemo/images/search-field-and-button-darkened.gif
new file mode 100644
index 0000000000..28419cfd62
Binary files /dev/null and b/webapp/src/main/webapp/themes/nemo/images/search-field-and-button-darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png b/webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png
new file mode 100644
index 0000000000..40e55fe29e
Binary files /dev/null and b/webapp/src/main/webapp/themes/nemo/images/search-interior-pages-darkened.png differ
diff --git a/webapp/src/main/webapp/themes/nemo/js/homePageUtils.js b/webapp/src/main/webapp/themes/nemo/js/homePageUtils.js
index 72ee75fb49..a977104913 100644
--- a/webapp/src/main/webapp/themes/nemo/js/homePageUtils.js
+++ b/webapp/src/main/webapp/themes/nemo/js/homePageUtils.js
@@ -102,7 +102,7 @@ $(document).ready(function(){
$.each($('div#research-faculty-mbrs div.item a.faculty-mbrs '), function() {
if ( $(this).children('img').length == 0 ) {
- var imgHtml = "
";
+ var imgHtml = "
";
$(this).prepend(imgHtml);
}
else {
@@ -115,7 +115,7 @@ $(document).ready(function(){
+ urlsBase
+ "/people#http://vivoweb.org/ontology/core#FacultyMember' alt='"
+ i18nStrings.viewAllFaculty + "'>"
- + i18nStrings.viewAllString + "";
+ + i18nStrings.i18nStrings.viewAllFaculty.charAt(0).toUpperCase() + i18nStrings.viewAllFaculty.slice(1) + "...";
//var viewMore = "
+
#if>
diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl
index b7288b535b..65a6c5207c 100644
--- a/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/nemo/templates/individual--foaf-person.ftl
@@ -98,7 +98,7 @@ Add divs and wrapper to create funnelback basket controls. MUST BE REMOVED BEFOR
+
<#if checkNamesResult?has_content >
${qrCodeLinkedImage!}
diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual-custom-visualizationFoafPerson.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual-custom-visualizationFoafPerson.ftl
index edf94e880e..b5b328bcda 100644
--- a/webapp/src/main/webapp/themes/nemo/templates/individual-custom-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/themes/nemo/templates/individual-custom-visualizationFoafPerson.ftl
@@ -65,7 +65,7 @@
<#if isInvestigator>
diff --git a/webapp/src/main/webapp/themes/nemo/templates/individual-property-group-tabs.ftl b/webapp/src/main/webapp/themes/nemo/templates/individual-property-group-tabs.ftl
index 10036a0928..eb9bf7d8df 100644
--- a/webapp/src/main/webapp/themes/nemo/templates/individual-property-group-tabs.ftl
+++ b/webapp/src/main/webapp/themes/nemo/templates/individual-property-group-tabs.ftl
@@ -73,7 +73,7 @@
<#--
-->
diff --git a/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl b/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl
index 04755e2fcc..d75ca850f9 100644
--- a/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl
+++ b/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceSetup.ftl
@@ -47,7 +47,7 @@ var mapOfScienceImageFolderPrefix = imageFolderPrefix + "mapofscience/";
var disciplineLabelImageUrlPrefix = mapOfScienceImageFolderPrefix + "labels/";
var disciplineBlackLabelImageUrlPrefix = disciplineLabelImageUrlPrefix + "black/";
-var infoIconUrl = "${urls.images}/iconInfo.png";
+var infoIconUrl = "${urls.images}/iconInfo-darkened.png";
var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png";
var entityLabel = '${entityLabel}';
diff --git a/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceStandalone.ftl b/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceStandalone.ftl
index 618d2726ae..f3da948adf 100644
--- a/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceStandalone.ftl
+++ b/webapp/src/main/webapp/themes/nemo/templates/mapOfScienceStandalone.ftl
@@ -22,7 +22,7 @@ corresponding changes in the included Templates. -->
${entityLabel}
![]()
+ ![]()
${i18n().compare_organizations} <#--/ people -->
- ![]()
+ ![]()
+
+
<#if checkNamesResult?has_content >
+
<#if checkNamesResult?has_content >
${qrCodeLinkedImage!}
diff --git a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
index 0998e5350b..67f85b16fe 100644
--- a/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
+++ b/webapp/src/main/webapp/themes/wilma/css/openSocial/gadgets.css
@@ -37,7 +37,7 @@
.gadgets-gadget-title-bar {
padding: 4px 4px 2px;
background-color: #EEEBE5;
- background-color: #f1f2ee; /* #e5ecf9; */
+ background-color: #F5F5F5; /* #e5ecf9; */
}
/*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */
.gadgets-gadget-title-bar img,
@@ -49,7 +49,7 @@
.gadgets-gadget-title a, .gadgets-gadget-title a:hover, .gadgets-gadget-title a:visited {
/* font-weight: bold; */
font-size: 16px; /*14px*/
- color: #2485AE; /*#CA7C29*/
+ color: #12739D; /*#CA7C29*/
padding-left:8px; /*tlw72*/
text-decoration: none; /*tlw72*/
}
diff --git a/webapp/src/main/webapp/themes/wilma/css/wilma.css b/webapp/src/main/webapp/themes/wilma/css/wilma.css
index 0a7c4fdb26..330305a594 100644
--- a/webapp/src/main/webapp/themes/wilma/css/wilma.css
+++ b/webapp/src/main/webapp/themes/wilma/css/wilma.css
@@ -30,7 +30,7 @@ body {
background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
}
a {
- color: #2485AE;
+ color: #12739D;
}
a:hover,
h2 a:hover,
@@ -52,7 +52,7 @@ h2 {
line-height: 1.5em;
}
h2 a {
- color: #2485ae;
+ color: #12739D;
}
h2 a:link,
h2 a:visited {
@@ -86,7 +86,7 @@ input[type="password"] {
font-size: 14px;
padding: .5em;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -128,7 +128,7 @@ input.form-button:visited {
position: relative;
border: 0;
margin: 0;
- background-color: #749a02;
+ background-color: #405503;
color: #fff;
font-size: 14px;
font-weight: normal;
@@ -176,7 +176,7 @@ input.submit:hover,
input#submit:hover,
input.form-button:hover {
color: #fff;
- background-color: #b2d15a;
+ background-color: #435A00;
}
input.delete:hover,
input#delete:hover {
@@ -197,7 +197,7 @@ section.accounts input.delete:active {
top: 1px;
}
form textarea {
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -214,7 +214,7 @@ form a:visited.cancel,
a.return:link,
a.return:visited {
text-decoration: underline;
- color: #f70;
+ color: #B50;
border-color: none;
padding-left: 3px;
}
@@ -225,7 +225,7 @@ a.return:visited {
form a:hover.cancel,
form a:active.cancel {
text-decoration: none;
- color: #f70;
+ color: #B50;
background: none;
}
.validationError {
@@ -244,13 +244,13 @@ p.submit {
padding: 3px;
}
.editingForm .entryFormHead {
- background-color: #f1f2ee;
+ background-color: #F5F5F5;
border-color: #dfe6e6;
}
.form-item {
margin-top:.3em;
background-color: #fff;
- border-color: #e0dfdf;
+ border-color: #898989;
font-size: .8em;
border-width: 1px;
color: #595B5B;
@@ -259,12 +259,12 @@ p.submit {
a.return:hover,
a.return:active {
text-decoration: none;
- color: #f70;
+ color: #B50;
background: none;
}
.database_header {
- background-color: #f1f2ee;
- color: #2485ae;
+ background-color: #F5F5F5;
+ color: #12739D;
font-size: 1em;
}
.database_upperleftcorner {
@@ -278,7 +278,7 @@ a.return:active {
}
.rownumheader,
.rownum {
- background-color: #F1F2EE;
+ background-color: #F5F5F5;
color: #5F6464;
font-size: 1em;
}
@@ -365,7 +365,7 @@ form select {
font-size: 14px;
padding: .5em;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -382,7 +382,7 @@ a.ingestMenu:visited,
a.account-menu:link,
a.account-menu:visited {
text-decoration: none;
- color: #2485AE;
+ color: #12739D;
}
a.ingestMenu:hover,
a.ingestMenu:active,
@@ -451,7 +451,7 @@ hr.formDivider {
margin: 0 auto;
}
/* BRANDING ------> */
-h1.vivo-logo {
+.vivo-logo {
position: absolute;
width: 442px;
height: 59px;
@@ -459,7 +459,7 @@ h1.vivo-logo {
left: 0;
background: url(../images/VIVO-logo.png) 0 0 no-repeat;
}
-h1.vivo-logo a {
+.vivo-logo a {
display: block;
width: 386px;
height: 59px;
@@ -506,7 +506,7 @@ ul#header-nav a.log-out {
#search-field {
width: 396px;
height: 38px;
- background: url(../images/search-interior-pages.png) 0 0 no-repeat;
+ background: url(../images/search-interior-pages-darkened.png) 0 0 no-repeat;
}
#search-field input.search {
text-decoration: none;
@@ -561,7 +561,7 @@ ul#main-nav {
}
#main-nav li a.selected {
color: #002b44;
- background: url(../images/selected-main-nav.jpg) left -1px no-repeat;
+ background: url(../images/selected-main-nav.png) left -1px no-repeat;
margin-left: 18px;
}
/* WRAPPER CONTENT------> */
@@ -585,7 +585,7 @@ body.loggedIn #intro {
#intro h2 {
padding: 35px 0 12px 24px;
border-bottom: none;
- color: #2485AE;
+ color: #12739D;
}
#intro p {
font-size: 16px;
@@ -603,7 +603,7 @@ p.forgot-password a,
ul#individual-personInPosition li a,
ul.individual-urls li a,
ul.individual-urls-people li a {
- color: #2485ae
+ color: #12739D
}
/* LOG IN------> */
#login {
@@ -621,13 +621,13 @@ body.login #login {
}
#login h2 {
font-size: 22px;
- color: #2485ae;
+ color: #12739D;
padding-left: 15px;
padding-top: 18px;
border-bottom: none;
}
h3.internal-auth:hover {
- color: #47B6D0;
+ color: #267C90;
}
#error-alert {
margin-left: 0;
@@ -664,7 +664,7 @@ h3.internal-auth:hover {
height: 24px;
margin-left: 38px;
background: #fff;
- border: 1px solid #e0dfdf;
+ border: 1px solid #898989;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -769,13 +769,13 @@ p.external-auth a.blue:hover {
padding: 0;
font-size: 22px;
margin-bottom: 15px;
- color: #2485AE;
+ color: #12739D;
padding-left: 24px;
}
#search-home-field {
width: 483px;
height: 44px;
- background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
+ background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat;
}
#search-home-field input.search {
text-decoration: none;
@@ -802,7 +802,7 @@ input.search-home-vivo {
/* SEARCH HOME------> */
#search-home-field {
- background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
+ background: url(../images/search-field-and-button-darkened.gif) 0 0 no-repeat;
width: 520px;
}
#search-home-field input.search {
@@ -861,11 +861,11 @@ ul#classes-in-classgroup a:hover,
ul#classes-in-classgroup a.selected,
ul#vgraph-classes a:hover,
ul#vgraph-classes a.selected {
- background: url(../images/arrow.gif) 0 10px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 0 10px no-repeat;
+ color: #0C5E7F;
}
svg text:hover {
- color: #2EA0CF;
+ color: #0C5E7F;
}
p.view-all {
clear: both;
@@ -1075,12 +1075,12 @@ ul#individual-facultyMemberships li:last-child {
#footer-nav a:hover,
a.terms,
a.powered-by-vivo {
- color: #09C;
+ color: #13475D;
text-decoration: none;
}
a.terms:hover,
a.powered-by-vivo:hover {
- color: #4e5051;
+ color: #0e303f;
text-decoration: none;
}
p {
@@ -1109,7 +1109,7 @@ p {
.green,
ul#individual-tools li a,
ul#individual-tools-people li a {
- color: #b2d15a;
+ color: #435A00;
}
.small.button,
.small.button:visited {
@@ -1123,11 +1123,11 @@ ul#individual-tools-people li a {
}
.green.button,
.green.button:visited {
- background-color: #749a02;
+ background-color: #405503;
color: #fff;
}
.green.button:hover {
- background-color: #b2d15a;
+ background-color: #435A00;
}
.blue.button,
.blue.button:visited {
@@ -1155,11 +1155,11 @@ ul#individual-tools-people li a {
}
.individualList li,
.individualList li span {
- color: #9c9c9c;
+ color: #656565;
}
.individualList li a {
font-weight: normal;
- color: #2485AE;
+ color: #12739D;
}
/* -------------------------------------------------> */
@@ -1198,13 +1198,13 @@ ul#individual-tools-people li a {
}
#find-by h3 {
font-size: 1.125em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
}
ul#find-filters a:hover,
ul#find-filters a.selected {
- background: url(../images/arrow.gif) 0 6px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 0 6px no-repeat;
+ color: #0C5E7F;
}
/* RESEARCHERS ------> */
#researchers {
@@ -1214,9 +1214,9 @@ ul#find-filters a.selected {
}
#researchers h3 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
- background: url(../images/arrow.gif) 140px 27px no-repeat;
+ background: url(../images/arrow_darkened.gif) 140px 27px no-repeat;
}
#researchers p {
font-size: 1.125em;
@@ -1230,7 +1230,7 @@ ul#find-filters a.selected {
font-size: 4.375em;
text-align: center;
float: left;
- color: #2485ae;
+ color: #12739D;
border-right: 1px dotted #dde4e3;
font-weight: bold;
}
@@ -1242,7 +1242,7 @@ ul#find-filters a.selected {
}
#nav-display p {
font-size: 26px;
- color: #2485ae;
+ color: #12739D;
}
#nav-display img {
border-left: 1px solid #e8e8e8;
@@ -1260,7 +1260,7 @@ ul#find-filters a.selected {
ul#browse-classes {
border: 1px solid #dde4e3;
border-right: 0;
- background-color: #f1f2ee;
+ background-color: #F5F5F5;
}
ul#browse-classes li,
ul#vgraph-classes li {
@@ -1269,8 +1269,8 @@ ul#vgraph-classes li {
}
ul#browse-classes a:hover,
ul#browse-classes a.selected {
- background: url(../images/arrow.gif) 4px 5px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrow_darkened.gif) 4px 5px no-repeat;
+ color: #0C5E7F;
}
ul#browse-classes .count-classes {
font-size: 12px;
@@ -1281,8 +1281,8 @@ ul#alpha-browse-individuals {
}
ul#alpha-browse-individuals a:hover,
ul#alpha-browse-individuals a.selected {
- background: url(../images/arrowSmall.gif) -3px 7px no-repeat;
- color: #2ea0cf;
+ background: url(../images/arrowSmall-darkened.gif) -3px 7px no-repeat;
+ color: #0C5E7F;
}
ul#alpha-browse-individuals .count-classes,
ul#vgraph-classes .count-classes {
@@ -1360,7 +1360,7 @@ article.property ul.property-list {
background-color: #f2f9fb;
}
#admin h3 {
- background: #2485AE;
+ background: #12739D;
color: #fff;
}
#admin .uri-link,
@@ -1368,7 +1368,7 @@ article.property ul.property-list {
color: #888c8c;
}
#admin a {
- color: #2a98bc;
+ color: #12739D;
}
/* INDIVIDUAL INTRO FOR ANY CLASS ------> */
.preferred {
@@ -1376,7 +1376,7 @@ article.property ul.property-list {
}
#individual-intro h1 {
font-size: 1.375em;
- color: #2485ae;
+ color: #12739D;
}
#individual-intro span.display-title,
h1.fn .display-title {
@@ -1385,7 +1385,7 @@ h1.fn .display-title {
border-left: 1px solid #a6b1b0;
}
ul#individual-tools {
- color: #8AA149;
+ color: #536520;
}
h2#webpage {
font-weight: bold;
@@ -1399,7 +1399,7 @@ img.individual-photo {
display: block;
}
ul#individual-tools {
- color: #8AA149
+ color: #536520
}
#share-contact a.email,
#share-contact a.tel,
@@ -1426,7 +1426,7 @@ ul.individual-urls-people {
h2#mainImage,
#share-contact h2,
h3.internal-auth {
- color: #5e6363;
+ color: #1d1d1d;
}
#individual-info h1.fn {
font-size: 1.375em;
@@ -1473,7 +1473,7 @@ a.all-vivo-publications {
/* <------ TEMPORAL GRAPH and MAP O' SCIENCE */
#temporal-graph h3 a,
#map-of-science h3 a {
- color: #2485AE;
+ color: #12739D;
font-size: .8em !important;
text-decoration: underline;
vertical-align:text-top;
@@ -1485,12 +1485,12 @@ img.co-author {
#co-authors h3,
#right-hand-column h3 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
}
/* PROPERTY GROUP MENU ------> */
#property-group-menu {
width: 920px;
- background: #f1f2ee;
+ background: #F5F5F5;
}
#property-group-menu li {
background: url(../../../images/individual/separator-property-group-nav.jpg) right 10px no-repeat;
@@ -1505,7 +1505,7 @@ img.co-author {
section.property-group h2,
#menupage-content h4 {
font-size: 1.25em;
- color: #2485ae;
+ color: #12739D;
font-weight: normal;
}
article.property {
@@ -1514,7 +1514,7 @@ article.property {
article.property h3 {
background: #fafaf9;
font-size: 1.063em;
- color: #8aa149;
+ color: #536520;
}
article.property ul.property-list li.subclass h3 {
font-size: 1.063em;
@@ -1526,7 +1526,7 @@ article.property .data-property-statement {
color: #5e6363;
}
article.property ul.property-list li a {
- /*color: #2485ae;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */
+ /*color: #12739D;*/ /* cappadona: seems unnecessarily specific and is overriding .more-less from individual.css so I'm commenting out for now */
line-height: 1.6em;
}
/* MISCELLANEOUS ------> */
@@ -1554,7 +1554,7 @@ p.address-line {
}
/* EDITING DISPLAY------> */
.edit-individual {
- border-left: 1px dotted #B2D15A;
+ border-left: 1px dotted #435A00;
}
/* -------------------------------------------------> */
/* SITE ADMIN DASHBOARD ----------------------------> */
@@ -1598,7 +1598,7 @@ p.address-line {
}
#revision-levels caption {
font-size: 18px;
- color: #2485ae;
+ color: #12739D;
}
#revision-levels th {
font-weight: bold;
@@ -1651,7 +1651,7 @@ form.customForm p {
section.accounts input.delete,
section.accounts input.delete:visited {
background-color: #FFF;
- color: #2485AE;
+ color: #12739D;
border: 1px solid #96c5da;
}
section.accounts input.delete:hover {
@@ -1672,7 +1672,7 @@ input.add-account:hover {
}
.disabledSubmit {
color: #ede ! important;
- background-color: #b2d15a ! important;
+ background-color: #435A00 ! important;
cursor: default ! important;
}
/* -------------------------------------------------> */
diff --git a/webapp/src/main/webapp/themes/wilma/images/arrowSmall-darkened.gif b/webapp/src/main/webapp/themes/wilma/images/arrowSmall-darkened.gif
new file mode 100644
index 0000000000..2ed7e47d12
Binary files /dev/null and b/webapp/src/main/webapp/themes/wilma/images/arrowSmall-darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/wilma/images/arrow_darkened.gif b/webapp/src/main/webapp/themes/wilma/images/arrow_darkened.gif
new file mode 100644
index 0000000000..bed5473dca
Binary files /dev/null and b/webapp/src/main/webapp/themes/wilma/images/arrow_darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/wilma/images/search-field-and-button-darkened.gif b/webapp/src/main/webapp/themes/wilma/images/search-field-and-button-darkened.gif
new file mode 100644
index 0000000000..28419cfd62
Binary files /dev/null and b/webapp/src/main/webapp/themes/wilma/images/search-field-and-button-darkened.gif differ
diff --git a/webapp/src/main/webapp/themes/wilma/images/search-interior-pages-darkened.png b/webapp/src/main/webapp/themes/wilma/images/search-interior-pages-darkened.png
new file mode 100644
index 0000000000..40e55fe29e
Binary files /dev/null and b/webapp/src/main/webapp/themes/wilma/images/search-interior-pages-darkened.png differ
diff --git a/webapp/src/main/webapp/themes/wilma/images/selected-main-nav.png b/webapp/src/main/webapp/themes/wilma/images/selected-main-nav.png
new file mode 100644
index 0000000000..88396f9754
Binary files /dev/null and b/webapp/src/main/webapp/themes/wilma/images/selected-main-nav.png differ
diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
index 86daf9a4b6..f134ba977a 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
@@ -44,7 +44,7 @@
+
<#if checkNamesResult?has_content >
${qrCodeLinkedImage!}