diff --git a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
index adb9b848..106a4ec3 100755
--- a/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
+++ b/webapp/src/main/webapp/css/visualization/capabilitymap/graph.css
@@ -246,17 +246,17 @@ ul.visible {
position:relative;
top:-2px;
}
-.progress, .progress div {
+.capability-progress, .capability-progress div {
height:10px;
margin-bottom:-10px;
}
-.progress {
+.capability-progress {
position:absolute;
top:0px;
left:0px;
width:100%;
}
-.progress div {
+.capability-progress div {
background-color:#9999FF;
width:0%;
white-space:nowrap;
@@ -268,7 +268,7 @@ hr {
background:#efefef;
}
.tabs {
- width: auto;
+ width: 300px;
margin-bottom: 15px;
border: 0;
z-index: 10;
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 a1e01a19..1b987e53 100755
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
@@ -1009,7 +1009,7 @@ var unhide = function() {
$("#resetButton").removeAttr("disabled");
if ($(window).width() > 1230) {
$("#container").css("box-shadow", "0px 0px 20px -6px #000000");
- $("#container").animate({"height" : "600px", "width" : "1200px", "margin-left" : "-130px"}, 500);
+ $("#container").animate({"height" : "600px", "width" : "1200px", "margin-bottom" : "20px", "margin-left" : (($("#main-content").width() - 1200) / 2) + "px"}, 500);
$("#center-container").css("width", "900px");
} else {
$("#container").animate({"height" : "600px"});
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
index 53bc40e4..dc615cf9 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
@@ -112,7 +112,7 @@ ${stylesheets.add(
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
index d84e11c2..a31b8a2d 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css
@@ -77,13 +77,19 @@ article.property li h3 {
}
#individual-intro span.display-title {
- padding-left: 10px;
+ padding-left: 0px;
margin-left: 10px;
}
-#individual-intro span.display-title, h1.fn .display-title {
+#individual-intro h1.foaf-person span.display-title {
font-size: .825em;
border-left: 1px solid #a6b1b0;
+ padding-left: 10px;
+}
+
+#individual-intro h2 {
+ clear: both;
+ margin-left: 10px;
}
ul#individual-hasResearchArea li,
diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
index 8d578c6c..c240c44f 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
+++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css
@@ -277,4 +277,25 @@ h5 {
margin: 0;
font-size: .875em;
color: #064d68;
-}
\ No newline at end of file
+}
+label {
+ display: block;
+}
+#developerPanel h1 {
+ line-height: 1.5em;
+}
+#developerPanel .container {
+ width: auto;
+}
+
+table.classHierarchy {
+ min-width: auto;
+ max-width: none;
+ display: block;
+ margin-right: 0px;
+}
+
+
+section#container div {
+ width: auto;
+}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/alert-overlay.png b/webapp/src/main/webapp/themes/tenderfoot/images/alert-overlay.png
new file mode 100644
index 00000000..222cdc91
Binary files /dev/null and b/webapp/src/main/webapp/themes/tenderfoot/images/alert-overlay.png differ
diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/arrow.gif b/webapp/src/main/webapp/themes/tenderfoot/images/arrow.gif
new file mode 100644
index 00000000..8d9199e7
Binary files /dev/null and b/webapp/src/main/webapp/themes/tenderfoot/images/arrow.gif differ
diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownAccount.gif b/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownAccount.gif
new file mode 100644
index 00000000..0f5463eb
Binary files /dev/null and b/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownAccount.gif differ
diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownOverAccount.gif b/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownOverAccount.gif
new file mode 100644
index 00000000..4db412c9
Binary files /dev/null and b/webapp/src/main/webapp/themes/tenderfoot/images/arrowDownOverAccount.gif differ
diff --git a/webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall.gif b/webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall.gif
new file mode 100644
index 00000000..1e050cd4
Binary files /dev/null and b/webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall.gif differ
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
index 3d4e345c..a69773a8 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
@@ -82,10 +82,9 @@
- <#include "individual-adminPanel.ftl">
-
+
<#include "individual-positions.ftl">
-
+
<#include "individual-researchAreas.ftl">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
index 81ac0025..6d1dda9c 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
@@ -30,6 +30,7 @@
<#include "identity.ftl">
+ <#include "developer.ftl">
<#include "menu.ftl">
<#include "message.ftl">
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
index 571a7c94..7b986aa3 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
@@ -12,22 +12,11 @@
<#include "identity.ftl">
- <#include "menu.ftl">
+ <#include "developer.ftl">
+ <#include "menu.ftl">
<#include "message.ftl">
- <#if flash?has_content>
- <#if flash?starts_with(i18n().menu_welcomestart) >
-
- <#else>
-
- #if>
- #if>
-