diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
new file mode 100644
index 000000000..2f362cdd4
--- /dev/null
+++ b/app/assets/stylesheets/mobile.css.scss
@@ -0,0 +1,62 @@
+/*
+ *= require "./common/010_reset"
+ *= require "./common/020_base"
+ *= require "./common/030_links"
+*/
+
+body {
+ padding: 5px;
+}
+
+/* paginator */
+div.paginator {
+ font-size: 20pt;
+ font-weight: bold;
+ text-align: center;
+
+ li {
+ display: inline;
+
+ a, span {
+ border: 1px solid #EAEAEA;
+ padding: 3px 18px;
+ margin: 0 3px;
+ display: inline-block;
+ }
+ }
+}
+
+/* posts/index */
+article.post-preview {
+ margin: 15px 0;
+ width: 150px;
+ text-align: center;
+ vertical-align: middle;
+ display: inline-block;
+ a {
+ width: 150px;
+ display: block;
+ margin: 0 auto;
+ }
+ img {
+ margin: 0 auto;
+ }
+}
+
+/* posts/show */
+img#image {
+ margin-top: 5px;
+}
+
+div#tags {
+ margin-top: 10px;
+
+ li {
+ margin: 10px 0;
+ }
+
+ a.search-tag {
+ font-size: 24pt;
+ font-weight: bold;
+ }
+}
diff --git a/app/controllers/mobile/posts_controller.rb b/app/controllers/mobile/posts_controller.rb
new file mode 100644
index 000000000..bd733d451
--- /dev/null
+++ b/app/controllers/mobile/posts_controller.rb
@@ -0,0 +1,18 @@
+class Mobile::PostsController < ApplicationController
+ layout "mobile"
+ before_filter :set_mobile_mode
+
+ def index
+ @post_set = PostSets::Post.new(params[:tags], params[:page], CurrentUser.user.per_page, false)
+ @posts = @post_set.posts
+ end
+
+ def show
+ @post = Post.find(params[:id])
+ end
+
+private
+ def set_mobile_mode
+ CurrentUser.mobile_mode = true
+ end
+end
diff --git a/app/logical/current_user.rb b/app/logical/current_user.rb
index c68630175..d40fe4ee5 100644
--- a/app/logical/current_user.rb
+++ b/app/logical/current_user.rb
@@ -11,6 +11,7 @@ class CurrentUser
ensure
self.user = old_user
self.ip_addr = old_ip_addr
+ self.mobile_mode = false
end
end
@@ -30,6 +31,14 @@ class CurrentUser
Thread.current[:current_ip_addr]
end
+ def self.mobile_mode=(mode)
+ Thread.current[:mobile_mode] = mode
+ end
+
+ def self.mobile_mode?
+ Thread.current[:mobile_mode]
+ end
+
def self.id
if user.nil?
nil
diff --git a/app/models/post.rb b/app/models/post.rb
index 8c83d6517..a30f1a992 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -118,6 +118,10 @@ class Post < ActiveRecord::Base
end
def file_url_for(user)
+ if CurrentUser.mobile_mode?
+ return large_file_url
+ end
+
case user.default_image_size
when "large"
if image_width > Danbooru.config.large_image_width
@@ -132,6 +136,10 @@ class Post < ActiveRecord::Base
end
def file_path_for(user)
+ if CurrentUser.mobile_mode?
+ return large_file_path
+ end
+
case user.default_image_size
when "large"
if image_width > Danbooru.config.large_image_width
@@ -155,6 +163,14 @@ class Post < ActiveRecord::Base
end
module ImageMethods
+ def device_scale
+ if large_image_width > 320
+ 320.0 / (large_image_width + 10)
+ else
+ 1.0
+ end
+ end
+
def twitter_card_supported?
image_width.to_i >= 280 && image_height.to_i >= 150
end
@@ -181,6 +197,10 @@ class Post < ActiveRecord::Base
end
def image_width_for(user)
+ if CurrentUser.mobile_mode?
+ return large_image_width
+ end
+
case user.default_image_size
when "large"
large_image_width
@@ -191,6 +211,10 @@ class Post < ActiveRecord::Base
end
def image_height_for(user)
+ if CurrentUser.mobile_mode?
+ return large_image_height
+ end
+
case user.default_image_size
when "large"
large_image_height
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index bb7be1799..813f287bb 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -20,7 +20,11 @@ class PostPresenter < Presenter
else
tag_param = nil
end
- html << %{}
+ if options[:mobile]
+ html << %{}
+ else
+ html << %{}
+ end
html << %{}
html << %{}
html << %{}
diff --git a/app/presenters/post_set_presenters/base.rb b/app/presenters/post_set_presenters/base.rb
index c06c1d69c..f13ce0245 100644
--- a/app/presenters/post_set_presenters/base.rb
+++ b/app/presenters/post_set_presenters/base.rb
@@ -4,7 +4,7 @@ module PostSetPresenters
raise NotImplementedError
end
- def post_previews_html(template)
+ def post_previews_html(template, options = {})
html = ""
if posts.empty?
@@ -12,7 +12,7 @@ module PostSetPresenters
end
posts.each do |post|
- html << PostPresenter.preview(post, :tags => @post_set.tag_string, :raw => @post_set.raw)
+ html << PostPresenter.preview(post, :tags => @post_set.tag_string, :raw => @post_set.raw, :mobile => options[:mobile])
html << "\n"
end
diff --git a/app/presenters/post_set_presenters/post.rb b/app/presenters/post_set_presenters/post.rb
index 290f77c43..2fea5d315 100644
--- a/app/presenters/post_set_presenters/post.rb
+++ b/app/presenters/post_set_presenters/post.rb
@@ -48,8 +48,8 @@ module PostSetPresenters
RelatedTagCalculator.calculate_from_post_set_to_array(post_set).map(&:first)
end
- def tag_list_html(template)
- tag_set_presenter.tag_list_html(template)
+ def tag_list_html(template, options = {})
+ tag_set_presenter.tag_list_html(template, options)
end
end
end
diff --git a/app/views/layouts/mobile.html.erb b/app/views/layouts/mobile.html.erb
new file mode 100644
index 000000000..768a5485c
--- /dev/null
+++ b/app/views/layouts/mobile.html.erb
@@ -0,0 +1,20 @@
+
+
+