push_type_admin 0.3.3 → 0.4.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad4085f3e097c6588c6b9ee61bce2cc53e4b555
-  data.tar.gz: df95f82b3bcc826432be6a8c62b087bf6f3af3f6
+  metadata.gz: b77ee92c0b5bbfe3c74687c873eeb08fa596421c
+  data.tar.gz: 2a3d5d1f2aaa092c7aa4b7cede91e6e346d05437
 SHA512:
-  metadata.gz: 1e17757f38197c9b9504e9ba7cd0bb0f3e78725c8ea106ad9c0c94fdecbd637b559296e5559b10ae2baedaa94a7259ee983dc910cb375d16f7169458d20013d9
-  data.tar.gz: d23997a21eab58ca5587e96404c8ea350c2ab0855ee09f31d5aa9232a643a83c1390986eaa9865010342420953830a231576b783681623ae4953ac2cc9b1b6dd
+  metadata.gz: 49c79598c6af1bfd4da9499f992d6e99899c7e90e846efeba75d14281a600d6ebe1b2fd906a226e5b7aa7683b763afc0baee144fa220eace50a6d3d7d428f889
+  data.tar.gz: fd2b10880eeaa0405cb2b23770d63f789bed9dcf4696145c65bcd7ab19964c84b8d6fa9db6f2fb10585f49be036a9fc7a529bc68d52bf58c921a15cd18e42928

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

@@ -13,9 +13,11 @@
 #= require jquery
 #= require jquery_ujs
 #= require turbolinks
+#= require foundation/foundation
 #= require foundation
 #= require confirm_with_reveal
 #= require angular
+#= require angular-ui-tree
 #= require jquery.sticky
 #= require jquery.sortable
 #= require jquery.filedrop
@@ -27,7 +29,12 @@
 
 Turbolinks.enableProgressBar()
 
-@app = angular.module 'push_type', []
+@app = angular.module 'push_type', ['ui.tree']
+
+@app.run ['$http', ($http) ->
+  $http.defaults.headers.common['Accept'] = 'application/json'
+  $http.defaults.headers.common['Content-Type'] = 'application/json'
+]
 
 @app.directive 'sidePanel', ->
   (scope, $el, attrs) ->
@@ -45,7 +52,7 @@ $(document).on 'ready page:load', ->
   # Bootstrap Angular
   angular.bootstrap $('[role="main"]'), ['push_type']
 
-  $('.sortable').sortable
+  $('.node-list.sortable').sortable
     handle: '.handle'
     forcePlaceholderSize: true
   .on 'sortupdate', (e, ui) ->

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

@@ -0,0 +1,43 @@
+@app.directive 'ptConfirmReveal', ->
+  ($scope, $el, $attrs) ->
+    # Options
+    defaults =
+      title:  'Are you sure?'
+      body:   'This action cannot be undone.'
+    option = (name) -> $el.data(name) || defaults[name]
+
+    # Define modal
+    $modal = $("""
+      <div data-reveal class="reveal-modal small">
+        <h2 pt-title></h2>
+        <p pt-body></p>
+        <div>
+          <button class="button alert" pt-confirm>OK</button>
+          <button class="button secondary" pt-cancel>Cancel</button>
+        </div>
+      </div>
+    """)
+
+    $modal.find('[pt-title]').html option('title')
+    $modal.find('[pt-body]').html option('body')
+
+    # Define confirm callback
+    callbackFn = new Function('$scope', "$scope.#{ $attrs.ptConfirmReveal }")
+
+    # Bind events
+    $modal.find('[pt-confirm]').on 'click', (e) ->
+      e.preventDefault()
+      callbackFn($scope)
+      $modal.foundation('reveal', 'close')
+    $modal.find('[pt-cancel]').on 'click', (e) ->
+      e.preventDefault()
+      $modal.foundation('reveal', 'close')
+
+    # Reveal the modal
+    $el.on 'click', (e) ->
+      e.preventDefault()
+      $modal
+        .appendTo('body')
+        .foundation('reveal', 'open')
+        .on 'closed.fndtn.reveal', (e) ->
+          $modal.remove()

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

@@ -26,7 +26,6 @@
         else
           "Save #{ $scope.typeToString() }"
           
-
   $scope.publishedDates = ->
     switch $scope.node.status
       when 'draft'
@@ -37,7 +36,6 @@
         else
           $scope.publishedAtMoment().format('Do MMM YYYY, h:mma')
           
-
   $scope.publishedAtMoment = ->
     $scope.published_at ||= if $scope.node.published_at then moment($scope.node.published_at) else moment()
 
@@ -57,4 +55,11 @@
       dateArray = $(this).siblings('select').andSelf().map( -> $(this).val() ).get()
       dateArray[1]--
       scope[attrs.nodeDatetime] = moment(dateArray)
-      scope.$apply() unless scope.$$phase
+      scope.$apply() unless scope.$$phase
+
+@app.directive 'nodeSubmit', ->
+  (scope, $el, attrs) ->
+    $el.on 'click', (e) ->
+      return if $(e.target).is('span')
+      $el.parents('form').submit()
+      

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

@@ -0,0 +1,103 @@
+@app.controller 'TaxonomyTermsCtrl', ['$scope', '$http', ($scope, $http) ->
+
+  $scope.basePath = location.pathname + '/terms'
+
+  $scope.termCount = ->
+    $scope.terms.length
+
+  $scope.newTerm = ->
+    $scope.terms.push { children: [] }
+
+  $scope.treeFuncs = {
+    accept: (sourceNodeScope, destNodesScope) ->
+      term = sourceNodeScope.term
+      matches = $.grep destNodesScope.terms, (i) ->
+        i.id != term.id && ( i.title == term.title || i.slug == term.slug )
+      if matches.length then false else true
+    dropped: (e) ->
+      # Unless node is dropped in exactly the same position
+      unless e.source.index == e.dest.index && e.source.nodesScope == e.dest.nodesScope
+        term   = e.source.nodeScope.term
+        parent = e.dest.nodesScope.term
+        index  = e.dest.index
+        family = if parent? then parent.children else e.dest.nodesScope.terms or e.source.nodeScope.terms
+        obj =
+          prev:   if family[index-1]? then family[index-1].id else null
+          next:   if family[index+1]? then family[index+1].id else null
+          parent: if parent? then parent.id else null
+        url = "#{ $scope.basePath }/#{ term.id }/position"
+        req = $http.post url, obj
+  }
+
+]
+
+@app.controller 'TaxonomyTermCtrl', ['$scope', '$http', ($scope, $http) ->
+
+  $scope.master = {}
+
+  $scope.errors = {}
+
+  $scope.isEditing = ->
+    $scope.isNewTerm() || $scope.termForm.$dirty
+
+  $scope.edit = ->
+    $scope.master = angular.copy($scope.term)
+    $scope.termForm.$setDirty()
+
+  $scope.reset = ->
+    # We need to reset the slug to force child nodes to
+    # update permalink
+    $scope.term.slug = $scope.master.slug
+    $scope.term = angular.copy($scope.master)
+    $scope.termForm.$setPristine()
+    if $scope.isNewTerm()
+      $scope.popTerm($scope.term)
+
+  $scope.popTerm = (term) ->
+    idx = $.inArray(term, $scope.terms)
+    $scope.terms.splice(idx, 1);
+
+  $scope.save = ->
+    params = {}
+    params[$scope.param] = $scope.term
+
+    req = if $scope.isNewTerm()
+      $http.post $scope.basePath, params
+    else
+      url = $scope.basePath + '/' + $scope.term.id
+      $http.put url, params
+
+    req.success (data) ->
+      $scope.term.id = data.term.id if $scope.isNewTerm()
+      $scope.termForm.$setPristine()
+    req.error (data, status) ->
+      for field, error of data.errors
+        $scope.errors[field] = error[0]
+        $scope.termForm[field].$valid = false
+
+  $scope.delete = ->
+    url = $scope.basePath + '/' + $scope.term.id
+    $http.delete url
+    $scope.popTerm($scope.term)
+
+  $scope.setSlug = ->
+    if $scope.isNewTerm()
+      $scope.term.slug = $scope.term.title.toLowerCase().replace(/[\s\_]/g, '-').replace(/[^\w\-]/g, '')
+
+  $scope.errorClass = (field) ->
+    if $scope.errors[field] then 'error' else null
+
+  $scope.isNewTerm = ->
+    angular.isUndefined($scope.term.id)
+
+  $scope.termPermalink = ->
+    path = [$scope.baseSlug]
+    addParents = (scope) ->
+      if scope.$parentNodeScope?
+        addParents(scope.$parentNodeScope)
+        path.push scope.$parentNodeScope.term.slug
+    addParents($scope)
+    path.push $scope.term.slug
+    '/' + path.join('/')
+
+]

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

@@ -138,6 +138,13 @@ table {
 .node-list {
   @extend .no-bullet;
   margin:               0;
+  .sortable-placeholder {
+    background-color: scale-color($warning-color, $lightness: 95%);
+    border-bottom:    1px solid $crumb-border-color;
+    &:last-child {
+      border-bottom:  none;
+    }
+  }
 }
 
 .node-list-item {
@@ -252,10 +259,203 @@ table {
   }
 }
 
+.taxonomies-list-item {
+  position:             relative;
+  background-color:     $white;
+  border:               1px solid $crumb-border-color;
+  @include radius($global-radius);
+
+  > a {
+    display:            block;
+    @include single-transition(background-color, 200ms);
+    &:hover {
+      background-color: scale-color($primary-color, $lightness: 97.5%);
+      .title {
+        color:          scale-color($primary-color, $lightness: -12%);
+      }
+    }
+  }
+  .title {
+    padding:            rem-calc(20 15);
+    line-height:        rem-calc(28);
+    font-size:          rem-calc(18);
+    color:              $tuatara;
+    overflow:           hidden;
+    white-space:        nowrap;
+  }
+  .meta {
+    height:             rem-calc(40);
+    padding:            rem-calc(0 15 0);
+    line-height:        rem-calc(40);
+    font-size:          rem-calc(13);
+    color:              $aluminum;
+    border-top:         1px solid $crumb-border-color;
+    .label {
+      margin-right:     rem-calc(10);
+    }
+  }
+}
+
+.taxonomy-term-list, .nested-taxonomy-term-list {
+  margin:               0;
+  list-style:           none;
+}
+
+.nested-taxonomy-term-list {
+  border-top:           1px solid $crumb-border-color;
+  padding-left:         rem-calc(40);
+  &:empty {
+    border-top:         none;
+  }
+  .taxonomy-term-item {
+    .show, form {
+      border-left:      1px solid $crumb-border-color;
+    }
+  }
+  .taxonomy-term-item, .angular-ui-tree-placeholder {
+    &:before, &:after {
+      position:         absolute;
+      right:            100%;
+      top:              0;
+      content:          ' ';
+      display:          block;
+      width:            rem-calc(23);
+      border-left:      6px solid $crumb-border-color;
+    }
+    &:before {
+      height:           rem-calc(43);
+      border-bottom:    6px solid $crumb-border-color;
+    }
+    &:after {
+      bottom:           -1px;
+    }
+    &:last-child:after {
+      display:          none;
+    }
+  }
+}
+
+.taxonomy-term-item {
+  position:             relative;
+  border-bottom:        1px solid $crumb-border-color;
+
+  &:last-child {
+    border-bottom:      none;
+  }
+  .show {
+    position:           relative;
+  }
+  .title {
+    height:             rem-calc(40);
+    padding:            rem-calc(10 15 6 40);
+    line-height:        rem-calc(24);
+    font-size:          rem-calc(18);
+    color:              $tuatara;
+    overflow:           hidden;
+    white-space:        nowrap;
+  }
+  .meta {
+    height:             rem-calc(40);
+    padding:            rem-calc(0 15 0 40);
+    line-height:        rem-calc(40);
+    font-size:          rem-calc(13);
+    color:              $aluminum;
+    .label {
+      margin-right:     rem-calc(10);
+    }
+  }
+  .buttons, .edit {
+    position:           absolute;
+    top:                0;
+    right:              0;
+    bottom:             0;
+    line-height:        rem-calc(40);
+    text-align:         center;
+    border-left:        1px solid $crumb-border-color;
+    a {
+      @extend %block-link-bg;
+      color:            $primary-color;
+    }
+  }
+  .buttons {
+    width:              rem-calc(40);
+    a, span {
+      display:          block;
+      width:            100%;
+      height:           rem-calc(40);
+      color:            $gainsboro;
+      &:first-child {
+        border-bottom:  1px solid $crumb-border-color;
+      }
+    }
+    a.alert {
+      color:            $alert-color;
+    }
+    a.success {
+      color:            $success-color;
+    }
+  }
+  .edit {
+    width:              rem-calc(90);
+    .icon {
+      height:           rem-calc(40);
+      padding-top:      rem-calc(10);
+      font-size:        rem-calc(24);
+    }
+    .meta {
+      padding:          0 !important;
+    }
+  }
+  .handle {
+    position:           absolute;
+    top:                6px;
+    left:               6px;
+    height:             rem-calc(68);
+    width:              rem-calc(19);
+    background-color:   $white-smoke;
+    cursor:             move;
+    @include single-transition(background-color, 200ms);
+    &:hover {
+      background-color: $gainsboro;
+    }
+  }
+  form {
+    overflow:           auto;
+    padding-top:        rem-calc(16);
+  }
+}
+
+.angular-ui-tree-empty, .angular-ui-tree-hidden {
+  display:              none;
+}
+
+.angular-ui-tree-placeholder {
+  position:             relative;
+  width:                auto !important;
+  border-bottom:        1px solid $crumb-border-color;
+  background-color:     scale-color($warning-color, $lightness: 95%);
+  &:last-child {
+    border-bottom:      none;
+  }
+}
+
+.angular-ui-tree-drag {
+  position:             absolute;
+  background-color:     $white;
+  border:               1px solid $primary-color;
+  box-shadow:           10px 10px 10px #000 !important;
+  pointer-events:       none;
+  opacity:              .9;
+  > li > div > .show .handle {
+    background-color:   $primary-color;
+  }
+}
+
 .user-list-item {
   position:             relative;
   background-color:     $white;
   border:               1px solid $crumb-border-color;
+  @include radius($global-radius);
 
   > a {
     display:            block;
@@ -476,7 +676,7 @@ form .title {
 
 form .permalink {
   .columns {
-    opacity:            0;  
+    opacity:            0;
   }
   .visible {
     opacity:            1 !important;
@@ -575,4 +775,64 @@ form .asset-upload {
 }
 
 @import "foundation-icons";
-@import "tagsinput";
+@import "tagsinput";
+
+
+
+
+
+
+
+//.angular-ui-tree {
+//
+//}
+//
+//.angular-ui-tree-empty {
+//    border: 1px dashed #bbb;
+//    min-height: 100px;
+//    background-color: #e5e5e5;
+//    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+//    background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+//    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff), linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
+//    background-size: 60px 60px;
+//    background-position: 0 0, 30px 30px;
+//}
+//
+//.angular-ui-tree-nodes {
+//  display: block;
+//  position: relative;
+//  margin: 0px;
+//  padding: 0px;
+//  list-style: none;
+//}
+//
+//.angular-ui-tree-nodes .angular-ui-tree-nodes {
+//    padding-left: 20px;
+//}
+//.angular-ui-tree-node, .angular-ui-tree-placeholder {
+//  display: block;
+//  position: relative;
+//  margin: 0px;
+//  padding: 0px;
+//  min-height: 20px;
+//  line-height: 20px;
+//}
+//
+
+//
+//.angular-ui-tree-placeholder {
+//    margin: 5px 0;
+//    padding: 0;
+//    min-height: 30px;
+//}
+//
+//.angular-ui-tree-handle {
+//    cursor: move;
+//    text-decoration: none;
+//    font-weight: bold;
+//    -webkit-box-sizing: border-box;
+//    -moz-box-sizing: border-box;
+//    box-sizing: border-box;
+//    min-height: 20px;
+//    line-height: 20px;
+//}

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

@@ -624,7 +624,7 @@ $form-label-font-color: $aluminum;
 $form-label-bottom-margin: rem-calc(5);
 $input-font-family: inherit;
 $input-font-color: $jet;
-$input-font-size: inherit;
+$input-font-size: rem-calc(16);
 // $input-bg-color: $white;
 // $input-focus-bg-color: scale-color($white, $lightness: -2%);
 // $input-border-color: scale-color($white, $lightness: -20%);

data/app/controllers/push_type/taxonomies_controller.rb

@@ -0,0 +1,36 @@
+require_dependency "push_type/admin_controller"
+
+module PushType
+  class TaxonomiesController < AdminController
+    
+    def index
+      @taxonomies = PushType::Taxonomy.descendants
+    end
+
+    def show
+      @terms = taxonomy.hash_tree.map { |parent, children| json_map(parent, children) }
+    end
+
+    private
+
+    def initial_breadcrumb
+      breadcrumbs.add 'Taxonomies', push_type.taxonomies_path
+    end
+
+    def taxonomy
+      @taxonomy ||= PushType::Taxonomy.descendants.find { |t| t.name.underscore == params[:id] }
+    end
+
+    def json_map(parent, children)
+      {
+        id:         parent.id,
+        title:      parent.title,
+        slug:       parent.slug,
+        sort_order: parent.sort_order,
+        parent_id:  parent.parent_id,
+        children:   children.map { |p, c| json_map(p, c) }
+      }
+    end
+
+  end
+end

data/app/controllers/push_type/taxonomy_terms_controller.rb

@@ -0,0 +1,81 @@
+require_dependency "push_type/admin_controller"
+
+module PushType
+  class TaxonomyTermsController < AdminController
+
+    before_filter :build_term, only: :create
+    before_filter :load_term, only: [:update, :destroy, :position]
+
+    def create
+      respond_to do |format|
+        format.json do
+          if @term.save
+            render json: { term: @term.as_json }, status: :created
+          else
+            render json: { errors: @term.errors }, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def update
+      respond_to do |format|
+        format.json do
+          if @term.update_attributes taxonomy_params
+            head :ok
+          else
+            render json: { errors: @term.errors }, status: :unprocessable_entity
+          end
+        end
+      end
+    end
+
+    def destroy
+      respond_to do |format|
+        format.json do
+          @term.destroy
+          head :ok
+        end
+      end
+    end
+
+    def position
+      respond_to do |format|
+        format.json do
+          reorder_term
+          head :ok
+        end
+      end
+    end
+
+    private
+
+    def taxonomy
+      @taxonomy ||= PushType::Taxonomy.descendants.find { |t| t.name.underscore == params[:taxonomy_id] }
+    end
+
+    def build_term
+      @term = taxonomy.new taxonomy_params
+    end
+
+    def load_term
+      @term = taxonomy.find params[:id]
+    end
+
+    def taxonomy_params
+      params.fetch(taxonomy.name.underscore.to_sym, {}).permit(:id, :title, :slug)
+    end
+
+    def reorder_term
+      if params[:prev]
+        taxonomy.find(params[:prev]).append_sibling(@term)
+      elsif params[:next]
+        taxonomy.find(params[:next]).prepend_sibling(@term)
+      elsif params[:parent]
+        taxonomy.find(params[:parent]).append_child(@term)
+      end
+    end
+
+
+  end
+end

data/app/helpers/push_type/taxonomies_helper.rb

@@ -0,0 +1,6 @@
+module PushType
+  module TaxonomiesHelper
+
+
+  end
+end