add backend form append note and fix show image

This commit is contained in:
spen committed 2014-05-02 13:52:02 +08:00
1 parent 7193e2efb4
commit eb7627a28a
5 files changed
+15 -6

No files matched your search

@@ -141,6 +141,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
params[:bulletin][:email_user_ids].delete('')
params[:bulletin][:update_user_id] = current_user.id
delete_out_invalid_date_from_params
respond_to do |format|
@@ -33,7 +33,7 @@
<a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
</li>
<li>
<a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
<a href="#imageupload" data-toggle="tab"><%= t("announcement.image") %></a>
</li>
<li>
<a href="#mail-group" data-toggle="tab"><%= t('announcement.email_reminder')%></a>
@@ -116,7 +116,7 @@
<!-- Images Upload -->
<div class="control-group">
<label class="control-label muted"><%= t(:image) %></label>
<label class="control-label muted"><%= t("announcement.image") %></label>
<div class="controls">
<div class="fileupload fileupload-new clearfix <%= 'fileupload-edit' if @bulletin.image.file %>" data-provides="fileupload">
<div class="fileupload-new thumbnail pull-left">
@@ -139,6 +139,7 @@
</label>
</div>
</div>
<div class="image_note"><%= t("announcement.image_note")%></div>
</div>
</div>
@@ -241,6 +242,10 @@
<% end %>
<div class="control-group">
<div class="controls add-input"><%= t('announcement.append_note')%></div>
</div>
<!-- Link -->
<div class="control-group">
<label class="control-label muted"><%= t(:link) %></label>
@@ -8,10 +8,6 @@
<span><%= link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
</div>
</div>
<div class="news_image">
<%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
<%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
</div>
<div class="news_paragraph">
<%= @bulletin.text.html_safe rescue '' %>
</div>