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

Move flash, image and link forms to right

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44365 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-11-06 05:39:14 +00:00
parent 87e4c4c51d
commit 28d8dfdfaf
6 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/cms_right.css
View File

@ -432,3 +432,4 @@ div.originallang_holder.field.CompositeField.nolabel {
.nonTranslating { .nonTranslating {
display: none; display: none;
} }

15
css/layout.css
View File

@ -177,7 +177,8 @@ body.stillLoading select {
border-top: 1px solid #77BBEE; border-top: 1px solid #77BBEE;
} }
#left h2 { #left h2,
#contentPanel h2 {
background-image:url(../images/textures/obar-18.gif); background-image:url(../images/textures/obar-18.gif);
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
@ -380,7 +381,6 @@ div.spacer, li.spacer {
} }
.thumbnailstrip { .thumbnailstrip {
height: 58px;
overflow: auto; overflow: auto;
white-space: nowrap; white-space: nowrap;
width: 100%; width: 100%;
@ -404,3 +404,14 @@ ul.tree li.Root span.Root span.c a {
iframe { iframe {
border: none; border: none;
} }
#contentPanel {
background-color: #FFFFFF;
width: 205px;
float: left;
position: absolute;
border: 1px solid #ACBBCC;
top: 45px;
padding 3px;
}

18
javascript/LeftAndMain.js
View File

@ -42,7 +42,16 @@ function fixRightWidth() {
$('right').style.left = (sep + 6) + 'px'; $('right').style.left = (sep + 6) + 'px';
// Give the remaining space to right // Give the remaining space to right
var rightWidth = parseInt(document.body.offsetWidth) - parseInt($('left').offsetWidth) - $('separator').offsetWidth - 8; var bodyWidth = parseInt(document.body.offsetWidth);
var leftWidth = parseInt($('left').offsetWidth);
var sepWidth = parseInt($('separator').offsetWidth - 8);
var rightWidth = bodyWidth - leftWidth - sepWidth -18;
// Extra pane in right for insert image/flash/link things
if($('contentPanel').style.display != "none") {
rightWidth -= 210;
$('contentPanel').style.left = leftWidth + sepWidth + rightWidth + sepWidth + 23 + 'px';
}
if( rightWidth >= 0 ) if( rightWidth >= 0 )
$('right').style.width = rightWidth + 'px'; $('right').style.width = rightWidth + 'px';
@ -144,7 +153,12 @@ window.onresize = function(init) {
var rightbottom = $('rightbottom'); var rightbottom = $('rightbottom');
if(rightbottom) rightbottom.style.display = 'none'; if(rightbottom) rightbottom.style.display = 'none';
if(typeof fitToParent == 'function') fitToParent('right', 12); if(typeof fitToParent == 'function') {
fitToParent('right', 12);
if($('contentPanel')) {
fitToParent('contentPanel', 12);
}
}
if( $('left') && $('separator') && right ) { if( $('left') && $('separator') && right ) {
// #right has padding-bottom to make room for AJAX Action buttons so we need to add that // #right has padding-bottom to make room for AJAX Action buttons so we need to add that

1
templates/Includes/CMSMain_right.ss
View File

@ -1,3 +1,4 @@
<% include Editor_toolbar %> <% include Editor_toolbar %>
<span id="Translating_Message" class="translatingMessage <% if EditingLang %><% else %>nonTranslating<% end_if %>"></span> <span id="Translating_Message" class="translatingMessage <% if EditingLang %><% else %>nonTranslating<% end_if %>"></span>

6
templates/Includes/Editor_toolbar.ss
View File

@ -32,10 +32,4 @@
</table> </table>
</div> </div>
$LinkForm
$ImageForm
$FlashForm
<% end_control %> <% end_control %>

8
templates/LeftAndMain.ss
View File

@ -33,6 +33,14 @@
</div> </div>
<% end_if %> <% end_if %>
<div id="contentPanel" style="display:none;">
<% control EditorToolbar %>
$ImageForm
$LinkForm
$FlashForm
<% end_control %>
</div>
<div id="bottom"> <div id="bottom">
<div class="holder"> <div class="holder">
<div id="logInStatus"> <div id="logInStatus">