From dd3996fd64525edb44602979304ef861cff51dc1 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 11 Nov 2011 18:32:43 -0500 Subject: [PATCH] fixes --- app/assets/stylesheets/common/simple_form.css.scss | 2 +- app/presenters/post_presenter.rb | 2 +- app/views/users/edit.html.erb | 2 +- app/views/users/new.html.erb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/simple_form.css.scss b/app/assets/stylesheets/common/simple_form.css.scss index b64483cc1..224336875 100644 --- a/app/assets/stylesheets/common/simple_form.css.scss +++ b/app/assets/stylesheets/common/simple_form.css.scss @@ -27,7 +27,7 @@ form.simple_form { span.hint { color: #666; font-style: italic; - display: block; + margin-left: 1em; } fieldset { diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 399ccfcba..9c37112b7 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -15,7 +15,7 @@ class PostPresenter < Presenter html << %{} if post.is_image? - html << %{} + html << %{#{h(post.tag_string)}} elsif post.is_flash? html << '
Flash
' else diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index e5841ebc2..953323d14 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -4,7 +4,7 @@ <%= simple_form_for @user do |f| %>
- <%= f.input :email, :required => Danbooru.config.enable_email_verification?, :hint => "Your email address (used for messages and for password resets)" %> + <%= f.input :email, :required => Danbooru.config.enable_email_verification?, :hint => "Your email address (used for messages and for password resets)", :as => :email %> <%= f.input :time_zone, :hint => "Your local time zone" %> <%= f.input :receive_email_notifications, :hint => "Enable to receive email notification when you receive a DMail" %> <%= f.input :comment_threshold, :hint => "Comments below this score will be hidden by default" %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index b935dd5b3..d850a5c65 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -65,10 +65,10 @@
<%= simple_form_for(@user) do |f| %> - <%= f.input :name %> + <%= f.input :name, :as => :string %> <%= f.input :password %> <%= f.input :password_confirmation %> - <%= f.input :email, :required => false %> + <%= f.input :email, :required => false, :as => :email %> <%= f.input :level, :collection => User.level_hash.to_a, :include_blank => false %> <%= f.button :submit %> <% end %>