diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index 8aba4f7..d6d3cc0 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss @@ -832,3 +832,16 @@ height:auto !important; } +.newsletter_block_edit{ + + max-width:770px; + margin:10px auto; + padding:10px; + box-shadow:0 0 10px rgba(0,0,0,0.1); + border:1px solid #C8C8CA; + + + + +} + diff --git a/app/controllers/admin/newsletters_controller.rb b/app/controllers/admin/newsletters_controller.rb index 1cf3f1a..1d34b42 100755 --- a/app/controllers/admin/newsletters_controller.rb +++ b/app/controllers/admin/newsletters_controller.rb @@ -85,7 +85,7 @@ end def send_test - + @errors = [] @newsletter = Newsletter.find(params[:id]) #NewsletterMails.newsletter(@newsletter, params[:email]).deliver send_helper @newsletter, params[:email] diff --git a/app/controllers/download_data_files_controller.rb b/app/controllers/download_data_files_controller.rb new file mode 100644 index 0000000..2ce085b --- /dev/null +++ b/app/controllers/download_data_files_controller.rb @@ -0,0 +1,14 @@ +# -*- encoding : utf-8 -*- +class DownloadDataFilesController < ApplicationController + def index + end + + + + def show + @data_file = DataFile.find_by_token(params[:id]) + send_file @data_file.file.path #, :disposition => "inline" + end + + +end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 117efb4..bd8ed94 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -34,7 +34,7 @@ class MenuItem < ActiveRecord::Base end def cible_url - menu_item_path(:url => self.permalink) + "http://"+HOSTNAME+menu_item_path(:url => self.permalink) end before_validation do diff --git a/app/models/newsletter.rb b/app/models/newsletter.rb index 5dddbc8..b647e59 100755 --- a/app/models/newsletter.rb +++ b/app/models/newsletter.rb @@ -3,6 +3,23 @@ class Newsletter < ActiveRecord::Base validates_presence_of :title + has_one :block, :as => :blockable + after_create :after_creation + + def after_creation + @block = Block.new(:block_name => "Contenu") + @block.blockable = self + @block.save + + + end + + def alloweds_types + self.block.allow_types :TitleContent, :TextContent, :ImageContent, :LinkContent, :GalleryContent, :HtmlContent, :DownloadContent + + end + + #attr_accessible :title, :content, :email_from #EMAIL_FROMS=["Le Pic Vert ", "Le Pic Vert "] diff --git a/app/views/admin/newsletters/edit.html.haml b/app/views/admin/newsletters/edit.html.haml index 12f495e..6c387ad 100755 --- a/app/views/admin/newsletters/edit.html.haml +++ b/app/views/admin/newsletters/edit.html.haml @@ -1,4 +1,85 @@ -%h1 Modifier une newsletter -=render :partial => "form" - - \ No newline at end of file +-if @newsletter.block + #toolbar-text + %div{:style => "margin-right:330px;margin-top:45px;"} + .newsletter_block_edit + #menu_item_block_edit + + =render :partial => "admin/blocks/block", :locals => {:block => @newsletter.block, :sortable => true} + + + %br + %br + %br + %br + %br + %br + %br + %br + %br + %br + %br + #menu_item_inspector_container + + + + + + + + #menu_item_informations + %h4 + Infos sur l'newsletter + + + .panel#collapseOne{:style => "display:none;"} + =render :partial => "form" + + %h4 éléments + + .panel#collapse2 + .block_portlets_sortable#content_types + -@newsletter.alloweds_types.each do |slug, name| + + .content_type{:id => slug, :"data-type" => slug} + =#i slug.to_s.constantize.picto + =image_tag("admin/content_type/type_"+slug.to_s+".png", :alt => name, :title => name, :class => "handle") + + + #collapse3{:style => "display:none;"} + %h4 Modifier l'élément + + + .panel + #element_form + + %div#element_form_action + %a.move.btn.btn-default.portlet_handle{:href => "#", :data => {:portlet_id => nil}} + %span.move_message + =ic :arrows +   + déplacer + %span.cancel_message + =ic :ban +   + annuler + + =link_to ic(:"trash-o"), "#", :method => :delete, :data => { :confirm => "Etes-vous sûr ?"}, :remote => true, :class => "btn btn-danger trash" + + %button.save.btn.btn-primary + =ic(:"floppy-o") +   + Sauvegarder + + + + + +-else + + =raw @newsletter.content + + + + + + diff --git a/app/views/admin/newsletters/index.html.haml b/app/views/admin/newsletters/index.html.haml index 2c2a98f..f5745c3 100755 --- a/app/views/admin/newsletters/index.html.haml +++ b/app/views/admin/newsletters/index.html.haml @@ -25,7 +25,7 @@ %td{:style => "text-align:right;"} - - if has_permission?('newsletter.send') + - if has_permission?('newsletter.send') and u.block =form_tag send_test_admin_newsletter_path(u), :style => "display:inline;" do .input-append{:style => "display:inline-block;margin:2px;"} = text_field_tag :email,"", :class => "" @@ -33,8 +33,9 @@ %td{:style => "width:180px;text-align:right;"} = link_to i(:"trash-o"), [:admin, u], :method => :delete, :confirm => 'Voulez-vous vraiment supprimer cette newsletter ?' - = link_to i(:"envelope-o"), select_recipients_admin_newsletter_path(u) - = link_to i(:pencil), edit_admin_newsletter_path(u) + -if u.block + = link_to i(:"envelope-o"), select_recipients_admin_newsletter_path(u) + = link_to i(:pencil), edit_admin_newsletter_path(u) = link_to i(:"eye"), admin_newsletter_path(u), :target => "_blank" = link_to i(:"bar-chart"), history_admin_newsletter_path(u) diff --git a/app/views/newsletter_mails/newsletter.html.haml b/app/views/newsletter_mails/newsletter.html.haml index 6ea6337..70d2ce5 100644 --- a/app/views/newsletter_mails/newsletter.html.haml +++ b/app/views/newsletter_mails/newsletter.html.haml @@ -4,6 +4,9 @@ -else - @lien_inscription_forum = link_to(new_forum_forum_user_url(:email => @email),new_forum_forum_user_url(:email => @email)) +=#raw @content.gsub(/\[lien_inscription_forum\]/, @lien_inscription_forum) + +-@content = render(:partial => "public/blocks/block", :object => @newsletter.block) =raw @content.gsub(/\[lien_inscription_forum\]/, @lien_inscription_forum) -if @newsletter.email_from and @newsletter.email_from != "" and @newsletter.email_from != "contact@lepicvert.asso.fr" diff --git a/app/views/portlets/render_public/_imagecontent.html.haml b/app/views/portlets/render_public/_imagecontent.html.haml index 840fbda..aa4c934 100644 --- a/app/views/portlets/render_public/_imagecontent.html.haml +++ b/app/views/portlets/render_public/_imagecontent.html.haml @@ -23,7 +23,7 @@ -else -url ="" --url = "http://"+request.host_with_port+url +-url = "http://"+HOSTNAME+url -style = "" -style = "text-align:center;" if input.alignement == "center" diff --git a/config/routes.rb b/config/routes.rb index 28ffbde..0f4d700 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -151,7 +151,7 @@ Survey::Application.routes.draw do get "forum_user/index" - + resources :download_data_files namespace :forum do root :to => "forum_topics#index", :id => 1 resources :forum_topics do