Changeset 2322 for lang/ruby/ssb

Timestamp:

12/03/07 07:23:35 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: Added quick ktai switching. You must run rake ktai:update for download ktai db

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb/ktai_spec.rb (modified) (1 diff)
• public_html/javascripts/ktai_db.js (added)
• public_html/javascripts/ssb.js (modified) (2 diffs)
• public_html/javascripts/suggest.js (added)
• public_html/ktai_db.rbx (deleted)
• public_html/stylesheets/ssb.css (modified) (1 diff)
• scripts/download_ktai_list.rb (modified) (2 diffs)
• templates/ssb.rhtml (modified) (3 diffs)

lang/ruby/ssb/trunk/libs/ssb/ktai_spec.rb

@@ -63 +63 @@
 
       ua = @props[:useragent].dup
-      unless ua == ''
+      unless ua.to_s == ''
         if ua =~ /DoCoMo\/1.0/ # PDC
-          ua.concat '/' + self['hid']
+          ua.concat '/' + self['hid'] unless self['hid'].nil?
         else                    # FOMA
           param_start = ua.index('(')
-          ua = ua[0, param_start] if param_start != 0
+          ua = ua[0, param_start] unless param_start.nil?
 
           ua.concat '(c100;TB'

lang/ruby/ssb/trunk/public_html/javascripts/ssb.js

@@ -45 +45 @@
         });
 
+    window.location.reload();
     Event.stop(event);
-    window.location.href = window.location.href;
+}
+
+function save_suggest_terminai_info(event) {
+    var manager = new CookieManager();
+        var val = SSB.ktai_db[$("term_search").value];
+        if(val) {
+                manager.setCookie('useragent', encodeURIComponent(val['useragent']));
+                window.location.reload();
+        } else {
+                $("term_search").value = '';
+        }
+        Event.stop(event);
 }
 
@@ -95 +107 @@
 
     // terminal setting form
-    var term_form = $("term_form");
+    var term_form = $('term_form');
     Event.observe(term_form, 'submit', save_terminal_info, true);
+
+    // ktai suggest
+                Event.observe($('suggest_start'), 'click', function(event) {
+                                $('suggest_start').toggle();
+                                $('suggest_form').innerHTML = '機種名: <input type="text" id="term_search" autocomplete="off" /><input type="submit" value="OK" />';
+                                $('term_search').focus();
+                                Event.observe($('suggest_form'), 'submit', save_suggest_terminai_info, true);
+                                new Suggest.Local('term_search',
+                                                                  'term_select',
+                                                                  SSB.ktai_list,
+                                                                  {
+                                                                          highlight: true,
+                                                                                  dispAllKey: true,
+                                                                                  dispMax: 4,
+                                                                                  });
+                                Event.stop(event);
+                        }, true);
 
     // show qrcode

lang/ruby/ssb/trunk/public_html/stylesheets/ssb.css

@@ -139 +139 @@
   background-color: gray;
   color: white;
-  text-align: center;
   margin: 0;
+}
+
+#client #sidebar #terminal h2 #suggest_start {
+  font-size: x-small;
+  color: orange;
+  font-weight: normal;
+  margin: 0;
+}
+
+#client #sidebar #terminal .select { 
+  background-color: orange;
+  color: white;
+}
+
+#client #sidebar #terminal #term_select { 
+  background-color: white;
 }
 

lang/ruby/ssb/trunk/scripts/download_ktai_list.rb

@@ -6 +6 @@
 # $Id$
 #
-require 'config/common.rb'
+require 'config/common'
+require 'ssb/ktai_db'
 require 'open-uri'
 
 uri = 'http://ke-tai.org/moblist/csv_down.php'
 
-print "updating ke-tai list from ke-tai.org..."
+print 'updating ke-tai list from ke-tai.org...'
 STDOUT.flush
 
@@ -20 +21 @@
 puts 'done.'
 
+print 'generating ke-tai db js...'
+db = SSB::KtaiDB.new(true)
+File.open(File.join(SSB::CONFIG[:public_dir], ['javascripts', 'ktai_db.js']), 'w') do |out|
+  out.puts 'var SSB = {';
+  out.puts '  ktai_list : ['
+  db.each do |ktai|
+    out.puts %Q|"#{ktai[:name]}",\n|
+  end
+  out.puts '  ],'
+
+  out.puts '  ktai_db : {'
+  db.each do |ktai|
+    out.puts %Q|    "#{ktai[:name]}": {\n|
+    ktai.each_pair do |k,v|
+      out.puts %Q|      "#{k}": "#{v}",\n|
+    end
+    out.puts "    },\n"
+  end
+  out.puts "  },\n"
+  out.puts "};\n"
+end
+puts 'done.'

lang/ruby/ssb/trunk/templates/ssb.rhtml

@@ -6 +6 @@
   <script type="text/javascript" src="javascripts/cookiemanager.js"></script>
   <script type="text/javascript" src="javascripts/qrcode.js"></script>
+  <script type="text/javascript" src="javascripts/ktai_db.js"></script>
+<script type="text/javascript" src="javascripts/suggest.js"></script>
   <script type="text/javascript" src="javascripts/ssb.js"></script>
   <link rel="stylesheet" href="stylesheets/ssb.css" type="text/css" media="screen" />
@@ -58 +60 @@
       </div> <!-- status_bar -->
 
-      <!-- ケータイ -->
-      <div id="terminal">
-        <h2>ケータイ</h2>
-        User-Agent: <%= term[:useragent] %><br />
-        UID: <%= term[:uid] %><br />
-        HID: <%= term[:hid] %><br />
-      </div> <!-- terminal -->
+          <!-- ケータイ -->
+          <div id="terminal">
+                <h2>
+                  ケータイ <a href="#" id="suggest_start">機種変更</a>
+                  <form id="suggest_form">
+<!--                    <input type="text" id="term_search" />
+                        <input type="submit" value="OK" />
+-->               </form>
+                </h2>
+                <div id="term_select"></div>
+                <p>
+                  User-Agent: <%= term[:useragent] %><br />
+                  UID: <%= term[:uid] %><br />
+                  HID: <%= term[:hid] %><br />
+                </p>
+          </div> <!-- terminal -->
+          <div class="clear"> </div>
 
       <!-- タブ -->
@@ -154 +166 @@
         <h2>Server Side Browser</h2>
         <p>
-          <a href="http://coderepos.org/share/browser/lang/ruby/ssb">http://coderepos.org/share/browser/lang/ruby/ssb</a><br />
-          Author: <a href="http://coji.s9.xrea.com/">coji</a> and all <a href="http://coderepos.org/share/">coderepos</a> committers.
+          <a href="http://coderepos.org/share/wiki/ssb">http://coderepos.org/share/wiki/ssb</a><br />
+                  
+          <p>Author: <a href="http://coji.s9.xrea.com/">coji</a> and all <a href="http://coderepos.org/share/">coderepos</a> committers.</p>
+                  <br />
+                  <p>機種変更時に利用される携帯端末情報は、<a href="http://ke-tai.org/moblist/">ke-tai.orgのデータ</a>を利用しています。<br />端末情報を最新のものに更新するにはssbのディレクトリでコマンドラインから、<pre>rake ktai:update</pre>と入力してください。</p>
         </p>
       </div>