mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
MINOR merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69858 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d02401ebda
commit
7e09cc8a18
@ -106,9 +106,7 @@ class AssetTableField extends ComplexTableField {
|
||||
|
||||
$tab->push(
|
||||
new LiteralField("ImageFull",
|
||||
'<a id="ImageEditorActivator" href="javascript: void(0)">' . "<img id='thumbnailImage' src='{$thumbnail}?r=" . rand(1,100000) . "' alt='{$childData->Name}' /><p>"._t('AssetTableField.EDITIMAGE', 'Edit this image')."</p>" . '</a>' .
|
||||
'<script type="text/javascript" src="cms/javascript/ImageEditor/Activator.js"></script><script type="text/javascript">var imageActivator = new ImageEditor.Activator.initialize();Event.observe("ImageEditorActivator","click",imageActivator.onOpen);</script>'
|
||||
)
|
||||
"<img id='thumbnailImage' src='{$thumbnail}?r=" . rand(1,100000) . "' alt='{$childData->Name}' />" )
|
||||
);
|
||||
|
||||
if(class_exists('GalleryFile')) {
|
||||
|
@ -376,6 +376,7 @@ JS;
|
||||
// $record = Versioned::get_one_by_stage($treeClass, "Live", "\"$treeClass\".\"ID\" = $id");
|
||||
Versioned::reading_stage('Live');
|
||||
singleton($treeClass)->flushCache();
|
||||
|
||||
$record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
|
||||
if($record) Versioned::reading_stage(null);
|
||||
}
|
||||
@ -821,6 +822,7 @@ HTML;
|
||||
|
||||
$JS_stageURL = $page->IsDeletedFromStage ? '' : Convert::raw2js($page->AbsoluteLink());
|
||||
$liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree\".\"ID\" = $page->ID");
|
||||
|
||||
$JS_liveURL = $liveRecord ? Convert::raw2js($liveRecord->AbsoluteLink()) : '';
|
||||
|
||||
FormResponse::add($this->getActionUpdateJS($page));
|
||||
|
@ -44,6 +44,10 @@ class CommentAdmin extends LeftAndMain {
|
||||
}
|
||||
$section = substr($url, strrpos($url, '/') + 1);
|
||||
|
||||
if($section != 'approved' && $section != 'unmoderated' && $section != 'spam') {
|
||||
$section = Session::get('CommentsSection');
|
||||
}
|
||||
|
||||
if($section != 'approved' && $section != 'unmoderated' && $section != 'spam') {
|
||||
$section = 'approved';
|
||||
}
|
||||
|
@ -11,6 +11,8 @@ class CommentTableField extends ComplexTableField {
|
||||
function __construct($controller, $name, $sourceClass, $mode, $fieldList, $detailFormFields = null, $sourceFilter = "", $sourceSort = "Created", $sourceJoin = "") {
|
||||
$this->mode = $mode;
|
||||
|
||||
Session::set('CommentsSection', $mode);
|
||||
|
||||
parent::__construct($controller, $name, $sourceClass, $fieldList, $detailFormFields, $sourceFilter, $sourceSort, $sourceJoin);
|
||||
|
||||
$this->Markable = true;
|
||||
|
@ -1,5 +1,5 @@
|
||||
#left form.actionparams {
|
||||
background: #ccc;
|
||||
background: #eee;
|
||||
padding: 3px 5px;
|
||||
}
|
||||
#left form.actionparams input,
|
||||
@ -400,6 +400,10 @@ ul.tree li.untranslated a:visited {
|
||||
|
||||
#SortItems {
|
||||
border-bottom: 1px solid #cccccc;
|
||||
background: #CCCCCC none repeat scroll 0%;
|
||||
background: #eee none repeat scroll 0%;
|
||||
padding: 3px 0 3px 7px;
|
||||
}
|
||||
#SortItems #sortitems {
|
||||
float: left;
|
||||
margin-right: 3px;
|
||||
}
|
@ -26,7 +26,6 @@ body {
|
||||
|
||||
#TreeActions {
|
||||
background: #eee;
|
||||
border-bottom: 1px solid #ccc;
|
||||
float: left;
|
||||
width: 100%;
|
||||
}
|
||||
@ -72,10 +71,12 @@ li.action button {
|
||||
input.action:hover,
|
||||
button.action:hover,
|
||||
li.action input:hover,
|
||||
li.action button:hover {
|
||||
li.action button:hover,
|
||||
li.selected input,
|
||||
li.selected button {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
|
||||
.ajaxActions input.disabled {
|
||||
color: #666;
|
||||
}
|
||||
@ -439,6 +440,12 @@ iframe {
|
||||
height: 120px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
#Caption {
|
||||
margin: 0;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
#contentPanel fieldset {
|
||||
padding: 5px;
|
||||
}
|
||||
|
@ -26,11 +26,11 @@ if((typeof tinyMCE != 'undefined')) {
|
||||
theme_advanced_toolbar_location : "top",
|
||||
theme_advanced_toolbar_align : "left",
|
||||
theme_advanced_toolbar_parent : "right",
|
||||
plugins : "blockquote,template,contextmenu,table,emotions,paste,../../tinymce_ssbuttons,../../tinymce_advcode,spellchecker",
|
||||
plugins : "blockquote,contextmenu,table,emotions,paste,../../tinymce_ssbuttons,../../tinymce_advcode,spellchecker",
|
||||
blockquote_clear_tag : "p",
|
||||
table_inline_editing : true,
|
||||
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,separator,bullist,numlist,outdent,indent,blockquote,hr,charmap",
|
||||
theme_advanced_buttons2 : "undo,redo,separator,cut,copy,paste,pastetext,pasteword,spellchecker,separator,ssimage,ssflash,sslink,unlink,anchor,separator,template,advcode,separator,search,replace,selectall,visualaid,separator,tablecontrols",
|
||||
theme_advanced_buttons2 : "undo,redo,separator,cut,copy,paste,pastetext,pasteword,spellchecker,separator,ssimage,ssflash,sslink,unlink,anchor,separator,advcode,search,replace,selectall,visualaid,separator,tablecontrols",
|
||||
theme_advanced_buttons3 : "",
|
||||
spellchecker_languages : "$SpellcheckLangs",
|
||||
|
||||
@ -51,6 +51,10 @@ Behaviour.register({
|
||||
this.isChanged = function() {
|
||||
return tinyMCE.getInstanceById(this.id).isDirty();
|
||||
}
|
||||
this.resetChanged = function() {
|
||||
inst = tinyMCE.getInstanceById(this.id);
|
||||
inst.startContent = tinymce.trim(inst.getContent({format : 'raw', no_events : 1}));
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
@ -1,6 +1,6 @@
|
||||
<div id="Logo" style="$LogoStyle">
|
||||
<% if ApplicationLogoText %>
|
||||
<a href="http://www.silverstripe.com/">$ApplicationLogoText</a><br />
|
||||
<a href="$ApplicationLink">$ApplicationLogoText</a><br />
|
||||
<% end_if %>
|
||||
</div>
|
||||
<ul id="MainMenu">
|
||||
|
Loading…
Reference in New Issue
Block a user