diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js index 6ecb7e922..15c6b0b02 100644 --- a/app/assets/javascripts/comments.js +++ b/app/assets/javascripts/comments.js @@ -20,7 +20,7 @@ Danbooru.Comment.initialize_preview_button = function() { $("div.new-comment input[type=submit][value=Preview]").click(function(e) { e.preventDefault(); - $.ajax("/dtext/preview", { + $.ajax("/dtext_preview", { type: "post", data: { body: $(e.target).closest("form").find("textarea").val() diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 68c936d05..768e9a41c 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -54,7 +54,7 @@ table { /*** BEGIN CUSTOM STYLES ***/ body { font-family: Verdana, Helvetica, sans-serif; - padding: 1em 2em; + padding: 0; margin: 0; line-height: 1.25em; } @@ -193,13 +193,37 @@ menu { } li { - margin: 0 1em 0 0; + margin: 0; padding: 0; list-style-type: none; display: inline; } } +header#top { + h1 { + margin: 5px 30px 0 30px; + } + + menu { + background: #F7F7FF; + padding: 5px 20px; + + li { + padding: 5px 10px; + } + } + + menu.main { + background: white; + + li.current { + background: #F7F7FF; + font-weight: bold; + } + } +} + p { margin-bottom: 1em; } @@ -523,7 +547,7 @@ div.comments-for-post { div.dtext-preview { border: 2px dashed #AAA; padding: 1em; - margin: 1em; + margin: 1em 0; width: 30em; } diff --git a/app/controllers/dtext_controller.rb b/app/controllers/dtext_controller.rb deleted file mode 100644 index 6746bc02e..000000000 --- a/app/controllers/dtext_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DtextController < ApplicationController - def preview - render :inline => "

Preview

<%= format_text(params[:body]) %>" - end -end diff --git a/app/controllers/dtext_previews_controller.rb b/app/controllers/dtext_previews_controller.rb new file mode 100644 index 000000000..196e42961 --- /dev/null +++ b/app/controllers/dtext_previews_controller.rb @@ -0,0 +1,5 @@ +class DtextPreviewsController < ApplicationController + def create + render :inline => "

Preview

<%= format_text(params[:body]) %>" + end +end diff --git a/app/views/advertisements/_secondary_links.html.erb b/app/views/advertisements/_secondary_links.html.erb index 414eb171a..ed08270f0 100644 --- a/app/views/advertisements/_secondary_links.html.erb +++ b/app/views/advertisements/_secondary_links.html.erb @@ -1,5 +1,5 @@ <% content_for(:secondary_nav_links) do %> - +
  • <%= link_to "Listing", advertisements_path %>
  • <%= link_to "New", new_advertisement_path %>
    • <% if @advertisement && !@advertisement.new_record? %> diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 31fba6e94..5d818cea8 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -21,10 +21,10 @@ <%= yield :html_header %> -
    +

    <%= link_to Danbooru.config.app_name, "/" %>