mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-06-25 22:19:42 +02:00
MINOR Removed old references to "rightbottom", which is now obsolete and caused a big box to appear in the CMS sometimes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66385 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey
Sam Minnee
parent
5444d65fb2
commit
4a60bb53d9
|
|
@ -347,15 +347,10 @@ class LeftAndMain extends Controller {
|
|||
public function Left() {
|
||||
return $this->renderWith($this->getTemplatesWithSuffix('_left'));
|
||||
}
|
||||
|
||||
public function Right() {
|
||||
return $this->renderWith($this->getTemplatesWithSuffix('_right'));
|
||||
}
|
||||
public function RightBottom() {
|
||||
if(SSViewer::hasTemplate($this->getTemplatesWithSuffix('_rightbottom'))) {
|
||||
return $this->renderWith($this->getTemplatesWithSuffix('_rightbottom'));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function getRecord($id, $className = null) {
|
||||
if(!$className) $className = $this->stat('tree_class');
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
|||
'addgroup',
|
||||
'addmember',
|
||||
'autocomplete',
|
||||
'getmember',
|
||||
'newmember',
|
||||
'removememberfromgroup',
|
||||
'savemember',
|
||||
'AddRecordForm',
|
||||
|
|
@ -101,15 +99,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
|||
}
|
||||
}
|
||||
|
||||
public function getmember() {
|
||||
Session::set('currentMember', $_REQUEST['ID']);
|
||||
SSViewer::setOption('rewriteHashlinks', false);
|
||||
$result = $this->renderWith("LeftAndMain_rightbottom");
|
||||
$parts = split('</?form[^>]*>', $result);
|
||||
echo $parts[1];
|
||||
}
|
||||
|
||||
|
||||
public function MemberForm() {
|
||||
$id = $_REQUEST['ID'] ? $_REQUEST['ID'] : Session::get('currentMember');
|
||||
if($id)
|
||||
|
|
@ -235,24 +224,6 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
|
|||
return $this->returnItemToUser($newGroup);
|
||||
}
|
||||
|
||||
public function newmember() {
|
||||
Session::clear('currentMember');
|
||||
$newMemberForm = array(
|
||||
"MemberForm" => $this->getMemberForm('new'),
|
||||
);
|
||||
// This should be using FormResponse ;-)
|
||||
if(Director::is_ajax()) {
|
||||
SSViewer::setOption('rewriteHashlinks', false);
|
||||
$customised = $this->customise($newMemberForm);
|
||||
$result = $customised->renderWith($this->class . "_rightbottom");
|
||||
$parts = split('</?form[^>]*>', $result);
|
||||
return $parts[1];
|
||||
|
||||
} else {
|
||||
return $newMemberForm;
|
||||
}
|
||||
}
|
||||
|
||||
public function EditedMember() {
|
||||
if(Session::get('currentMember'))
|
||||
return DataObject::get_by_id("Member", Session::get('currentMember'));
|
||||
|
|
|
|||
|
|
@ -193,62 +193,6 @@
|
|||
clear: left;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bottom-right
|
||||
*/
|
||||
#rightbottom {
|
||||
border: none;
|
||||
margin-top: 4px;
|
||||
margin-left: 1px;
|
||||
border: 1px solid #808080;
|
||||
}
|
||||
|
||||
#rightbottom form {
|
||||
margin: 1em;
|
||||
}
|
||||
|
||||
#rightbottom form div {
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
#rightbottom form div.field {
|
||||
clear: both;
|
||||
margin-left: 10em;
|
||||
font-size: 12px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#rightbottom form label.left {
|
||||
float: left;
|
||||
width: 10em;
|
||||
margin-left: -10em;
|
||||
}
|
||||
|
||||
#rightbottom form input,
|
||||
#rightbottom form select,
|
||||
#rightbottom form textarea {
|
||||
width: 90%;
|
||||
}
|
||||
|
||||
#rightbottom form input.checkbox,
|
||||
#rightbottom form .optionset input,
|
||||
#rightbottom form .htmleditor select,
|
||||
#rightbottom form input.action {
|
||||
width: auto;
|
||||
}
|
||||
#rightbottom form .optionset li {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
#rightbottom form h2 {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#rightbottom form .fieldgroup input,
|
||||
#rightbottom form .fieldgroup select {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* RHS Action Parameters boxes
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ body.stillLoading select {
|
|||
border: 1px solid #acbbcc;
|
||||
background: #fff;
|
||||
}
|
||||
#right, #rightbottom {
|
||||
#right {
|
||||
position: absolute;
|
||||
left: 208px;
|
||||
top: 45px;
|
||||
|
|
@ -132,10 +132,6 @@ body.stillLoading select {
|
|||
margin-right: 3px;
|
||||
}
|
||||
|
||||
#rightbottom {
|
||||
height: 30%;
|
||||
}
|
||||
|
||||
#separator {
|
||||
position: absolute;
|
||||
top: 51px;
|
||||
|
|
@ -161,17 +157,13 @@ body.stillLoading select {
|
|||
}
|
||||
|
||||
|
||||
#left div.title, #right div.title, #rightbottom div.title {
|
||||
#left div.title, #right div.title {
|
||||
border-top: 1px solid #77BBEE;
|
||||
height: 22px !important;
|
||||
background: #0075C9 url(../images/texture/obar.gif) repeat-x 0 0;
|
||||
}
|
||||
|
||||
#rightbottom div.light {
|
||||
background-image: url(../images/textures/obar-light.png) !important;
|
||||
}
|
||||
|
||||
#left div.title div, #right div.title div, #rightbottom div.title div {
|
||||
#left div.title div, #right div.title div {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
color: #fff;
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ DraggableSeparator.prototype = {
|
|||
}
|
||||
|
||||
function fixRightWidth() {
|
||||
if( !$('right') )
|
||||
return;
|
||||
if(!$('right')) return;
|
||||
|
||||
// Absolutely position all the elements
|
||||
var sep = getDimension($('left'),'width') + getDimension($('left'),'left');
|
||||
|
|
@ -53,14 +52,7 @@ function fixRightWidth() {
|
|||
$('contentPanel').style.left = leftWidth + sepWidth + rightWidth + sepWidth + 23 + 'px';
|
||||
}
|
||||
|
||||
if( rightWidth >= 0 )
|
||||
$('right').style.width = rightWidth + 'px';
|
||||
|
||||
var rb;
|
||||
if(rb = $('rightbottom')) {
|
||||
rb.style.left = $('right').style.left;
|
||||
rb.style.width = $('right').style.width;
|
||||
}
|
||||
if(rightWidth >= 0) $('right').style.width = rightWidth + 'px';
|
||||
}
|
||||
|
||||
Behaviour.register({
|
||||
|
|
@ -150,8 +142,6 @@ window.ontabschanged = function() {
|
|||
|
||||
window.onresize = function(init) {
|
||||
var right = $('right');
|
||||
var rightbottom = $('rightbottom');
|
||||
if(rightbottom) rightbottom.style.display = 'none';
|
||||
|
||||
if(typeof fitToParent == 'function') {
|
||||
fitToParent('right', 12);
|
||||
|
|
@ -171,14 +161,6 @@ window.onresize = function(init) {
|
|||
$('left').style.height = $('separator').style.height = rightH + 'px';
|
||||
}
|
||||
|
||||
if(rightbottom) {
|
||||
var newHeight = rightH / 3;
|
||||
right.style.height = (newHeight*2) + 'px';
|
||||
rightbottom.style.height = newHeight + 'px';
|
||||
rightbottom.style.display = '';
|
||||
rightbottom.style.top = getDimension(right,'top') + (newHeight*2) + 'px';
|
||||
}
|
||||
|
||||
if(typeof fitToParent == 'function') {
|
||||
fitToParent('Form_EditForm');
|
||||
if($('Form_EditorToolbarImageForm') && $('Form_EditorToolbarImageForm').style.display == "block") {
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ CMSRightForm.prototype = {
|
|||
}*/
|
||||
}
|
||||
|
||||
CMSForm.applyTo('#Form_SubForm', 'rightbottom');
|
||||
CMSForm.applyTo('#Form_SubForm');
|
||||
CMSRightForm.applyTo('#Form_EditForm', 'right');
|
||||
|
||||
function action_save_right() {
|
||||
|
|
|
|||
|
|
@ -27,13 +27,6 @@
|
|||
$Right
|
||||
</div>
|
||||
|
||||
<% if RightBottom %>
|
||||
<div class="right" id="rightbottom">
|
||||
$RightBottom
|
||||
<div id="statusMessage" style="display:none;"></div>
|
||||
</div>
|
||||
<% end_if %>
|
||||
|
||||
<div id="contentPanel" style="display:none;">
|
||||
<% control EditorToolbar %>
|
||||
$ImageForm
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user