ecrire 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e721c37f57738d2e79e23190c75fb346ed10fe7f
-  data.tar.gz: 3ca14baffff90df341b9c2716e1f62415cbc9880
+  metadata.gz: 4ce26477b0912ec3e5e72cdfe31cd7ebaf91367b
+  data.tar.gz: 7cfef2c63d03495c04cc90b97adc668bc653266a
 SHA512:
-  metadata.gz: 2e4047293bd8959c766ebbce0f139b95e7fcf0e89a8181033c76a8bf089ccd793ad32e2695a67df85e7af10e922f6d14221b4098af618a74d44008a9daa9605e
-  data.tar.gz: 7f55372eaea1db2211174634caa89b2b17f3f21c3d69ee2732ce99009b686034183bab6262420db24f0b92374e46c0b3171f1b18f31c750be1eb746659e61255
+  metadata.gz: bee627694b0efe4e26e5b1f23516714635f9fecbade81d20fa8c628c295a8fde2ce271869106608d345c2a5edabed12d00366088bea9cb39220ee7038a4a67eb
+  data.tar.gz: d34158b4a0a0ec3541afa55a2cf5cb222c20e12af7543725d59b5a9c819524704a54db7c18c97029e5ecb456e0bb9871754b46f9e742825a56762af363a9d5db

data/README.md

@@ -1,13 +1,26 @@
 # Ecrire
-
 [![Build Status](https://travis-ci.org/pothibo/ecrire.svg?branch=master)](https://travis-ci.org/pothibo/ecrire)
 
-Ecrire is a blog built *on top* of Ruby on Rails. The goal of this blog engine is to make it **easy** to start a blog while keeping control over the content. You can see this as an alternative to WordPress.
+Ecrire is a blog engine built for web professionals. Most best practices comes builtin for you to quickly create powerful websites.
+
+## How does it work?
+Essentially, Ecrire is a blog engine. It provides a powerful Markdown editor, tags support, drafts, permalinks, image uploads, and everything else you would need to create a website.
+
+Ecrire is built around the concept of themes. When you create a project with Ecrire, you are actually creating a new theme for you to customize to your needs.
+
+## How flexible is a theme?
+You can do pretty much anything you want inside a theme. It is based on Rails::Engine, a foundation block of Ruby on Rails. You can add gems, routes, controllers, views, javascript files, anything.
+
+By default, a theme has 3 type of routes: posts, tags and static. While the first two serve dynamic contents (posts and tags), the third one is a route that handles static pages. This is useful when you want to add an about/FAQ/Contact page that doesn't change much and you want to use normal HTML to render it instead of the Markdown Editor.
+
+Views(HTML) uses by default ERB, a Ruby + HTML template to build dynamic pages. The default theme provides tons of example on how to use ERB to build pages with content written in Markdown.
+
 
 ## The editor
-The editor was built around the Markdown syntax. The content change as you type to offer you a very good approximation of how your post will look like once publish.
 
-Here's the available feature:
+The editor uses Markdown as its syntax. The advantage is to format your text as you type. The syntax is easy to understand and is powerful enough to let you structure your text as you type so you can focus on the content.
+
+Here's the different structures available to you in the editor:
 - Headers
 - Unordered list
 - Ordered list
@@ -16,35 +29,23 @@ Here's the available feature:
 - Links
 - Bold and Italic words
 
-More feature will be implemented as the Editor mature.
-
-## Theme
-When you start a new blog with Ecrire, it will generate a folder for you. Everything in that folder is for you to modify. You won't break anything. It also features a few characteristic that you may recognize if you are a Rails developer.
-
-- SASS
-- Coffeescript
-- Assets caching through Sprockets
-- View using layouts, views and partials
-- Controllers
-- Helpers
-- Static pages
-
-When you install your theme, the documentation will be available direclty within your blog so you can go back to it when you need it.
+You can learn more about the syntax on [Ecrire.io](http://ecrire.io/markdown)
 
-## How to install
+## Get started
+First, you need to install ecrire as a gem and then create a new theme.
 
-```bash
+~~~bash
 $ gem install ecrire
 $ ecrire new my.blog.com
 $ cd my.blog.com/
 $ ecrire server
-```
+~~~
 
-From there, you can access your new blog via the browser and start configuring your database.
+Once the server is started, you can load your browser at **http://localhost:3000** to finish the configuration.
 
-## Heroku
+## Go live on Heroku
 
-Once you have finished your changes in your local environment, here's how you can publish your blog on Heroku.
+Once you're ready to go live, you can use Heroku to deploy your application in production:
 
 ~~~bash
 $ heroku git:remote -a name-of-your-app-on-heroku
@@ -63,4 +64,4 @@ irb(main)> user.save!
 irb(main)> exit
 ~~~
 
-You can now log in to your blog in production and start writing for real!
+

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

@@ -1,6 +1,7 @@
 ObserveJS.bind 'Editor.Save', class
   loaded: =>
-    @on 'keydown', window, @save
+    @on 'click', @save
+    @on 'keydown', window, @shouldSave
     @on 'Editor:loaded', document, @cache
     @on 'Editor:updated', document, @update
     @on 'posts:update', document, @saved
@@ -19,15 +20,18 @@ ObserveJS.bind 'Editor.Save', class
       cache
     @cache()
 
-  save: (e) =>
+  shouldSave: (e) =>
     @cache()
     if e.metaKey isnt true || e.which isnt 83
       return
 
+    @save(e)
+
+  save: (e) =>
     e.preventDefault()
     e.stopPropagation()
 
-    dialog = @element().content.querySelector('#SavePost').cloneNode(true)
+    dialog = @retrieve('#SavePost').cloneNode(true)
     document.body.appendChild(dialog)
 
   saved: (e) =>

data/lib/ecrire/app/assets/stylesheets/admin/base.css.scss

@@ -101,34 +101,35 @@ main {
 }
 
 .button {
-  @include transition(text-shadow 0.3s ease-in, border-color 0.3s, background-color 0.3s, box-shadow 0.3s, color 0.3s);
-  border: 1px solid lighten($navy-blue, 5%);
+  @include transition(text-shadow 0.1s ease-in, border-color 0.1s, background-color 0.1s, box-shadow 0.1s, color 0.1s);
+  border: 1px solid darken($bright-blue, 15%);
   border-radius: 2px;
   text-decoration: none;
   padding: 4px 8px;
   margin: 0 0.5em;
   font-size: 0.8em;
   text-transform: uppercase;
-  font-weight: bolder;
-  box-shadow: inset 0 1px 0 transparent;
-  text-shadow: 0 1px 0 transparent;
+  font-weight: bold;
+  background-color: $bright-blue;
+
+  color: lighten($navy-blue, 100%);
+  box-shadow: inset 0 1px 0 0 lighten($bright-blue, 15%);
 
   &.selected {
-    background-color: lighten($navy-blue, 25%);
-    border-color: lighten($navy-blue, 25%);
-    color: lighten($navy-blue, 100%);
+    background-color: darken($bright-blue, 15%);
+    border-color: darken($bright-blue, 25%);
+    box-shadow: none;
   }
 
   &:hover:not(.selected) {
-    background-color: lighten($navy-blue, 25%);
-    box-shadow: inset 0 1px 0 lighten($navy-blue, 30%), 0 1px 1px lighten($navy-blue, 15%);
-    color: lighten($navy-blue, 60%);
-    text-shadow: 0 1px lighten($navy-blue, 25%);
+    background-color: lighten($bright-blue, 5%);
+    color: lighten($navy-blue, 100%);
+    border-color: darken($bright-blue, 25%);
+    box-shadow: inset 0 1px 0 0 lighten($bright-blue, 15%), 0 0 2px 0 darken($bright-blue, 15%);
   }
 
   &:active:not(.selected) {
-    box-shadow: none;
-    color: lighten($navy-blue, 100%);
-    text-shadow: 0 1px lighten($navy-blue, 25%);
+    box-shadow: inset 0 1px 2px 0 darken($bright-blue, 15%), 0 0 2px 0 transparent;
+    background-color: darken($bright-blue, 5%);
   }
 }

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

@@ -1,20 +1,27 @@
-main.edit.posts > header {
+main.posts > header {
   @include display(flex);
   @include flex(0 auto);
   @include align-items(center);
   @include justify-content(center);
+  @include flex-direction(column);
   background-color: $bright-blue;
+  background-size: cover;
   color: lighten($bright-blue, 50%);
-  min-height: 200px;
+  max-height: 200px;
+  height: 30vh;
 }
 
 main.edit.posts > header > div.title {
   @include display(flex);
+  @include flex(1);
   @include flex-direction(column);
   @include transition(opacity 0.2s linear);
+  @include justify-content(center);
   text-align: center;
   width: 100%;
   z-index: 5;
+  margin: 1em 0;
+
   & > p.browse {
     @include transition(color 0.3s);
     font-size: 0.7em;
@@ -29,7 +36,7 @@ main.edit.posts > header > div.title {
     width: 30px;
     position: absolute;
     right: 1em;
-    top: 1em;
+    bottom: 1em;
     fill: #D8ABAB;
     cursor: pointer;
     &:hover {
@@ -44,8 +51,6 @@ main.edit.posts > header > div.title {
 
   font-size: 2.3em;
   line-height: 1.4em;
-  padding: 0.3em 1em;
-  margin: 0.5em 0 0 0;
   cursor: pointer;
   text-decoration: none;
   color: inherit;
@@ -56,6 +61,23 @@ main.edit.posts > header > div.title {
 
 }
 
+[as='Post.Header'] [as='Editor.Save'] {
+  margin-right: 2em;
+  background-color: darken($green, 10%);
+  box-shadow: inset 0 1px 0 0 lighten($green, 5%);
+  border-color: darken($green, 35%);
+
+  &:hover {
+    background-color: darken($green, 10%);
+    box-shadow: inset 0 1px 0 0 lighten($green, 10%), 0 0 2px 0 darken($green, 30%);
+  }
+
+  &:active {
+    box-shadow: inset 0 1px 2px 0 darken($green, 25%), 0 0 2px 0 transparent;
+    background-color: darken($green, 5%);
+  }
+}
+
 [as='Post.Header'] {
   @include display(flex);
   @include flex-direction(column);
@@ -83,6 +105,7 @@ main.edit.posts > header > div.title {
 
   input[type='file'] {
     visibility: hidden;
+    height: 1px;
   }
 
 }

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

@@ -10,6 +10,7 @@ nav#Menu.admin {
   font-size: 16px;
   font-weight: bold;
   padding: 0 0.5em;
+  z-index: 10;
 
   background-color: darken($gray-blue, 25%);
   color: lighten($gray-blue, 15%);
@@ -18,8 +19,8 @@ nav#Menu.admin {
   text-shadow: 0 -1px darken($light-blue, 75%);
 
   .button {
-    @include transition(text-shadow 0.3s ease-in, border-color 0.3s, background-color 0.3s, box-shadow 0.3s, color 0.3s);
-    border: 1px solid lighten($gray-blue, 15%);
+    @include transition(text-shadow 0.2s ease-in, border-color 0.2s, background-color 0.2s, box-shadow 0.2s, color 0.2s);
+    border: 1px solid darken($navy-blue, 5%);
     border-radius: 2px;
     text-decoration: none;
     padding: 4px 8px;
@@ -27,9 +28,10 @@ nav#Menu.admin {
     font-size: 0.8em;
     text-transform: uppercase;
     font-weight: bolder;
-    box-shadow: inset 0 1px 0 transparent;
-    text-shadow: 0 1px 0 transparent;
-    color: inherit;
+    background-color: lighten($navy-blue, 25%);
+    box-shadow: inset 0 1px 0 lighten($navy-blue, 35%), 0 1px 1px darken($navy-blue, 15%);
+    color: lighten($navy-blue, 60%);
+    text-shadow: 0 1px lighten($navy-blue, 25%);
 
     &.selected {
       background-color: lighten($navy-blue, 25%);
@@ -38,17 +40,14 @@ nav#Menu.admin {
     }
 
     &:hover:not(.selected) {
-      background-color: lighten($navy-blue, 25%);
-      box-shadow: inset 0 1px 0 lighten($navy-blue, 25%), 0 1px 1px darken($navy-blue, 15%);
-      color: lighten($navy-blue, 60%);
-      text-shadow: 0 1px lighten($navy-blue, 25%);
-      border-color: lighten($navy-blue, 25%);
+      border-color: darken($navy-blue, 25%);
     }
 
     &:active:not(.selected) {
-      box-shadow: none;
       color: lighten($navy-blue, 100%);
       text-shadow: 0 1px lighten($navy-blue, 25%);
+      box-shadow: inset 0 0 2px darken($navy-blue, 15%), 0 1px 1px transparent;
+      border-color: darken($navy-blue, 15%);
     }
 
     &.home {
@@ -61,16 +60,16 @@ nav#Menu.admin form.logout {
   @include transition(color 0.3s,background-color 0.3s, border 0.3s, box-shadow 0.3s);
   border: 1px solid lighten($red, 5%);
   border-radius: 2px;
-  color: lighten($red, 5%);
   margin: 0;
   padding: 4px 8px;
   cursor: pointer;
   outline: none;
+  background-color: lighten($red, 5%);
+  color: lighten($red, 30%);
+  box-shadow: inset 0 1px 0 0 lighten($red, 10%), 0 1px 1px darken($red, 20%);
 
   &:hover {
-    background-color: lighten($red, 5%);
-    color: lighten($red, 30%);
-    box-shadow: inset 0 1px 0 0 lighten($red, 10%), 0 1px 1px darken($red, 20%);
+    border-color: darken($red, 10%);
   }
 
   &:active {

data/lib/ecrire/app/assets/stylesheets/admin/posts.css.scss

@@ -44,7 +44,7 @@ main.posts div.done {
   }
 }
 
-main.posts.view > header > nav > div.publish.state {
+main.posts > header > nav > div.publish.state {
   @include transition(background-color 0.2s);
   position: relative;
   padding: 2px;
@@ -52,6 +52,7 @@ main.posts.view > header > nav > div.publish.state {
   width: 10em;
   height: 30px;
   background-color: #dddddd;
+  color: darken($bright-blue, 25%);
   border-radius: 60px;
   cursor: pointer;
   overflow: hidden;
@@ -92,11 +93,11 @@ main.posts.view > header > nav > div.publish.state {
   }
 
   &[published='true'] {
-    background-color: lighten($gray-blue, 5%);
+    background-color: darken($bright-blue, 15%);
 
     label:first-child {
-      background-color: lighten($navy-blue, 25%);
-      color: darken($navy-blue, 25%);
+      background-color: darken($bright-blue, 25%);
+      color: lighten($bright-blue, 50%);
     }
 
     label:last-child {
@@ -117,9 +118,9 @@ main.posts.view > header > nav > div.publish.state {
 }
 
 #PostsIndex header {
+  @include flex-direction(row);
+
   min-height: 200px;
-  @include display(flex);
-  @include align-items(center);
 
   & > section {
     @include flex(1);
@@ -131,8 +132,10 @@ main.posts.view > header > nav > div.publish.state {
   @include display(flex);
   @include align-items(stretch);
 
-  border: 1px solid lighten($gray-blue, 25%);
+  border: 1px solid darken($bright-blue, 10%);
   border-radius: 2px;
+  overflow: hidden;
+  background-color: lighten($gray-blue, 50%);
 
   input {
     @include flex(1);
@@ -141,6 +144,8 @@ main.posts.view > header > nav > div.publish.state {
     font-size: 1.0em;
     margin: 0 auto;
     border: none;
+    border-radius: 0;
+    background-color: inherit;
   }
 
   svg {
@@ -155,6 +160,7 @@ main.posts.view > header > nav > div.publish.state {
     @include transition(background-color 0.3s ease, box-shadow 0.3s ease);
     border-right: 1px solid lighten($gray-blue, 25%);
     cursor: pointer;
+    color: darken($bright-blue, 15%);
 
     &:hover, &.tagged {
       background-color: $light-blue;
@@ -201,11 +207,15 @@ main.posts.view > header > nav > div.publish.state {
   @include justify-content(flex-start);
 
   margin: 2em 1em;
+  max-width: 400px;
+  width: 100%;
 
   & > h3 {
+    @include align-self(center);
     text-align: center;
     font-size: 3em;
     font-weight: bolder;
+    border-bottom: 1px solid $gray-blue;
   }
 
   li {
@@ -213,21 +223,25 @@ main.posts.view > header > nav > div.publish.state {
     @include flex-direction(column);
     @include flex(0 0 auto);
     @include justify-content(space-between);
-    max-width: 400px;
     padding: 1em;
     margin: 0.1em;
     color: darken($navy-blue, 25%);
 
     .title {
-      margin: 1em 0;
+      margin: 0.5em 0;
       font-weight: bolder;
-      font-size: 1.3em;
+      font-size: 1.7em;
       text-decoration: none;
       &:hover {
         text-decoration: underline;
       }
     }
 
+    svg {
+      width: 12px;
+      fill: $gray-blue;
+    }
+
     a {
       color: inherit;
     }
@@ -323,22 +337,27 @@ main.posts.view > header > nav > div.publish.state {
   }
 }
 
-main.posts.view > header {
+main.posts > header {
 
   h2 {
-    margin: 2em 0;
+    @include display(flex);
+    @include flex(1);
+    font-size: 2.3em;
+    margin: 1em 0;
     text-align: center;
-    text-transform: uppercase;
-    color: lighten($gray-blue, 5%);
+    color: lighten($gray-blue, 50%);
   }
 
   nav {
     @include display(flex);
     @include justify-content(space-between);
     @include align-items(center);
-    @include flex(1);
-    padding: 0 1em 1em 1em;
-    border-bottom: 1px solid lighten($gray-blue, 25%);
+    @include flex(0 auto);
+
+    z-index: 100;
+    width: 100%;
+    margin: 2em 0 0 0;
+    padding: 0 1em;
   }
 
 }

data/lib/ecrire/app/assets/stylesheets/admin/tags.css.scss

@@ -132,18 +132,19 @@
       border-color: $red;
       font-weight: bold;
       color: $red;
+      background-color: lighten($red, 15%);
+      text-shadow: 0 1px lighten($red, 25%);
+      box-shadow: inset 0 1px 0 0 lighten($red, 25%), 0 1px 1px darken($red, 15%);
 
       &:hover:not(:active) {
         color: darken($red, 25%);
-        background-color: lighten($red, 15%);
-        text-shadow: 0 1px lighten($red, 25%);
-        box-shadow: inset 0 1px 0 0 lighten($red, 25%), 0 1px 1px darken($red, 15%);
       }
 
       &:active {
         background-color: lighten($red, 15%);
         text-shadow: 0 1px lighten($red, 25%);
         color: darken($red, 25%);
+        box-shadow: inset 0 1px 2px 0 darken($red, 5%), 0 1px 1px transparent;
       }
     }
   }
@@ -208,18 +209,19 @@
   border-color: $red;
   color: $red;
   font-weight: bold;
+  background-color: lighten($red, 15%);
+  text-shadow: 0 1px lighten($red, 25%);
+  box-shadow: inset 0 1px 0 0 lighten($red, 25%), 0 1px 1px darken($red, 15%);
 
   &:hover:not(:active) {
     color: darken($red, 25%);
-    background-color: lighten($red, 15%);
-    text-shadow: 0 1px lighten($red, 25%);
-    box-shadow: inset 0 1px 0 0 lighten($red, 25%), 0 1px 1px darken($red, 15%);
   }
 
   &:active {
     background-color: lighten($red, 15%);
     text-shadow: 0 1px lighten($red, 25%);
     color: darken($red, 25%);
+    box-shadow: inset 0 1px 2px 0 darken($red, 5%), 0 1px 1px transparent;
   }
 }
 

data/lib/ecrire/app/assets/stylesheets/editor/figure.css.scss

@@ -8,6 +8,7 @@ article.content > figure {
 
   &.dropping div[contenteditable] {
     background-color: rgb(122, 199, 122);
+    padding: 1em;
   }
 
   figcaption {

data/lib/ecrire/app/helpers/admin/posts_helper.rb

@@ -2,6 +2,13 @@ module Admin
   module PostsHelper
     include ::PostsHelper
 
+    def post_tags(post)
+      tags = post.tags.map do |tag|
+        tag.name.capitalize
+      end
+      tags.join(', ')
+    end
+
     def edit_content_tag(post)
       content_tag :article, id: 'PostBody', postid: @post.id,
         class: %w(content),

data/lib/ecrire/app/views/admin/posts/_posts.html.erb

@@ -2,7 +2,7 @@
   <h3>Drafts</h3>
   <% drafted.each do |post| %>
     <li>
-      <%= link_to post.title, url('/admin/posts/:post.id', post: post), class: %w(title) %>
+      <%= link_to post.title, url('/admin/posts/:post.id/edit', post: post), class: %w(title) %>
     </li>
   <% end %>
 </ol>
@@ -11,7 +11,16 @@
   <h3>Published</h3>
   <% published.each do |post| %>
     <li>
-      <%= link_to post.title, url('/admin/posts/:post.id', post: post), class: %w(title) %>
+      <%= link_to post.title, url('/admin/posts/:post.id/edit', post: post), class: %w(title) %>
+      <% if post.tags.any? %>
+        <%= content_tag :div, class: %w(tags) do %>
+          <svg version="1.1" class="tag icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+            <path d="M18.662,5.521L5.237,19l0.707-4.967l-4.945,0.709L14.424,1.263c0.391-0.392,1.133-0.308,1.412,0l2.826,2.839 C19.162,4.575,19.053,5.128,18.662,5.521z"/>
+            </svg>
+
+            <%= post_tags(post) %>
+        <% end %>
+      <% end %>
     </li>
   <% end %>
 </ol>

data/lib/ecrire/app/views/admin/posts/edit.html.erb

@@ -1,13 +1,30 @@
-<template as='Editor.Save'>
-  <%= content_tag :div, as: 'Editor.Save.Dialog', id: 'SavePost', href: admin_post_path(@post), method: 'PUT' do %>
-    <div class='progress'></div>
-    <p class='message'>
-      Saving...
-    </p>
-  <% end %>
-</template>
-
 <%= content_tag :header, as: "Post.Header", href: admin_post_image_path(@post), method: 'POST' do |header| %>
+  <nav class='actions'>
+    <div class='meta'>
+      <button class='button' as='Editor.Save'>
+        Save
+        <template for='Editor.Save'>
+          <%= content_tag :div, as: 'Editor.Save.Dialog', id: 'SavePost', href: admin_post_path(@post), method: 'PUT' do %>
+            <div class='progress'></div>
+            <p class='message'>
+              Saving...
+            </p>
+          <% end %>
+        </template>
+      </button>
+
+      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(selected button) %>
+      <%= link_to 'Preview', admin_post_path(@post), class: %w(button) %>
+      <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
+      <%= link_to 'Title', admin_post_titles_path(@post), class: %w(button) %>
+    </div>
+
+
+    <%= content_tag :div, class: %w(publish state), href: admin_post_toggle_path(@post), method: :put, published: @post.published?, as: 'Post.Publish' do %>
+      <label>Published</label>
+      <label>Draft</label>
+    <% end %>
+  </nav>
   <template for='Post.Header'>
     <%= render 'admin/posts/header/dropping', css: %w(status dropping hidden) %>
     <%= render 'admin/posts/header/uploading', css: %w(status uploading hidden) %>

data/lib/ecrire/app/views/admin/posts/show.html.erb

@@ -1,8 +1,9 @@
 <% content_for :class, 'post view' %>
-<header>
-  <%= content_tag :h2, @post.title %>
+
+<%= content_tag :header do |header| %>
   <nav>
     <div class='meta'>
+      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
       <%= link_to 'Preview', admin_post_path(@post), class: %w(selected button) %>
       <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
       <%= link_to 'Title', admin_post_titles_path(@post), class: %w(button) %>
@@ -13,9 +14,14 @@
       <label>Draft</label>
     <% end %>
   </nav>
-</header>
+
+  <%= content_tag :h2, @post.title %>
+
+  <% if @post.header? %>
+    <% header[:style] = "background-image: url(#{@post.header.url});" %>
+  <% end %>
+<% end %>
 
 <section class='preview'>
-  <%= link_to 'Edit this post', edit_admin_post_path(@post) %>
   <%= content_tag :article, @post.compiled_content.try(:html_safe) %>
 <section>

data/lib/ecrire/app/views/admin/posts/tags/index.html.erb

@@ -1,8 +1,9 @@
 <% content_for :class, 'posts view' %>
-<header>
-  <%= content_tag :h2, @post.title %>
+
+<%= content_tag :header do |header| %>
   <nav>
     <div class='meta'>
+      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
       <%= link_to 'Preview', admin_post_path(@post), class: %w(button) %>
       <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(selected button) %>
       <%= link_to 'Title', admin_post_titles_path(@post), class: %w(button) %>
@@ -12,9 +13,14 @@
       <label>Published</label>
       <label>Draft</label>
     <% end %>
-
   </nav>
-</header>
+  
+  <%= content_tag :h2, @post.title %>
+
+  <% if @post.header? %>
+    <% header[:style] = "background-image: url(#{@post.header.url});" %>
+  <% end %>
+<% end %>
 
 <section>
   <svg version="1.1" class="tag icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">

data/lib/ecrire/app/views/admin/posts/titles/index.html.erb

@@ -1,8 +1,9 @@
 <% content_for :class, 'posts view' %>
-<header>
-  <%= content_tag :h2, @post.title %>
+
+<%= content_tag :header do |header| %>
   <nav>
     <div class='meta'>
+      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(button) %>
       <%= link_to 'Preview', admin_post_path(@post), class: %w(button) %>
       <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
       <%= link_to 'Title', admin_post_titles_path(@post), class: %w(selected button) %>
@@ -12,9 +13,14 @@
       <label>Published</label>
       <label>Draft</label>
     <% end %>
-
   </nav>
-</header>
+
+  <%= content_tag :h2, @post.title %>
+
+  <% if @post.header? %>
+    <% header[:style] = "background-image: url(#{@post.header.url});" %>
+  <% end %>
+<% end %>
 
 <section>
   <% if @post.published? %>

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.26.1'
+  VERSION = '0.26.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com