Add icons from open-iconic

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/.gitmodules b/.gitmodules
index 487cbd07a7d19d142f0964c989cdfe14017459b3..51c389df19a5997ae007fa228b2f075d957b5f55 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,7 @@
 [submodule "src/fonts"]
        path = src/fonts
        url = https://github.com/google/fonts.git
+
+[submodule "src/open-iconic"]
+       path = src/open-iconic
+       url = https://github.com/iconic/open-iconic.git

diff --git a/Makefile.am b/Makefile.am
index 5b13675cfc12e5aa9dc428522f1152afd0cd5a2b..d0decf9693147fef46f49215e633023d697a2dc3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -211,7 +211,13 @@ static_fonts_DATA = \
        src/fonts/ofl/mukta/Mukta-Light.ttf \
        src/fonts/ofl/mukta/Mukta-Medium.ttf \
        src/fonts/ofl/mukta/Mukta-Regular.ttf \
-       src/fonts/ofl/mukta/Mukta-SemiBold.ttf
+       src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
+       \
+       src/open-iconic/font/fonts/open-iconic.eot \
+       src/open-iconic/font/fonts/open-iconic.otf \
+       src/open-iconic/font/fonts/open-iconic.svg \
+       src/open-iconic/font/fonts/open-iconic.ttf \
+       src/open-iconic/font/fonts/open-iconic.woff
 
 static_fontsdir = $(staticdir)/fonts
 

diff --git a/src/open-iconic b/src/open-iconic
new file mode 160000 (submodule)
index 0000000..1d1e888
--- /dev/null
+++ b/src/open-iconic
@@ -0,0 +1 @@
+Subproject commit 1d1e8885c5031874b32f4e480e371ce2b1c24144

diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss
index 00220893ad8627c8bf4694354ed40bf829a43e2b..99830cd3fa4ce05aebfab69c5d8f1e52b51d5529 100644 (file)
--- a/src/scss/_fonts.scss
+++ b/src/scss/_fonts.scss
@@ -51,3 +51,6 @@
        src: local("Mukta Bold"), local("Mukta-Bold"), url(fonts/Mukta-Bold.ttf) format("truetype");
        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
+
+// Include icon fonts
+@import "../open-iconic/font/css/open-iconic-bootstrap.scss";

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 015eef484293ca326b85972169d5ee3d0911744a..65ffa7d91f2f4d21cd42a57d4587d820f01796a6 100644 (file)
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -1,3 +1,6 @@
+// Paths
+$icon-font-path:                       "fonts/";
+
 /*
        Colours
 */

diff --git a/src/templates/talk/modules/channels.html b/src/templates/talk/modules/channels.html
index 25ddd7ed56fcc0881a2adfbff17a2b3a0bf4fdef..247fbc676051d03fb9cb1769ca8a74165ab41925 100644 (file)
--- a/src/templates/talk/modules/channels.html
+++ b/src/templates/talk/modules/channels.html
@@ -6,9 +6,9 @@
                                        {% for chan in channels %}
                                                <tr>
                                                        <td>
-                                                               {{ chan.direction }}
-
                                                                {% if chan.direction == "inbound" %}
+                                                                       <span class="oi oi-arrow-right text-danger"></span>
+
                                                                        {% if chan.application == "conference" %}
                                                                                CONFERENCE
 
@@ -31,6 +31,8 @@
                                                                                {{ chan.called_number }}
                                                                        {% end %}
                                                                {% elif chan.direction == "outbound" %}
+                                                                       <span class="oi oi-arrow-right text-success"></span>
+
                                                                        {% if chan.caller %}
                                                                                <a href="/users/{{ chan.caller.uid }}">{{ chan.caller }}</a>
                                                                        {% else %}
@@ -42,7 +44,7 @@
                
                                                                <br>
                
-                                                               <span class="text-muted">
+                                                               <span class="text-muted small">
                                                                        {% if chan.is_secure() %}
                                                                                <!-- XXX icon lock with title: {{ chan.secure }} -->
                                                                        {% end %}