Commit 33f7151a authored by Maximo Mena's avatar Maximo Mena Committed by Nicolas Borda
Browse files

Issue #1121678: by ipwa, mmenavas: sidebar widths - Updated page.tpl.php to show regions

parent 0a0d57a6

abstract.info

+1 −1
Changes for abstract.info: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stylesheets[all][] = css/fusion-starter-style.css 
stylesheets[all][] = css/default.css





regions[sidebar_first] = sidebar second

regions[sidebar_first] = sidebar first

regions[sidebar_second] = sidebar second

regions[header_top] = header top

regions[header] = header

templates/page.tpl.php

+25 −15
Changes for templates/page.tpl.php: 25 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -3,26 +3,23 @@ 


  <div id="page" class="page">

    <div id="page-inner" class="page-inner row <?php print $grid_width; ?>">

      <div id="skip">

        <a href="#main-content-area"><?php print t('Skip to Main Content Area'); ?></a>

      </div>

      <?php //print theme('grid_row', $header_top, 'header-top', 'full-width'); ?>



      <!-- header-top row: width = grid_width -->

      <?//php //print theme('grid_row', $header_top, 'header-top', 'full-width', $grid_width); ?>

      <?php print render($page['header_top']); ?>



      <!-- header-group row: width = grid_width -->

      <div id="header-group-wrapper" class="header-group-wrapper full-width <?php print $grid_width; ?>">

        <div id="header-group" class="header-group row">

          <div id="header-group-inner" class="header-group-inner inner">

	

			<?//php //print //theme('grid_block', $primary_links_tree, 'primary-menu'); ?>

			

            <?//php print //theme('grid_block', theme('links', $secondary_links), 'secondary-menu'); ?>

            <?//php print //theme('grid_block', $search_box, 'search-box'); ?>

            <?php //print theme('grid_block', theme('links', $primary_links), 'primary-menu'); ?>

            <?php //print theme('grid_block', theme('links', $secondary_links), 'secondary-menu'); ?>

            <?php //print theme('grid_block', $search_box, 'search-box'); ?>

            <?php print render($page['main_menu']); ?>



            <?php if ($logo || $site_name || $site_slogan): ?>

            <div id="header-site-info" class="header-site-info block">

              <div id="header-site-info-inner" class="header-site-info-inner inner">

              <div id="header-site-info-inner" class="header-site-info-inner gutter">

                <?php if ($logo): ?>

                <div id="logo">

                  <a href="<?php print check_url($front_page); ?>" title="<?php print t('Home'); ?>"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" /></a>
@@ -39,24 +36,27 @@ 
            <?php endif; ?>



            <?//php //print theme('grid_row', $header, 'header', 'nested'); ?>

            

            <?php print render($page['header']); ?>

          </div><!-- /header-group-inner -->

        </div><!-- /header-group -->

      </div><!-- /header-group-wrapper -->



      <!-- preface-top row: width = grid_width -->

      <?//php //print theme('grid_row', $preface_top, 'preface-top', 'full-width', $grid_width); ?>

      <?php print render($page['preface_top']); ?>            



      <!-- main row: width = grid_width -->

      <div id="main-wrapper" class="main-wrapper full-width clearfix">

        <div id="main" class="main row">

          <div id="main-inner" class="main-inner inner clearfix">

            <?//php// print theme('grid_row', $sidebar_first, 'sidebar-first', 'nested', $sidebar_first_width); ?>

            <?php print render($page['sidebar_first']); ?>

            

            <!-- main group: width = grid_width - sidebar_first_width -->

            <div id="main-group" class="main-group row nested <?php print $main_group_width; ?>">

              <div id="main-group-inner" class="main-group-inner inner">

                <?//php //print theme('grid_row', $preface_bottom, 'preface-bottom', 'nested'); ?>

                <?php print render($page['preface_bottom']); ?>

                

                <div id="main-content" class="main-content row nested">

                  <div id="main-content-inner" class="main-content-inner inner">
@@ -64,8 +64,10 @@ 
                    <div id="content-group" class="content-group row nested <?//php print $content_group_width; ?>">

                      <div id="content-group-inner" class="content-group-inner inner">

                        <?php //print theme('grid_block', $breadcrumb, 'breadcrumbs'); ?>

                        <?php print theme('grid_block', array('content' => $breadcrumb, 'id' => 'breadcrumbs')); ?>



                        <?//php if ($content_top || $help || $messages): ?>

                        <?php //if ($content_top || $help || $messages): ?>

                        <?php //REVIEW CONTENT_TOP REGION. ?>

                        <div id="content-top" class="content-top row nested">

                          <div id="content-top-inner" class="content-top-inner inner">

                            <?php print theme('grid_block', array('content' => render($page['help']), 'id' => 'content-help')); ?>
@@ -81,8 +83,15 @@ 
                            <?php print theme('grid_block', array('content' => render($tabs), 'id' => 'content-tabs')); ?>

                            <div id="content-inner" class="content-inner block">

                              <div id="content-inner-inner" class="content-inner-inner inner">



                                <?php // COPIED FROM FUSION CORE's page.tpl.php ?>

                                <?php print render($title_prefix); ?>

                                <?php if ($title): ?>

                                <h1 class="title"><?php print $title; ?></h1>

                                <h1 class="title gutter"><?php print $title; ?></h1>

                                <?php endif; ?>

                                <?php print render($title_suffix); ?>

                                <?php if ($action_links): ?>

                                <ul class="action-links"><?php print render($action_links); ?></ul>

                                <?php endif; ?>                            

                                <?php if ($page['content']): ?>

                                <div id="content-content" class="content-content">
@@ -94,17 +103,17 @@ 
                            </div><!-- /content-inner -->

                          </div><!-- /content-region-inner -->

                        </div><!-- /content-region -->



                        <?php print render($page['content_bottom']); ?>

                        <?php //print //theme('grid_row', $content_bottom, 'content-bottom', 'nested'); ?>

                      </div><!-- /content-group-inner -->

                    </div><!-- /content-group -->



                    <?//php //print //theme('grid_row', $sidebar_last, 'sidebar-last', 'nested', $sidebar_last_width); ?>

                    <?php print render($page['sidebar_second']); ?>

                  </div><!-- /main-content-inner -->

                </div><!-- /main-content -->



                <?php //print theme('grid_row', $postscript_top, 'postscript-top', 'nested'); ?>

                <?php print render($page['postscript_top']); ?>

              </div><!-- /main-group-inner -->

            </div><!-- /main-group -->

          </div><!-- /main-inner -->
@@ -113,6 +122,7 @@ 


      <!-- postscript-bottom row: width = grid_width -->

      <?//php //print theme('grid_row', $postscript_bottom, 'postscript-bottom', 'full-width', $grid_width); ?>

      <?php print render($page['postscript_bottom']); ?>

      <?//php print theme('grid_block', array('content' => render($page['postscript_bottom']), 'id' => 'full-width')); ?>



      <!-- footer row: width = grid_width -->