push_type_admin 0.2.1 → 0.3.1

data/app/views/push_type/nodes/_form_fields.html.haml

@@ -2,7 +2,7 @@
   .large-8.columns
     .container
       .head
-        .left.btn= link_to ficon(:previous), @node.parent ? push_type.node_nodes_path(@node.parent) : push_type.nodes_path
+        .left.btn= link_to ficon(:previous), node_back_link(@node)
         .title= yield :title
       .body.padded
         .row.title
@@ -30,34 +30,8 @@
   .large-4.columns
     .side-panel{ :'side-panel' => true }
       .padded
-        .meta-table
-          .meta-row{ ng: { class: 'publishDatesVisibility()' } }
-            .key= ficon :calendar, 'Publish'
-            .value.editable{ data: { dropdown: 'publish-date-fields' }} {{ publishedDates() }}
-            #publish-date-fields.f-dropdown.content{ data: { dropdown: { content: true } } }
-              .row.publish-date
-                .columns
-                  = f.label :published_at
-                  = f.datetime_select :published_at, {}, :'node-datetime' => 'published_at'
-              .row.publish-date
-                .columns
-                  = f.label :published_to
-                  = f.datetime_select :published_to, include_blank: true, default: nil
-          = render 'meta_table'
-          
+        = render 'meta_table', f: f
       .submit.text-center
-        = f.hidden_field :status, value: '{{ node.status }}'
-        %button.button.radius.split{ ng: { class: 'saveButtonClass()' } }
-          = ficon :check, "{{ saveButtonText() }}"
-          %span{ data: { dropdown: 'publish-toggle', options: 'align:bottom' } }
-        %ul#publish-toggle.f-dropdown.tiny{ data: { dropdown: { content: true } } }
-          %li
-            %a{ href: '#', node: { status: 'draft' } } Save as draft
-          %li
-            %a{ href: '#', node: { status: 'published' } } Save and publish
-
-        - unless @node.new_record?
-          .delete-link
-            = link_to "Delete #{@node.type.underscore.humanize.downcase}", push_type.node_path(@node), method: 'delete', data: { confirm: { body: 'Deleted content will be moved to the trash. You can restore trashed content later.' } }
+        = render 'form_submit', f: f
 
       

data/app/views/push_type/nodes/_form_submit.html.haml

@@ -0,0 +1,24 @@
+- unless @node.trashed?
+  = f.hidden_field :status, value: '{{ node.status }}'
+  %button.button.radius.split{ ng: { class: 'saveButtonClass()' } }
+    = ficon :check, "{{ saveButtonText() }}"
+    %span{ data: { dropdown: 'publish-toggle', options: 'align:bottom' } }
+  %ul#publish-toggle.f-dropdown.tiny{ data: { dropdown: { content: true } } }
+    %li
+      %a{ href: '#', node: { status: 'draft' } } Save as draft
+    %li
+      %a{ href: '#', node: { status: 'published' } } Save and publish
+
+  - unless @node.new_record?
+    .text-button.alert
+      = link_to "Delete #{@node.type.underscore.humanize.downcase}", push_type.node_path(@node), method: 'delete', data: { confirm: { body: 'Deleted content, and all its child content, will be moved to the trash. You can restore trashed content later.' } }
+
+- else
+  %button.button.radius.secondary= ficon :check, 'Save as trash'
+  .text-button.success
+    - if @node.orphan?
+      %span Orphan. Cannot be restored.
+    - else
+      = link_to "Restore #{ @node.type.underscore.humanize.downcase }", push_type.restore_node_path(@node), method: 'put'
+  .text-button.alert
+    = link_to "Permanently delete #{ @node.type.underscore.humanize.downcase }", push_type.node_path(@node), method: 'delete', data: { confirm: { body: 'This action cannot be undone. All child content will also be permanently deleted.' } }

data/app/views/push_type/nodes/_meta_table.html.haml

@@ -1,8 +1,33 @@
-- if @node.creator
-  .meta-row
-    .key= ficon :torso, 'Author'
-    .value= @node.creator.name
-- if @node.updater && @node.updater != @node.creator
-  .meta-row
-    .key= ficon :torso, 'Updated by'
-    .value= @node.updater
+.meta-table
+  - unless @node.trashed?
+    .meta-row{ ng: { class: 'publishDatesVisibility()' } }
+      .key= ficon :calendar, 'Publish'
+      .value.editable{ data: { dropdown: 'publish-date-fields' }} {{ publishedDates() }}
+      #publish-date-fields.f-dropdown.content{ data: { dropdown: { content: true } } }
+        .row.publish-date
+          .columns
+            = f.label :published_at
+            = f.datetime_select :published_at, {}, :'node-datetime' => 'published_at'
+        .row.publish-date
+          .columns
+            = f.label :published_to
+            = f.datetime_select :published_to, include_blank: true, default: nil
+
+  - if @node.creator
+    .meta-row
+      .key= ficon :torso, 'Author'
+      .value= @node.creator.name
+
+  - if @node.updater && @node.updater != @node.creator
+    .meta-row
+      .key= ficon :torso, 'Updated by'
+    .value= @node.updater.name
+    
+  - if @node.trashed?
+    .meta-row
+      .key= ficon :calendar, 'Deleted'
+      .value= l @node.deleted_at, format: :short
+
+
+
+

data/app/views/push_type/nodes/edit.html.haml

@@ -1,6 +1,10 @@
 - title "Edit #{ @node.type.underscore.humanize.downcase }"
-- for node in @node.ancestors.reverse
-  - breadcrumbs.add node.title, push_type.node_nodes_path(node)
+
+- if @node.trashed?
+  - breadcrumbs.add 'Trash', push_type.trash_nodes_path
+-else
+  - for node in @node.ancestors.reverse
+    - breadcrumbs.add node.title, push_type.node_nodes_path(node)
 - breadcrumbs.add @node.title, push_type.edit_node_path(@node)
 
 = form_for @node, url: push_type.node_path(@node) do |f|

data/app/views/push_type/nodes/index.html.haml

@@ -4,54 +4,56 @@
   - for node in @parent.self_and_ancestors.reverse
     - breadcrumbs.add node.title, push_type.node_nodes_path(node)
 
-- if !@parent && @nodes.empty?
-  .columns
-    .empty-default
-      %h2 No content
-      %p A website without any content makes for a pretty poor user experience. Better sort this one out now and create your first page.
-      = render 'new_node_button'
-
-- else
-  .large-8.columns
-    %section.container
-      .head
-        - if @parent
-          .left.btn= link_to ficon(:previous), @parent.root? ? push_type.nodes_path : push_type.node_nodes_path(@parent.parent)
-          .title= @parent.title
-        - else
-          .title Content
-      .body
-        - if @nodes.empty?
-          .empty-default
-            %h3 No content
+.large-8.columns
+  %section.container
+    .head
+      - if @parent
+        .left.btn= link_to ficon(:previous), @parent.root? ? push_type.nodes_path : push_type.node_nodes_path(@parent.parent)
+        .title= @parent.title
+      - else
+        .title Content
+        
+    .body
+      - if @nodes.empty?
+        .empty-default
+          %h3 No content
+          - if !@parent
+            %p A website without any content makes for a pretty poor user experience. Better sort this one out now and create your first page.
+            = render 'new_node_button'
+          - else
             %p There is no content in this section yet.
-        - else
-          %ul.node-list{ class: ('sortable' if !@parent || @parent.sortable?) }
-            - for node in @nodes.all
-              %li.node-list-item{ data: { id: node.id } }
-                = link_to push_type.edit_node_path(node) do
-                  .title= node.title
-                  .meta
-                    %span.label.secondary.radius= node.type.to_s.underscore.humanize
-                    %span.label.radius{ class: node.published? ? 'success' : 'warning' }= node.status.titlecase
-                    %time Updated #{ time_ago_in_words node.updated_at } ago
+      - else
+        %ul.node-list{ class: ('sortable' if !@parent || @parent.sortable?) }
+          - for node in @nodes.all
+            %li.node-list-item{ data: { id: node.id } }
+              = link_to push_type.edit_node_path(node) do
+                .title= node.title
+                .meta
+                  %span.label.secondary.radius= node.type.to_s.underscore.humanize
+                  %span.label.radius{ class: node.published? ? 'success' : 'warning' }= node.status.titlecase
+                  - if node.published?
+                    %time Published #{ l node.published_at.to_date, format: :short }
                     \-
-                    %span= pluralize node.child_ids.size, 'child'
-                .buttons
-                  = link_to ficon(:magnifying_glass), '#'
-                  - unless node.child_nodes.empty?
-                    = link_to ficon(:folder), push_type.node_nodes_path(node)
-                - if !@parent || @parent.sortable?
-                  .handle
+                  %time Updated #{ time_ago_in_words node.updated_at } ago
+                  \-
+                  %span= pluralize node.children.not_trash.count, 'child'
+              .buttons
+                %span= ficon(:magnifying_glass)
+                = link_to ficon(:folder), push_type.node_nodes_path(node) unless node.child_nodes.empty?
+              - if !@parent || @parent.sortable?
+                .handle
 
-  .large-4.columns
-    .side-panel{ :'side-panel' => true }
-      .padded
-        .pagination-centered
-          .pagination-stats
-            = pluralize @nodes.total_count, 'item'
-            - unless @nodes.total_count == 0
-              \- Page #{ @nodes.current_page } of #{ @nodes.total_pages }
-          = paginate @nodes
-      .cta.text-center
-        = render 'new_node_button'
+.large-4.columns
+  .side-panel{ :'side-panel' => true }
+    .padded
+      .pagination-centered
+        .pagination-stats
+          = pluralize @nodes.total_count, 'item'
+          - unless @nodes.total_count == 0
+            \- Page #{ @nodes.current_page } of #{ @nodes.total_pages }
+        = paginate @nodes
+    .cta.text-center
+      = render 'new_node_button'
+      - if @nodes.current_page == 1
+        .text-button
+          = link_to ficon(:trash, 'Trash bin'), push_type.trash_nodes_path

data/app/views/push_type/nodes/trash.html.haml

@@ -0,0 +1,48 @@
+- title 'Trash'
+
+- breadcrumbs.add 'Trash', push_type.trash_nodes_path
+
+- if @nodes.empty?
+  .columns
+    .empty-default
+      %h2 No trash
+      = link_to ficon(:arrow_left, 'Back to content'), push_type.nodes_path, class: 'button radius secondary'
+
+- else
+  .large-8.columns
+    %section.container
+      .head
+        .left.btn= link_to ficon(:previous), push_type.nodes_path
+        .title Trash
+      .body
+        %ul.node-list
+          - for node in @nodes.all
+            %li.node-list-item{ data: { id: node.id } }
+              = link_to push_type.edit_node_path(node) do
+                .title= node.title
+                .meta
+                  %span.label.secondary.radius= node.type.to_s.underscore.humanize
+                  %span.label.radius.alert Trashed
+                  - if node.orphan?
+                    %span.label.radius.alert Orphan
+                  %time Deleted #{ time_ago_in_words node.deleted_at } ago
+                  \-
+                  %span= pluralize node.children.count, 'child'
+              .buttons
+                - if node.orphan?
+                  %span= ficon(:loop)
+                - else
+                  = link_to ficon(:loop), push_type.restore_node_path(node), method: 'put', class: 'success'
+                = link_to ficon(:x), push_type.node_path(node), method: 'delete', class: 'alert', data: { confirm: { body: 'This action cannot be undone. All child content will also be permanently deleted.' } }
+
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .padded
+        .pagination-centered
+          .pagination-stats
+            = pluralize @nodes.total_count, 'item'
+            - unless @nodes.total_count == 0
+              \- Page #{ @nodes.current_page } of #{ @nodes.total_pages }
+          = paginate @nodes
+      .cta.text-center
+        = link_to ficon(:trash, 'Empty trash'), push_type.trash_nodes_path, method: 'delete', class: 'button radius alert', data: { confirm: true }

data/app/views/push_type/users/_form.html.haml

@@ -27,6 +27,8 @@
           %button.button.success.radius= ficon :check, 'Create user'
         - else
           %button.button.radius= ficon :check, 'Update user'
-          .delete-link= link_to 'Delete user', push_type.user_path(@user), method: 'delete', data: { confirm: true }
+          - unless @user == push_type_user
+            .text-button.alert
+              = link_to 'Delete user', push_type.user_path(@user), method: 'delete', data: { confirm: true }
             
             

data/config/routes.rb

@@ -1,12 +1,26 @@
 PushType::Core::Engine.routes.draw do
 
   resources :nodes, except: :show do
+    collection do
+      get 'trash'
+      delete 'trash' => 'nodes#empty'
+    end
+    member do
+      post 'position'
+      put 'restore'
+    end
     resources :nodes, only: [:index, :new, :create]
-    post 'position', on: :member
   end
 
   resources :assets, except: :show, path: 'media' do
-    post 'upload', on: :collection
+    collection do
+      post 'upload'
+      get 'trash'
+      delete 'trash' => 'assets#empty'
+    end
+    member do
+      put 'restore'
+    end
   end
 
   resources :users, except: :show

data/lib/push_type/admin/engine.rb

@@ -16,6 +16,38 @@ module PushType
         push_type/admin_assets.css 
         push_type/admin_assets.js
       )
+
+      initializer 'push_type_admin.menus' do
+        PushType.menu :main do
+          element :ul
+          html_options class: 'inline-list'
+
+          item :content do
+            link    { push_type.nodes_path }
+            active  { request.fullpath.match %r{^#{ push_type.nodes_path }} }
+          end
+          item :media do
+            link    { push_type.assets_path }
+            active  { request.fullpath.match %r{^#{ push_type.assets_path }} }
+          end
+          item :users do
+            link    { push_type.users_path }
+            active  { request.fullpath.match %r{^#{ push_type.users_path }} }
+          end
+        end
+
+        PushType.menu :utility do
+          element :ul
+          html_options class: 'inline-list right'
+
+          item :info do
+            text    { ficon(:info) }
+            link    { push_type.info_path }
+            link_options data: { :'reveal-id' => 'reveal-ajax', :'reveal-ajax' => true }
+          end
+        end
+      end
+
     end
   end
 end

data/test/controllers/push_type/assets_controller_test.rb

@@ -15,6 +15,16 @@ module PushType
       it { assigns[:assets].size.must_equal 5 }
     end
 
+    describe 'GET #trash' do
+      before do
+        2.times { FactoryGirl.create :asset }
+        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        get :trash
+      end
+      it { response.must_render_template 'trash' }
+      it { assigns[:assets].size.must_equal 3 }
+    end
+
     describe 'GET #new' do
       before { get :new }
       it { response.must_render_template 'new' }
@@ -84,5 +94,25 @@ module PushType
       it { asset.reload.must_be :trashed? }
     end
 
+    describe 'PUT #restore' do
+      before do
+        asset.trash!
+        put :restore, id: asset.id
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { asset.reload.wont_be :trashed? }
+    end
+
+    describe 'DELETE #empty' do
+      before do
+        3.times { FactoryGirl.create :asset, deleted_at: Time.zone.now }
+        delete :empty
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { PushType::Asset.trashed.must_be :empty? }
+    end
+
   end
 end

data/test/controllers/push_type/nodes_controller_test.rb

@@ -15,6 +15,16 @@ module PushType
       it { assigns[:nodes].size.must_equal 5 }
     end
 
+    describe 'GET #trash' do
+      before do
+        2.times { FactoryGirl.create :node }
+        3.times { FactoryGirl.create :node, deleted_at: Time.zone.now }
+        get :trash
+      end
+      it { response.must_render_template 'trash' }
+      it { assigns[:nodes].size.must_equal 3 }
+    end
+
     describe 'GET #new' do
       before { get :new, kind: 'page' }
       it { response.must_render_template 'new' }
@@ -62,10 +72,21 @@ module PushType
     end
 
     describe 'DELETE #destroy' do
-      before { delete :destroy, id: node.id }
-      it { response.must_respond_with :redirect }
-      it { flash[:notice].must_be :present? }
-      it { node.reload.must_be :trashed? }
+      describe 'with untrashed node' do
+        before { delete :destroy, id: node.id }
+        it { response.must_respond_with :redirect }
+        it { flash[:notice].must_be :present? }
+        it { node.reload.must_be :trashed? }
+      end
+      describe 'with trashed node' do
+        before do
+          node.trash!
+          delete :destroy, id: node.id
+        end
+        it { response.must_respond_with :redirect }
+        it { flash[:notice].must_be :present? }
+        it { proc { node.reload }.must_raise ActiveRecord::RecordNotFound }
+      end
     end
 
     describe 'POST #position' do
@@ -97,5 +118,25 @@ module PushType
       end
     end
 
+    describe 'PUT #restore' do
+      before do
+        node.trash!
+        put :restore, id: node.id
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { node.reload.wont_be :trashed? }
+    end
+
+    describe 'DELETE #empty' do
+      before do
+        3.times { FactoryGirl.create :node, deleted_at: Time.zone.now }
+        delete :empty
+      end
+      it { response.must_respond_with :redirect }
+      it { flash[:notice].must_be :present? }
+      it { PushType::Node.trashed.must_be :empty? }
+    end
+
   end
 end