]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
DASH: use fontawesome v4.7.0 icons
authorPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Tue, 10 Oct 2017 13:24:48 +0000 (15:24 +0200)
committerPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Tue, 10 Oct 2017 13:24:48 +0000 (15:24 +0200)
python_suite/dashboard/static/images/clipboard.svg [deleted file]
python_suite/dashboard/views/base_bootstrap.jinja2
python_suite/dashboard/views/pv_details_bootstrap.jinja2
python_suite/dashboard/views/pv_overview_bootstrap.jinja2

diff --git a/python_suite/dashboard/static/images/clipboard.svg b/python_suite/dashboard/static/images/clipboard.svg
deleted file mode 100644 (file)
index db2c56d..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg3336"
-   width="896"
-   height="1024">
-  <metadata
-     id="metadata3344">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3342" />
-  <path
-     id="path3338"
-     d="M128 768h256v64H128v-64z m320-384H128v64h320v-64z m128 192V448L384 640l192 192V704h320V576H576z m-288-64H128v64h160v-64zM128 704h160v-64H128v64z m576 64h64v128c-1 18-7 33-19 45s-27 18-45 19H64c-35 0-64-29-64-64V192c0-35 29-64 64-64h192C256 57 313 0 384 0s128 57 128 128h192c35 0 64 29 64 64v320h-64V320H64v576h640V768zM128 256h512c0-35-29-64-64-64h-64c-35 0-64-29-64-64s-29-64-64-64-64 29-64 64-29 64-64 64h-64c-35 0-64 29-64 64z" />
-</svg>
index a614dbed53ad3b2792b584451276b4141dffbf75..93e185c74a782df33ceec5c480b1c3fca1c2235a 100644 (file)
@@ -19,6 +19,8 @@
     }
     </style>
 
+    <link rel="stylesheet" href="/static/external/fontawesome/css/font-awesome.min.css">
+
     {% block header %}
     <!-- Custom Head Section -->
     {% endblock %}
index 8053890db1b50dbd2e779796739fe2e38ce706b1..33e519ba95c188280c36ad03b3df1836e55aa488 100644 (file)
@@ -28,9 +28,9 @@
 <div class="pv-block value indicator {{ PV.classes }}">
        <div class="error"></div>
        <div class="btn-group">
-               <a class="btn btn-sm btn-outline-primary btn-pv" href="/pv/{{ PV.name }}" title="{{ PV.name }}">PV</a>
+               <a class="btn btn-sm btn-outline-primary btn-pv" href="/pv/{{ PV.name }}" title="{{ PV.name }}"><i class="fa fa-info"></i></a>
                <button type="button" class="btn btn-sm btn-outline-primary btn-copy js-tooltip js-copy" data-toggle="tooltip" data-placement="bottom" data-copy="{{ PV.name }}" title="Copy PV name to clipboard">
-                       <img class="icon" src="/static/images/clipboard.svg">
+                       <i class="fa fa-clipboard"></i>
                </button>
        </div>
        <div class="value-unit-box" style="display: inline-block;">
index 3a8cd1e4a78b9f64bb8006486c3acdfc38a00cba..df052d9ed1c3051eaff8ac54eef1feb692c58e67 100644 (file)
@@ -26,9 +26,9 @@
                                                <div class="error"></div>
                                                <div class="pvname" style="overflow-wrap:break-word;">{{ PV.alias or PV.name }}</div>
                                                <div class="btn-group">
-                                                       <a class="btn btn-sm btn-outline-primary btn-pv js-tooltip" data-toggle="tooltip" data-placement="bottom" href="/pv/{{ PV.name }}" title="{{ PV.name }}">PV</a>
+                                                       <a class="btn btn-sm btn-outline-primary btn-pv js-tooltip" data-toggle="tooltip" data-placement="bottom" href="/pv/{{ PV.name }}" title="{{ PV.name }}"><i class="fa fa-info"></i></a>
                                                        <button type="button" class="btn btn-sm btn-outline-primary btn-copy js-tooltip js-copy" data-toggle="tooltip" data-placement="bottom" data-copy="{{ PV.name }}" title="Copy PV name to clipboard">
-                                                               <img class="icon" src="/static/images/clipboard.svg">
+                                                               <i class="fa fa-clipboard"></i>
                                                        </button>
                                                </div>
                                                <div class="value-unit-box" style="display: inline-block;">