From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 21 Jan 2015 17:31:54 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~113
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5826537e8d4519f35cdb55769794c95edef7e3dc;hp=-c;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

5826537e8d4519f35cdb55769794c95edef7e3dc
diff --combined portal/templates/fed4fire/fed4fire_home-view.html
index 89972ac6,5938eac8..4c1c6fbc
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@@ -55,7 -55,7 +55,7 @@@
  	{%if 'creds_expired'  in user_cred %}
      	<p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
      {%endif%}
 -		{%if 'is_pi'  in pi %}
 +		{% if pi %}
  		<div class="col-md-3">
  			<h3>
  				EXPERIMENT
@@@ -92,9 -92,23 +92,23 @@@
  			<div>
  				<a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
  			</div>
+ 			<div>
+ 				<button id="projectrequestbtn" type="button" class="btn btn-default" style="width:165px;"><span class="glyphicon glyphicon-plus"></span> Join Project</button>
+ 			</div>
  			<div>
  				<button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
  			</div>
+ 			<div>
+ 				<p><strong>Your projects </strong>
+ 					<span title="A project is a sub-authority under the responsability of your institution gathering users, who will be able to create slices for their experiments."
+ 					class="glyphicon glyphicon-info-sign">
+ 				</span>
+   				</p>
+ 			</div>
+ 			<div>	
+ 				<div id="home-project-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
+ 			</div>
+ 
  		</div>
  		<div class="col-md-3">
  			<h3>
@@@ -108,7 -122,7 +122,7 @@@
  			</div>
  			<p></p>
  			<div>
-     			<button id="statbtn" type="button" style="width: 150px;" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' status</button>
+     			<button id="statbtn" type="button" style="width: 170px;" class="btn btn-default"><span class="glyphicon glyphicon-stats" style="margin-right: 10px;"></span>Testbeds' status</button>
  			</div>
  			<div>
      			<button id="repbtn" type="button" style="width: 170px;" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' reputation</button>
@@@ -269,6 -283,9 +283,9 @@@
  		$('button#slicerequestbtn').click(function() {
  			window.location="/portal/slice_request/";
  		});
+ 		$('button#projectrequestbtn').click(function() {
+ 			window.location="/portal/project_request/";
+ 		});
  
          myslice.loadSlices();
  });