keeping up to iPhone/iPod touch (cont'd)

diff --git a/lib/plugins/10url b/lib/plugins/10url
index 3d5a96c..e648922 100644 (file)
--- a/lib/plugins/10url
+++ b/lib/plugins/10url
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/10url
 # URL処理
-# $Id: 10url,v 1.8 2008-08-03 02:36:48 morimoto Exp $
+# $Id: 10url,v 1.9 2008-12-29 14:42:40 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/10url,v $
 
 # The line number (1 incremented) and filename below must be
@@ -15,7 +15,7 @@ $plugin = {
        message_replace_imprementation => sub {
                my ($session_id, $param) = @_;
                if($param =~ m/^http/){
-                       return sprintf('<a href="%s%s/url/%s">%s</a>',
+                       return sprintf('<a target="_self" href="%s%s/url/%s">%s</a>',
                                       $::cf->web_root(),
                                       $session_id, $param, $param);
                }

diff --git a/lib/plugins/20mail b/lib/plugins/20mail
index eeb7518..c5fa2a6 100644 (file)
--- a/lib/plugins/20mail
+++ b/lib/plugins/20mail
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/20mail
 # メールアドレス
-# $Id: 20mail,v 1.5 2008-06-29 09:20:49 morimoto Exp $
+# $Id: 20mail,v 1.6 2008-12-29 14:42:40 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20mail,v $
 
 # The line number (1 incremented) and filename below must be
@@ -14,7 +14,7 @@ $plugin = {
        message_replace_regexp => '\b(\w[\w.+=-]*\@[\w.-]+[\w]\.[\w]{2,4})\b',
        message_replace_imprementation => sub {
                my ($session_id, $param) = @_;
-               sprintf('<a href="%s%s/mail/%s">%s</a>',
+               sprintf('<a target="_self" href="%s%s/mail/%s">%s</a>',
                        $::cf->web_root(), $session_id, $param, $param);
        },
 

diff --git a/lib/plugins/20phone b/lib/plugins/20phone
index 3beeba6..7bc9653 100644 (file)
--- a/lib/plugins/20phone
+++ b/lib/plugins/20phone
@@ -1,7 +1,7 @@
 # -*- mode: perl; coding: utf-8 -*-
 # keitairc/lib/plugins/20phone
 # 電話番号
-# $Id: 20phone,v 1.6 2008-06-29 09:20:49 morimoto Exp $
+# $Id: 20phone,v 1.7 2008-12-29 14:42:40 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/20phone,v $
 
 # The line number (1 incremented) and filename below must be
@@ -14,7 +14,7 @@ $plugin = {
        message_replace_regexp => '\b(0\d{1,3})([-(]?)(\d{2,4})([-)]?)(\d{4})\b',
        message_replace_imprementation => sub {
                my ($session_id, $p1, $p2, $p3, $p4, $p5) = @_;
-               sprintf('<a href="%s%s/phone/%s%s%s">%s%s%s%s%s</a>',
+               sprintf('<a target="_self" href="%s%s/phone/%s%s%s">%s%s%s%s%s</a>',
                        $::cf->web_root(),
                        $session_id,
                        $p1, $p3, $p5,

diff --git a/lib/plugins/32address b/lib/plugins/32address
index 30c7510..b94b4fb 100644 (file)
--- a/lib/plugins/32address
+++ b/lib/plugins/32address
@@ -3,7 +3,7 @@
 # based on 'Add link to google maps japan on address-like texts'
 # by twk, from http://nonn-et-twk.net/twk/node/51
 # 
-# $Id: 32address,v 1.5 2008-08-03 02:36:48 morimoto Exp $
+# $Id: 32address,v 1.6 2008-12-29 14:42:40 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/32address,v $
 
 # The line number (1 incremented) and filename below must be
@@ -49,7 +49,7 @@ $plugin = {
                # remove building names since google maps rarely recognize them
                $s =~ s/($re->{building1}).*/$1/;
                $s =~ s/$re->{building2}.*/$1/;
-               return sprintf('<a href="%s%s/address/%s">%s</a>',
+               return sprintf('<a target="_self" href="%s%s/address/%s">%s</a>',
                               $::cf->web_root(), $session_id,
                               URI::Escape::uri_escape_utf8($s), $src);
        },

diff --git a/lib/plugins/33distinct b/lib/plugins/33distinct
index 652a7a0..1920311 100644 (file)
--- a/lib/plugins/33distinct
+++ b/lib/plugins/33distinct
@@ -3,7 +3,7 @@
 # based on 'Add link to google maps japan on address-like texts'
 # by twk, from http://nonn-et-twk.net/twk/node/51
 # 
-# $Id: 33distinct,v 1.1 2008-08-03 02:36:48 morimoto Exp $
+# $Id: 33distinct,v 1.2 2008-12-29 14:42:40 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/lib/plugins/33distinct,v $
 
 # The line number (1 incremented) and filename below must be
@@ -44,7 +44,7 @@ $plugin = {
                # remove building names since google maps rarely recognize them
                $s =~ s/($re->{building1}).*/$1/;
                $s =~ s/$re->{building2}.*/$1/;
-               return sprintf('<a href="%s%s/address/%s">%s</a>',
+               return sprintf('<a target="_self" href="%s%s/address/%s">%s</a>',
                               $::cf->web_root(), $session_id,
                               URI::Escape::uri_escape_utf8($s), $src);
        },

diff --git a/lib/templates/ipod-sjis/404.html b/lib/templates/ipod-sjis/404.html
index 1546a86..adb3ffc 100644 (file)
--- a/lib/templates/ipod-sjis/404.html
+++ b/lib/templates/ipod-sjis/404.html
@@ -10,6 +10,7 @@
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <style type="text/css" media="screen">@import "/i.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/address.html b/lib/templates/ipod-sjis/address.html
index 416d948..e5b6d6c 100644 (file)
--- a/lib/templates/ipod-sjis/address.html
+++ b/lib/templates/ipod-sjis/address.html
@@ -8,6 +8,7 @@
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <style type="text/css" media="screen">@import "/i.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: \92n\90}\95\\8e¦</title>
   </head>
   <!-- see http://developer.apple.com/documentation/AppleApplications/Reference/SafariWebContent/UsingiPhoneApplications/chapter_6_section_4.html#//apple_ref/doc/uid/TP40006513-SW5 -->

diff --git a/lib/templates/ipod-sjis/all.html b/lib/templates/ipod-sjis/all.html
index 9b8f458..35728f8 100644 (file)
--- a/lib/templates/ipod-sjis/all.html
+++ b/lib/templates/ipod-sjis/all.html
@@ -10,6 +10,7 @@
       @import "/iui-keitairc.css";
     </style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: <!-- tmpl_var channel_compact --></title>
   </head>
   <body>
@@ -43,7 +44,9 @@
       <tmpl_if plugin_location>
       </tmpl_if>
       <li><a target="_self" href="<!-- tmpl_var cid -->">\8dX\90V</a></li>
-      <li><a target="_self" href="../location/<!-- tmpl_var cid -->">\88Ê\92u\8fî\95ñ\91\97\90M</a></li>
+      <tmpl_unless is_ipod>
+       <li><a target="_self" href="../location/<!-- tmpl_var cid -->">\88Ê\92u\8fî\95ñ\91\97\90M</a></li>
+      </tmpl_unless>
     </ul>
 
     <form id="submitForm" class="dialog" action="<!-- tmpl_var cid -->" method="post">
@@ -52,7 +55,7 @@
         <a class="button leftButton" type="cancel">\83L\83\83\83\93\83Z\83\8b</a>
         <a class="button blueButton" type="submit">\94­\8c¾</a>
         <input type="text" name="m" />
-       <input type="hidden" name="stamp" value="<!-- stamp -->" />
+       <input type="hidden" name="stamp" value="<!-- tmpl_var stamp -->" />
       </fieldset>
     </form>
 

diff --git a/lib/templates/ipod-sjis/index.html b/lib/templates/ipod-sjis/index.html
index 6b34cbc..567f81b 100644 (file)
--- a/lib/templates/ipod-sjis/index.html
+++ b/lib/templates/ipod-sjis/index.html
@@ -9,19 +9,20 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>
 
     <div class="toolbar">
       <h1 id="pageTitle"></h1>
-      <a class="button" target="_self" href="/<!-- tmpl_var sid -->/index">\8dX\90V</a> 
+      <a class="button" target="_self" href="index">\8dX\90V</a> 
     </div>
 
       <ul id="home" title="\83`\83\83\83l\83\8b\83\8a\83X\83g" selected="true">
        <tmpl_loop name="loop">
          <li>
-           <a target="_self" href="/<!-- tmpl_var sid -->/all/<!-- tmpl_var cid -->"><!-- tmpl_var cname -->
+           <a target="_self" href="all/<!-- tmpl_var cid -->"><!-- tmpl_var cname -->
            <tmpl_if unread_lines>
              (<!-- tmpl_var unread_lines -->)
            </tmpl_if>
@@ -35,9 +36,11 @@
        </tmpl_loop>
 
        <tmpl_if unread>
-         <li><a target="_self" href="/<!-- tmpl_var sid -->/recent">\96¢\93Ç\94­\8c¾\88ê\97\97</a></li>
+         <tmpl_unless ipod>
+           <li><a target="_self" href="recent">\96¢\93Ç\94­\8c¾\88ê\97\97</a></li>
+         </tmpl_unless>
        </tmpl_if>
-       <li><a target="_self" href="/<!-- tmpl_var sid -->/topic">\83g\83s\83b\83N\88ê\97\97</a></li>
+       <li><a target="_self" href="topic">\83g\83s\83b\83N\88ê\97\97</a></li>
       </ul>
   </body>
 </html>

diff --git a/lib/templates/ipod-sjis/location.html b/lib/templates/ipod-sjis/location.html
index 5485c0e..33f4eb1 100644 (file)
--- a/lib/templates/ipod-sjis/location.html
+++ b/lib/templates/ipod-sjis/location.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: <!-- tmpl_var channel_compact --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/location_receiver.html b/lib/templates/ipod-sjis/location_receiver.html
index 515548b..424c09e 100644 (file)
--- a/lib/templates/ipod-sjis/location_receiver.html
+++ b/lib/templates/ipod-sjis/location_receiver.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: <!-- tmpl_var channel_compact --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/mail.html b/lib/templates/ipod-sjis/mail.html
index c6dcdb3..dbcb751 100644 (file)
--- a/lib/templates/ipod-sjis/mail.html
+++ b/lib/templates/ipod-sjis/mail.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: mail <!-- tmpl_var mail --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/nick.html b/lib/templates/ipod-sjis/nick.html
index 6e22b35..43e6460 100644 (file)
--- a/lib/templates/ipod-sjis/nick.html
+++ b/lib/templates/ipod-sjis/nick.html
@@ -9,6 +9,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/phone.html b/lib/templates/ipod-sjis/phone.html
index 10676b3..b554952 100644 (file)
--- a/lib/templates/ipod-sjis/phone.html
+++ b/lib/templates/ipod-sjis/phone.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: phone <!-- tmpl_var phone --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/postme.html b/lib/templates/ipod-sjis/postme.html
index 5d24d42..3a7f934 100644 (file)
--- a/lib/templates/ipod-sjis/postme.html
+++ b/lib/templates/ipod-sjis/postme.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: postme</title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/recent.html b/lib/templates/ipod-sjis/recent.html
index 6997d52..193e4fb 100644 (file)
--- a/lib/templates/ipod-sjis/recent.html
+++ b/lib/templates/ipod-sjis/recent.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/root.html b/lib/templates/ipod-sjis/root.html
index 1c8ce12..dc88800 100644 (file)
--- a/lib/templates/ipod-sjis/root.html
+++ b/lib/templates/ipod-sjis/root.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/topic.html b/lib/templates/ipod-sjis/topic.html
index 26e4a3d..18faf8a 100644 (file)
--- a/lib/templates/ipod-sjis/topic.html
+++ b/lib/templates/ipod-sjis/topic.html
@@ -7,8 +7,10 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">
       @import "/iui/iui.css";
+      @import "/iui-keitairc.css";
     </style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title --></title>
   </head>
   <body>
@@ -20,7 +22,8 @@
 
     <ul id="home" title="\83g\83s\83b\83N\88ê\97\97" selected="true">
       <tmpl_loop name="loop">
-       <li><!-- tmpl_var cname --><br />
+       <li class="message">
+         <span class="nick"><!-- tmpl_var cname --></span>
          <tmpl_if topic>
            <!-- tmpl_var topic -->
          <tmpl_else>

diff --git a/lib/templates/ipod-sjis/unread.html b/lib/templates/ipod-sjis/unread.html
index 217e287..f566209 100644 (file)
--- a/lib/templates/ipod-sjis/unread.html
+++ b/lib/templates/ipod-sjis/unread.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: <!-- tmpl_var channel_compact --></title>
   </head>
   <body>
@@ -16,7 +17,7 @@
     <form action="<!-- tmpl_var cid -->" method="post">
        <input type="text" name="m" />
       <input type="submit" value="\94­\8c¾/\8dX\90V" />
-      <input type="hidden" name="stamp" value="<!-- stamp -->" /><br />
+      <input type="hidden" name="stamp" value="<!-- tmpl_var stamp -->" /><br />
     </form>
 
     <tmpl_if buf>
@@ -32,7 +33,9 @@
     </tmpl_if>
     <a href="../index">Á¬ÈÙؽÄ</a><br />
     <tmpl_if plugin_location>
+      <tmpl_unless is_ipod>
        <a href="../location/<!-- tmpl_var cid -->">\88Ê\92u\8fî\95ñ\91\97\90M</a><br />
+      </tmpl_unless>
     </tmpl_if>
     <a href="../recent">\96¢\93Ç\94­\8c¾\88ê\97\97</a><br />
     <a href="<!-- tmpl_var cid -->">\8dX\90V</a><br />

diff --git a/lib/templates/ipod-sjis/url.html b/lib/templates/ipod-sjis/url.html
index 4ddc486..de54695 100644 (file)
--- a/lib/templates/ipod-sjis/url.html
+++ b/lib/templates/ipod-sjis/url.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: URL <!-- tmpl_var url --></title>
   </head>
   <body>

diff --git a/lib/templates/ipod-sjis/url_session.html b/lib/templates/ipod-sjis/url_session.html
index 3902d10..1bc0929 100644 (file)
--- a/lib/templates/ipod-sjis/url_session.html
+++ b/lib/templates/ipod-sjis/url_session.html
@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/> 
     <style type="text/css" media="screen">@import "/iui/iui.css";</style> 
     <script type="application/x-javascript" src="/iui/iui.js"></script> 
+    <!-- tmpl_var header -->
     <title><!-- tmpl_var title -->: URL <!-- tmpl_var url --></title>
   </head>
   <body>