Merge pull request #167 from silverstripe-rebelalliance/trac/7450

'updatetreenodes' URL in tree template (#7450)
silverstripe · Jul 23, 2012 · 9d6178b · 9d6178b
2 parents 605b11d + 1717e40
commit 9d6178b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/config.rb b/config.rb
@@ -9,6 +9,7 @@
 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
 

diff --git a/css/screen.css b/css/screen.css
diff --git 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;
 			}
 		}

diff --git 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>