git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e85e428)
Fixed bootstrap style to SLA dataTable
authorJavier García <javier.garcial.external@atos.net>
Fri, 1 Aug 2014 10:32:22 +0000 (12:32 +0200)
committerJavier García <javier.garcial.external@atos.net>
Fri, 1 Aug 2014 10:32:22 +0000 (12:32 +0200)
portal/templates/base.html patch | blob | history
portal/templates/fed4fire/fed4fire_base.html patch | blob | history
sla/slaclient/restclient.py patch | blob | history
sla/static/images/sort_asc.png [new file with mode: 0644] patch | blob
sla/static/images/sort_both.png [new file with mode: 0644] patch | blob
sla/static/images/sort_desc.png [new file with mode: 0644] patch | blob
sla/templates/slice-tab-sla.html patch | blob | history

diff --git a/portal/templates/base.html b/portal/templates/base.html
index af81a0e..f4e4762 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -8,7 +8,7 @@
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
-<script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
+<script src="{{ STATIC_URL }}js/dataTables.bootstrap.js"></script>
 <!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
 <!-- <script src="{{ STATIC_URL }}js/stash.min.js"></script> -->
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
@@ -30,6 +30,7 @@
 {% insert_str prelude "css/bootstrap.css" %}
 {% insert_str prelude "css/topmenu.css" %}
 {% insert_str prelude "js/logout.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/dataTables.bootstrap.css">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
 
 <script type="text/javascript">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
 
 <script type="text/javascript">
diff --git a/portal/templates/fed4fire/fed4fire_base.html b/portal/templates/fed4fire/fed4fire_base.html
index f411ec2..00492cd 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_base.html
+++ b/portal/templates/fed4fire/fed4fire_base.html
@@ -7,7 +7,7 @@
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
-<script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
+<script src="{{ STATIC_URL }}js/dataTables.bootstrap.js"></script>
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
 <script src="{{ STATIC_URL }}js/myslice.js"></script>
 <script src="{{ STATIC_URL }}js/myslice-ui.js"></script>
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
@@ -28,6 +28,7 @@
 {% insert_str prelude "css/bootstrap.css" %}
 {% insert_str prelude "css/topmenu.css" %}
 {% insert_str prelude "js/logout.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/dataTable.bootstrap.css">
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
 </head>
 <body>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
 </head>
 <body>
diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py
index 29fcae8..ab38cc4 100755 (executable)
--- a/sla/slaclient/restclient.py
+++ b/sla/slaclient/restclient.py
@@ -120,8 +120,8 @@ class Client(object):
         kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
                                        settings.SLA_MANAGER_PASSWORD)
 
         kwargs["auth"] = HTTPBasicAuth(settings.SLA_MANAGER_USER,
                                        settings.SLA_MANAGER_PASSWORD)
 
-        for key, values in kwargs.iteritems():
-            print key, values
+        # for key, values in kwargs.iteritems():
+        #     print key, values
 
         result = requests.get(url, **kwargs)
         print "GET {} {} {}".format(
 
         result = requests.get(url, **kwargs)
         print "GET {} {} {}".format(
diff --git a/sla/static/images/sort_asc.png b/sla/static/images/sort_asc.png
new file mode 100644 (file)
index 0000000..a88d797
Binary files /dev/null and b/sla/static/images/sort_asc.png differ
diff --git a/sla/static/images/sort_both.png b/sla/static/images/sort_both.png
new file mode 100644 (file)
index 0000000..8222cdb
Binary files /dev/null and b/sla/static/images/sort_both.png differ
diff --git a/sla/static/images/sort_desc.png b/sla/static/images/sort_desc.png
new file mode 100644 (file)
index 0000000..def071e
Binary files /dev/null and b/sla/static/images/sort_desc.png differ
diff --git a/sla/templates/slice-tab-sla.html b/sla/templates/slice-tab-sla.html
index e0b36ec..2742078 100755 (executable)
--- a/sla/templates/slice-tab-sla.html
+++ b/sla/templates/slice-tab-sla.html
@@ -3,7 +3,7 @@
 </div>
 
  <div class="col-md-9">
 </div>
 
  <div class="col-md-9">
-   <div class="row" id="agreements">
+   <div class="row" id="agreements" style="padding-top:1em;">
     
         
 {% for row in ag_info %}
     
         
 {% for row in ag_info %}
@@ -47,7 +47,7 @@
 
 {% endfor %}
 
 
 {% endfor %}
 
-      <table class="display table table-bordered row-border" id="sla_table">
+      <table class="table table-striped table-bordered" id="sla_table">
       
         <thead>
           <tr> 
       
         <thead>
           <tr> 
myslice (django)