Changeset 19663 for branches/version-2_5-dev/data/Smarty

Timestamp:

2010/11/09 18:47:07 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

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/data/Smarty/templates

Files:

• admin/design/index.tpl (modified) (1 diff)
• default/header.tpl (modified) (1 diff)

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

@@ -74 +74 @@
             </tr>
             <tr>
-                <th colspan="3" id="layout-header">ヘッダー部</td>
+                <!-- ★☆★ ヘッダ内部ナビテーブル ☆★☆ -->
+                <th id="layout-header">ヘッダー部</th>
+                <td colspan="2" id="HeaderInternalNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "HeaderInternalNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+              </td>
+              <!-- ★☆★ ヘッダ内部ナビテーブル ☆★☆ -->
             </tr>
             <tr>

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

@@ -26 +26 @@
       <em><!--{$arrSiteInfo.shop_name|escape}-->/<!--{$tpl_title|escape}--></em></a>
   </h1>
+  <!--{* ▼HeaderInternal COLUMN*}-->
+  <!--{if $arrPageLayout.HeaderInternalNavi|@count > 0}-->
+      <div id="headerinternalcolumn">
+          <!--{* ▼上ナビ *}-->
+          <!--{foreach key=HeaderInternalNaviKey item=HeaderInternalNaviItem from=$arrPageLayout.HeaderInternalNavi}-->
+            <!-- ▼<!--{$HeaderInternalNaviItem.bloc_name}--> -->
+            <!--{if $HeaderInternalNaviItem.php_path != ""}-->
+              <!--{include_php file=$HeaderInternalNaviItem.php_path}-->
+            <!--{else}-->
+              <!--{include file=$HeaderInternalNaviItem.tpl_path}-->
+            <!--{/if}-->
+            <!-- ▲<!--{$HeaderInternalNaviItem.bloc_name}--> -->
+          <!--{/foreach}-->
+          <!--{* ▲上ナビ *}-->
+      </div>
+  <!--{/if}-->
+  <!--{* ▲HeaderInternal COLUMN*}-->
   <div id="information">
     <ul>