tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: #6579 Show page status in page tree (pull request #142 from wolfv/sapphire)

This commit is contained in:
wolfv 2011-12-29 09:55:25 +01:00 committed by Ingo Schommer
parent 2a429c9850
commit 2ccda564ca
3 changed files with 92 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/LeftAndMain.php
View File

@ -1339,4 +1339,4 @@ class LeftAndMainMarkingFilter {
return array_key_exists((int) $id, $this->ids) ? $this->ids[$id] : false;
}
}
?>
?>

11
admin/css/screen.css
View File

@ -461,11 +461,12 @@ body.ArrayData .Actions { z-index: 100; position: fixed; bottom: 3px; right: 20p
.cms-tree.jstree-apple li.Root strong, body.ArrayData .jstree-apple li.Root strong { font-weight: bold; padding-left: 1px; }
.cms-tree.jstree-apple li.Root > a .jstree-icon, body.ArrayData .jstree-apple li.Root > a .jstree-icon { background-position: -56px -36px; }
.cms-tree.jstree-apple a, .cms-tree.jstree-apple a:link, body.ArrayData .jstree-apple a, body.ArrayData .jstree-apple a:link { color: #1556b2; padding: 3px 6px 3px 3px; border: none; display: inline-block; margin-right: 5px; }
.cms-tree.jstree-apple a span.status:after, .cms-tree.jstree-apple a:link span.status:after, body.ArrayData .jstree-apple a span.status:after, body.ArrayData .jstree-apple a:link span.status:after { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; }
.cms-tree.jstree-apple span.modified:after, body.ArrayData .jstree-apple span.modified:after { content: "draft"; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms-tree.jstree-apple span.new:after, body.ArrayData .jstree-apple span.new:after { content: "new"; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms-tree.jstree-apple span.private:after, body.ArrayData .jstree-apple span.private:after { content: "private"; color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
.cms-tree.jstree-apple span.workflow-approval:after, body.ArrayData .jstree-apple span.workflow-approval:after { content: "awaiting approval"; color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; }
.cms-tree.jstree-apple span.badge, body.ArrayData .jstree-apple span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; }
.cms-tree.jstree-apple span.badge.modified, body.ArrayData .jstree-apple span.badge.modified { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms-tree.jstree-apple span.badge.addedtodraft, body.ArrayData .jstree-apple span.badge.addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms-tree.jstree-apple span.badge.deletedonlive, body.ArrayData .jstree-apple span.badge.deletedonlive { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
.cms-tree.jstree-apple span.badge.removedfromdraft, body.ArrayData .jstree-apple span.badge.removedfromdraft { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; }
.cms-tree.jstree-apple span.badge.workflow-approval, body.ArrayData .jstree-apple span.badge.workflow-approval { color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; }
.cms-tree.jstree-apple span.comment-count, body.ArrayData .jstree-apple span.comment-count { clear: both; position: relative; text-transform: uppercase; display: inline-block; overflow: visible; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; }
.cms-tree.jstree-apple span.comment-count:before, body.ArrayData .jstree-apple span.comment-count:before { content: ""; position: absolute; bottom: -4px; /* value = - border-top-width - border-bottom-width */ left: 3px; /* controls horizontal position */ border-width: 4px 4px 0; border-style: solid; border-color: #C9B800 transparent; /* reduce the damage in FF3.0 */ display: block; width: 0; }
.cms-tree.jstree-apple span.comment-count:after, body.ArrayData .jstree-apple span.comment-count:after { content: ""; position: absolute; bottom: -3px; /* value = - border-top-width - border-bottom-width */ left: 4px; /* value = (:before left) + (:before border-left) - (:after border-left) */ border-width: 3px 3px 0; border-style: solid; border-color: #FFF0BC transparent; /* reduce the damage in FF3.0 */ display: block; width: 0; }

170
admin/scss/_tree.scss
View File

@ -398,93 +398,93 @@
border: none;
display: inline-block;
margin-right: 5px;
& span.status:after {
clear: both;
text-transform: uppercase;
display: inline-block;
padding: 0px 3px;
font-size: 0.75em;
line-height: 1em;
margin-left: 3px;
margin-right: 6px;
margin-top: -1px;
@include border-radius(2px, 2px);
}
}
span.badge {
clear: both;
text-transform: uppercase;
display: inline-block;
padding: 0px 3px;
font-size: 0.75em;
line-height: 1em;
margin-left: 3px;
margin-right: 6px;
margin-top: -1px;
@include border-radius(2px, 2px);
}
span.badge.modified {
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
span.badge.addedtodraft {
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
span.badge.deletedonlive {
color: #636363;
border: 1px solid #E49393;
background-color: #F2DADB;
}
span.badge.removedfromdraft {
color: #636363;
border: 1px solid #E49393;
background-color: #F2DADB;
}
span.badge.workflow-approval {
color: #56660C;
border: 1px solid #7C8816;
background-color: #DAE79A;
}
& span.modified:after {
content: "draft";
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
& span.new:after {
content: "new";
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
& span.private:after {
content: "private";
color: #636363;
border: 1px solid #E49393;
background-color: #F2DADB;
}
& span.workflow-approval:after {
content: "awaiting approval";
color: #56660C;
border: 1px solid #7C8816;
background-color: #DAE79A;
}
/* comment speech bubble - ccs3 only - source: http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */
& span.comment-count {
clear: both;
position: relative;
text-transform: uppercase;
display: inline-block;
overflow: visible;
padding: 0px 3px;
font-size: 0.75em;
line-height: 1em;
margin-left: 3px;
margin-right: 6px;
@include border-radius(2px, 2px);
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
& span.comment-count:before {
content:"";
position:absolute;
bottom:-4px; /* value = - border-top-width - border-bottom-width */
left:3px; /* controls horizontal position */
border-width:4px 4px 0;
border-style:solid;
border-color:#C9B800 transparent;
/* reduce the damage in FF3.0 */
display:block;
width:0;
}
& span.comment-count:after {
content:"";
position:absolute;
bottom:-3px; /* value = - border-top-width - border-bottom-width */
left:4px; /* value = (:before left) + (:before border-left) - (:after border-left) */
border-width:3px 3px 0;
border-style:solid;
border-color:#FFF0BC transparent;
/* reduce the damage in FF3.0 */
display:block;
width:0;
}
/* comment speech bubble - ccs3 only - source: http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */
& span.comment-count {
clear: both;
position: relative;
text-transform: uppercase;
display: inline-block;
overflow: visible;
padding: 0px 3px;
font-size: 0.75em;
line-height: 1em;
margin-left: 3px;
margin-right: 6px;
@include border-radius(2px, 2px);
color: #7E7470;
border: 1px solid #C9B800;
background-color: #FFF0BC;
}
& span.comment-count:before {
content:"";
position:absolute;
bottom:-4px; /* value = - border-top-width - border-bottom-width */
left:3px; /* controls horizontal position */
border-width:4px 4px 0;
border-style:solid;
border-color:#C9B800 transparent;
/* reduce the damage in FF3.0 */
display:block;
width:0;
}
& span.comment-count:after {
content:"";
position:absolute;
bottom:-3px; /* value = - border-top-width - border-bottom-width */
left:4px; /* value = (:before left) + (:before border-left) - (:after border-left) */
border-width:3px 3px 0;
border-style:solid;
border-color:#FFF0BC transparent;
/* reduce the damage in FF3.0 */
display:block;
width:0;
}
.jstree-hovered {
text-shadow: none;