sibu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5cda6f4ef051d7e724abb03090d7cb7057edba
-  data.tar.gz: 0d768bddd8641ec038babb501e9d7a9b78f1e60b
+  metadata.gz: b7888abe9ddb32391de3695fe43f06a5e4d6cb95
+  data.tar.gz: e14e12d53f591b8c2ca71599de672d56e8422d92
 SHA512:
-  metadata.gz: 473a8590fe208a18be9f598bc0f5d3cbbdb712d631c135b71e95e65547999dd4da57e9d9b9c2a9027e7a5a072d63704727ad0e060d19793e57295e675664e8f3
-  data.tar.gz: 80adac713e3c3bedf4da2a37a3941403fc546b434b6997e24dc2262388fb128b4f601cc3b4a623f29365e9bd8adbfe0727263a0383746f78f50f2d34e294acea
+  metadata.gz: 5a06716af55ec6f6c0a12dcc4686bc7e549d0d13d02652c5b9b53f8626cfb054e22001629fe089f3dd382d3cc67c96eac03e330759584239ca64833103862408
+  data.tar.gz: 6e0de7ab878681deaa8f35e3bcc5649511a52f986ea6787bf7b4e1ace4d4bdc06d1e2bfc0c6b70dbf0e7efc109430b25f7fb94040d99664b622a1f136ef35f66

data/app/controllers/sibu/images_controller.rb

@@ -2,7 +2,8 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class ImagesController < ApplicationController
-    before_action :set_site, only: [:index, :new, :create, :edit]
+    before_action :set_site, only: [:index, :new, :create, :edit, :update, :destroy]
+    before_action :set_image, only: [:edit, :update, :destroy]
     before_action :set_edition_context, only: [:new, :create]
 
     def index
@@ -16,7 +17,7 @@ module Sibu
     def create
       @image = Sibu::Image.new(image_params)
       if @image.save
-        if @page_id && @section_id && @element_id && @size
+        if !@page_id.blank? && !@section_id.blank? && !@element_id.blank? && !@size.blank?
           entity = @entity_type == 'site' ? @site : Sibu::Page.find(@page_id)
           ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
           elt = entity.update_element(*ids, {"id" => @img_id, "src" => @image.file_url(@size.to_sym), "alt" => @image.alt})
@@ -42,9 +43,17 @@ module Sibu
     end
 
     def update
+      if @image.update(image_params)
+        redirect_to site_images_url(@site.id), notice: "L'image a bien été mise à jour."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement de l'image."
+        render :index
+      end
     end
 
     def destroy
+      @image.destroy
+      redirect_to site_images_url(@site.id), notice: "L'image a bien été supprimée."
     end
 
     private
@@ -53,6 +62,10 @@ module Sibu
       @site = Sibu::Site.find(params[:site_id])
     end
 
+    def set_image
+      @image = Sibu::Image.find(params[:id])
+    end
+
     def set_edition_context
       @page_id = params[:page_id]
       @entity_type = params[:entity_type]

data/app/views/sibu/images/_edit_form.html.erb

@@ -0,0 +1,17 @@
+<div class="sibu_image_preview">
+  <%= image_tag @image.file_url(:medium) %>
+</div>
+<%= form_for([@site, @image]) do |f| %>
+  <div class="sibu_field">
+    <%= f.label :alt, "Légende / texte alternatif" %>
+    <div>
+      <%= f.text_field :alt %>
+      <small>Renseignez un texte décrivant l'image</small>
+    </div>
+  </div>
+  <%= f.hidden_field :site_id %>
+  <div class="sibu_actions">
+    <%= f.submit 'Mettre à jour' %>
+    <%= link_to 'Supprimer', site_image_path(@image.site_id, @image.id), method: :delete, data: {confirm: "Supprimer l'image ?", disable_with: "Suppression en cours..."} %>
+  </div>
+<% end %>

data/app/views/sibu/images/_form.html.erb

@@ -22,7 +22,7 @@
   <%= hidden_field_tag :img_id, @img_id %>
   <%= hidden_field_tag :size, @size %>
   <div class="sibu_actions">
-    <%= f.submit 'Valider' %>
+    <%= f.submit 'Valider', data: {disable_with: "Téléchargement de l'image en cours..."} %>
     <%= link_to 'Annuler', :back %>
   </div>
 <% end %>

data/app/views/sibu/images/edit.js.erb

@@ -0,0 +1,3 @@
+$(".sibu_edit_image").html("<%= j(render 'edit_form') %>");
+$(".sibu_image").removeClass("selected");
+$("<%= "#sibu_image_#{@image.id}" %>").addClass("selected");

data/app/views/sibu/images/index.html.erb

@@ -3,8 +3,11 @@
     <%= link_to 'Télécharger une image', new_site_image_path(@site.id) %> <%= link_to 'Retour', :back %>
   </div>
   <h2>Images du site "<%= @site.name %>"</h2>
-  <% @images.each do |image| %>
-    <div class="sibu_image"><%= image_tag image.file_url(:small) %></div>
-  <% end %>
+  <div class="sibu_images">
+    <% @images.each do |image| %>
+      <%= link_to image_tag(image.file_url(:small)), edit_site_image_path(@site.id, image.id), class: 'sibu_image', id: "sibu_image_#{image.id}", remote: true %>
+    <% end %>
+  </div>
+  <div class="sibu_edit_image">Sélectionnez une image pour voir ses informations.</div>
 </div>
 

data/app/views/sibu/pages/index.html.erb

@@ -20,8 +20,8 @@
         <td><%= l p.updated_at %></td>
         <td colspan="2">
           <%= link_to 'Voir', site_page_path(@site.id, p), target: '_blank' %> |
-          <%= link_to 'Editer', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
-          <%= link_to 'Modifier', edit_site_page_path(@site.id, p) %> |
+          <%= link_to 'Modifier', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
+          <%= link_to 'Paramétrer', edit_site_page_path(@site.id, p) %> |
           <%= link_to 'Supprimer', site_page_path(@site.id, p), method: :delete, data: {confirm: "Supprimer la page \"#{p.name}\" ?"} %>
         </td>
       </tr>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -152,8 +152,9 @@ files:
 - app/views/layouts/sibu/application.html.erb
 - app/views/layouts/sibu/edit_content.html.erb
 - app/views/layouts/sibu/site.html.erb
+- app/views/sibu/images/_edit_form.html.erb
 - app/views/sibu/images/_form.html.erb
-- app/views/sibu/images/edit.html.erb
+- app/views/sibu/images/edit.js.erb
 - app/views/sibu/images/index.html.erb
 - app/views/sibu/images/new.html.erb
 - app/views/sibu/images/show.html.erb

data/app/views/sibu/images/edit.html.erb

@@ -1,2 +0,0 @@
-<h1>Images#edit</h1>
-<p>Find me in app/views/sibu/images/edit.html.erb</p>