From bd494207eb3d819ae81548f32fccd92d5cc04cd4 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 20 Aug 2015 13:40:22 -0400
Subject: [PATCH] got rid of that fancy edit for cat name/desc + improved
 layout for settings

---
 public/src/admin/manage/category.js | 16 ---------------
 src/views/admin/manage/category.tpl | 32 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 64633429e4..209e782c7b 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -63,21 +63,6 @@ define('admin/manage/category', [
 			});
 		}
 
-		function setupEditTargets() {
-			$('[data-edit-target]').on('click', function() {
-				var $this = $(this),
-					target = $($this.attr('data-edit-target'));
-
-				$this.addClass('hide');
-				target.removeClass('hide').on('blur', function() {
-					$this.removeClass('hide').children('span').text(this.value).html();
-					$(this).addClass('hide');
-				}).val($this.children('span').html().text());
-
-				target.focus();
-			});
-		}
-
 		// If any inputs have changed, prepare it for saving
 		$('form.category input, form.category select').on('change', function(ev) {
 			modified(ev.target);
@@ -158,7 +143,6 @@ define('admin/manage/category', [
 			});
 		});
 
-		setupEditTargets();
 		Category.setupPrivilegeTable();
 	};
 
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 0719fb40a8..25535dee7d 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -5,28 +5,26 @@
 				<div class="panel-heading"><i class="fa fa-folder"></i> Category Settings</div>
 				<div class="panel-body category-settings-form">
 					<fieldset>
-						<div class="col-xs-12">
-							<h3 data-edit-target="#cid-{category.cid}-name"><span>{category.name}</span> <small><i class="fa fa-edit"></i></small></h3>
-							<input id="cid-{category.cid}-name" type="text" class="form-control hide" placeholder="Category Name" data-name="name" value="{category.name}" />
-							<h4 data-edit-target="#cid-{category.cid}-description"><span>{category.description}</span> <small><i class="fa fa-edit"></i></small></h4>
-							<input id="cid-{category.cid}-description" data-name="description" placeholder="Category Description" value="{category.description}" class="form-control category_description input-sm description hide"></input>
-						</div>
+						<label for="cid-{category.cid}-name">Category Name</label>
+						<input id="cid-{category.cid}-name" type="text" class="form-control" placeholder="Category Name" data-name="name" value="{category.name}" /><br />
+
+						<label for="cid-{category.cid}-description">Category Description</label>
+						<input id="cid-{category.cid}-description" data-name="description" placeholder="Category Description" value="{category.description}" class="form-control category_description description"></input><br />
 					</fieldset>
 
 					<fieldset>
-						<div class="col-xs-12">
-							<div class="form-group">
-								<label for="cid-{category.cid}-parentCid">Parent Category</label>
-								<br/>
-								<div class="btn-group <!-- IF !category.parent.name -->hide<!-- ENDIF !category.parent.name-->">
-									<button type="button" class="btn btn-default" data-action="changeParent" data-parentCid="{category.parent.cid}"><i class="fa {category.parent.icon}"></i> {category.parent.name}</button>
-									<button type="button" class="btn btn-warning" data-action="removeParent" data-parentCid="{category.parent.cid}"><i class="fa fa-times"></i></button>
-								</div>
-								<button type="button" class="btn btn-default form-control <!-- IF category.parent.name -->hide<!-- ENDIF category.parent.name-->" data-action="setParent"><i class="fa fa-sitemap"></i> (None)</button>
+						<div class="form-group">
+							<label for="cid-{category.cid}-parentCid">Parent Category</label>
+							<br/>
+							<div class="btn-group <!-- IF !category.parent.name -->hide<!-- ENDIF !category.parent.name-->">
+								<button type="button" class="btn btn-default" data-action="changeParent" data-parentCid="{category.parent.cid}"><i class="fa {category.parent.icon}"></i> {category.parent.name}</button>
+								<button type="button" class="btn btn-warning" data-action="removeParent" data-parentCid="{category.parent.cid}"><i class="fa fa-times"></i></button>
 							</div>
+							<button type="button" class="btn btn-default <!-- IF category.parent.name -->hide<!-- ENDIF category.parent.name-->" data-action="setParent"><i class="fa fa-sitemap"></i> (None)</button><br />
 						</div>
 					</fieldset>
-					<fieldset>
+
+					<fieldset class="row">
 						<div class="col-sm-4 col-xs-12">
 							<div class="form-group">
 								<label for="cid-{category.cid}-bgColor">Background Colour</label>
@@ -48,7 +46,7 @@
 									<option value="contain">contain</option>
 								</select>
 							</div>
-						</div>
+						</div><br />
 						<div class="col-sm-4 col-xs-12">
 							<div class="form-group">
 								<label for="cid-{category.cid}-class">Custom Class</label>