From 06b792deed4add851a767c3019edf97c30a9b9b1 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Wed, 7 Jun 2017 22:24:11 +0100
Subject: [PATCH] Tenderfoot improvements

---
 .../css/visualization/capabilitymap/graph.css |   8 +++---
 .../visualization/capabilitymap/graph_new.js  |   2 +-
 .../capabilitymap/capabilityMap.ftl           |   2 +-
 .../themes/tenderfoot/css/page-individual.css |  10 ++++++--
 .../themes/tenderfoot/css/tenderfoot.css      |  23 +++++++++++++++++-
 .../tenderfoot/images/alert-overlay.png       | Bin 0 -> 135 bytes
 .../webapp/themes/tenderfoot/images/arrow.gif | Bin 0 -> 294 bytes
 .../tenderfoot/images/arrowDownAccount.gif    | Bin 0 -> 175 bytes
 .../images/arrowDownOverAccount.gif           | Bin 0 -> 56 bytes
 .../themes/tenderfoot/images/arrowSmall.gif   | Bin 0 -> 281 bytes
 .../individual/individual--foaf-person.ftl    |   5 ++--
 .../tenderfoot/templates/page/page-home.ftl   |   1 +
 .../themes/tenderfoot/templates/page/page.ftl |  15 ++----------
 13 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/alert-overlay.png
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrow.gif
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrowDownAccount.gif
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrowDownOverAccount.gif
 create mode 100644 webapp/src/main/webapp/themes/tenderfoot/images/arrowSmall.gif

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(
         <div id="center-container">
             <div id="log"></div>
             <div id="infovis"></div>
-            <div class="progress"><div id="progressbar"></div></div>
+            <div class="capability-progress"><div id="progressbar"></div></div>
         </div>
 
         <div id="right-container">
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 0000000000000000000000000000000000000000..222cdc9131383dbb710de07fbb1833879ad9bebf
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^j6iI}!3HGf{@&OHq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6={09IEGZ*O8WQz|9)m+X6D2776%(nxhnsAD5^a9YrmG;
h!*Z2f?2Jr23}w1TDGooh7XURec)I$ztaD0e0s!~ADr5iv

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8d9199e7a80fb38338440e88af34f88bab44fa43
GIT binary patch
literal 294
zcmZ?wbhEHb<YM4uxT?gk?Q+tVOYv{N+}wOAcFU!>omVsOzu9&2e)oxcoo~Ke`|<nz
zy*E2IU5tMF_2%=BXWxCjefHs$pT9po`*8Bvhf{Z6ZN2q!{iAmWj^Ay6_;&w|7i;dn
z*?r^1>Rs2eZoXK%`&#b9xBGTo%ieS`>i_@$4734?KUo+V7?c=vK*odo#K7k4Fmb~p
z0jbt*f#roFff5S^JPPi(EWVulT&q^bxKUf9u%*D(&GVtx1rGIw*AJAp99hh=OF;2D
Tx2U)xqlB-LAUm6{BZD;niN|nG

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..0f5463ebaa8ae4b7964f0e3a94a809cac6de77c7
GIT binary patch
literal 175
zcmZ?wbhEHb6lY*(IKsg2`Rg~!*!;#BORn5`U>uPxWE*_*!IMv4zCC~Q?$WLMN6ue;
z|LKcSc-F@+U-_&8xy<}bBXh6cf5c?q@&EsS1|opsPZmZ724MyrkXn$P46Hf}6naxM
wHG@~J^Guw^v+3N*k9&klF4R1k(ZZH5v9nj<km5&nMveK+2Oe2+Gcs5M0KHZ{-2eap

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..4db412c98e4a7c72eb0d1efb1f80d5f480da2754
GIT binary patch
literal 56
zcmZ?wbhEHb6lY*(XkcLY4+e@qSr{1@7#VaJfPfb$!@$Jf(l37U;hH<yLCd<7*CmKE
GSOWm*ZV`R}

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1e050cd48dd5c4a19c5fd20b6a79b44ce5700ef5
GIT binary patch
literal 281
zcmZ?wbhEHbWM|-HxT?>v_eSyMrwjMqD7yG~&bsqKJFjGX`u_Oe|Gzt~W*)j-d-!(!
z`)~LD|Nr;%_ov&hHa-7%=Kh=A8!tqxJs<e>=c_g6{9b%K_v-Vdqj#EiTuncIul?iq
zN1HB2z5jaW#mBR|ujOvM5dQ7wtM%uDfBpIL^uw_Wk7vL9bpFea7iS+%I)1lp-MPSh
zH;UJt4_<#h<ln!)|G|KPM4<SSg^__lpFszt59B8XHnRiMH4YT+jhpJ|m1^On*D}@N
tah7kuM1h1tlS;cuM;1EX+F;Osv2&}|6bU|7)<nx~4m0~cin1_R0|4NjjNAYK

literal 0
HcmV?d00001

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 @@
 			</div>
 			<div class="row person-details">
 				<div class="col-md-12">
-					<#include "individual-adminPanel.ftl">
-                        <!-- Positions -->
+					<!-- Positions -->
 					<#include "individual-positions.ftl">
-                        <!-- Research Areas -->
+					<!-- Research Areas -->
 					<#include "individual-researchAreas.ftl">
 				</div>
 			</div>
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 @@
 		<header id="branding" role="banner">
 			<#include "identity.ftl">
 		</header>
+        <#include "developer.ftl">
         <#include "menu.ftl">
         <#include "message.ftl">
         <div class="row hero">
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 @@
 		<header id="branding" role="banner" -->
 			<#include "identity.ftl">
 		</header>
-        <#include "menu.ftl">
+		<#include "developer.ftl">
+		<#include "menu.ftl">
 		<#include "message.ftl">
 
 		<div id="wrapper-content" role="main" class="container">        
-			<#if flash?has_content>
-				<#if flash?starts_with(i18n().menu_welcomestart) >
-					<section  id="welcome-msg-container" role="container">
-						<section  id="welcome-message" role="alert">${flash}</section>
-					</section>
-				<#else>
-					<section id="flash-message" role="alert">
-						${flash}
-					</section>
-				</#if>
-			</#if>
-			
 			<!--[if lte IE 8]>
 			<noscript>
 				<p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com"  title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>