smithycms 0.6.10 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e7e48128896913a10004670f400ca8529be8fb
-  data.tar.gz: 2774df6156688fc67a89bce6d59cf8d359e60a52
+  metadata.gz: 8e488b0b840e5746ecfb42f5afdc5c406759a13d
+  data.tar.gz: 981f62d7db553a5328609359a3d4a0af906cc68c
 SHA512:
-  metadata.gz: f13faaa540821280269ad9a0a9f12b813d09304ec6b96dbf0fe0d93fba9da23937b94db4ac19b1aac709a528d45dfb3f0e3817a6a8a204c78de7346824d4eb57
-  data.tar.gz: 9fab5b50e447552d95ac1c3a5edf1f3c513673b03ca78e3ec6d7a1a9aba098972f34469961ea7733c77c0fb94539d1b776c62cb137d63ce4cac8c11cab4cd920
+  metadata.gz: 612329465b66651222def0240823a9504d5675cca25f04cb1bd857cad8272bf505e0e7706111b55e616ad20ba7d56ff7623337bd122838c625589b94e2f57fa8
+  data.tar.gz: 33550ffcc8c8cbff5e6a11776f30729b23a025841442124db7d96d14d6dee4239d7acbaed6cdcdb99d8f5e83fef0571f8e013cd22e52657af8e90f5c982450b0

data/app/assets/javascripts/smithy/application.js

@@ -20,4 +20,5 @@
 //= require zeroclipboard-2.2.0/ZeroClipboard.min.js
 //= require refile
 //= require smithy/smithy_editor
+//= require smithy/layout
 //= require_tree .

data/app/assets/javascripts/smithy/layout.coffee

@@ -0,0 +1,13 @@
+setLayoutHeight = ->
+  $('#content.with-sidebar').css('min-height', $('#side').prop('scrollHeight') - $('#main').height() - 48)
+  $('#side').css('max-height', $(window).height()).affix('checkPosition')
+
+$ ->
+  $('#side').affix
+    offset:
+      top: ->
+        this.top = $('.navbar').outerHeight(true)
+  setLayoutHeight()
+
+$(window).on 'load resize', (e) ->
+  setLayoutHeight()

data/app/assets/stylesheets/smithy/application.scss

@@ -19,6 +19,8 @@
  *= depend_on smithy/templates.scss
  */
 
+$tag-orange: #faa61a;
+$tag-red:    #C6311D;
 @import 'bootstrap_and_overrides';
 @import 'datatables/dataTables.bootstrap';
 @import 'datatables-responsive';
@@ -26,6 +28,7 @@
 @import 'forms';
 @import 'guides';
 @import 'pages';
+@import 'tabs';
 @import 'templates';
 @import 'content_blocks';
 @import 'assets';

data/app/assets/stylesheets/smithy/layout.scss

@@ -14,12 +14,9 @@ body { background:#444; padding:0; }
 }
 
 #side {
-  // float:left; width:20%;
-  position:relative;
   .actions { padding:16px 15px 0 15px ; }
   .nav-list {
     border-top:1px solid #393939;
-    margin:16px 0 0 0;
     padding:0;
     .nav-list { margin:0; }
     li + .nav-header {
@@ -61,11 +58,38 @@ body { background:#444; padding:0; }
     }
   }
 }
+#body {
+  @include clearfix(); position:relative;
+  #main { @extend .col-xs-12; }
+  &.with-sidebar {
+    #side {
+      @extend .col-xs-5;
+      @extend .col-sm-3;
+      @extend .col-md-2;
+      overflow:auto; padding-top:$grid-gutter-width/2; padding-bottom:$grid-gutter-width/2;
+      @media screen and (min-width: $screen-sm-min) {
+        position:absolute; top:0;
+        &.affix { position:fixed; }
+        &.affix-top { bottom: auto; }
+      }
+    }
+    #main {
+      @extend .col-xs-7;
+      @extend .col-sm-9;
+      @extend .col-md-10;
+      @extend .col-sm-offset-3;
+      @extend .col-md-offset-2;
+    }
+  }
+
+  #content { @extend .col-md-12; }
+  &.with-related {
+    #content { @extend .col-md-9; }
+    #related { @extend .col-md-3; }
+  }
+}
 #main {
-  // float:left; width:80%;
   background:#f9f9f9; margin:-12px 0 0 0; padding:0 0 24px 0; position:relative;
-  -webkit-border-radius: 10px 0px 0px 10px;
-          border-radius: 10px 0px 0px 10px;
   -webkit-box-shadow:  0px 0px 18px 0px rgba(0, 0, 0, 0.4);
           box-shadow:  0px 0px 18px 0px rgba(0, 0, 0, 0.4);
   > h1 { padding:24px 0 0 12px; }
@@ -74,14 +98,9 @@ body { background:#444; padding:0; }
   #related {}
 }
 
-.wide #main {
-  > .container-fluid { padding-right:20px; }
-  #content { border-right:0; }
-}
-
 #main-wide { background:#f9f9f9; padding:0 0 24px 0; position:relative; }
 
 #footer {
-  color:#BBB; font-size:12px; text-align:right; padding:1em;
-  a { color:#EEE; }
+  color:#BBB; font-size:12px; text-align:right; padding:1em;  a { color:#EEE; }
+  a { color:$tag-orange; }
 }

data/app/assets/stylesheets/smithy/tabs.scss

@@ -0,0 +1,3 @@
+.tab-content {
+  background:#fff; padding:$grid-gutter-width/2; border:1px solid $navbar-default-border; border-top:0;
+}

data/app/controllers/smithy/assets_controller.rb

@@ -8,7 +8,7 @@ module Smithy
 
     def index
       @asset_source = AssetSource.first
-      respond_with @assets, :layout => 'smithy/wide' do |format|
+      respond_with @assets do |format|
         format.html
         format.json { render json: ::Smithy::AssetsDatatable.new(view_context, params[:type]) }
       end

data/app/controllers/smithy/content_resources_controller.rb

@@ -11,7 +11,7 @@ class Smithy::ContentResourcesController < Smithy::BaseController
 
   def index
     @records = find_records
-    respond_with @records, :layout => 'smithy/wide'
+    respond_with @records
   end
 
   def show

data/app/controllers/smithy/pages_controller.rb

@@ -6,7 +6,7 @@ module Smithy
     include Smithy::Liquid::Rendering
     before_filter :load_page_from_path, :only => [ :show ]
     before_filter :initialize_page, :only => [ :new, :create ]
-    before_filter :load_page, :only => [ :edit, :update, :destroy ]
+    before_filter :load_page, :only => [ :edit, :update, :destroy, :duplicate ]
     before_filter :load_parent, :except => [ :index, :show, :order, :selector_modal ]
     before_filter :load_root, :only => [ :index ]
     respond_to :html, :json
@@ -50,6 +50,20 @@ module Smithy
       respond_with @page.parent ? @page.parent : @page
     end
 
+    def duplicate
+      old_page = @page
+      @page = old_page.dup
+      @page.duplicate_page = old_page.id
+      @page.title << " (Copy)"
+      @page.permalink.clear
+      @page.browser_title.clear
+      @page.keywords.clear
+      @page.description.clear
+      respond_with @page do |format|
+        format.html { render(action: :new) }
+      end
+    end
+
     def order
       first = Smithy::Page.find(params[:order].shift)
       @parent = first.parent

data/app/models/smithy/page.rb

@@ -3,6 +3,7 @@ module Smithy
     validates_presence_of :template, :title
     validate :validate_one_root
     validate :validate_exclusion_of_reserved_words
+    validate :validate_duplicate_page_exists
 
     belongs_to :template
     has_many :containers, :through => :template
@@ -14,13 +15,14 @@ module Smithy
 
     before_save :build_permalink
     before_save :set_published_at
+    before_save :copy_content_from_duplicate, on: :create, if: -> { self.duplicate_page.present? }
 
     accepts_nested_attributes_for :contents, :reject_if => lambda {|a| a['label'].blank? || a['container'].blank? || a['content_block'].blank? }, :allow_destroy => true
 
     scope :included_in_navigation, -> { where("show_in_navigation=? AND published_at <= ?", true, Time.now) }
     scope :published, -> { where('published_at <= ?', Time.now) }
 
-    attr_accessor :publish
+    attr_accessor :publish, :duplicate_page
     attr_reader :liquid_context
 
     def self.page_selector_options
@@ -96,11 +98,22 @@ module Smithy
         self.permalink = self.root? ? title.parameterize : path.split('/').last unless self.permalink?
       end
 
+      def copy_content_from_duplicate
+        duplicate_page = Page.find(self.duplicate_page)
+        duplicate_page.contents.each do |content|
+          self.contents << content.dup
+        end
+      end
+
       def set_published_at
         self.published_at = Time.now if self.publish.present?
         self.published_at = nil if self.publish == false
       end
 
+      def validate_duplicate_page_exists
+        errors.add(:duplicate_page, "this page could not be found. Please choose another and try again.") if self.duplicate_page.present? && Page.find_by(id: self.duplicate_page).blank?
+      end
+
       def validate_exclusion_of_reserved_words
         reserved = %w(index new edit session login logout users smithy)
         errors.add(:title, "cannot contain reserved words (#{reserved.join(', ')})") if reserved.include?(self.title.to_s.parameterize)

data/app/models/smithy/permitted_params.rb

@@ -38,7 +38,7 @@ module Smithy
     end
 
     def page_attributes
-      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id ]
+      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id, :duplicate_page ]
     end
 
     def page_content_attributes

data/app/views/layouts/smithy/application.html.erb

@@ -2,24 +2,31 @@
 <body>
 <%= render :partial => "layouts/smithy/shared/nav" %>
 <div class="container-fluid">
-  <div class="row">
-    <nav id="side" class="col-xs-5 col-sm-3 col-md-2">
-      <%= yield :secondary_nav %>
-    </nav>
-    <div id="main" class="col-xs-7 col-sm-9 col-md-10">
+  <%- classes = 'row' -%>
+  <%- classes += ' with-sidebar' if content_for?(:secondary_nav) -%>
+  <%- classes += ' with-related' if content_for?(:related) -%>
+  <div id="body" class="<%= classes %>">
+    <% if content_for? :secondary_nav %>
+      <nav id="side" class="">
+        <%= yield :secondary_nav %>
+      </nav>
+    <% end %>
+    <div id="main">
       <% if content_for? :title %><h1><%= yield :title %></h1><% end %>
       <%= render :partial => "layouts/smithy/shared/flash", :locals => { flash: flash } %>
       <%= yield :top_content %>
       <div class="container-fluid">
         <section class="row" id="content-container">
 
-          <article id="content" class="col-md-9">
+          <article id="content">
             <%= yield %>
           </article>
 
-          <aside id="related" class="col-md-3">
-            <%= yield :related %>
-          </aside>
+          <% if content_for? :related %>
+            <aside id="related">
+              <%= yield :related %>
+            </aside>
+          <% end %>
 
         </section>
       </div>

data/app/views/smithy/pages/_content_tab.html.erb

@@ -0,0 +1,14 @@
+<%= f.input :title %>
+<%= f.input :parent, :include_blank => false, :collection => tree_for_select unless !@page.parent_id? %>
+<%= f.input :show_in_navigation, :label => "Show page in site navigation" %>
+<%= f.input :template, :as => :select, :collection => Smithy::Template.templates, :include_blank => false %>
+
+<% if @page.persisted? && @page.external_link.blank? %>
+  <%= render :partial => "container", :collection => @page.containers, :locals => { :f => f } %>
+<% elsif @page.external_link? %>
+  <%= f.inputs "Redirect" do %>
+    <%= f.input :external_link, :hint => "This page is currently being redirected to #{link_to @page.external_link, @page.external_link}".html_safe %>
+  <% end %>
+<% else %>
+  <%= f.input :duplicate_page, as: :select, label: "Copy Content From", collection: tree_for_select %>
+<% end %>

data/app/views/smithy/pages/_form.html.erb

@@ -13,38 +13,22 @@
 <% end %>
 
 <%= semantic_form_for @page, :url => ( @page.persisted? ? page_path(@page.id) : pages_path ) do |f| %>
-  <%= f.inputs "Page Information" do %>
-    <%= f.input :title %>
-    <%= f.input :permalink, :hint => "This will be auto-created if blank. Only fill it in if you know what you're doing" %>
-    <%= f.input :parent, :include_blank => false, :collection => tree_for_select unless !@page.parent_id? %>
-    <%= f.input :show_in_navigation, :label => "Show page in site navigation" %>
-    <%= f.input :template, :as => :select, :collection => Smithy::Template.templates, :include_blank => false %>
-    <%= render :partial => "smithy/pages/page_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_page_fields.html.erb')) %>
-  <% end %>
-  <% if @page.persisted? && @page.external_link.blank? %>
-    <h3>Content</h3>
-    <%= render :partial => "container", :collection => @page.containers, :locals => { :f => f } %>
-  <% elsif @page.external_link? %>
-    <%= f.inputs "Redirect" do %>
-      <%= f.input :external_link, :hint => "This page is currently being redirected to #{link_to @page.external_link, @page.external_link}".html_safe %>
-    <% end %>
-  <% end %>
-  <h3 data-toggle="collapse" data-target="#page-meta">Meta <i class="fa fa-caret-down"></i></h3>
-  <%= content_tag :div, :id => "page-meta", :class => "collapse" do %>
-    <%= f.inputs do %>
-      <%= f.input(:external_link) unless @page.external_link? %>
-      <%= f.input :cache_length, :hint => "In seconds (eg. 600 is 10 minutes)" %>
-      <%= render :partial => "smithy/pages/meta_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_meta_fields.html.erb')) %>
-    <% end %>
-  <% end %>
-  <h3 data-toggle="collapse" data-target="#page-seo">SEO <i class="fa fa-caret-down"></i></h3>
-  <%= content_tag :div, :id => "page-seo", :class => "collapse" do %>
-    <%= f.inputs do %>
-      <%= f.input :browser_title %>
-      <%= f.input :keywords, as: :string, input_html: { maxlength: nil } %>
-      <%= f.input :description %>
-    <% end %>
-  <% end %>
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="active"><a href="#page_content" role="tab" data-toggle="tab">Content</a></li>
+    <li><a href="#meta" role="tab" data-toggle="tab">Meta</a></li>
+    <li><a href="#seo" role="tab" data-toggle="tab">SEO</a></li>
+  </ul>
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="page_content">
+      <%= render partial: 'smithy/pages/content_tab', locals: { f: f } %>
+    </div>
+    <div role="tabpanel" class="tab-pane" id="meta">
+      <%= render partial: 'smithy/pages/meta_tab', locals: { f: f } %>
+    </div>
+    <div role="tabpanel" class="tab-pane" id="seo">
+      <%= render partial: 'smithy/pages/seo_tab', locals: { f: f } %>
+    </div>
+  </div>
 
   <%= f.actions do %>
     <% if @page.published? %>

data/app/views/smithy/pages/_meta_tab.html.erb

@@ -0,0 +1,8 @@
+<%= f.inputs do %>
+  <%= f.input :permalink, :hint => "This will be auto-created if blank. Only fill it in if you know what you're doing" %>
+  <%= render :partial => "smithy/pages/page_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_page_fields.html.erb')) %>
+
+  <%= f.input(:external_link) unless @page.external_link? %>
+  <%= f.input :cache_length, :hint => "In seconds (eg. 600 is 10 minutes)" %>
+  <%= render :partial => "smithy/pages/meta_fields", :locals => { :f => f } if File.exists?(Rails.root.join('app', 'views', 'smithy', 'pages', '_meta_fields.html.erb')) %>
+<% end %>

data/app/views/smithy/pages/_page_related.html.erb

@@ -19,4 +19,5 @@
 
 <%= content_tag :p, link_to("View Page", @page.path, class: 'btn btn-primary') if @page.persisted? && @page.published? %></p>
 <%= content_tag :p, link_to("Delete Page", page_path(@page.id), method: :delete, data: { confirm: "Are you sure you want to delete this page?" }, class: 'btn btn-danger') if @page.persisted? %></p>
+<%= content_tag :p, link_to("Duplicate", duplicate_page_path(@page.id), method: :post, class: 'btn btn-info') if @page.persisted? %></p>
 <% end %>

data/app/views/smithy/pages/_seo_tab.html.erb

@@ -0,0 +1,5 @@
+<%= f.inputs do %>
+  <%= f.input :browser_title %>
+  <%= f.input :keywords, as: :string, input_html: { maxlength: nil } %>
+  <%= f.input :description %>
+<% end %>

data/config/routes.rb

@@ -19,6 +19,9 @@ Smithy::Engine.routes.draw do
     resources :content_blocks
     resources :guides, :only => :show
     resources :pages do
+      member do
+        post :duplicate
+      end
       collection do
         get :order
         get :selector_modal

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.6.10"
+  VERSION = "0.7.0"
 end