Moved elgg-inner out of layouts and into the page shell

git-svn-id: http://code.elgg.org/elgg/trunk@8441 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index aa8581a74363e51a2a6de690e0a5c042086c838f..ba09071f79709a6a606549357a86e88f6d09e86b 100644 (file)
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -43,7 +43,9 @@ if (count_messages()) {
                        <?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?>
                </div>
                <div class="elgg-page-body">
-                       <?php echo $vars['body']; ?>
+                       <div class="elgg-inner">
+                               <?php echo $vars['body']; ?>
+                       </div>
                </div>
                <div class="elgg-page-footer">
                        <div class="elgg-inner">

diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index 55e4b204c5edbd251b7f8ccbb309a82b375b0100..c59a574e7d7eb1bd4a648b14fcd0c35bbc5573c5 100644 (file)
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -9,7 +9,7 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout elgg-layout-one-column elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-column clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }

diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index d2a0b85c3c3c089618414a87e8e1ab29ac28a2a4..1e308f979de8c6760efdb879d787e460e8f5c456 100644 (file)
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -11,7 +11,7 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-layout elgg-layout-one-sidebar elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }