diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/admin-rtl.css | 11 | ||||
| -rw-r--r-- | modules/system/admin.css | 8 | ||||
| -rw-r--r-- | modules/system/maintenance-page.tpl.php | 16 | ||||
| -rw-r--r-- | modules/system/page.tpl.php | 24 | ||||
| -rw-r--r-- | modules/system/system.install | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 4 |
6 files changed, 41 insertions, 26 deletions
diff --git a/modules/system/admin-rtl.css b/modules/system/admin-rtl.css index 08f12acd7..f9420333a 100644 --- a/modules/system/admin-rtl.css +++ b/modules/system/admin-rtl.css @@ -4,6 +4,17 @@ div.admin-panel .body { padding: 0 8px 2px 4px; } +div.admin .left { + float: right; + margin-left: 0; + margin-right: 1em; +} +div.admin .right { + float: left; + margin-left: 1em; + margin-right: 0; +} + div.admin .expert-link { text-align: left; margin-right: 0; diff --git a/modules/system/admin.css b/modules/system/admin.css index e37c69644..0f11126e5 100644 --- a/modules/system/admin.css +++ b/modules/system/admin.css @@ -22,14 +22,14 @@ div.admin { } div.admin .left { - float: left; + float: left; /* LTR */ width: 47%; - margin-left: 1em; + margin-left: 1em; /* LTR */ } div.admin .right { - float: right; + float: right; /* LTR */ width: 47%; - margin-right: 1em; + margin-right: 1em; /* LTR */ } div.admin .expert-link { diff --git a/modules/system/maintenance-page.tpl.php b/modules/system/maintenance-page.tpl.php index e411afd11..cd4127927 100644 --- a/modules/system/maintenance-page.tpl.php +++ b/modules/system/maintenance-page.tpl.php @@ -57,10 +57,10 @@ <div id="container" class="clearfix"> - <?php if (!empty($left)): ?> - <div id="sidebar-left" class="column sidebar"> - <?php print $left; ?> - </div> <!-- /sidebar-left --> + <?php if (!empty($sidebar_first)): ?> + <div id="sidebar-first" class="column sidebar"> + <?php print $sidebar_first; ?> + </div> <!-- /sidebar-first --> <?php endif; ?> <div id="main" class="column"><div id="main-squeeze"> @@ -75,10 +75,10 @@ </div></div> <!-- /main-squeeze /main --> - <?php if (!empty($right)): ?> - <div id="sidebar-right" class="column sidebar"> - <?php print $right; ?> - </div> <!-- /sidebar-right --> + <?php if (!empty($sidebar_second)): ?> + <div id="sidebar-second" class="column sidebar"> + <?php print $sidebar_second; ?> + </div> <!-- /sidebar-second --> <?php endif; ?> </div> <!-- /container --> diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index ac6e2c383..7b4cc420e 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -46,10 +46,10 @@ * - node-type-[node type]: When viewing a single node, the type of that node. * For example, if the node is a "Blog entry" it would result in "node-type-blog". * Note that the machine name will often be in a short form of the human readable label. - * The following only apply with the default 'left' and 'right' block regions: + * The following only apply with the default 'sidebar_first' and 'sidebar_second' block regions: * - two-sidebars: When both sidebars have content. * - no-sidebars: When no sidebar content exists. - * - one-sidebar and sidebar-left or sidebar-right: A combination of the two classes + * - one-sidebar and sidebar-first or sidebar-second: A combination of the two classes * when only one of the two sidebars have content. * * Site identity: @@ -77,8 +77,8 @@ * - $help: Dynamic help text, mostly for admin pages. * - $content: The main content of the current page. * - $feed_icons: A string of all feed icons for the current page. - * - $left: Items for the left sidebar. - * - $right: Items for the right sidebar. + * - $sidebar_first: Items for the first sidebar. + * - $sidebar_second: Items for the second sidebar. * - $highlight: Items for the highlighted content region. * * Opening and closing data: @@ -177,16 +177,16 @@ <?php print $feed_icons; ?> </div></div> <!-- /.section, /#content --> - <?php if ($left): ?> - <div id="sidebar-left" class="column sidebar"><div class="section region"> - <?php print $left; ?> - </div></div> <!-- /.section, /#sidebar-left --> + <?php if ($sidebar_first): ?> + <div id="sidebar-first" class="column sidebar"><div class="section region"> + <?php print $sidebar_first; ?> + </div></div> <!-- /.section, /#sidebar-first --> <?php endif; ?> - <?php if ($right): ?> - <div id="sidebar-right" class="column sidebar"><div class="section region"> - <?php print $right; ?> - </div></div> <!-- /.section, /#sidebar-right --> + <?php if ($sidebar_second): ?> + <div id="sidebar-second" class="column sidebar"><div class="section region"> + <?php print $sidebar_second; ?> + </div></div> <!-- /.section, /#sidebar-second --> <?php endif; ?> </div></div> <!-- /#main, /#main-wrapper --> diff --git a/modules/system/system.install b/modules/system/system.install index 084248a0c..3d2244415 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1987,6 +1987,10 @@ function system_update_7021() { $ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('system', 'main', '" . $theme->name . "', 1, 0, 'content', '', -1)"); } + // Migrate blocks from left/right regions to first/second regions. + $ret[] = update_sql("UPDATE {block} SET region = 'sidebar_first' WHERE region = 'left'"); + $ret[] = update_sql("UPDATE {block} SET region = 'sidebar_second' WHERE region = 'right'"); + // Migrate contact form information. if ($contact_help = variable_get('contact_form_information', '')) { $bid = db_insert('box')->fields(array('body' => $contact_help, 'info' => 'Contact page help', 'format' => FILTER_FORMAT_DEFAULT))->execute(); diff --git a/modules/system/system.module b/modules/system/system.module index bcd4b8d7d..b4e6ef55f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1841,8 +1841,8 @@ function _system_get_theme_data() { // Set defaults for theme info. $defaults = array( 'regions' => array( - 'left' => 'Left sidebar', - 'right' => 'Right sidebar', + 'sidebar_first' => 'Left sidebar', + 'sidebar_second' => 'Right sidebar', 'content' => 'Content', 'header' => 'Header', 'footer' => 'Footer', |