Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev

5 files changed, 9 insertions, 8 deletions

diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 5d928b2e..91646b1e 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid">
+<ul id="g-album-grid" class="g-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
index d0d3eba6..378bd971 100644
--- a/themes/wind/views/no_sidebar.html.php
+++ b/themes/wind/views/no_sidebar.html.php
@@ -1,5 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="g-warning">
-  <?= t("No active sidebar blocks. <a href=\"%url\">Add blocks</a>",
-          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
-</div>
+<ul class="g-message-block">
+  <li class="g-warning"><?= t("No active sidebar blocks.<br/>
+      <a href=\"%url\">Add blocks</a>",
+          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
+</ul>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 6e1e3a53..fab4ba9e 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header">
+      <div id="g-header" class="g-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 5e79add6..2075fd95 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager">
+<ul class="g-pager g-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
index d2551c52..c49a7b51 100644
--- a/themes/wind/views/sidebar.html.php
+++ b/themes/wind/views/sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
 <div class="g-toolbar">
-  <div id="g-view-menu" class="g-buttonset">
+  <div id="g-view-menu" class="g-buttonset g-clearfix">
     <? if ($page_type == "album"):?>
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>