CVS update: slashjp/plugins/Email/templates (Slashdotjp-dev 440) - SRAD

Index: slashjp/plugins/Email/templates/data;email;default
diff -u slashjp/plugins/Email/templates/data;email;default:1.3 slashjp/plugins/Email/templates/data;email;default:1.4

--- slashjp/plugins/Email/templates/data;email;default:1.3	Fri Dec 31 21:35:53 2004
+++ slashjp/plugins/Email/templates/data;email;default	Wed Jul 12 20:41:48 2006
@@ -40,18 +40,18 @@
 
 CASE 'optout_added';
 	email = form.email | strip_attribute;
-	"Address <TT>$email</TT> added to opt-out list.<BR>";
+	"Address <tt>$email</tt> added to opt-out list.<br>";
 
 CASE 'optout_removed';
 	email = form.email | strip_attribute;
-	"Address <TT>$email</TT> removed from opt-out list.<BR>";
+	"Address <tt>$email</tt> removed from opt-out list.<br>";
 
 CASE 'mail_result';
 	UNLESS rc -%]
 [% storylinks = Slash.linkStory({ link => "the story", sid => form.sid }) %]
 Story mailed successfully.  Return to
-<A HREF="[% storylinks.0 | strip_attribute %]"[% IF storylinks.2 %] TITLE="[% storylinks.2 | strip_attribute %]"[% END %]>[% storylinks.1 | strip_html %]</A>
-or to <A HREF="[% gSkin.rootdir %]/">the home page</A>.
+<a href="[% storylinks.0 | strip_attribute %]"[% IF storylinks.2 %] TITLE="[% storylinks.2 | strip_attribute %]"[% END %]>[% storylinks.1 | strip_html %]</a>
+or to <a href="[% gSkin.rootdir %]/">the home page</a>.
 	[%- ELSE;
 "An error occured while attempting to mail the story.  Please check that
 the email address is valid.  If you believe this error is due to a
@@ -60,8 +60,8 @@
 
 CASE 'formkeyError';
 	linkop = 'email_send' ? 'email_form' : 'optout_form'; -%]
-	<P>Please return back to the <A HREF="[% gSkin.rootdir
-	-%]/email.pl?op=[% linkop %]">originating form</A> and try again.
+	<p>Please return back to the <a href="[% gSkin.rootdir
+	-%]/email.pl?op=[% linkop %]">originating form</a> and try again.
 	<!-- op=[% operation %], check=[% check %] -->
 	[%
 
@@ -69,4 +69,4 @@
 
 -%]
 __version__
-$Id: data;email;default,v 1.3 2004/12/31 12:35:53 oliver Exp $
+$Id: data;email;default,v 1.4 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/dispStory;email;default
diff -u slashjp/plugins/Email/templates/dispStory;email;default:1.3 slashjp/plugins/Email/templates/dispStory;email;default:1.4
--- slashjp/plugins/Email/templates/dispStory;email;default:1.3	Fri Dec 31 21:35:53 2004
+++ slashjp/plugins/Email/templates/dispStory;email;default	Wed Jul 12 20:41:48 2006
@@ -32,9 +32,7 @@
 	IF constants.use_dept;
 		box("  from the $story.dept dept.");
 	END;
-	thisurl = Slash.url2abs(
-		Slash.db.getSection(story.section, 'rootdir'), gSkin.absolutedir) ||
-		gSkin.absolutedir;
+	thisurl = Slash.url2abs(Slash.db.getSection(story.primaryskid, 'rootdir'), absolutedir) || absolutedir;
 
 	stime = Slash.timeCalc(story.time, "%A %B %d, @%H:%M");
 	box("  posted by $author on $stime ($topicname)");
@@ -58,7 +56,7 @@
 To opt-out of further emailings:
     [% thisurl %]/email.pl?op=optout_form
 
-Copyright 1997-2004 [% constants.sitepublisher %].  All rights reserved.
+Copyright 1997-2005 [% constants.sitepublisher %].  All rights reserved.
 
 __version__
-$Id: dispStory;email;default,v 1.3 2004/12/31 12:35:53 oliver Exp $
+$Id: dispStory;email;default,v 1.4 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/emailOptoutForm;email;default
diff -u slashjp/plugins/Email/templates/emailOptoutForm;email;default:1.2 slashjp/plugins/Email/templates/emailOptoutForm;email;default:1.3
--- slashjp/plugins/Email/templates/emailOptoutForm;email;default:1.2	Fri Dec 31 21:35:53 2004
+++ slashjp/plugins/Email/templates/emailOptoutForm;email;default	Wed Jul 12 20:41:48 2006
@@ -21,17 +21,17 @@
 	width="99%"
 	title="Opt-Out of Story Mailings" -%]
 
-<FORM ACTION="[% gSkin.rootdir %]/email.pl" METHOD="POST">
+<form action="[% gSkin.rootdir %]/email.pl" method="post">
 [% IF form.formkey -%]
-<INPUT TYPE="HIDDEN" NAME="formkey" VALUE="[% form.formkey %]">
+<input type="hidden" name="formkey" value="[% form.formkey %]">
 [% END -%]
-<INPUT TYPE="HIDDEN" NAME="op" VALUE="optout_save">
+<input type="hidden" name="op" value="optout_save">
 
-Enter email address to be removed from further story mailings:<BR>
-<INPUT TYPE="TEXT" NAME="email" SIZE="50">
-<BR><BR>
-<INPUT TYPE="SUBMIT" VALUE="Opt Out">
-</FORM>
+Enter email address to be removed from further story mailings:<br>
+<input type="text" name="email" size="50">
+<br><br>
+<input type="submit" value="Opt Out">
+</form>
 
 __version__
-$Id: emailOptoutForm;email;default,v 1.2 2004/12/31 12:35:53 oliver Exp $
+$Id: emailOptoutForm;email;default,v 1.3 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/emailStoryForm;email;default
diff -u slashjp/plugins/Email/templates/emailStoryForm;email;default:1.2 slashjp/plugins/Email/templates/emailStoryForm;email;default:1.3
--- slashjp/plugins/Email/templates/emailStoryForm;email;default:1.2	Fri Dec 31 21:35:53 2004
+++ slashjp/plugins/Email/templates/emailStoryForm;email;default	Wed Jul 12 20:41:48 2006
@@ -22,28 +22,28 @@
 	width="99%"
 	title="Email a Story" -%]
 
-<FORM ACTION="[% gSkin.rootdir %]/email.pl" METHOD="POST">
+<form action="[% gSkin.rootdir %]/email.pl" method="post">
 [% IF form.formkey -%]
-<INPUT TYPE="HIDDEN" NAME="formkey" VALUE="[% form.formkey %]">
+<input type="hidden" name="formkey" value="[% form.formkey %]">
 [% END -%]
-<INPUT TYPE="HIDDEN" NAME="op" VALUE="email_send">
+<input type="hidden" name="op" value="email_send">
 [% IF form.sid -%]
-<INPUT TYPE="HIDDEN" NAME="sid" VALUE="[% form.sid | strip_attribute %]">
+<input type="hidden" name="sid" value="[% form.sid | strip_attribute %]">
 [% END -%]
 
 [% UNLESS form.sid -%]
-<P>Enter story ID to mail: 
-<INPUT TYPE="TEXT" NAME="sid" SIZE="16">
+<p>Enter story ID to mail: 
+<input type="text" name="sid" size="16">
 [% ELSE -%]
-Selected story: <I>[% story.title %]</I>
-<SMALL>[% Slash.timeCalc(story.time) %] ([% story.sid %])</SMALL>
-</BLOCKQUOTE>
+Selected story: <i>[% story.title %]</i>
+<small>[% Slash.timeCalc(story.time) %] ([% story.sid %])</small>
+</blockquote>
 [% END -%]
 
-<P>Enter email address to send story to: 
-<INPUT TYPE="TEXT" NAME="email" SIZE="50">
-<P><INPUT TYPE="SUBMIT" VALUE="Send Email">
-</FORM>
+<p>Enter email address to send story to: 
+<input type="text" name="email" size="50">
+<p><input type="submit" value="Send Email">
+</form>
 
 __version__
-$Id: emailStoryForm;email;default,v 1.2 2004/12/31 12:35:53 oliver Exp $
+$Id: emailStoryForm;email;default,v 1.3 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/email_subj;email;default
diff -u slashjp/plugins/Email/templates/email_subj;email;default:1.1.1.1 slashjp/plugins/Email/templates/email_subj;email;default:1.2
--- slashjp/plugins/Email/templates/email_subj;email;default:1.1.1.1	Wed Jan 28 06:54:14 2004
+++ slashjp/plugins/Email/templates/email_subj;email;default	Wed Jul 12 20:41:48 2006
@@ -16,4 +16,4 @@
 __template__
 [% story.title %]
 __version__
-$Id: email_subj;email;default,v 1.1.1.1 2004/01/27 21:54:14 oliver Exp $
+$Id: email_subj;email;default,v 1.2 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/optout_confirm;email;default
diff -u slashjp/plugins/Email/templates/optout_confirm;email;default:1.1.1.1 slashjp/plugins/Email/templates/optout_confirm;email;default:1.2
--- slashjp/plugins/Email/templates/optout_confirm;email;default:1.1.1.1	Wed Jan 28 06:54:14 2004
+++ slashjp/plugins/Email/templates/optout_confirm;email;default	Wed Jul 12 20:41:48 2006
@@ -19,4 +19,4 @@
 If this request has been made in error, please send an email 
 to [% constants.adminmail %].
 __version__
-$Id: optout_confirm;email;default,v 1.1.1.1 2004/01/27 21:54:14 oliver Exp $
+$Id: optout_confirm;email;default,v 1.2 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/optout_subj;email;default
diff -u slashjp/plugins/Email/templates/optout_subj;email;default:1.1.1.1 slashjp/plugins/Email/templates/optout_subj;email;default:1.2
--- slashjp/plugins/Email/templates/optout_subj;email;default:1.1.1.1	Wed Jan 28 06:54:14 2004
+++ slashjp/plugins/Email/templates/optout_subj;email;default	Wed Jul 12 20:41:48 2006
@@ -17,4 +17,4 @@
 __template__
 Story Mailing Opt-out Confirmation
 __version__
-$Id: optout_subj;email;default,v 1.1.1.1 2004/01/27 21:54:14 oliver Exp $
+$Id: optout_subj;email;default,v 1.2 2006/07/12 11:41:48 sugi Exp $
Index: slashjp/plugins/Email/templates/removeOptoutForm;email;default
diff -u slashjp/plugins/Email/templates/removeOptoutForm;email;default:1.2 slashjp/plugins/Email/templates/removeOptoutForm;email;default:1.3
--- slashjp/plugins/Email/templates/removeOptoutForm;email;default:1.2	Fri Dec 31 21:35:53 2004
+++ slashjp/plugins/Email/templates/removeOptoutForm;email;default	Wed Jul 12 20:41:48 2006
@@ -21,14 +21,14 @@
 	width="99%"
 	title="Remove an Email Address from Opt-out List" -%]
 
-<FORM ACTION="[% gSkin.rootdir %]/email.pl" METHOD="POST">
-<INPUT TYPE="HIDDEN" NAME="op" VALUE="optoutrem">
+<form action="[% gSkin.rootdir %]/email.pl" method="post">
+<input type="hidden" name="op" value="optoutrem">
 
-Enter email address to be removed from the opt-out list:<BR>
-<INPUT TYPE="TEXT" NAME="email" SIZE="50">
-<BR><BR>
-<INPUT TYPE="SUBMIT" VALUE="Remove from Opt-out List">
-</FORM>
+Enter email address to be removed from the opt-out list:<br>
+<input type="text" name="email" size="50">
+<br><br>
+<input type="submit" value="Remove from Opt-out List">
+</form>
 
 __version__
-$Id: removeOptoutForm;email;default,v 1.2 2004/12/31 12:35:53 oliver Exp $
+$Id: removeOptoutForm;email;default,v 1.3 2006/07/12 11:41:48 sugi Exp $


SRAD

[Slashdotjp-dev 440] CVS update: slashjp/plugins/Email/templates