added confirmation panel on disable owner

public/js/startup.js

@@ -58,6 +58,7 @@ $(document).on('ready', function () {
 		};
 		console.log('[startup] sending register msg');
 		ws.send(JSON.stringify(obj));
+		$(this).prev('button').html('Next Step');
 	});
 
 	// show loading spinner

public/js/ui_building.js

@@ -84,12 +84,17 @@ function build_user_panels(data) {
 
 		console.log('[ui] building owner panel ' + data[i].id);
 
+		let disableHtml = '';
+		if (data[i].company  === escapeHtml(bag.marble_company)) {
+			disableHtml = '<span class="fa fa-trash disableOwner" title="Disable Owner"></span>';
+		}
+
 		html += `<div id="user` + i + `wrap" username="` + data[i].username + `" company="` + data[i].company +
 			`" owner_id="` + data[i].id + `" class="marblesWrap ` + colorClass + `">
 					<div class="legend" style="` + size_user_name(data[i].username) + `">
 						` + toTitleCase(data[i].username) + `
 						<span class="fa fa-thumb-tack marblesFix" title="Never Hide Owner"></span>
-						<span class="fa fa-trash disableOwner" title="Disable Owner"></span>
+						` + disableHtml + `
 					</div>
 					<div class="innerMarbleWrap"><i class="fa fa-plus addMarble"></i></div>
 					<div class="noMarblesMsg hint">No marbles</div>

public/js/ui_events.js

@@ -279,14 +279,25 @@ $(document).on('ready', function () {
 		$('#leftEverything').fadeIn();
 	});
 
-	// disable the marble owner
+	let selectedOwner = null;
+	// show dialog to confirm if they want to disable the marble owner
 	$(document).on('click', '.disableOwner', function () {
+		$('#disableOwnerWrap, #tint').fadeIn();
+		selectedOwner = $(this).parents('.marblesWrap');
+	});
+
+	// disable the marble owner
+	$('#removeOwner').click(function () {
 		var obj = {
 			type: 'disable_owner',
-			owner_id: $(this).parents('.marblesWrap').attr('owner_id')
+			owner_id: selectedOwner.attr('owner_id')
 		};
 		ws.send(JSON.stringify(obj));
-		$(this).parents('.marblesWrap').css('opacity', 0.4);
+		selectedOwner.css('opacity', 0.4);
+	});
+
+	$('.closeDisableOwner, #removeOwner').click(function () {
+		$('#disableOwnerWrap, #tint').fadeOut();
 	});
 });
 

scss/3_global.scss

@@ -680,12 +680,12 @@ $marble_left: 0;
 	margin-top: 15px;
 	padding-top: 15px;
 }
-#closeStartUp, #closeTxStoryPos, #closeSettings, #closeCreate{
+#closeStartUp, #closeTxStoryPos, #closeSettings, #closeCreate, #closePos{
 	position: absolute;
 	right: 15px;
 	top: 15px;
 }
-#closeStartUp:hover, #closeTxStoryPos:hover, #closeSettings:hover, #closeCreate:hover{
+#closeStartUp:hover, #closeTxStoryPos:hover, #closeSettings:hover, #closeCreate:hover, #closePos:hover{
 	color: $hi_color1;
 	cursor: pointer;
 }

scss/disable_owner.scss

@@ -0,0 +1,11 @@
+#disableOwnerWrap{
+	display: none;
+	position: absolute;
+	top: 200px;
+	left: calc(50% - 250px);
+	width: 500px;
+	background: #343d48;
+	padding: 20px 40px;
+	border-radius: 3px;
+	z-index: 1100;
+}

views/marbles.pug

@@ -45,6 +45,9 @@ block content
 
 		// --------------- Settings Panel
 		include ./panel_settings.pug
+
+		// --------------- Disable Owner Panel
+		include ./panel_disable_owner.pug
 
 block footer
 	include ./template/blockchain.pug

views/panel_disable_owner.pug

@@ -0,0 +1,21 @@
+#disableOwnerWrap
+	span.fa.fa-close.closeDisableOwner#closePos
+
+	h2 Remove
+
+	br
+	br
+
+	span Do you want to archive this marble owner?
+
+	br
+	br
+
+	span Their marbles will also be archived.
+
+	br
+	br
+
+	button.closeDisableOwner(style="float:left;") Nope
+	span   
+	button(style="float:right;")#removeOwner Yep

views/panel_startup.pug

@@ -222,7 +222,7 @@
 						span.tooltiptext Enter the names of the marble owners you want created. Seperate them by commas.
 
 			.successStep Step 4 Complete
-			button.nextStep(nextstepid="step5" style="display: inline-block") Next Step
+			button.nextStep(nextstepid="step5" style="display: inline-block") Skip Step
 			button.runStep(stepid="step4" nextstepid="step5")#registerOwners Create
 
 		//----------------- Step 5 Content [Finished]