This commit is contained in:
albert
2011-05-26 19:10:08 -04:00
parent ca68b2def1
commit 969185ad24
31 changed files with 629 additions and 575 deletions

View File

@@ -13,15 +13,16 @@
<% if flash[:notice] =~ /error/ %>
<meta name="errors" content="true">
<% end %>
<meta name="max-image-width" content="500">
<%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %>
<link rel="stylesheet" href="/assets/application.css" media="screen" type="text/css">
<script src="/assets/application.js" type="text/javascript" charset="utf-8" async defer></script>
<%= stylesheet_link_tag "application", :media => "screen" %>
<%= javascript_include_tag "application" %>
<%= Danbooru.config.custom_html_header_content %>
<%= yield :html_header %>
</head>
<body>
<header>
<h1><%= Danbooru.config.app_name %></h1>
<h1><%= link_to Danbooru.config.app_name, "/" %></h1>
<nav>
<menu>
<% if CurrentUser.user.is_anonymous? %>

View File

@@ -22,7 +22,7 @@
<% end %>
<section id="blacklist-box">
<h1>Blacklisted</h1>
<h1>Blacklist</h1>
<%= link_to "Hidden", "#" %>
<ul>
</ul>
@@ -30,35 +30,18 @@
<%= render :partial => "posts/partials/index/explore", :locals => {:post_set => @post_set} %>
<section id="tag-and-wiki-box">
<menu>
<li><h1><a href="#tag-box">Tags</a></h1></li>
<% unless @post_set.tags.blank? %>
<li><h1><a href="#wiki-box">Wiki</a></h1></li>
<% end %>
</menu>
<div id="tag-box">
<h2>Tags</h2>
<%= @post_set.presenter.tag_list_html(self) %>
</div>
<div id="wiki-box">
<h2>Wiki</h2>
<%= @post_set.presenter.wiki_html(self) %>
</div>
<section id="tag-box">
<h1>Tags</h1>
<%= @post_set.presenter.tag_list_html(self) %>
</section>
</aside>
<section id="content">
<h1>Posts</h1>
<%= @post_set.presenter.post_previews_html %>
<div class="clearfix"></div>
<div class="paginator">
<%= @post_set.presenter.pagination_html(self) %>
</div>
<% if @post_set.has_wiki? && @post_set.page < 2 %>
<%= render :partial => "wiki_pages/excerpt", :locals => {:wiki_page => @post_set.wiki_page, :tag => @post_set.tag} %>
<% end %>
<%= render :partial => "posts/partials/index/posts", :locals => {:post_set => @post_set} %>
</section>
<% content_for(:page_title) do %>

View File

@@ -1,4 +1,4 @@
<%= form_tag(posts_path, :method => "get") do %>
<%= text_field_tag("tags", params[:tags], :size => 15) %>
<%= text_field_tag("tags", params[:tags]) %>
<%= submit_tag "Go" %>
<% end %>

View File

@@ -0,0 +1,9 @@
<h1>Posts</h1>
<%= post_set.presenter.post_previews_html %>
<div class="clearfix"></div>
<div class="paginator">
<%= post_set.presenter.pagination_html(self) %>
</div>

View File

@@ -1,26 +1,26 @@
<div class="static">
<div class="site_map">
<h2><%= link_to Danbooru.config.app_name, '/' %></h2>
<div>
<div id="c-static">
<div id="a-site-map">
<h1><%= Danbooru.config.app_name %></h1>
<section>
<ul>
<li><h4>Posts</h4></li>
<li><h1>Posts</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:posts")) %></li>
<li><%= link_to("Listing", posts_path) %></li>
<li><%= link_to("Recent Changes", post_histories_path) %></li>
<li><%= link_to("Recent Changes", post_versions_path) %></li>
<li><%= link_to("Upload", new_upload_path) %></li>
</ul>
<ul>
<li><h4>Tools</h4></li>
<li><h1>Tools</h1></li>
<li><%= link_to("Bookmarklet", wiki_pages_path(:title => "help:bookmarklet")) %></li>
<li><%= link_to("API Documentation", wiki_pages_path(:title => "help:api")) %></li>
</ul>
<ul>
<li><h4>Reports</h4></li>
<li><h1>Reports</h1></li>
</ul>
</div>
<div>
</section>
<section>
<ul>
<li><h4>Tags</h4></li>
<li><h1>Tags</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:tags")) %></li>
<li><%= link_to("Cheat sheet", wiki_pages_path(:title => "help:cheatsheet")) %></li>
<li><%= link_to("Aliases", tag_aliases_path) %></li>
@@ -28,63 +28,63 @@
<li><%= link_to("Listing", tags_path) %></li>
</ul>
<ul>
<li><h4>Notes</h4></li>
<li><h1>Notes</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:notes")) %></li>
<li><%= link_to("History", note_versions_path) %></li>
<li><%= link_to("Listing", notes_path) %></li>
</ul>
<ul>
<li><h4>Artists</h4></li>
<li><h1>Artists</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:artists")) %></li>
<li><%= link_to("Listing", artists_path) %></li>
</ul>
<ul>
<li><h4>Pools</h4></li>
<li><h1>Pools</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:pools")) %></li>
<li><%= link_to("Listing", pools_path) %></li>
</ul>
</div>
<div>
</section>
<section>
<ul>
<li><h4>Comments</h4></li>
<li><h1>Comments</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:comments")) %></li>
<li><%= link_to("Listing", comments_path) %></li>
<li><%= link_to("Trac", "http://trac.donmai.us") %></li>
</ul>
<ul>
<li><h4>Forum</h4></li>
<li><h1>Forum</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:forum")) %></li>
<li><%= link_to("Listing", forum_topics_path) %></li>
</ul>
<ul>
<li><h4>Wiki</h4></li>
<li><h1>Wiki</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:wiki")) %></li>
<li><%= link_to("Listing", wiki_pages_path) %></li>
<li><%= link_to("Recent Changes", wiki_page_versions_path) %></li>
</ul>
</div>
<div>
</section>
<section>
<ul>
<li><h4>Users</h4></li>
<li><h1>Users</h1></li>
<li><%= link_to("Help", wiki_pages_path(:title => "help:users")) %></li>
<li><%= link_to("Bans", bans_path) %></li>
<li><%= link_to("Listing", users_path) %></li>
<% unless CurrentUser.nil? %>
<li><%= link_to("Profile", user_path(CurrentUser.user)) %></li>
<% end %>
<li><%= link_to("Feedback", user_feedback_path) %></li>
<li><%= link_to("Feedback", user_feedback_index_path) %></li>
<li><%= link_to("Settings", edit_user_path(CurrentUser.user)) %></li>
<li><%= link_to("Signup", new_user_path) %></li>
<li><%= link_to("Terms of Service", terms_of_service_path) %></li>
</ul>
<% if CurrentUser.is_admin? %>
<ul>
<li><h4>Admin</h4></li>
<li><h1>Admin</h1></li>
<li><%= link_to("Edit User", admin_users_edit_path) %></li>
<li><%= link_to("Janitor Trials", janitor_trials_path) %></li>
<li><%= link_to("IP Bans", ip_bans_path) %></li>
</ul>
<% end %>
</div>
</section>
</div>
</div>

View File

@@ -0,0 +1,19 @@
<!--
- wiki_page
- tag
-->
<div id="wiki-page-excerpt">
<span class="ui-icon ui-icon-closethick" id="close-wiki-page-excerpt"></span>
<h1>Wiki</h1>
<% if wiki_page %>
<div id="wiki-page-excerpt" class="prose">
<%= format_text(wiki_page.presenter.excerpt) %>
<p>Read the <%= link_to "full article", wiki_page_path(wiki_page.id) %>.</p>
</div>
<% else %>
<p>There is currently no wiki page for the tag "<%= tag %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => tag}) %>.</p>
<% end %>
</div>