From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 13 Nov 2013 05:29:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~113^2~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e6184193b74ac6d5c52289546dae9121bdd99008;hp=-c;p=unfold.git

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

Conflicts:
	unfold/page.py
	unfold/static/css/onelab_marko.css
---

e6184193b74ac6d5c52289546dae9121bdd99008
diff --combined portal/templates/contact.html
index 624fac30,43adfa5c..8ffbf9c9
--- a/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@@ -7,22 -7,24 +7,24 @@@
  {% block unfold1_main %}
  
  <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
 -<div class="onelab-title well well-lg">
 +<div class="onelab-title well-lg">
    <h2>Onelab Support</h2>
    <h4>If you have already registered, then please <a href="mailto:support@myslice.info">send an e-mail</a>
    or <a href="http://trac.myslice.info/" >visit us</a></h4>
  </div>
  
+ <!-- no hint for this form, moreover we need more space to write stuff down
+      so we use a 3-6-3 layout -->
  <div class='well'>
    <form class="cmxform form-horizontal" id="commentForm" action="#" method="post" role="form">{% csrf_token %}
    <fieldset>
      {% for field in form %}
      <div class="form-group">
-       <label for="{{ field.html_name }}" class="col-xs-4 control-label">{{ field.label }}</label>
-       <div class="col-xs-4"> {{ field.errors }} {{ field }} <p class="form-hint">{{ field.help_text }}</p> </div>
+       <label for="{{ field.html_name }}" class="col-xs-3 control-label">{{ field.label }}</label>
+       <div class="col-xs-6"> {{ field.errors }} {{ field }} <p class="form-hint">{{ field.help_text }}</p> </div>
      </div>
      {% endfor %}
-     <button class="submit btn btn-default col-md-offset-4 col-xs-4" type="submit">Send to Support</button>
+     <button class="submit btn btn-default col-xs-12" type="submit">Send to Support</button>
    </fieldset>
    </form>
  </div>
diff --combined portal/templates/registration_view.html
index 3d19def7,2780d60a..b0bb3896
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@@ -2,7 -2,7 +2,7 @@@
  
  {% block unfold1_main %}        
  
 -<div class="onelab-title well well-lg">
 +<div class="onelab-title well-lg">
    <h2>OneLab Experimenter Registration</h2>
    <h4>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
  </div>
@@@ -20,21 -20,21 +20,21 @@@
      <fieldset>
      {% csrf_token %}
      <div class="form-group">
-       <label for="firstname" class="col-xs-4 control-label">First Name</label>
+       <label for="firstname" class="col-xs-2 control-label">First Name</label>
        <div class="col-xs-4">
  	<input type="text" name="firstname" class="form-control" minlength="2" value="{{ firstname }}" placeholder="First Name" required />
        </div>
-       <div class="col-xs-4"> <p class="form-hint">Enter your first name</p> </div>
+       <div class="col-xs-6"> <p class="form-hint">Enter your first name</p> </div>
      </div>
      <div class="form-group">
-       <label for="lastname" class="col-xs-4 control-label">Last Name</label>
+       <label for="lastname" class="col-xs-2 control-label">Last Name</label>
        <div class="col-xs-4">
  	<input type="text" name="lastname" size="25" class="form-control" minlength="2" value="{{ lastname }}" placeholder="Last Name" required />
        </div>
-       <div class="col-xs-4"><p class="form-hint">Enter your last name</p></div>
+       <div class="col-xs-6"><p class="form-hint">Enter your last name</p></div>
      </div>
      <div class="form-group">
-       <label for="auth_list" class="col-xs-4 control-label">Authority</label>
+       <label for="auth_list" class="col-xs-2 control-label">Authority</label>
        <div class="col-xs-4">
  	<select id="auth_list" name="authority_hrn" size="1" class="form-control" required>
  	  {% if authorities %}
@@@ -47,7 -47,7 +47,7 @@@
  	  {% endif %}
  	</select>
        </div>
-       <div class="col-xs-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
+       <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your account</p></div>
      </div>
  
  	<!-- LOGIN
@@@ -56,55 -56,55 +56,55 @@@
  	user.
  	-->
      <div class="form-group">
-       <label for="login" class="col-xs-4 control-label">Login</label>
+       <label for="login" class="col-xs-2 control-label">Login</label>
        <div class="col-xs-4">
  	  <input type="text" name="login" size="25" class="form-control" minlength="2" value="{{ login }}" placeholder="Login" required />
        </div>
-       <div class="col-xs-4"><p class="form-hint">Enter your login</p></div>
+       <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
      </div>
      
      <div class="form-group">
-       <label for="email" class="col-xs-4 control-label">Email</label>
+       <label for="email" class="col-xs-2 control-label">Email</label>
        <div class="col-xs-4">
  	<input type="email" name="email" size="25"  class="form-control" value="{{ email }}" required/> 
        </div>
-       <div class="col-xs-4"><p class="form-hint">Enter a valid email address</p></div>
+       <div class="col-xs-6"><p class="form-hint">Enter a valid email address</p></div>
      </div>
      <div class="form-group">
-       <label for="password" class="col-xs-4 control-label">Password</label>
+       <label for="password" class="col-xs-2 control-label">Password</label>
        <div class="col-xs-4">
  	<input type="password"  id="password" name="password"   class="form-control" minlength="4" value="{{ password }}" required/> 
        </div>
-       <div class="col-xs-4"><p class="form-hint">Enter password</p></div>
+       <div class="col-xs-6"><p class="form-hint">Enter password</p></div>
      </div>
      <div class="form-group">
-       <label for="password" class="col-xs-4 control-label">Confirm Password</label>
+       <label for="password" class="col-xs-2 control-label">Confirm Password</label>
        <div class="col-xs-4">
  	<input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="form-control" 
  	       value="" placeholder="Confirm Password" required/>
        </div>
-       <div class="col-xs-4"><p class="form-hint">Retype the password</p></div>
+       <div class="col-xs-6"><p class="form-hint">Retype the password</p></div>
      </div>
      <div class="form-group">
-       <label for="question" class="col-xs-4 control-label">My Keys</label>
+       <label for="question" class="col-xs-2 control-label">My Keys</label>
        <div class="col-xs-4">
  	<select name="question" class="form-control" id="key-policy" required>        
  	  <option value="generate">Generate key pairs for me </option>
  	  <option value="upload">Upload my public key </option>
  	</select>
        </div>
-       <div class="col-xs-4"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </div>
+       <div class="col-xs-6"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </div>
      </div>
      <div class="form-group" style="display:none;" id="upload_key">
-       <label for="file" class="col-xs-4 control-label">Upload public key</label>
+       <label for="file" class="col-xs-2 control-label">Upload public key</label>
        <div class="col-xs-4">
  	<input type="file" name="user_public_key" class="form-control" id="user_public_key" required/>
  	<p class="warning" id="pkey_del_msg">Once your account is validated, you will have to delegate your credentials manually using SFA [Advanced users only]</p>
        </div>
-       <div class="col-xs-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
+       <div class="col-xs-6"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
      </div>
      <div class="form-group" id="register">
-       <button class="submit btn btn-default col-md-offset-4 col-xs-4" type="submit">Register</button>
+       <button class="submit btn btn-default col-xs-12" type="submit">Register</button>
      </div>
      </div>
    </fieldset>
diff --combined portal/templates/slice-request-view.html
index 3b3a01ff,502e380b..b9e0e22d
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@@ -11,7 -11,7 +11,7 @@@
  <!-- xxx ideally only onelab.css but ... xxx -->
  <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
  
 -<div class="onelab-title well well-lg">
 +<div class="onelab-title well-lg">
    <h2>Request a Slice</h2>
  </div>
  
@@@ -20,12 -20,12 +20,12 @@@
    <fieldset>
      {% for field in form %}
      <div class="form-group">
-       <label for="{{ field.html_name }}" class="col-xs-4 control-label">{{ field.label }}</label>
+       <label for="{{ field.html_name }}" class="col-xs-2 control-label">{{ field.label }}</label>
        <div class="col-xs-4"> {{ field.errors }} {{ field }} </div>
-       <div class="col-xs-4"> <p class="form-hint">{{ field.help_text }}</p> </div>
+       <div class="col-xs-6"> <p class="form-hint">{{ field.help_text }}</p> </div>
      </div>
      {% endfor %}
-     <button class="submit btn btn-default col-md-offset-4 col-xs-4" type="submit">Request Slice</button>
+     <button class="submit btn btn-default col-xs-12" type="submit">Request Slice</button>
    </fieldset>
    </form>
  </div>
diff --combined ui/templates/base.html
index 96c04209,2cf0b0a8..b551df76
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@@ -5,13 -5,11 +5,12 @@@
  <link rel="shortcut icon" href="/static/img/myslice-icon.png">
  {# This is where insert_str will end up #}{% media_container prelude %}
  {% include 'messages-transient-header.html' %}
 +<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab_marko.css" />
  <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
  <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
  {{ header_prelude }}
  {% block head %} {% endblock head %}
  </head>{# let's add these ones no matter what #}
- {% insert_str prelude "css/layout-unfold2.css" %}
  {% insert_str prelude "js/jquery.min.js" %}
  {% insert_str prelude "js/jquery.html5storage.min.js" %}
  {% insert_str prelude "js/messages-runtime.js" %}
@@@ -21,7 -19,10 +20,10 @@@
  {% insert_str prelude "js/plugin.js" %}
  {% insert_str prelude "js/manifold.js" %}
  {% insert_str prelude "js/topmenu.js" %}
+ {% insert_str prelude "css/layout-unfold2.css" %}
  {% insert_str prelude "css/manifold.css" %}
+ {% insert_str prelude "css/plugin.css" %}
+ {% insert_str prelude "css/onelab_marko.css" %}
  <body>
  {% block container %}
    {% block topmenu %}
diff --combined unfold/page.py
index 024bd449,bc44cd1a..7c6d60bd
--- a/unfold/page.py
+++ b/unfold/page.py
@@@ -33,9 -33,8 +33,10 @@@ class Page
          # queue of queries with maybe a domid, see enqueue_query
          self._queue=[]
          # global prelude object
 +        self.prelude=Prelude(css_files='css/plugin.css')
 +        print "Loading... CSS OneLab"
 +        self.prelude=Prelude(css_files='css/onelab_marko.css')
+ #        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
 -        self.prelude=Prelude()
  
      # record known plugins hashed on their domid
      def record_plugin (self, plugin):
diff --combined unfold/static/css/onelab_marko.css
index 7cab5e0e,7e19d780..ab82706b
--- a/unfold/static/css/onelab_marko.css
+++ b/unfold/static/css/onelab_marko.css
@@@ -1,28 -1,16 +1,22 @@@
- /* @override 
- 	http://test.myslice.info/static/css/plugin.css
- */
- 
- 
+ /* @override unfold/static/css/plugin.css */
  
  /*-------------------------------- MARKO'S STYLES -----*/
  
  /* GENERAL */
  
  .container {
 -    padding: 0 !important;
 -/*    color: #fff; */
 +	padding: 0 !important;
 +	color: #fff;
 +    background: url(http://new.fit-equipex.fr/images/background.jpg) no-repeat;
 +    margin: 0;
 +    width: 100%;
 +    max-width: 100%;
 +    min-height: 100%;
 +    height: 100%;
  }
  
- .container h1 {
- 	color: #fff !important;
- 	font-family: Ubuntu;
- 	margin-top: 60px;
+ .container h1, .container h2 {
+     color: #fff !important;
  }
  
  div.plugin-outline-complete, 
@@@ -61,30 -49,22 +55,30 @@@ a.plugin-tooltip:hover 
  
  
  /* LIST VIEW */
 -
 +div.well-lg {
 +    background-color: rgba(168, 32, 202, 0.5) !important;
 +}
 +div.onelab-title {
 +    background-color: rgba(168, 32, 202, 0.5) !important;
 +}
 +div.well {
 +    background-color: rgba(0, 0, 0, 0.5) !important;
 +}
  h2.well.well-lg {
- 	border-radius:0;
- 	border: 0;
- 	font-family: Ubuntu, arial, sans-serif;
- 	/* text-transform: ; */
- 	font-weight: normal;
- 	font-size: 40px;
- 	/* color: #30196d; */
+     border-radius:0;
+     border: 0;
+     font-family: Ubuntu, arial, sans-serif;
+     /* text-transform: ; */
+     font-weight: normal;
+     font-size: 40px;
+     /* color: #30196d; */
      color: white;
- 	margin-bottom: 0px;
- 	margin-top: 0;
- 	padding: 40px;
- 	opacity: 1;
- 	text-align: center;
- 	background-color: #30196d;
+     margin-bottom: 0px;
+     margin-top: 0;
+     padding: 40px;
+     opacity: 1;
+     text-align: center;
+     background-color: #30196d;
  }
  
  #complete-resources {
@@@ -127,9 -107,9 +121,9 @@@
  #complete-pending,
  #complete-customize-resources,
  #complete-msgs-pre {
- 	opacity: 1;
- 	text-align: center;
- 	color: #333;
+     opacity: 1;
+     text-align: center;
+     color: #333;
  }
  
  #complete-resources:hover, 
@@@ -139,34 -119,34 +133,34 @@@
  #complete-pending:hover,
  #complete-customize-resources:hover,
  #complete-msgs-pre:hover {
- 	opacity: 1;
+     opacity: 1;
  }
  
  .nav.nav-tabs {
- 	font-family: Ubuntu, Arial, sans-serif;
- 	border: 0 !important;
- 	border-bottom: 3px solid #fff !important;
- 	margin-bottom: 40px;
+     font-family: Ubuntu, Arial, sans-serif;
+     border: 0 !important;
+     border-bottom: 3px solid #fff !important;
+     margin-bottom: 40px;
  }
  
  .nav.nav-tabs li.active a {
- 	color: #572bc9;
- 	border-left: 0px solid #572bc9;
- 	border-top: 0px solid #572bc9;
- 	border-right: 0px solid #572bc9;
+     color: #572bc9;
+     border-left: 0px solid #572bc9;
+     border-top: 0px solid #572bc9;
+     border-right: 0px solid #572bc9;
  }
  
  .nav.nav-tabs li a {
- 	color: #333;
- 	border: 0 !important;
- 	margin-right: 5px;
+     color: #333;
+     border: 0 !important;
+     margin-right: 5px;
  }
  
  .nav.nav-tabs li a:hover {
- 	color: #333;
- 	background: #572bc9;
- 	color: #fff;
- 	border: 0 !important;
+     color: #333;
+     background: #572bc9;
+     color: #fff;
+     border: 0 !important;
  }
  
  
@@@ -176,40 -156,44 +170,45 @@@
  /* TOPMENU.CSS */
  
  body {
 -    background: #30196d !important;
 +	/* background: #30196d !important; */
 +	background: black !important;
      padding-top: 60px;
      padding-bottom: 0px;
  }
  
+ /* Thierry : turning this off
  div.topmenu { 
- 	padding-top: 0px;
- 	font-family: Ubuntu, Arial, sans-serif;
- 	font-weight: bold;
- 	/* text-transform: ; */
- 	background: #fff;
- 	-webkit-box-shadow: 0px 10px 10px rgba(50, 50, 50, 0.44);
- 	-moz-box-shadow:    0px 10px 10px rgba(50, 50, 50, 0.44);
- 	box-shadow:         0px 10px 10px rgba(50, 50, 50, 0.44);
+     padding-top: 0px;
+     font-family: Ubuntu, Arial, sans-serif;
+     font-weight: bold;
+     background: #fff;
+     -webkit-box-shadow: 0px 10px 10px rgba(50, 50, 50, 0.44);
+     -moz-box-shadow:    0px 10px 10px rgba(50, 50, 50, 0.44);
+     box-shadow:         0px 10px 10px rgba(50, 50, 50, 0.44);
  }
+ Thierry */
  
+ /* Thierry : turning this off
  .navbar-nav li a,
  .navbar-nav li.other a {
- 	padding-top: 25px;
- 	padding-bottom: 20px;
+     padding-top: 25px;
+     padding-bottom: 20px;
  }
+ Thierry */
  
  .navbar-nav li a:hover {
- 	color: #572bc9 !important;
+     color: #572bc9 !important;
  }
  
  .navbar-nav li.active a {
- 	background: #eee !important;
+     background: #eee !important;
  }
  
+ /* Thierry : turning this off
  ul.logged-in { 
      padding-top: 25px; 
  }
+ Thierry */
  button.logged-in { 
      font-size: 1em;
      font-weight: bold; 
@@@ -241,44 -225,44 +240,44 @@@ li.username 
  
  
  ul.pagination li a {
- 	/* background: ; */
- 	color: #572bc9;
- 	font-family: Ubuntu, Arial, sans-serif;
+     /* background: ; */
+     color: #572bc9;
+     font-family: Ubuntu, Arial, sans-serif;
  }
  
  ul.pagination li.active a {
- 	background: #572bc9;
- 	border: 1px solid #572bc9;
+     background: #572bc9;
+     border: 1px solid #572bc9;
  }
  
  .btn.btn-default {
- 	background: #572bc9;
- 	color: #ccc;
- 	font-family: Ubuntu, Arial, sans-serif;
- 	font-weight: bold;
- 	border: 0px;
+     background: #572bc9;
+     color: #ccc;
+     font-family: Ubuntu, Arial, sans-serif;
+     font-weight: bold;
+     border: 0px;
  }
  
  .btn.btn-default:hover {
- 	/* background: #4af25d; */
- 	background: #ff7394;
- 	color: #333;
- 	font-family: Ubuntu, Arial, sans-serif;
- 	font-weight: bold;
- 	border: 0px;
+     /* background: #4af25d; */
+     background: #ff7394;
+     color: #333;
+     font-family: Ubuntu, Arial, sans-serif;
+     font-weight: bold;
+     border: 0px;
  }
  
  input {
- 	border-radius: 3px;
- 	border: none;
- 	border: 1px solid #ccc;
+     border-radius: 3px;
+     border: none;
+     border: 1px solid #ccc;
  }
  
  
  div.dataTables_length label, 
  div.dataTables_filter label,
  div.dataTables_info {
- 	font-family: Ubuntu, Arial, sans-serif !important;
+     font-family: Ubuntu, Arial, sans-serif !important;
  }
  
  
@@@ -345,59 -329,59 +344,59 @@@ table.query-editor td 
  #ms-dashboard-profile,
  #ms-dashboard-testbeds,
  #ms-dashboard-slices {
- 	-webkit-transition: all 50ms ease-out;
+     -webkit-transition: all 50ms ease-out;
      -moz-transition: all 50ms ease-out;
      -o-transition: all 50ms ease-out;
      transition: all 0.05s ease-out;
- 	padding-top: 140px;
- 	padding-bottom: 60px;
- 	margin-top: 60px;
- 	color: #fff;
- 	font-family: Ubuntu, Arial, sans-serif;
- 	text-align: center;
+     padding-top: 140px;
+     padding-bottom: 60px;
+     margin-top: 60px;
+     color: #fff;
+     font-family: Ubuntu, Arial, sans-serif;
+     text-align: center;
  	
  }
  
  #ms-dashboard-profile:hover,
  #ms-dashboard-testbeds:hover,
  #ms-dashboard-slices:hover {
- 	margin-top: 65px;
+     margin-top: 65px;
  }
  
  #ms-dashboard-profile {
- 	background: url("../img/icon_users_color.png") top center no-repeat;
+     background: url("../img/icon_users_color.png") top center no-repeat;
  }
  
  #ms-dashboard-testbeds {
- 	background: url("../img/icon_testbed_color.png") top center no-repeat;
+     background: url("../img/icon_testbed_color.png") top center no-repeat;
  }
  
  #ms-dashboard-slices {
- 	background: url("../img/icon_slices_color.png") top center no-repeat;
+     background: url("../img/icon_slices_color.png") top center no-repeat;
  }
  
  .ms-dashboard-content ul {
- 	list-style-type: none !important;
- 	padding-left: 0;
- 	text-align: center !important;
+     list-style-type: none !important;
+     padding-left: 0;
+     text-align: center !important;
  }
  
  .ms-dashboard-content {
- 	padding: 0 !important;
+     padding: 0 !important;
  }
  
  .ms-dashboard-content a {
- 	color: #ff7394 !important;
- 	/* color: #ff0099 !important; */
+     color: #ff7394 !important;
+ /* color: #ff0099 !important; */
  }
  
  .ms-dashboard-content a:hover {
      color: white !important;
  }
  .ms-dashboard-caption h2 {
- 	font-family: Ubuntu, Arial, sans-serif;
- 	border-bottom: 0 !important;
- 	text-transform: uppercase;
+     font-family: Ubuntu, Arial, sans-serif;
+     border-bottom: 0 !important;
+     text-transform: uppercase;
  }
  
  #ms-dashboard-profile>div.ms-dashboard-caption {
@@@ -416,13 -400,7 +415,7 @@@
  }   
  
  .simplelist {
- 	font-size: 100%;
- 	text-align: center !important;
- 	margin: 0 auto;
+     font-size: 100%;
+     text-align: center !important;
+     margin: 0 auto;
  }
- 
- 
- 
- 
- 
-