Commit 732bf829 authored by Nicolas Borda's avatar Nicolas Borda
Browse files

Issue #1121678: by ipwa, mmenavas: Updating page template so that content and... 

Issue #1121678: by ipwa, mmenavas: Updating page template so that content and sidebar last work properly.
parent 33f7151a

abstract.info

+3 −0
Changes for abstract.info: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,11 +9,14 @@ engine = phptemplate 
stylesheets[all][] = css/fusion-starter-style.css

stylesheets[all][] = css/default.css



skinr[api] = 2

skinr[directory] = skins



regions[sidebar_first] = sidebar first

regions[sidebar_second] = sidebar second

regions[header_top] = header top

regions[header] = header

regions[main_menu] = Main menu

regions[preface_top] = preface top

regions[preface_bottom] = preface bottom

regions[content_top] = content top

css/default.css

+14 −10
Changes for css/default.css: 14 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ blockquote p { 


#wrap, #header-group, #main-wrapper

/*#page-inner*/ {

	width: 716px;

	/*width: 716px;*/

	margin-left: 267px;

}
@@ -233,24 +233,24 @@ html body.layout-first-main-last, body.layout-first-main-last div.full-width{ 


/* TPrimary links */



#top #menu, #primary-menu {

#top #menu, #primary-menu, #main-menu {

	width: 484px;

	margin-left: -14px;

	overflow: hidden;

	position: relative;

}



#top #menu ul, #primary-menu ul {

#top #menu ul, #primary-menu ul, #main-menu ul {

	padding: 0;

	font-size: 18px;

	text-transform: lowercase;

}



#top #menu li, #primary-menu li {

#top #menu li, #primary-menu li, #main-menu li {

	display: inline;

}



#top #menu li a, #primary-menu li a {

#top #menu li a, #primary-menu li a, #main-menu li a {

	display: block;

	float: left;

	line-height: 20px;
@@ -259,7 +259,7 @@ html body.layout-first-main-last, body.layout-first-main-last div.full-width{ 
	display: inline; /* fix ie6 margin problem */

}



#top #menu li a:hover, #primary-menu li a:hover {

#top #menu li a:hover, #primary-menu li a:hover, #main-menu li a:hover {

	background: url(../images/bg_footer.jpg);

	color: #75D5B9;

}
@@ -270,7 +270,7 @@ html body.layout-first-main-last, body.layout-first-main-last div.full-width{ 


/* Top (menu > current page) */



#top #menu li.current_page_item a, #primary-menu li a.active {

#top #menu li.current_page_item a, #primary-menu li a.active, #main-menu li a.active {

	border-top: #ADCB56 8px solid;

	padding: 42px 1px 14px 1px;

	margin: 0 12px;
@@ -278,11 +278,15 @@ html body.layout-first-main-last, body.layout-first-main-last div.full-width{ 
	color: #ADCB56;

}



#top #menu li.current_page_item a:hover, #primary-menu li a.active:hover {

#top #menu li.current_page_item a:hover, #primary-menu li a.active:hover, #main-menu li a.active:hover {

	background: none;

	color: #C0D67E;

}



#main-menu h2 {

  display:none;

}



/* Top (search) */



/*#top .search{
@@ -365,11 +369,11 @@ padding:30px 0 30px; 
	margin-right: 39px;

	display: inline;

	overflow: hidden;

	width: auto;

	/*width: auto;*/

}



#content .block {

	width: auto;

	/*width: auto;*/

}



#content img,

templates/page.tpl.php

+3 −3
Changes for templates/page.tpl.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
      <?php print render($page['preface_top']); ?>            



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

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

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

        <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" class="main-group row nested <?//php print $content_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']); ?>
@@ -61,7 +61,7 @@ 
                <div id="main-content" class="main-content row nested">

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

                    <!-- content group: width = grid_width - (sidebar_first_width + sidebar_second_width) -->

                    <div id="content-group" class="content-group row nested <?//php print $content_group_width; ?>">

                    <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')); ?>