From 43244328640d87b712abca2dfad18bd1cb90c574 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Oct 2018 13:01:24 +0100
Subject: [PATCH] Add icons from open-iconic

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 .gitmodules                              | 4 ++++
 Makefile.am                              | 8 +++++++-
 src/open-iconic                          | 1 +
 src/scss/_fonts.scss                     | 3 +++
 src/scss/_variables.scss                 | 3 +++
 src/templates/talk/modules/channels.html | 8 +++++---
 6 files changed, 23 insertions(+), 4 deletions(-)
 create mode 160000 src/open-iconic

diff --git a/.gitmodules b/.gitmodules
index 487cbd07..51c389df 100644
--- 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 5b13675c..d0decf96 100644
--- 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
index 00000000..1d1e8885
--- /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 00220893..99830cd3 100644
--- 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 015eef48..65ffa7d9 100644
--- 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 25ddd7ed..247fbc67 100644
--- 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 %}
-- 
2.47.3