From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 4 Oct 2013 16:30:55 +0000 (+0200)
Subject: use col-xs-<n> instead of col-md-<n> as the bootstrap doc states
X-Git-Tag: myslice-0.2-5~40
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c33f536cc523e21c29cf06d0c906009b01b6f576

use col-xs-<n> instead of col-md-<n> as the bootstrap doc states
"Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs."
---

diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index dbff4ce1..ab22c1e4 100644
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -82,7 +82,7 @@
             var actual_options = {
                 // Customize the position of Datatables elements (length,filter,button,...)
                 // we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time
-                sDom: "<'row'<'col-md-5'l><'col-md-1'r><'col-md-6'f>>t<'row'<'col-md-5'i><'col-md-7'p>>",
+                sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
 		// XXX as of sept. 2013, I cannot locate a bootstrap3-friendly mode for now
 		// hopefully this would come with dataTables v1.10 ?
 		// in any case, search for 'sPaginationType' all over the code for more comments
diff --git a/portal/templates/contact.html b/portal/templates/contact.html
index 3468b0ff..5161971b 100644
--- a/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@ -18,11 +18,11 @@
   <fieldset>
     {% for field in form %}
     <div class="form-group">
-      <label for="{{ field.html_name }}" class="col-md-4 control-label">{{ field.label }}</label>
-      <div class="col-md-4"> {{ field.errors }} {{ field }} <p class="form-hint">{{ field.help_text }}</p> </div>
+      <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>
     </div>
     {% endfor %}
-    <div class="col-md-offset-4 col-md-4">
+    <div class="col-xs-offset-4 col-xs-4">
       <button class="submit btn btn-default" type="submit">Submit</button>
     </div>
   </fieldset>
diff --git a/portal/templates/dashboard.html b/portal/templates/dashboard.html
index c80da1af..972e4b1b 100644
--- a/portal/templates/dashboard.html
+++ b/portal/templates/dashboard.html
@@ -11,7 +11,7 @@
 
   <div class="container">
     <div class="row">
-      <div class='col-md-4' id="ms-dashboard-profile">
+      <div class='col-xs-4' id="ms-dashboard-profile">
 	<div class='ms-dashboard-caption'>
 	  <h2>User profile</h2>
 	</div>
@@ -24,7 +24,7 @@
 	</div>
       </div>
 
-      <div class='col-md-4' id='ms-dashboard-testbeds'>
+      <div class='col-xs-4' id='ms-dashboard-testbeds'>
 	<div class='ms-dashboard-caption'>
 	  <h2>Testbeds</h2>
 	</div>
@@ -33,7 +33,7 @@
 	</div>
       </div>
 
-      <div class='col-md-4' id='ms-dashboard-slices'>
+      <div class='col-xs-4' id='ms-dashboard-slices'>
 	<div class='ms-dashboard-caption'>
 	  <h2>Slices</h2>
 	</div>
diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 88de5729..d7788d0d 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -20,22 +20,22 @@
     <fieldset>
     {% csrf_token %}
     <div class="form-group">
-      <label for="firstname" class="col-md-4 control-label">First Name</label>
-      <div class="col-md-4">
+      <label for="firstname" class="col-xs-4 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-md-4"> <p class="form-hint">Enter your first name</p> </div>
+      <div class="col-xs-4"> <p class="form-hint">Enter your first name</p> </div>
     </div>
     <div class="form-group">
-      <label for="lastname" class="col-md-4 control-label">Last Name</label>
-      <div class="col-md-4">
+      <label for="lastname" class="col-xs-4 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-md-4"><p class="form-hint">Enter your last name</p></div>
+      <div class="col-xs-4"><p class="form-hint">Enter your last name</p></div>
     </div>
     <div class="form-group">
-      <label for="auth_list" class="col-md-4 control-label">Authority</label>
-      <div class="col-md-4">
+      <label for="auth_list" class="col-xs-4 control-label">Authority</label>
+      <div class="col-xs-4">
 	<select id="auth_list" name="authority_hrn" size="1" class="form-control" required>
 	  {% if authorities %}
 	  {% for authority in authorities %}
@@ -47,51 +47,51 @@
 	  {% endif %}
 	</select>
       </div>
-      <div class="col-md-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
+      <div class="col-xs-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
     </div>
     
     <div class="form-group">
-      <label for="email" class="col-md-4 control-label">Email</label>
-      <div class="col-md-4">
+      <label for="email" class="col-xs-4 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-md-4"><p class="form-hint">Enter a valid email address</p></div>
+      <div class="col-xs-4"><p class="form-hint">Enter a valid email address</p></div>
     </div>
     <div class="form-group">
-      <label for="password" class="col-md-4 control-label">Password</label>
-      <div class="col-md-4">
+      <label for="password" class="col-xs-4 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-md-4"><p class="form-hint">Enter password</p></div>
+      <div class="col-xs-4"><p class="form-hint">Enter password</p></div>
     </div>
     <div class="form-group">
-      <label for="password" class="col-md-4 control-label">Confirm Password</label>
-      <div class="col-md-4">
+      <label for="password" class="col-xs-4 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-md-4"><p class="form-hint">Retype the password</p></div>
+      <div class="col-xs-4"><p class="form-hint">Retype the password</p></div>
     </div>
     <div class="form-group">
-      <label for="question" class="col-md-4 control-label">My Keys</label>
-      <div class="col-md-4">
+      <label for="question" class="col-xs-4 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-md-4"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </div>
+      <div class="col-xs-4"><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-md-4 control-label">Upload public key</label>
-      <div class="col-md-4">
+      <label for="file" class="col-xs-4 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-md-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
+      <div class="col-xs-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
     </div>
     <div class="form-group" id="register">
-      <div class="col-md-offset-4 col-md-4">
+      <div class="col-xs-offset-4 col-xs-4">
 	<button class="submit btn btn-default" type="submit">Register</button>
       </div>
     </div>
diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html
index 7ff306c1..6983354b 100644
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@ -20,11 +20,11 @@
   <fieldset>
     {% for field in form %}
     <div class="form-group">
-      <label for="{{ field.html_name }}" class="col-md-4 control-label">{{ field.label }}</label>
-      <div class="col-md-4"> {{ field.errors }} {{ field }} <p class="form-hint">{{ field.help_text }}</p> </div>
+      <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>
     </div>
     {% endfor %}
-    <div class="col-md-offset-4 col-md-4">
+    <div class="col-xs-offset-4 col-xs-4">
       <button class="submit btn btn-default" type="submit">Submit</button>
     </div>
   </fieldset>
diff --git a/ui/templates/layout-unfold1.html b/ui/templates/layout-unfold1.html
index 002a0231..fa796b93 100644
--- a/ui/templates/layout-unfold1.html
+++ b/ui/templates/layout-unfold1.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
 {% block base_content %}
-    <div id="unfold1-main" class="col-md-12 columns">
+    <div id="unfold1-main" class="col-xs-12 columns">
       {% block unfold1_main %}
       "The main content area (define block 'unfold1_main')"
       {% endblock unfold1_main %}
-    </div><!--col-md-12-->
+    </div><!--col-xs-12-->
 {% endblock %}
diff --git a/ui/templates/layout-unfold2.html b/ui/templates/layout-unfold2.html
index 1d092c21..954ce22d 100644
--- a/ui/templates/layout-unfold2.html
+++ b/ui/templates/layout-unfold2.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 
 {% block base_content %}
-    <div id="unfold2-main" class="col-md-9 columns">
+    <div id="unfold2-main" class="col-xs-9 columns">
       {% block unfold2_main %}
       "The main content area (define block 'unfold2_main')"
       {% endblock unfold2_main %}
-    </div><!--col-md-9-->
-    <div id='unfold2-margin' class='col-md-3'>
+    </div><!--col-xs-9-->
+    <div id='unfold2-margin' class='col-xs-3'>
       {% block unfold2_margin %}
       "The related content area (define block 'related_main')"
       {% endblock unfold2_margin %}
-    </div><!--col-md-3-->
+    </div><!--col-xs-3-->
 {% endblock %}