From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 10 Mar 2014 17:39:20 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~208
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c79b3c894ec8a08686ae4978e5375c15ec6f2cbf

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

Conflicts:
	portal/static/js/myslice.js
---

c79b3c894ec8a08686ae4978e5375c15ec6f2cbf
diff --cc devel/server-loop.sh
index c77258fc,c77258fc..51159ade
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@@ -4,7 -4,7 +4,7 @@@ cd $DIRNAME/.
  
  # default port : if hostname starts with z -> use 8080 ; otherwise take 80
  #hostname | grep -q '^z' && port=8080 || port=8080
--hostname | grep -q '^z' && port=8080 || port=80
++hostname | grep -q '^z' && port=8080 || port=8080
  [[ -n "$@" ]] && port=$1
  
  while true; do 
diff --cc plugins/query_editor/static/js/query_editor.js
index 17b9bf77,17b9bf77..68d0265a
--- a/plugins/query_editor/static/js/query_editor.js
+++ b/plugins/query_editor/static/js/query_editor.js
@@@ -35,7 -35,7 +35,7 @@@
                      // XXX This should be handled by manifold
                      manifold.raise_event(self.options.query_uuid, FILTER_REMOVED, [key, op]);
                  }
--            }
++            };
          },
  
          init: function(options, element) {
diff --cc portal/static/css/onelab.css
index 6d203a59,6d203a59..a236d10d
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@@ -13,13 -13,13 +13,13 @@@ a, a:active, a:focus 
  
  h1 {
      border-bottom:1px solid #DDDDDD;
--    padding:0 0 5px 0;
--    margin:0 0 15px 0;
++    padding:0 0 0 0;
++    margin:0 0 0 0;
      font-size:18pt;
  }
  h1 img {
      vertical-align:middle;
--    margin-bottom:4px;
++    margin-bottom:6px;
  }
  h2 {
      font-size:14pt;
@@@ -29,6 -29,6 +29,7 @@@ h3 
      font-size:13pt;
      color:#201E62;
  }
++
  div.wrapper {
      width:980px;
      margin:0 auto;
@@@ -258,7 -258,7 +259,6 @@@ div#home-dashboard div#home-slice-list 
  /* NAV TABS */
  
  .nav.nav-tabs {
--    margin-bottom:25px;
  }
  
  .nav.nav-tabs li.active a {
@@@ -334,6 -334,6 +334,27 @@@ div#ticket-request p 
  }
  
  /* SLICE VIEW */
++ul.nav-sliceview {}
++ul.nav-sliceview li {
++    
++}
++ul.nav-sliceview li:first-child {
++    padding:0;
++}
++ul.nav-sliceview li:first-child a {
++    font-weight:bold;
++    padding:6px 15px 4px 15px;
++}
++ul.nav-sliceview li:first-child img {
++    margin:0 4px 1px 0;
++    padding:0;
++}
++
++
++
++
++
++
  div#slice-view {
      margin:0;
  }
diff --cc portal/static/js/myslice.js
index 2caa4b8f,bf640168..fa115bec
--- a/portal/static/js/myslice.js
+++ b/portal/static/js/myslice.js
@@@ -138,13 -44,13 +138,14 @@@ var myslice = 
      },
      
      apply: function() {
-     	$('div#loading').show();
-     	this.pending = [];
-     	this.save();
-     	// setTimeout(function(){
-     		// $('div#loading').hide();
-     		// window.location.href = '/resources/' + this.slice + '?message=true';
-     		// },6000);
++
+     	//$('div#loading').show();
+     	//this.pending = [];
+     	//this.save();
+     	//setTimeout(function(){
+     		//$('div#loading').hide();
+     		//window.location.href = '/resources/' + this.slice + '?message=true';
+     		//},6000);
      	
      	 
  
diff --cc portal/templates/about.html
index bddeb7e5,bddeb7e5..9b124f28
--- a/portal/templates/about.html
+++ b/portal/templates/about.html
@@@ -2,7 -2,7 +2,7 @@@
  
  {% block content %}
  <div class="row">
--	<h1><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="About MySlice" /> About</h1>
++	<h1><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> About</h1>
  </div>
  
  <div class="row">
diff --cc portal/templates/onelab/onelab__widget-topmenu.html
index 26cb09b1,26cb09b1..ec07303a
--- a/portal/templates/onelab/onelab__widget-topmenu.html
+++ b/portal/templates/onelab/onelab__widget-topmenu.html
@@@ -1,7 -1,7 +1,4 @@@
--{% insert_str prelude "js/bootstrap.js" %}
--{% insert_str prelude "css/bootstrap.css" %}
--{% insert_str prelude "css/topmenu.css" %}
--{% insert_str prelude "js/logout.js" %}
++
  <div id="header">
  	<div class="wrapper">
  		<div class="logo">
diff --cc portal/templates/onelab/onelab_slice-view.html
index a67d34b2,a67d34b2..b734564b
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@@ -1,24 -1,24 +1,29 @@@
  {% extends "layout_wide.html" %}
  
  {% block content %}
--	<div class="col-md-2"></div>
--	<div class="col-md-10">
--		<div class="row">
--		  	{% include theme|add:"_widget-slice-sections.html" %}
++<div class="wrapper">
++	<div class="row">
++		<div class="col-md-12">
++		{% include theme|add:"_widget-slice-sections.html" %}
++	    </div>
++	</div>
++</div>
++<div class="container-fluid">
++	<div class="row">
++		<div class="col-md-2">
++			ll
  		</div>
--    </div>
--    
--	<div class="col-md-2"></div>
--	<div class="col-md-10">
--        <br>
--        <br>
--        <div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
--        <div id="slice-tab-loaded" style="display:none;">
--            <table id="slice-tab">
--            </table>
--        </div>
--  	</div>
-- 
++		<div class="col-md-10">
++        	<br>
++        	<br>
++        	<div id="slice-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
++        	<div id="slice-tab-loaded" style="display:none;">
++        	    <table id="slice-tab">
++        	    </table>
++        	</div>
++  		</div>
++	</div>
++</div>
  <script>
      $(document).ready(function() {
          $.post("/rest/slice/",{'filters':{'slice_hrn':'{{slice}}'}}, function( data ) {
diff --cc portal/templates/onelab/onelab_widget-slice-sections.html
index e637b15a,e637b15a..46d86562
--- a/portal/templates/onelab/onelab_widget-slice-sections.html
+++ b/portal/templates/onelab/onelab_widget-slice-sections.html
@@@ -1,13 -1,13 +1,14 @@@
--<div class="col-md-8 slice-sections">
--	<ul class="nav nav-pills nav-justified">
--		<li {% if section == 'slice' %}class="active"{% endif %}><a href="/slice/{{ slice }}/">{{ slice }}</a></li>
--		<li {% if section == 'testbeds' %}class="active"{% endif %}><a href="/testbeds/{{ slice }}/">Testbeds</a></li>
--		<li {% if section == 'resources' %}class="active"{% endif %}><a href="/resources/{{ slice }}/">Resources</a></li>
--		<li {% if section == 'users' %}class="active"{% endif %}><a href="/users/{{ slice }}/">Users</a></li>
--		<li><a href="">Statistics</a></li>
--		<li><a href="">Measurements</a></li>
--	</ul>
--</div>
--<div class="col-md-4 slice-experiment">
--	<a href="/portal/experiment"><button type="button" class="btn btn-default">Experiment</button></a>
--</div>
++<ul class="nav nav-tabs nav-sliceview">
++	<li class="active"><a href="/slice/{{ slice }}/"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
++	<li><a href="/testbeds/{{ slice }}/">Testbeds</a></li>
++	<li><a href="/resources/{{ slice }}/">Resources</a></li>
++	<li><a href="/users/{{ slice }}/">Users</a></li>
++	<li><a href="">Statistics</a></li>
++	<li><a href="">Measurements</a></li>
++	<li><a href="/portal/experiment">Experiment</a></li>
++</ul>
++<script>
++	$(document).ready(function() {
++		
++	});
++</script>
diff --cc ui/templates/base.html
index 97326533,97326533..85139519
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@@ -24,6 -24,6 +24,10 @@@
  {% insert_str prelude "js/manifold.js" %}
  {% insert_str prelude "css/manifold.css" %}
  {% insert_str prelude "css/plugin.css" %}
++{% insert_str prelude "js/bootstrap.js" %}
++{% insert_str prelude "css/bootstrap.css" %}
++{% insert_str prelude "css/topmenu.css" %}
++{% insert_str prelude "js/logout.js" %}
  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
  </head>
  <body>