type_station 0.0.1.pre → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc0f535d662673d450847fa1b72363c8280c38a
-  data.tar.gz: a600056558b9a35692faf406a2c7b3f2b8cd84b4
+  metadata.gz: 211c046817891ef530fb8e52497e2b362ddf34b3
+  data.tar.gz: 1cb1804ecbddf73afa4cbdf17e940f6587ca3cb2
 SHA512:
-  metadata.gz: afcc7157640ca50284a02207fa981b048d9a81f07f70d7a87af912b79783f44475750871e2e87ff6507f14bb8b33741064e2ec492a17f071e152e9faca62d177
-  data.tar.gz: 975f88b39bfe0f8059662fe30b7f4b9664c9d8f6cfa9431ab94f2d44073f2746f762936199f08c39f89491d9e69850bcff38cd5a137925bee70ab73e6b2a87d7
+  metadata.gz: 87545439337fea12d9ebc0e4c173a25c22fdb320d0d7d42e0a1c5817297ebf64391fad4c4f43df09f5d822e2394d315c02d68ccdf16ef961e051dccd1e4b5200
+  data.tar.gz: 7eca9bd8e7233dfec78f9e334d5f8539ccc6addd61e002216766cd1ad6dcb020515f2dda75ed55252a943a3dda8588173b7514b43eba3263fe9479dc0ee25aef

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

@@ -10,5 +10,17 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery-fileupload/basic
+//= require jquery.cloudinary
 //= require medium-editor
-//= require "type_station/editable_text"
+//= require drop
+//= require vex.combined.min
+//= require type_station/lib/ts
+//= require type_station/lib/models
+//= require_tree ./editables
+//= require type_station/init
+//= require_self
+
+jQuery(function(){
+  window.TS.init();
+});

data/app/assets/javascripts/type_station/editables/admin_bar.js.coffee

@@ -0,0 +1,32 @@
+class window.TS.AdminBar
+  constructor: (@element) ->
+    template = @element.html()
+    $('body').append(template)
+
+    $('#ts-admin-bar-edit').on 'click', ->
+      $('#ts-admin-bar').removeClass('ts-hidden')
+      $('#ts-admin-bar-edit').addClass('ts-hidden')
+      window.TS.enable()
+
+    $('#ts-admin-bar-cancel').on 'click', ->
+      $('#ts-admin-bar').addClass('ts-hidden')
+      $('#ts-admin-bar-edit').removeClass('ts-hidden')
+      window.TS.disable()
+    
+    $('#ts-admin-bar-save').on 'click', ->
+      window.TS.save()
+
+    $('#ts-admin-bar input').on 'change', ->
+      model = window.TS.getModel $(@).data('ts-edit-url')
+      model.set($(@).data('ts-field'), { field: $(@).data('ts-field'), value: $(@).val(), type: 'text' })
+
+    drop = new Drop
+      target: $('#ts-admin-bar .ts-options i')[0]
+      content: $('#ts-admin-bar-options')[0]
+      position: 'bottom center'
+      openOn: 'click'
+      classes: 'drop-theme-arrows-bounce-dark'
+
+  enable: ->
+
+  disable: ->

data/app/assets/javascripts/type_station/editables/file.js.coffee

@@ -0,0 +1,55 @@
+buildUploader = (element, data)->
+  elementId = $(element).attr('id')
+  $input = $('<input/>')
+  $input
+    .attr({type: "file", name: "file", class: 'ts-editable-file-input', 'data-form-data': JSON.stringify(data), 'data-element-id': elementId})
+    .cloudinary_fileupload()
+    .bind 'cloudinaryprogress', (e, data) ->
+      $('.ts-progress-bar').css('width', Math.round((data.loaded * 100.0) / data.total) + '%')
+    .bind 'cloudinarystart', (e, data) ->
+      $(this).prop('disabled', true)
+      $('body').append($('<div>').addClass('ts-progress-bar'))
+    .bind 'cloudinarydone', (e, data) ->
+      $element = $("##{$(this).data('elementId')}")
+      for imageTag in $('.ts-editable-link-tag', $element)
+        $(imageTag).attr('href', $.cloudinary.url(data.result.public_id, {}))
+      $element.data('drop').close()
+      $(this).prop('disabled', false)
+      $('.ts-progress-bar').remove()
+
+      model = window.TS.getModel $element.data('ts-edit-url')
+      model.set($element.data('ts-field'), { field: $element.data('ts-field'), value: {identifier: data.result.public_id}, type: 'file' })
+  $input
+
+setUpDrops = (elements)->
+  drops = []
+
+  for element in elements
+    tsData = $(element).data('tsData')
+    drop = new Drop
+      target: $('.ts-editable-button', element)[0]
+      content: buildUploader(element, tsData)[0]
+      position: 'bottom center'
+      openOn: 'click'
+      classes: 'drop-theme-arrows-bounce-dark'
+    $(element).data('drop', drop)
+    drops.push drop
+
+  drops
+
+class window.TS.EditableFile
+  constructor: (@elements) ->
+    @drops = []
+    for element in elements
+      $(element).append($('<div>').addClass('ts-editable-button').addClass('ts-button').html("<i class='ion-ios-compose-outline'></i>"))
+
+  enable: ->
+    @disable()
+    @drops = setUpDrops(@elements)
+
+  disable: ->
+    for drop in @drops
+      drop.close()
+      drop.remove()
+      drop.destroy()
+    @drops = []

data/app/assets/javascripts/type_station/editables/image.js.coffee

@@ -0,0 +1,56 @@
+buildUploader = (element, data)->
+  elementId = $(element).attr('id')
+  $input = $('<input/>')
+  $input
+    .attr({type: "file", name: "file", class: 'ts-editable-image-input', 'data-form-data': JSON.stringify(data), 'data-element-id': elementId})
+    .cloudinary_fileupload()
+    .bind 'cloudinaryprogress', (e, data) ->
+      $('.ts-progress-bar').css('width', Math.round((data.loaded * 100.0) / data.total) + '%')
+    .bind 'cloudinarystart', (e, data) ->
+      $(this).prop('disabled', true)
+      $('body').append($('<div>').addClass('ts-progress-bar'))
+    .bind 'cloudinarydone', (e, data) ->
+      $element = $("##{$(this).data('elementId')}")
+      for imageTag in $('.ts-editable-image-tag', $element)
+        $(imageTag).attr('src', $.cloudinary.url(data.result.public_id, $(imageTag).data()))
+      $element.data('drop').close()
+      $(this).prop('disabled', false)
+      $('.ts-progress-bar').remove()
+
+      model = window.TS.getModel $element.data('ts-edit-url')
+      model.set($element.data('ts-field'), { field: $element.data('ts-field'), value: {identifier: data.result.public_id}, type: 'image' })
+
+  $input
+
+setUpDrops = (elements)->
+  drops = []
+
+  for element in elements
+    tsData = $(element).data('tsData')
+    drop = new Drop
+      target: $('.ts-editable-button', element)[0]
+      content: buildUploader(element, tsData)[0]
+      position: 'bottom center'
+      openOn: 'click'
+      classes: 'drop-theme-arrows-bounce-dark'
+    $(element).data('drop', drop)
+    drops.push drop
+
+  drops
+
+class window.TS.EditableImage
+  constructor: (@elements) ->
+    @drops = []
+    for element in elements
+      $(element).append($('<div>').addClass('ts-editable-button').addClass('ts-button').html("<i class='ion-ios-compose-outline'></i>"))
+
+  enable: ->
+    @disable()
+    @drops = setUpDrops(@elements)
+
+  disable: ->
+    for drop in @drops
+      drop.close()
+      drop.remove()
+      drop.destroy()
+    @drops = []

data/app/assets/javascripts/type_station/editables/new_model.js.coffee

@@ -0,0 +1,72 @@
+buildFields = (element) ->
+  $element = $(element)
+  $ul = $('<ul/>')
+  tsFields = $element.data('tsFields')
+  tsNewUrl = $element.data('tsNewUrl')
+  tsParentId = $element.data('tsParentId')
+
+  for field in tsFields
+    $li = $('<li/>')
+    $input = $('<input/>')
+
+    $input
+      .attr({type: "text", name: "text", placeholder: field})
+      .data({'ts-field': field, 'ts-new-url': tsNewUrl})
+      .on 'change', (e) ->
+        $(@).parent().parent().data($(@).data('ts-field'), $(@).val())
+      .appendTo($li)
+
+    $li.appendTo($ul)
+
+  $li = $('<li/>')
+  $button = $('<button/>')
+  $button
+    .html('<i class="ion-ios-checkmark-outline"></i>')
+    .addClass('ts-button')
+    .addClass('ts-button-primary')
+    .data({'ts-field': field, 'ts-new-url': tsNewUrl, 'ts-parent-id': tsParentId})
+    .on 'click', ->
+      data = {}
+      data[$(@).data('ts-field')] = $(@).parent().parent().data($(@).data('ts-field'))
+      data['parent_id'] = $(@).data('ts-parent-id') if $(@).data('ts-parent-id') 
+      console.log data
+      $.ajax
+        type: "POST"
+        url: $(@).data('ts-new-url')
+        dataType: 'json'
+        contentType: 'application/json'
+        data: JSON.stringify(data)
+        success: (data, status) -> window.location.reload()
+    .appendTo($li)
+  $li.appendTo($ul)
+
+  $ul
+
+setUpDrops = (elements)->
+  drops = []
+  for element in elements
+    drop = new Drop
+      target: $(element)[0]
+      content: buildFields(element)[0]
+      position: 'bottom center'
+      openOn: 'click'
+      classes: 'drop-theme-arrows-bounce-dark'
+    $(element).data('drop', drop)
+    drops.push drop
+
+  drops
+
+class window.TS.NewModel
+  constructor: (@elements) ->
+    @drops = []
+
+  enable: ->
+    @disable()
+    @drops = setUpDrops(@elements)
+
+  disable: ->
+    for drop in @drops
+      drop.close()
+      drop.remove()
+      drop.destroy()
+    @drops = []

data/app/assets/javascripts/type_station/editables/text_html.js.coffee

@@ -0,0 +1,38 @@
+class window.TS.EditableText
+  constructor: (@elements) ->
+    @editor = new MediumEditor @elements,
+      disableReturn: true
+      buttons: ['bold', 'italic', 'underline', 'anchor']
+    @editor.deactivate()
+
+  enable: ->
+    @editor.activate()
+    @elements.on 'input', ->
+      model = window.TS.getModel $(@).data('ts-edit-url')
+      if $(@).is(':input')
+        model.set($(@).data('ts-field'), { field: $(@).data('ts-field'), value: $(@).val(), type: 'text' })
+      else
+        model.set($(@).data('ts-field'), { field: $(@).data('ts-field'), value: $(@).html(), type: 'text' })
+
+  disable: ->
+    @editor.deactivate()
+    @elements.off 'input'
+
+
+class window.TS.EditableHtml
+  constructor: (@elements) ->
+    @editor = new MediumEditor @elements,
+      buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'unorderedlist', 'orderedlist', 'justifyLeft', 'justifyFull', 'justifyCenter', 'justifyRight']
+    @editor.deactivate()
+
+  enable: ->
+    @editor.activate()
+    @elements.on 'input', ->
+      model = window.TS.getModel $(@).data('ts-edit-url')
+      if $(@).is(':input')
+        model.set($(@).data('ts-field'), { field: $(@).data('ts-field'), value: $(@).val(), type: 'html' })
+      else
+        model.set($(@).data('ts-field'), { field: $(@).data('ts-field'), value: $(@).html(), type: 'html' })
+  disable: ->
+    @editor.deactivate()
+    @elements.off 'input'

data/app/assets/javascripts/type_station/init.js.coffee

@@ -0,0 +1,26 @@
+window.TS.models = new window.TS.Store
+window.TS.editors = new window.TS.Store
+
+window.TS.getModel = (url) ->
+  model = @models.get url
+  unless model
+    model = new window.TS.Model url
+    @models.set url, model
+  model
+
+window.TS.enable = ->
+  @editors.each (id, editor) -> editor.enable()
+
+window.TS.disable = ->
+  @editors.each (id, editor) -> editor.disable()
+
+window.TS.save = ->
+  @models.each (id, model) -> model.save()
+
+window.TS.init = ->
+  @editors.set 'ts-admin-bar', new window.TS.AdminBar $('#ts-admin-bar-template')
+  @editors.set 'ts-editable-text', new window.TS.EditableText $('span.ts-editable-text')
+  @editors.set 'ts-editable-html', new window.TS.EditableHtml $('.ts-editable-html')
+  @editors.set 'ts-editable-image', new window.TS.EditableImage $('.ts-editable-image')
+  @editors.set 'ts-editable-file', new window.TS.EditableFile $('.ts-editable-file')
+  @editors.set 'ts-new-model', new window.TS.NewModel $('.ts-new-model')

data/app/assets/javascripts/type_station/lib/models.js.coffee

@@ -0,0 +1,25 @@
+class window.TS.Store
+  constructor: (@id = null) ->
+    @STORE = {}
+  get: (key) -> @STORE[key]
+  set: (key, value) -> @STORE[key] = value
+
+  each: (callback) -> 
+    for key, value of @STORE
+      callback?(key, value)
+
+class window.TS.Model extends window.TS.Store
+  save: (callback = ->) ->
+    self = @
+    data = []
+
+    for key, value of @STORE
+      data.push(value)
+
+    $.ajax
+      type: "PATCH"
+      url: self.id
+      dataType: 'json'
+      contentType: 'application/json'
+      data: JSON.stringify({contents: data})
+      success: (data) -> callback(data)

data/app/assets/javascripts/type_station/lib/ts.js.coffee

@@ -0,0 +1 @@
+window.TS = {}

data/app/assets/stylesheets/type_station/admin_bar.css.scss

@@ -0,0 +1,84 @@
+body {
+  padding-bottom: 50px;
+}
+
+
+#ts-admin-bar-edit {
+  position: fixed;
+  left: 5px;
+  bottom: 5px;
+  width: 100px;
+  button {
+    line-height: 1.5em;
+    padding: 0px 10px;
+    i {
+      font-size: 2em;
+    }
+  }
+}
+
+#ts-admin-bar {
+  position: fixed;
+  background: #fff;
+  border-top: 3px solid #ccc;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  padding: 0px;
+  margin: 0px;
+  font-family: Tahoma, Geneva, sans-serif;
+
+  ul { 
+    display: table;
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+    padding: 0px;
+    li {
+      display: table-cell;
+      margin: 0px;
+      padding: 0px;
+      vertical-align: middle;
+
+      &.ts-brand {
+        background: #57ad68;
+        color: #fff;
+        text-align: center;
+        text-transform: uppercase;
+      }
+
+      &.ts-title {
+        width: 78%;
+        input {
+          display: block;
+          width: 100%;
+          border: 0px;
+          outline: none;
+          padding: 7px 15px;
+          font-size: 1.4em;
+        }
+      }
+
+      &.ts-actions {
+        width: 15%;
+
+        .ts-button-group {
+          width: 100%;
+        }
+
+        button {
+          width: 30%;
+          line-height: 1.5em;
+          i {
+            font-size: 2em;
+          }
+        }
+
+        .ts-button-primary {
+          width: 40%;
+        }
+      }
+    }
+
+  } 
+}

data/app/assets/stylesheets/type_station/application.css

@@ -12,6 +12,9 @@
  *
  *= require medium-editor/medium-editor
  *= require medium-editor/themes/flat
+ *= require drop-theme-arrows-bounce-dark
+ *= require vex
+ *= require vex-theme-os
  *= require_tree .
  *= require_self
  */

data/app/assets/stylesheets/type_station/base.css.scss

@@ -0,0 +1,42 @@
+.ts-button-group {
+  display: table;
+  button {
+    display: table-cell;
+  }
+}
+
+.ts-hidden {
+  display: none;
+}
+
+.ts-button {
+  font-size: 1em;
+  background: #eee;
+  color: #444;
+  border: 0px;
+  padding: 7px 5px;
+  margin: 0px;
+  outline: none;
+  font-family: Tahoma, Geneva, sans-serif;
+}
+
+.ts-button-primary {
+  background: #57ad68;
+  color: #fff;
+}
+
+.ts-progress-bar {
+  width: 0;
+  height: 5px;
+  background: #57ad68;
+  position: fixed;
+  top: 0px;
+  left: 0px;
+}
+
+.ts-editable-image, .ts-editable-file { position: relative;}
+.ts-editable-button {
+  position: absolute;
+  top:0px;
+  right: 0px;
+}

data/app/controllers/type_station/admin/pages_controller.rb

@@ -1,6 +1,21 @@
 module TypeStation
   module Admin
     class PagesController < ::TypeStation::AdminController
+
+      def create
+        @page = TypeStation::Page.new(title: params[:title])
+
+        if params[:parent_id]
+          parent_page = TypeStation::Page.find(params[:parent_id]) 
+          @page.parent = parent_page
+        end
+
+        if @page.save
+          render json: { status: :success, url: @page.path }, status: :ok
+        else
+          render json: @page.errors, status: :unprocessable_entity
+        end
+      end
       
       def update
         @page = TypeStation::Page.find(params[:id])
@@ -15,7 +30,7 @@ module TypeStation
       private
 
       def contents
-        [params[:contents]].flatten
+        [params[:contents]].compact.flatten
       end
 
     end

data/app/presenters/type_station/content_presenter.rb

@@ -6,32 +6,5 @@ module TypeStation
       content.get
     end
 
-    def call(&block)
-      case content.type
-      when :image, :file
-        block.call(OpenStruct.new(content.get))
-      when :multiple_select
-        block.call(content.get)
-      when :html
-        content.get.html_safe
-      else
-        content.get
-      end.to_s
-    end
-
-    private
-
-    def image_struct
-      OpenStruct.new({url: content.get, alt: ''})
-    end
-
-    def image_struct
-      OpenStruct.new({url: '', alt: ''})
-    end
-
-    def select_struct
-      OpenStruct.new({value: content.get, values: content.get })
-    end
-
   end
 end

data/app/presenters/type_station/page_presenter.rb

@@ -1,7 +1,7 @@
 module TypeStation
   class PagePresenter < BasePresenter
     presents :page
-    delegate :to_param, :path, :slug, :template_name, :template_name?, :redirect_to, :redirect?, to: :page
+    delegate :to_param, :title, :path, :slug, :template_name, :template_name?, :redirect_to, :redirect?, to: :page
 
     def initialize(object, template)
       super(object, template)
@@ -12,10 +12,6 @@ module TypeStation
       h.type_station.admin_page_url(page)
     end
 
-    def title
-      ContentPresenter.new(OpenStruct.new({type: :text, get: page.title}), @template)
-    end
-
     def children
       @children ||= page.children.map {|p| PagePresenter.new(p, @template)}
     end

data/app/views/type_station/toolbars/_admin_bar.html.haml

@@ -0,0 +1,29 @@
+#ts-admin-bar-edit
+  %button.ts-button.ts-button-primary 
+    %i.ion-ios-compose-outline
+
+#ts-admin-bar.ts-hidden
+  %ul
+    %li.ts-brand
+      ts
+    %li.ts-title
+      = text_field_tag 'page_title', model.try(:title), data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: :title, ts_data: {}}
+    %li.ts-actions
+      .ts-button-group
+        %button.ts-button.ts-options
+          %i.ion-ios-gear
+        %button#ts-admin-bar-cancel.ts-button
+          %i.ion-ios-close-outline
+        %button#ts-admin-bar-save.ts-button.ts-button-primary 
+          %i.ion-ios-checkmark-outline
+
+#ts-admin-bar-options
+  %ul
+    %li
+      Options 1
+    %li
+      Options 2
+    %li
+      Options 3
+    %li
+      Options 4

data/config/routes.rb

@@ -2,7 +2,7 @@ TypeStation::Engine.routes.draw do
   root :to => 'pages#index'
 
   namespace :admin, path: "_admin" do
-    resources :pages, only: [:update]
+    resources :pages, only: [:create, :update]
   end
 
   match "*path", to: "pages#show", via: :all

data/lib/type_station/version.rb

@@ -3,7 +3,7 @@ module TypeStation
     MAJOR = 0
     MINOR = 0
     TINY  = 1
-    PRE   = 'pre'
+    PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
 end

data/lib/type_station/view_helpers.rb

@@ -5,9 +5,16 @@ module TypeStation
       result = ''
       presenter = model.try(key)
       type = options[:type] || :text
+      id = options[:id] || "#{model.to_param}-#{key}-#{SecureRandom.hex(3)}"
+      data = options[:data] || {}
 
       if presenter.present?
-        result += presenter.call(&block)
+        result += case type
+        when :image, :file
+          capture(OpenStruct.new(presenter.value), &block)
+        else
+          presenter.value
+        end
       else
         result += capture(OpenStruct.new({}), &block)
       end
@@ -15,26 +22,68 @@ module TypeStation
       if type_station_current_user
         case type
         when :text
-          content_tag(:span, result, class: 'ts-editable-text', id: "#{model.to_param}-#{key}", data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key})
+          content_tag(:span, result.html_safe, class: 'ts-editable-text', id: id, data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key, ts_data: data})
         when :html
-          content_tag(:div, result.html_safe, class: 'ts-editable-html', id: "#{model.to_param}-#{key}", data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key})
-        when :image
-          content_tag(:div, result, class: 'ts-editable-image', data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key})
+          content_tag(:div, result.html_safe, class: 'ts-editable-html', id: id, data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key, ts_data: data})
+        when :image, :file
+          data = Cloudinary::Utils.sign_request(Cloudinary::Uploader.build_upload_params({}), {}) rescue {}
+          content_tag(:div, result.html_safe, class: "ts-editable-#{type}", id: id, data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key, ts_data: data })
         when :select
-          content_tag(:div, result, class: 'ts-editable-select', data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key})
+          content_tag(:div, result.html_safe, class: 'ts-editable-select', id: id, data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key, ts_data: data})
         when :multiple_select
-          content_tag(:div, result, class: 'ts-editable-multiple-select', data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key})
+          content_tag(:div, result.html_safe, class: 'ts-editable-multiple-select', id: id, data: {ts_id: model.to_param, ts_edit_url: model.edit_url, ts_field: key, ts_data: data})
         end
       else
         result
       end
     end
 
-    def inline_edit_js
+    def ts_new(name_or_url, options = {}, &block)
+      content_tag = options[:content_tag] || :div
+      parent = options[:parent] || nil
+      fields = options[:fields] || ['title']
+
+      if parent.is_a?(String)
+        parent_id = parent
+      else
+        parent_id = parent.to_param
+      end
+
+      if name_or_url.is_a?(Symbol)
+        url = case name_or_url
+        when :page
+          type_station.admin_pages_url
+        end
+      else
+        url = name_or_url
+      end
+
+      result = capture(&block)
+
+      content_tag(content_tag, result.html_safe, class: 'ts-new-model', data: {ts_new_url: url, ts_parent_id: parent_id, ts_fields: fields})
+    end
+
+    def ts_image_tag(identifier, options = {})
+      css_class = options.delete(:class) if options.include?(:class)
+      cl_image_tag(identifier, options.merge({class: ['ts-editable-image-tag', css_class], data: options}))
+    end
+
+    def ts_link_to(identifier, html_options = nil, &block)
+      css_class = html_options.delete(:class) if html_options.include?(:class)
+      content_tag(:a, nil, html_options.merge({class: ['ts-editable-link-tag', css_class], href: cloudinary_url(identifier)}), &block)
+    end
+
+    def type_station_admin_toolbar(model)
+      type_station_toolbar('ts-admin-bar', model, 'admin_bar')
+    end
+
+    def type_station_init
       result = ''.html_safe
       if type_station_current_user
-      # TODO INIT JS
-        result << type_station_toolbar('ts-editable-text-toolbar', 'text')
+        result << stylesheet_link_tag("//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css")
+        result << stylesheet_link_tag("type_station/application", media: "all")
+        result << javascript_include_tag("type_station/application") 
+        result << cloudinary_js_config     
       end
       result
     end
@@ -43,12 +92,12 @@ module TypeStation
       instance_eval &TypeStation.config.current_user
     end
 
-    def type_station_toolbar(id, partial_name = 'text')
-      type_station_template(id, render(partial: "type_station/toolbars/#{partial_name}").html_safe)
+    def type_station_toolbar(id, model, partial_name)
+      type_station_template([id, 'template'].join('-'), render(partial: "type_station/toolbars/#{partial_name}", locals: {model: model}).html_safe)
     end
 
-    def type_station_template(id, content)
-      content_tag :script, content, id: id, type: 'text/x-type-station-template'
+    def type_station_template(id, content, type = 'text/x-type-station-template')
+      content_tag :script, content, id: id, type: type
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: type_station
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1
 platform: ruby
 authors:
 - Richard Adams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: jquery-fileupload-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cloudinary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,8 +189,17 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/type_station/application.js
-- app/assets/javascripts/type_station/editable_text.js.coffee
+- app/assets/javascripts/type_station/editables/admin_bar.js.coffee
+- app/assets/javascripts/type_station/editables/file.js.coffee
+- app/assets/javascripts/type_station/editables/image.js.coffee
+- app/assets/javascripts/type_station/editables/new_model.js.coffee
+- app/assets/javascripts/type_station/editables/text_html.js.coffee
+- app/assets/javascripts/type_station/init.js.coffee
+- app/assets/javascripts/type_station/lib/models.js.coffee
+- app/assets/javascripts/type_station/lib/ts.js.coffee
+- app/assets/stylesheets/type_station/admin_bar.css.scss
 - app/assets/stylesheets/type_station/application.css
+- app/assets/stylesheets/type_station/base.css.scss
 - app/controllers/type_station/admin/pages_controller.rb
 - app/controllers/type_station/admin_controller.rb
 - app/controllers/type_station/application_controller.rb
@@ -174,7 +211,7 @@ files:
 - app/presenters/type_station/content_presenter.rb
 - app/presenters/type_station/page_presenter.rb
 - app/views/layouts/type_station/application.html.erb
-- app/views/type_station/toolbars/_text.html.haml
+- app/views/type_station/toolbars/_admin_bar.html.haml
 - config/routes.rb
 - lib/tasks/type_station_tasks.rake
 - lib/type_station.rb
@@ -199,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/app/assets/javascripts/type_station/editable_text.js.coffee

@@ -1,54 +0,0 @@
-jQuery ->
-
-  elements = document.querySelectorAll('.ts-editable-text')
-  window.t = editor = new MediumEditor elements,
-    disableReturn: true
-    buttons: ['bold', 'italic', 'underline', 'anchor']
-
-
-  elements = document.querySelectorAll('.ts-editable-html')
-  window.t = editor = new MediumEditor elements,
-    buttons: ['bold', 'italic', 'underline', 'anchor', 'header1', 'header2', 'unorderedlist', 'orderedlist', 'justifyLeft', 'justifyFull', 'justifyCenter', 'justifyRight']
-
-  $('.ts-editable-text').on 'input', ->
-    console.log this
-
-#   textParserRules =
-#     tags:
-#       strong: {}
-#       b: {}
-#       i: {}
-#       em: {}
-#       br: {}
-#       p:
-#         unwrap: 1
-#       div:
-#         unwrap: 1
-#       span:
-#         unwrap: 1
-#       ul:
-#         unwrap: 1
-#       ol:
-#         unwrap: 1
-#       li:
-#         unwrap: 1
-#       a:
-#         check_attributes:
-#           href:   "url" # important to avoid XSS
-  
-#   $('.ts-editable-text').each (i)->
-#     $this = $(@)
-#     data = $this.data()
-#     offset = $this.offset()
-#     console.log data
-#     #Set up ID
-#     toolbarId = "#{data.tsId}-#{i}-toolbar"
-#     $($('#ts-editable-text-toolbar').html())
-#       .attr('id', toolbarId)
-#       .css({ position: 'absolute', top: (offset.top - 20), left: offset.left})
-#       .appendTo('body')
-
-#     window.t = editor = new wysihtml5.Editor @,
-#       toolbar:  toolbarId
-#       parserRules: textParserRules
-#       contentEditableMode: true

data/app/views/type_station/toolbars/_text.html.haml

@@ -1,3 +0,0 @@
-.ts-editable-text-toolbar
-  <a data-wysihtml5-command="bold">bold</a>
-  <a data-wysihtml5-command="italic">italic</a>