From e431452a11099f4a8497dfaf8ebb1c72396b5dd8 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 3 Mar 2011 18:26:50 -0500
Subject: [PATCH] improved pool simple edit interface

---
 app/logical/post_sets/wiki_page.rb            | 29 ++++++++++
 app/models/wiki_page.rb                       |  8 +++
 app/presenters/post_presenter.rb              |  2 +-
 app/views/pools/_simple_edit.html.erb         |  6 +-
 app/views/pools/edit.html.erb                 |  4 +-
 app/views/pools/index.html.erb                |  4 +-
 app/views/pools/new.html.erb                  |  8 ++-
 app/views/pools/show.html.erb                 |  4 +-
 app/views/posts/index.html.erb                |  4 +-
 app/views/posts/show.html.erb                 |  4 +-
 app/views/wiki_pages/_form.html.erb           |  9 ++-
 .../wiki_pages/_secondary_links.html.erb      |  8 ++-
 app/views/wiki_pages/show.html.erb            | 42 +-------------
 public/javascripts/compiled/default.js        |  4 +-
 public/javascripts/src/app/pools.js           |  4 +-
 public/stylesheets/compiled/default.css       | 56 +++++++++++++------
 public/stylesheets/src/default.scss           | 39 ++++++++++++-
 17 files changed, 150 insertions(+), 85 deletions(-)
 create mode 100644 app/logical/post_sets/wiki_page.rb

diff --git a/app/logical/post_sets/wiki_page.rb b/app/logical/post_sets/wiki_page.rb
new file mode 100644
index 000000000..770acfb6c
--- /dev/null
+++ b/app/logical/post_sets/wiki_page.rb
@@ -0,0 +1,29 @@
+module PostSets
+  class WikiPage < Base
+    attr_reader :tag_name
+    
+    def initialize(tag_name)
+      @tag_name = tag_name
+    end
+    
+    def load_posts
+      @posts = ::Post.tag_match(tag_name).all(:order => "posts.id desc", :limit => limit, :offset => offset)
+    end
+    
+    def limit
+      8
+    end
+    
+    def offset
+      0
+    end
+
+    def use_sequential_paginator?
+      false
+    end
+  
+    def use_numbered_paginator?
+      false
+    end
+  end  
+end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index f83978ec4..eaa1e2f63 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -76,4 +76,12 @@ class WikiPage < ActiveRecord::Base
   def initialize_creator
     self.creator_id = CurrentUser.user.id
   end
+  
+  def post_set
+    @post_set ||= PostSets::WikiPage.new(title)
+  end
+  
+  def presenter
+    @presenter ||= WikiPagePresenter.new(self)
+  end
 end
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index 2dae25442..04395c5ce 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -5,7 +5,7 @@ class PostPresenter < Presenter
     flags << "flagged" if post.is_flagged?
     flags << "deleted" if post.is_deleted?
     
-    html =  %{<article id="post_#{post.id}" data-id="#{post.id}" data-tags="#{h(post.tag_string)}" data-uploader="#{h(post.uploader_name)}" data-rating="#{post.rating}" data-width="#{post.image_width}" data-height="#{post.image_height}" data-flags="#{flags.join(' ')}">}
+    html =  %{<article class="post-preview" id="post_#{post.id}" data-id="#{post.id}" data-tags="#{h(post.tag_string)}" data-uploader="#{h(post.uploader_name)}" data-rating="#{post.rating}" data-width="#{post.image_width}" data-height="#{post.image_height}" data-flags="#{flags.join(' ')}">}
     html << %{<a href="/posts/#{post.id}">}
     html << %{<img src="#{post.preview_file_url}">}
     html << %{</a>}
diff --git a/app/views/pools/_simple_edit.html.erb b/app/views/pools/_simple_edit.html.erb
index a2eae8758..e073781e0 100644
--- a/app/views/pools/_simple_edit.html.erb
+++ b/app/views/pools/_simple_edit.html.erb
@@ -4,8 +4,8 @@
 <ul id="sortable">
   <% posts.each do |post| %>
     <li class="ui-state-default" id="pool[post_id_array]_<%= post.id %>">
-      <%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
-      <span class="delete">Delete</span>
+      <%= link_to(image_tag(post.preview_file_url), post_path(post)) %>        
+      <span class="ui-icon ui-icon-closethick delete" title="Remove post"></span>
     </li>
   <% end %>
 </ul>
@@ -14,4 +14,4 @@
   <%= f.input :name %>
   <%= f.input :description %>
   <%= submit_tag "Save" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/pools/edit.html.erb b/app/views/pools/edit.html.erb
index 223192eec..1bfdc04ec 100644
--- a/app/views/pools/edit.html.erb
+++ b/app/views/pools/edit.html.erb
@@ -1,5 +1,5 @@
-<div class="pools">
-  <div class="edit">
+<div id="c-pools">
+  <div id="a-edit">
     <% if params[:advanced] %>
       <%= render "advanced_edit" %>
     <% else %>
diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb
index 0db739305..8997ac791 100644
--- a/app/views/pools/index.html.erb
+++ b/app/views/pools/index.html.erb
@@ -1,5 +1,5 @@
-<div id="pools">
-  <div id="index">
+<div id="c-pools">
+  <div id="a-index">
     <%= render "search" %>
 
     <table class="highlightable" width="100%">
diff --git a/app/views/pools/new.html.erb b/app/views/pools/new.html.erb
index 5d45569d3..b04f0a6d6 100644
--- a/app/views/pools/new.html.erb
+++ b/app/views/pools/new.html.erb
@@ -1,2 +1,6 @@
-<h1>New Pool</h1>
-<%= render :partial => "form", :locals => {:pool => @pool} %>
+<div id="c-pools">
+  <div id="c-new">
+    <h1>New Pool</h1>
+    <%= render :partial => "form", :locals => {:pool => @pool} %>    
+  </div>
+</div>
diff --git a/app/views/pools/show.html.erb b/app/views/pools/show.html.erb
index 2d878cf31..c9a0fd3da 100644
--- a/app/views/pools/show.html.erb
+++ b/app/views/pools/show.html.erb
@@ -1,5 +1,5 @@
-<div class="pools">
-  <div class="show">
+<div id="c-pools">
+  <div id="a-show">
     <aside id="sidebar">
       <h2>Pool: <%= @pool.name %></h2>
       <p><%= format_text(@pool.description) %></p>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 0bfc23295..9288fff40 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -1,5 +1,5 @@
-<div class="posts">
-  <div class="index">
+<div id="c-posts">
+  <div id="a-index">
     <% if @post_set.suggestions.any? %>
       <div class="notice">
         Maybe you meant: <%= @post_set.suggestions.map {|x| link_to(x, posts_path(:tags => x), :class => "tag-type-#{Tag.type_name(x)}" )}.to_sentence(:last_word_connector => ", or ", :two_words_connector => " or ") %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index c782d252b..5646b93d0 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -1,5 +1,5 @@
-<div class="posts">
-  <div class="show">
+<div id="c-posts">
+  <div id="a-show">
     <aside id="sidebar">
       <section>
         <h1>Search</h1>
diff --git a/app/views/wiki_pages/_form.html.erb b/app/views/wiki_pages/_form.html.erb
index 7cda6e1ec..324bcd9d3 100644
--- a/app/views/wiki_pages/_form.html.erb
+++ b/app/views/wiki_pages/_form.html.erb
@@ -1,5 +1,8 @@
-<%= f.input :title %>
+<% if @wiki_page.new_record? || CurrentUser.is_moderator? %>
+  <%= f.input :title %>
+<% end %>
 <%= f.input :body %>
-<% if CurrentUser. %>
-<%= f.input :is_locked %>
+<% if CurrentUser.is_janitor? %>
+  <%= f.input :is_locked %>
+<% end %>
 <%= f.button :submit, "Save" %><%= f.button :submit, "Cancel" %><%= f.button :submit "Preview" %>
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 03e95b18a..3faf87601 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -7,9 +7,11 @@
       <li>|</li>
       <li><%= link_to "Posts (#{Post.fast_count(@wiki_page.title)})", posts_path(:tags => @wiki_page.title) %></li>
       <li><%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id_equals => @wiki_page.id}) %></li>
-      <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page) %></li>
-      <% if CurrentUser.is_moderator? %>
-        <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :confirm => "Do you want to delete this wiki page?" %></li>
+      <% unless @wiki_page.new_record? %>
+        <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page) %></li>
+        <% if CurrentUser.is_moderator? %>
+          <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :confirm => "Do you want to delete this wiki page?" %></li>
+        <% end %>
       <% end %>
     <% end %>
   </menu>
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index a97054753..fd744e36d 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -10,48 +10,8 @@
       </div>
       
       <div id="wiki-page-posts">
-        <%= @wiki_page.presenter.posts %>
+        <%= @wiki_page.post_set.presenter.post_previews_html %>
       </div>
     </section>
   </div>
 </div>
-
-<div class="wiki" id="wiki-show">
-  <%= render :partial => "sidebar" %>
-
-  <h2 class="title"><%= @presenter.html_title %></h2>
-
-  <div id="body">
-    <div style="margin-bottom: 1em;">
-      <%= @presenter.html_body(self) %>
-    </div>
-
-    <div style="margin-bottom: 1em;">
-      <%= @presenter.html_posts(self) %>
-    </div>
-  </div>
-  
-  <% content_for("footer") do %>
-    <li>|</li>
-    <% if @wiki_page.nil? %>
-      <li><%= link_to "Posts (#{Post.fast_count(params[:title])})", :controller => "post", :action => "index", :tags => params[:title] %></li>
-      <li><%= link_to "Edit", :controller => "wiki", :action => "edit", :title => params[:title] %></li>
-    <% else %>
-      <li><%= link_to "Posts (#{Post.fast_count(params[:title])})", :controller => "post", :action => "index", :tags => @title %></li>
-      <li><%= link_to "History", :controller => "wiki", :action => "history", :title => @wiki_page.title %></li>
-      <% if not @wiki_page.is_locked? %>
-        <li><%= link_to "Edit", :controller => "wiki", :action => "edit", :title => @wiki_page.title, :version => @wiki_page.version %></li>
-      <% end %>
-      <% if @wiki_page.is_locked? %>
-        <li><%= link_to "Unlock", {:controller => "wiki", :action => "unlock", :title => @wiki_page.title}, :method => "post" %></li>
-      <% else %>
-        <li><%= link_to "Revert", {:controller => "wiki", :action => "revert", :title => @wiki_page.title, :version => @wiki_page.version}, :confirm => "Are you sure you want to revert to this page?", :method => :post %></li>
-        <li><%= link_to "Delete", {:controller => "wiki", :action => "destroy", :title => @wiki_page.title}, :confirm => "Are you sure you want to delete this page (and all versions)?", :method => :post %></li>
-        <li><%= link_to "Lock", {:controller => "wiki", :action => "lock", :title => @wiki_page.title}, :method => :post %></li>
-        <li><%= link_to "Rename", :action => "rename", :title => @wiki_page.title %></li>
-      <% end %>    
-    <% end %>
-  <% end %>
-  
-  <%= render :partial => "footer" %>
-</div>
diff --git a/public/javascripts/compiled/default.js b/public/javascripts/compiled/default.js
index 3d8dc8a3b..9b7f411e3 100644
--- a/public/javascripts/compiled/default.js
+++ b/public/javascripts/compiled/default.js
@@ -1430,7 +1430,9 @@ $(document).ready(function() {
   }
   
   Danbooru.Pool.initialize_simple_edit = function() {
-    $("ul#sortable").sortable();
+    $("ul#sortable").sortable({
+      placeholder: "ui-state-placeholder"
+    });
     $("ul#sortable").disableSelection();
     $("ul#sortable span.delete").click(function(e) {
       $(e.target).parent().remove();
diff --git a/public/javascripts/src/app/pools.js b/public/javascripts/src/app/pools.js
index a19ad8430..35de60019 100644
--- a/public/javascripts/src/app/pools.js
+++ b/public/javascripts/src/app/pools.js
@@ -16,7 +16,9 @@
   }
   
   Danbooru.Pool.initialize_simple_edit = function() {
-    $("ul#sortable").sortable();
+    $("ul#sortable").sortable({
+      placeholder: "ui-state-placeholder"
+    });
     $("ul#sortable").disableSelection();
     $("ul#sortable span.delete").click(function(e) {
       $(e.target).parent().remove();
diff --git a/public/stylesheets/compiled/default.css b/public/stylesheets/compiled/default.css
index 081ac844a..1a9a36d42 100644
--- a/public/stylesheets/compiled/default.css
+++ b/public/stylesheets/compiled/default.css
@@ -218,9 +218,26 @@ div.dtext p {
   margin-bottom: 1em; }
 
 /*** Pools ***/
-div.pools div.edit p {
+div#c-pools div#a-edit p {
   margin-bottom: 1em;
   width: 40em; }
+div#c-pools div#a-edit ul.ui-sortable {
+  list-style-type: none; }
+  div#c-pools div#a-edit ul.ui-sortable span {
+    margin: 0;
+    float: right;
+    cursor: pointer; }
+  div#c-pools div#a-edit ul.ui-sortable li {
+    padding: 0.5em; }
+  div#c-pools div#a-edit ul.ui-sortable li.ui-state-default {
+    margin-bottom: 20px;
+    width: 250px;
+    background: none; }
+  div#c-pools div#a-edit ul.ui-sortable li.ui-state-placeholder {
+    margin-bottom: 20px;
+    width: 250px;
+    height: 150px;
+    background: none; }
 
 /*** Comments ***/
 div.comments-for-post div.list-of-comments article {
@@ -254,38 +271,43 @@ div.favorites section#content > h1 {
   display: none; }
 
 /*** Posts ***/
-div.posts h1 {
+article.post-preview {
+  margin-right: 4em;
+  margin-bottom: 4em;
+  float: left; }
+
+div#c-posts h1 {
   font-size: 1.2em; }
-div.posts h2 {
+div#c-posts h2 {
   font-size: 1.1em; }
-div.posts aside#sidebar > section > ul li {
+div#c-posts aside#sidebar > section > ul li {
   list-style-type: none; }
-div.posts aside#sidebar > section > ul ul li {
+div#c-posts aside#sidebar > section > ul ul li {
   margin-left: 1em; }
-div.posts section#tag-and-wiki-box {
+div#c-posts section#tag-and-wiki-box {
   padding: 0; }
-  div.posts section#tag-and-wiki-box menu li {
+  div#c-posts section#tag-and-wiki-box menu li {
     display: inline-block; }
-  div.posts section#tag-and-wiki-box menu li.active a {
+  div#c-posts section#tag-and-wiki-box menu li.active a {
     color: #000; }
-  div.posts section#tag-and-wiki-box h1 {
+  div#c-posts section#tag-and-wiki-box h1 {
     font-size: 1.2em; }
-  div.posts section#tag-and-wiki-box div#tag-box h2 {
+  div#c-posts section#tag-and-wiki-box div#tag-box h2 {
     display: none; }
-  div.posts section#tag-and-wiki-box div#tag-box li {
+  div#c-posts section#tag-and-wiki-box div#tag-box li {
     list-style-type: none; }
-  div.posts section#tag-and-wiki-box div#wiki-box h2 {
+  div#c-posts section#tag-and-wiki-box div#wiki-box h2 {
     display: none; }
-div.posts section#content > h1 {
+div#c-posts section#content > h1 {
   display: none; }
-div.posts section#content section > h2 {
+div#c-posts section#content section > h2 {
   display: none; }
-div.posts section#content menu#post-sections {
+div#c-posts section#content menu#post-sections {
   margin-bottom: 1em; }
-  div.posts section#content menu#post-sections li {
+  div#c-posts section#content menu#post-sections li {
     font-size: 1.1em;
     font-weight: bold; }
-  div.posts section#content menu#post-sections li.active a {
+  div#c-posts section#content menu#post-sections li.active a {
     color: black; }
 
 /*** Post Histories ***/
diff --git a/public/stylesheets/src/default.scss b/public/stylesheets/src/default.scss
index 5c19c54ff..3d239d3db 100644
--- a/public/stylesheets/src/default.scss
+++ b/public/stylesheets/src/default.scss
@@ -311,12 +311,39 @@ div.dtext {
 
 /*** Pools ***/
 
-div.pools {
-  div.edit {
+div#c-pools {
+  div#a-edit {
     p {
       margin-bottom: 1em;
       width: 40em;
     }
+    
+    ul.ui-sortable {
+      list-style-type: none;
+
+      span {
+        margin: 0;
+        float: right;
+        cursor: pointer;
+      }
+      
+      li {
+        padding: 0.5em;
+      }
+      
+      li.ui-state-default {
+        margin-bottom: 20px;
+        width: 250px;
+        background: none;
+      }
+      
+      li.ui-state-placeholder {
+        margin-bottom: 20px;
+        width: 250px;
+        height: 150px;
+        background: none;
+      }
+    }
   }
 }
 
@@ -386,7 +413,13 @@ div.favorites {
 
 /*** Posts ***/
 
-div.posts {
+article.post-preview {
+  margin-right: 4em;
+  margin-bottom: 4em;
+  float: left;
+}
+
+div#c-posts {
   h1 {
     font-size: 1.2em;
   }