lines-engine 0.6.2 → 0.9.0

data/app/views/lines/admin/articles/new.html.erb

@@ -15,13 +15,6 @@
   </div>
 <% end %>
 
-<div class="row">
-  <div class="span8">
-    <div class="form-box">
-      <%= render 'lines/admin/articles/form' %>
-    </div>
-  </div>
-  <div class="span4 picture-box">
-    <%= render 'lines/admin/articles/picture_box' %>
-  </div>
-</div>
+
+<%= render 'lines/admin/articles/form' %>
+<%= render 'lines/admin/articles/picture_box' %>

data/app/views/lines/admin/articles/show.html.erb

@@ -1,6 +1,8 @@
-<%= render_navbar do %>
-  <%= link_to 'Edit', edit_admin_article_path(@article), :class => "btn btn-edit" %>
-  <%= button_to (@article.published ? "Unpublish" : "Publish"), admin_article_toggle_publish_path(@article), :class => "btn btn-publish" %>
+<%= content_for :navbar do  %>
+  <%= render_navbar do %>
+    <%= button_to (@article.published ? "Unpublish" : "Publish"), admin_article_toggle_publish_path(@article), :class => "btn btn-save-publish highlight" %>
+    <%= link_to 'Edit', edit_admin_article_path(@article), :class => "btn btn-edit" %>
+  <% end %>
 <% end %>
 
-<%= render "lines/articles/article", :article_counter => -1, :article => @article %>
+<%= render @article, article_counter: -1 %>

data/app/views/lines/admin/authors/_form.html.erb

@@ -1,52 +1,23 @@
 <%= simple_form_for([:admin, @author]) do |f| %>
   <div class="new-author">
-    <div class="row">
-      <div class="label">
-        <h3>
-          <%= f.label :name, "Name" %>
-        </h3>
-      </div>
-      <div class="input">
-        <%= f.text_field :name %>
-      </div>
-      <div class="additional"></div>
+
+    <h2>New Author</h2>
+
+    <div class="input-field">
+      <%= f.text_field :name, placeholder: "Name *" %>
     </div>
-    <div class="row">
-      <div class="label">
-        <h3>
-          <%= f.label :email, "E-Mail" %>
-        </h3>
-      </div>
-      <div class="input">
-        <%= f.text_field :email %>
-      </div>
-      <div class="additional"></div>
+    <div class="input-field">
+      <%= f.text_area :description, placeholder: "Description *", rows: 1 %>
     </div>
-    <div class="row">
-      <div class="label">
-        <h3>
-          <%= f.label :gplus_profile, "G+ Profile" %>
-        </h3>
-      </div>
-      <div class="input">
-        <%= f.text_field :gplus_profile %>
-      </div>
-      <div class="additional"></div>
+    <div class="input-field">
+      <%= f.text_field :email, placeholder: "E-Mail *" %>
     </div>
-    <div class="row">
-      <div class="label">
-        <h3>
-          <%= f.label :description, "Description" %>
-        </h3>
-      </div>
-      <div class="input">
-        <%= f.text_area :description %>
-      </div>
-      <div class="additional"></div>
+    <div class="input-field">
+      <%= f.text_field :gplus_profile, placeholder: "Website" %>
     </div>
 
     <%= render_navbar do %>
-      <%= f.submit "Save Author", class: "btn btn-save-publish" %>
+      <%= f.submit "Save Author", class: "btn btn-save-publish highlight" %>
       <%= link_to 'Cancel', admin_authors_path, class: 'btn btn-cancel' %>
     <% end %>  
 

data/app/views/lines/admin/authors/index.html.erb

@@ -1,7 +1,6 @@
 <%= render_navbar do %>
-  <%= link_to 'New Author', new_admin_author_path, class: "btn btn-new-author" %>
-  <%= link_to 'Articles', admin_articles_path, class: "btn btn-articles" %>
-  <%= link_to 'Visit Blog', lines.root_path, class: "btn btn-view-blog" %>
+  <%= link_to 'New Author', new_admin_author_path, class: "btn btn-new-author highlight" %>
+  <%= link_to 'Dashboard', lines.admin_root_path, class: "btn btn-view-blog" %>
 <% end %>
 
 <% if defined?(@author) && @author.errors.any? %>
@@ -20,15 +19,21 @@
 <h2>All authors</h2>
 <div class="authors-list">
   <% @authors.each do |author| %>
-    <table class="author">
-      <tr>
-        <td class="show"><%= link_to '', admin_author_path(author) %></td>
-        <td class="edit"><%= link_to '', edit_admin_author_path(author) %></td>
-        <td class="name"><%= link_to author.name, edit_admin_author_path(author) %></td>
-        <td class="email"><%= author.email %></td>
-        <td class="delete"><%= link_to '', admin_author_path(author), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-        <td class="delete"><%= button_to "", {controller: :authors, action: 'destroy', id: author.id }, method: :delete, confirm: "Are you sure?" %></td>
-      </tr>
-    </table>
+    <div class="author">
+      <div class="name">
+        <%= link_to author.name, admin_author_path(author) %>
+      </div>
+      <div class="email">
+        <%= link_to author.email, edit_admin_author_path(author) %>
+      </div>
+      <div class="actions">
+        <div class="left">
+          <%= link_to "Edit", edit_admin_author_path(author), class: "btn-edit" %>
+        </div>
+        <div class="right">
+          <%= link_to "", {controller: :authors, action: 'destroy', id: author.id}, data: { confirm: "Are you sure?" }, class: "btn-delete icon-delete", method: :delete %>
+        </div>
+      </div>
+    </div>
   <% end %>
 </div>

data/app/views/lines/admin/authors/show.html.erb

@@ -1,53 +1,24 @@
-<div class="new-author">
-  <div class="row show">
-    <div class="label">
-      <h3>
-        Name
-      </h3>
-    </div>
-    <div class="input">
+<%= render_navbar do %>
+  <%= link_to 'Edit', edit_admin_author_path(@author), class: "btn btn-new-author highlight" %>
+  <%= link_to 'Dashboard', lines.admin_root_path, class: "btn btn-view-blog" %>
+<% end %>
+
+<div class="articles-list">
+  <div class="article published">
+    <div class="title">
       <%= @author.name %>
     </div>
-    <div class="additional"></div>
-  </div>
-  <div class="row show">
-    <div class="label">
-      <h3>
-        E-Mail
-      </h3>
-    </div>
-    <div class="input">
-      <%= @author.email %>
-    </div>
-    <div class="additional"></div>
-  </div>
-  <div class="row show">
-    <div class="label">
-      <h3>
-        G+ Profile
-      </h3>
-    </div>
-    <div class="input">
-      <%= link_to @author.gplus_profile, @author.gplus_profile %>
-    </div>
-    <div class="additional"></div>
-  </div>
-  <div class="row show">
-    <div class="label">
-      <h3>
-        Description
-      </h3>
+    <div class="subtitle">
+      <%= markdown @author.description %>
     </div>
-    <div class="input">
-      <%= @author.description %>
+    <div class="actions">
+      <div class="left">
+        <%= mail_to @author.email, @author.email  %>
+      </div>
+      <div class="right">
+        <%= link_to "Website", @author.gplus_profile, class: "btn-unpublish" unless @author.gplus_profile.empty? %>
+      </div>
     </div>
-    <div class="additional"></div>
   </div>
-  <br />
-  <br />
-  <br />
-  <%= render_navbar do %>
-    <%= link_to 'Edit', edit_admin_author_path(@author), class: "btn btn-save-publish" %>
-    <%= link_to 'Back', admin_authors_path, class: "btn btn-cancel" %>
-  <% end %>
-</div>
+</div>
+

data/app/views/lines/admin/pictures/_picture.html.erb

@@ -1,5 +1,6 @@
-<div class="picture-preview" id="<%= dom_id @picture %>">
-  <div class="picture"><%= image_tag @picture.image_url(:preview) %></div>
-  <a href="#" class="insert-image" data-url="<%= @picture.image_url %>"></a>
-  <%= button_to "", admin_picture_path(@picture), remote: true, confirm: "Are you sure?", method: :delete, class: 'btn-delete-photo' %>
+<div class="image-preview" id="<%= dom_id @picture %>" style="background-image: url(<%= @picture.image_url(:preview) %>)" data-url="<%= @picture.image_url %>">
+  <%#= image_tag @picture.image_url(:preview), data: { :url => @picture.image_url } %>
+  <%= button_to admin_picture_path(@picture), remote: true, confirm: "Are you sure?", method: :delete, class: 'icon-delete' do %>
+
+  <% end %>
 </div>

data/app/views/lines/admin/pictures/create.js.erb

@@ -1,5 +1,5 @@
 <% if @picture.new_record? %>
   alert("Failed to upload painting: <%= j @picture.errors.full_messages.join(', ').html_safe %>");
 <% else %>
-  $("#pictures").append("<%= j render('lines/admin/pictures/picture') %>");
+  $(".images").append("<%= j render('lines/admin/pictures/picture') %>");
 <% end %>

data/app/views/lines/admin/pictures/destroy.js.erb

@@ -1 +1 @@
-$("#<%= dom_id @picture %>").slideUp();
+$("#<%= dom_id @picture %>").remove();

data/app/views/lines/articles/_article.html.erb

@@ -2,11 +2,13 @@
 
 <% cache article do %>
 
-  <div class="hero_image">
-    <%= link_to article_path(article), { style: "background-image:url('#{article.image_url}')" } do %>
-      <img src="<%= article.image_url %>" alt="<%= article.title %>" />
-    <% end %>
-  </div>
+  <% unless article.image_url.blank? %>
+    <div class="hero_image">
+      <%= link_to article_path(article) do %>
+        <img src="<%= article.image_url %>" alt="<%= article.title %>" />
+      <% end %>
+    </div>
+  <% end %>
 
   <div class="article_header">
     <h1><%= link_to article.title, article_path(article) %></h1>
@@ -29,10 +31,12 @@
 
   <% unless article.gplus_url.blank? %>
     <div class="article_googleplus">
-      <a href="<%= article.gplus_url %>"><span></span>Discuss this article at Google+</a>
+      <a href="<%= article.gplus_url %>">Discuss this article at Google+</a>
     </div>
   <% end %>
   
+  <hr>
+
   <div class="article_footer">
     Written on <span class="published_at"><%= article.published_at.to_date %></span> by <%= display_article_authors(article, true) %>
   </div>

data/app/views/lines/articles/_article_collection.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: 'article_small', locals: { article_small: article_collection, article_counter: article_collection_counter } %>
+<%= render partial: 'article_small', locals: { article_small: article_collection, article_class: 'small', article_counter: article_collection_counter } %>
 
 <% if (article_collection_counter % 2) != 0 %>
   <div class="breaker" style="clear:both;height:1px;line-height:1px">&nbsp;</div>

data/app/views/lines/articles/_article_small.html.erb

@@ -1,10 +1,12 @@
-<div class="article small">
+<div class="article <%= article_class %>">
 <% cache "#{article_small}_small" do %>
-  <div class="hero_image">
-    <%= link_to article_path(article_small), { style: "background-image:url('#{article_small.image_url}')" } do %>
-      <img src="<%= article_small.image_url %>" alt="<%= article_small.title %>" />
-    <% end %>
-  </div>
+  <% unless article_small.image_url.blank? %>
+    <div class="hero_image">
+      <%= link_to article_path(article_small) do %>
+        <img src="<%= article_small.image_url %>" alt="<%= article_small.title %>" />
+      <% end %>
+    </div>
+  <% end %>
 
   <div class="article_header">
     <h1><%= link_to article_small.title, article_path(article_small) %></h1>
@@ -13,7 +15,7 @@
   </div>
 
   <div class="article_teaser">
-    <%= render_teaser(article_small) %>
+    <%= render_teaser(article_small).html_safe %>
     <div class="more-link">
       <%= link_to "Read full article", article_path(article_small) %>
     </div>

data/app/views/lines/articles/index.atom.builder

@@ -15,18 +15,19 @@ atom_feed do |feed|
         end
       end
       entry.content type: 'xhtml' do |xhtml|
-        xhtml << content_tag(:p,"<img src=\"#{article.image_url}\" alt=\"#{article.title}\"/>".html_safe).html_safe
+        xhtml << content_tag(:p,"<img src=\"#{article.absolute_image_url}\" alt=\"#{CGI.escape_html(article.title)}\"/>".html_safe).html_safe
         xhtml << markdown(article.content).html_safe
       end
-      entry.author do |author|
-        article.authors.each do |a|
-          author.name a.name
-        end
+      article.authors.each do |author|
+        entry.author do |a|
+          a.name author.name
+
+        end        
       end
-      entry.contributor do |author|
-        article.authors.each do |a|
-          author.name a.name
-        end
+      article.authors.each do |author|
+        entry.contributor do |a|
+          a.name author.name
+        end        
       end
     end
   end

data/app/views/lines/articles/index.html.erb

@@ -1,14 +1,14 @@
-<% content_for :head, auto_discovery_link_tag(:atom, articles_url(format: "atom")) %>
 <div class="rss">
     <%= link_to image_tag("ic_rss.png"), articles_url(format: "atom") %>
 </div>
 
 <div id="articles">
-  <%= render partial: 'article', locals: { article: @first_article, article_counter: -1 } unless @first_article.nil? %>
+  <%= render partial: 'article_small', locals: { article_small: @first_article, article_class: 'first', article_counter: -1 } unless @first_article.nil? %>
   <%= render partial: 'article_collection', collection: @articles %>
 </div>
 
 <% if @articles.num_pages > 1 %>
+<hr>
 <div id="pagination">
   <%= paginate @articles, outer_window: 1, window: 2, theme: 'lines' %>
 </div>

data/app/views/lines/articles/show.html.erb

@@ -1 +1,5 @@
-<%= render @article, article_counter: -1 %>
+<%= render @article, article_counter: -1 %>
+
+<div id="articles">
+  <%= render partial: 'article_collection', collection: @related_articles %>
+</div>

data/app/views/lines/password_resets/edit.html.erb

@@ -1,26 +1,39 @@
-<h1>Reset password</h1>
+<%= render_navbar {} %>
+<div class="login">
+  <h2>Set new password password</h2>
 
-<%= form_for(@user, url: password_reset_path(params[:id])) do |f| %>
   <% if @user.errors.any? %>
     <div id="error_explanation">
-      <div class="alert errors">
-        The form contains <%= pluralize(@user.errors.count, "error") %>.
-      </div>
+      <h2><%= pluralize(@user.errors.count, "error") %> occured:</h2>
+
       <ul>
       <% @user.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>
       <% end %>
       </ul>
+      <a href="#" class="close">x</a>
     </div>
   <% end %>
+      
+  <%= form_for(@user, url: password_reset_path(params[:id])) do |f| %>
+
+    <%= hidden_field_tag :email, @user.email %>
 
-  <%= hidden_field_tag :email, @user.email %>
+    <div class="input-field">
+      <%= f.password_field :password, placeholder: 'Enter a new password' %>
+    </div>
+    
+    <div class="input-field">
+      <%= f.password_field :password_confirmation, placeholder: 'Confirm your passwword' %>    
+    </div>
 
-  <%= f.label :password %>
-  <%= f.password_field :password %>
+    <br style="clear: both;" />
+    <div class="submit">
+      <%= submit_tag "Set new password" %>
+      <a href="/">or go back to your blog.</a>
+    </div>
+  <% end %>
+  
+</div>
 
-  <%= f.label :password_confirmation, "Confirmation" %>
-  <%= f.password_field :password_confirmation %>
 
-  <%= f.submit "Update password" %>
-<% end %>

data/app/views/lines/password_resets/new.html.erb

@@ -1,8 +1,14 @@
-<h1>Reset Password</h1>
-
-<%= form_for(:password_reset, url: password_resets_path) do |f| %>
-  <%= f.label :email %>
-  <%= f.email_field :email %>
-
-  <%= f.submit "Submit" %>
-<% end %>
+<%= render_navbar {} %>
+<div class="login">
+  <h2>Reset password</h2>
+  
+  <%= form_for(:password_reset, url: password_resets_path) do |f| %>
+    <div class="input-field">
+      <%= f.email_field :email, placeholder: 'E-Mail' %>
+    </div>
+    <br style="clear: both;" />
+    <div class="submit">
+      <%= submit_tag "Send password reset link" %> or <a href="/">go back to your blog.</a>
+    </div>
+  <% end %>
+</div>

data/app/views/lines/sessions/new.html.erb

@@ -1,22 +1,18 @@
 <%= render_navbar {} %>
 <div class="login">
-  <h1>Login</h1>
+  <h2>Administration Login</h2>
 
   <%= form_tag sessions_path do %>
-    <div class="email">
-      <%= label_tag :email, "Email address" %>
-      <%= text_field_tag :email, params[:email] %>
-      <br style="clear: both;" />
+    <div class="input-field">
+      <%= text_field_tag :email, params[:email], placeholder: "E-Mail" %>
     </div>
-    <div class="password">
-      <%= label_tag :password, "Password" %>
-      <%= password_field_tag :password %>
-      <br style="clear: both;" />
+    <div class="input-field">
+      <%= password_field_tag :password, "", placeholder: 'Password' %>
     </div>
     <br style="clear: both;" />
     <div class="submit">
       <%= submit_tag "Login" %>
-      <a href="/">or go back to your blog.</a>
+      or <a href="/">go back to your blog.</a>
     </div>
     <br style="clear: both;" />
     <div class="additional_actions">