From 2ba3fbe42d3cf4b5a8608c925f735a09f2109a59 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 17 Jul 2012 22:19:25 +0200
Subject: [PATCH 1/3] 'updatetreenodes' URL in tree template (#7450)

---
 templates/Includes/CMSMain_TreeView.ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss
index 248a977d..9c54d888 100644
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@@ -22,7 +22,7 @@ $ExtraTreeTools
 	</div>
 	<% end_if %>
 
-	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-addpage="{$LinkPageAdd}AddForm/?action_doAdd=1&amp;ParentID=%s&amp;PageType=%s&amp;SecurityID=$SecurityID" data-url-editpage="$LinkPageEdit('%s')" data-hints="$SiteTreeHints">
+	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd}AddForm/?action_doAdd=1&amp;ParentID=%s&amp;PageType=%s&amp;SecurityID=$SecurityID" data-url-editpage="$LinkPageEdit('%s')" data-hints="$SiteTreeHints">
 		$SiteTreeAsUL
 	</div>
 </div>

From ace2dfe54f17408068bd2c5f7a770f84314df4a9 Mon Sep 17 00:00:00 2001
From: Hamish Friedlander <hamish@silverstripe.com>
Date: Mon, 23 Jul 2012 22:15:42 +1200
Subject: [PATCH 2/3] Make compass not include line number comments

---
 config.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.rb b/config.rb
index 7838e4dc..f685460d 100644
--- a/config.rb
+++ b/config.rb
@@ -9,6 +9,7 @@ sass_dir = "scss"
 images_dir = "images"
 javascripts_dir = "javascript"
 output_style = :compact
+line_comments = false
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true
 

From 1717e400f61495b6b5cbeea3b1f53939b48d03b7 Mon Sep 17 00:00:00 2001
From: Hamish Friedlander <hamish@silverstripe.com>
Date: Mon, 23 Jul 2012 22:16:39 +1200
Subject: [PATCH 3/3] Always show badge on current page in side tree

---
 css/screen.css     | 2 +-
 scss/_CMSMain.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/screen.css b/css/screen.css
index 4d793a86..5b88d57d 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -18,7 +18,7 @@
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; position: absolute; top: 8px; right: 4px; }
 .cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
 .cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge { display: inline-block; }
+.cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge, .cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked > .text > .badge { display: inline-block; }
 
 /** ------------------------------------------------------------------ URLSegment field ----------------------------------------------------------------- */
 .field.urlsegment.disabled { color: #444; padding-left: 0px; margin-left: 0px; background: none; border-color: transparent; }
diff --git a/scss/_CMSMain.scss b/scss/_CMSMain.scss
index ab71f649..35f6c4f7 100644
--- a/scss/_CMSMain.scss
+++ b/scss/_CMSMain.scss
@@ -84,7 +84,7 @@
 			}
 
 			// Show badge on hovered node
-			a:hover > .text > .badge {
+			a:hover > .text > .badge, .jstree-clicked > .text > .badge {
 				display: inline-block;
 			}
 		}