ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 6357


Ignore:
Timestamp:
Apr 7, 2008, 4:48:07 PM (13 years ago)
Author:
ogawa
Message:

#2014:フレンドのassignする場所を移動、テンプレート内は変数を使うよう統一

Location:
OpenPNE/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/trunk/webapp/lib/OpenPNE/Smarty.php

    r6341 r6357  
    2323            }
    2424        }
     25
     26        $this->assign('WORD_FRIEND', WORD_FRIEND);
     27        $this->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
     28        $this->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
     29        $this->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    2530    }
    2631
  • OpenPNE/trunk/webapp/lib/OpenPNE/Validator/Common.php

    r4933 r6357  
    4141        $v_dir = OPENPNE_WEBAPP_DIR . '/validate/';
    4242        $common_ini_files = array();
    43         $common_ini_files[] = $v_dir . 'msg.ini'; // エラーメッセージ系
    44         $common_ini_files[] = $v_dir . 'sessid.ini'; // はまちちゃん対策セッションID
     43        $common_ini_files[] = $v_dir . 'msg.ini';
     44        $common_ini_files[] = $v_dir . 'sessid.ini';
    4545        foreach ($common_ini_files as $ini) {
    4646            $this->validator->addIniSetting($ini);
  • OpenPNE/trunk/webapp/lib/util/mail_send.php

    r5568 r6357  
    8787    $smarty->assign($params);
    8888    $smarty->assign('inc_signature', fetch_inc_signature($smarty));
    89     $smarty->assign('WORD_FRIEND', WORD_FRIEND);
    90     $smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    91     $smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    92     $smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    9389
    9490    $tpl_name = str_replace('.tpl', '', $tpl_name);
  • OpenPNE/trunk/webapp/lib/util/page.php

    r6099 r6357  
    4949    $inc_smarty->assign('INC_NAVI_type', $type);
    5050    $inc_smarty->assign('navi', util_get_c_navi($type));
    51 
    52     $inc_smarty->assign('WORD_FRIEND', WORD_FRIEND);
    53     $inc_smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    54     $inc_smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    55     $inc_smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    5651
    5752    return $inc_smarty->ext_fetch('inc_navi.tpl');
  • OpenPNE/trunk/webapp/modules/admin/templates/diary_list.tpl

    r6349 r6357  
    8484全員に公開
    8585({elseif $item.public_flag == "friend"})
    86 ({$smarty.const.WORD_MY_FRIEND})まで公開
     86({$WORD_MY_FRIEND})まで公開
    8787({elseif $item.public_flag == "private"})
    8888公開しない
  • OpenPNE/trunk/webapp/modules/admin/templates/edit_c_admin_config.tpl

    r6349 r6357  
    302302<td>
    303303<span class="info">SNS内「フレンド」を他の名称に設定します</span><br />
    304 <input class="basic" name="WORD_FRIEND" type="text" value="({$smarty.const.WORD_FRIEND})" size="30" />
     304<input class="basic" name="WORD_FRIEND" type="text" value="({$WORD_FRIEND})" size="30" />
    305305</td>
    306306</tr>
     
    309309<td>
    310310<span class="info">SNS内「フレンド」を他の名称に設定します</span><br />
    311 <input class="basic" name="WORD_MY_FRIEND" type="text" value="({$smarty.const.WORD_MY_FRIEND})" size="30" />
     311<input class="basic" name="WORD_MY_FRIEND" type="text" value="({$WORD_MY_FRIEND})" size="30" />
    312312</td>
    313313</tr>
     
    316316<td>
    317317<span class="info">SNS内「フレンド」を他の名称に設定します</span><br />
    318 <input class="basic" name="WORD_FRIEND_HALF" type="text" value="({$smarty.const.WORD_FRIEND_HALF})" size="30" />
     318<input class="basic" name="WORD_FRIEND_HALF" type="text" value="({$WORD_FRIEND_HALF})" size="30" />
    319319</td>
    320320</tr>
     
    323323<td>
    324324<span class="info">SNS内「フレンド」を他の名称に設定します</span><br />
    325 <input class="basic" name="WORD_MY_FRIEND_HALF" type="text" value="({$smarty.const.WORD_MY_FRIEND_HALF})" size="30" />
     325<input class="basic" name="WORD_MY_FRIEND_HALF" type="text" value="({$WORD_MY_FRIEND_HALF})" size="30" />
    326326</td>
    327327</tr>
  • OpenPNE/trunk/webapp/modules/admin/templates/edit_c_profile.tpl

    r2513 r6357  
    125125<td class="cell05">({if $item.is_required})○({else})×({/if})</td>
    126126<td class="cell06">({if $item.public_flag_edit})○({else})×({/if})</td>
    127 <td class="cell07">({if $item.public_flag_default == 'private'})公開しない({elseif $item.public_flag_default == 'friend'})({$smarty.const.WORD_MY_FRIEND})まで公開({else})全員に公開({/if})</td>
     127<td class="cell07">({if $item.public_flag_default == 'private'})公開しない({elseif $item.public_flag_default == 'friend'})({$WORD_MY_FRIEND})まで公開({else})全員に公開({/if})</td>
    128128<td class="cell08">({if $item.form_type == 'text'})テキスト({elseif $item.form_type == 'textlong'})テキスト(長)({elseif $item.form_type == 'textarea'})テキスト(複数行)({elseif $item.form_type == 'select'})単一選択(プルダウン)({elseif $item.form_type == 'radio'})単一選択(ラジオボタン)({elseif $item.form_type == 'checkbox'})複数選択(チェックボックス)({/if})</td>
    129129<td class="cell09">({$item.sort_order})</td>
  • OpenPNE/trunk/webapp/modules/admin/templates/insert_c_profile.tpl

    r4607 r6357  
    3535<td><select class="basic" name="public_flag_default">
    3636<option value="public">全員に公開</option>
    37 <option value="friend">({$smarty.const.WORD_MY_FRIEND})まで公開</option>
     37<option value="friend">({$WORD_MY_FRIEND})まで公開</option>
    3838<option value="private">公開しない</option>
    3939</select></td>
  • OpenPNE/trunk/webapp/modules/admin/templates/update_c_profile.tpl

    r4607 r6357  
    3939<td><select class="basic" name="public_flag_default">
    4040<option value="public"({if $c_profile.public_flag_default == 'public'}) selected="selected"({/if})>全員に公開</option>
    41 <option value="friend"({if $c_profile.public_flag_default == 'friend'}) selected="selected"({/if})>({$smarty.const.WORD_MY_FRIEND})まで公開</option>
     41<option value="friend"({if $c_profile.public_flag_default == 'friend'}) selected="selected"({/if})>({$WORD_MY_FRIEND})まで公開</option>
    4242<option value="private"({if $c_profile.public_flag_default == 'private'}) selected="selected"({/if})>公開しない</option>
    4343</select></td>
  • OpenPNE/trunk/webapp/modules/ktai/init.inc

    r4933 r6357  
    7474    //全ページ共通変数のアサイン
    7575    $smarty->assign('msg', k_p_common_msg4msg_id($_REQUEST['msg']));
    76     $smarty->assign('WORD_FRIEND', WORD_FRIEND);
    77     $smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    78     $smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    79     $smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    8076    $smarty->assign('ktai_color_config', util_get_color_config_ktai());
    8177
  • OpenPNE/trunk/webapp/modules/ktai/templates/h_set_public_flag_all_confirm.tpl

    r4371 r6357  
    1414公開しない
    1515({elseif $public_flag_diary_all == 'friend'})
    16 ({$smarty.const.WORD_MY_FRIEND_HALF})まで公開
     16({$WORD_MY_FRIEND_HALF})まで公開
    1717({else})
    1818全員に公開
  • OpenPNE/trunk/webapp/modules/pc/init.inc

    r6349 r6357  
    1818function init_pc_page(&$smarty)
    1919{
    20     //文言系
    21     $smarty->assign('WORD_FRIEND', WORD_FRIEND);
    22     $smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    23     $smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    24     $smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    25 
    2620    $is_secure = $GLOBALS['__Framework']['is_secure'];
    2721
     
    5044    $smarty->assign('INC_HEADER_page_name', $GLOBALS['__Framework']['current_action']);
    5145    if ($is_secure) {
    52             $smarty->assign('INC_HEADER_top_banner_html_after', p_common_c_siteadmin4target_pagename('top_banner_html_after'));
    53             $smarty->assign('INC_HEADER_global_navi', util_get_c_navi('global'));
     46        $smarty->assign('INC_HEADER_top_banner_html_after', p_common_c_siteadmin4target_pagename('top_banner_html_after'));
     47        $smarty->assign('INC_HEADER_global_navi', util_get_c_navi('global'));
    5448    } else {
    55             $smarty->assign('INC_HEADER_top_banner_html_before', p_common_c_siteadmin4target_pagename('top_banner_html_before'));
     49        $smarty->assign('INC_HEADER_top_banner_html_before', p_common_c_siteadmin4target_pagename('top_banner_html_before'));
    5650    }
    5751    $smarty->assign('INC_HEADER_inc_page_top', p_common_c_siteadmin4target_pagename('inc_page_top'));
  • OpenPNE/trunk/webapp/modules/pc/templates/h_set_public_flag_all_confirm.tpl

    r6087 r6357  
    99({t_form_block m=pc a=do_h_set_public_flag_all})
    1010<input type="hidden" name="public_flag_diary_all" value="({$public_flag_diary_all})" />
    11 <p>設定内容 : ({if $public_flag_diary_all == 'private'})公開しない({elseif $public_flag_diary_all == 'friend'})({$smarty.const.WORD_MY_FRIEND})まで公開({else})全員に公開({/if})</p>
     11<p>設定内容 : ({if $public_flag_diary_all == 'private'})公開しない({elseif $public_flag_diary_all == 'friend'})({$WORD_MY_FRIEND})まで公開({else})全員に公開({/if})</p>
    1212<ul class="moreInfo button">
    1313<li><input type="submit" class="input_submit" name="ok" value="一括設定" /></li>
  • OpenPNE/trunk/webapp_biz/modules/biz/init.inc

    r4933 r6357  
    3131            "pc_get_trusted")
    3232    );
    33 
    34     //文言系
    35     $smarty->assign('WORD_FRIEND', WORD_FRIEND);
    36     $smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    37     $smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    38     $smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    3933
    4034    $is_secure = $GLOBALS['__Framework']['is_secure'];
  • OpenPNE/trunk/webapp_biz/modules/ktai_biz/init.inc

    r4933 r6357  
    7777    //全ページ共通変数のアサイン
    7878    $smarty->assign('msg', k_p_common_msg4msg_id($_REQUEST['msg']));
    79     $smarty->assign('WORD_FRIEND', WORD_FRIEND);
    80     $smarty->assign('WORD_MY_FRIEND', WORD_MY_FRIEND);
    81     $smarty->assign('WORD_FRIEND_HALF', WORD_FRIEND_HALF);
    82     $smarty->assign('WORD_MY_FRIEND_HALF', WORD_MY_FRIEND_HALF);
    8379    $smarty->assign('ktai_color_config', util_get_color_config_ktai());
    8480
Note: See TracChangeset for help on using the changeset viewer.