From 1a69e7a82418690d95ae4d5ac8c826cf1b85f09b Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Mon, 17 Feb 2020 12:27:29 -0500
Subject: [PATCH] Add buttons to del/move tabs in edit mode

---
 code/modules/vchat/css/ss13styles.css |  4 ++
 code/modules/vchat/html/vchat.html    |  5 +-
 code/modules/vchat/js/vchat.js        | 92 ++++-----------------------
 3 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css
index d95c5dffad3..a9783cdfaf8 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -27,6 +27,10 @@
 	cursor: pointer;
 }
 
+.icon-left-open-outline:hover, .icon-right-open-outline:hover, .icon-cancel-circled-outline:hover {
+	color: red;
+}
+
 body.inverted {
 	background-color: #111111;
 }
diff --git a/code/modules/vchat/html/vchat.html b/code/modules/vchat/html/vchat.html
index 24ad6581f3a..6e254a36160 100644
--- a/code/modules/vchat/html/vchat.html
+++ b/code/modules/vchat/html/vchat.html
@@ -25,8 +25,11 @@
 
 	<!-- Top menu -->
 	<div class="ui top fixed pointing menu" :class="{ inverted: inverted }">
-		<div v-for="tab in tabs" class="item" :class="{ active: tab.active, inverted: inverted }" @click="switchtab(tab)" @click.ctrl="editmode">
+		<div v-for="(tab,index) in tabs" class="item" :class="{ active: tab.active, inverted: inverted }" @click="switchtab(tab)" @click.ctrl="editmode">
+			<i v-show="editing && !tab.immutable && index >= 2" class="icon-left-open-outline" @click.stop.prevent="movetab(tab,-1)" title="Move tab left"></i>
 			{{tab.name}}
+			<i v-show="editing && !tab.immutable" class="icon-cancel-circled-outline" @click.stop.prevent="deltab(tab)" title="Delete tab"></i>
+			<i v-show="editing && !tab.immutable && index != tabs.length-1" class="icon-right-open-outline" @click.stop.prevent="movetab(tab,1)" title="Move tab right"></i>
 			<div v-if="tab_unread_count(tab) > 0" class="ui top right attached red label">{{tab_unread_count(tab)}}</div>
 		</div>
 		
diff --git a/code/modules/vchat/js/vchat.js b/code/modules/vchat/js/vchat.js
index 497cfb7ff19..eec9ac172da 100644
--- a/code/modules/vchat/js/vchat.js
+++ b/code/modules/vchat/js/vchat.js
@@ -346,13 +346,23 @@ function start_vue() {
 				tabtorename.name = newname;
 			},
 			//Delete the currently active tab
-			deltab: function() {
-				if(this.active_tab.immutable) {
+			deltab: function(tab) {
+				if(!tab) {
+					tab = this.active_tab;
+				}
+				if(tab.immutable) {
 					return;
 				}
-				var doomed_tab = this.active_tab;
 				this.switchtab(this.tabs[0]);
-				this.tabs.splice(this.tabs.indexOf(doomed_tab), 1);
+				this.tabs.splice(this.tabs.indexOf(tab), 1);
+			},
+			movetab: function(tab, shift) {
+				if(!tab || tab.immutable) {
+					return;
+				}
+				var at = this.tabs.indexOf(tab);
+				var to = at + shift;
+				this.tabs.splice(to, 0, this.tabs.splice(at, 1)[0]);
 			},
 			tab_unread_count: function(tab) {
 				var unreads = 0;
@@ -703,77 +713,3 @@ function doWinset(control_id, params) {
 	}).join("&");
 	window.location = url;
 }
-
-/***********
-*
-* Vue Components
-*
-************/
-
-
-/*
-	Classes of note (02-06-2020 vorestation):
-	------ 'Local Chat' ------
-	.say = say (includes whispers which just have <i>)
-	.emote = emote (includes subtles which just have <i>)
-	.ooc .looc = looc
-
-	------ 'Radio' ------
-	.alert = global announcer (join messages, etc, the fake radios)
-	.syndradio
-	.centradio
-	.airadioc
-	.entradio
-	.comradio
-	.secradio
-	.engradio
-	.medradio
-	.sciradio
-	.supradio
-	.srvradio
-	.expradio
-	.radio = radio fallback
-
-	------ 'Warnings' ------
-	.critical = BIGGEST warnings?? rarely used
-	.danger = generally BIG warnings
-	.userdanger = ??
-	.warning = generally smol warnings
-	.italics = stupid, should be replaced with warning
-
-	------ 'Info' ------
-	.notice = generally notifications
-	.adminnotice = server malfunctions
-	.info = antag role info only?
-	.sinister = cult things, equivalent of fancy notice
-	.cult = cult things, equivalent of fancy notice
-
-	------ 'Deadchat' ------
-	.deadsay = dsay
-
-	------ 'Global OOC' ------
-	.ooc :not(.looc) = ooc (global)
-
-	------ 'Admin PM' ------
-	.pm = adminpm
-
-	------ 'Admin Chat' ------
-	.admin_channel = asay
-
-	------ 'Mod Chat' ------
-	.mod_channel = msay
-
-	------ 'Event Chat' ------
-	.event_channel = esay
-
-	------ 'System' ------
-	.boldannounce = server announcements/bootup messages
-
-	//Unused for now
-	.ooc .aooc = aooc
-	.ooc .admin = admin speaking in ooc
-	.ooc .event_manager = em speaking in ooc
-	.ooc .developer = dev speaking in ooc
-	.ooc .moderator = mod speaking in ooc
-	.ooc .elevated = staff that it can't find a style for speaking in ooc
-*/
\ No newline at end of file