Changeset 20567


Ignore:
Timestamp:
2011/03/09 15:21:44 (10 years ago)
Author:
kimoto
Message:

list.tplに古いロジックが残っていたので修正 #1089

Location:
branches/version-2_5-dev/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/Smarty/templates/mobile/products/list.tpl

    r20116 r20567  
    2222 */ 
    2323*}--> 
    24 <!--{if isset($tpl_previous_page|smarty:nodefaults) || isset($tpl_next_page|smarty:nodefaults)}--> 
    25 <!--{if isset($tpl_previous_page|smarty:nodefaults)}--> 
    26 <a href="<!--{$tpl_previous_page|h}-->">前へ</a> 
    27 <!--{/if}--> 
    28 <!--{if isset($tpl_previous_page|smarty:nodefaults) && isset($tpl_next_page|smarty:nodefaults)}--> 
    29  
    30 <!--{/if}--> 
    31 <!--{if isset($tpl_next_page|smarty:nodefaults)}--> 
    32 <a href="<!--{$tpl_next_page|h}-->">次へ</a> 
    33 <!--{/if}--> 
     24<!--{if $tpl_strnavi != "&nbsp;"}--> 
     25<!--{$tpl_strnavi}--> 
    3426<br><br> 
    3527<!--{/if}--> 
     
    6658<!--{/foreach}--> 
    6759 
    68 <!--{if isset($tpl_previous_page|smarty:nodefaults) || isset($tpl_next_page|smarty:nodefaults)}--> 
    69 <!--{if isset($tpl_previous_page|smarty:nodefaults)}--> 
    70 <a href="<!--{$tpl_previous_page|h}-->">前へ</a> 
     60<!--{if $tpl_strnavi != "&nbsp;"}--> 
     61<!--{$tpl_strnavi}--> 
     62<br><br> 
    7163<!--{/if}--> 
    72 <!--{if isset($tpl_previous_page|smarty:nodefaults) && isset($tpl_next_page|smarty:nodefaults)}--> 
    73  
    74 <!--{/if}--> 
    75 <!--{if isset($tpl_next_page|smarty:nodefaults)}--> 
    76 <a href="<!--{$tpl_next_page|h}-->">次へ</a> 
    77 <!--{/if}--> 
    78 <br> 
    79 <!--{/if}--> 
  • branches/version-2_5-dev/data/class/SC_PageNavi.php

    r20155 r20567  
    137137            } 
    138138 
    139             if ($before || $next) { 
     139            if ($before && $next) { 
    140140                $this->strnavi = $before .(($display_number) ? $page_number : ' | ') .$next; 
     141            } else if ($before || $next) { 
     142                $this->strnavi = $before .(($display_number) ? $page_number : '') .$next; 
    141143            } 
    142144        } else { 
  • branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php

    r20540 r20567  
    124124        $this->tpl_linemax = $this->lfGetProductAllNum($arrSearchCondition); 
    125125        $urlParam = "category_id={$this->arrSearchData['category_id']}&pageno=#page#"; 
    126         $this->objNavi = new SC_PageNavi_Ex($this->tpl_pageno, $this->tpl_linemax, $this->disp_number, 'fnNaviPage', NAVI_PMAX, $urlParam,SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE); 
    127         $this->arrProducts = $this->lfGetProductsList($arrSearchCondition,$this->disp_number,$this->objNavi->start_row,$this->tpl_linemax,$objProduct); 
     126        $this->objNavi = new SC_PageNavi_Ex($this->tpl_pageno, $this->tpl_linemax, $this->disp_number, 'fnNaviPage', NAVI_PMAX, $urlParam, SC_Display_Ex::detectDevice() !== DEVICE_TYPE_MOBILE); 
     127        $this->arrProducts = $this->lfGetProductsList($arrSearchCondition, $this->disp_number, $this->objNavi->start_row, $this->tpl_linemax, $objProduct); 
    128128        //商品一覧の表示処理 
    129129        $strnavi = $this->objNavi->strnavi; 
     
    314314        // 規格を設定 
    315315        $objProduct->setProductsClassByProductIds($arrProduct_id); 
    316         $arrProducts += array('productStatus'=>$objProduct->getProductStatus($arrProduct_id));      
     316        $arrProducts += array('productStatus'=>$objProduct->getProductStatus($arrProduct_id)); 
    317317        return $arrProducts; 
    318318    } 
     
    358358     * 
    359359     * @return str 
    360      */     
     360     */ 
    361361    function lfGetPageTitle($mode,$category_id = 0){ 
    362362        if ($mode == 'search') { 
     
    368368            return $arrCat['name']; 
    369369        } 
    370         return "";        
     370        return ""; 
    371371    } 
    372372 
     
    375375     * 
    376376     * @return array 
    377      */     
     377     */ 
    378378    function lfGetSearchConditionDisp($arrSearchData){ 
    379379        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
     
    400400     * 
    401401     * @return int 
    402      */     
     402     */ 
    403403    function lfGetProductAllNum($searchCondition){ 
    404404        // 検索結果対象となる商品の数を取得 
     
    413413     * 
    414414     * @return array 
    415      */     
     415     */ 
    416416    function lfGetSearchCondition($arrSearchData){ 
    417417        $searchCondition = array( 
     
    468468     * 
    469469     * @return str 
    470      */    
     470     */ 
    471471    function lfSetSelectedData(&$arrProducts,$arrForm,$arrErr,$product_id){ 
    472472        $js_fnOnLoad = ""; 
     
    488488     * 
    489489     * @return void 
    490      */    
     490     */ 
    491491    function lfAddCart($arrForm, $referer){ 
    492492        $product_class_id = $arrForm['product_class_id']; 
Note: See TracChangeset for help on using the changeset viewer.