Changeset 774

Timestamp:

Nov 19, 2006, 6:41:53 PM (16 years ago)

Author:

takanashi

Message:

r773,r734,r736のマージ

Location:

OpenPNE/trunk

Files:

• config.php.sample (modified) (1 diff)
• webapp/modules/pc/templates/fh_friend_list_delete_c_friend_confilm.tpl (modified) (1 diff)
• webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl (modified) (1 diff)

OpenPNE/trunk/config.php.sample

@@ -286 +286 @@
 
 // ImageMagick の convertコマンドのパス
-//define('IMGMAGICK_APP', '/usr/bin/convert');
+define('IMGMAGICK_APP', '/usr/bin/convert');
 //define('IMGMAGICK_APP', '"C:\Program Files\ImageMagick-6.2.5-Q16\convert"');
 

OpenPNE/trunk/webapp/modules/pc/templates/fh_friend_list_delete_c_friend_confilm.tpl

@@ -72 +72 @@
 <input type="hidden" name="sessid" value="({$PHPSESSID})">
 <input type="hidden" name="target_c_member_id" value="({$target_c_member_id})">
-<input type="submit" value="　外 す　">&nbsp;
+<input type="submit" class="submit" value="　外 す　">&nbsp;
 </form>
 

OpenPNE/trunk/webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl

@@ -99 +99 @@
 ({* スケジュール *})
 ({foreach from=$item.schedule item=item_schedule name=schedule})
+({* 時間指定変数の初期化 *})
+({assign var="begin_time_H" value=null})
+({assign var="begin_time_M" value=null})
+({assign var="finish_time_H" value=null})
+({assign var="finish_time_M" value=null})
         ({if !$item_schedule.begin_time})