Merge branch 'master' into talmdal_dev

4 files changed, 5 insertions, 5 deletions

diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 7870ef3f..5fff5845 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_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-paginator">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Item %from_number of %count",
                        "Items %from_number - %to_number of %count",
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index fcebeea8..376dac74 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -20,10 +20,10 @@ input.submit {
   float: none !important;
 }
 
-.g-pager .g-text-right {
+.g-paginator .g-text-right {
   width: 29%;
 }
 
-.g-pager .ui-icon-right {
+.g-paginator .ui-icon-right {
   width: 60px;
 }
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 0025a993..ddaf33d0 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -108,7 +108,7 @@
           </li>
           <? $i++ ?>
           <? endforeach ?>
-          <li class="g-active"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active<? if ($i == 0) print " g-first" ?>"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
diff --git a/themes/wind/views/paginator.html.php b/themes/wind/views/paginator.html.php
index f6c03084..5034c965 100644
--- a/themes/wind/views/paginator.html.php
+++ b/themes/wind/views/paginator.html.php
@@ -26,7 +26,7 @@
 //
 ?>
 
-<ul class="g-pager ui-helper-clearfix">
+<ul class="g-paginator ui-helper-clearfix">
   <li class="g-first">
   <? if ($page_type == "collection"): ?>
     <? if (isset($first_page_url)): ?>