wip: mobile layout, remove is_deleted constraint by default

This commit is contained in:
albert
2012-01-26 14:33:46 -05:00
parent d5c98dd0c4
commit ea16f2ce37
11 changed files with 135 additions and 65 deletions

View File

@@ -3,12 +3,39 @@
<head>
<title><%= yield :page_title %></title>
<%= csrf_meta_tag %>
<%= stylesheet_link_tag "mobile", :media => "screen" %>
<%= javascript_include_tag "mobile" %>
<%= stylesheet_link_tag "application", :media => "screen" %>
<%= stylesheet_link_tag "mobile", :media => "only screen and (max-width: 480px), only screen and (max-device-width: 480px)" %>
<%= javascript_include_tag "application" %>
<meta name="viewport" content="width=device-width, initial-scale=1">
<%= yield :html_header %>
</head>
<body>
<div id="main">
<header id="top">
<%= render "news_updates/listing" %>
<h1><%= link_to Danbooru.config.app_name, "/" %></h1>
<nav>
<%= render "layouts/main_links" %>
<%= yield :secondary_links %>
</nav>
<%= render "layouts/more_links" %>
</header>
<div id="page">
<%- if flash[:notice] -%>
<div class="ui-corner-all ui-state-highlight" id="notice"><%= flash[:notice] %></div>
<%- else -%>
<div class="ui-corner-all ui-state-highlight" id="notice" style="display: none;"></div>
<%- end -%>
<%= yield :layout %>
</div>
<footer>
<%= yield :page_footer_content %>
</footer>
<%= render "static/footer" %>
</body>
</html>

View File

@@ -0,0 +1,14 @@
<div id="c-posts">
<div id="a-index">
<%= render "posts/partials/index/posts", :post_set => @post_set %>
<%= render "posts/partials/common/secondary_links" %>
</div>
</div>
<% content_for(:page_title) do %>
<% if @post_set.tag_string.present? %>
<%= @post_set.tag_string %> - <%= Danbooru.config.app_name %>
<% else %>
<%= Danbooru.config.app_name %>
<% end %>
<% end %>