jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added ip addr search

Browse Source
This commit is contained in:
albert
2011-07-29 18:04:50 -04:00
parent 5da43c54f0
commit c8afd34d15
55 changed files with 406 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/artist_versions/index.html.erb
View File

@@ -31,9 +31,7 @@
</table>
</div>
<div class="paginator">
<%= sequential_paginator(@artist_versions) %>
</div>
<%= sequential_paginator(@artist_versions) %>
</div>
</div>

2
app/views/artists/edit.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-artists">
<div id="a-edit">
<h3>Edit Artist</h3>
<h1>Edit Artist</h1>
<%= render "form" %>
</div>
</div>

4
app/views/artists/index.html.erb
View File

@@ -34,9 +34,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@artists) %>
</div>
<%= numbered_paginator(@artists) %>
<%= render "secondary_links" %>
</div>

4
app/views/comments/index_by_comment.html.erb
View File

@@ -8,9 +8,7 @@
</div>
</div>
<div class="paginator">
<%= sequential_paginator(@comments) %>
</div>
<%= sequential_paginator(@comments) %>
</div>
</div>

4
app/views/comments/index_by_post.html.erb
View File

@@ -16,9 +16,7 @@
</div>
<% end %>
<div class="paginator">
<%= sequential_paginator(@posts) %>
</div>
<%= sequential_paginator(@posts) %>
</div>
</div>

15
app/views/favorites/index.html.erb
View File

@@ -1,13 +1,7 @@
<div id="c-favorites">
<div id="a-index">
<aside id="sidebar">
<section id="search-box">
<h1>Search Favorites</h1>
<%= form_tag(favorites_path, :method => "get") do %>
<%= text_field_tag("tags", @favorite_set.tag_string, :size => 20) %>
<%= submit_tag "Go" %>
<% end %>
</section>
<%= render :partial => "posts/partials/common/search", :locals => {:path => favorites_path, :tags => @favorite_set.tag_string} %>
<% if CurrentUser.is_privileged? %>
<section id="mode-box">
@@ -25,13 +19,10 @@
<section id="content">
<h1>Posts</h1>
<%= @favorite_set.presenter.post_previews_html(self) %>
<div class="clearfix"></div>
<div class="paginator">
<%= sequential_paginator(@favorite_set.favorites) %>
</div>
<%= sequential_paginator(@favorite_set.favorites) %>
</section>
<% content_for(:page_title) do %>

2
app/views/forum_posts/edit.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-forum-topics">
<div id="a-edit">
<h3>Edit Forum Post</h3>
<h1>Edit Forum Post</h1>
<%= render "form" %>
</div>

48
app/views/forum_posts/index.html.erb
View File

@@ -1,28 +1,28 @@
<table width="100%" class="striped">
<thead>
<tr>
<th>Topic</th>
<th>Excerpt</th>
<th>Creator</th>
<th>Date</th>
</tr>
</thead>
<tbody>
<% @forum_posts.each do |forum_post| %>
<tr>
<td><%= link_to forum_post.topic.title, forum_topic_path(forum_post.topic) %></td>
<td><%= link_to truncate(forum_post.body, :length => 50), forum_post_path(forum_post) %></td>
<td><%= forum_post.creator.name %></td>
<td><%= time_ago_in_words forum_post.created_at %> ago</td>
</tr>
<% end %>
</tbody>
</table>
<div id="c-forum-posts">
<div id="a-index">
<table width="100%" class="striped">
<thead>
<tr>
<th>Topic</th>
<th>Excerpt</th>
<th>Creator</th>
<th>Date</th>
</tr>
</thead>
<tbody>
<% @forum_posts.each do |forum_post| %>
<tr>
<td><%= link_to forum_post.topic.title, forum_topic_path(forum_post.topic) %></td>
<td><%= link_to truncate(forum_post.body, :length => 50), forum_post_path(forum_post) %></td>
<td><%= forum_post.creator.name %></td>
<td><%= time_ago_in_words forum_post.created_at %> ago</td>
</tr>
<% end %>
</tbody>
</table>
<div id="paginator">
<%= numbered_paginator(@forum_posts) do |page| %>
<%= link_to(page, forum_posts_path(:search => params[:search], :page => page)) %>
<% end %>
<%= numbered_paginator(@forum_posts) %>
</div>
</div>
<%= render "forum_topics/secondary_links" %>

2
app/views/forum_posts/new.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-forum-topics">
<div id="a-new">
<h3>New Forum Post</h3>
<h1>New Forum Post</h1>
<%= render "form" %>
<%= error_messages_for "forum_post" %>
</div>

2
app/views/forum_posts/search.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-forum-topics">
<div id="a-search">
<h3>Search Forum Posts</h3>
<h1>Search Forum Posts</h1>
<%= simple_form_for @search do |f| %>
<%= f.input :topic_title_matches, :label => "Title" %>
<%= f.input :body_matches, :label => "Body" %>

4
app/views/forum_topics/_paginator.html.erb
View File

@@ -1,3 +1 @@
<div class="paginator">
<%= @forum_topic.presenter(@forum_posts).pagination_html(self) %>
</div>
<%= @forum_topic.presenter(@forum_posts).pagination_html(self) %>

2
app/views/forum_topics/edit.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-forum-topics">
<div id="a-edit">
<h3>Edit Forum Topic</h3>
<h1>Edit Forum Topic</h1>
<%= render "form" %>
</div>

2
app/views/forum_topics/new.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-forum-topics">
<div id="a-new">
<h3>New Forum Topic</h3>
<h1>New Forum Topic</h1>
<%= render "form" %>
</div>

22
app/views/moderator/ip_addrs/index.html.erb Normal file
View File

@@ -0,0 +1,22 @@
<div id="c-moderator-ip-addrs">
<div id="a-index">
<h1>IP Addresses</h1>
<table>
<thead>
<tr>
<th>Key</th>
<th>Count</th>
</tr>
</thead>
<tbody>
<% @search.execute.each do |k, count| %>
<tr>
<td><%= k %></td>
<td><%= count %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>

19
app/views/moderator/ip_addrs/search.html.erb Normal file
View File

@@ -0,0 +1,19 @@
<div id="c-moderator-ip-addrs">
<div id="a-search">
<h1>IP Address Search</h1>
<%= form_tag(moderator_ip_addrs_path) do %>
<div class="input">
<label>User</label>
<%= text_field :search, :user_name %>
</div>
<div class="input">
<label>IP Addr</label>
<%= text_field :search, :ip_addr %>
</div>
<%= submit_tag %>
<% end %>
</div>
</div>

1
app/views/moderator/post/dashboards/show.html.erb
View File

@@ -38,3 +38,4 @@
</div>
</div>
<%= render :partial => "posts/partials/common/secondary_links" %>

5
app/views/note_versions/index.html.erb
View File

@@ -33,12 +33,9 @@
</tbody>
</table>
<div class="paginator">
<%= sequential_paginator(@note_versions) %>
</div>
<%= sequential_paginator(@note_versions) %>
<%= render :partial => "notes/secondary_links" %>
</div>
</div>

4
app/views/notes/index_by_note.html.erb
View File

@@ -23,9 +23,7 @@
</tbody>
</table>
<div class="paginator">
<%= sequential_paginator(@notes) %>
</div>
<%= sequential_paginator(@notes) %>
</div>
</div>

4
app/views/notes/index_by_post.html.erb
View File

@@ -2,9 +2,7 @@
<div id="a-index">
<%= @post_set.presenter.post_previews_html(self) %>
<div class="paginator">
<%= numbered_paginator(@posts, false) %>
</div>
<%= numbered_paginator(@posts, false) %>
</div>
</div>

6
app/views/pool_versions/index.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-pools">
<div id="a-index">
<h3>Pool History</h3>
<h1>Pool History</h1>
<table width="100%">
<thead>
@@ -33,9 +33,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@pool_versions) %>
</div>
<%= numbered_paginator(@pool_versions) %>
</div>
</div>

4
app/views/pools/index.html.erb
View File

@@ -25,9 +25,7 @@
</tbody>
</table>
<div class="paginator">
<%= sequential_paginator(@pools) %>
</div>
<%= numbered_paginator(@pools) %>
<%= render "secondary_links" %>
</div>

6
app/views/pools/show.html.erb
View File

@@ -9,11 +9,7 @@
<section id="content">
<%= @post_set.presenter.post_previews_html(self) %>
<div class="clearfix"></div>
<div class="paginator">
<%= numbered_paginator(@post_set) %>
</div>
<%= numbered_paginator(@post_set) %>
</section>
</div>
</div>

4
app/views/post_versions/_listing.html.erb
View File

@@ -39,6 +39,4 @@
</table>
</div>
<div class="paginator">
<%= sequential_paginator(post_versions) %>
</div>
<%= sequential_paginator(post_versions) %>

21
app/views/posts/index.html.erb
View File

@@ -1,26 +1,11 @@
<div id="c-posts">
<div id="a-index">
<aside id="sidebar">
<section id="search-box">
<h1>Search</h1>
<%= form_tag(posts_path, :method => "get") do %>
<%= text_field_tag("tags", params[:tags], :size => 20) %>
<%= submit_tag "Go" %>
<% end %>
</section>
<%= render :partial => "posts/partials/common/search", :locals => {:path => posts_path, :tags => params[:tags]} %>
<% if CurrentUser.user.is_privileged? %>
<section id="mode-box">
<%= render :partial => "posts/partials/index/mode_menu" %>
</section>
<% end %>
<%= render :partial => "posts/partials/index/mode_menu" %>
<section id="blacklist-box">
<h1>Blacklist</h1>
<%= link_to "Hidden", "#" %>
<ul>
</ul>
</section>
<%= render :partial => "posts/partials/index/blacklist" %>
<section id="tag-box">
<h1>Tags</h1>

16
app/views/posts/partials/common/_search.html.erb
View File

@@ -1,4 +1,12 @@
<%= form_tag(posts_path, :method => "get") do %>
<%= text_field_tag("tags", params[:tags]) %>
<%= submit_tag "Go" %>
<% end %>
<!--
- path
- tags
-->
<section id="search-box">
<h1>Search</h1>
<%= form_tag(path, :method => "get") do %>
<%= text_field_tag("tags", tags, :size => 20) %>
<%= submit_tag "Go" %>
<% end %>
</section>

5
app/views/posts/partials/common/_secondary_links.html.erb
View File

@@ -6,11 +6,10 @@
<li><%= link_to "Hot", explore_post_hot_path %></li>
<% unless CurrentUser.is_anonymous? %>
<li><%= link_to "Favorites", favorites_path %></li>
<li><%= link_to "Subscriptions", tag_subscriptions_path(:user_id => CurrentUser.id) %></li>
<li><%= link_to "Subscriptions", posts_tag_subscription_path(CurrentUser.id) %></li>
<% end %>
<li><%= link_to "Changes", post_versions_path %></li>
<li>Approvals</li>
<li><%= link_to "Moderate", moderator_post_dashboard_path %></li>
<li>Help</li>
<li><%= link_to "Help", wiki_pages_path(:title => "help:posts") %></li>
</menu>
<% end %>

6
app/views/posts/partials/index/_blacklist.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<section id="blacklist-box">
<h1>Blacklisted</h1>
<%= link_to "Hidden", "#" %>
<ul>
</ul>
</section>

46
app/views/posts/partials/index/_mode_menu.html.erb
View File

@@ -1,21 +1,25 @@
<h1>Mode</h1>
<form action="/">
<select name="mode">
<option value="view">View</option>
<option value="edit">Edit</option>
<option value="add-fav">Favorite</option>
<option value="remove-fav">Unfavorite</option>
<option value="rating-s">Rate safe</option>
<option value="rating-q">Rate questionable</option>
<option value="rating-e">Rate explicit</option>
<option value="vote-up">Vote up</option>
<option value="vote-down">Vote down</option>
<option value="lock-rating">Lock rating</option>
<option value="lock-note">Lock notes</option>
<option value="edit-tag-script">Edit tag script</option>
<option value="apply-tag-script">Apply tag script</option>
<% if CurrentUser.user.is_janitor? %>
<option value="approve">Approve</option>
<% end %>
</select>
</form>
<% if CurrentUser.is_privileged? %>
<section id="mode-box">
<h1>Mode</h1>
<form action="/">
<select name="mode">
<option value="view">View</option>
<option value="edit">Edit</option>
<option value="add-fav">Favorite</option>
<option value="remove-fav">Unfavorite</option>
<option value="rating-s">Rate safe</option>
<option value="rating-q">Rate questionable</option>
<option value="rating-e">Rate explicit</option>
<option value="vote-up">Vote up</option>
<option value="vote-down">Vote down</option>
<option value="lock-rating">Lock rating</option>
<option value="lock-note">Lock notes</option>
<option value="edit-tag-script">Edit tag script</option>
<option value="apply-tag-script">Apply tag script</option>
<% if CurrentUser.user.is_janitor? %>
<option value="approve">Approve</option>
<% end %>
</select>
</form>
</section>
<% end %>

6
app/views/posts/partials/index/_posts.html.erb
View File

@@ -2,8 +2,4 @@
<%= post_set.presenter.post_previews_html(self) %>
<div class="clearfix"></div>
<div class="paginator">
<%= numbered_paginator(post_set.posts) %>
</div>
<%= numbered_paginator(post_set.posts) %>

5
app/views/posts/show.html.erb
View File

@@ -1,10 +1,7 @@
<div id="c-posts">
<div id="a-show">
<aside id="sidebar">
<section>
<h1>Search</h1>
<%= render :partial => "posts/partials/common/search" %>
</section>
<%= render :partial => "posts/partials/common/search", :locals => {:path => posts_path, :tags => params[:tags]} %>
<% if @post.pools.any? %>
<section id="pool-sidebar">

6
app/views/tag_aliases/index.html.erb
View File

@@ -36,11 +36,9 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@tag_aliases) %>
</div>
</div>
<div class="paginator">
<%= numbered_paginator(@tag_aliases) %>
</div>
<%= render "secondary_links" %>

6
app/views/tag_implications/index.html.erb
View File

@@ -36,11 +36,9 @@
<% end %>
</tbody>
</table>
<%= numbered_paginator(@tag_implications) %>
</div>
</div>
<div class="paginator">
<%= numbered_paginator(@tag_implications) %>
</div>
<%= render "secondary_links" %>

26
app/views/tag_subscriptions/posts.html.erb Normal file
View File

@@ -0,0 +1,26 @@
<div id="c-tag-subscriptions">
<div id="a-posts">
<aside id="sidebar">
<%= render :partial => "posts/partials/common/search", :locals => {:path => posts_tag_subscription_path, :tags => @post_set.tag_string} %>
<%= render :partial => "posts/partials/index/mode_menu" %>
<%= render :partial => "posts/partials/index/blacklist" %>
</aside>
<section id="content">
<h1>Posts</h1>
<%= @post_set.presenter.post_previews_html(self) %>
<%= numbered_paginator(@posts) %>
</section>
<% content_for(:page_title) do %>
/fav:<%= CurrentUser.name %>
<% end %>
<%= render :partial => "posts/partials/common/secondary_links" %>
</div>
</div>

44
app/views/tags/index.html.erb
View File

@@ -1,25 +1,27 @@
<table width="100%" class="striped">
<thead>
<tr>
<th>Count</th>
<th>Name</th>
</tr>
</thead>
<tbody>
<% @tags.each do |tag| %>
<tr>
<td><%= tag.post_count %></td>
<td class="tag-category-<%= tag.category_name %>">
<%= link_to("?", wiki_pages_path(:title => tag.name)) %>
<%= link_to(tag.name, posts_path(:tags => tag.name)) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div id="c-tags">
<div id="a-index">
<table width="100%" class="striped">
<thead>
<tr>
<th>Count</th>
<th>Name</th>
</tr>
</thead>
<tbody>
<% @tags.each do |tag| %>
<tr>
<td><%= tag.post_count %></td>
<td class="tag-category-<%= tag.category_name %>">
<%= link_to("?", wiki_pages_path(:title => tag.name)) %>
<%= link_to(tag.name, posts_path(:tags => tag.name)) %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@tags) %>
<%= numbered_paginator(@tags) %>
</div>
</div>
<%= render "secondary_links" %>

4
app/views/uploads/index.html.erb
View File

@@ -23,9 +23,7 @@
</tbody>
</table>
<div class="paginator">
<%= sequential_paginator(@uploads) %>
</div>
<%= sequential_paginator(@uploads) %>
</div>
</div>

4
app/views/user_feedbacks/index.html.erb
View File

@@ -23,9 +23,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@user_feedbacks) %>
</div>
<%= numbered_paginator(@user_feedbacks) %>
<%= render "secondary_links" %>
</div>

2
app/views/users/edit.html.erb
View File

@@ -29,3 +29,5 @@
<% content_for(:page_title) do %>
/Users/<%= @user.name %>/Settings
<% end %>
<%= render "secondary_links" %>

4
app/views/users/index.html.erb
View File

@@ -48,9 +48,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@users) %>
</div>
<%= numbered_paginator(@users) %>
<%= render "secondary_links" %>
</div>

4
app/views/wiki_page_versions/index.html.erb
View File

@@ -32,9 +32,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@wiki_page_versions) %>
</div>
<%= numbered_paginator(@wiki_page_versions) %>
</section>
</div>
</div>

4
app/views/wiki_pages/index.html.erb
View File

@@ -22,9 +22,7 @@
</tbody>
</table>
<div class="paginator">
<%= numbered_paginator(@wiki_pages) %>
</div>
<%= numbered_paginator(@wiki_pages) %>
</section>
</div>
</div>