Merge branch 'dev' of git://github.com/infinitas/infinitas into dev

infinitas · Jan 6, 2010 · a3f289b · a3f289b
2 parents 706b550 + 9b3a70a
commit a3f289b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/views/elements/pagination/navigation.ctp b/views/elements/pagination/navigation.ctp
@@ -24,7 +24,6 @@
 ?>
     <div class="wrap">
         <div class="limit">
-            <span><?php echo __( 'Display', true ); ?> #</span>
             <span><?php
                 $_paginationOptions = explode( ',', Configure::read( 'Global.pagination_select' ) );
                 $paginationLimmits = array_combine(
@@ -67,11 +66,7 @@
                             'class' => ''
                         ),
                         null,
-                        array(
-                            'escape' => false,
-                            'tag' => 'span',
-                            'class' => ''
-                        )
+                        null
                     );
                 ?>
             </div>
@@ -107,19 +102,15 @@
         <div class="button2-left">
             <div class="next">
                 <?php
-                    echo $paginator->prev(
+                    echo $paginator->next(
                         __( 'Next', true ),
                         array(
                             'escape' => false,
                             'tag' => 'span',
                             'class' => ''
                         ),
                         null,
-                        array(
-                            'escape' => false,
-                            'tag' => 'span',
-                            'class' => ''
-                        )
+                        null
                     );
                 ?>
             </div>
@@ -139,7 +130,7 @@
                 ?>
             </div>
         </div>
-        <span>
+        <span class="pages">
             <?php echo $this->Design->paginationCounter( $paginator ); ?>
         </span>
     </div>

diff --git a/webroot/css/admin/pagination.css b/webroot/css/admin/pagination.css
@@ -6,9 +6,13 @@
     margin:          0 auto;
 }
 
+.pagination .wrap .pages{
+	margin-left: 5px;
+}
+
 .pagination a:hover {
     text-decoration: none;
-    color:           #0B55C4;
+    color:           #FF6500;
 }
 
 .pagination a,
@@ -38,7 +42,7 @@
 }
 
 .pagination .limit .submit {
-    float:right;
+    float:left;
 }
 
 .pagination .limit select {