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

Changeset 2160


Ignore:
Timestamp:
Mar 19, 2007, 3:22:29 AM (15 years ago)
Author:
takanashi
Message:

kunitada分マージ確認

Location:
OpenPNE/branches/takanashi/2_7_5
Files:
11 added
7 edited
4 copied

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/ktai/init.inc

    r1856 r2160  
    11<?php
    22/**
    3  * @copyright 2005-2007 OpenPNE Project
     3 * @copyright 2005-2006 OpenPNE Project
    44 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
    55 */
     6
     7//ライブラリの読み込み
     8$ext_lib_dir = OPENPNE_WEBAPP_EXT_DIR . '/lib';
     9require_once($ext_lib_dir . '/common_commu.php');  //共通コミュニティライブラリ
    610
    711//デフォルトページ
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/ktai/page/f_home.php

    r1856 r2160  
    11<?php
    22/**
    3  * @copyright 2005-2007 OpenPNE Project
     3 * @copyright 2005-2006 OpenPNE Project
    44 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
    55 */
     
    5353        $this->set("c_commu_list", k_p_h_home_c_commu_list_lastupdate4c_member_id($target_c_member_id, 5));
    5454
     55        //共通コミュニティ
     56        $this->set('common_commu_count', count(db_common_commu_common_commu_id4c_member_id($target_c_member_id,$u)));
     57
    5558        //ターゲットと自分との関係
    5659        $this->set("relation", db_friend_relationship4two_members($u, $target_c_member_id));
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/ktai/templates/f_home.tpl

    r1382 r2160  
    144144({/foreach})
    145145<a href="({t_url m=ktai a=page_fh_com_list})&amp;target_c_member_id=({$target_c_member.c_member_id})&amp;({$tail})">→すべて表示</a><br>
     146({if $common_commu_count})
     147<a href="({t_url m=ktai a=page_f_com_list_common})&amp;target_c_member_id=({$target_c_member.c_member_id})&amp;({$tail})">→共通コミュニティ</a><br>
     148({/if})
    146149<a href="#top">↑このページの先頭へ戻る</a>
    147150
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/pc/init.inc

    r1856 r2160  
    11<?php
    22/**
    3  * @copyright 2005-2007 OpenPNE Project
     3 * @copyright 2005-2006 OpenPNE Project
    44 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
    55 */
     6
     7//ライブラリの読み込み
     8$ext_lib_dir = OPENPNE_WEBAPP_EXT_DIR . '/lib';
     9require_once($ext_lib_dir . '/common_commu.php');  //共通コミュニティライブラリ
    610
    711//デフォルトページ
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/pc/page/f_home.php

    r2153 r2160  
    11<?php
    22/**
    3  * @copyright 2005-2007 OpenPNE Project
     3 * @copyright 2005-2006 OpenPNE Project
    44 * @license   http://www.php.net/license/3_01.txt PHP License 3.01
    55 */
     
    7171        $this->set('c_friend_count', db_friend_count_friends($target_c_member_id));
    7272        $this->set('user_count', db_commu_count_c_commu4c_member_id($target_c_member_id));
     73
     74        $this->set('common_commu_count', count(db_common_commu_common_commu_id4c_member_id($target_c_member_id,$u)));
     75       
    7376        $c_commu_list = db_commu_c_commu_list4c_member_id_2($target_c_member_id, 9);
    7477        $this->set('c_commu_list', $c_commu_list);
     
    8184        $this->set('days_birthday', db_member_count_days_birthday4c_member_id($target_c_member_id));
    8285
     86        // inc_entry_point
     87        $this->set('inc_entry_point', fetch_inc_entry_point_f_home($this->getView()));
    8388        //PNEPOINT
    8489        $point = db_point_get_point($target_c_member_id);
     
    8792        //rank
    8893        $this->set("rank", db_point_get_rank4point($point));
    89 
    90         // inc_entry_point
    91         $this->set('inc_entry_point', fetch_inc_entry_point_f_home($this->getView()));
    9294
    9395        // ---
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/pc/templates/c_event_detail.tpl

    r2120 r2160  
    6767<tr>
    6868<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    69 <td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})21({else})19({/if})">
     69<td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})19({else})17({/if})">
    7070
    7171<div class="padding_s">
     
    129129<tr>
    130130<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    131 <td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})19({else})17({/if})">
     131<td style="width:110px;" class="bg_03" align="center" valign="top" rowspan="({if $is_c_event_admin})17({else})15({/if})">
    132132
    133133<div class="padding_s">
     
    335335
    336336({if $c_topic.invite_period != "0000-00-00"})({$c_topic.invite_period})({else})指定なし({/if})
    337 
    338 </div>
    339 
    340 </td>
    341 <td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    342 </tr>
    343 ({*********})
    344 <tr>
    345 <td style="height:1px;" class="bg_01"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    346 <td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    347 </tr>
    348 ({*********})
    349 <tr>
    350 <td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    351 <td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    352 <td class="bg_05" align="center" valign="middle">
    353 
    354 <div class="padding_s">
    355 
    356 募集人数
    357 
    358 </div>
    359 
    360 </td>
    361 <td class="bg_01" align="center"><img src="./skin/dummy.gif" style="width:1px;height:1px;" class="dummy"></td>
    362 <td class="bg_02" align="left" valign="middle">
    363 
    364 <div class="padding_s">
    365 
    366 ({if $c_topic.capacity})
    367 ({$c_topic.capacity})人
    368 ({else})
    369 無制限
    370 ({/if})
    371 
    372337
    373338</div>
     
    527492<!-- ********************************* -->
    528493<!-- ******ここから:書き込み一覧****** -->
    529 
    530 <a name="write"></a>
    531 
    532494<table border="0" cellspacing="0" cellpadding="0" style="width:650px;margin:0px auto;" class="border_07">
    533495<tr>
     
    743705<div class="padding_s">
    744706
    745 <textarea name="body" rows="10" cols="50" style="width:474px">({$body})</textarea>
     707<textarea name="body" rows="10" cols="50" style="width:415px">({$body})</textarea>
    746708
    747709</div>
     
    855817<input type="submit" class="submit" name="button" value="コメントのみ書き込む">
    856818({elseif $is_c_commu_member})
    857 
    858 ({if not $c_topic.capacity or ($c_topic.capacity gt $c_topic.member_num) })
    859819<input type="submit" class="submit" name="button" value="イベントに参加する">
    860 ({/if})
    861 
    862820<input type="submit" class="submit" name="button" value="コメントのみ書き込む">
    863821({/if})
  • OpenPNE/branches/takanashi/2_7_5/webapp/modules/pc/templates/inc_f_home_h_prof.tpl

    r2141 r2160  
    251251
    252252({if $inc_entry_point[3]})
    253 ({$inc_entry_point[3]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     253({$inc_entry_point[3]|smarty:nodefaults})
    254254({/if})
    255255
     
    353353<img src="./skin/dummy.gif" class="v_spacer_m">
    354354
    355 ({if $point})
    356 <p align=center>
    357 ({$point})pt<br>
    358 </p>
    359 ({/if})
    360 ({if $rank})
    361 <p align=center>
    362 ({$rank.name})<br>
    363 <img src="({t_img_url filename=$rank.image_filename})" class="pict" alt=({$rank.name}) style="margin:2px">
    364 </p>
    365 ({/if})
    366 
    367355({if $inc_entry_point[4]})
    368 ({$inc_entry_point[4]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     356({$inc_entry_point[4]|smarty:nodefaults})
    369357({/if})
    370358
     
    571559
    572560({if $inc_entry_point[5]})
    573 ({$inc_entry_point[5]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     561({$inc_entry_point[5]|smarty:nodefaults})
    574562({/if})
    575563
     
    606594&pne_item({$key+1})_linkurl=({t_url m=pc a=page_c_home _urlencode=true _html=false})%26target_c_commu_id=({$item.c_commu_id})
    607595&pne_item({$key+1})_imageurl=({t_img_url filename=$item.image_filename w=76 h=76 noimg=no_logo_small _urlencode=true _html=false})
    608 &pne_item({$key+1})_count=({$item.count_commu_members})
     596&pne_item({$key+1})_count=({$item.count_commu_member})
    609597({/foreach})
    610598({/strip})({/capture})
     
    630618({if $item})
    631619<td style="width:88px;" class="bg_03" align="center">
    632 ({if $item.c_member_id_admin == $target_c_member.c_member_id })<img src="({t_img_url_skin filename=icon_crown})" class="icon"><br>({/if})
    633620<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    634621<img src="({t_img_url filename=$item.image_filename w=76 h=76 noimg=no_logo_small})" class="pict"></a>
     
    648635<td class="bg_02" align="center">
    649636<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    650 ({$item.name}) (({$item.count_commu_members}))
     637({$item.name}) (({$item.count_commu_member}))
    651638</a>
    652639</td>
     
    669656({if $item})
    670657<td class="bg_03" align="center">
    671 ({if $item.c_member_id_admin == $target_c_member.c_member_id })<img src="({t_img_url_skin filename=icon_crown})" class="icon"><br>({/if})
    672658<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    673659<img src="({t_img_url filename=$item.image_filename w=76 h=76 noimg=no_logo_small})" class="pict"></a>
     
    687673<td class="bg_02" align="center">
    688674<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    689 ({$item.name}) (({$item.count_commu_members}))
     675({$item.name}) (({$item.count_commu_member}))
    690676</a>
    691677</td>
     
    708694({if $item})
    709695<td class="bg_03" align="center">
    710 ({if $item.c_member_id_admin == $target_c_member.c_member_id })<img src="({t_img_url_skin filename=icon_crown})" class="icon"><br>({/if})
    711696<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    712697<img src="({t_img_url filename=$item.image_filename w=76 h=76 noimg=no_logo_small})" class="pict"></a>
     
    726711<td class="bg_02" align="center">
    727712<a href="({t_url m=pc a=page_c_home})&amp;target_c_commu_id=({$item.c_commu_id})">
    728 ({$item.name}) (({$item.count_commu_members}))
     713({$item.name}) (({$item.count_commu_member}))
    729714</a>
    730715</td>
     
    760745<td style="width:5px;" class="bg_02"><img src="./skin/dummy.gif" style="width:5px;height:1px;" class="dummy"></td>
    761746</tr>
     747({if $common_commu_count})
     748<tr>
     749<td style="width:125px;" class="bg_02"><img src="./skin/dummy.gif" style="width:125px;height:1px;" class="dummy"></td>
     750<td style="width:20px;" class="bg_02"><img src="./skin/dummy.gif" class="icon arrow_1"></td>
     751<td align="left" style="width:116px;padding:2px 0px;" class="bg_02 lh_110">
     752<a href="({t_url m=pc a=page_f_com_list_common})&amp;target_c_member_id=({$target_c_member_id})">共通コミュニティ(({$common_commu_count}))</a>
     753</td>
     754<td style="width:5px;" class="bg_02"><img src="./skin/dummy.gif" style="width:5px;height:1px;" class="dummy"></td>
     755</tr>
     756({/if})
    762757<tr>
    763758<td style="width:266px;" class="bg_02" colspan="4"><img src="./skin/dummy.gif" style="width:266px;height:5px;" class="dummy"></td>
     
    780775
    781776({if $inc_entry_point[6]})
    782 ({$inc_entry_point[6]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     777({$inc_entry_point[6]|smarty:nodefaults})
    783778({/if})
    784779
     
    792787
    793788({if $inc_entry_point[7]})
    794 ({$inc_entry_point[7]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     789({$inc_entry_point[7]|smarty:nodefaults})
    795790({/if})
    796791
     
    10831078
    10841079({if $inc_entry_point[8]})
    1085 ({$inc_entry_point[8]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     1080({$inc_entry_point[8]|smarty:nodefaults})
    10861081({/if})
    10871082
     
    11751170
    11761171({if $inc_entry_point[9]})
    1177 ({$inc_entry_point[9]|smarty:nodefaults|t_url2cmd:'entry_point'|t_cmd:'entry_point'})
     1172({$inc_entry_point[9]|smarty:nodefaults})
    11781173({/if})
    11791174
Note: See TracChangeset for help on using the changeset viewer.