git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b80070e)
css changes
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:10:31 +0000 (19:10 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:10:31 +0000 (19:10 +0100)
portal/static/css/onelab.css patch | blob | history
portal/templates/contact.html patch | blob | history
ui/templates/base.html patch | blob | history

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index dc8932c..e78eb56 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -278,3 +278,29 @@ div#ticket-request {
 div#ticket-request p {
     margin:20px 0;
 }
+
+/* SLICE VIEW */
+div#slice-view {
+    width:100%;
+    margin-top:15px;
+}
+div#slice-view div.list-group-item {
+    border:0;
+    background-color:white;
+    font-weight:bold;
+    padding-left:0;
+}
+div#slice-view a.list-group-item {
+    border:0;
+    background-color:white;
+    padding:3px 0 3px 10px;
+    border-left:2pt white solid;
+}
+div#slice-view a.list-group-item.active, div#slice-view a.list-group-item:hover {
+    border-left:2pt blue solid;
+}
+div#slice-view a.list-group-item p.list-group-item-text {
+    font-size:9pt;
+    font-style:italic;
+}
+
diff --git a/portal/templates/contact.html b/portal/templates/contact.html
index 4bc8218..9f2e30e 100644 (file)
--- a/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@ -8,7 +8,7 @@
 
 
 <div class="wrapper" id="ticket-request">
-<h1><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="Open a Ticket" /> Onelab Support</h1>
+<h1><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="Open a Ticket" /> OneLab Support</h1>
 
 <p>
        If you have any diffculties using the portal, please contact us by filling this form below.<br />
diff --git a/ui/templates/base.html b/ui/templates/base.html
index 3685b10..a79c6b4 100644 (file)
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@ -6,6 +6,9 @@
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% 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/myslice-ui.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 %}
@@ -26,13 +29,11 @@
 </head>
 <body>
 {% block container %}
-  {% block topmenu %}
-  {% include theme|add:"__widget-topmenu.html" %}
-  {% endblock topmenu %}
+       {% block topmenu %}
+       {% include theme|add:"__widget-topmenu.html" %}
+       {% endblock topmenu %}
 {% include 'messages-transient.html' %}
-<div class="container"> <div class="row">
-   {% block base_content%}{% endblock %}
-</div></div>
+       {% block base_content%}{% endblock %}
 {% endblock container %}
 </body>
 </html>
myslice (django)