OSDN Git Service

- スマートフォン対応レポジトリからマージ 2.1.4
authorTaro Matsuzawa aka. btm <btm@tech.email.ne.jp>
Tue, 11 Oct 2011 06:59:44 +0000 (15:59 +0900)
committerTaro Matsuzawa aka. btm <btm@tech.email.ne.jp>
Tue, 11 Oct 2011 06:59:44 +0000 (15:59 +0900)
commitb3b1e49e70868759807216c9df7233b0bd8f769b
tree7036b531c34f014899d41559976df62dc4ae17b1
parent485fea875511d59bd7b5fd63aec93cfd969e34d1
- スマートフォン対応レポジトリからマージ
- スマートフォンに対応していない決済モジュールへの対応コードを追加
70 files changed:
app/controllers/accounts_controller.rb
app/controllers/cart_controller.rb
app/controllers/image_resource_controller.rb
app/controllers/portal_controller.rb
app/controllers/products_controller.rb
app/helpers/base_helper.rb
app/helpers/cart_helper.rb
app/models/normal_payment_plugin.rb
app/views/accounts/_confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/_delivery_form_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/_form_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/delivery_confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/delivery_edit_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/delivery_list_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/delivery_new_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/edit_complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/edit_confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/edit_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/history_list_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/history_show_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/kiyaku_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/login_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/myindex_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/salvage_complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/salvage_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/signup_complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/signup_confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/signup_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/withdraw_complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/withdraw_confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/accounts/withdraw_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/base/_add_cart_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/base/_new_product_smartphone.html.erb [new file with mode: 0644]
app/views/cart/_address_list_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/_cart_items_smartphone.html.erb [new file with mode: 0644]
app/views/cart/_set_delivery_each_retailer_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/delivery_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/purchase_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/shipping_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/show_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/cart/temporary_shipping_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/inquiries/complete_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/inquiries/confirm_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/inquiries/new_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/inquiries/privacy_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/inquiries/show_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/layouts/base_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/portal/escape_clause_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/portal/privacy_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/portal/show_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/portal/show_tradelaw_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/products/_stock_table.html.erb [new file with mode: 0644]
app/views/products/index_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/products/show_mobile_smartphone.html.erb [new file with mode: 0644]
app/views/shop/about_mobile_smartphone.html.erb [new file with mode: 0644]
config/environment.rb
config/initializers/jpmobile_override_for_smartphone.rb [new file with mode: 0644]
lib/jpmobile/mobile/smartphone.rb [new file with mode: 0644]
lib/payment_plugin_base.rb
public/images/smartphone/hori_large.png [new file with mode: 0644]
public/javascripts/smartphone/jquery-1.6.2.min.js [new file with mode: 0644]
public/javascripts/smartphone/jquery.tools.min.js [new file with mode: 0644]
public/javascripts/smartphone/jscript.js [new file with mode: 0644]
public/javascripts/smartphone/scrollable.js [new file with mode: 0644]
public/stylesheets/smartphone/scrollable-buttons.css [new file with mode: 0644]
public/stylesheets/smartphone/scrollable-horizontal.css [new file with mode: 0644]
public/stylesheets/smartphone/scrollableMin.css [new file with mode: 0644]
public/stylesheets/smartphone/smartphone.css [new file with mode: 0644]