iPhone UI update (index and all only yet)

diff --git a/lib/templates/ipod-sjis/all.html b/lib/templates/ipod-sjis/all.html
index 07b3cf2..701a170 100644 (file)
--- a/lib/templates/ipod-sjis/all.html
+++ b/lib/templates/ipod-sjis/all.html
@@ -6,10 +6,10 @@
     <!-- tmpl_var common_header -->
     <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 "<!-- tmpl_var root -->iui/iui.css";
+      @import "<!-- tmpl_var root -->iui/iuix.css";
       @import "<!-- tmpl_var root -->iui-keitairc.css";
     </style>
-    <script type="application/x-javascript" src="<!-- tmpl_var root -->iui/iui.js"></script>
+    <script type="application/javascript" src="<!-- tmpl_var root -->iui/iuix.js"></script>
     <!-- tmpl_var extra_header -->
     <title><!-- tmpl_var title -->: <!-- tmpl_var channel_compact --></title>
   </head>
@@ -18,7 +18,7 @@
     <div class="toolbar">
       <h1 id="pageTitle"></h1>
       <a target="_self" class="button leftButton backButton" href="../index">\83`\83\83\83l\83\8b\83\8a\83X\83g</a>
-      <a class="button" href="#submitForm" onClick="document.getElementById('m').focus();">\94­\8c¾</a>
+      <a class="button" id="m_menu" href="#submitForm" onClick="document.getElementById('m').focus();">\83\81\83j\83\85\81[</a>
     </div>
 
     <ul id="home" title="<!-- tmpl_var channel_compact -->" selected="true">
@@ -44,14 +44,6 @@
        <li class="message">\82Ü\82¾\94­\8c¾\82ª\82 \82è\82Ü\82¹\82ñ</li>
       </tmpl_unless>
 
-      <tmpl_if follow_nick>
-       <li><a target="_self" href="../nick/<!-- tmpl_var cid -->">nick\88ê\97\97</a></li>
-      </tmpl_if>
-      <li><a target="_self" href="<!-- tmpl_var cid -->">\8dX\90V</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>
-
       <li class="footer">
        <!-- tmpl_var timestamp --><br />
        keitairc <!-- tmpl_var version -->
@@ -60,11 +52,19 @@
 
     <form target="_self" id="submitForm" class="dialog" action="<!-- tmpl_var cid -->" method="post">
       <fieldset>
-        <h1>\94­\8c¾</h1>
-        <a href="#" 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" id="m" name="m" />
+       <h1>\94­\8c¾</h1>
+       <a href="#" class="button leftButton" type="cancel">\83L\83\83\83\93\83Z\83\8b</a>
+       <a class="button blueButton" type="submit">\83\81\83j\83\85\81[</a>
+       <input type="text" id="m" name="m" />
        <input type="hidden" name="stamp" value="<!-- tmpl_var stamp -->" />
+       <hr />
+       <a class="grayButton" target="_self" href="<!-- tmpl_var cid -->">\83y\81[\83W\82Ì\8dX\90V</a>
+       <tmpl_if is_ipod_os3>
+         <a class="whiteButton" target="_self" href="../location_receiver/<!-- tmpl_var cid -->">\88Ê\92u\8fî\95ñ\91\97\90M</a>
+       </tmpl_if>
+       <tmpl_if follow_nick>
+         <a class="whiteButton" target="_self" href="../nick/<!-- tmpl_var cid -->">nick\88ê\97\97</a>
+       </tmpl_if>
       </fieldset>
     </form>
 

diff --git a/lib/templates/ipod-sjis/index.html b/lib/templates/ipod-sjis/index.html
index cbdc2a7..0a242b4 100644 (file)
--- a/lib/templates/ipod-sjis/index.html
+++ b/lib/templates/ipod-sjis/index.html
@@ -6,10 +6,10 @@
     <!-- tmpl_var common_header -->
     <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 "<!-- tmpl_var root -->iui/iui.css";
+      @import "<!-- tmpl_var root -->iui/iuix.css";
       @import "<!-- tmpl_var root -->iui-keitairc.css";
     </style>
-    <script type="application/x-javascript" src="<!-- tmpl_var root -->iui/iui.js"></script>
+    <script type="application/x-javascript" src="<!-- tmpl_var root -->iui/iuix.js"></script>
     <!-- tmpl_var extra_header -->
     <title><!-- tmpl_var title --></title>
   </head>
@@ -17,7 +17,8 @@
 
     <div class="toolbar">
       <h1 id="pageTitle"></h1>
-      <a class="button" target="_self" href="index">\8dX\90V</a> 
+      <a class="button leftButton" target="_self" href="index">\8dX\90V</a>
+      <a class="button" href="#submitForm">\83\81\83j\83\85\81[</a>
     </div>
 
     <ul id="home" title="\83`\83\83\83l\83\8b\83\8a\83X\83g" selected="true">
@@ -36,18 +37,26 @@
        </li>
       </tmpl_loop>
 
-      <tmpl_if unread>
-       <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="topic">\83g\83s\83b\83N\88ê\97\97</a></li>
-      <li><a target="_self" href="logout">\83\8d\83O\83A\83E\83g</a></li>
       <li class="footer">
        <!-- tmpl_var timestamp --><br />
        keitairc <!-- tmpl_var version -->
       </li>
     </ul>
 
+    <form id="submitForm" class="dialog">
+      <fieldset>
+       <h1>\83\81\83j\83\85\81[</h1>
+       <a href="#" class="button leftButton" type="cancel">\83L\83\83\83\93\83Z\83\8b</a>
+       <a class="button blueButton" type="submit">\83\81\83j\83\85\81[</a>
+       <br />
+       <a class="grayButton" target="_self" href="index">\83y\81[\83W\82Ì\8dX\90V</a>
+       <tmpl_if unread>
+         <a class="whiteButton" target="_self" href="recent">\96¢\93Ç\94­\8c¾\88ê\97\97</a>
+       </tmpl_if>
+       <a class="whiteButton" target="_self" href="topic">\83g\83s\83b\83N\88ê\97\97</a>
+       <a class="whiteButton" target="_self" href="logout">\83\8d\83O\83A\83E\83g</a>
+      </fieldset>
+    </form>
+
   </body>
 </html>