Merge branch 'master' of github.com:r888888888/danbooru

app/assets/stylesheets/specific/comments.css.scss

@@ -1,7 +1,6 @@
 @import "../common/000_vars.css.scss";
 
 div.comments-for-post {
-  float: left;
   div.notices {
     margin: 1em 0;
   }
@@ -21,7 +20,7 @@ div.comments-for-post {
         width: 12em;
         float: left;
         overflow: hidden;
-        margin-right: 2em;
+        margin-right: 1em;
 
         h1 {
           display: block;
@@ -30,8 +29,8 @@ div.comments-for-post {
       }
 
       div.content {
-        width: 40em;
-        float: left;
+        margin-left: 13em;
+        min-width: 17em;
 
         menu {
           li {
@@ -61,6 +60,12 @@ div.comments-for-post {
   }
 }
 
+div#c-posts {
+  div.comments-for-post {
+    float: left;
+  }
+}
+
 div#c-comments {
   div#a-index, div#a-show {
     div.header {
@@ -96,8 +101,21 @@ div#c-comments {
       margin-bottom: 4em;
 
       div.comments-for-post {
-        float: left;
-        width: 55em;
+        margin-left: 184px;
+        min-width: 30em;
+        
+        div.list-of-comments {
+          float: left;
+          width: 100%;
+        }
+      }
+    }
+    
+    div.comments-for-post {
+      div.post {
+        article.comment {
+          margin-left: 184px;
+        }
       }
     }
 

app/assets/stylesheets/specific/posts.css.scss

@@ -153,7 +153,7 @@ div#c-posts {
   }
 
   div.nav-notice {
-    padding: 0.5em;
+    padding: 0.5em 0.5em 0;
     margin-bottom: 1em;
     background: #EEE;
     border: 1px solid #AAA;
@@ -267,7 +267,7 @@ div#c-posts {
       li {
         position: relative;
         text-align: center;
-        padding: 0px 4.5em;
+        padding: 0px 5.5em;
 
         .prev {
           position: absolute;

app/models/artist_url.rb

@@ -11,8 +11,8 @@ class ArtistUrl < ActiveRecord::Base
       url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2")
       url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2")
       url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2")
-      url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img.pixiv.net")
-      url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://img.pixiv.net")
+      url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img.pixiv.net")
+      url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://img.pixiv.net")
       url = url.gsub(/\/+\Z/, "")
       url + "/"
     end
@@ -27,8 +27,8 @@ class ArtistUrl < ActiveRecord::Base
     url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2")
     url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2")
     url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2")
-    url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img*.pixiv.net")
-    url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://*.pixiv.net/img*")
+    url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img*.pixiv.net")
+    url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://*.pixiv.net/img*")
   end
 
   def normalize

app/presenters/post_presenter.rb

@@ -194,7 +194,11 @@ class PostPresenter < Presenter
       klass = ""
     end
 
-    pool_html << template.link_to("&laquo;".html_safe, template.post_path(pool.post_id_array.first, :pool_id => pool.id), :class => "#{klass} first")
+    if @post.id != pool.post_id_array.first
+      pool_html << template.link_to("&laquo;".html_safe, template.post_path(pool.post_id_array.first, :pool_id => pool.id), :class => "#{klass} first")
+    else
+      pool_html << '<span class="first">&laquo;</span>'
+    end
 
     if pool.neighbors(@post).previous
       pool_html << template.link_to("&lsaquo;&thinsp;prev".html_safe, template.post_path(pool.neighbors(@post).previous, :pool_id => pool.id), :rel => prev_rel, :class => "#{klass} prev")
@@ -214,7 +218,11 @@ class PostPresenter < Presenter
       pool_html << '<span class="next">next&thinsp;&rsaquo;</span>'
     end
 
-    pool_html << template.link_to("&raquo;".html_safe, template.post_path(pool.post_id_array.last, :pool_id => pool.id), :class => "#{klass} last")
+    if @post.id != pool.post_id_array.last
+      pool_html << template.link_to("&raquo;".html_safe, template.post_path(pool.post_id_array.last, :pool_id => pool.id), :class => "#{klass} last")
+    else
+      pool_html << '<span class="last">&raquo;</span>'
+    end
 
     pool_html << "</li>"
     pool_html

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.9.0"
+      "2.9.1"
     end
 
     # The name of this Danbooru.