From 491da0cc1ca0c3cac80faef5dcf2b8ade16b0d62 Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Fri, 27 Dec 2013 01:01:17 +0100
Subject: [PATCH] Prepare release

---
 public/res/extensions/documentManager.js      |  5 +-
 public/res/html/bodyIndex.html                | 80 +++++++++----------
 .../res/html/dialogManageSharingLocation.html |  2 +-
 public/res/libs/ace_mode_highlight_rules.js   | 20 ++---
 public/res/styles/main.less                   | 11 ++-
 public/res/themes/school.less                 |  5 +-
 6 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/public/res/extensions/documentManager.js b/public/res/extensions/documentManager.js
index 7749c6ae..15ffd415 100644
--- a/public/res/extensions/documentManager.js
+++ b/public/res/extensions/documentManager.js
@@ -143,7 +143,7 @@ define([
 
         // Root folder
         var documentListHtml = [
-            '<a href="#" class="list-group-item folder clearfix" data-toggle="collapse" data-target=".modal-document-manager .file-list.root-folder">',
+            '<a href="#" class="list-group-item folder root-folder clearfix" data-toggle="collapse" data-target=".modal-document-manager .file-list.root-folder">',
             '<label class="checkbox" title="Select"><input type="checkbox"></label>',
             '<div class="pull-right file-count">',
             _.size(orphanDocumentList),
@@ -281,6 +281,9 @@ define([
 
         // Set checkbox event listeners
         $(documentListElt.querySelectorAll('[type=checkbox]')).change(doActiveButtons);
+        
+        // Open root folder by default
+        $(documentListElt.querySelectorAll('.root-folder')).click();
     }, 50);
 
     documentManager.onFileCreated = refreshManager;
diff --git a/public/res/html/bodyIndex.html b/public/res/html/bodyIndex.html
index d2d50c54..1beb4283 100644
--- a/public/res/html/bodyIndex.html
+++ b/public/res/html/bodyIndex.html
@@ -171,8 +171,8 @@
 				class="action-reset-input list-group-item"><i class="icon-share"></i>
 				Manage publication</a>
 			<a href="#" data-toggle="modal" data-target=".modal-manage-sharing"
-				class="action-reset-input list-group-item"><i class="icon-link"></i>
-				Sharing</a>
+				class="action-reset-input list-group-item"><i class="icon-provider-stackedit"></i>
+				Sharing...</a>
 		</div>
 		<ul class="nav">
 			<li><a href="#" data-toggle="modal"
@@ -993,6 +993,44 @@
 					</div>
 					<div class="tab-pane" id="tabpane-settings-services">
 						<div class="form-horizontal">
+							<div class="form-group">
+								<label class="col-lg-4 control-label"
+									for="input-settings-gdrive-multiaccount">Google Drive multi-accounts</a>
+								</label>
+								<div class="col-lg-7">
+									<select id="input-settings-gdrive-multiaccount" class="form-control">
+    									<option value="1">1 account</option>
+    									<option value="2">2 accounts</option>
+    									<option value="3">3 accounts</option>
+									</select>
+									<span class="help-block"><b>Please sign in first with Google.</b> Once linked with your Google accounts, changing account is not possible unless you reset the application.</span>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-lg-4 control-label">Permissions</label>
+								<div class="col-lg-7">
+									<div class="checkbox">
+									    <label>
+										    <input type="checkbox" id="input-settings-gdrive-full-access" />
+										    Allow StackEdit to open any document in Google Drive
+										</label> <span class="help-block">Any existing token has to be revoked in
+										<a href="https://www.google.com/settings/dashboard" target="_blank">Google Dashboard</a>
+										for this change to take effect.</span>
+									</div>
+								</div>
+							</div>
+							<div class="form-group">
+								<div class="col-lg-4"></div>
+								<div class="col-lg-7">
+									<div class="checkbox">
+									    <label>
+										    <input type="checkbox" id="input-settings-dropbox-full-access" />
+										    Allow StackEdit to open any document in Dropbox
+										</label> <span class="help-block">If unchecked, access will be restricted to folder
+										<b>/Applications/StackEdit</b> for existing files.</span>
+									</div>
+								</div>
+							</div>
 							<div class="form-group">
 								<label class="col-lg-4 control-label"
 									for="textarea-settings-publish-template">Default
@@ -1024,44 +1062,6 @@
 									</select>
 								</div>
 							</div>
-							<div class="form-group">
-								<label class="col-lg-4 control-label"
-									for="input-settings-gdrive-multiaccount">Google Drive multi-accounts</a>
-								</label>
-								<div class="col-lg-7">
-									<select id="input-settings-gdrive-multiaccount" class="form-control">
-    									<option value="1">1 account</option>
-    									<option value="2">2 accounts</option>
-    									<option value="3">3 accounts</option>
-									</select>
-									<span class="help-block"><b>Please sign in with Google first.</b> Once linked with your Google accounts, changing account is not possible unless you reset the application.</span>
-								</div>
-							</div>
-							<div class="form-group">
-								<label class="col-lg-4 control-label">Permissions</label>
-								<div class="col-lg-7">
-									<div class="checkbox">
-									    <label>
-										    <input type="checkbox" id="input-settings-gdrive-full-access" />
-										    Allow StackEdit to open any document in Google Drive
-										</label> <span class="help-block">Any existing token has to be revoked in
-										<a href="https://www.google.com/settings/dashboard" target="_blank">Google Dashboard</a>
-										for this change to take effect.</span>
-									</div>
-								</div>
-							</div>
-							<div class="form-group">
-								<div class="col-lg-4"></div>
-								<div class="col-lg-7">
-									<div class="checkbox">
-									    <label>
-										    <input type="checkbox" id="input-settings-dropbox-full-access" />
-										    Allow StackEdit to open any document in Dropbox
-										</label> <span class="help-block">If unchecked, access will be restricted to folder
-										<b>/Applications/StackEdit</b> for existing files.</span>
-									</div>
-								</div>
-							</div>
 							<div class="form-group">
 								<label class="col-lg-4 control-label"
 									for="input-settings-publish-commit-msg">GitHub commit message</label>
diff --git a/public/res/html/dialogManageSharingLocation.html b/public/res/html/dialogManageSharingLocation.html
index 16237f68..b425239c 100644
--- a/public/res/html/dialogManageSharingLocation.html
+++ b/public/res/html/dialogManageSharingLocation.html
@@ -1,5 +1,5 @@
 <div class="input-group">
 	<a href="<%= link %>" class="input-group-addon" title="Sharing location"><i
-		class="icon-link"></i></a> <input class="form-control" type="text"
+		class="icon-provider-stackedit"></i></a> <input class="form-control" type="text"
 		value="<%= link %>" disabled />
 </div>
diff --git a/public/res/libs/ace_mode_highlight_rules.js b/public/res/libs/ace_mode_highlight_rules.js
index 80b81ea7..1dbd3882 100644
--- a/public/res/libs/ace_mode_highlight_rules.js
+++ b/public/res/libs/ace_mode_highlight_rules.js
@@ -56,20 +56,20 @@ var MarkdownHighlightRules = function() {
         next : "header"
     },
     { // Github style block
-        token : "code_block",
+        token : "constant.language.escape",
         regex : "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$",
         next  : "githubblock"
     }, { // block quote
-        token : "blockquote",
-        regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+        token : ["constant.language.escape", "blockquote"],
+        regex : "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)",
         next  : "blockquote"
     }, { // HR * - _
         token : "constant",
         regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$",
         next: "allowBlock"
     }, { // list
-        token : "markup.list",
-        regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+        token : ["constant.language.escape", "markup.list"],
+        regex : "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)",
         next  : "listblock-start"
     }, { // Math block
         token : "constant.language.escape",
@@ -151,8 +151,8 @@ var MarkdownHighlightRules = function() {
             regex : "^$",
             next  : "start"
         }, { // list
-            token : "markup.list",
-            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+            token : ["constant.language.escape", "markup.list"],
+            regex : "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)",
             next  : "listblock-start"
         }, {
             include : "basic", noEscape: true
@@ -165,8 +165,8 @@ var MarkdownHighlightRules = function() {
             regex : "^\\s*$",
             next  : "start"
         }, { // block quote
-            token : "blockquote",
-            regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+            token : ["constant.language.escape", "blockquote"],
+            regex : "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)",
             next  : "blockquote"
         }, {
             include : "basic", noEscape: true
@@ -175,7 +175,7 @@ var MarkdownHighlightRules = function() {
         } ],
 
         "githubblock" : [ {
-            token : "code_block",
+            token : "constant.language.escape",
             regex : "^```",
             next  : "start"
         }, {
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index f807af7e..45316500 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -35,10 +35,10 @@
 
 // Editor
 @tertiary-bg: #fff;
-@tertiary-color-light: fade(@tertiary-color, 75%);
-@tertiary-color: desaturate(@tertiary, 85%);
-@tertiary-color-dark: darken(@tertiary-color, 20%);
-@tertiary-color-darker: darken(@tertiary-color, 40%);
+@tertiary-color-light: fade(@tertiary-color, 60%);
+@tertiary-color: darken(@secondary-desaturated, 7.5%);
+@tertiary-color-dark: darken(@tertiary-color, 15%);
+@tertiary-color-darker: darken(@tertiary-color, 30%);
 
 // Panel buttons
 @panel-button-bg-color: #FFF;
@@ -1074,8 +1074,7 @@ a {
 	}
 	
 	.ace_link {
-	    color: @tertiary-color;
-		background-color: @code-bg;
+	    color: @tertiary-color-light;
 	}
 	
 	.ace_description {
diff --git a/public/res/themes/school.less b/public/res/themes/school.less
index d30931b0..b3634eca 100644
--- a/public/res/themes/school.less
+++ b/public/res/themes/school.less
@@ -1,7 +1,7 @@
 @import "../styles/main.less";
 
 @board-color: #385E50;
-@board-border-color: #B9AA9F;
+@board-border-color: #B9B39F;
 @blue-ink: #284F72;
 @black-ink: #444;
 @red-ink: #B56E85;
@@ -10,12 +10,11 @@
 @primary: desaturate(darken(@board-border-color, 20%), 20%);
 @primary-color: lighten(@blue-ink, 30%);
 @secondary-color: lighten(@blue-ink, 20%);
-@tertiary-color: lighten(@blue-ink, 30%);
+@tertiary-color: desaturate(lighten(@blue-ink, 20%), 20%);
 @secondary: @primary;
 @tertiary: @primary;
 @primary-desaturated: @primary;
 @secondary-desaturated: darken(@board-border-color, 19%);
-@tertiary-desaturated: @tertiary;
 @primary-border-color: @navbar-default-bg;
 @modal-backdrop-bg: @primary;
 @btn-success-color: #eee;