Changeset 13151

Timestamp:

11/06/09 00:33:47 (2 weeks ago)

Author:

Alexander Ermashev

Message:

- ticket #1413;

Files:

• trunk/calendar.php (modified) (1 diff)
• trunk/templates/base/scripts/BxBaseSearchResult.php (modified) (3 diffs)

trunk/calendar.php

@@ -39 +39 @@
-    $aDateParams = explode('/', $sDate);
-    $oSearch = new BxTemplSearchProfile('calendar', (int)$aDateParams[0], (int)$aDateParams[1], (int)$aDateParams[2]);
+    $oSearch -> aConstants['linksTempl']['browseAll'] = 'calendar.php?';
+
-    $sCode = $oSearch->displayResultBlock();
-
+
+
-}
-

trunk/templates/base/scripts/BxBaseSearchResult.php

@@ -157 +157 @@
-    }
-
-
+
+
-        $aLinkAddon = $this->getLinkAddByPrams();
+
+        if($aLinkAddon) {
+           foreach($aLinkAddon as $mKey => $sValue)
+           {
+                $sPageLink .= $sValue;
+           }   
+        }
+ 
+        if(!$this->id) {
+            $this->id = 0;
+        }
+    
-        $oPaginate = new BxDolPaginate(array(
-this->getCurrentUrl('browseAll', 0, '')
+sPageLink
-            'count' => $this->aCurrent['paginate']['totalNum'],
-            'per_page' => $this->aCurrent['paginate']['perPage'],
@@ -166 +179 @@
-            'per_page_changer' => true,
-            'page_reloader' => true,
-
-
+!$bPageReload ? '' : 
+!$bChangePage ? '' : 
-        ));
-        $sPaginate = '<div class="clear_both"></div>'.$oPaginate->getPaginate();
@@ -198 +211 @@
-        }
-        //paginate
-'.$this->aCurrent['paginate']['page']
-'.$this->aCurrent['paginate']['perPage']
+{page}'
+{per_page}'
-        return $aLinks;
-    }