From bc0ddf61d3ba190e05ce93672270009170e04806 Mon Sep 17 00:00:00 2001
From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 16 Apr 2015 18:33:37 +0200
Subject: [PATCH] small cosmetic changes to slice/project forms

---
 portal/static/css/fed4fire.css                            | 5 +++++
 portal/templates/fed4fire/fed4fire_home-view.html         | 8 ++++----
 portal/templates/fed4fire/fed4fire_institution.html       | 2 +-
 .../templates/fed4fire/fed4fire_projectrequest_view.html  | 4 +++-
 portal/templates/fed4fire/fed4fire_slicerequest_view.html | 8 ++++----
 portal/templates/fed4fire/fed4fire_widget-topmenu.html    | 4 ++--
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css
index 2d83fcd7..712c7233 100644
--- a/portal/static/css/fed4fire.css
+++ b/portal/static/css/fed4fire.css
@@ -674,6 +674,7 @@ div.home h3, div.home h4 {
     color:#424242;
     line-height:1.4em;
 }
+
 div.home h3 a {
     color:#FD6D2C;
 }
@@ -682,6 +683,7 @@ div.dashboard {
 div.dashboard a {
     color:#206090;
 }
+
 div.dashboard a:hover {
     text-decoration:underline;
 }
@@ -714,6 +716,9 @@ div.dashboard h3 {
     margin-right:15px;
     margin-bottom:25px;
 }
+div.dashboard h3 a {
+     color:#201E62;
+}
 div.dashboard h3 img {
     margin:15px 15px 15px 0;
 }
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index c278a1d1..5e6a5108 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -26,7 +26,7 @@
     <div class="row">
         <div class="col-sm-4">
             <h3>
-                <a href="/portal/slice_request"><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" /></a>EXPERIMENT
+                <img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" />EXPERIMENT
             </h3>
             <div>
                 <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
@@ -67,7 +67,7 @@
             <div class="row">
                 <div class="col-sm-12">
                     <h3>
-                        <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /></a>ACCOUNT
+                        <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /></a><a href="/portal/account/">ACCOUNT</a>
                     </h3>
                     {% if person.last_name %}
                     <p>
@@ -82,7 +82,7 @@
             <div class="row">
                 <div class="col-sm-12">
                     <h3>
-                        <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /></a>MANAGEMENT
+                        <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /></a><a href="/portal/institution">MANAGEMENT</a>
                     </h3>
                    
                     <div>
@@ -95,7 +95,7 @@
             <div class="row">
                 <div class="col-sm-12">
                     <h3>
-                        <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="" /></a>SUPPORT 
+                        <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="" /></a><a href="/portal/support">SUPPORT</a>
                     </h3>
                     <p>
                         <span class="glyphicon glyphicon-envelope"></span> <a href="/portal/contact/">Contact</a>
diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html
index e523c818..182030df 100644
--- a/portal/templates/fed4fire/fed4fire_institution.html
+++ b/portal/templates/fed4fire/fed4fire_institution.html
@@ -125,7 +125,7 @@
 	   </div>
 	</div>
 	<div class="tab-pane row" id="requests">
-        <div id="spinner" style="padding-top:40px; padding-left:40px;"/>
+        <div id="spinner" style="padding-top:40px; padding-left:40px;"></div>
 	</div>
 </div>
 <script>
diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
index 456df96c..ae0c1877 100644
--- a/portal/templates/fed4fire/fed4fire_projectrequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_projectrequest_view.html
@@ -56,7 +56,9 @@
                     
                     <label>
                         The authority under which your project will be managed <br />
-                        Before you can access your newly created project a manager of this authority should approve the request.
+                        <span class="sublabel">
+                        Before you can access your newly created project a manager of this authority should approve the request
+                        </span>
                     </label>
                     <div class="form-group">
                         <select id="org_name" name="authority_name" class="form-control" style="width:100%" value="{{ organization }}" required> 
diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
index 21ffb36e..f52b1543 100644
--- a/portal/templates/fed4fire/fed4fire_slicerequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
@@ -42,21 +42,21 @@
 			          If your are not part of any projects you can <a href="/portal/project_request/">join or create one</a>
 			      </label>
 				<input type="text" class="form-control" id="authority_hrn" name="org_name" style="width:100%" placeholder="Project" 
-				        title="Select a project under which you want to create your slice. Don't have any project yet! Create/Join project from the dashboard." required="required">
+				        title="Select a project under which you want to create your slice" required="required">
 			  </div>
 			  <div class="form-group">
 			      <label>
-			          Provide an URL for your experiment
+			          Provide an URL for your experiment (not required)
 			      </label>
 			      <input type="text" class="form-control" name="url" id="url" style="width:100%" placeholder="Experiment URL (if one exists)"
-				        title="Please provide the url of your experiment if you have one." value="{{url}}">
+				        title="Please provide the url of your experiment" value="{{url}}">
 			  </div>
 			  <div class="form-group">
 			      <label>
                         Please provide a description of the purpose for your experiment
                    </label>
 			  	  <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment description" style="width:100%" 
-				        title="Purpose of your experiment (informative)" required="required">{{ purpose }}</textarea>
+				        title="Description of your experiment" required="required">{{ purpose }}</textarea>
 			  </div>
 			  <button type="submit" id=submit_pi class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
 			</form>
diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
index 680163e5..3f2bd7ae 100644
--- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html
+++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
@@ -9,7 +9,6 @@
         
 	    <div id="secondary" class="col-sm-8 col-md-8 secondary">
 			<ul>
-			    <li><a href="/">Home</a></li>
 				<li><a href="/portal/about">About</a></li>
 				<li><a href="http://doc.fed4fire.eu/">Documentation</a></li>
 				<li><a target="_blank" href="http://www.fed4fire.eu">Project website</a></li>
@@ -23,7 +22,7 @@
 	   {% if username %}
         <div class="col-md-12 navigation">
             <ul>
-                <li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
+                <li><a href="/">DASHBOARD</a></li>
                 <li>|</li>
                 <!--<li id="nav-institution" class=""><a href="/portal/institution">AUTHORITY</a></li>-->
                 <li class="slices">
@@ -38,6 +37,7 @@
                 <li id="nav-service"><a href="/portal/servicedirectory">SERVICES</a></li>
                 <li id="nav-support"><a href="http://doc.fed4fire.eu/support.html">SUPPORT</a></li>
                 <li>|</li>
+                <li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
                 <li id="nav-logout"><span class="glyphicon glyphicon-off iconlogout"></span> <a id="logout" data-username="{{ username }}" href="#">LOGOUT</a></li>
             </ul>
         </div>
-- 
2.43.0