Changeset 19663


Ignore:
Timestamp:
2010/11/09 18:47:07 (13 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20101109090016-4fquwj4873620v9q
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/design/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Findex.tpl
data/Smarty/templates/default/header.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fheader.tpl
data/class/helper/SC_Helper_PageLayout.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_PageLayout.php
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/user_data/packages/admin/css/admin_contents.css 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fcss%2Fadmin_contents.css
html/user_data/packages/default/js/layout_design.js 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fjs%2Flayout_design.js
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20101109094702-mwscfwruu44cp72u
bzr:revno:
2393
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:timestamp:
2010-11-09 18:47:02.213000059 +0900
bzr:user-agent:
bzr2.2.0+bzr-svn1.0.3
svn:original-date:
2010-11-09T09:47:02.213000Z
Message:

source:branches/camp/camp-2_5-A のマージ(changeset:18931)

  • ヘッダ内部にもブロックを配置できるよう修正(#518)
Location:
branches/version-2_5-dev
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl

    r18900 r19663  
    7474            </tr> 
    7575            <tr> 
    76                 <th colspan="3" id="layout-header">ヘッダー部</td> 
     76                <!-- ★☆★ ヘッダ内部ナビテーブル ☆★☆ --> 
     77                <th id="layout-header">ヘッダー部</th> 
     78                <td colspan="2" id="HeaderInternalNavi" class="ui-sortable"> 
     79                    <!--{assign var="firstflg" value=false}--> 
     80                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}--> 
     81                        <!--{if $item.target_id == "HeaderInternalNavi"}--> 
     82                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->"> 
     83                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" /> 
     84                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" /> 
     85                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" /> 
     86                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" /> 
     87                                <!--{$item.name}--> 
     88                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label>  
     89                            </div> 
     90                            <!--{assign var="firstflg" value=true}--> 
     91                        <!--{/if}--> 
     92                    <!--{/foreach}--> 
     93              </td> 
     94              <!-- ★☆★ ヘッダ内部ナビテーブル ☆★☆ --> 
    7795            </tr> 
    7896            <tr> 

  • branches/version-2_5-dev/data/Smarty/templates/default/header.tpl

    r18700 r19663  
    2626      <em><!--{$arrSiteInfo.shop_name|escape}-->/<!--{$tpl_title|escape}--></em></a> 
    2727  </h1> 
     28  <!--{* ▼HeaderInternal COLUMN*}--> 
     29  <!--{if $arrPageLayout.HeaderInternalNavi|@count > 0}--> 
     30      <div id="headerinternalcolumn"> 
     31          <!--{* ▼上ナビ *}--> 
     32          <!--{foreach key=HeaderInternalNaviKey item=HeaderInternalNaviItem from=$arrPageLayout.HeaderInternalNavi}--> 
     33            <!-- ▼<!--{$HeaderInternalNaviItem.bloc_name}--> --> 
     34            <!--{if $HeaderInternalNaviItem.php_path != ""}--> 
     35              <!--{include_php file=$HeaderInternalNaviItem.php_path}--> 
     36            <!--{else}--> 
     37              <!--{include file=$HeaderInternalNaviItem.tpl_path}--> 
     38            <!--{/if}--> 
     39            <!-- ▲<!--{$HeaderInternalNaviItem.bloc_name}--> --> 
     40          <!--{/foreach}--> 
     41          <!--{* ▲上ナビ *}--> 
     42      </div> 
     43  <!--{/if}--> 
     44  <!--{* ▲HeaderInternal COLUMN*}--> 
    2845  <div id="information"> 
    2946    <ul> 

  • branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

    r18847 r19663  
    111111        $arrPageLayout['HeaderTopNavi'] = $this->lfGetNavi($arrNavi,8); //上部 
    112112        $arrPageLayout['FooterBottomNavi'] = $this->lfGetNavi($arrNavi,9); //下部 
     113        $arrPageLayout['HeaderInternalNavi'] = $this->lfGetNavi($arrNavi,10); //ヘッダ中 
    113114         
    114115         

  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php

    r19661 r19663  
    3131 * デザイン管理 のページクラス. 
    3232 * 
    33  * ターゲットID 0:未使用 1:レフトナビ 2:ライトナビ 3:イン画面上部 4:メイン画面下部  5:画面上部 6:画面下部 7:ヘッダより上 8:フッタより下 9:HEADタグ内 
     33 * ターゲットID 0:未使用 1:レフトナビ 2:ライトナビ 3:イン画面上部 4:メイン画面下部  5:画面上部 6:画面下部 7:ヘッダより上 8:フッタより下 9:HEADタグ内 10:ヘッダ内部 
    3434 * @package Page 
    3535 * @author LOCKON CO.,LTD. 

  • branches/version-2_5-dev/html/install/sql/insert_data.sql

    r19662 r19663  
    744744INSERT INTO mtb_target (id, name, rank) VALUES (8, 'HeaderTopNavi', 8); 
    745745INSERT INTO mtb_target (id, name, rank) VALUES (9, 'FooterBottomNavi', 9); 
     746INSERT INTO mtb_target (id, name, rank) VALUES (10, 'HeaderInternalNavi', 10); 
    746747 
    747748INSERT INTO mtb_taxrule (id, name, rank) VALUES (1, '四捨五入', 0); 

  • branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css

    r18900 r19663  
    392392.design-layout #BottomNavi, 
    393393.design-layout #FooterBottomNavi, 
     394.design-layout #HeaderInternalNavi, 
    394395.design-layout #Unused { 
    395396    padding-bottom: 20px; 
    … …  
    412413    height: 20px; 
    413414} 
    414  
     415#layout-header { 
     416    vertical-align: middle; 
     417} 
    415418 
    416419/* フォーム 

  • branches/version-2_5-dev/html/user_data/packages/default/js/layout_design.js

    r18701 r19663  
    3939     
    4040    $(document).ready(function(){ 
    41         var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#TopNavi', '#BottomNavi', '#HeadNavi', '#HeaderTopNavi', '#FooterBottomNavi', '#Unused']; 
     41        var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#TopNavi', '#BottomNavi', '#HeadNavi', '#HeaderTopNavi', '#FooterBottomNavi', '#HeaderInternalNavi', '#Unused']; 
    4242        var $els = $(els.toString()); 
    4343         
Note: See TracChangeset for help on using the changeset viewer.