From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 12 Mar 2014 18:06:38 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~200
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6818940d6b018d6f5bcad47c2f20d164623b468a;p=unfold.git

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

Conflicts:
	portal/templates/onelab/onelab_slice-resource-view.html
---

6818940d6b018d6f5bcad47c2f20d164623b468a
diff --cc portal/templates/onelab/onelab_slice-resource-view.html
index 4051c62b,8206fdfb..80c3fccd
--- a/portal/templates/onelab/onelab_slice-resource-view.html
+++ b/portal/templates/onelab/onelab_slice-resource-view.html
@@@ -46,9 -46,9 +46,9 @@@
  			{% endif %}
  		</div>
  		<div class="row">
 -			<ul class="nav nav-tabs nav-resources">
 +			<ul class="nav nav-pills nav-resources">
  			  <li class="active"><a data-panel="resources" href="#">Resources</a></li>
- 			  <li><a data-panel="map" href="#">Map</a></li>
+ 			  <li id="GoogleMap"><a data-panel="map" href="#">Map</a></li>
  			  <li><a data-panel="pending" href="#">Pending</a></li>
  			  <li><a href="#"></a></li>
  			</ul>