From e0470c8b2b2c4e80d35b0952ffe42bf6ff711efa Mon Sep 17 00:00:00 2001
From: Christopher Fullarton <christopher@fullarton.eu>
Date: Wed, 1 Jun 2016 08:24:10 +0200
Subject: [PATCH 1/2] Use new icons for the buttons and change color to green
 when active

---
 .../layout/view_hashtag_management/scripts/events.js      | 2 +-
 .../view_hashtag_management/templates/hashtag_view.html   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arsnova.click/client/layout/view_hashtag_management/scripts/events.js b/arsnova.click/client/layout/view_hashtag_management/scripts/events.js
index 31d0e0482..a73042b28 100644
--- a/arsnova.click/client/layout/view_hashtag_management/scripts/events.js
+++ b/arsnova.click/client/layout/view_hashtag_management/scripts/events.js
@@ -64,7 +64,7 @@ Template.hashtagView.events({
 			});
 		}));
 		let addNewHashtagItem = $("#addNewHashtag");
-		addNewHashtagItem.html(TAPi18n.__("view.hashtag_management.create_session") + '<span class="glyphicon glyphicon-plus glyph-right" aria-hidden="true"></span>');
+		addNewHashtagItem.html(TAPi18n.__("view.hashtag_management.create_session") + '<span class="glyphicon glyphicon-pencil glyph-right" aria-hidden="true"></span>');
 		if (lib.trimIllegalChars(inputHashtag).length === 0) {
 			addNewHashtagItem.attr("disabled", "disabled");
 			return;
diff --git a/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html b/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
index d0218a866..aeabb1e4e 100644
--- a/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
+++ b/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
@@ -29,13 +29,13 @@
 			</div>
 			<div class="row distance-top">
 				<div class="col-xs-6 col-join-session">
-					<button id="joinSession" class="button button-purple" disabled><span
-							class="glyphicon glyphicon-share-alt glyph-left" aria-hidden="true"></span>{{_ "view.hashtag_management.join_session"}}
+					<button id="joinSession" class="button button-success" disabled><span
+							class="glyphicon glyphicon-thumbs-up glyph-left" aria-hidden="true"></span>{{_ "view.hashtag_management.join_session"}}
 					</button>
 				</div>
 				<div class="col-xs-6 col-create-session">
-					<button id="addNewHashtag" class="button button-warning" disabled>{{_ "view.hashtag_management.create_session"}}<span
-							class="glyphicon glyphicon-plus glyph-right" aria-hidden="true"></span>
+					<button id="addNewHashtag" class="button button-success" disabled>{{_ "view.hashtag_management.create_session"}}<span
+							class="glyphicon glyphicon-pencil glyph-right" aria-hidden="true"></span>
 					</button>
 				</div>
 			</div>
-- 
GitLab


From 10452f8c9838303bc66e327467f0da064e3bc113 Mon Sep 17 00:00:00 2001
From: Christopher Fullarton <christopher@fullarton.eu>
Date: Wed, 1 Jun 2016 08:25:22 +0200
Subject: [PATCH 2/2] Use correct xhtml syntax for disabled buttons

---
 .../view_hashtag_management/templates/hashtag_view.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html b/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
index aeabb1e4e..5c1787ea2 100644
--- a/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
+++ b/arsnova.click/client/layout/view_hashtag_management/templates/hashtag_view.html
@@ -29,12 +29,12 @@
 			</div>
 			<div class="row distance-top">
 				<div class="col-xs-6 col-join-session">
-					<button id="joinSession" class="button button-success" disabled><span
+					<button id="joinSession" class="button button-success" disabled="disabled"><span
 							class="glyphicon glyphicon-thumbs-up glyph-left" aria-hidden="true"></span>{{_ "view.hashtag_management.join_session"}}
 					</button>
 				</div>
 				<div class="col-xs-6 col-create-session">
-					<button id="addNewHashtag" class="button button-success" disabled>{{_ "view.hashtag_management.create_session"}}<span
+					<button id="addNewHashtag" class="button button-success" disabled="disabled">{{_ "view.hashtag_management.create_session"}}<span
 							class="glyphicon glyphicon-pencil glyph-right" aria-hidden="true"></span>
 					</button>
 				</div>
-- 
GitLab