refinerycms-snippets 0.4.0 → 0.4.1

data/app/controllers/admin/snippets_controller.rb

@@ -3,5 +3,34 @@ module Admin
 
     crudify :snippet, :xhr_paging => true
     
+    def create
+      if (@snippet = Snippet.create(params[:snippet])).valid?
+        (request.xhr? ? flash.now : flash).notice = t(
+          'refinery.crudify.created',
+          :what => "#{@snippet.title}"
+        )
+
+        unless request.xhr?
+          redirect_to (params[:continue_editing] =~ /1/ ? edit_admin_snippet_path(@snippet) : admin_snippets_url)
+        else
+          response = Hash.new
+          response['redirect'] = edit_admin_snippet_path(@snippet) if params[:continue_editing]
+          render :json => response
+        end
+
+      else
+        unless request.xhr?
+          render :action => 'new'
+        else
+          html_snippets = Hash.new
+          html_snippets['flash_container'] = render_to_string(:partial => "/shared/admin/error_messages",
+                                                              :locals => {
+                                                                :object => @snippet,
+                                                                :include_object_name => true
+                                                              })
+          render :json => {'snippets' => html_snippets}
+        end
+      end
+    end
   end
 end

data/app/views/admin/pages/tabs/_snippets_content.html.erb

@@ -1,4 +1,8 @@
+<% if @page.new_record? %>
+<div class="msg alert"><%= t('.please_save_page_before') %></div>
+<% else %>
 <%= render :partial => '/admin/pages/tabs/snippets_field' %>
+<% end %>
 
 <% content_for :stylesheets do %>
   <%= stylesheet_link_tag 'page-snippet-picker' %>

data/app/views/admin/snippets/_form.html.erb

@@ -14,37 +14,26 @@
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
   </div>
+  <br />
   <div class='field'>
-    <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
-      <ul id='page_parts'>
-        <% [:body].each_with_index do |part, part_index| %>
-          <li class='ui-state-default<%= ' ui-state-active' if part_index == 0 %>'>
-            <%= link_to part.to_s.titleize, "##{part}" %>
-          </li>
-        <% end %>
-      </ul>
-
-      <div id='page_part_editors'>
+    <div class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
+      <div>
         <% [:body].each do |part| %>
-          <div class='page_part' id='<%= part %>'>
+          <div>
             <%= f.text_area part, :rows => 20, :class => 'wymeditor widest' -%>
           </div>
         <% end %>
       </div>
     </div>
-  
-  <%= render :partial => "/shared/admin/form_actions",
+
+  <%= render :partial => 'form_actions',
               :locals => {
                 :f => f,
-                :continue_editing => false,
+                :continue_editing => true,
                 :delete_title => t('delete', :scope => 'admin.snippets.snippet'),
                 :delete_confirmation => t('message', :scope => 'shared.admin.delete', :title => @snippet.title)
               } %>
 <% end -%>
 <% content_for :javascripts do %>
-  <script>
-    $(document).ready(function(){
-      page_options.init(false, '', '');
-    });
-  </script>
+
 <% end %>

data/app/views/admin/snippets/_form_actions.html.erb

@@ -0,0 +1,31 @@
+<div class="form-actions">
+  <div class="form-actions-left">
+    <%= hidden_field_tag :continue_editing, 1 %>
+
+    <%= submit_tag t('save', :scope => 'shared.admin.form_actions'),
+      :id => 'save-button',
+      :class => 'wymupdate button no-js-hide' %>
+
+    <%= submit_tag t('save_and_continue_editing', :scope => 'shared.admin.continue_editing'),
+      :id => 'save-continue-button',
+      :class => "wymupdate button" %>
+
+  </div>
+</div>
+<% content_for :javascripts do %>
+<script type="text/javascript">
+  $(document).ready(function () {
+    var save_button = $('#save-button'),
+        save_continue_button = $('#save-continue-button'),
+        continue_input = $('#continue_editing');
+    
+    save_button.bind('click', function () {
+      continue_input.val('0');
+    });
+
+    save_continue_button.bind('click', function () {
+      continue_input.val('1');
+    });
+  });
+</script>
+<% end %>

data/config/locales/en.yml

@@ -18,6 +18,8 @@ en:
         delete: Remove this snippet forever
     pages:
       tabs:
+        snippets_content:
+          please_save_page_before: Please save this page before you can add any snippets.
         snippets_field:
           active: Active
           inactive: Inactive

data/public/stylesheets/page-snippet-picker.css

@@ -27,3 +27,13 @@ a.add-snippet {
 #inactive-snippets ul {
 	background: #fcfcfc;
 }
+
+.msg {
+	margin: 5px 5px 10px;
+	padding: 20px;
+}
+
+.msg.alert {
+	color: #f66;
+	background: #fff;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-snippets
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Marek L.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,8 @@ files:
 - app/controllers/admin/snippets_page_controller.rb
 - app/models/snippet_page.rb
 - app/models/snippet.rb
-- app/views/snippets/show.html.erb
-- app/views/snippets/index.html.erb
 - app/views/admin/snippets/_snippets.html.erb
+- app/views/admin/snippets/_form_actions.html.erb
 - app/views/admin/snippets/edit.html.erb
 - app/views/admin/snippets/_sortable_list.html.erb
 - app/views/admin/snippets/index.html.erb

data/app/views/snippets/index.html.erb

@@ -1,11 +0,0 @@
-<% content_for :body_content_left do %>
-  <ul id="snippets">
-    <% @snippets.each do |snippet| %>
-      <li>
-        <%= link_to snippet.title, snippet_url(snippet) %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
-<%= render :partial => "/shared/content_page" %>

data/app/views/snippets/show.html.erb

@@ -1,33 +0,0 @@
-<% content_for :body_content_title do %>
-  <%= @snippet.title %>
-<% end %>
-
-<% content_for :body_content_left do %>
-  <section>
-    <h1>Title</h1>
-    <p>
-      <%=raw @snippet.title %>
-    </p>
-  </section>
-  <section>
-    <h1>Body</h1>
-    <p>
-      <%=raw @snippet.body %>
-    </p>
-  </section>
-<% end %>
-
-<% content_for :body_content_right do %>
-  <aside>
-    <h2><%= t('.other') %></h2>
-    <ul id="snippets">
-      <% @snippets.each do |snippet| %>
-        <li>
-          <%= link_to snippet.title, snippet_url(snippet) %>
-        </li>
-      <% end %>
-    </ul>
-  </aside>
-<% end %>
-
-<%= render :partial => "/shared/content_page" %>