From 92faeccdb6c85061b0622ec82767d2b185175c6a Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 22 Jul 2013 17:24:58 +0800 Subject: [PATCH] Revert change in main-form and change class name of form_file --- app/assets/stylesheets/lib/main-forms.css | 2 +- .../panel/announcement/back_end/bulletins/_form_file.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/lib/main-forms.css b/app/assets/stylesheets/lib/main-forms.css index ed3aea650..f5dff7f60 100644 --- a/app/assets/stylesheets/lib/main-forms.css +++ b/app/assets/stylesheets/lib/main-forms.css @@ -90,7 +90,7 @@ .main-forms fieldset .input-area .controls .exist .input-prepend, .main-forms fieldset .input-area .controls .add-target .input-prepend { margin-bottom: 10px; - display: block; + display: inline-block; } .main-forms fieldset .input-area .controls .exist .fileupload-new { display: block; diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb index a3a77a11b..d2d2f9b8e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb @@ -1,7 +1,7 @@ <% if form_file.new_record? %>
<% else %> -
+
<%= link_to form_file.file_identifier, form_file.file.url, {:class => 'file-link for_preview', :target => '_blank', :title => t(:view), "data-trigger" => :hover}.merge(file_picture_preview_setting(form_file.file.url)) %> <% end %>