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

Changeset 2745


Ignore:
Timestamp:
May 10, 2007, 12:03:38 PM (12 years ago)
Author:
ebihara
Message:

リリースブランチの変更をマージ

Location:
OpenPNE/branches/ebihara/prj_debug_2_6_7
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/public_html/modules/admin/default.css

    r2426 r2745  
    312312.contents textarea { padding: 2px 0 2px 5px;}
    313313
    314 
    315 .contents select.basic { padding: 1px;}
     314.contents select.basic { padding: 1px 0;}
     315.contents select.basic option { padding: 0 .3em 0 0;}
    316316
    317317/* ページャーの見た目 */
     
    870870#admin_page_edit_entry_point td.detail dl.image { padding: 15px 0 0 20px;}
    871871#admin_page_edit_entry_point td.detail h4 { margin-top: 16px; margin-left: 20px;padding-left: 5px; border-left: 6px #58585C solid; font-size: medium;}
    872 #admin_page_edit_entry_point td.detail p.textBtn { border-left: 5px solid #5F6067;}
    873872#admin_page_edit_entry_point td.detail img { margin-left: 23px;border-width: 2px; border-style: solid; border-color: #828282 #E0E0E0 #F0F0F0 #999999;}
    874873#admin_page_edit_entry_point p.actionMsg { margin: 10px 17px; border-color: #FFFFFF;}
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/admin/templates/user_analysis_date_month.tpl

    r2628 r2745  
    3232({foreach from=$analysis_date_month key=key item=item})
    3333<tr>
    34         ({if $key == "合計"})
     34        ({if $key eq "合計"})
    3535        <th>({$key})</th>       
    3636        ({else})
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/page/h_diary_add_confirm.php

    r1268 r2745  
    5555        $category_list = array_unique(explode(" ", rtrim($category)));
    5656        if (count($category_list) > 5) {
    57             $_REQUEST['msg'] = 'カテゴリの指定は5個以下にしてください';
     57            $_REQUEST['msg'] = 'カテゴリは5つまでしか指定できません';
    5858            openpne_forward('pc', 'page', 'h_diary_add');
    5959            exit;
    6060        }
    6161        foreach ($category_list as $value) {
    62             if(mb_strwidth($value) > 20) {
    63                 $_REQUEST['msg'] = 'カテゴリの文字数は半角20文字以内にしてください';
     62            if (mb_strwidth($value) > 20) {
     63                $_REQUEST['msg'] = 'カテゴリはひとつにつき全角10文字(半角20文字)以内で入力してください';
    6464                openpne_forward('pc', 'page', 'h_diary_add');
    6565                exit;
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/page/h_diary_edit_confirm.php

    r1593 r2745  
    5454        $category_list = array_unique(explode(" ", rtrim($category)));
    5555        if (count($category_list) > 5) {
    56             $_REQUEST['msg'] = 'カテゴリの指定は5個以下にしてください';
     56            $_REQUEST['msg'] = 'カテゴリは5つまでしか指定できません';
    5757            openpne_forward('pc', 'page', 'h_diary_edit');
    5858            exit;
    5959        }
    6060        foreach ($category_list as $value) {
    61             if(mb_strwidth($value) > 20) {
    62                 $_REQUEST['msg'] = 'カテゴリの文字数は半角20文字以内にしてください';
     61            if (mb_strwidth($value) > 20) {
     62                $_REQUEST['msg'] = 'カテゴリはひとつにつき全角10文字(半角20文字)以内で入力してください';
    6363                openpne_forward('pc', 'page', 'h_diary_edit');
    6464                exit;
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/c_edit_member.tpl

    r2628 r2745  
    9292({if !$c_member.is_c_commu_admin
    9393 &&  !$c_member.is_c_commu_sub_admin
    94  &&   $c_member.c_commu_admin_confirm_id <= 0
    95  &&   $c_member.c_commu_sub_admin_confirm_id <= 0
     94 &&   $c_member.c_commu_admin_confirm_id le 0
     95 &&   $c_member.c_commu_sub_admin_confirm_id le 0
    9696 &&   $c_commu.c_member_id_sub_admin != $u
    9797})
     
    108108
    109109({if !($c_member.is_c_commu_admin && !$c_member.is_c_commu_sub_admin)
    110  &&   $c_member.c_commu_admin_confirm_id <= 0
     110 &&   $c_member.c_commu_admin_confirm_id le 0
    111111 &&   $c_commu.c_member_id_sub_admin != $u
    112112})
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/c_home.tpl

    r2717 r2745  
    533533</tr>
    534534<!-- ここまで:主内容>コミュニティの説明 -->
    535 ({if $is_c_commu_member || $c_commu.public_flag != "auth_commu_member"})
     535({if $is_c_commu_member || $c_commu.public_flag neq "auth_commu_member"})
    536536<!-- ここから:主内容>新着のトピック書き込み -->
    537537({if $new_topic_comment})
     
    663663<td style="width:260px;" class="bg_02"><img src="./skin/dummy.gif" style="width:260px;height:1px;" class="dummy"></td>
    664664<td style="width:160px;padding:5px 0px;" class="bg_02 lh_140">
    665 ({if $is_c_commu_member || $c_commu.public_flag != "auth_commu_member"})
     665({if $is_c_commu_member || $c_commu.public_flag neq "auth_commu_member"})
    666666({if ($c_commu.topic_authority == 'public')||($c_commu.topic_authority == 'admin_only' && $is_c_commu_admin)})
    667667({if !$new_topic_comment})
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/fh_review_list_member.tpl

    r2628 r2745  
    88<img src="./skin/dummy.gif" class="v_spacer_l">
    99
    10 ({if $type == "h"})
     10({if $type eq "h"})
    1111<!-- ********************************** -->
    1212<!-- ******ここから:レビューを書く****** -->
     
    284284<a href="({t_url m=pc a=page_h_review_list_product})&amp;c_review_id=({$review.c_review_id})">全てのレビューを見る(({$review.write_num}))</a>
    285285
    286 ({if $type == "h"})|<a href="({t_url m=pc a=page_h_review_add_write})&amp;category_id=({$review.c_review_category_id})&amp;asin=({$review.asin})">編集</a><br>({/if})
     286({if $type eq "h"})|<a href="({t_url m=pc a=page_h_review_add_write})&amp;category_id=({$review.c_review_category_id})&amp;asin=({$review.asin})">編集</a><br>({/if})
    287287
    288288</div>
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/h_com_find_all.tpl

    r2717 r2745  
    5454並び替え<img src="({t_img_url_skin filename=icon_arrow_2})" class="icon">
    5555
    56 <a href="({t_url m=pc a=page_h_com_find_all})&amp;val_order=count&amp;keyword=({$keyword})&amp;category_id=({$search_val_list.category_id})">メンバー数順</a>
     56<a href="({t_url m=pc a=page_h_com_find_all})&amp;val_order=count&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;category_id=({$search_val_list.category_id})">メンバー数順</a>
    5757|
    58 <a href="({t_url m=pc a=page_h_com_find_all})&amp;val_order=r_datetime&amp;keyword=({$keyword})&amp;category_id=({$search_val_list.category_id})">作成日順</a>
     58<a href="({t_url m=pc a=page_h_com_find_all})&amp;val_order=r_datetime&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;category_id=({$search_val_list.category_id})">作成日順</a>
    5959
    6060<img src="./skin/dummy.gif" class="v_spacer_l">
     
    7373<input type="submit" class="submit" value=" 検 索 ">
    7474
    75 <a href="({t_url m=pc a=page_h_diary_list_all})&amp;keyword=({$keyword})">日記検索</a>
     75<a href="({t_url m=pc a=page_h_diary_list_all})&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})">日記検索</a>
    7676|
    77 <a href="http://www.google.com/search?hl=ja&amp;lr=lang_ja&amp;q=({$keyword})" target="_blank">ウェブ検索</a>
     77<a href="http://www.google.com/search?hl=ja&amp;lr=lang_ja&amp;q=({$smarty.capture.keyword_url|smarty:nodefaults})" target="_blank">ウェブ検索</a>
    7878
    7979</form>
     
    111111<div style="text-align:left;padding:3px;">
    112112({foreach name=cccl from=$c_commu_category_list[$item_parent.c_commu_category_parent_id] item=item_cat})
    113 <a href="({t_url m=pc a=page_h_com_find_all})&amp;order=r_datetime&amp;keyword=({$keyword})&amp;category_id=({$item_cat.c_commu_category_id})">({$item_cat.name})(({$item_cat.count_commu_category}))</a>
     113<a href="({t_url m=pc a=page_h_com_find_all})&amp;order=r_datetime&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;category_id=({$item_cat.c_commu_category_id})">({$item_cat.name})(({$item_cat.count_commu_category}))</a>
    114114({if !$smarty.foreach.cccl.last}) - ({/if})
    115115({/foreach})
     
    202202
    203203({if $is_prev})
    204 <a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=-1&amp;page=({$page})&amp;keyword=({$keyword})&amp;val_order=({$search_val_list.val_order})&amp;category_id=({$search_val_list.category_id})">前を表示</a>&nbsp;&nbsp;
     204<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=-1&amp;page=({$page})&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;val_order=({$search_val_list.val_order})&amp;category_id=({$search_val_list.category_id})">前を表示</a>&nbsp;&nbsp;
    205205({/if})
    206206({if $total_num})
     
    208208({/if})
    209209({if $is_next})
    210 &nbsp;&nbsp;<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=1&amp;page=({$page})&amp;keyword=({$keyword})&amp;val_order=({$search_val_list.val_order})&amp;category_id=({$search_val_list.category_id})">次を表示</a>
     210&nbsp;&nbsp;<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=1&amp;page=({$page})&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;val_order=({$search_val_list.val_order})&amp;category_id=({$search_val_list.category_id})">次を表示</a>
    211211({/if})
    212212
     
    409409
    410410({if $is_prev})
    411 <a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=-1&amp;page=({$page})&amp;val_order=({$search_val_list.val_order})&amp;keyword=({$keyword})&amp;category_id=({$search_val_list.category_id})">前を表示</a>&nbsp;&nbsp;
     411<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=-1&amp;page=({$page})&amp;val_order=({$search_val_list.val_order})&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;category_id=({$search_val_list.category_id})">前を表示</a>&nbsp;&nbsp;
    412412({/if})
    413413({if $total_num})
     
    415415({/if})
    416416({if $is_next})
    417 &nbsp;&nbsp;<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=1&amp;page=({$page})&amp;val_order=({$search_val_list.val_order})&amp;keyword=({$keyword})&amp;category_id=({$search_val_list.category_id})">次を表示</a>
     417&nbsp;&nbsp;<a href="({t_url m=pc a=page_h_com_find_all})&amp;direc=1&amp;page=({$page})&amp;val_order=({$search_val_list.val_order})&amp;keyword=({$smarty.capture.keyword_url|smarty:nodefaults})&amp;category_id=({$search_val_list.category_id})">次を表示</a>
    418418({/if})
    419419
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/h_config.tpl

    r2717 r2745  
    364364<div class="padding_s">
    365365
    366 <input type="radio" name="is_receive_daily_news" value="1" ({if $c_member.is_receive_daily_news == 1}) checked="checked"({/if}) class="no_bg">毎日
    367 ({if $daily_news_day_num})<input type="radio" name="is_receive_daily_news" value="2" ({if $c_member.is_receive_daily_news == 2}) checked="checked"({/if}) class="no_bg">週({$daily_news_day_num})回 (({$daily_news_day_str}))({/if})
    368 <input type="radio" name="is_receive_daily_news" value="0" ({if $c_member.is_receive_daily_news == 0}) checked="checked"({/if}) class="no_bg">受け取らない<br>
     366<input type="radio" name="is_receive_daily_news" value="1" ({if $c_member.is_receive_daily_news eq 1}) checked="checked"({/if}) class="no_bg">毎日
     367({if $daily_news_day_num})<input type="radio" name="is_receive_daily_news" value="2" ({if $c_member.is_receive_daily_news eq 2}) checked="checked"({/if}) class="no_bg">週({$daily_news_day_num})回 (({$daily_news_day_str}))({/if})
     368<input type="radio" name="is_receive_daily_news" value="0" ({if $c_member.is_receive_daily_news eq 0}) checked="checked"({/if}) class="no_bg">受け取らない<br>
    369369<span>※({$SNS_NAME})の最新情報をお届けします。</span>
    370370
     
    547547<div class="padding_s">
    548548
    549 <input type="radio" name="is_shinobiashi" value="0"({if $is_shinobiashi == 0}) checked="checked"({/if}) class="no_bg" id="is_shinobiashi_0"><label for="is_shinobiashi_0">あしあとを残す</label>
    550 <input type="radio" name="is_shinobiashi" value="1"({if $is_shinobiashi == 1}) checked="checked"({/if}) class="no_bg" id="is_shinobiashi_1"><label for="is_shinobiashi_1">あしあとを残さない</label>
     549<input type="radio" name="is_shinobiashi" value="0"({if $is_shinobiashi eq 0}) checked="checked"({/if}) class="no_bg" id="is_shinobiashi_0"><label for="is_shinobiashi_0">あしあとを残す</label>
     550<input type="radio" name="is_shinobiashi" value="1"({if $is_shinobiashi eq 1}) checked="checked"({/if}) class="no_bg" id="is_shinobiashi_1"><label for="is_shinobiashi_1">あしあとを残さない</label>
    551551<br>
    552552※他人のページを見たときに、あしあとを残すかどうかを設定することができます。
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/h_diary_add.tpl

    r2425 r2745  
    472472</select>
    473473<br>
    474 ひとつのカテゴリにつき半角20文字以内で入力してください。<br>
    475 カテゴリは5つまで登録できます。<br>
     474カテゴリはひとつにつき全角10文字(半角20文字)以内で入力してください。<br>
     475ひとつの日記にカテゴリは5つまで同時に指定することができます。<br>
    476476</div>
    477477</td>
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/modules/pc/templates/h_diary_edit.tpl

    r1600 r2745  
    491491</select>
    492492<br>
    493 ひとつのカテゴリにつき半角20文字以内で入力してください。<br>
    494 カテゴリは5つまで登録できます。<br>
     493カテゴリはひとつにつき全角10文字(半角20文字)以内で入力してください。<br>
     494ひとつの日記にカテゴリは5つまで同時に指定することができます。<br>
    495495</div>
    496496</td>
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp/templates/debug.tpl

    r2628 r2745  
    55{assign_debug_info}
    66
    7 {if isset($_smarty_debug_output|smarty:nodefaults) and $_smarty_debug_output == "html"}
     7{if isset($_smarty_debug_output|smarty:nodefaults) and $_smarty_debug_output eq "html"}
    88        <table border=0 width=100%>
    99        <tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>
    1010        <tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>
    1111        {section name=templates loop=$_debug_tpls}
    12                 <tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type == "template"}brown{elseif $_debug_tpls[templates].type == "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html}</font>{if isset($_debug_tpls[templates].exec_time|smarty:nodefaults)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% == 0} (total){/if}</i></font>{/if}</tt></td></tr>
     12                <tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html}</font>{if isset($_debug_tpls[templates].exec_time|smarty:nodefaults)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>
    1313        {sectionelse}
    1414                <tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>
     
    4242        _smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>");
    4343        {section name=templates loop=$_debug_tpls}
    44                 _smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type == "template"}brown{elseif $_debug_tpls[templates].type == "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html|escape:javascript}</font>{if isset($_debug_tpls[templates].exec_time|smarty:nodefaults)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% == 0} (total){/if}</i></font>{/if}</tt></td></tr>");
     44                _smarty_console.document.write("<tr bgcolor={if %templates.index% is even}#eeeeee{else}#fafafa{/if}><td colspan=2><tt>{section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}<font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>{$_debug_tpls[templates].filename|escape:html|escape:javascript}</font>{if isset($_debug_tpls[templates].exec_time|smarty:nodefaults)} <font size=-1><i>({$_debug_tpls[templates].exec_time|string_format:"%.5f"}){if %templates.index% eq 0} (total){/if}</i></font>{/if}</tt></td></tr>");
    4545        {sectionelse}
    4646                _smarty_console.document.write("<tr bgcolor=#eeeeee><td colspan=2><tt><i>no templates included</i></tt></td></tr>");
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp_biz/modules/biz/templates/fh_biz_schedule_add.tpl

    r2693 r2745  
    8282<select name='sc_rcount'>
    8383        ({section name=i loop=$rp_count})
    84                 <option type='radio' value='({$rp_count[i]})'>({$rp_count[i]})週間
     84                <option value='({$rp_count[i]})'>({$rp_count[i]})週間
    8585        ({/section})
    8686</select>  
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp_biz/modules/biz/templates/fh_biz_schedule_edit.tpl

    r2698 r2745  
    8282<select name='sc_rcount'>
    8383        ({section name=i loop=$rp_count})
    84                 <option type='radio' value='({$rp_count[i]})' ({if ($repeat_term + 1) == $rp_count[i]})selected({/if})>({$rp_count[i]})週間
     84                <option value='({$rp_count[i]})' ({if ($repeat_term + 1) == $rp_count[i]})selected({/if})>({$rp_count[i]})週間
    8585        ({/section})
    8686</select>
  • OpenPNE/branches/ebihara/prj_debug_2_6_7/webapp_biz/modules/biz/templates/h_biz_schedule_edit.tpl

    r1088 r2745  
    8181<select name='sc_rcount'>
    8282        ({section name=i loop=$rp_count})
    83                 <option type='radio' value='({$rp_count[i]})'>({$rp_count[i]})週間
     83                <option value='({$rp_count[i]})'>({$rp_count[i]})週間
    8484        ({/section})
    8585</select>
Note: See TracChangeset for help on using the changeset viewer.