Merge branch 'master' into talmdal_dev

6 files changed, 44 insertions, 19 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 860529cd..3a5a1946 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -542,17 +542,17 @@ div#g-action-status {
 
 /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.g-pager {
+.g-paginator {
   padding: .2em 0;
   width: 100%;
 }
 
-.g-pager li {
+.g-paginator li {
   float: left;
   width: 30%;
 }
 
-.g-pager .g-info {
+.g-paginator .g-info {
   background: none;
   padding: .2em 0;
   text-align: center;
@@ -675,12 +675,19 @@ div#g-action-status {
   padding-right: 30px !important;
 }
 
+.rtl form li.g-error,
+.rtl form li.g-info,
+.rtl form li.g-success,
+.rtl form li.g-warning {
+  padding-right: 0 !important;
+}
+
 .rtl .g-left,
 .rtl .g-inline li,
 .rtl #g-content #g-album-grid .g-item,
 .rtl .sf-menu li,
 .rtl .g-breadcrumbs li,
-.rtl .g-pager li,
+.rtl .g-paginator li,
 .rtl .g-buttonset li,
 .rtl .ui-icon-left .ui-icon,
 .rtl .g-short-form li,
@@ -717,19 +724,11 @@ div#g-action-status {
   padding-right: 0;
 }
 
-.rtl .g-pager .g-info {
-  width: 35%;
-}
-
-.rtl .g-pager .g-text-right {
-  margin-left: 0;
-}
-
 .rtl input.checkbox {
   margin-right: .4em;
 }
 
-/* Superfish RTL ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .rtl .sf-menu a.sf-with-ul {
 	padding-left: 2.25em;
@@ -789,3 +788,29 @@ div#g-action-status {
 	-webkit-border-top-left-radius: 17px;
 	-webkit-border-bottom-right-radius: 17px;
 }
+
+/* RTL paginator ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-paginator .g-info {
+  width: 35%;
+}
+
+.rtl .g-paginator .g-text-right {
+  margin-left: 0;
+}
+
+.rtl .g-paginator .ui-icon-seek-end {
+  background-position: -80px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-next {
+  background-position: -48px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-prev {
+  background-position: -32px -160px;
+}
+
+.rtl .g-paginator .ui-icon-seek-first {
+  background-position: -64px -160px;
+}
\ No newline at end of file
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 20236a7a..f58267bd 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -193,7 +193,7 @@
       <? endforeach ?>
     </table>
 
-    <div class="g-pager">
+    <div class="g-paginator">
       <?= $pager ?>
     </div>
 
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)): ?>