ergonomie création newsletter

app/controllers/admin/newsletters_controller.rb

@@ -38,6 +38,7 @@ end
   def new
     @h2 = "Creer une newsletter"
     @newsletter = Newsletter.new
+    render :layout => false
   end
 
   def create
@@ -46,8 +47,12 @@ end
     @newsletter = Newsletter.new(params.require(:newsletter).permit!)
   
     if @newsletter.save
+    	per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 15
+    	page = (params[:page] and params[:page] != "") ? params[:page] : 1 
 	
-      redirect_to :action => :index
+   
+       @newsletters= Newsletter.order("created_at DESC").page(page).per(per_page)
+      #redirect_to :action => :index
     else
       render :action => :new
     end
@@ -63,7 +68,7 @@ end
     @newsletter = Newsletter.find(params[:id])
     if @newsletter.update_attributes(params.require(:newsletter).permit!)
       flash[:notice]= "La newsletter à été mise à jour"
-      redirect_to :action => :index
+      
     else
       render :action => :edit
     end

app/views/admin/newsletters/_form.haml

@@ -1,32 +1,18 @@
-=form_for [:admin, @newsletter] do |f|
-	=f.submit "sauvegarder"
-	%p
-		Sujet :
-		=f.text_field :title, :class => "inputText"
+=form_for [:admin, @newsletter], :remote => true do |f|
   
-	%p
-		Sujet :
-		=f.select :email_from, Newsletter::EMAIL_FROMS,:class => "inputText"
+  .content
+    %p
+      Sujet :
+      =f.text_field :title, :class => "inputText"
+    
+    %p
+      Sujet :
+      =f.select :email_from, Newsletter::EMAIL_FROMS,:class => "inputText"
 
 
 
   
-	%p pour ajouter le lien d'inscription pour le forum avec le numéro adhérent ajouter : [lien_inscription_forum]
-	%p
-		=f.text_area :content, :class => "redactor_content", :style => "height:600px;width:100%;max-width:100%"
-	
-	:javascript
-		
-		$('.redactor_content').redactor({
-			
-			fixed: true,
-			lang: 'fr',
-			buttons : ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted','underline','|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'table', 'link', '|','fontcolor', 'backcolor','|', 'horizontalrule'],
-			
-		
-		});
-		
-	
-	=f.submit "sauvegarder"
-	
+    %p pour ajouter le lien d'inscription pour le forum avec le numéro adhérent ajouter : [lien_inscription_forum]
     
+  .actions
+    =f.submit "sauvegarder", :class => "btn btn-primary"

app/views/admin/newsletters/_newsletter.haml

@@ -0,0 +1,23 @@
+%tr
+  %td
+    =newsletter.email_from
+  %td
+    = newsletter.title
+  
+        
+        
+
+  %td{:style => "text-align:right;"}
+    -  if has_permission?('newsletter.send') and newsletter.block
+      =form_tag send_test_admin_newsletter_path(newsletter), :style => "display:inline;" do
+        .input-append{:style => "display:inline-block;margin:2px;"}
+          = text_field_tag :email,"", :class => ""
+          = submit_tag "Envoyer un email de test", :class => "btn btn-default"
+  
+  %td{:style => "width:180px;text-align:right;"}
+    = link_to i(:"trash-o"), [:admin, newsletter], :method => :delete,  :confirm => 'Voulez-vous vraiment supprimer cette newsletter ?'
+    -if newsletter.block
+      = link_to i(:"envelope-o"), select_recipients_admin_newsletter_path(newsletter)
+      = link_to i(:pencil), edit_admin_newsletter_path(newsletter)
+    = link_to i(:"eye"), admin_newsletter_path(newsletter), :target => "_blank"
+    = link_to i(:"bar-chart"), history_admin_newsletter_path(newsletter)

app/views/admin/newsletters/create.js.erb

@@ -0,0 +1,4 @@
+$('#newsletters').html("<%= escape_javascript(render(@newsletters))%>");
+close_pane_hover();
+
+<%= flash_js %>

app/views/admin/newsletters/edit.html.haml

@@ -28,7 +28,7 @@
   
     #menu_item_informations
       %h4
-        Infos sur l'newsletter
+        Infos sur la newsletter
     
     
       .panel#collapseOne{:style => "display:none;"}

app/views/admin/newsletters/index.html.haml

@@ -1,6 +1,6 @@
 
 .right
-  =link_to ic(:plus)+" Créer une newsletter", new_admin_newsletter_path, :class => "btn btn-primary"
+  =link_to ic(:plus)+" Créer une newsletter", new_admin_newsletter_path, :class => "btn btn-primary", :remote => true
 
 %h1 Newsletters
 
@@ -13,31 +13,7 @@
     %th
   
 
-  -for u in @newsletter
-  
-    %tr
-      %td
-        =u.email_from
-      %td
-        = u.title
-      
-            
-            
-
-      %td{:style => "text-align:right;"}
-        -  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 => ""
-              = submit_tag "Envoyer un email de test", :class => "btn btn-default"
-      
-      %td{:style => "width:180px;text-align:right;"}
-        = link_to i(:"trash-o"), [:admin, u], :method => :delete,  :confirm => 'Voulez-vous vraiment supprimer cette newsletter ?'
-        -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)
+  %tbody#newsletters=render @newsletter
         
         
        

app/views/admin/newsletters/new.js.erb

@@ -0,0 +1 @@
+show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",700,900);

app/views/admin/newsletters/update.js.erb

@@ -0,0 +1 @@
+<%= flash_js %>