From 20dd8c89d8ea2ac8035165d336800f9b553b2311 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 9 Dec 2014 19:18:41 -0500
Subject: [PATCH] Remove "CSL" column in Cite -> Styles preferences

---
 chrome/content/zotero/preferences/preferences_cite.js  | 6 ------
 chrome/content/zotero/preferences/preferences_cite.xul | 5 ++---
 chrome/skin/default/zotero/preferences.css             | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_cite.js b/chrome/content/zotero/preferences/preferences_cite.js
index bb14d1d228..b5c3b2d7f5 100644
--- a/chrome/content/zotero/preferences/preferences_cite.js
+++ b/chrome/content/zotero/preferences/preferences_cite.js
@@ -66,7 +66,6 @@ Zotero_Preferences.Cite = {
 			var treerow = document.createElement('treerow');
 			var titleCell = document.createElement('treecell');
 			var updatedCell = document.createElement('treecell');
-			var cslCell = document.createElement('treecell');
 			
 			if (style.updated) {
 				var updatedDate = Zotero.Date.formatDate(Zotero.Date.strToDate(style.updated), true);
@@ -78,14 +77,9 @@ Zotero_Preferences.Cite = {
 			treeitem.setAttribute('id', 'zotero-csl-' + style.styleID);
 			titleCell.setAttribute('label', style.title);
 			updatedCell.setAttribute('label', updatedDate);
-			// if not EN
-			if(style.type == "csl") {
-				cslCell.setAttribute('src', 'chrome://zotero/skin/tick.png');
-			}
 			
 			treerow.appendChild(titleCell);
 			treerow.appendChild(updatedCell);
-			treerow.appendChild(cslCell);
 			treeitem.appendChild(treerow);
 			treechildren.appendChild(treeitem);
 			
diff --git a/chrome/content/zotero/preferences/preferences_cite.xul b/chrome/content/zotero/preferences/preferences_cite.xul
index 07d3307687..0ee500f6cc 100644
--- a/chrome/content/zotero/preferences/preferences_cite.xul
+++ b/chrome/content/zotero/preferences/preferences_cite.xul
@@ -58,9 +58,8 @@
 								onselect="document.getElementById('styleManager-delete').disabled = undefined"
 								onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { Zotero_Preferences.Cite.deleteSelectedStyle(); }">
 							<treecols>
-								<treecol id="styleManager-title" label="&zotero.preferences.cite.styles.styleManager.title;" flex="3"/>
-								<treecol id="styleManager-updated" label="&zotero.preferences.cite.styles.styleManager.updated;" flex="1"/>
-								<treecol id="styleManager-csl" label="&zotero.preferences.cite.styles.styleManager.csl;"/>
+								<treecol id="styleManager-title" label="&zotero.preferences.cite.styles.styleManager.title;" flex="1"/>
+								<treecol id="styleManager-updated" label="&zotero.preferences.cite.styles.styleManager.updated;"/>
 							</treecols>
 							<treechildren id="styleManager-rows"/>
 						</tree>
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index dde144968f..080b8d4d0d 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -247,9 +247,9 @@ grid row hbox:first-child
 	-moz-box-align: center;
 }
 
-#styleManager-csl
+#styleManager-updated
 {
-	width: 36px;
+	width: 105px;
 }
 
 #zotero-prefpane-keys textbox