fix announcement image info and mail subject

app/models/user/user.rb

@@ -7,7 +7,7 @@ class User
   
   mount_uploader :avatar, AvatarUploader
   
-  field :admin, :type => Boolean, :default => true
+  field :admin, :type => Boolean, :default => false
   field :active_role
   field :user_id
   field :sid

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -23,6 +23,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
 
   def index
+
+    email_group_data
+
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
     get_categorys('BulletinCategory',params[:bulletin_category_id])
@@ -116,6 +119,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # POST /bulletins
   # POST /bulletins.xml
   def create
+
+    email_group_data
+    
     @tags = get_tags
     if params[:bulletin_link]
 
@@ -153,12 +159,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
         if @bulletin.save
 
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
+          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
+            send_email_data(@bulletin)
 
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
+            @bulletin.email_sent = false
+            @bulletin.save
+          end
 
           format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
           format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
@@ -221,6 +227,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   def update
 
+    email_group_data
+
       @bulletin = Bulletin.find(params[:id])
 
       # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
@@ -241,12 +249,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
             @bulletin.de_pending!
           end
 
-          # if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
-          #   send_email_data(@bulletin)
+          if @bulletin.email_sent == true && @bulletin.is_checked == true && !@bulletin.is_rejected
+            send_email_data(@bulletin)
 
-          #   @bulletin.email_sent = false
-          #   @bulletin.save
-          # end
+            @bulletin.email_sent = false
+            @bulletin.save
+          end
 
           # if (params[:bulletin][:is_checked] == "false")
           #   @bulletin.is_rejected = true
@@ -395,6 +403,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
         :mail_from_app => 'announcement',
         :mail_from => @user.email,
         :mail_reply_to => @user.email,
+        :mail_subject => "#{t("announcement.mail_subject")}：",
         :mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}：#{bulletin.title}",
         :mail_to => @group_mail.join(','),
         :mail_content => @mail_content ,

vendor/built_in_modules/announcement/app/models/bulletin_file.rb

@@ -11,4 +11,14 @@ class BulletinFile
   
   belongs_to :bulletin
 
+  validate :check_file_title
+
+  private
+
+  def check_file_title
+    if self.title.blank?
+      errors.add( :file,  I18n.t("announcement.file_name_not_null"))
+    end
+  end
+
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -22,7 +22,11 @@
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
           </div>
-					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
+					<span class="alert widgetInfo">
+						<%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px(w) x 230px(h)") %>
+						<br />
+						<%= t("announcement.image_upload_size_note", :image_upload_size =>'900kb') %>
+					</span>
 					<div class="controls file-upload input-prepend">
 						<%= t(:browse) %>
 						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
@@ -278,32 +282,29 @@
                     <div id="content-box">
                         <hr />
 
-												<%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
-												
-												<br /> 
+										
+						<br /> 
 
-				                <%= f.label :email_group ,t("announcement.email_group")%>
-				                <div class="form-inline">
-				                    <ul class="nav nav-pills">
-														<% @email_group_data.collect do |k,v| %>
-															<li class="pull-left">
-															<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ?  false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
-															<label for="field-<%= k %>"><%= v["name"] %></label>
-															<%= hidden_field_tag 'bulletin[email_group][]', '' %>
-															</li>
-														<% end %>
-				                    </ul>
-				                </div>
+		                <%= f.label :email_group ,t("announcement.email_group")%>
+		                <div class="form-inline">
+		                    <ul class="nav nav-pills">
+								<% @email_group_data.collect do |k,v| %>
+									<li class="pull-left">
+									<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ?  false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
+									<label for="field-<%= k %>"><%= v["name"] %></label>
+									<%= hidden_field_tag 'bulletin[email_group][]', '' %>
+									</li>
+								<% end if !@email_group_data.blank? %>
+		                    </ul>
+		                </div>
 
 
-										    <%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
-												<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
+					    <%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
+						<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
 
                     </div>
 
 
-                    
-
                 </div>
             </div>
         </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb

@@ -1,5 +1,7 @@
 <% # encoding: utf-8 %>
 
+<%= f.error_messages %>
+
 <tr id="<%= "bulletin_file_#{form_bulletin_file.id}" if !form_bulletin_file.new_record? %>" class='list_item'>
   <td>
     <div class="control-group">

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -25,6 +25,7 @@ en:
     file: Attachment
     file_description: File Description
     file_name: File Name
+    file_name_not_null: Name cannot be null
     frontend:
       bulletins: Announcement front-end
       search_result: Search result
@@ -48,11 +49,13 @@ en:
     email_group_data_2: Postgraduates
     email_group_data_3: Continuing Ed. Postgraduates 
     email_group_data_4: Other
-    mail_subject: this is an announcement reminder from【%{site_title}】
+    # mail_subject: this is an announcement reminder from【%{site_title}】
+    mail_subject: 【北教大公告提醒】
     other_mailaddress: Other Email
     other_mailaddress_note: Divide different email accounts with ","
     mail_hi: Hi
     mail_url_view: This email is the reminder of an announcement, please click the link for the details
     mail_source: Source
     mail_time: Time
+    image_upload_size_note: The following recommendations %{image_upload_size} upload size
 

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -25,6 +25,7 @@ zh_tw:
     file: 附加檔案
     file_description: 檔案描述
     file_name: 檔案名稱
+    file_name_not_null: 名稱不得為空值
     frontend:
       bulletins: 公告前台
       search_result: 搜尋結果頁
@@ -50,10 +51,12 @@ zh_tw:
     email_group_data_2: 日間部研究生
     email_group_data_3: 進修部研究生
     email_group_data_4: 其他
-    mail_subject: 來自【%{site_title}】的公告事件提醒
+    # mail_subject: 來自【%{site_title}】的公告事件提醒
+    mail_subject: 【北教大公告提醒】
     mail_hi: 您好
     mail_url_view: 此封信件為公告事件提醒，請點選以下連結詳細觀看
     mail_source: 來源
     mail_time: 時間
+    image_upload_size_note: 建議檔案小於%{image_upload_size}