From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 14:06:43 +0000 (+0200)
Subject: use django-bootstrap3 css plus patches
X-Git-Tag: 1.6.1~1^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=db09604dc26001edbbd4649b5377b3058662ab52;p=telemeta.git

use django-bootstrap3 css plus patches
---

diff --git a/telemeta/static/telemeta/css/bootstrap.css b/telemeta/static/telemeta/css/bootstrap.css
index b4695123..8988a0f7 100644
--- a/telemeta/static/telemeta/css/bootstrap.css
+++ b/telemeta/static/telemeta/css/bootstrap.css
@@ -299,6 +299,9 @@ th {
 .glyphicon-pencil:before {
   content: "\270f";
 }
+.glyphicon-copy:before {
+  content: "\e205";
+}
 .glyphicon-glass:before {
   content: "\e001";
 }
diff --git a/telemeta/static/telemeta/css/telemeta-more.css b/telemeta/static/telemeta/css/telemeta-more.css
new file mode 100644
index 00000000..0362b380
--- /dev/null
+++ b/telemeta/static/telemeta/css/telemeta-more.css
@@ -0,0 +1,22 @@
+a, a:visited {
+    color: #BB0000;
+    text-decoration:none;
+}
+a:hover {
+    background-color: transparent;
+    color: #BB0000;
+    text-decoration: underline;
+}
+
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+  z-index: 2;
+  color: #fff;
+  cursor: default;
+  background-color: #6a0307;
+  border-color: #6a0307;
+}
diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 69397cc3..3db1eba3 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -32,7 +32,8 @@
 
 {% block stylesheets %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta.css" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/bootstrap.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}bootstrap/dist/css/bootstrap.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta-more.css" />
 
 <!--[if IE]>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie.css" />
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 4b539b3e..c3a66944 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -108,7 +108,7 @@
     </a>
     <a href="{% url "telemeta-item-copy" item.public_id %}">
       <button type="button" class="btn btn-default">
-        <span class="glyphicon glyphicon-new-window"></span> {% trans "Copy" %}
+        <span class="glyphicon glyphicon-copy"></span> {% trans "Copy" %}
       </button>
     </a>
     {% endif %}
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index 92f39909..c363fc4c 100644
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -46,7 +46,7 @@ jQuery(document).ready(function(){
     </a>
     <a href="{% url "telemeta-resource-copy" type resource.public_id %}">
       <button type="button" class="btn btn-default">
-        <span class="glyphicon glyphicon-new-window"></span> {% trans "Copy" %}
+        <span class="glyphicon glyphicon-copy"></span> {% trans "Copy" %}
       </button>
     </a>
     {% endif %}
@@ -139,4 +139,3 @@ jQuery(document).ready(function(){
 {% else %}
     <p>{% trans "No such resource" %}</p>
 {% endif %}
-