push_type_admin 0.1.0.beta3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cbf92079561b52b5fff07bedf439c15859cfa2a
-  data.tar.gz: 06007ba7129d9587f72b4ba6b2b400913a8a40fa
+  metadata.gz: 6ca575684bea0f00a9dfeb1215090ce1eed8a2d7
+  data.tar.gz: cea04749d65fadc65367c8d7508f5c32a7a98574
 SHA512:
-  metadata.gz: f5bb867b96a4ea65e0cf748b829a3e3db5d83913a4b9c4bcdf381775f2e153db89f2c8fd9a430265131bc53cf2d65c074e8120e359bed495879c0f6241823f5f
-  data.tar.gz: 35d91900238b20a916b29c50a7db7983831b5feb2bbf548c2c0f21cbbb0ef96e3795358746869535afbef9a3c0ab5d3e0bebfcca2e21decd38d2d223edc39988
+  metadata.gz: 7230cf3ec37d7b22b5ffe420f837a87ca914b517d23b152a24b195e8e407526af2343ad09bc27883815cf658ee4f5a64bb8dca1d6887097ae233efe2b5000b6c
+  data.tar.gz: 2b19efefc3928accbd3d29530b4b344e7a21b760beeacb0fa078ececef9e17ed6bf67bb3218e56c21b495cd8cb02efbad475a291a9249da781a300e360ebae91

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

@@ -40,6 +40,20 @@ html.turbolinks-progress-bar::before {
   margin-right:         rem-calc(5);
 }
 
+.reveal-modal-bg {
+  z-index:              1005;
+}
+.reveal-modal, dialog {
+  z-index:              1006;
+}
+
+table {
+  width:                100%;
+  td p:last-child {
+    margin-bottom:      0;
+  }
+}
+
 /* Custom styles */
 
 %block-link-bg {
@@ -323,6 +337,12 @@ html.turbolinks-progress-bar::before {
       }
     }
   }
+  .side-nav {
+    padding:            rem-calc(24 0);
+    .heading {
+      padding:          rem-calc(0 14);
+    }
+  }
 }
 
 .meta-table {
@@ -511,5 +531,6 @@ form .asset-upload {
 }
 
 
+
 @import "foundation-icons";
 @import "froala_theme";

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

@@ -1133,7 +1133,7 @@ $reveal-max-width: rem-calc(768);
 // $side-nav-link-color: $primary-color;
 // $side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%);
 // $side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%);
-// $side-nav-link-bg-hover: hsla(0, 0, 0, 0.025);
+$side-nav-link-bg-hover: scale-color($panel-bg, $lightness: 75%);
 // $side-nav-link-margin: 0;
 // $side-nav-link-padding: rem-calc(7 14);
 // $side-nav-font-size: rem-calc(14);

data/app/controllers/push_type/admin_controller.rb

@@ -4,11 +4,19 @@ module PushType
     layout 'push_type/admin'
     before_filter :initial_breadcrumb
 
+    def info
+      render layout: false
+    end
+
     protected
 
     def push_type_user
       respond_to?(:current_user) ? current_user : nil
     end
+
+    def initial_breadcrumb
+      true
+    end
     
   end
 end

data/app/controllers/push_type/nodes_controller.rb

@@ -70,7 +70,7 @@ module PushType
 
     def node_params
       fields = [:title, :slug, :status, :published_at, :published_to] + @node.fields.keys
-      params.fetch(@node.type.downcase.to_sym, {}).permit(*fields)
+      params.fetch(@node.type.underscore.to_sym, {}).permit(*fields)
     end
 
     def redirect_path

data/app/helpers/push_type/admin_helper.rb

@@ -11,5 +11,12 @@ module PushType
       [el, label].compact.join(' ').html_safe
     end
 
+    def render_custom_field(field, form_builder)
+      classes = [ field.kind, field.column_class, 'columns end' ]
+      content_tag :div, class: classes.compact do
+        render "push_type/fields/#{ field.template }", f: form_builder, field: field
+      end
+    end
+
   end
 end

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

@@ -25,8 +25,8 @@
       </nav>
       <nav class="small-4 medium-3 large-2 columns">
         <ul class="inline-list right">
-          <%= content_tag :li, link_to(ficon(:info), '#') %>
-          <%= content_tag :li, link_to(ficon(:widget), '#') %>
+          <%= 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>
       </nav>
@@ -51,5 +51,7 @@
     </div>
   </section>
 
+  <div id="reveal-ajax" class="reveal-modal" data-reveal></div>
+
 </body>
 </html>

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

@@ -0,0 +1,20 @@
+%p.text-center= image_tag 'push_type/pushtype-logo.png', 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' }.
+
+%table
+  %tr
+    %th Version
+    %td= PushType::VERSION
+  %tr
+    %th Homepage
+    %td= link_to 'http://type.pushcode.com'
+  %tr
+    %th Source code
+    %td= link_to 'http://github.com/pushcode/push_type'
+  %tr
+    %th Copyright
+    %td 2014 Push Code Ltd
+  %tr
+    %th License
+    %td= link_to 'MIT', 'http://opensource.org/licenses/MIT'

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

@@ -22,8 +22,10 @@
               = f.text_field :slug, :'ng-model' => 'node.slug'
             - if @node.errors.include? :slug
               .error-icon= ficon :info, 'Error'
-        - @node.fields.each do |key, field|
-          = f.custom_field_row field
+
+        .row.custom-fields
+          - @node.fields.each do |key, field|
+            = render_custom_field field, f
 
   .large-4.columns
     .side-panel{ :'side-panel' => true }
@@ -56,6 +58,6 @@
 
         - unless @node.new_record?
           .delete-link
-            = link_to "Delete #{@node.type.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.' } }
+            = 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.' } }
 
       

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

@@ -1,17 +1,17 @@
 - if @parent
   - if @parent.child_node_types.size == 1
-    = link_to ficon(:page_add, "New #{ @parent.child_node_types.first.humanize }"), push_type.new_node_node_path(kind: @parent.child_node_types.first), class: 'button radius success'
+    = link_to ficon(:page_add, "New #{ @parent.child_node_types.first.humanize.downcase }"), push_type.new_node_node_path(kind: @parent.child_node_types.first), class: 'button radius success'
   - elsif @parent.child_node_types.size > 1
     = link_to ficon(:page_add, 'New content'), push_type.new_node_node_path(kind: @parent.child_node_types.first), class: 'button radius success dropdown', data: { dropdown: 'new-node' }
     %ul#new-node.f-dropdown
       - for kind in @parent.child_node_types
-        %li= link_to "New #{ kind.humanize }", push_type.new_node_node_path(kind: kind)
+        %li= link_to "New #{ kind.humanize.downcase }", push_type.new_node_node_path(kind: kind)
 
 - else
   - if PushType.root_node_types.size == 1
-    = link_to ficon(:page_add, "New #{ PushType.root_node_types.first.humanize }"), push_type.new_node_path(kind: PushType.root_node_types.first), class: 'button radius success'
+    = link_to ficon(:page_add, "New #{ PushType.root_node_types.first.humanize.downcase }"), push_type.new_node_path(kind: PushType.root_node_types.first), class: 'button radius success'
   - elsif PushType.root_node_types.size > 1
     = link_to ficon(:page_add, 'New content'), push_type.new_node_path(kind: PushType.root_node_types.first), class: 'button radius success dropdown', data: { dropdown: 'new-node' }
     %ul#new-node.f-dropdown
       - for kind in PushType.root_node_types
-        %li= link_to "New #{ kind.humanize }", push_type.new_node_path(kind: kind)
+        %li= link_to "New #{ kind.humanize.downcase }", push_type.new_node_path(kind: kind)

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

@@ -1,7 +1,7 @@
-- title "Edit #{ @node.type }"
+- title "Edit #{ @node.type.underscore.humanize.downcase }"
 - 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), builder: PushType::FormBuilder do |f|
+= form_for @node, url: push_type.node_path(@node) do |f|
   = render 'form_fields', f: f

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

@@ -32,7 +32,7 @@
                 = link_to push_type.edit_node_path(node) do
                   .title= node.title
                   .meta
-                    %span.label.secondary.radius= node.type
+                    %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
                     \-

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

@@ -1,4 +1,4 @@
-- title "New #{ @node.type }"
+- title "New #{ @node.type.underscore.humanize.downcase }"
 
 - if @parent
   - for node in @parent.self_and_ancestors.reverse
@@ -7,5 +7,5 @@
 - else
   - breadcrumbs.add yield(:title), push_type.new_node_path
 
-= form_for @node, url: (@parent ? push_type.node_nodes_path(@parent, kind: @node.type.underscore) : push_type.nodes_path(kind: @node.type.underscore)), builder: PushType::FormBuilder do |f|
+= form_for @node, url: (@parent ? push_type.node_nodes_path(@parent, kind: @node.type.underscore) : push_type.nodes_path(kind: @node.type.underscore)) do |f|
   = render 'form_fields', f: f

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

@@ -1,4 +1,4 @@
-= form_for @user, builder: PushType::FormBuilder do |f|
+= form_for @user do |f|
   .large-8.columns
     .container
       .head
@@ -13,8 +13,10 @@
           .columns
             = f.label :email
             = f.email_field :email
-        - @user.fields.each do |key, field|
-          = f.custom_field_row field
+
+        .row.custom-fields
+          - @user.fields.each do |key, field|
+            = render_custom_field field, f
 
   .large-4.columns
     .side-panel{ :'side-panel' => true }

data/config/routes.rb

@@ -11,6 +11,8 @@ PushType::Core::Engine.routes.draw do
 
   resources :users, except: :show
 
+  get 'info' => 'admin#info', as: 'info'
+
   root to: redirect('nodes')
     
 end

data/lib/push_type/admin.rb

@@ -23,5 +23,4 @@ end
 
 require 'push_type/admin/engine'
 
-require 'push_type/rails/form_builder'
 require 'push_type/breadcrumbs/foundation'

data/test/controllers/push_type/admin_controller_test.rb

@@ -0,0 +1,13 @@
+require "test_helper"
+
+module PushType
+  describe AdminController do
+    
+    describe 'GET #info' do
+      before { get :info }
+      it { response.must_render_template 'info' }
+      it { response.must_render_template layout: false }
+    end
+
+  end
+end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: ed0d0cf2ffcfbf9182c93b72a18812cd29852d95e1fa1446998f79d8b7bb8b668b2be3e23a2ba8f888ba3b0496d4a2ff0cec8696659a1ed814e45d6b7bf78c07
+  secret_key_base: fdce6af8f15d1de2cd324e5f6c5c4acaa8cac39a3865db771b0b20dd3d8620ccc47c0cb4ca8410632429412c979fc6af1f67e42a0ebba570ac829853af9382eb
 
 test:
-  secret_key_base: 04d9840621b0c0295e395f82d9c93e57b375e4279eb5dce3f56dd47ecbb16ae0efa21f63e2a65b823d2325b6eb293d71c677681a664e49a3bef7d861a1058ab8
+  secret_key_base: 7660d04073b52f452410b46c26a04e17bfeda1140ee6c335250e01be4eaf6d6ac71c12923bd49f47dfb3bc4e03f6d49a6f1bbef353f0e9d5d3e876938133e4f7
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141205213509) do
+ActiveRecord::Schema.define(version: 20150102204421) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"