push_type_admin 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cec54e8a19328fc15f4f90b398174ee4d777983
-  data.tar.gz: bbee5c519952e45ccf2428229bf8ae6e83f40423
+  metadata.gz: e22728f8712a2a71b27522c4519c2974537ac90b
+  data.tar.gz: 4f9e1d5c5287432aadbc2930721e917ca07ee706
 SHA512:
-  metadata.gz: 385f8ef3372a4986b36ae8a7968452d56c4ad375e0442e9449013336b96b10f8f84ba083ba640354f650daf3fb7797a37d9639a8314e3dc1c358125d21b7b71a
-  data.tar.gz: 0507b19e7ed26d08166c4db4fc57b7f881817923a1a92470b62115748ff7fa513c927598f6cf1321b7384e50c8a9e95bfe0739383814399e1e74223f18aa8e15
+  metadata.gz: b1bc3aeeb6d92be4ab25d0857954c7db2b9f47f01b5bb12b8b70e9ba5653bed1bd504cb7a6c5b6f62ab5dea8103ee3195787bd8c3fd9bdd1859bfde87d5f738c
+  data.tar.gz: b3ee2f5c7481296dc8e23bf51bc1faa2ea9db3b86c585eb57d27430a41fa7cc7f21e9cc6136a298386ac03ab70b89b5e07e1b710462c8ea03e85f68430e8b061

data/app/assets/javascripts/push_type/assets.js.coffee

@@ -26,9 +26,6 @@
   $scope.saveButtonText = ->
     if $scope.asset['new_record?'] then 'Upload file' else 'Update media'
 
-  $scope.uploadedDate = ->
-    moment($scope.asset.created_at).format('Do MMM YYYY, h:mma')
-
   $scope.afterUpload = (asset) ->
     $scope.asset = asset
 

data/app/assets/stylesheets/push_type/admin.scss

@@ -101,10 +101,16 @@ table {
       width:            rem-calc(40);
       line-height:      rem-calc(40);
       text-align:       center;
-      border-right:     1px solid $crumb-border-color;
+      
       a {
         @extend %block-link-bg;
       }
+      &.left {
+        border-right:   1px solid $crumb-border-color;
+      }
+      &.right {
+        border-left:    1px solid $crumb-border-color;
+      }
     }
     .title {
       display:          inline;
@@ -180,14 +186,25 @@ table {
     line-height:        rem-calc(40);
     text-align:         center;
     border-left:        1px solid $crumb-border-color;
-    a {
-      @extend %block-link-bg;
+    a, span {
+      display:          block;
       width:            100%;
       height:           rem-calc(40);
+      color:            $gainsboro;
       &:first-child {
         border-bottom:  1px solid $crumb-border-color;
       }
     }
+    a {
+      @extend %block-link-bg;
+      color:            $primary-color;
+      &.alert {
+        color:          $alert-color;
+      }
+      &.success {
+        color:          $success-color;
+      }
+    }
   }
   .handle {
     position:           absolute;
@@ -318,10 +335,17 @@ table {
       margin:           0;
     }
   }
-  .delete-link {
+  .text-button {
     text-align:         center;
     margin-top:         rem-calc(20);
+    color:              $aluminum;
     a {
+      color:            $primary-color;
+    }
+    &.success a {
+      color:            $success-color;
+    }
+    &.alert a {
       color:            $alert-color;
     }
   }
@@ -356,7 +380,7 @@ table {
     display:            table-cell;
   }
   .key {
-    width:              22%;
+    width:              25%;
     padding-right:      rem-calc(10);
   }
   .value {

data/app/controllers/push_type/admin_controller.rb

@@ -3,6 +3,7 @@ module PushType
 
     layout 'push_type/admin'
     before_filter :initial_breadcrumb
+    helper_method :push_type_user
 
     def info
       render layout: false

data/app/controllers/push_type/assets_controller.rb

@@ -4,12 +4,16 @@ module PushType
   class AssetsController < AdminController
 
     before_filter :build_asset, only: [:new, :create, :upload]
-    before_filter :load_asset,  only: [:edit, :update, :destroy]
+    before_filter :load_asset,  only: [:edit, :update, :destroy, :restore]
 
     def index
       @assets = PushType::Asset.not_trash.page(params[:page]).per(20)
     end
 
+    def trash
+      @assets = PushType::Asset.trashed.page(params[:page]).per(20)
+    end
+
     def new
     end
 
@@ -47,8 +51,26 @@ module PushType
     end
 
     def destroy
-      @asset.trash!
-      flash[:notice] = 'Media trashed.'
+      if @asset.trashed?
+        @asset.destroy
+        flash[:notice] = 'Media permanently deleted.'
+        redirect_to push_type.trash_assets_path
+      else
+        @asset.trash!
+        flash[:notice] = 'Media trashed.'
+        redirect_to push_type.assets_path
+      end
+    end
+
+    def restore
+      @asset.restore!
+      flash[:notice] = 'Media successfully restored.'
+      redirect_to push_type.assets_path
+    end
+
+    def empty
+      PushType::Asset.trashed.destroy_all
+      flash[:notice] = 'Trash successfully emptied.'
       redirect_to push_type.assets_path
     end
 

data/app/controllers/push_type/nodes_controller.rb

@@ -4,12 +4,16 @@ module PushType
   class NodesController < AdminController
 
     before_filter :build_node,  only: [:new, :create]
-    before_filter :load_node,   only: [:edit, :update, :destroy, :position]
+    before_filter :load_node,   only: [:edit, :update, :destroy, :restore, :position]
 
     def index
       @nodes = node_scope.not_trash.page(params[:page]).per(30)
     end
 
+    def trash
+      @nodes = PushType::Node.all.trashed.page(params[:page]).per(30).reorder(deleted_at: :desc)
+    end
+
     def new
     end
 
@@ -35,9 +39,15 @@ module PushType
     end
 
     def destroy
-      @node.trash!
-      flash[:notice] = "#{ @node.type } trashed."
-      redirect_to redirect_path
+      if @node.trashed?
+        @node.destroy
+        flash[:notice] = "#{ @node.type } permanently deleted."
+        redirect_to redirect_path
+      else
+        @node.trash!
+        flash[:notice] = "#{ @node.type } trashed."
+        redirect_to redirect_path(true)
+      end
     end
 
     def position
@@ -48,6 +58,18 @@ module PushType
       end
     end
 
+    def restore
+      @node.restore!
+      flash[:notice] = "#{ @node.type } successfully restored."
+      redirect_to redirect_path
+    end
+
+    def empty
+      PushType::Node.trashed.destroy_all
+      flash[:notice] = 'Trash successfully emptied.'
+      redirect_to push_type.nodes_path
+    end
+
     private
 
     def node_scope
@@ -73,8 +95,14 @@ module PushType
       params.fetch(@node.type.underscore.to_sym, {}).permit(*fields)
     end
 
-    def redirect_path
-      @node.root? ? push_type.nodes_path : push_type.node_nodes_path(@node.parent_id)
+    def redirect_path(skip_trash = false)
+      if @node.trashed? && !skip_trash
+        push_type.trash_nodes_path
+      elsif @node.root?
+        push_type.nodes_path
+      else
+        push_type.node_nodes_path(@node.parent_id)
+      end
     end
 
     def initial_breadcrumb

data/app/helpers/push_type/assets_helper.rb

@@ -25,5 +25,13 @@ module PushType
       "push_type/icon-file-#{ asset.kind }.png"
     end
 
+    def asset_back_link(asset)
+      if asset.trashed?
+        push_type.trash_assets_path
+      else
+        push_type.assets_path
+      end
+    end
+
   end
 end

data/app/helpers/push_type/nodes_helper.rb

@@ -11,5 +11,15 @@ module PushType
       end
     end
 
+    def node_back_link(node)
+      if node.trashed?
+        push_type.trash_nodes_path
+      elsif node.root?
+        push_type.nodes_path
+      else
+        push_type.node_nodes_path(node.parent)
+      end
+    end
+
   end
 end

data/app/views/layouts/push_type/admin.html.erb

@@ -7,6 +7,7 @@
   <%= javascript_include_tag 'vendor/modernizr' %>
   <%= javascript_include_tag 'push_type/admin', 'push_type/admin_assets' %>
   <%= stylesheet_link_tag    'push_type/admin', 'push_type/admin_assets', '//fonts.googleapis.com/css?family=Lato:300,300italic,400,700', media: 'all' %>
+  <%= favicon_link_tag 'push_type/pushtype-favicon.png' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
@@ -14,21 +15,13 @@
   <header class="header" role="banner">
     <div class="row">
       <div class="small-4 medium-3 large-2 columns">
-        <%= link_to image_tag('push_type/pushtype-logo.png', alt: 'PushType'), push_type.root_path %>
+        <%= link_to image_tag('push_type/pushtype-logo.svg', size: '140x26', alt: 'PushType'), push_type.root_path %>
       </div>
       <nav class="small-4 medium-6 large-8 columns">
-        <ul class="inline-list">
-          <%= content_tag :li, link_to('Content', push_type.nodes_path), class: 'active' %>
-          <%= content_tag :li, link_to('Media', push_type.assets_path) %>
-          <%= content_tag :li, link_to('Users', push_type.users_path) %>
-        </ul>
+        <%= render_menu(:main) %>
       </nav>
       <nav class="small-4 medium-3 large-2 columns">
-        <ul class="inline-list right">
-          <%= content_tag :li, link_to(ficon(:info), push_type.info_path, data: { :'reveal-id' => 'reveal-ajax', :'reveal-ajax' => true }) %>
-          <%= content_tag :li, link_to(ficon(:widget), push_type.edit_profile_path) rescue nil %>
-          <%= content_tag :li, link_to(ficon(:power), push_type.destroy_user_session_path, method: 'delete') rescue nil %>
-        </ul>
+        <%= render_menu(:utility) %>
       </nav>
     </div>
   </header>  

data/app/views/push_type/admin/info.html.haml

@@ -1,4 +1,4 @@
-%p.text-center= image_tag 'push_type/pushtype-logo.png', alt: 'PushType'
+%p.text-center= image_tag 'push_type/pushtype-logo.svg', size: '140x26', alt: 'PushType'
 
 %p PushType is an open source content management system for Ruby on Rails, developed and maintained by #{ link_to 'Push Code Ltd', 'http://www.pushcode.com' }.
 

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

@@ -4,7 +4,7 @@
     .large-8.columns
       .container
         .head
-          .left.btn= link_to ficon(:previous), push_type.assets_path
+          .left.btn= link_to ficon(:previous), asset_back_link(@asset)
           .title= yield :title
         .body.padded
           .row.asset-upload
@@ -30,9 +30,6 @@
                   %tr
                     %th Content type
                     %td {{ asset.mime_type }}
-                  %tr
-                    %th Uploaded
-                    %td {{ uploadedDate() }}
           .row.string
             .columns
               = f.label :description
@@ -41,10 +38,7 @@
     .large-4.columns
       .side-panel{ :'side-panel' => true }
         .padded
-          .meta-table
+          = render 'meta_table'
         .submit.text-center
-          %button.button.radius{ ng: { class: 'saveButtonClass()' } }
-            = ficon :check, '{{ saveButtonText() }}'
-          - unless @asset.new_record?
-            .delete-link= link_to 'Delete media', push_type.asset_path(@asset), method: 'delete', data: { confirm: { body: 'Deleted media will be moved to the trash. You can restore trashed media later.' } }
+          = render 'form_submit'
               

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

@@ -0,0 +1,13 @@
+- unless @asset.trashed?
+  %button.button.radius{ ng: { class: 'saveButtonClass()' } }
+    = ficon :check, '{{ saveButtonText() }}'
+  - unless @asset.new_record?
+    .text-button.alert
+      = link_to 'Delete media', push_type.asset_path(@asset), method: 'delete', data: { confirm: { body: 'Deleted media will be moved to the trash. You can restore trashed media later.' } }
+
+- else
+  %button.button.radius.secondary= ficon :check, 'Save as trash'
+  .text-button.success
+    = link_to 'Restore media', push_type.restore_asset_path(@asset), method: 'put'
+  .text-button.alert
+    = link_to 'Permanently delete media', push_type.asset_path(@asset), method: 'delete', data: { confirm: true }

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

@@ -0,0 +1,15 @@
+.meta-table
+  - unless @asset.new_record?
+    .meta-row
+      .key= ficon :calendar, 'Uploaded'
+      .value= l @asset.created_at, format: :short
+
+  - if @asset.uploader
+    .meta-row
+      .key= ficon :torso, 'Uploader'
+      .value= @asset.uploader.name
+
+  - if @asset.trashed?
+    .meta-row
+      .key= ficon :calendar, 'Deleted'
+      .value= l @asset.deleted_at, format: :short

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

@@ -1,4 +1,7 @@
 - title 'Edit media'
+
+- if @asset.trashed?
+  - breadcrumbs.add 'Trash', push_type.trash_assets_path
 - breadcrumbs.add @asset.description_or_file_name, push_type.edit_asset_path(@asset)
 
 = render 'form'

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

@@ -1,34 +1,34 @@
 - title 'Media'
 
-- if @assets.empty?
-  .columns
-    .empty-default{ ng: { hide: 'assetCount() > 0' } }
-      %h2 No uploads
-      %p Upload images, documents, videos. Get started by uploading your first file.
-      = link_to ficon(:plus, 'New upload'), push_type.new_asset_path, class: 'button radius success'
+%div{ ng: { controller: 'AssetListCtrl', init: "assets=#{ assets_array(@assets).to_json }; assetUrl='#{ push_type.edit_asset_path('~id') }'" } }
+  .large-8.columns
+    - if @assets.empty?
+      .empty-default{ ng: { hide: 'assetCount() > 0' } }
+        %h2 No uploads
+        %p Upload images, documents, videos. Get started by uploading your first file.
+        = link_to ficon(:plus, 'New upload'), push_type.new_asset_path, class: 'button radius success'
 
-- else
-  %div{ ng: { controller: 'AssetListCtrl', init: "assets=#{ assets_array(@assets).to_json }; assetUrl='#{ push_type.edit_asset_path('~id') }'" } }
-    .large-8.columns
-      %section
-        %ul.asset-list.small-block-grid-2.medium-block-grid-4
-          %li{ ng: { repeat: 'asset in assets' } }
-            %article.asset-list-item
-              %a{ ng: { href: '{{ editUrl(asset) }}' } }
-                .preview
-                  %img{ alt: '{{ asset.file_name }}', ng: { src: '{{ asset.preview_thumb_url }}' } }
-                .title {{ asset.description_or_file_name }}
+    %section
+      %ul.asset-list.small-block-grid-2.medium-block-grid-4
+        %li{ ng: { repeat: 'asset in assets' } }
+          %article.asset-list-item
+            %a{ ng: { href: '{{ editUrl(asset) }}' } }
+              .preview
+                %img{ alt: '{{ asset.file_name }}', ng: { src: '{{ asset.preview_thumb_url }}' } }
+              .title {{ asset.description_or_file_name }}
 
-    .large-4.columns
-      .side-panel{ :'side-panel' => true }
-        .padded
-          .pagination-centered
-            .pagination-stats {{ assetCount() }} items - Page #{ @assets.current_page } of #{ @assets.total_pages }
-            = paginate @assets
-        .cta.text-center
-          = link_to ficon(:plus, 'New upload'), push_type.new_asset_path, class: 'button radius success'
-          - if @assets.current_page == 1
-            .asset-upload
-              .dropzone{ asset: { upload: push_type.upload_assets_path, maxfiles: 10 } }
-                .prompt Drag files to quickly upload them…
-                .icon= ficon(:upload_cloud)
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .padded
+        .pagination-centered
+          .pagination-stats {{ assetCount() }} items - Page #{ @assets.current_page } of #{ @assets.total_pages }
+          = paginate @assets
+      .cta.text-center
+        = link_to ficon(:plus, 'New upload'), push_type.new_asset_path, class: 'button radius success'
+        - if @assets.current_page == 1
+          .asset-upload
+            .dropzone{ asset: { upload: push_type.upload_assets_path, maxfiles: 10 } }
+              .prompt Drag files to quickly upload them…
+              .icon= ficon(:upload_cloud)
+          .text-button
+            = link_to ficon(:trash, 'Trash bin'), push_type.trash_assets_path

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

@@ -0,0 +1,35 @@
+- title 'Trash'
+
+- breadcrumbs.add 'Trash', push_type.trash_assets_path
+
+- if @assets.empty?
+  .columns
+    .empty-default
+      %h2 No trash
+      = link_to ficon(:arrow_left, 'Back to media'), push_type.assets_path, class: 'button radius secondary'
+
+- else
+  %div
+    .large-8.columns
+      %section
+        %ul.asset-list.small-block-grid-2.medium-block-grid-4
+          - for asset in @assets
+            %li
+              %article.asset-list-item
+                = link_to push_type.edit_asset_path(asset) do
+                  .preview
+                    = image_tag asset_preview_thumb_url(asset), alt: asset.file_name
+                  .title= asset.description_or_file_name
+
+    .large-4.columns
+      .side-panel{ :'side-panel' => true }
+        .padded
+          .pagination-centered
+            .pagination-stats
+            = pluralize @assets.total_count, 'item'
+            - unless @assets.total_count == 0
+              \- Page #{ @assets.current_page } of #{ @assets.total_pages }
+            = paginate @assets
+        .cta.text-center
+          = link_to ficon(:trash, 'Empty trash'), push_type.trash_assets_path, method: 'delete', class: 'button radius alert', data: { confirm: true }
+