ecrire 0.28.3 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629884e8e58d57c5c64d4f888d93ba8bf33549fb
-  data.tar.gz: 8cf5ac6fe7db70763605200d1d70195bb63a8d93
+  metadata.gz: 972644840a974c24fcf476528edce7ffff3360a5
+  data.tar.gz: 50ab53263e7654829b081cc356a13dde20afcf24
 SHA512:
-  metadata.gz: 9f63c01f342f64ab815edb42ce430c5ebcd07a134f73af6b55e8e578e00a144d51fa8dd51a6262edd0ae1337031e0749420985d7d1a2838788e03f7f74737757
-  data.tar.gz: 4defce3a565e5c53d7696191e6daeb4dd6bda4a94d6b13e71bf588f20cf8c4159a21bf147517a456572f42a5d38534954ab8c5933ada39a4145457dbfae8db3d
+  metadata.gz: 342ed664666e9efa6a4787ceb059aee6608b62a0e1ed647d971d0b847db0d98ffced77f9e97915c136cf318eace3e4d3d2841e8b25fb72d29a42ba0def2945aa
+  data.tar.gz: 7954cd679f01d36420e87b1bd2dc8ae18e0f3fa9cc9e8d480be1f77cb88d1952a277f735eb7eda400c8b0360f30642efaa2a8b0e2dd2891095829d65f51f4189

data/Gemfile

@@ -18,6 +18,6 @@ gem 'coffee-rails',      '~> 4.0'
 gem 'turbolinks',        '~> 2.2'
 gem 'bourbon',           '~> 3.2'
 gem 'uglifier',          '~> 2.5'
-gem 'jbuilder',          '~> 2.2'
+gem 'jbuilder'
 
 gem 'byebug'

data/Rakefile

@@ -66,6 +66,7 @@ namespace :test do
     t.verbose = true
   end
 
+
 end
 
 task :test do
@@ -73,3 +74,24 @@ task :test do
     Rake::Task[name].invoke
   end
 end
+
+
+namespace :template do
+  desc 'Run a server set to use the template theme'
+  task :server do
+    require 'ecrire/commands/server'
+    Dir.chdir 'lib/ecrire/theme/template'
+    Rails.env = ENV['RAILS_ENV'] = 'development'
+    Ecrire::Commands::Server.new(Port: 3000).run!
+  end
+
+  task :routes do
+    Dir.chdir 'lib/ecrire/theme/template'
+    Rails.env = ENV['RAILS_ENV'] = 'development'
+    Ecrire::Application.initialize!
+    all_routes = Ecrire::Application.routes.routes
+    require 'action_dispatch/routing/inspector'
+    inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
+    puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER'])
+  end
+end

data/lib/ecrire/app/assets/javascripts/admin/editor/content.coffee

@@ -3,6 +3,9 @@ ObserveJS.bind 'Editor.Content', class @Editor
   loaded: =>
     @on 'keydown', @linefeed
 
+    if @parsers?
+      return
+
     @parsers = Editor.Parsers.sort()
 
     @extensions = Editor.Extensions.map (ext) =>

data/lib/ecrire/app/assets/javascripts/admin/navigation/save.js.coffee

@@ -31,7 +31,11 @@ ObserveJS.bind 'Editor.Save', class
     e.preventDefault()
     e.stopPropagation()
 
-    dialog = @retrieve('#SavePost').cloneNode(true)
+    dialog = @retrieve('#SavePost')
+
+    if e.type == 'click'
+      dialog.dataset.preview = true
+
     document.body.appendChild(dialog)
 
   saved: (e) =>
@@ -59,7 +63,10 @@ ObserveJS.bind 'Editor.Save.Dialog', class
   saved: (e) =>
     msg = @element().querySelector('.message')
     msg.innerHTML = e.MessageHTML
-    window.setTimeout @remove, 400
+    if @element().dataset.preview == 'true'
+      window.location = @element().getAttribute('href')
+    else
+      window.setTimeout @remove, 400
 
   download: (e) =>
     if e.lengthComputable

data/lib/ecrire/app/assets/javascripts/admin/posts/filter.js.coffee

@@ -0,0 +1,19 @@
+ObserveJS.bind 'Posts.Filter', class
+  loaded: =>
+    for el in @element().elements
+      switch el.type
+        when 'text', 'hidden' then @on 'input', el, @search
+        when 'radio' then @on 'change', el, @search
+
+    document.querySelector('input.search').focus()
+
+  search: =>
+    xhr = new ObserveJS.XHR(@element())
+    for el in @element().elements
+      switch el.type
+        when 'text', 'hidden' then xhr.data.set(el.name, el.value) if el.value.length > 0
+        when 'radio' then xhr.data.set(el.name, el.value) if el.checked == true && el.value.length > 0
+    xhr.send()
+
+    document.querySelector('input.search').focus()
+

data/lib/ecrire/app/assets/javascripts/admin/posts/filters/tags.js.coffee

@@ -15,26 +15,35 @@ ObserveJS.bind 'Posts.Filter.Tags', class
 
     return unless el?
 
+    input = @element().querySelector('input[type=hidden]')
     span = @retrieve('span.tag')
     span.textContent = el.textContent
+    input.value = el.getAttribute('oid')
+
     @retrieve('svg.placeholder').remove()
     @element().appendChild(span)
     @element().appendChild(@retrieve('svg.clear'))
-    @element().setAttribute('tid', el.getAttribute('oid'))
     @element().classList.add 'tagged'
+
     document.querySelector("[as='Overlay']").instance.remove()
-    document.querySelector("[as='Posts.Filter']").instance.search()
-    document.querySelector("[as='Posts.Filter'] input.search").focus()
+
+    @changed(input)
 
   action: =>
+    input = @element().querySelector('input[type=hidden]')
     if @element().classList.contains('tagged')
       @retrieve('svg.clear').remove()
       @retrieve('span.tag').remove()
       @element().appendChild(@retrieve('svg.placeholder'))
       @element().classList.remove('tagged')
-      @element().removeAttribute('tid')
+      input.value = null
+      @changed(input)
     else
       xhr = new ObserveJS.XHR(@element())
       xhr.send()
-    document.querySelector("[as='Posts.Filter']").instance.search()
-    document.querySelector("[as='Posts.Filter'] input.search").focus()
+
+
+  changed: (el) =>
+    event = new Event('input')
+    el.dispatchEvent(event)
+

data/lib/ecrire/app/assets/javascripts/admin/posts/header.coffee

@@ -11,12 +11,24 @@ ObserveJS.bind 'Post.Header', class
 
     @on 'images:create', @refresh
     @on 'images:destroy', @refresh
-    @on 'titles:index', @popup
-    @on 'titles:update', document, @updateTitle
-    @on 'titles:create', document, @updateTitle
 
-  popup: (e) =>
-    document.body.appendChild(e.HTML)
+    @on 'scroll', window, @resize
+
+    @maxHeight = parseFloat(window.getComputedStyle(this.element())['height'])
+
+    @resize()
+
+  resize:  =>
+    height = @maxHeight - window.scrollY
+    if height < 0
+      height = 0
+
+    if height != @maxHeight
+      @element().querySelector('nav').classList.add 'hidden'
+    else
+      @element().querySelector('nav').classList.remove 'hidden'
+
+    @element().style.height = "#{height}px"
 
   show: (el) =>
     @show.container ||= @element().querySelector('div.drop')
@@ -118,7 +130,3 @@ ObserveJS.bind 'Post.Header', class
       @element().style.backgroundImage = null
 
     @clear()
-
-  updateTitle: (e) =>
-    unless e.Errors?
-      @element().querySelector('a.title').textContent = e.Title

data/lib/ecrire/app/assets/javascripts/admin/posts/list.coffee

@@ -0,0 +1,6 @@
+ObserveJS.bind 'Posts.List', class
+  loaded: =>
+    @on 'posts:index', document, @refresh
+
+  refresh: (e) =>
+    @element().innerHTML = e.HTML.innerHTML

data/lib/ecrire/app/assets/javascripts/admin/posts/tags/form.coffee

@@ -0,0 +1,39 @@
+ObserveJS.bind 'Post.Tags.Form', class
+  loaded: =>
+    @on 'input', @search
+    @on 'submit', @send
+    @on 'tags:index', @refresh
+    @on 'tags:create', @append
+
+    @element().querySelector('#TagName').focus()
+
+  send: (e) =>
+    e.preventDefault()
+    e.stopPropagation()
+    ObserveJS.XHR.send(@element())
+
+  search: (e) =>
+    xhr = new ObserveJS.XHR(@element())
+    xhr.method = 'GET'
+    xhr.data.set 'q', e.target.value
+    xhr.send()
+
+  append: (e) =>
+    oid = e.HTML.getAttribute('oid')
+    list = @element().nextElementSibling
+    el = list.querySelector("[oid='#{oid}']")
+
+    if el?
+      el.parentElement.replaceChild(e.HTML, el)
+      return
+
+    el = list.querySelector('li.empty')
+    if el?
+      el.remove()
+      list.appendChild(e.HTML)
+      return
+    
+  refresh: (e) =>
+    sibling = @element().nextElementSibling
+    list = e.HTML.querySelector('ul.tags')
+    @element().parentElement.replaceChild(list, sibling)

data/lib/ecrire/app/assets/javascripts/admin/posts/tags/list.coffee

@@ -0,0 +1,27 @@
+ObserveJS.bind 'Post.Tags.List', class
+  loaded: =>
+    @on 'mouseover', @clear
+    @on 'keydown', @element().parentElement, @navigate
+
+  navigate: (e) =>
+    switch e.keyCode
+      when 40 then @down()
+      when 38 then @up()
+
+  down: =>
+    el = @element().querySelector('li:focus')
+    if el?
+      (el.nextElementSibling || el).focus()
+    else
+      @element().firstElementChild.focus()
+
+  up: =>
+    el = @element().querySelector('li:focus')
+    if el?
+      (el.previousElementSibling || @element().previousElementSibling.querySelector('#TagName')).focus()
+
+  clear: =>
+    el = document.activeElement
+    if el.getAttribute('as') == 'Post.Tags.Tag'
+      el.blur()
+

data/lib/ecrire/app/assets/javascripts/admin/posts/tags/tag.coffee

@@ -0,0 +1,17 @@
+ObserveJS.bind 'Post.Tags.Tag', class
+  loaded: =>
+    @on 'change', @submit
+    @on 'tags:toggle', @update
+    @on 'keypress', @submit
+
+  submit: (e) =>
+    ObserveJS.XHR.send(@element())
+
+  update: (e) =>
+    oid = e.HTML.getAttribute('oid')
+    if @element().getAttribute('oid') == oid
+      activeElement = document.activeElement
+      @element().parentElement.replaceChild(e.HTML, @element())
+      if activeElement == @element()
+        e.HTML.focus()
+

data/lib/ecrire/app/assets/javascripts/admin/posts/tags.coffee

@@ -0,0 +1,11 @@
+ObserveJS.bind 'Post.Tags', class
+  loaded: =>
+    @on 'tags:toggle', document, @refresh
+    @on 'tags:create', document, @refresh
+    @on 'tags:index', @show
+
+  refresh: (e) =>
+    @element().innerHTML = e.TagsHTML.innerHTML
+
+  show: (e) =>
+    document.body.appendChild(e.HTML)

data/lib/ecrire/app/assets/javascripts/admin/posts/title.coffee

@@ -1,44 +1,11 @@
 ObserveJS.bind 'Post.Title', class
   loaded: =>
-    @on 'keydown', @enter
-    @observer = new MutationObserver(@modified)
-    @observer.settings = {
-      childList: true,
-      subtree: true,
-    }
-    @input = @element().querySelector('div.input')
-    @errors = @element().querySelector('ul.errors')
-    @observe()
-    @on 'titles:update', @update
-    @on 'titles:create', @update
-    @input.focus()
+    @on 'titles:index', @show
+    @on 'titles:update', document, @refresh
 
-  dismiss: =>
-    @element().parentElement.instance.remove()
+  show: (e) =>
+    document.body.appendChild(e.HTML)
 
-  update: (e) =>
-    if e.Errors
-      @errors.appendChild(error) for error in e.Errors
-    else
-      @dismiss()
+  refresh: (e) =>
+    @element().textContent = e.HTML.children[0].textContent
 
-  enter: (e) =>
-    if e.keyCode == 13
-      @errors.innerHTML = ''
-      e.stopPropagation()
-      e.preventDefault()
-      @save()
-      return
-
-  modified: (observedMutations) =>
-    @observer.disconnect()
-    @input.innerHTML = @input.textContent
-    @observe()
-
-  observe: =>
-    @observer.observe @input, @observer.settings
-
-  save: =>
-    xhr = new ObserveJS.XHR(@element())
-    xhr.data.set '[title]name', @input.textContent
-    xhr.send()

data/lib/ecrire/app/assets/javascripts/admin/posts/titles.coffee

@@ -0,0 +1,8 @@
+ObserveJS.bind 'Post.Titles', class
+  loaded: =>
+    @on 'titles:update', document, @refresh
+    @on 'titles:create', document, @refresh
+
+  refresh: (e) =>
+    @element().innerHTML = e.HTML.innerHTML
+

data/lib/ecrire/app/assets/javascripts/shared/popup.js.coffee

@@ -1,6 +1,19 @@
-ObserveJS.bind 'Posts.Popup', class
+ObserveJS.bind 'Popup', class
   loaded: =>
-    @on 'posts:index', @show
+    @on 'click', document, @clicked
+    @on 'keyup', document, @escaped
 
-  show: (e) =>
-    document.body.appendChild(e.HTML)
+  clicked: (e) =>
+    el = e.target
+    while el != @element() && el?
+      el = el.parentElement
+
+    unless el?
+      @remove()
+
+  escaped: (e) =>
+    if e.keyCode == 27
+      @remove()
+
+  remove: (e) =>
+    @element().remove()

data/lib/ecrire/app/assets/stylesheets/admin/header.scss

@@ -5,17 +5,50 @@ main.posts > header {
   @include justify-content(center);
   @include flex-direction(column);
 
+  position: fixed;
+  left: 0;
+  right: 0;
+
   background-color: $bright-blue;
   background-size: cover;
   background-position: center left;
 
   color: lighten($bright-blue, 50%);
 
-  height: 30vh;
-  min-height: 200px;
+  height: 200px;
+  min-height: 100px;
+  margin-top: 46px;
+
+  h2 {
+    @include display(flex);
+    @include flex(1);
+    font-size: 2.3em;
+    margin: 1em 0;
+    text-align: center;
+    color: lighten($gray-blue, 50%);
+  }
+
+  nav {
+    @include display(flex);
+    @include justify-content(space-between);
+    @include align-items(center);
+    @include flex(0 auto);
+    @include transition(opacity 0.2s);
+
+    z-index: 100;
+    width: 100%;
+    margin: 2em 0 0 0;
+    padding: 0 1em;
+    position: absolute;
+
+    &.hidden {
+      opacity: 0;
+    }
+  }
+
 }
 
-main.edit.posts > header > div.title {
+main.posts > header > div.title {
   @include display(flex);
   @include flex(1);
   @include flex-direction(column);
@@ -24,7 +57,6 @@ main.edit.posts > header > div.title {
   text-align: center;
   width: 100%;
   z-index: 5;
-  margin: 1em 0;
 
   & > p.browse {
     @include transition(color 0.3s);
@@ -91,7 +123,6 @@ main.edit.posts > header > div.title {
 
   background-size: cover;
   position: relative;
-  padding-bottom: 0.5em;
   border-bottom: 1px solid #E8E8E8;
 
   &.image {
@@ -110,6 +141,7 @@ main.edit.posts > header > div.title {
   input[type='file'] {
     visibility: hidden;
     height: 1px;
+    padding: 0;
   }
 
 }
@@ -198,19 +230,96 @@ main.edit.posts > header > div.title {
   }
 }
 
-main.posts [as='Navigation.Toggle'] {
-  @include flex(0 auto);
-  @include transition(transform 0.2s, color 0.2s);
-  width: 2em;
-  height: auto;
+[as='Post.Header'] div.publish.state {
+  @include transition(background-color 0.2s);
+  position: relative;
+  padding: 2px;
+  width: 10em;
+  height: 30px;
+  background-color: rgba(black, 0.2);
+  color: darken($bright-blue, 25%);
+  border-radius: 60px;
   cursor: pointer;
-  fill: rgba(212, 228, 237, 1);
-  margin: 8px auto;
-  &:hover {
-    fill: #73CDFF;
+  overflow: hidden;
+
+  &:hover label:last-child {
+    background-color: darken(white, 2%);
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.6);
+  }
+
+  label {
+    display: block;
+    position: absolute;
+    font-weight: bold;
+    line-height: 2em;
+    text-indent: 0;
+    top: 1px;
+    left: 1px;
+    bottom: 1px;
+    cursor: pointer;
+    padding: 0 1em;
+  }
+
+  label:first-child {
+    @include transition(background 0.2s, text-indent 0.2s);
+    right: 1px;
+    background-color: #f1f1f1;
+    border-radius: 30px;
+    text-indent: 0;
   }
-  &.active {
-    @include transform(rotate(180deg));
-    fill: #1A5371;
+
+  label:last-child {
+    @include transition(background 0.2s, box-shadow 0.2s, margin 0.2s);
+    width: 28px;
+    background-color: white;
+    border-radius: 100%;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
+    text-indent: 30px;
+  }
+
+  &[published='true'] {
+    background-color: rgba(black, 0.5);
+
+    label:first-child {
+      background-color: darken($bright-blue, 25%);
+      color: lighten($bright-blue, 50%);
+    }
+
+    label:last-child {
+      margin-left: calc(10em - 30px);
+      text-indent: 10em;
+    }
+  }
+
+  &:not([published='true']) {
+    label:first-child {
+      text-indent: -20em;
+    }
+
+    label:last-child {
+    }
+  }
+
+}
+
+#PostsIndex header {
+  @include flex-direction(row);
+  @include flex-wrap(wrap);
+  @include align-items(center);
+  @include align-content(center);
+  @include justify-content(center);
+
+  position: relative;
+  min-height: 200px;
+
+  & > h1 {
+    text-align: center;
+    width: 100%;
+  }
+
+  & > section {
+    @include flex(0 auto);
+    @include display(flex);
   }
 }
+

data/lib/ecrire/app/assets/stylesheets/admin/navigation.scss

@@ -15,7 +15,11 @@ nav#Menu.admin {
   font-size: 16px;
   font-weight: bold;
   padding: 0 2em;
-  z-index: 10;
+  z-index: 1000;
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
 
   background-color: lighten($gray-blue, 25%);
   color: darken($gray-blue, 30%);