From ec428f240c02cf268cc0a77ae1669e93c3c9b134 Mon Sep 17 00:00:00 2001 From: Matthew Fu Date: Tue, 31 Jan 2012 18:23:32 +0800 Subject: [PATCH] Basic function for ad_banner --- config/environments/development.rb | 30 ++++----- config/routes.rb | 2 +- .../back_end/bulletins/_file.html - 複製.erb | 34 ---------- .../bulletins/index.html - 有分類.erb | 64 ------------------- 4 files changed, 16 insertions(+), 114 deletions(-) delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html - 複製.erb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 有分類.erb diff --git a/config/environments/development.rb b/config/environments/development.rb index d1b671e5..549fc11e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -24,21 +24,21 @@ PrototypeR4::Application.configure do config.action_dispatch.best_standards_support = :builtin - config.middleware.use ExceptionNotifier, - :email_prefix => "[R4_error]", - :sender_address => %{"notifier" }, - :exception_recipients => %w{chris@rulingcom.com} - - config.action_mailer.delivery_method = :smtp - config.action_mailer.smtp_settings = { - :tls => true, - :enable_starttls_auto => true, - :address => "smtp.gmail.com", - :port => '587', - :domain => "smtp.gmail.com", - :authentication => "plain", - :user_name => "redmine@rulingcom.com", - :password => "rulingredmine" } + # config.middleware.use ExceptionNotifier, + # :email_prefix => "[R4_error]", + # :sender_address => %{"notifier" }, + # :exception_recipients => %w{chris@rulingcom.com} + # + # config.action_mailer.delivery_method = :smtp + # config.action_mailer.smtp_settings = { + # :tls => true, + # :enable_starttls_auto => true, + # :address => "smtp.gmail.com", + # :port => '587', + # :domain => "smtp.gmail.com", + # :authentication => "plain", + # :user_name => "redmine@rulingcom.com", + # :password => "rulingredmine" } end diff --git a/config/routes.rb b/config/routes.rb index 60f87467..3d483d08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,7 +13,7 @@ PrototypeR4::Application.routes.draw do namespace :admin do resources :assets resources :app_auths - + resources :ad_banners resources :designs do collection do get 'upload_package' diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html - 複製.erb deleted file mode 100644 index 009a602d..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html - 複製.erb +++ /dev/null @@ -1,34 +0,0 @@ -
- - <% bulletin_files.each do | bulletin_file | %> - <%= fields_for 'bulletin[bulletin_files][]', bulletin_file, :index => nil do |f| %> -
- <%= f.label :file %> - <%#= file_field_tag 'bulletin[file]' %> - <%= f.file_field :file %> - - <%= f.label :file_title %> - <%= f.text_field :filetitle %> - - <%= f.label :file_description %> - <%= f.text_field :description %> - - - <% if bulletin_file.new_record? %> - <%= t(:delete) %> - <% else %> - <%= f.hidden_field :id %> - <% if bulletin_file.is_built_in? %> - - <%= f.hidden_field :disabled, :value => bulletin_file.is_disabled? , :class => 'built_in_state' %> - <% else %> - <%= t(:delete) %> - <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - <% end %> - -
- <% end %> - <% end %> - -
\ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 有分類.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 有分類.erb deleted file mode 100644 index 80dc0e7e..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 有分類.erb +++ /dev/null @@ -1,64 +0,0 @@ -<% content_for :secondary do %> -
-
-
-
-
-
    -
  • <%= link_to t('bulletin.new_announcement'), new_panel_announcement_back_end_bulletin_path %>
    • -
  • <%= link_to t('bulletin.new_announcement_class'), panel_announcement_back_end_bulletin_categorys_path %>
    • -
-<% end -%> - -<%= flash_messages %> - -

<%= t('bulletin.list_announcement') %>

-
-
-
-
-
- -<% @bulletin_categorys.each do |t| %> - -

<%= link_to t.i18n_variable[I18n.locale], panel_announcement_back_end_bulletins_path(:bulletin_category_id => t.id ) %>

- - - - - - - - - - - - - - <% t.bulletins.each do |post| %> - - - - - - - - - - - - <% end %> - -
<%= t('bulletin.category') %><%= t('bulletin.title') %><%= t('bulletin.image') %><%= t('bulletin.file') %><%= t('bulletin.text') %><%= t('bulletin.postdate') %><%= t('bulletin.deadline') %><%= t('bulletin.action') %>
<%= link_to post.bulletin_category.i18n_variable[I18n.locale], panel_announcement_front_end_bulletin_path(post) %><%= post.title %><%= link_to t('bulletin.image'), post.image.url, {:target => '_blank', :title => post.alt} if post.image.file %> - <% post.bulletin_files.each do | bfile | %> - <%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> - <% end %> - <%= truncate(post.text,:length=>15) %><%= post.postdate %><%= post.deadline %> - <%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(post) %> | - <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(post), :confirm => t('announcement.sure?'), :method => :delete, :confirm => 'Are you sure?' %> -
- -<% end %> - -
-