tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Adding classes and markup necessary to style tree before jstree.js loads

Browse Source
This commit is contained in:
Ingo Schommer 2011-03-18 08:32:23 +13:00
parent 91995ad73b
commit 6e60314006
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/LeftAndMain.php
View File

@ -517,9 +517,10 @@ class LeftAndMain extends Controller {
// getChildrenAsUL is a flexible and complex way of traversing the tree // getChildrenAsUL is a flexible and complex way of traversing the tree
$titleEval = ' $titleEval = '
"<li id=\"record-$child->ID\" data-id=\"$child->ID\" class=\"" . $child->CMSTreeClasses($extraArg) . "\">" . "<li id=\"record-$child->ID\" data-id=\"$child->ID\" class=\"" . $child->CMSTreeClasses($extraArg) . "\">" .
"<ins class=\"jstree-icon\">&nbsp;</ins>" .
"<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" title=\"' "<a href=\"" . Controller::join_links(substr($extraArg->Link(),0,-1), "show", $child->ID) . "\" title=\"'
. _t('LeftAndMain.PAGETYPE','Page type: ') . _t('LeftAndMain.PAGETYPE','Page type: ')
. '".$child->class."\" >" . ($child->TreeTitle) . . '".$child->class."\" ><ins class=\"jstree-icon\">&nbsp;</ins>" . ($child->TreeTitle) .
"</a>" "</a>"
'; ';

17
css/cms_left.css
View File

@ -272,6 +272,23 @@ ul.contextMenu li a:hover {
text-decoration: none; text-decoration: none;
} }
/* Tree */
/* Added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree */
.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; }
.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; }
.jstree-rtl li { margin-left:0; margin-right:18px; }
.jstree > ul > li { margin-left:0px; }
.jstree-rtl > ul > li { margin-right:0px; }
.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; }
.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; }
.jstree a:focus { outline: none; }
.jstree a > ins { height:16px; width:16px; }
.jstree a > .jstree-icon { margin-right:3px; }
.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; }
li.jstree-open > ul { display:block; }
li.jstree-closed > ul { display:none; }
ul.tree span.untranslated a:link, ul.tree span.untranslated a:link,
ul.tree span.untranslated a:hover, ul.tree span.untranslated a:hover,
ul.tree span.untranslated a:visited { ul.tree span.untranslated a:visited {

2
templates/Includes/AssetAdmin_left.ss
View File

@ -36,7 +36,7 @@
</label> </label>
</div> </div>
<div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)"> <div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
$SiteTreeAsUL $SiteTreeAsUL
</div> </div>

2
templates/Includes/CMSMain_left.ss
View File

@ -7,7 +7,7 @@
<div id="TreeTools"> <div id="TreeTools">
<% include CMSMain_TreeTools %> <% include CMSMain_TreeTools %>
</div> </div>
<div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)"> <div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
$SiteTreeAsUL $SiteTreeAsUL
</div> </div>
</div> </div>

2
templates/Includes/ReportAdmin_left.ss
View File

@ -10,7 +10,7 @@
</h3> </h3>
<div id="sitetree_holder"> <div id="sitetree_holder">
<div id="sitetree_and_tools"> <div id="sitetree_and_tools">
<div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)"> <div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
<% include ReportAdmin_SiteTree %> <% include ReportAdmin_SiteTree %>
</div> </div>
</div> </div>

2
templates/Includes/SecurityAdmin_left.ss
View File

@ -36,7 +36,7 @@
</label> </label>
</div> </div>
<div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)"> <div id="sitetree_ul" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
$SiteTreeAsUL $SiteTreeAsUL
</div> </div>