Changeset 18931

Timestamp:

2010/11/06 16:13:01 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/camp/camp-2_5-A:18910

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.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
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.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 18910@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-A%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:merge:

nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

nanasess@fsm.ne.jp-20101106071252-ch4zs660mx9kkxha

bzr:revno:

2364

bzr:revprop:branch-nick:

branches/camp/camp-2_5-A

bzr:root:

branches/camp/camp-2_5-A

bzr:text-parents:

data/Smarty/templates/default/header.tpl ohkouchi@loop-az.jp-20100614082324-fsyp4ss6t8s1l9hk
data/class/helper/SC_Helper_PageLayout.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18847
data/class/pages/admin/design/LC_Page_Admin_Design.php ohkouchi@loop-az.jp-20100804001353-nwvwvt05fn4vv05y
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php ohkouchi@loop-az.jp-20100909012402-qenu9kl3as94n1qf
data/install.php nanasess@fsm.ne.jp-20101106070749-f1jiu18u6mo6sp88
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20101104035705-abeyiznymhr557j6
html/user_data/packages/default/js/layout_design.js ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m

bzr:text-revisions:

data/Smarty/templates/admin/design/index.tpl nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
data/Smarty/templates/default/header.tpl nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
data/class/helper/SC_Helper_PageLayout.php nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
data/class/pages/admin/design/LC_Page_Admin_Design.php nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
html/user_data/packages/admin/css/admin_contents.css nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae
html/user_data/packages/default/js/layout_design.js nanasess@fsm.ne.jp-20101106070925-42s36i6snh52igae

bzr:timestamp:

2010-11-06 16:12:52.444000006 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-11-06T07:12:52.444000Z

Message:

ヘッダ中にもブロックを配置できるように修正

• TODO header.tpl 内の位置

Location:

branches/camp/camp-2_5-A

Files:

• data/Smarty/templates/admin/design/index.tpl (modified) (1 diff)
• data/Smarty/templates/default/header.tpl (modified) (1 diff)
• data/class/helper/SC_Helper_PageLayout.php (modified) (1 diff)
• data/class/pages/admin/design/LC_Page_Admin_Design.php (modified) (1 diff)
• data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php (modified) (2 diffs)
• html/install/sql/insert_data.sql (modified) (1 diff)
• html/user_data/packages/admin/css/admin_contents.css (modified) (2 diffs)
• html/user_data/packages/default/js/layout_design.js (modified) (1 diff)

branches/camp/camp-2_5-A/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/camp/camp-2_5-A/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>

branches/camp/camp-2_5-A/data/class/helper/SC_Helper_PageLayout.php

@@ -111 +111 @@
         $arrPageLayout['HeaderTopNavi'] = $this->lfGetNavi($arrNavi,8); //上部
         $arrPageLayout['FooterBottomNavi'] = $this->lfGetNavi($arrNavi,9); //下部
+        $arrPageLayout['HeaderInternalNavi'] = $this->lfGetNavi($arrNavi,10); //ヘッダ中
         
         

branches/camp/camp-2_5-A/data/class/pages/admin/design/LC_Page_Admin_Design.php

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

branches/camp/camp-2_5-A/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php

@@ -271 +271 @@
         }
 
+        // FIXME SC_Query::insert(), update() を使用する
         // bloc_id が空 若しくは データが存在していない場合にはINSERTを行う
         if ($arrData['bloc_id'] === '' or !isset($arrChk[0])) {
@@ -285 +286 @@
             $sql .= " ) VALUES (?, ?,?,?,now(),now() )";
             $sql .= " ";
+            array_unshift($arrUpdData, $arrData['bloc_id']);
         }else{
             // データが存在してる場合にはアップデートを行う

branches/camp/camp-2_5-A/html/install/sql/insert_data.sql

@@ -744 +744 @@
 INSERT INTO mtb_target (id, name, rank) VALUES (8, 'HeaderTopNavi', 8);
 INSERT INTO mtb_target (id, name, rank) VALUES (9, 'FooterBottomNavi', 9);
+INSERT INTO mtb_target (id, name, rank) VALUES (10, 'HeaderInternalNavi', 10);
 
 INSERT INTO mtb_taxrule (id, name, rank) VALUES (1, '四捨五入', 0);

branches/camp/camp-2_5-A/html/user_data/packages/admin/css/admin_contents.css

@@ -392 +392 @@
 .design-layout #BottomNavi,
 .design-layout #FooterBottomNavi,
+.design-layout #HeaderInternalNavi,
 .design-layout #Unused {
     padding-bottom: 20px;
@@ -412 +413 @@
     height: 20px;
 }
-
+#layout-header {
+    vertical-align: middle;
+}
 
 /* フォーム

branches/camp/camp-2_5-A/html/user_data/packages/default/js/layout_design.js

@@ -39 +39 @@
     
     $(document).ready(function(){
-        var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#TopNavi', '#BottomNavi', '#HeadNavi', '#HeaderTopNavi', '#FooterBottomNavi', '#Unused'];
+        var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#TopNavi', '#BottomNavi', '#HeadNavi', '#HeaderTopNavi', '#FooterBottomNavi', '#HeaderInternalNavi', '#Unused'];
         var $els = $(els.toString());