Changeset 19958


Ignore:
Timestamp:
2011/01/18 18:13:37 (12 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19957
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/mail/history.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Fhistory.tpl
data/Smarty/templates/admin/mail/query.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Fquery.tpl
data/Smarty/templates/admin/mail/template_complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate_complete.tpl
data/Smarty/templates/admin/mail/template_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Ftemplate_input.tpl
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php 15649@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_TemplateInput.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110118091323-o7quat3at554excw
bzr:revno:
2687
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/mail/history.tpl ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
data/Smarty/templates/admin/mail/query.tpl ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
data/Smarty/templates/admin/mail/template_complete.tpl ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
data/Smarty/templates/admin/mail/template_input.tpl ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
data/class/pages/admin/mail/LC_Page_Admin_Mail.php ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
html/install/index.php ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
html/install/sql/drop_table.sql ohkouchi@loop-az.jp-20110118091150-dk5vee3dha9eznkd
bzr:timestamp:
2011-01-18 18:13:23.717999935 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-18T09:13:23.718000Z
Message:

#793(非推奨機能の削除)

  • 動作を優先するため, r18786 の一部を差し戻し

#382(管理画面XHTMLに変更)

  • メルマガ管理画面を修正
Location:
branches/version-2_5-dev
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl

    r19954 r19958  
    2525<input type="hidden" name="search_pageno" value="" /> 
    2626<input type="hidden" name="mode" value="" /> 
    27 <div id="mail" class="contents-main"> 
     27  <!--{if count($arrDataList) > 0}--> 
     28  <div id="mail" class="contents-main"> 
    2829    <table class="list center"> 
    2930        <tr> 
    … …  
    4647            <td class="left"><!--{$arrDataList[cnt].subject|h}--></td> 
    4748            <td><a href="javascript:;" onclick="win03('./preview.php?send_id=<!--{$arrDataList[cnt].send_id|h}-->', 'confirm', '720', '600'); return false;">確認</a></td> 
    48             <td><a href="#" onclick="win03('./<!--{$smarty.const.DIR_INDEX_URL}-->?mode=query&amp;send_id=<!--{$arrDataList[cnt].send_id|h}-->','query','720','420'); return false;">確認</a></td> 
     49            <td><a href="javascript:;" onclick="win03('./<!--{$smarty.const.DIR_INDEX_URL}-->?mode=query&amp;send_id=<!--{$arrDataList[cnt].send_id|h}-->','query','615','800'); return false;">確認</a></td> 
    4950            <td><!--{$arrDataList[cnt].count_all|h}--></td> 
    5051            <td><!--{$arrDataList[cnt].count_sent|h}--></td> 
    … …  
    6364        </tr> 
    6465        <!--{/section}--> 
    65     </table> 
    66 </div> 
     66      </table> 
     67    </div> 
     68    <!--{else}--> 
     69      <div id="complete"> 
     70          <div class="complete-top"></div> 
     71          <div class="contents"> 
     72              <div class="message"> 
     73          配信履歴はありません 
     74              </div> 
     75          </div> 
     76          <div class="btn-area-top"></div> 
     77          <div class="btn-area"> 
     78              <ul> 
     79                  <li><a class="btn-action" href="./<!--{$smarty.const.DIR_INDEX_URL}-->"><span class="btn-prev">配信内容設定へ戻る</span></a></li> 
     80              </ul> 
     81          </div> 
     82          <div class="btn-area-bottom"></div> 
     83      </div> 
     84    <!--{/if}--> 
    6785</form> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl

    r19954 r19958  
    134134  </table> 
    135135 
    136   <div class="btn"> 
    137     <a class="btn-normal" href="javascript:;" onclick="window.close(); return false;"><span>ウインドウを閉じる</span></a> 
     136  <div class="btn-area"> 
     137    <ul> 
     138      <li><a class="btn-action" href="javascript:;" onclick="window.close(); return false;"><span class="btn-next">ウインドウを閉じる</span></a></li> 
     139    </ul> 
    138140  </div> 
    139141</div> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_complete.tpl

    r18873 r19958  
    2525<input type="hidden" name="mode" value="" /> 
    2626<input type="hidden" name="product_id" value="" /> 
    27 <div id="mail" class="contents-main"> 
    28   <div class="message"> 
    29     テンプレートの登録・編集が完了しました<br /> 
    30     <a href="./template.php">テンプレート一覧に戻る</a> 
    31   </div> 
     27    <div id="complete"> 
     28        <div class="complete-top"></div> 
     29        <div class="contents"> 
     30            <div class="message"> 
     31                登録が完了致しました。 
     32            </div> 
     33        </div> 
     34        <div class="btn-area-top"></div> 
     35        <div class="btn-area"> 
     36            <ul> 
     37                <li><a class="btn-action" href="./template.php"><span class="btn-prev">テンプレート一覧に戻る</span></a></li> 
     38            </ul> 
     39        </div> 
     40        <div class="btn-area-bottom"></div> 
     41    </div> 
    3242</div> 
    3343</form> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl

    r19954 r19958  
    8989  </div> 
    9090</table> 
    91  
     91</div> 

  • branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

    r19943 r19958  
    210210 
    211211            $this->list_data = $list_data; 
     212            $this->setTemplate('mail/query.tpl'); 
    212213            return; 
    213214        } 

  • branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php

    r19805 r19958  
    142142        } else { 
    143143            $sqlval['create_date'] = "now()"; 
     144            $sqlval['template_id'] = $objQuery->nextVal('dtb_mailmaga_template_template_id'); 
    144145            $objQuery->insert("dtb_mailmaga_template", $sqlval); 
    145146        } 

  • branches/version-2_5-dev/html/install/index.php

    r19938 r19958  
    10331033                 array("dtb_site_control", "control_id"), 
    10341034                 array("dtb_table_comment", "id"), 
    1035                  array("dtb_trackback", "trackback_id")); 
     1035                 array("dtb_trackback", "trackback_id"), 
     1036                 array("dtb_mailmaga_template", "template_id")); 
    10361037} 
    10371038 

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

    r19928 r19958  
    235235) ENGINE=InnoDB; 
    236236 
     237CREATE TABLE dtb_mailmaga_template ( 
     238    template_id int NOT NULL, 
     239    subject text, 
     240    charge_image text, 
     241    mail_method int, 
     242    header text, 
     243    body text, 
     244    main_title text, 
     245    main_comment text, 
     246    main_product_id int, 
     247    sub_title text, 
     248    sub_comment text, 
     249    sub_product_id01 int, 
     250    sub_product_id02 int, 
     251    sub_product_id03 int, 
     252    sub_product_id04 int, 
     253    sub_product_id05 int, 
     254    sub_product_id06 int, 
     255    sub_product_id07 int, 
     256    sub_product_id08 int, 
     257    sub_product_id09 int, 
     258    sub_product_id10 int, 
     259    sub_product_id11 int, 
     260    sub_product_id12 int, 
     261    del_flg smallint NOT NULL DEFAULT 0, 
     262    creator_id int NOT NULL, 
     263    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
     264    update_date timestamp NOT NULL, 
     265    PRIMARY KEY (template_id) 
     266) ENGINE=InnoDB; 
     267 
    237268CREATE TABLE dtb_send_history ( 
    238269    send_id int  NOT NULL, 

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

    r19928 r19958  
    235235); 
    236236 
     237CREATE TABLE dtb_mailmaga_template ( 
     238    template_id int NOT NULL, 
     239    subject text, 
     240    charge_image text, 
     241    mail_method int, 
     242    header text, 
     243    body text, 
     244    main_title text, 
     245    main_comment text, 
     246    main_product_id int, 
     247    sub_title text, 
     248    sub_comment text, 
     249    sub_product_id01 int, 
     250    sub_product_id02 int, 
     251    sub_product_id03 int, 
     252    sub_product_id04 int, 
     253    sub_product_id05 int, 
     254    sub_product_id06 int, 
     255    sub_product_id07 int, 
     256    sub_product_id08 int, 
     257    sub_product_id09 int, 
     258    sub_product_id10 int, 
     259    sub_product_id11 int, 
     260    sub_product_id12 int, 
     261    del_flg smallint NOT NULL DEFAULT 0, 
     262    creator_id int NOT NULL, 
     263    create_date timestamp NOT NULL DEFAULT now(), 
     264    update_date timestamp NOT NULL, 
     265    PRIMARY KEY (template_id) 
     266); 
     267 
    237268CREATE TABLE dtb_send_history ( 
    238269    send_id int NOT NULL, 

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

    r19860 r19958  
    103103DROP TABLE dtb_index_list; 
    104104DROP TABLE dtb_payment_options; 
     105DROP TABLE dtb_mailmaga_template; 
Note: See TracChangeset for help on using the changeset viewer.