summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshivcharan Patil2013-08-20 17:36:43 +0530
committershivcharan Patil2013-08-20 17:36:43 +0530
commit1bd162257f1edf2bb7ec5037dee6e6622b771113 (patch)
tree30401ee4dcf1dcc9250b2c07edd559b6a5e8b178
parent45082f2d18caed998302dd337fa3b1c89efb71dd (diff)
Fixing footer bug7.x-1.0-alpha1
-rw-r--r--css/beach.css5
-rw-r--r--page.tpl.php26
2 files changed, 15 insertions, 16 deletions
diff --git a/css/beach.css b/css/beach.css
index 0904c7f..2379873 100644
--- a/css/beach.css
+++ b/css/beach.css
@@ -625,8 +625,9 @@ div.terms {
.footer-column {
float: left;
+ width: 25%;
}
-
+/*
.wrap-1-col .footer-column {
width: 100%;
}
@@ -652,7 +653,7 @@ div.terms {
width: 32.9%;
margin-right: 0;
}
-
+*/
.last-column .block {
margin-right: 0;
}
diff --git a/page.tpl.php b/page.tpl.php
index 2db47e6..9f24f74 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -105,35 +105,33 @@
<div id="bottom-wrapper" class="clear-block">
<div id="footer" class="section <?php print $attributes ?>">
- <?php if ($footer_column_count !== 0): ?>
- <div class="wrap-<?php print $footer_column_count ?>-col column-wrapper clear-block">
+ <div class="wrap-col column-wrapper clear-block">
- <?php if ($footer_1): ?>
+ <?php if ($page['footer_1']): ?>
<div class="footer-column">
- <?php print $footer_1 ?>
+ <?php print render($page['footer_1']); ?>
</div>
<?php endif; ?>
- <?php if ($footer_2): ?>
- <div class="footer-column<?php print $column2_is_last ?>">
- <?php print $footer_2 ?>
+ <?php if ($page['footer_2']): ?>
+ <div class="footer-column">
+ <?php print render($page['footer_2']); ?>
</div>
<?php endif; ?>
- <?php if ($footer_3): ?>
- <div class="footer-column<?php print $column3_is_last ?>">
- <?php print $footer_3 ?>
+ <?php if ($page['footer_3']): ?>
+ <div class="footer-column">
+ <?php print render($page['footer_3']); ?>
</div>
<?php endif; ?>
- <?php if ($footer_4): ?>
- <div class="footer-column<?php print $column4_is_last ?>">
- <?php print $footer_4 ?>
+ <?php if ($page['footer_4']): ?>
+ <div class="footer-column">
+ <?php print render($page['footer_4']); ?>
</div>
<?php endif; ?>
</div> <!-- /footer-column-wrap -->
- <?php endif; ?>
<div id="credit-wrap" class="clear-block">
<?php print render($page['footer']); ?>