moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

themes lib MDL-24895 Multiple fixes to better handle overflow.

Browse source 
Major tasks undertaken in this patch:
* New format_text argument, overflowdiv.
* New page layout Report.
* Review of all format_text calls.
* Added support for the report layout to all themes.
* Changed forum post display from tables to divs.
This commit is contained in:
Sam Hemelryk 2010-11-05 02:53:47 +00:00
parent 2412f8b882
commit 367a75fae4
125 changed files with 3366 additions and 2062 deletions
Download patch file Download diff file Expand all files Collapse all files

28
theme/nonzero/config.php
View file

@ -38,8 +38,8 @@ $THEME->name = 'nonzero';
$THEME->parents = array(
'canvas',
'base',
'canvas',
'base',
);
/////////////////////////////////////////////////////
@ -54,8 +54,8 @@ $THEME->parents = array(
$THEME->sheets = array(
'core',
'pagelayout',
'core',
'pagelayout',
);
////////////////////////////////////////////////////
@ -64,12 +64,12 @@ $THEME->sheets = array(
////////////////////////////////////////////////////
$THEME->parents_exclude_sheets = array(
'base'=>array(
'pagelayout',
),
'canvas'=>array(
'pagelayout',
),
'base'=>array(
'pagelayout',
),
'canvas'=>array(
'pagelayout',
),
);
@ -155,7 +155,7 @@ $THEME->layouts = array(
'options' => array('nofooter'=>true, 'nonavbar'=>true),
),
'embedded' => array(
'theme' => 'canvas',
'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true),
@ -166,7 +166,11 @@ $THEME->layouts = array(
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
),
'report' => array(
'file' => 'general.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
);
///////////////////////////////////////////////////////////////

153
theme/nonzero/style/pagelayout.css
View file

@ -1,139 +1,136 @@
/** Path: theme pagelayout **/
body {margin:auto 0px;width:auto;}
#page {width:100%;overflow:hidden;}
#page-content {
clear: both;
overflow: hidden;
position: relative;
width: 100%;
clear: both;
overflow: hidden;
position: relative;
width: 100%;
}
#page-content #region-main-box {
float: left;
margin-left: -[[setting:regionpostwidth]];;
position: relative;
width: 200%;
right: 100%;
float: left;
margin-left: -[[setting:regionpostwidth]];;
position: relative;
width: 200%;
right: 100%;
}
#page-content #region-main-box #region-post-box {
float: left;
margin-left: -[[setting:regionprewidth]];;
width: 100%;
#page-content #region-post-box {
float: left;
margin-left: -[[setting:regionprewidth]];;
width: 100%;
}
#page-content #region-main-box #region-post-box #region-main-wrap {
float: left;
width: 50%;
#page-content #region-main-wrap {
float: left;
width: 50%;
}
#page-content #region-main-box #region-post-box #region-main-wrap #region-main {
overflow: hidden;
position: relative;
margin-left: [[setting:regionsumwidth]];
left: 100%;
#page-content #region-main {
overflow: hidden;
position: relative;
margin-left: [[setting:regionsumwidth]];
left: 100%;
}
#page-content #region-main-box #region-post-box #region-pre {
float: right;
position: relative;
width: [[setting:regionprewidth]];
left: [[setting:regionprewidth]];
#page-content #region-pre {
float: right;
position: relative;
width: [[setting:regionprewidth]];
left: [[setting:regionprewidth]];
}
#page-content #region-main-box #region-post-box #region-post {
float: right;
position: relative;
left: [[setting:regiondoublepresumwidth]];
width: [[setting:regionpostwidth]];
#page-content #region-post {
float: right;
position: relative;
left: [[setting:regiondoublepresumwidth]];
width: [[setting:regionpostwidth]];
}
#page-content #region-main-box #region-post-box #region-main-wrap #region-main .region-content {
overflow: hidden;
padding: 20px 20px 20px 0;
#page-content #region-main .region-content {
overflow: hidden;
padding: 20px 20px 20px 0;
}
#page-content #region-main-box #region-post-box #region-pre .region-content,
#page-content #region-main-box #region-post-box #region-post .region-content {
overflow: hidden;
padding: 20px 10px;
#page-content #region-pre .region-content,
#page-content #region-post .region-content {
overflow: hidden;
padding: 20px 10px;
}
#page-footer {
clear: both;
float: left;
width: 100%;
clear: both;
float: left;
width: 100%;
}
/** Only side pre **/
.side-pre-only #page-content #region-main-box {
margin-left: 0px;
margin-left: 0px;
}
.side-pre-only #page-content #region-main-box #region-post-box {
margin-left: -[[setting:regionprewidth]];
.side-pre-only #page-content #region-post-box {
margin-left: -[[setting:regionprewidth]];
}
.side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: [[setting:regionprewidth]];
.side-pre-only #page-content #region-main {
margin-left: [[setting:regionprewidth]];
}
.side-pre-only #page-content #region-main-box #region-post-box #region-pre {
left: [[setting:regionprewidth]];
width: [[setting:regionprewidth]];
.side-pre-only #page-content #region-pre {
left: [[setting:regionprewidth]];
width: [[setting:regionprewidth]];
}
.side-pre-only #page-content #region-main-box #region-post-box #region-post {
width: 0%;
.side-pre-only #page-content #region-post {
width: 0%;
}
/** Only side post **/
.side-post-only #page-content #region-main-box {
margin-left: 0px;
margin-left: 0px;
}
.side-post-only #page-content #region-main-box #region-post-box {
margin-left: -[[setting:regionpostwidth]];
.side-post-only #page-content #region-post-box {
margin-left: -[[setting:regionpostwidth]];
}
.side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: [[setting:regionpostwidth]];
.side-post-only #page-content #region-main {
margin-left: [[setting:regionpostwidth]];
}
.side-post-only #page-content #region-main-box #region-post-box #region-post {
left: [[setting:regionpostwidth]];
width: [[setting:regionpostwidth]];
.side-post-only #page-content #region-post {
left: [[setting:regionpostwidth]];
width: [[setting:regionpostwidth]];
}
.has_dock.side-post-only .page-middle #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: [[setting:regionprewidth]];
margin-left: [[setting:regionprewidth]];
}
/** No blocks whatsoever **/
.content-only #page-content #region-main-box {
margin-left: 0px;
margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box {
margin-left: 0px;
.content-only #page-content #region-post-box {
margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main {
margin-left: 0px;
.content-only #page-content #region-main {
margin-left: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-pre {
width: 0px;
.content-only #page-content #region-pre {
width: 0px;
}
.content-only #page-content #region-main-box #region-post-box #region-post {
width: 0px;
}
.content-only #page-content #region-post {
width: 0px;
}
.pagelayout-report #page-content #region-main {overflow:auto;}
.pagelayout-report #page-content #region-main .region-content {overflow:visible;}