push_type_admin 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6084e28586ff7c9cce383dba8ccd42648febd04
-  data.tar.gz: 3553a36311a9eb4628a9b10720a8af668338c3e9
+  metadata.gz: 9735421fcff5796f51bc260929fb6fe0e10d9307
+  data.tar.gz: b8e79b4a906b25b8df02ab7c0800f48cb7db428a
 SHA512:
-  metadata.gz: 76a629c6f17350ccf711074460dd3c8fe698e444abb8e8c4d5fe41c009180c917105833aa6f659303e65f51b21ab165412b76072890d246d2da6d6e085209400
-  data.tar.gz: a137f7193c84225ac0a6f8e9e8ecc4d1604bafa9227a693ccd5200e4775b305dc950abccaf5f8c36704cbb84c8c1e1f94e7b75d927e5f61c5f7208504ab05770
+  metadata.gz: 293b2b4fef759eb8009825415da10607b3b9adfb04806535666d1a8a566540e554af0d27fd81bf141f949f7867d533d695d3fe1908ce3ab013eedc5051aab28f
+  data.tar.gz: 433e0dc369cd8cd3911615800079c36395f90ff6cdb7aeae423608e00e2a218c7cc7b10d017284d8a435dba01e807bf6cbcbcd25ed4e5c29ddab1914f729f8d1

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

@@ -29,12 +29,24 @@ html.turbolinks-progress-bar::before {
 
 [class^="fi-"], [class~=" fi-"] {
   &:before {
-    font-size: 1.25em;
+    font-size:          1.25em;
   }
 }
 
-.inline-list .active {
-  font-weight:          400;
+.top-bar {
+  .logo {
+    margin-top:         -3px;
+  }
+  .active a {
+    font-weight:        $font-weight-bold;
+  }
+  .has-dropdown > a, .has-dropdown > a:hover {
+    background:         $white !important;
+  }
+  .dropdown {
+    border:             1px solid $silver;
+    border-top:         none;
+  }
 }
 
 .button i {
@@ -73,7 +85,6 @@ table {
   z-index:              5;
   width:                100%;
   height:               rem-calc(60);
-  padding-top:          rem-calc(16);
   background-color:     $white;
   border-bottom:        1px solid $silver;
 }

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

@@ -1361,11 +1361,11 @@ $side-nav-link-bg-hover: scale-color($panel-bg, $lightness: 75%);
 // $include-html-top-bar-classes: $include-html-classes;
 
 // Background color for the top bar
-// $topbar-bg-color: $oil;
-// $topbar-bg: $topbar-bg-color;
+$topbar-bg-color: transparent;
+$topbar-bg: $topbar-bg-color;
 
 // Height and margin
-// $topbar-height: 45px;
+$topbar-height: rem-calc(59);
 // $topbar-margin-bottom: 0;
 
 // Controlling the styles for the title in the top bar
@@ -1373,27 +1373,29 @@ $side-nav-link-bg-hover: scale-color($panel-bg, $lightness: 75%);
 // $topbar-title-font-size: rem-calc(17);
 
 // Style the top bar dropdown elements
-// $topbar-dropdown-bg: $oil;
-// $topbar-dropdown-link-color: $white;
-// $topbar-dropdown-link-bg: $oil;
+$topbar-dropdown-bg: $white;
+$topbar-dropdown-link-color: $primary-color;
+$topbar-dropdown-link-color-hover: scale-color($primary-color, $lightness: -14%);
+$topbar-dropdown-link-bg: $white;
+$topbar-dropdown-link-bg-hover: scale-color($primary-color, $lightness: 95%);
 // $topbar-dropdown-link-weight: $font-weight-normal;
 // $topbar-dropdown-toggle-size: 5px;
-// $topbar-dropdown-toggle-color: $white;
-// $topbar-dropdown-toggle-alpha: 0.4;
+$topbar-dropdown-toggle-color: $primary-color;
+$topbar-dropdown-toggle-alpha: 0.6;
 
 // Set the link colors and styles for top-level nav
-// $topbar-link-color: $white;
-// $topbar-link-color-hover: $white;
-// $topbar-link-color-active: $white;
-// $topbar-link-color-active-hover: $white;
+$topbar-link-color: $primary-color;
+$topbar-link-color-hover: scale-color($primary-color, $lightness: -14%);
+$topbar-link-color-active: $topbar-link-color-hover;
+$topbar-link-color-active-hover: $topbar-link-color-hover;
 // $topbar-link-weight: $font-weight-normal;
-// $topbar-link-font-size: rem-calc(13);
+$topbar-link-font-size: rem-calc(16);
 // $topbar-link-hover-lightness: -10%; // Darken by 10%
 // $topbar-link-bg: $topbar-bg;
 // $topbar-link-bg-color-hover: $charcoal;
-// $topbar-link-bg-hover: #272727;
-// $topbar-link-bg-active: $primary-color;
-// $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%);
+$topbar-link-bg-hover: scale-color($primary-color, $lightness: 95%);
+$topbar-link-bg-active: $topbar-link-bg-hover;
+$topbar-link-bg-active-hover: scale-color($primary-color, $lightness: 90%);
 // $topbar-link-font-family: $body-font-family;
 // $topbar-link-text-transform: none;
 // $topbar-link-padding: $topbar-height / 3;
@@ -1410,13 +1412,13 @@ $side-nav-link-bg-hover: scale-color($panel-bg, $lightness: 75%);
 // $topbar-dropdown-label-bg: $oil;
 
 // Top menu icon styles
-// $topbar-menu-link-transform: uppercase;
-// $topbar-menu-link-font-size: rem-calc(13);
-// $topbar-menu-link-weight: $font-weight-bold;
-// $topbar-menu-link-color: $white;
-// $topbar-menu-icon-color: $white;
-// $topbar-menu-link-color-toggled: $jumbo;
-// $topbar-menu-icon-color-toggled: $jumbo;
+$topbar-menu-link-transform: none;
+$topbar-menu-link-font-size: $topbar-link-font-size;
+$topbar-menu-link-weight: $font-weight-normal;
+$topbar-menu-link-color: $primary-color;
+$topbar-menu-icon-color: $topbar-menu-link-color;
+$topbar-menu-link-color-toggled: scale-color($primary-color, $lightness: -14%);
+$topbar-menu-icon-color-toggled: $topbar-menu-link-color-toggled;
 
 // Transitions and breakpoint styles
 // $topbar-transition-speed: 300ms;

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

@@ -12,19 +12,20 @@
 </head>
 <body>
   
-  <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.svg', size: '140x26', alt: 'PushType'), push_type.root_path %>
-      </div>
-      <nav class="small-4 medium-6 large-8 columns">
+  <header class="header contain-to-grid" role="banner">
+    <nav class="top-bar" data-topbar role="navigation">
+      <ul class="title-area">
+        <li class="name">
+          <h1><%= link_to image_tag('push_type/pushtype-logo.svg', size: '140x26', alt: 'PushType', class: 'logo'), push_type.root_path %></h1>
+        </li>
+        <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+      </ul>
+      <section class="top-bar-section">
         <%= render_menu(:main) %>
-      </nav>
-      <nav class="small-4 medium-3 large-2 columns">
         <%= render_menu(:utility) %>
-      </nav>
-    </div>
-  </header>  
+      </section>
+    </nav>
+  </header>
 
   <section class="main" role="main">
     <div class="row">

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

@@ -1,6 +1,6 @@
 %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' }.
+%p PushType is a modern, open source content management system for Ruby on Rails, lovingly developed and maintained by #{ link_to 'Push Code Ltd', 'http://www.pushcode.com' }.
 
 %table
   %tr
@@ -11,7 +11,7 @@
     %td= link_to 'http://www.pushtype.org', 'http://www.pushtype.org'
   %tr
     %th Source code
-    %td= link_to 'http://github.com/pushcode/push_type', 'http://github.com/pushcode/push_type'
+    %td= link_to 'http://github.com/pushtype/push_type', 'http://github.com/pushtype/push_type'
   %tr
     %th Copyright
     %td © 2014-#{ Date.today.year } Push Code Ltd

data/lib/push_type/admin/engine.rb

@@ -7,7 +7,7 @@ module PushType
       config.generators do |g|
         g.assets false
         g.helper false
-        g.test_framework  :minitest, spec: true, fixture: false
+        g.test_framework  :test_unit, fixture: false
       end
 
       config.assets.precompile += %w(
@@ -20,7 +20,7 @@ module PushType
       initializer 'push_type_admin.menus' do
         PushType.menu :main do
           element :ul
-          html_options class: 'inline-list'
+          html_options class: 'left'
 
           item :content do
             link    { push_type.nodes_path }
@@ -38,7 +38,7 @@ module PushType
 
         PushType.menu :utility do
           element :ul
-          html_options class: 'inline-list right'
+          html_options class: 'right'
 
           item :info do
             text    { ficon(:info) }

data/lib/push_type/admin.rb

@@ -18,12 +18,14 @@ require 'premailer/rails'
 
 module PushType
 
-  module Admin
-  end
-
   def self.admin_assets
     @@admin_assets ||= PushType::Admin::Assets.new
   end
+
+  module Admin
+    ActiveSupport.run_load_hooks(:push_type_admin, PushType)
+  end
+  
 end
 
 require 'push_type/admin/assets'

data/test/controllers/push_type/admin_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe AdminController do
+  class AdminControllerTest < ActionController::TestCase
     
     describe 'GET #info' do
       before { get :info }

data/test/controllers/push_type/assets_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe AssetsController do
+  class AssetsControllerTest < ActionController::TestCase
 
     let(:asset_attrs) { FactoryGirl.attributes_for(:asset) }
     let(:asset) { FactoryGirl.create :asset }

data/test/controllers/push_type/nodes_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe NodesController do
+  class NodesControllerTest < ActionController::TestCase
 
     let(:node_attrs) { FactoryGirl.attributes_for(:node) }
     let(:node) { Page.create node_attrs }

data/test/controllers/push_type/taxonomies_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe TaxonomiesController do
+  class TaxonomiesControllerTest < ActionController::TestCase
     
     describe 'GET #index' do
       before { get :index }

data/test/controllers/push_type/taxonomy_terms_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe TaxonomyTermsController do
+  class TaxonomyTermsControllerTest < ActionController::TestCase
 
     let(:json_response) { JSON.parse(response.body) }
   

data/test/controllers/push_type/users_controller_test.rb

@@ -1,7 +1,7 @@
-require "test_helper"
+require 'test_helper'
 
 module PushType
-  describe UsersController do
+  class UsersControllerTest < ActionController::TestCase
 
     let(:user_attrs) { FactoryGirl.attributes_for(:user) }
     let(:user) { FactoryGirl.create :user }

data/test/dummy/app/models/category.rb

@@ -1,6 +1,7 @@
 class Category < PushType::Taxonomy
 
-  # Set base slug
+  # The default prefix for a taxonomy term's permalink can be
+  # overridden be setting the base slug.
   # base_slug :category
 
 end

data/test/dummy/app/models/page.rb

@@ -1,10 +1,11 @@
 class Page < PushType::Node
 
-  # Control child nodes
-  # has_child_nodes :all
+  # By default a node can have children of any other node type.
+  # Optionally pass a list of acceptable node types or prevent
+  # any descendents by passing false.
+  has_child_nodes :all
 
-  # Set custom fields
+  # Model the content by adding custom fields to the node.
   # field :body, :text, validates: { presence: true }
-  
 
 end

data/test/dummy/config/initializers/push_type.rb

@@ -1,22 +1,39 @@
 PushType.setup do |config|
 
+  # By default all node types can be placed at the root of the
+  # content tree. Alternatively, set an array of node type symbols
+  # to whiltelist acceptable root nodes.
   config.root_nodes = :all
 
-  config.unexposed_nodes = []
-
+  # Set the slug of the node that the `NodesFrontEndContoller` will
+  # render when visting the root URL of the site (the homepage).
+  # This setting can be overridden in config/routes.rb.
   config.home_slug = 'home'
 
+  # Set an array of node type symbols which will not be exposed to
+  # the `NodesFrontEndContoller`. These nodes will not be accessible
+  # through their permalink.
+  config.unexposed_nodes = []
+
+  # Set an array of taxonomy type symbols which will not be exposed
+  # to the `TaxonomiesFrontEndController`. These taxonomies will not
+  # be accessible through their permalink.
   config.unexposed_taxonomies = []
 
+  # Media styles allow you to predefine a collection of geometry
+  # strings for resizing images on the fly with the `Asset#media`
+  # method. Example: `image.media(:large)`
   config.media_styles = {
     large:    '1024x1024>',
     medium:   '512x512>',
     small:    '256x256>'
   }
 
-  # Configure the default mailer "from" address
+  # Configure the email address to be used as the "from" address
+  # for PushType's build in mailers.
   config.mailer_sender = 'pushtype@example.com'
 
+  # PushType uses Dragonfly for managing uploaded images/assets.
   # Dragonfly datastore configuration
   config.dragonfly_datastore = :file
   config.dragonfly_datastore_options = {
@@ -33,6 +50,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '3abdea25f273f515a627a784598f75fae06f1960d47e7204ae339877a659e32e'
+  # config.dragonfly_secret = '284393008c2c21fd10b51685513feee09ce39a2d7f46e3cadb8075a7b35794ee'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 61729a30cd08c1057785075bb02c8fc0cf80a22b922f948845bebd86b8760e43d19665dfc88c8b2981307a40fad241b32114f96d4373afec6976ee1aaf1fd82d
+  secret_key_base: 8f018bc1caf2c33095b9d08575602f4f03484b1039015751d4e5f1ba6bc78eac5e36ad4c0c5444040c328624fa33df70d58cb41658d9221f29be93c19dbf3502
 
 test:
-  secret_key_base: dda3e2afd287c240ad96f77ed7f71327e686be1dadd3acf684257ef321a3f8dd23ee0de78d04e6f8e06c39e8b4f0087772acdf0a0c200e4f31d0e467928e35c5
+  secret_key_base: c042392e563312f5d05dd94140d57fe699768b7eb444ae2bccd274a8e197d682c0f744ee6c38939322193b5f147b5e2b82760a32f50526cb8f5ab8c29b7e7155
 
 # 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: 20150816155463) do
+ActiveRecord::Schema.define(version: 20150824095164) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"