Yoshihisa Fukuhara
higef****@users*****
2006年 3月 1日 (水) 14:40:36 JST
Index: affelio/apps/diary/templates/admin_menu.tmpl
diff -u affelio/apps/diary/templates/admin_menu.tmpl:1.1 affelio/apps/diary/templates/admin_menu.tmpl:1.2
--- affelio/apps/diary/templates/admin_menu.tmpl:1.1 Wed Jan 25 11:31:16 2006
+++ affelio/apps/diary/templates/admin_menu.tmpl Wed Mar 1 14:40:36 2006
@@ -7,8 +7,11 @@
<!--<div id="afMenu">-->
<div class="afAdminMenu">
<UL>
-<LI><A HREF="./owner.cgi"><AF_M text='Write a diary'></A></LI>
+<LI><A HREF="./admin.cgi"><AF_M text='Write a diary'></A></LI>
+<LI><A HREF="./admin.cgi?mode=edit_category"><AF_M text='Edit categories'></A></LI>
<LI><A HREF="<TMPL_VAR NAME="access_control_URL">" target="_blank"><AF_M text='Access control'></A></LI>
-<LI><A HREF="./owner.cgi?mode=rdf_set"><AF_M text='General settings'></A></LI>
+<LI><A HREF="./admin.cgi?mode=pref_set"><AF_M text='General settings'></A></LI>
</UL>
</div>
+
+<div class="afContent">
\ No newline at end of file
Index: affelio/apps/diary/templates/calender.tmpl
diff -u affelio/apps/diary/templates/calender.tmpl:1.4 affelio/apps/diary/templates/calender.tmpl:1.5
--- affelio/apps/diary/templates/calender.tmpl:1.4 Wed Jul 6 07:06:14 2005
+++ affelio/apps/diary/templates/calender.tmpl Wed Mar 1 14:40:36 2006
@@ -1,9 +1,9 @@
<div class="afPubMessageTable">
<table id="calender">
<tr><td colspan="7" style="text-align:center;">
-<a href="list_diary.cgi?year=<TMPL_VAR NAME='LASTYEAR'>&month=<TMPL_VAR NAME='LAST_MON'>"><<</a>
+<a href="index.cgi?year=<TMPL_VAR NAME='LASTYEAR'>&month=<TMPL_VAR NAME='LAST_MON'>"><<</a>
<TMPL_VAR NAME="YEAR">/<TMPL_VAR NAME="MONTH">
-<a href="list_diary.cgi?year=<TMPL_VAR NAME='NEXTYEAR'>&month=<TMPL_VAR NAME='NEXT_MON'>">>></a>
+<a href="index.cgi?year=<TMPL_VAR NAME='NEXTYEAR'>&month=<TMPL_VAR NAME='NEXT_MON'>">>></a>
</td></tr>
<tr><th><AF_M text="Su"></th><th><AF_M text="Mo"></th><th><AF_M text="Tu"></th><th><AF_M text="We"></th><th><AF_M text="Th"></th><th><AF_M text="Fr"></th><th><AF_M text="Sa"></th></tr>
<TMPL_LOOP NAME="WEEKS">
Index: affelio/apps/diary/templates/edit_category.tmpl
diff -u /dev/null affelio/apps/diary/templates/edit_category.tmpl:1.1
--- /dev/null Wed Mar 1 14:40:36 2006
+++ affelio/apps/diary/templates/edit_category.tmpl Wed Mar 1 14:40:36 2006
@@ -0,0 +1,61 @@
+<!--<div class="afContent">-->
+
+<TMPL_IF NAME="EDIT_CATEGORY">
+<div class="afPubContentHeading">
+<table border="0" cellspacing="0">
+<tr><td align="left"><AF_M text="Edit categories">
+</td></tr></table>
+</div>
+
+<!-- Category Settings -->
+<div class="afPubContentBlock">
+<div class="afPubContentBlockTitle">
+<AF_M text="Create a new category">
+</div>
+<div class="afPubContentBlockContent">
+<TMPL_IF NAME="DONE_ADD">
+<AF_M text="New category was created."><br />
+</TMPL_IF>
+
+<form action="admin.cgi?mode=edit_category" method="post" name="edit_form">
+<AF_M text="Category name">: <input type="text" name="category" size="20" value="<TMPL_VAR NAME='CATEGORY'>">
+<input type="hidden" name="action" value="submit" />
+<input type="submit" name="save_category" value="<AF_M text='Apply'>" />
+</form>
+</div>
+</div>
+
+<div class="afPubContentBlock">
+<div class="afPubContentBlockTitle">
+<AF_M text="Edit categories">
+</div>
+<div class="afPubContentBlockContent">
+<TMPL_IF NAME="DONE_UPDATE">
+<AF_M text="The category was updated."><br />
+</TMPL_IF>
+
+<form action="admin.cgi?mode=edit_category" method="post" name="update_form">
+<SELECT size="6" name="categories" id="categories" onchange="changeCategory(this.form)">
+<TMPL_LOOP NAME="CATEGORIES">
+<OPTION value="<TMPL_VAR NAME="ID">"><TMPL_VAR NAME="CATEGORY"></OPTION>
+</TMPL_LOOP>
+</SELECT>
+<br />
+<br />
+<AF_M text="Edit the category name">: <input type="text" name="category" size="20" value="<TMPL_VAR NAME='CATEGORY'>">
+<input type="hidden" name="c_id" />
+<input type="hidden" name="action" value="update" />
+<input type="submit" name="update_category" value="<AF_M text='Apply'>" />
+</form>
+</div>
+</div>
+<script>
+function changeCategory(f){
+ id = f.categories.selectedIndex;
+ f.c_id.value=f.categories.options[id].value;
+ f.category.value=f.categories.options[id].text;
+}
+</script>
+
+</TMPL_IF>
+
Index: affelio/apps/diary/templates/external_blog.tmpl
diff -u affelio/apps/diary/templates/external_blog.tmpl:1.3 affelio/apps/diary/templates/external_blog.tmpl:1.4
--- affelio/apps/diary/templates/external_blog.tmpl:1.3 Sat Jul 2 08:22:30 2005
+++ affelio/apps/diary/templates/external_blog.tmpl Wed Mar 1 14:40:36 2006
@@ -4,35 +4,12 @@
<!-- 最新ã®ã‚¨ãƒ³ãƒˆãƒª -->
<div class="afPubContentBlock">
<div class="afPubContentBlockTitle">
-Recent Entries</div><!-- afPubContentBlockTitle -->
+<AF_M text="Recent Entries"></div><!-- afPubContentBlockTitle -->
<TMPL_LOOP NAME="ENTRY_LIST">
<a href="<TMPL_VAR NAME='LINK'>"><TMPL_VAR ESCAPE="HTML" NAME="TITLE"></a><br>
</TMPL_LOOP>
</div><!-- afPubContentBlock -->
-<!-- RSSã®ç·¨é›† -->
-<TMPL_IF NAME="WRITABLE">
-
-<form action="external_blog.cgi" method="post">
-<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle">
-Set RDF URL</div><!-- afPubContentBlockTitle -->
-<input type="text" name="url" size="15" /><br />
-<input type="submit" name="set_url" value="update" />
-</div><!-- afPubContentBlock -->
-</form>
-
-<form action="external_blog.cgi" method="post">
-<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle">
-Remove RDF</div><!-- afPubContentBlockTitle -->
-<input type="submit" name="remove_urlfile" value="remove" />
-</div><!-- afPubContentBlock -->
-</form>
-<br>
-
-</TMPL_IF>
-
<!-- RDFã®å–å¾— -->
<p>
<a href="<TMPL_VAR NAME='RSS_URL'>"><img src="./resource/xml.gif" border="0" /></a>
Index: affelio/apps/diary/templates/list_diary.tmpl
diff -u affelio/apps/diary/templates/list_diary.tmpl:1.8 affelio/apps/diary/templates/list_diary.tmpl:1.9
--- affelio/apps/diary/templates/list_diary.tmpl:1.8 Wed Jan 25 11:30:51 2006
+++ affelio/apps/diary/templates/list_diary.tmpl Wed Mar 1 14:40:36 2006
@@ -3,7 +3,7 @@
<tr><td align="left" valign="top"><TMPL_VAR ESCAPE="HTML" NAME="install_title">
</td><td align="right" valign="top">
<TMPL_IF NAME="EDITABLE">
-<form method="post" action="write_diary.cgi" style="padding:0px; margin:0px;"><input type="submit" name="write_diary" value="<AF_M text='Add Diary Entry'>" /></form>
+<form method="post" action="index.cgi" style="padding:0px; margin:0px;"><input type="hidden" name="mode" value="write_diary" /><input type="submit" name="write_diary" value="<AF_M text='Write a diary'>" /></form>
</TMPL_IF>
</td></tr>
</table>
@@ -16,17 +16,18 @@
<div class="afPubContentBlockTitle">
<TMPL_VAR NAME="TITLE">
</div>
-<div id="date"><TMPL_VAR NAME="MONTH">/<TMPL_VAR NAME="DAY"></div>
-<br>
-<div style="padding-left: 2.0em;">
-<TMPL_VAR NAME="IMAGES"><p><TMPL_VAR NAME="CONTENTS"></p>
-</div><!-- style="padding-left: 2.0em;" -->
+<div class="afAppDiaryDate">
+<TMPL_VAR NAME="MONTH">月<TMPL_VAR NAME="DAY">日 <TMPL_VAR NAME="HOUR">時<TMPL_VAR NAME="MIN">分</div>
+<div class="afAppDiaryCategory"><TMPL_VAR NAME="CATEGORY"></div>
+<div class="afAppDiaryText">
+<TMPL_VAR NAME="IMAGES"><p><TMPL_VAR NAME="CONTENTS">
+</div>
<br>
<small>
-<a href="show_diary.cgi?id=<TMPL_VAR NAME="ID">"><AF_M text="Comments">（<TMPL_VAR NAME="COMMENT_NO">）</a>｜
-<a href="show_trackback.cgi?id=<TMPL_VAR NAME="ID">"><AF_M text="Trackbacks">(<TMPL_VAR NAME="TRACKBACKS">)</a>
+Posted by <TMPL_VAR NAME="USERNAME">, <a href="index.cgi?mode=show_diary&id=<TMPL_VAR NAME="ID">"><AF_M text="Comments">(<TMPL_VAR NAME="COMMENT_NO">)</a>
+<a href="index.cgi?mode=show_tb&id=<TMPL_VAR NAME="ID">"><AF_M text="Trackbacks">(<TMPL_VAR NAME="TRACKBACKS">)</a>
<TMPL_IF NAME="EDITABLE">
-｜<a href="edit_diary.cgi?id=<TMPL_VAR NAME="ID">"><AF_M text="Edit"></a>
+<a href="index.cgi?mode=write_diary&action=edit&id=<TMPL_VAR NAME="ID">"><AF_M text="Edit"></a>
</TMPL_IF>
</small>
</div>
@@ -34,3 +35,5 @@
</TMPL_LOOP>
</div><!-- afPubContent -->
+
+
Index: affelio/apps/diary/templates/menu.tmpl
diff -u affelio/apps/diary/templates/menu.tmpl:1.15 affelio/apps/diary/templates/menu.tmpl:1.16
--- affelio/apps/diary/templates/menu.tmpl:1.15 Tue Feb 21 00:54:04 2006
+++ affelio/apps/diary/templates/menu.tmpl Wed Mar 1 14:40:36 2006
@@ -6,13 +6,14 @@
<TMPL_VAR NAME="CALENDER">
<P>
-<!-- Archive -->
-<TMPL_IF NAME="ARCHIVES">
+
+<!-- Recent Entries -->
+<TMPL_IF NAME="RECENT_ENTRIES">
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle"><AF_M text="Entry Archives"></div><!-- afPubContentBlockTitle -->
-<TMPL_LOOP NAME="ARCHIVES">
-<a href="list_diary.cgi?year=<TMPL_VAR NAME="YEAR">&month=<TMPL_VAR NAME="MONTH">">
-<TMPL_VAR NAME="YEAR">/<TMPL_VAR NAME="MONTH">
+<div class="afPubContentBlockTitle"><AF_M text="Recent Entries"></div><!-- afPubContentBlockTitle -->
+<TMPL_LOOP NAME="RECENT_ENTRIES">
+<a href="index.cgi?mode=show_diary&id=<TMPL_VAR NAME="ID">">
+<TMPL_VAR NAME="TITLE">
</a>
<br>
</TMPL_LOOP>
@@ -20,13 +21,13 @@
<br>
</TMPL_IF>
-<!-- Recent Entries -->
-<TMPL_IF NAME="RECENT_ENTRIES">
+<!-- Categories -->
+<TMPL_IF NAME="CATEGORIES">
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle"><AF_M text="Recent Entries"></div><!-- afPubContentBlockTitle -->
-<TMPL_LOOP NAME="RECENT_ENTRIES">
-<a href="show_diary.cgi?id=<TMPL_VAR NAME="ID">">
-<TMPL_VAR NAME="TITLE">
+<div class="afPubContentBlockTitle"><AF_M text="Categories"></div><!-- afPubContentBlockTitle -->
+<TMPL_LOOP NAME="CATEGORIES">
+<a href="index.cgi?mode=top&c_id=<TMPL_VAR NAME="C_ID">">
+<TMPL_VAR NAME="CATEGORY"> (<TMPL_VAR NAME="COUNT_CID">)
</a>
<br>
</TMPL_LOOP>
@@ -34,14 +35,15 @@
<br>
</TMPL_IF>
+
<TMPL_IF NAME="RECENT_COMMENTS">
<div class="afPubContentBlock">
<div class="afPubContentBlockTitle"><AF_M text="Recent Comments"></div><!-- afPubContentBlockTitle -->
<TMPL_LOOP NAME="RECENT_COMMENTS">
-<TMPL_VAR NAME="USER">/
-<a href="show_diary.cgi?id=<TMPL_VAR NAME='ID'>">
+<a href="index.cgi?mode=show_diary&id=<TMPL_VAR NAME='ID'>">
<TMPL_VAR NAME="TITLE">
-</a><br>
+</a>(<TMPL_VAR NAME="USER">)
+<br>
</TMPL_LOOP>
</div><!-- afPubContentBlock -->
<br>
@@ -52,7 +54,7 @@
<div class="afPubContentBlock">
<div class="afPubContentBlockTitle"><AF_M text="Recent Trackbacks"></div><!-- afPubContentBlockTitle -->
<TMPL_LOOP NAME="RECENT_TRACKBACKS">
-<a href="show_trackback.cgi?id=<TMPL_VAR ESCAPE='HTML' NAME='ID'>">
+<a href="index.cgi?mode=show_tb&id=<TMPL_VAR ESCAPE='HTML' NAME='ID'>">
<TMPL_VAR ESCAPE="HTML" NAME="TITLE">
</a>
<small>(<TMPL_VAR ESCAPE="HTML" NAME="BLOG_NAME">)</small><BR>
@@ -61,25 +63,18 @@
<br>
</TMPL_IF>
-<!-- Import RDF -->
-<TMPL_IF NAME="EDITABLE">
+<!-- Archive -->
+<TMPL_IF NAME="ARCHIVES">
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle"><AF_M text="Import BLOG"></div><!-- afPubContentBlockTitle -->
-<TMPL_UNLESS NAME="NO_PARSER">
-<a href="external_blog.cgi">blog</a>
-<TMPL_ELSE>
-<AF_M text="To use this feature, you need XML::Parser module on youre system">
-</TMPL_UNLESS>
-</div><!-- afPubContentBlock -->
-<br>
-</TMPL_IF>
-
-<TMPL_IF NAME="access_control_URL">
-<!-- Access Control -->
-<a href="<TMPL_VAR NAME="access_control_URL">" target="_blank">
-<AF_M text="Access Control">
+<div class="afPubContentBlockTitle"><AF_M text="Entry Archives"></div><!-- afPubContentBlockTitle -->
+<TMPL_LOOP NAME="ARCHIVES">
+<a href="index.cgi?mode=top&year=<TMPL_VAR NAME="YEAR">&month=<TMPL_VAR NAME="MONTH">">
+<TMPL_VAR NAME="YEAR">年<TMPL_VAR NAME="MONTH">月 (<TMPL_VAR NAME="COUNT_ACVS">)
</a>
<br>
+</TMPL_LOOP>
+</div><!-- afPubContentBlock -->
+<br>
</TMPL_IF>
<TMPL_IF NAME="ARCHIVES">
Index: affelio/apps/diary/templates/rdf_set.tmpl
diff -u /dev/null affelio/apps/diary/templates/rdf_set.tmpl:1.1
--- /dev/null Wed Mar 1 14:40:36 2006
+++ affelio/apps/diary/templates/rdf_set.tmpl Wed Mar 1 14:40:36 2006
@@ -0,0 +1,45 @@
+<!--<div class="afContent">-->
+
+<div class="afPubContentHeading">
+<table border="0" cellspacing="0">
+<tr><td align="left"><AF_M text="General settings">
+</td></tr></table>
+</div>
+
+<!-- Diary and RSS Settings -->
+<div class="afPubContentBlock">
+<div class="afPubContentBlockTitle">
+<AF_M text="Diary Configuration">
+</div>
+<div class="afPubContentBlockContent">
+<TMPL_IF NAME="SET_RDF">
+<p>
+<TMPL_VAR NAME="SET_RDF">
+</p>
+<br>
+</TMPL_IF>
+<TMPL_IF NAME="UNSET_RDF">
+<p>
+<TMPL_VAR NAME="UNSET_RDF">
+</p>
+<br>
+</TMPL_IF>
+
+<form action="admin.cgi?mode=pref_set" method="post">
+<p>
+<input type="radio" name="type" value="normal" <TMPL_VAR NAME="default"> />
+<AF_M text="Use this diary">
+<br>
+<input type="radio" name="type" value="import" <TMPL_VAR NAME="use_rdf"> <TMPL_IF NAME="NO_PARSER">disabled</TMPL_IF>>
+<AF_M text="Import external blog's RDF">
+<br>URL: <input type="text" name="url" size="50" value="<TMPL_VAR NAME='RDF_URL'>" <TMPL_IF NAME="NO_PARSER">readonly</TMPL_IF>>
+<TMPL_IF NAME="NO_PARSER">
+<br><small>(<AF_M text="To use this feature, you need XML::Parser module on youre system">)</small>
+</TMPL_IF>
+</p>
+<input type="hidden" name="action" value="submit" />
+<input type="submit" name="save_state" value="<AF_M text='Apply'>" />
+</form>
+</div>
+</div>
+
Index: affelio/apps/diary/templates/show_diary.tmpl
diff -u affelio/apps/diary/templates/show_diary.tmpl:1.9 affelio/apps/diary/templates/show_diary.tmpl:1.10
--- affelio/apps/diary/templates/show_diary.tmpl:1.9 Tue Feb 21 00:54:04 2006
+++ affelio/apps/diary/templates/show_diary.tmpl Wed Mar 1 14:40:36 2006
@@ -1,52 +1,69 @@
-<!--<TMPL_VAR ESCAPE="HTML" NAME="install_title">-->
-
-<!-- Diary -->
<div class="afPubContentHeading">
-<table border="0" cellspacing="0">
-<tr><td align="left">
-<small><TMPL_VAR NAME="MONTH">/<TMPL_VAR NAME="DAY"></small> : <TMPL_VAR NAME="TITLE">
-</td></tr></table>
+<table width="100%" cellspacing="0">
+<tr><td align="left" valign="top"><TMPL_VAR ESCAPE="HTML" NAME="install_title">
+</td><td align="right" valign="top">
+<TMPL_IF NAME="EDITABLE">
+<form method="post" action="index.cgi" style="padding:0px; margin:0px;"><input type="hidden" name="mode" value="write_diary" /><input type="submit" name="write_diary" value="<AF_M text='Write a diary'>" /></form>
+</TMPL_IF>
+</td></tr>
+</table>
</div><!-- afPubContentHeading -->
+<br>
<div class="afPubContent">
+
<div class="afPubContentBlock">
-<div style="padding-left: 2.0em; padding-top: 1.0em; padding-bottom: 1.0em;">
-<TMPL_VAR NAME="IMAGES"><p><TMPL_VAR NAME="CONTENTS"></p>
-</div><!-- style="padding-left: 2.0em; padding-top: 2.0em; padding-bottom: 1.0em;" -->
-</div><!-- afPubContentBlock -->
-</div><!-- afPubContent -->
+<div class="afPubContentBlockTitle">
+<TMPL_VAR NAME="TITLE">
+</div>
+<div class="afAppDiaryDate"><TMPL_VAR NAME="MONTH">月<TMPL_VAR NAME="DAY">日 <TMPL_VAR NAME="HOUR">時<TMPL_VAR NAME="MIN">分</div>
+<div class="afAppDiaryCategory"><TMPL_VAR NAME="CATEGORY"></div>
+<div class="afAppDiaryText">
+<TMPL_VAR NAME="IMAGES"><p><TMPL_VAR NAME="CONTENTS">
+</div>
+<br>
+<small>
+Posted by <TMPL_VAR NAME="USERNAME">,
+</small>
+</div>
+<br />
<!-- Comment -->
<TMPL_IF NAME="HAS_COMMENTS">
-<div class="afPubContent">
<div class="afPubContentBlock">
<div class="afPubContentBlockTitle">
<AF_M text="Comment">
</div><!-- afPubContentBlockTitle -->
-
+<div class="afAppDiaryText">
<TMPL_LOOP NAME="COMMENTS">
<TMPL_VAR NAME="COMMENT">
<p></p>
-<b><TMPL_VAR NAME="UNAME"></b>
-<small>(<TMPL_VAR NAME="COMMENT_TIME">)</small>
-<br><hr>
+<small>
+Posted by <b><TMPL_VAR NAME="UNAME"></b>
+ (<TMPL_VAR NAME="COMMENT_TIME">)
+</small><br /><hr />
</TMPL_LOOP>
-
+</div>
</div><!-- afPubContentBlock -->
-</div><!-- afPubContent -->
</TMPL_IF>
+<br />
+
<!-- Write Comment -->
-<TMPL_IF NAME="comment_write">
-<form method="post" action="write_comment.cgi">
-<div class="afPubContent">
+<TMPL_IF NAME="COMMENT_WRITE">
+<form method="post" action="index.cgi">
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle"><AF_M text="Please write your comment"></div><!-- afPubContentBlockTitle -->
+<div class="afPubContentBlockTitle"><AF_M text="Please write your comment."></div><!-- afPubContentBlockTitle -->
+
<textarea name="comment" rows="5" cols="60"></textarea><br>
<input type="submit" name="comment_confirm" value="<AF_M text="Confirm">">
+<input type="hidden" name="action" value="confirm">
+<input type="hidden" name="mode" value="write_comment">
<input type="hidden" name="id" value="<TMPL_VAR NAME='ID'>" />
+
</div><!-- afPubContentBlock -->
-</div><!-- afPubContent -->
</form>
</TMPL_IF>
+
+</div>
\ No newline at end of file
Index: affelio/apps/diary/templates/show_trackback.tmpl
diff -u affelio/apps/diary/templates/show_trackback.tmpl:1.4 affelio/apps/diary/templates/show_trackback.tmpl:1.5
--- affelio/apps/diary/templates/show_trackback.tmpl:1.4 Wed Jul 6 07:06:14 2005
+++ affelio/apps/diary/templates/show_trackback.tmpl Wed Mar 1 14:40:36 2006
@@ -1,20 +1,20 @@
-<!--<TMPL_VAR ESCAPE="HTML" NAME="install_title">-->
-
-<div class="afPubContent">
-
<div class="afPubContentHeading">
-<table border="0" cellspacing="0">
+<table width="100%" cellspacing="0">
<tr><td align="left">Trackbacks</td></tr>
</table>
+</div><!-- afPubContentHeading -->
+<br>
+<div class="afPubContent">
+
+
<div class="afPubContentBlock">
<div class="afPubContentBlockTitle">
<AF_M text="Trackback Ping-Url for this entry">
</div><!-- afPubContentBlockTitle -->
<br>
<TMPL_VAR NAME="PING_URL">
-</div><!-- afPubContent -->
+</div><!-- afPubContentBlock -->
-</div><!-- afPubContentHeading -->
<br>
<TMPL_LOOP NAME="TRACKBACKS">
@@ -23,16 +23,16 @@
<TMPL_VAR NAME="TITLE">
</div><!-- afPubContentBlockTitle -->
<div id="date"><TMPL_VAR NAME="DATE"></div><br>
-Received By:<br>
<div style="padding-left: 2.0em; font-size: x-small;">
-<TMPL_VAR NAME="BLOG_NAME">(<TMPL_VAR NAME='URL'>)<br>
+概è¦:<br>
+<TMPL_VAR NAME="EXCERPT"><br>
</div>
<br>
-Excerpt:<br>
<div style="padding-left: 2.0em; font-size: x-small;">
-<TMPL_VAR NAME="EXCERPT"><br>
+<a href="<TMPL_VAR NAME='URL'>"><TMPL_VAR NAME="BLOG_NAME"></a><br>
</div>
</div><!-- afPubContentBlock -->
</TMPL_LOOP>
</div>
+
Index: affelio/apps/diary/templates/uploader.tmpl
diff -u /dev/null affelio/apps/diary/templates/uploader.tmpl:1.1
--- /dev/null Wed Mar 1 14:40:36 2006
+++ affelio/apps/diary/templates/uploader.tmpl Wed Mar 1 14:40:36 2006
@@ -0,0 +1,50 @@
+<HTML>
+<Head>
+<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
+<Title>Image Uploader</title>
+<link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="style_path">">
+</head>
+<body>
+<TMPL_IF NAME="img">
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+ window.opener.document.edit_form.contents.value=window.opener.document.edit_form.contents.value+'<image="<TMPL_VAR NAME="img">">';
+//-->
+</SCRIPT>
+</TMPL_IF>
+<div>
+
+<div class="afPubContent">
+<div class="afPubContentBlock">
+<div class="afPubContentBlockTitle">
+<AF_M text="Image Uploader">
+</div>
+<div class="afPubContentBlockContent">
+<TMPL_IF NAME="err">
+<AF_M text="<TMPL_VAR NAME="err">">
+</TMPL_IF>
+<TMPL_IF NAME="img">
+<font color="red"><TMPL_VAR NAME="img">をアップãƒãƒ¼ãƒ‰ã—ã¾ã—ãŸã€‚</font>
+</TMPL_IF>
+<FORM method="POST" action="upload.cgi" enctype="multipart/form-data">
+<input type="file" name="upload" size="12" MAXLENGTH=256" />
+<br />
+<input type="submit" name="submit" value="<AF_M text='Submit'>" />
+<br />
+ç”»åƒã‚’é¸æŠžã—ã€é€ä¿¡ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ãã ã•ã„。
+<br />
+é€ä¿¡ã«æˆåŠŸã™ã‚‹ã¨ã€æœ¬æ–‡ç·¨é›†ã‚¨ãƒªã‚¢ã«<image="gazou.jpg"><br />
+ã¨ã„ã£ãŸã‚¿ã‚°ãŒæŒ¿å…¥ã•ã‚Œã¾ã™ã€‚
+<br />
+<br />
+<input type="button" value="<AF_M text='Close'>" onclick="window.close()" />
+
+</form>
+</div>
+
+</div>
+</div>
+
+</div>
+</body>
+</html>
Index: affelio/apps/diary/templates/write_comment.tmpl
diff -u affelio/apps/diary/templates/write_comment.tmpl:1.3 affelio/apps/diary/templates/write_comment.tmpl:1.4
--- affelio/apps/diary/templates/write_comment.tmpl:1.3 Fri Jul 1 13:55:59 2005
+++ affelio/apps/diary/templates/write_comment.tmpl Wed Mar 1 14:40:36 2006
@@ -22,7 +22,7 @@
<!-- コメント済ã¿ç”»é¢ -->
<TMPL_IF NAME="COMMIT">
-<form action="show_diary.cgi" method="post">
+<form action="index.cgi" method="post">
<div class="afPubContentHeading">
<table border="0" cellspacing="0">
<tr><td align="left">コメントã—ã¾ã—ãŸ</td></tr>
Index: affelio/apps/diary/templates/write_comment_confirm.tmpl
diff -u affelio/apps/diary/templates/write_comment_confirm.tmpl:1.8 affelio/apps/diary/templates/write_comment_confirm.tmpl:1.9
--- affelio/apps/diary/templates/write_comment_confirm.tmpl:1.8 Wed Jul 6 07:06:14 2005
+++ affelio/apps/diary/templates/write_comment_confirm.tmpl Wed Mar 1 14:40:36 2006
@@ -1,5 +1,5 @@
<!-- Confirmation -->
-<form action="write_comment.cgi" method="post">
+<form action="index.cgi" method="post">
<div class="afPubContentHeading">
<table border="0" cellspacing="0">
<tr><td align="left"><AF_M text="Your Comment"></td></tr>
@@ -15,6 +15,8 @@
</TMPL_IF>
<input type="submit" name="comment_commit" value="<AF_M text='Comment'>" />
<input type="hidden" name="id" value="<TMPL_VAR NAME='ID'>" />
+<input type="hidden" name="mode" value="write_comment" />
+<input type="hidden" name="action" value="commit" />
<input type="hidden" name="comment" value="<TMPL_VAR ESCAPE='HTML' NAME='COMMENT'>" />
</div>
</form>
Index: affelio/apps/diary/templates/write_diary_confirm.tmpl
diff -u affelio/apps/diary/templates/write_diary_confirm.tmpl:1.10 affelio/apps/diary/templates/write_diary_confirm.tmpl:1.11
--- affelio/apps/diary/templates/write_diary_confirm.tmpl:1.10 Thu Feb 23 22:36:03 2006
+++ affelio/apps/diary/templates/write_diary_confirm.tmpl Wed Mar 1 14:40:36 2006
@@ -1,26 +1,42 @@
<form method="post" action="write_diary.cgi" enctype="multipart/form-data">
<div class="afPubContentHeading">
<table border="0" cellspacing="0">
-<tr><td align="left"><AF_M text="Your Diary Entry">
+<tr><td align="left"><AF_M text="Confirm your article">
</td></tr></table>
</div>
+<br>
<div class="afPubContent">
<div class="afPubContentBlock">
-<div class="afPubMessageTable">
-<table>
-<tr><th>Title</th></tr>
-<tr><td><TMPL_VAR NAME="TITLE_SHOW"></td></tr>
-<tr><th>Content</th></tr>
-<tr><td><TMPL_VAR NAME="CONTENTS_SHOW"><br></td></tr>
-<tr><td><AF_M text="Image"> 1<input type="file" name="filename_1" size="32"></td><tr>
-<tr><td><AF_M text="Image"> 2<input type="file" name="filename_2" size="32"></td><tr>
-<tr><td><AF_M text="Send Trackback Ping"><input type="text" name="tping_url" size="32"></td><tr>
-<tr><td>
-<input type="submit" name="submit" value="<AF_M text='Add'>">
-<input type="submit" name="noname" value="<AF_M text='Modify'>">
-</td></tr>
-</table>
+<div class="afPubContentBlockTitle">
+<TMPL_VAR NAME="TITLE_SHOW">
+</div>
+<div class="afAppDiaryDate"><TMPL_VAR NAME="MONTH">/<TMPL_VAR NAME="DAY"></div>
+<div class="afAppDiaryCategory">
+<TMPL_VAR NAME="CATEGORY_NAME">
+</div>
+<br>
+<div class="afAppDiaryText">
+<TMPL_VAR NAME="CONTENTS_SHOW">
+<br>
+<br>
+<br>
+<TMPL_IF NAME="TPING">
+<b><AF_M text="Trackback Ping"></b><br>
+<TMPL_VAR NAME="TPING"></TMPL_IF>
+</div>
+<br>
+<br>
+<br>
<input type="hidden" name="title" value="<TMPL_VAR ESCAPE='HTML' NAME='TITLE'>">
<input type="hidden" name="contents" value="<TMPL_VAR ESCAPE='HTML' NAME='CONTENTS'>">
-</div></div>
+<TMPL_IF NAME="TPING">
+<input type="hidden" name="tping" value="<TMPL_VAR NAME='TPING'>">
+</TMPL_IF>
+<input type="submit" name="submit" value="<AF_M text='Add'>">
+<input type="submit" name="noname" value="<AF_M text='Modify'>">
+</div>
+<br>
+
+</div>
</form>
+
Index: affelio/apps/diary/templates/write_diary_done.tmpl
diff -u /dev/null affelio/apps/diary/templates/write_diary_done.tmpl:1.1
--- /dev/null Wed Mar 1 14:40:36 2006
+++ affelio/apps/diary/templates/write_diary_done.tmpl Wed Mar 1 14:40:36 2006
@@ -0,0 +1,19 @@
+<form method="post" action="index.cgi">
+
+<div class="afPubContentHeading">
+<table border="0" cellspacing="0">
+<tr><td align="left"><AF_M text="A contribution of an article was completed."></td></tr>
+</table>
+</div><!-- afPubContentHeading -->
+
+<div class="afPubContent">
+<div class="afPubContentBlock">
+<div class="afPubContentBlockContent">
+<input type="submit" name="submit" value="<AF_M text='Return'>" />
+</div>
+
+</div>
+</div>
+
+</form>
+</div>
\ No newline at end of file
Index: affelio/apps/diary/templates/write_diary_edit.tmpl
diff -u affelio/apps/diary/templates/write_diary_edit.tmpl:1.10 affelio/apps/diary/templates/write_diary_edit.tmpl:1.11
--- affelio/apps/diary/templates/write_diary_edit.tmpl:1.10 Tue Jul 12 06:05:16 2005
+++ affelio/apps/diary/templates/write_diary_edit.tmpl Wed Mar 1 14:40:36 2006
@@ -1,8 +1,8 @@
-<form method="post" enctype="multipart/form-data" action="write_diary.cgi">
+<form onSubmit="return checkForm(this)" method="post" action="index.cgi" name="edit_form">
<div class="afPubContentHeading">
<table border="0" cellspacing="0">
-<tr><td align="left"><AF_M text="Add Diary Entry"></td></tr>
+<tr><td align="left"><AF_M text="Write a diary"></td></tr>
</table>
</div><!-- afPubContentHeading -->
@@ -10,15 +10,96 @@
<div class="afPubContentBlock">
<div class="afPubMessageTable">
<table>
-<tr><th>Title</th></tr>
-<tr><td><input class="text" type="text" size="50" name="title" value="<TMPL_VAR ESCAPE='HTML' NAME='TITLE'>" /></td></tr>
-<tr><th>Contents</th></tr>
-<tr><td><textarea name="contents" rows="15" cols="50"><TMPL_VAR ESCAPE="HTML" NAME="CONTENTS"></textarea></td></tr>
+<tr><th><AF_M text="Title"></th></tr>
+<tr><td><input class="text" type="text" size="50" name="title" value="<TMPL_VAR NAME='TITLE'>" /></td></tr>
+<tr><th><AF_M text="Categories"> <small><a href="./admin.cgi?mode=edit_category">[<AF_M text="Edit categories">]</a></small>
+</th></tr>
+<tr><td>
+<SELECT NAME="category">
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
+<Option value="<TMPL_VAR NAME="ID">" <TMPL_IF NAME="SELECT">SELECTED</TMPL_IF>><TMPL_VAR NAME="CATEGORY">
+</TMPL_LOOP>
+</TMPL_IF>
+</SELECT>
+</td></tr>
+<tr><th><AF_M text="Content"></th></tr>
+<tr><td>
+<a href="javascript:insertTag('big')"><big>大</big></a>
+ <a href="javascript:insertTag('small')"><small>å°</small></a>
+ <a href="javascript:insertTag('b')"><b>太</b></a>
+ <a href="javascript:insertTag('i')"><i>斜</i></a>
+ <a href="javascript:insertTag('u')"><u>下線</u></a>
+ <!--left center right color link--></td></tr>
+<tr><td><textarea name="contents" rows="15" cols="50" id="contents"><TMPL_VAR NAME="CONTENTS"></textarea></td></tr>
<tr><td><small><AF_M text="Allowed HTML tags:"> <br> <a> <b> <big> <blockquote> <em> <i> <p> <strong> <small> <u> <br> <AF_M text="Only href attribute is allowed in anchor tag"></small></td></tr>
-<tr><td><input type="submit" name="confirm" value="<AF_M text='Confirm'>" /></td></tr>
+<tr><th><AF_M text="Insert images"></th></tr>
+<tr><td><input type="button" value="<AF_M text="Open the uploader">" onClick="OpenWin();"></td><tr>
+<tr><th><AF_M text="Send Trackback Ping"></th></tr>
+<tr><td><input type="text" name="tping_url" size="32"></td><tr>
+
+<tr><td>
+<input type="hidden" name="mode" value="write_diary" />
+<TMPL_IF NAME="ID">
+<input type="hidden" name="id" value="<TMPL_VAR NAME="ID">" />
+<input type="hidden" name="action" value="update" />
+<TMPL_ELSE>
+<input type="hidden" name="action" value="submit" />
+</TMPL_IF>
+<input type="button" name="preview" value="<AF_M text='Preview'>" onClick="previewDiary()" />
+<input type="submit" name="submit" value="<AF_M text='Post'>" />
+</td></tr>
</table>
</div>
</div>
+<!--preview-->
+<div class="afPubContentBlock">
+<div class="afPubContentBlockTitle">
+<AF_M text="Preview">
+</div>
+<div class="afAppDiaryText" id="preview">
+
+</div>
+
+</div>
+
</form>
+
+<script>
+function OpenWin(){
+ win=window.open("upload.cgi","new","toolbar=no,location=no,status=no,menubar=no,scrollbar=no,width=350,height=220");
+}
+
+function previewDiary(){
+ var str =document.getElementById('contents').value;
+ var str2 = str.replace(/\n/ig, '<br>');
+ var str3 = /<image="([A-Za-z0-9\-\_]*\.(jpg)|(png)|(gif)|(bmp)|(jpeg))">/gi.exec(str2);
+ if (str3){
+ var str4 = str2.replace(/<image="([A-Za-z0-9\-\_]*\.(jpg)|(png)|(gif)|(bmp)|(jpeg))">/gi, '<img src="show_image.cgi?id=0&filename='+str3[1]+'&size=s">');
+ document.getElementById('preview').innerHTML=str4;
+ }else{
+ document.getElementById('preview').innerHTML=str2;
+ }
+}
+
+function checkForm(f) {
+ if(f.title.value==""){
+ alert("Please input a title.");
+ f.name.focus();
+ return false;
+ }else if (f.contents.value==""){
+ alert("Please write a content.");
+ f.contetns.focus();
+ return false;
+ }
+ return true;
+}
+
+function insertTag(tag) {
+ document.edit_form.contents.value = document.edit_form.contents.value+'<'+tag+'></'+tag+'>';
+}
+</script>
+
+</div>
\ No newline at end of file