pager fix

diff --git a/ipf/form/boundfield.php b/ipf/form/boundfield.php
index d16f01d0f7dbf0028b37b855c00f278d8f92d22e..8791398975efd85817ae421494e89abdbb240244 100644 (file)
--- a/ipf/form/boundfield.php
+++ b/ipf/form/boundfield.php
@@ -33,7 +33,7 @@ class IPF_Form_BoundField
             $widget = $this->field->widget;
         }
         $id = $this->autoId();
-        if ($id and !array_key_exists('id', $attrs) 
+        if ($id and !array_key_exists('id', $attrs)
             and !array_key_exists('id', $widget->attrs)) {
             $attrs['id'] = $id;
         }
@@ -51,14 +51,19 @@ class IPF_Form_BoundField
         $widget = $this->field->widget;
         $id = (isset($widget->attrs['id'])) ? $widget->attrs['id'] : $this->autoId();
         $_tmp = array();
+        $class_found = false;
         foreach ($attrs as $attr=>$val) {
             $_tmp[] = $attr.'="'.$val.'"';
+            if ($attr=='class')
+               $class_found = true;
         }
+        if ( (!$class_found) && ($this->field->required==1))
+               $_tmp[] = 'class="req"';
         if (count($_tmp)) {
             $attrs = ' '.implode(' ', $_tmp);
         } else {
             $attrs = '';
-        } 
+        }
         return new IPF_Template_SafeString(sprintf('<label for="%s"%s>%s</label>',
                                                     $widget->idForLabel($id), $attrs, $contents), true);
     }

diff --git a/ipf/orm/pager/layoutarrows.php b/ipf/orm/pager/layoutarrows.php
index 76105e043ffa63dcb49dd9c3deb29736b41ea409..5ba8486d0c4f9f9ed082258cf1f522a286c26ca5 100644 (file)
--- a/ipf/orm/pager/layoutarrows.php
+++ b/ipf/orm/pager/layoutarrows.php
@@ -11,17 +11,17 @@ class IPF_ORM_Pager_LayoutArrows extends IPF_ORM_Pager_Layout
 
                $this->removeMaskReplacement('page');
 
-               if (($pager->getPage()-2)>$pager->getFirstPage()){
+               if (($pager->getPage()-5)>$pager->getFirstPage()){
 
-                       if (($pager->getPage()-2)>$pager->getFirstPage()){
+                       if (($pager->getPage()-5)>$pager->getFirstPage()){
                                $options['page_number'] = $pager->getFirstPage();
                                $str .= $this->processPage($options);
                        }
-                       if (($pager->getPage()-3)>$pager->getFirstPage()){
+                       if (($pager->getPage()-6)>$pager->getFirstPage()){
                                $options['page_number'] = $pager->getFirstPage()+1;
                                $str .= $this->processPage($options);
                        }
-                       if (($pager->getPage()-4)>$pager->getFirstPage()){
+                       if (($pager->getPage()-7)>$pager->getFirstPage()){
                                $str .= ' ... ';
                        }
                }

diff --git a/ipf/orm/pager/range/sliding.php b/ipf/orm/pager/range/sliding.php
index b704772106fbb79fb6af0e0a6c4ad40e938f6f26..cf8198eb37d939f3bfe4514c62d8bacdbb814114 100644 (file)
--- a/ipf/orm/pager/range/sliding.php
+++ b/ipf/orm/pager/range/sliding.php
@@ -56,7 +56,6 @@ class IPF_ORM_Pager_Range_Sliding extends IPF_ORM_Pager_Range
                 $chunkStart = $chunkStart - $adjust;
                 $chunkEnd = $pages;
             }
-
             return range($chunkStart, $chunkEnd);
         }