From 113588452f7ae31b6927b422f52c85174d8c88cf Mon Sep 17 00:00:00 2001 From: yasushiito Date: Wed, 2 Jan 2013 14:25:36 +0900 Subject: [PATCH] heroku --- Gemfile | 3 +- .../{jquery-1.6.2.min.js => jquery-162min.js} | 0 .../javascripts/{peta.apps.js => peta-apps.js} | 0 .../javascripts/{peta.common.js => peta-common.js} | 0 app/assets/stylesheets/peta.apps.css | 29 ++---------- app/controllers/application_controller.rb | 2 +- app/controllers/comics_controller.rb | 2 +- app/views/layouts/application.html.erb | 6 +-- app/views/layouts/guest.html.erb | 52 ++++++++++++++++++++++ app/views/layouts/metro.html.erb | 6 +-- config/environments/production.rb | 1 + 11 files changed, 66 insertions(+), 35 deletions(-) rename app/assets/javascripts/{jquery-1.6.2.min.js => jquery-162min.js} (100%) rename app/assets/javascripts/{peta.apps.js => peta-apps.js} (100%) rename app/assets/javascripts/{peta.common.js => peta-common.js} (100%) create mode 100644 app/views/layouts/guest.html.erb diff --git a/Gemfile b/Gemfile index da2ec2c4..bb396fec 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,6 @@ gem 'pettanr_unknown_v01_licenses' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' - # Gems used only for assets and not required # in production environments by default. @@ -50,6 +48,7 @@ group :mgk do end group :development, :test do + gem 'sqlite3' gem 'webrat' gem 'rspec' gem 'rspec-rails' diff --git a/app/assets/javascripts/jquery-1.6.2.min.js b/app/assets/javascripts/jquery-162min.js similarity index 100% rename from app/assets/javascripts/jquery-1.6.2.min.js rename to app/assets/javascripts/jquery-162min.js diff --git a/app/assets/javascripts/peta.apps.js b/app/assets/javascripts/peta-apps.js similarity index 100% rename from app/assets/javascripts/peta.apps.js rename to app/assets/javascripts/peta-apps.js diff --git a/app/assets/javascripts/peta.common.js b/app/assets/javascripts/peta-common.js similarity index 100% rename from app/assets/javascripts/peta.common.js rename to app/assets/javascripts/peta-common.js diff --git a/app/assets/stylesheets/peta.apps.css b/app/assets/stylesheets/peta.apps.css index 9120ed12..0261b2e5 100644 --- a/app/assets/stylesheets/peta.apps.css +++ b/app/assets/stylesheets/peta.apps.css @@ -159,7 +159,7 @@ #comic-reader-header, #comic-reader-console { position: absolute; - left; 0; + left: 0; width: 100%; z-index: 9998; } @@ -171,7 +171,7 @@ z-index: 9997; position: absolute; width: 100%; - left; 0; + left: 0; width: 100%; height: 40px; background: #000; @@ -179,14 +179,6 @@ -moz-opacity: 0.5; -khtml-opacity: 0.5; } - .pettanr-ActiveX-enabled .comic-reader-shadow { - filter: alpha(opacity=50); - -ms-filter: "alpha(opacity=50)"; - } - .pettanr-ActiveX-disabled .comic-reader-shadow { - background: transparent url( "/assets/black_50pct.png" )　repeat 0 0; - _background: url( "/assets/black_50pct.gif" )　repeat 0 0; - } #comic-reader-header-content { height: 24px; padding-top: 16px; @@ -219,7 +211,6 @@ #comic-reader-back-button:link, #comic-reader-forward-button:link { display: block; - zoom: 1; position: absolute; top: 0; height: 100px; @@ -390,7 +381,6 @@ box-shadow: 0 4px 9px #333; -moz-box-shadow: 0 4px 9px #333; -webkit-box-shadow: 0 4px 9px #333; - filter:progid:DXImageTransform.Microsoft.Shadow(color=#333333,direction=180,strength=9); } .menu-bar-item, .menu-bar-item-focus { @@ -428,7 +418,6 @@ box-shadow: 1px 4px 9px #333; -moz-box-shadow: 1px 4px 9px #333; -webkit-box-shadow: 1px 4px 9px #333; - filter: progid:DXImageTransform.Microsoft.Shadow(color=#666666,direction=120,strength=9); } .menu-bar-item-focus li { display: block; @@ -449,13 +438,11 @@ width: 200px; height: 24.1pt; line-height: 24.1pt; - *cursor: pointer; } .menu-bar-item-focus a:hover { color: #333; background-color: #ccf; text-decoration: none; - *cursor: pointer; } .menu-bar-item-focus li.disabled a, .menu-bar-item-focus li.disabled a:link, @@ -464,7 +451,6 @@ .menu-bar-item-focus li.disabled a:hover { color: #999; background-color: #fff; - *cursor: default; } .menu-bar-item-focus span { position: absolute; @@ -512,8 +498,6 @@ -khtml-opacity: 0.7; } .pettanr-ActiveX-enabled #whiteGlass-container div { - filter: alpha(opacity=70); - -ms-filter: alpha(opacity=70); } .pettanr-ActiveX-disabled #whiteGlass-container div { background: transparent url( "/assets/white_70pct.png" ) repeat 0 0; @@ -563,8 +547,6 @@ } .pettanr-ActiveX-enabled #mouse-operation-catcher { background-color: #fff; - filter: alpha( opacity=0 ); - -ms-filter: alpha( opacity=0 ); } /* * ie では、背景を設定しないと、 mousemove が働かない。 @@ -678,7 +660,7 @@ text-align: center; font-size: 12px; line-height: 12px; - padding: 9px 0; + padding: 9px 0px; left: -2px; } @@ -834,7 +816,6 @@ box-shadow: 1px 4px 9px #333; -moz-box-shadow: 1px 4px 9px #333; -webkit-box-shadow: 1px 4px 9px #333; - filter: progid:DXImageTransform.Microsoft.Shadow(color=#666666,direction=120,strength=9); } .window-header, @@ -874,11 +855,10 @@ position: relative; border-right: 1px solid #999; border-left: 1px solid #aaa; - *border-left: 1px solid #ccc; } html>/**/body .window-body { - border-left /***/: 1px solid #ccc\9; + border-left /***/: 1px solid #ccc; } .window-footer { @@ -916,7 +896,6 @@ border-bottom: 1px solid #666; padding: 1em; text-decoration: none; - zoom: 1; } .sidenavi-item:hover { background-color: #ccc; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 295a4ec3..eaca0dce 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base when :admin 'test' when :user - 'test' + 'guest' when :demand_user 'test' end diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb index d57a0842..c97a4d12 100644 --- a/app/controllers/comics_controller.rb +++ b/app/controllers/comics_controller.rb @@ -11,7 +11,7 @@ class ComicsController < ApplicationController def top respond_to do |format| - format.html # index.html.erb + format.html end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5d5dcd9f..44212d5a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,7 +18,7 @@
[ESC] キーを押すと Metro ホームに入るよ．ホームの一番最後のタイルをクリックすると このページに戻るよ．
ホームへ
<%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %> - <%= javascript_include_tag "jquery-1.6.2.min" %> + <%= javascript_include_tag "jquery-162min" %> <%= javascript_include_tag "system" %> <% if current_user %> @@ -35,8 +35,8 @@ <% end %> <% end %> - <%= javascript_include_tag "peta.common" %> - <%= javascript_include_tag "peta.apps" %> + <%= javascript_include_tag "peta-common" %> + <%= javascript_include_tag "peta-apps" %> <%= javascript_include_tag "pongame" %> diff --git a/app/views/layouts/guest.html.erb b/app/views/layouts/guest.html.erb new file mode 100644 index 00000000..00fa4f30 --- /dev/null +++ b/app/views/layouts/guest.html.erb @@ -0,0 +1,52 @@ + + + + Pettanr + <%= stylesheet_link_tag "test.css" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + +
+ + + + + + +
+

PettanR

+ 		+ +
+
+<%= yield %> +
+ <%= link_to t('tab.demander.title'), main_app.demanders_path %> + <% if demand_user_signed_in? %> + <%= link_to t_m('Demander'), main_app.demanders_path %> + <%= link_to t('home.sign_out.title'), main_app.destroy_demand_user_session_path, :method => :delete %> + <% else %> + <%= link_to t('home.sign_in.title'), main_app.new_demand_user_session_path %> + <% end %> +
+
+ <%= link_to t('tab.system.title'), '/system' %> + <% if admin_signed_in? %> + <%= link_to t('tab.system.browse'), '/system/browse' %> + <%= link_to t('tab.system.approve'), '/system/waiting_list' %> + <%= link_to t('tab.system.port'), '/system/import' %> + <%= link_to t('tab.system.token'), '/system/auth_token' %> + <%= t('tab.system.layout') %>: + <%= link_to t('tab.system.test'), '/system/test_layout' %> + <%= link_to t('tab.system.production'), '/system/production_layout' %> + <%= link_to t('home.sign_out.title'), main_app.destroy_admin_session_path, :method => :delete %> + <% else %> + <%= link_to t('home.sign_in.title'), main_app.new_admin_session_path %> + <% end %> +
+<%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %> + + + diff --git a/app/views/layouts/metro.html.erb b/app/views/layouts/metro.html.erb index 5d5dcd9f..44212d5a 100644 --- a/app/views/layouts/metro.html.erb +++ b/app/views/layouts/metro.html.erb @@ -18,7 +18,7 @@
[ESC] キーを押すと Metro ホームに入るよ．ホームの一番最後のタイルをクリックすると このページに戻るよ．
ホームへ
<%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %> - <%= javascript_include_tag "jquery-1.6.2.min" %> + <%= javascript_include_tag "jquery-162min" %> <%= javascript_include_tag "system" %> <% if current_user %> @@ -35,8 +35,8 @@ <% end %> <% end %> - <%= javascript_include_tag "peta.common" %> - <%= javascript_include_tag "peta.apps" %> + <%= javascript_include_tag "peta-common" %> + <%= javascript_include_tag "peta-apps" %> <%= javascript_include_tag "pongame" %> diff --git a/config/environments/production.rb b/config/environments/production.rb index b80671e5..d8b2f5a8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,5 +1,6 @@ Pettanr::Application.configure do # Settings specified here will take precedence over those in config/application.rb +config.assets.precompile += %w( *.js *.css ) # Code is not reloaded between requests config.cache_classes = true -- 2.11.0