From 8d4e8d215158b89dec5e4f92008856adfd03f95b Mon Sep 17 00:00:00 2001 From: Chris Matthieu Date: Sat, 2 Jul 2011 22:26:36 -0700 Subject: [PATCH] a few tweeks --- Gemfile.lock | 2 ++ lib/tss_em_web_socket_server.rb | 10 +++++----- lib/tss_web_server.rb | 6 +++--- views/default.css.erubis | 7 +------ views/login_form.erubis | 11 +++-------- views/search.erubis | 14 +++++--------- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index be1e257..b4b33bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,7 @@ GEM faraday (~> 0.5.4) hashie (1.0.0) http_accept_language (1.0.1) + json (1.5.3) moji (1.5) monkey-lib (0.5.4) backports @@ -72,6 +73,7 @@ DEPENDENCIES em-websocket erubis http_accept_language + json moji oauth sinatra diff --git a/lib/tss_em_web_socket_server.rb b/lib/tss_em_web_socket_server.rb index 3872d69..4a350f4 100644 --- a/lib/tss_em_web_socket_server.rb +++ b/lib/tss_em_web_socket_server.rb @@ -94,11 +94,11 @@ def on_web_socket_open(ws) convert_entries(entries) send(ws, {"entries" => entries}) - if !(query =~ /\A\#[a-z0-9_]+\z/) - send(ws, {"error" => "Auto update works only for hash tags."}) - ws.close_connection_after_writing() - next - end + # if !(query =~ /\A\#[a-z0-9_]+\z/) + # send(ws, {"error" => "Auto update works only for hash tags."}) + # ws.close_connection_after_writing() + # next + # end if @stream_state == :connected && @query_to_wsocks.has_key?(query) register_web_socket(query, ws) dump_connections() diff --git a/lib/tss_web_server.rb b/lib/tss_web_server.rb index 7839341..6789440 100644 --- a/lib/tss_web_server.rb +++ b/lib/tss_web_server.rb @@ -193,10 +193,10 @@ def search(query, template, index) if params[:title] @head_title = @body_title = params[:title] elsif !@query.empty? && !index - @head_title = "%s - Tweet Search Stream" % @query - @body_title = "Tweet Search Stream" + @head_title = "%s - Raply" % @query + @body_title = "Raply" else - @head_title = @body_title = "Tweet Search Stream" + @head_title = @body_title = "Raply" end @logo_url = params[:logo] diff --git a/views/default.css.erubis b/views/default.css.erubis index 80001d6..c3679ab 100644 --- a/views/default.css.erubis +++ b/views/default.css.erubis @@ -1,10 +1,5 @@ -/* - Copyright: Hiroshi Ichikawa - License: New BSD License -*/ - body { - font-size: 95%; + font-size: 125%; } h1 { diff --git a/views/login_form.erubis b/views/login_form.erubis index ac8d3ed..d89f104 100644 --- a/views/login_form.erubis +++ b/views/login_form.erubis @@ -1,19 +1,15 @@ - - Tweet Search Stream + Raply
-

Tweet Search Stream

+

Raply

@@ -28,8 +24,7 @@

diff --git a/views/search.erubis b/views/search.erubis index 612a084..47afd79 100644 --- a/views/search.erubis +++ b/views/search.erubis @@ -1,9 +1,5 @@ <%# coding: UTF-8 %> - @@ -36,6 +32,8 @@ function onLoad() { initialize(); +// supress left column +onCloseLeftButtonClick(); } @@ -58,7 +56,7 @@ <% if @lang == "ja" %> English <% else %> - Japanese + <% end %> @@ -152,8 +150,7 @@
Loading...
@@ -181,8 +178,7 @@