Changeset 4578
- Timestamp:
- 09/13/07 22:00:46 (1 year ago)
- Files:
-
- components/news/trunk/news/admin/_admin_content.rhtml (modified) (4 diffs)
- components/news/trunk/news/admin/main.rhtml (modified) (4 diffs)
- components/news/trunk/news/admin_controller.rb (modified) (2 diffs)
- components/news/trunk/news/languages/english.rb (modified) (1 diff)
- components/news/trunk/news/languages/japanese.rb (modified) (1 diff)
- components/news/trunk/news/news/block.rhtml (modified) (1 diff)
- components/news/trunk/news/news/public_news_list.rhtml (modified) (1 diff)
- components/news/trunk/news/news_config.rb (modified) (1 diff)
- components/news/trunk/news/news_controller.rb (modified) (6 diffs)
- components/news/trunk/news/news_helper.rb (modified) (4 diffs)
- components/news/trunk/news/news_item.rb (modified) (2 diffs)
- components/news/trunk/news/rubricks_search.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
components/news/trunk/news/admin/_admin_content.rhtml
r3465 r4578 3 3 <td class="rubricks_general_table_cell_bordered admin_table_item" style="width: 30%"><%= hl('[_News_Need_Approval_Posted_News]') %></td> 4 4 <td id="config_approval" class="rubricks_general_table_cell_bordered admin_table_value" style="width: 70%"> 5 <%= ( News::NewsConfig.need_approval)? hl('[_Common_Yes]') : hl('[_Common_No]') %>5 <%= (@nc.approval)? hl('[_Common_Yes]') : hl('[_Common_No]') %> 6 6 </td> 7 7 </tr> … … 9 9 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_News_Per_Page]') %></td> 10 10 <td id="config_news_per_page" class="rubricks_general_table_cell_bordered"> 11 <%= hl( News::NewsConfig.news_per_page) %>11 <%= hl(@nc.news_per_page) %> 12 12 </td> 13 13 </tr> … … 15 15 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_News_Per_Block]') %></td> 16 16 <td id="config_news_per_block" class="rubricks_general_table_cell_bordered"> 17 <%= hl( News::NewsConfig.news_per_block) %>17 <%= hl(@nc.news_per_block) %> 18 18 </td> 19 19 </tr> … … 21 21 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_New_Days]') %></td> 22 22 <td id="config_new_days" class="rubricks_general_table_cell_bordered"> 23 <%= hl( News::NewsConfig.new_days) %>23 <%= hl(@nc.new_days) %> 24 24 </td> 25 25 </tr> components/news/trunk/news/admin/main.rhtml
r4563 r4578 1 1 <%= stylesheet_link_tag '/stylesheets/components/news/style' %> 2 2 <%= flash_for_feedback_msg(:news_common) %> 3 <% = start_validate_page%>3 <% validate_page do %> 4 4 <div class="rubricks_general_frame_borderless"> 5 <% = render_operation_bar_begin%>5 <% render_operation_bar do %> 6 6 <%= form_tag({:controller => '/news/admin', :action => 'print', :page => 'print_admin'}, {:id => 'news_admin_print_form', :class => 'operationbar_button_right_inactive swap', :target => "_blank"}) %> 7 7 <span id="print_button" class="buttons darkicon_print textcolor_white" onclick="rubricks.common.fire_submit('news_admin_print_form', 'print_button');rubricks.common.rubricks_wait_message_close();"><%= hl('[_Common_Print]') %></span> 8 8 </form> 9 <% = render_operation_bar_end %>10 <% = render_content_body_begin%>11 <% = render_detail_frame_begin('00')%>9 <% end %> 10 <% render_content_body do %> 11 <% render_detail_frame('00') do %> 12 12 <div id="news_edit_area"> 13 13 <div> 14 14 <% render_detail('00', hl('[_News_Setting]')) do %> 15 <% = render_float_button_begin('float_button_area_read')%>15 <% render_float_button('float_button_area_read') do %> 16 16 <div id="news_edit_mode_form" class="float_button_right_inactive swap"> 17 17 <span id="news_admin_edit_mode_button" class="buttons icon_edit" onclick="rubricks.news.edit_news_admin();"><%= hl('[_Common_Edit]') %></span> 18 18 </div> 19 <% = render_float_button_end('float_button_area_read')%>20 <%= render (:partial => "news/admin/admin_content")%>19 <% end %> 20 <%= render :partial => '/news/admin/admin_content' %> 21 21 <% end %> 22 22 </div> 23 23 <div style="display: none;"> 24 24 <% render_detail('00', hl('[_News_Setting]')) do %> 25 <%= start_validate('news_admin_edit_button')%>26 <%= form_main_tag :url=>{:controller => '/news/admin', :action => 'update'}, :html => {:id => 'news_edit_form'} %>27 <%= render_float_button_begin('float_button_area_admin_edit')%>28 <div class="float_button_right_inactive swap">29 <span id="news_edit_cancel_button" class="buttons icon_cancel" onclick="rubricks.common.FormEditor.readMode('news_edit_area', 'news_edit_form');"><%= hl('[_Common_Cancel]') %></span>30 </div>31 <div class="float_button_right_inactive swap">32 <%= span_submit hl('[_Common_Save]'), 'news_admin_edit_button', :modal_area_id => 'news_edit_area' %>33 </div>34 <%= render_float_button_end('float_button_area_admin_edit')%>25 <% validate_form('news_admin_edit_button') do %> 26 <%= form_main_tag :url=>{:controller => '/news/admin', :action => 'update'}, :html => {:id => 'news_edit_form'} %> 27 <% render_float_button('float_button_area_admin_edit') do %> 28 <div class="float_button_right_inactive swap"> 29 <span id="news_edit_cancel_button" class="buttons icon_cancel" onclick="rubricks.common.FormEditor.readMode('news_edit_area', 'news_edit_form');"><%= hl('[_Common_Cancel]') %></span> 30 </div> 31 <div class="float_button_right_inactive swap"> 32 <%= span_submit hl('[_Common_Save]'), 'news_admin_edit_button', :modal_area_id => 'news_edit_area' %> 33 </div> 34 <% end %> 35 35 <table id="test" class="rubricks_general_table" style="position: static;"> 36 36 <tr class="rubricks_general_table_odd"> 37 37 <td class="rubricks_general_table_cell_bordered admin_table_item" style="width: 30%"><%= hl('[_News_Need_Approval_Posted_News]') %></td> 38 38 <td class="rubricks_general_table_cell_bordered admin_table_value" style="width: 70%"> 39 <input type="radio" class="check" id="rubricks_news_need_approval_true" name="news_config[approval]" value="true" <%= "checked" if News::NewsConfig.need_approval %>><label class="cursor_pointer" for="rubricks_news_need_approval_true"><%= hl('[_Common_Yes]') %></label>40 <input type="radio" class="check" id="rubricks_news_need_approval_false" name="news_config[approval]" value="false" <%= "checked" unless News::NewsConfig.need_approval %>><label class="cursor_pointer" for="rubricks_news_need_approval_false"><%= hl('[_Common_No]') %></label>39 <input type="radio" class="check" id="rubricks_news_need_approval_true" name="news_config[approval]" value="true" <%= "checked" if @nc.approval %>><label class="cursor_pointer" for="rubricks_news_need_approval_true"><%= hl('[_Common_Yes]') %></label> 40 <input type="radio" class="check" id="rubricks_news_need_approval_false" name="news_config[approval]" value="false" <%= "checked" unless @nc.approval %>><label class="cursor_pointer" for="rubricks_news_need_approval_false"><%= hl('[_Common_No]') %></label> 41 41 </td> 42 42 </tr> … … 45 45 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_News_Per_Page]') %></td> 46 46 <td class="rubricks_general_table_cell_bordered"> 47 <%= text_field 'news_config', 'news_per_page', :value => hl( News::NewsConfig.news_per_page) %>47 <%= text_field 'news_config', 'news_per_page', :value => hl(@nc.news_per_page) %> 48 48 <span id="news_config_news_per_page_msg"></span> 49 49 </td> … … 53 53 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_News_Per_Block]') %></td> 54 54 <td class="rubricks_general_table_cell_bordered"> 55 <%= text_field 'news_config', 'news_per_block', :value => hl( News::NewsConfig.news_per_block) %>55 <%= text_field 'news_config', 'news_per_block', :value => hl(@nc.news_per_block) %> 56 56 <span id="news_config_news_per_block_msg"></span> 57 57 </td> … … 61 61 <td class="rubricks_general_table_cell_bordered"><%= hl('[_News_New_Days]') %></td> 62 62 <td class="rubricks_general_table_cell_bordered"> 63 <%= text_field 'news_config', 'new_days', :value => hl( News::NewsConfig.new_days) %>63 <%= text_field 'news_config', 'new_days', :value => hl(@nc.new_days) %> 64 64 <span id="news_config_new_days_msg"></span> 65 65 </td> 66 66 </tr> 67 67 </table> 68 < %= end_validate %>69 < /form>68 </form> 69 <% end %> 70 70 <% end %> 71 71 </div> 72 72 </div> 73 <% = render_detail_frame_end %>74 <% = render_content_body_end %>73 <% end %> 74 <% end %> 75 75 </div> 76 76 <script type="text/javascript"> 77 77 rubricks.common.FormEditor.readMode('news_edit_area'); 78 78 </script> 79 <% = end_validate_page%>79 <% end %> components/news/trunk/news/admin_controller.rb
r3642 r4578 4 4 5 5 def main 6 @nc = News::NewsConfig.instance 6 7 end 7 8 … … 17 18 flash[:news_common] = '[_News_Components_Setting_Update_Failed]' 18 19 end 19 re nder:action => 'main'20 redirect_to :action => 'main' 20 21 end 21 22 components/news/trunk/news/languages/english.rb
r3427 r4578 3 3 @lang['_News_Info_Description'] = 'The component to register and display news.' 4 4 @lang['_News_Info_DisplayName'] = 'News' 5 @lang['_News_Info_TrailRead'] = 'Read a news' 6 @lang['_News_Info_TrailUpdate'] = 'Post/Edit/Delete a news' 5 7 @lang['_News_Title_Config'] = 'News Config' 6 8 @lang['_News_Need_Approval_Posted_News'] = 'Approval is necessary for contributed news' components/news/trunk/news/languages/japanese.rb
r3402 r4578 4 4 å ±çãæçš¿ã»è¡šç€ºããããã®ã³ã³ããŒãã³ãã§ãã' 5 5 @lang['_News_Info_DisplayName'] = 'ãã¥ãŒã¹' 6 @lang['_News_Info_TrailRead'] = 'ãã¥ãŒã¹ã®é²èŠ§' 7 @lang['_News_Info_TrailUpdate'] = 'ãã¥ãŒã¹ã®æçš¿ã»ç·šéã»åé€' 6 8 @lang['_News_Title_Config'] = 'ãã¥ãŒã¹ç®¡ç' 7 9 @lang['_News_Need_Approval_Posted_News'] = 'æçš¿ããããã¥ãŒã¹ã«æ¿èªãå¿ components/news/trunk/news/news/block.rhtml
r4224 r4578 9 9 <div id="news_publish_date_<%= news.id %>" style="float: left;width: 42px;"><%= hl(publish_date_block_to_s(news)) %></div> 10 10 <div style="float: left;width: 18px"> 11 <% if news.is_new?%>11 <% if is_new?(news) %> 12 12 <span class="icon_new_red new_icon"> </span> 13 13 <% end %> components/news/trunk/news/news/public_news_list.rhtml
r4222 r4578 25 25 <td id="news_list_publish_date_<%= hl(news.id) %>" class="custom_selectableTable_td" style="width: 100px"> 26 26 <span style="float: left;"><%= hl(publish_date_to_s(news)) %></span> 27 <% if news.is_new?%>27 <% if is_new?(news) %> 28 28 <span id="new_news_<%= hl(news.id) %>" class="buttons icon_new_red new_icon"> </span> 29 29 <% end %> components/news/trunk/news/news_config.rb
r2250 r4578 9 9 10 10 class << self 11 def need_approval 12 News::NewsConfig.find(1).approval 13 end 14 15 def news_per_page 16 News::NewsConfig.find(1).news_per_page 17 end 18 19 def news_per_block 20 News::NewsConfig.find(1).news_per_block 21 end 22 23 def new_days 24 News::NewsConfig.find(1).new_days 11 def instance 12 self.find(1) 25 13 end 26 14 end components/news/trunk/news/news_controller.rb
r3905 r4578 70 70 def public_news_list 71 71 news_id = params[:news_id] ||= params[:id] 72 @nc = News::NewsConfig.instance 72 73 if news_id 73 74 news_item = News::NewsItem.find(news_id) rescue news_item = nil 74 75 if news_item && (news_item.is_approvaled? || !guest?) 75 76 news_count = News::NewsItem.count(:conditions => ['approval = 1 and (publish_date > ? or (publish_date = ? and id > ?))', news_item.publish_date, news_item.publish_date, news_item.id]) 76 params[:page] = news_count / News::NewsConfig.news_per_page + 177 params[:page] = news_count / @nc.news_per_page + 1 77 78 @show_news_id = news_id 78 79 end 79 80 end 80 @pages, @news_items = paginate(:'news/news_item', :per_page => News::NewsConfig.news_per_page, :conditions => ['approval = 1'], :order => 'publish_date DESC, id DESC')81 @pages, @news_items = paginate(:'news/news_item', :per_page => @nc.news_per_page, :conditions => ['approval = 1'], :order => 'publish_date DESC, id DESC') 81 82 end 82 83 … … 154 155 def post 155 156 check_permission 157 nc = News::NewsConfig.instance 156 158 ru = current_user 157 159 @news_item = News::NewsItem.new … … 162 164 @news_item.approval = Acts::Approval::WAITING 163 165 164 if @news_item.is_waiting? && 165 (!News::NewsConfig.need_approval || permitted_current_component_function?('approval') && 166 @news_item.my_news?) 166 if @news_item.is_waiting? && (!nc.approval || permitted_current_component_function?('approval') && @news_item.my_news?) 167 167 @news_item.approval = Acts::Approval::APPROVALED 168 168 @news_item.publish_date = DateTime.now.strftime("%Y-%m-%d %H:%M:%S") … … 222 222 def block 223 223 News::NewsItem.approved_scope do 224 @news_items = News::NewsItem.find(:all, :limit => News::NewsConfig.news_per_block, :order => 'publish_date DESC, id DESC') 224 @nc = News::NewsConfig.instance 225 @news_items = News::NewsItem.find(:all, :limit => @nc.news_per_block, :order => 'publish_date DESC, id DESC') 225 226 end 226 227 end … … 267 268 def approval_news_list(approval) 268 269 news_id = params[:id] 270 nc = News::NewsConfig.instance 269 271 if news_id 270 272 news_item = News::NewsItem.find(news_id) rescue news_item = nil … … 276 278 news_count = News::NewsItem.count(:conditions => ['rubricks_user_id = ? and approval = ? and (updated_on > ? or (updated_on = ? and id > ?))', current_user.id, approval, news_item.updated_on, news_item.updated_on, news_item.id]) 277 279 end 278 params[:page] = news_count / News::NewsConfig.news_per_page + 1280 params[:page] = news_count / nc.news_per_page + 1 279 281 @show_news_id = news_id 280 282 end 281 283 end 282 284 if administrator? 283 @pages, @news_items = paginate(:'news/news_item', :per_page => News::NewsConfig.news_per_page, :conditions => ['approval = ?', approval], :order => 'updated_on DESC, id DESC')285 @pages, @news_items = paginate(:'news/news_item', :per_page => nc.news_per_page, :conditions => ['approval = ?', approval], :order => 'updated_on DESC, id DESC') 284 286 else 285 @pages, @news_items = paginate(:'news/news_item', :per_page => News::NewsConfig.news_per_page, :conditions => ['rubricks_user_id = ? and approval = ?', current_user.id, approval], :order => 'updated_on DESC, id DESC')287 @pages, @news_items = paginate(:'news/news_item', :per_page => nc.news_per_page, :conditions => ['rubricks_user_id = ? and approval = ?', current_user.id, approval], :order => 'updated_on DESC, id DESC') 286 288 end 287 289 end components/news/trunk/news/news_helper.rb
r4138 r4578 1 1 module News::NewsHelper 2 3 2 def cutoff_news_title(value) 4 3 return value.cutoff_by_char(20) … … 45 44 46 45 def has_approval?(news) 47 return news.is_waiting? && (RubricksLib.permitted_current_component_function?('approval')) 46 return news.is_waiting? && (RubricksLib.permitted_current_component_function?('approval')) 48 47 end 49 48 … … 56 55 def has_delete_multiple? 57 56 return false if RubricksLib.guest? 58 if News::NewsConfig.need_approval57 if @nc.approval 59 58 return RubricksLib.permitted_current_component_function?('admin') 60 59 else 61 60 return RubricksLib.permitted_current_component_function?('post') 62 61 end 62 end 63 64 def is_new?(news) 65 return false if news.publish_date.nil? 66 days = Date.today - news.publish_date.to_date 67 return days < @nc.new_days 63 68 end 64 69 … … 68 73 69 74 def need_confirm_update?(news) 75 nc = News::NewsConfig.instance 70 76 return false if RubricksLib.permitted_current_component_function?('admin') || RubricksLib.permitted_current_component_function?('approval') 71 return news.is_approvaled? && News::NewsConfig.need_approval && RubricksLib.permitted_current_component_function?('post')77 return news.is_approvaled? && nc.approval && RubricksLib.permitted_current_component_function?('post') 72 78 end 73 79 components/news/trunk/news/news_item.rb
r3783 r4578 1 1 class News::NewsItem < ActiveRecord::Base 2 2 acts_as_approval 3 acts_as_strippable :article4 acts_as_tiny_mce_attachable :article5 validates_not_nil_of :rubricks_user_id6 validates_not_nil_of :approval7 validates_not_nil_of :article8 validates_length_of :display_name, :in => 1..329 validates_length_of :title, :in => 1..643 acts_as_strippable :article 4 acts_as_tiny_mce_attachable :article 5 validates_not_nil_of :rubricks_user_id 6 validates_not_nil_of :approval 7 validates_not_nil_of :article 8 validates_length_of :display_name, :in => 1..32 9 validates_length_of :title, :in => 1..64 10 10 11 11 class << self … … 37 37 end 38 38 39 def is_new?40 return false if self.publish_date.nil?41 days = Date.today - self.publish_date.to_date42 return days < News::NewsConfig.new_days43 end44 45 39 def my_news? 46 40 return self.rubricks_user_id == RubricksLib.current_user.id components/news/trunk/news/rubricks_search.rb
r3336 r4578 6 6 query = "(#{query}) AND approval=1" 7 7 conditions.unshift(query) 8 ni_list = News::NewsItem.find( 9 :all, 10 :conditions => conditions, 11 :offset => offset, 12 :limit => limit, 13 :order => 'created_on DESC' 14 ) 8 ni_list = News::NewsItem.find(:all, :conditions => conditions, :offset => offset,:limit => limit, :order => 'created_on DESC') 15 9 ni_list.each do |ni| 16 10 result << { … … 31 25 query = "(#{query}) AND approval=1" 32 26 conditions.unshift(query) 33 count = News::NewsItem.count( 34 :all, 35 :conditions => conditions 36 ) 27 count = News::NewsItem.count(:all, :conditions => conditions) 37 28 return count 38 29 end … … 40 31 def target 41 32 target = { 42 'display_name' => '[_Common_Poster]',43 'title' => '[_Common_Title]',44 'article_plain' 33 'display_name' => '[_Common_Poster]', 34 'title' => '[_Common_Title]', 35 'article_plain' => '[_News_Article_Text]' 45 36 } 46 37 end
