sibu 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c5d82061f85ff21bd3989f9b12554ed157a9338
-  data.tar.gz: b11f19b5ee199a81cea6dbbd5703916349e01bb0
+  metadata.gz: 3bd4c7f3ddac097c6e3ff1718357d64f3769f886
+  data.tar.gz: c45772f2d3851da0c553d0fb7b76a427fc6fdea6
 SHA512:
-  metadata.gz: 75fe75f7afaa6dd93753f4c11c4106f5dd386244daab9765733ad73651091f6e76e86012ca6209096bba78898659fef9450dfeb3549541c02f8810b5369e9c22
-  data.tar.gz: 7a88ff8ceddec27e47629ddad26c66636670290fbef6e4eb8a581f444b79050ed1678856abe495758b352c12260c40eeb31c7e78a1a959031dcfd2e832a5d60b
+  metadata.gz: 02475b5b1707ec2f4807be144549aa06234050e9f2c34e600d34fcb807c29858a698d4b64697719763911b857aa4087b14ed29b9b62a51441205e418709a39eb
+  data.tar.gz: d9383148391ef403d4cc9de8ec3203853eb7870bc9c6de18ddd6b623d8277e9b505cff40ac738cbe668188175867189a7232eed49532f8c26d72a87e578cfda4

data/app/controllers/sibu/sites_controller.rb

@@ -29,11 +29,12 @@ module Sibu
     end
 
     def edit
+      @next_page = params[:next_page]
     end
 
     def update
       if @site.update(site_params)
-        redirect_to sites_url, notice: "Le site a bien été mis à jour."
+        redirect_to (params[:next_page].blank? ? sites_url : params[:next_page]), notice: "Le site a bien été mis à jour."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."
         render :edit

data/app/views/layouts/sibu/edit_content.html.erb

@@ -58,7 +58,7 @@
         editMode.find(".overlay_bottom").css("top", top + height);
         editMode.find(".overlay_left").css({"height": height, "width": left, "top": top});
         editMode.find(".overlay_right").css({"height": height, "left": left + width, "top": top});
-        editMode.find(".edit_mode_actions").css({"top": (top <= 40 ? (top + height) : (top - 40)), left: left, width: width});
+        editMode.find(".edit_mode_actions").css({"top": (top <= 40 ? (top + height) : (top - 40 - 20)), left: left, width: width});
         editMode.find("#edit_section_msg").text("Modifier la section");
         editMode.show();
         if(!section.data('sb-repeat')) {
@@ -226,6 +226,7 @@
         return height;
     }
 </script>
-<%= yield :scripts %>
+<%= yield :site_scripts %>
+<%= yield :page_scripts %>
 </body>
 </html>

data/app/views/layouts/sibu/site.html.erb

@@ -23,6 +23,7 @@
 
 <%= yield %>
 
-<%= yield :scripts %>
+<%= yield :site_scripts %>
+<%= yield :page_scripts %>
 </body>
 </html>

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

@@ -37,6 +37,7 @@
     <%= f.label :name, 'Police de caractères (corps)' %>
     <%= f.select :secondary_font, secondary_fonts, {prompt: 'Police par défaut'} %>
   </div>
+  <%= hidden_field_tag :next_page, @next_page %>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>

data/app/views/sibu/sites/edit_styles.html.erb

@@ -0,0 +1,9 @@
+<div class="sibu_view">
+  <div class="actions">
+    <%= link_to 'Retour', :back %>
+  </div>
+  <h2>Modifier un site</h2>
+  <div class="sibu_form">
+    <%= render 'form' %>
+  </div>
+</div>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -162,6 +162,7 @@ files:
 - app/views/sibu/sites/_form.html.erb
 - app/views/sibu/sites/destroy.html.erb
 - app/views/sibu/sites/edit.html.erb
+- app/views/sibu/sites/edit_styles.html.erb
 - app/views/sibu/sites/index.html.erb
 - app/views/sibu/sites/new.html.erb
 - app/views/sibu/sites/show.html.erb