lines-engine 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01fa882ca6f4c39d506d42af7fa20ee5adb3177f
-  data.tar.gz: b705396bf026ac73112b5296792fb9beb0b7da84
+  metadata.gz: 44eee1e47e463bda3f916ec470c24c7bf74c966f
+  data.tar.gz: 5826129bde5172984d1672183a3310208b70a951
 SHA512:
-  metadata.gz: efb38385db2bd65ddd200133dd1771fd20e159905fa81de241665b479c85559942f9e32070cb9ba015e9fb6bde5cee5a3b4e855673bb014f1b20bfe2edd3e2a7
-  data.tar.gz: ee01698f7a033b83978c26c638661db7b13c5e7e210dbd2257db2e9f4482dc5ba05d49f9d55262327727f6997229529e918b23b5267a8e02b37b77c958cdd990
+  metadata.gz: db9451ef1eb6d1a63b352cc98d961ca19e202db721884b08285a31b0c15f54086f316f966fe519ea3c11b95ec303e6c8bea67f89bb932a2c094cc8053e3b97f3
+  data.tar.gz: 3bee7873ee5d77f4f6c766449aba31a27bf46464dceca4799339747f35ebc71e53b3fbb1577221b58cf1b1ef648bd296480dd99de4690123b8eb40c39be6502c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.1.22)
+    lines-engine (0.1.23)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)

data/app/assets/stylesheets/lines/admin.css.scss

@@ -641,7 +641,7 @@ hr {
   position: relative;
   .picture-box {
     position: absolute;
-    top: 560px;
+    top: 760px;
     right: 0px;
     width: 260px;
     h2 {

data/app/assets/stylesheets/lines/style.css.scss

@@ -332,9 +332,7 @@ div.article.first {
   .article_googleplus, .article_footer, .article_content, div.sub_title {
     display: block;
   }
-  .article_teaser {
-    display: none;
-  }
+  .more-link { display: none; }
   div.article_wrapper {
     border-bottom: 1px solid #ccc;
     padding: 30px 20px 30px 20px;
@@ -427,6 +425,12 @@ div.article_content {
     font-family: 'UbuntuBold';
     margin: 20px 0 0 0;
   }
+  p {
+    margin: 0 0 20px 0;
+    width: 100%;
+    min-width: 100%;
+    display: block;
+  }
   ul {
     margin-left: 10px;
     li {
@@ -459,13 +463,23 @@ div.article_content {
     display: block;
     margin: 0 auto;
   }
-}
-
-div.article_content p {
-  margin: 0 0 20px 0;
-  width: 100%;
-  min-width: 100%;
-  display: block;
+  .more-link {
+    margin:40px 20px 0px 20px;
+    text-transform: uppercase;
+    letter-spacing: 0.06em;
+    font-size:0.8em;
+    a {
+      background-color: #f4f4f4;
+      padding:5px 10px;
+      color: #4d4d4d;
+      display:block;
+      width:100%;
+      text-align:center;
+    }
+    a:hover {
+      background-color: #e7e7e7;
+    }
+  }
 }
 
 div.article_footer {
@@ -561,24 +575,6 @@ div.article_googleplus {
   }
 }
 
-div.more-link {
-  margin:40px 20px 0px 20px;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  font-size:0.8em;
-  a {
-    background-color: #f4f4f4;
-    padding:5px 10px;
-    color: #4d4d4d;
-    display:block;
-    width:100%;
-    text-align:center;
-  }
-  a:hover {
-    background-color: #e7e7e7;
-  }
-}
-
 #footer {
   background-color: #f4f4f4;
   margin:50px 0 0 0;

data/app/controllers/lines/admin/articles_controller.rb

@@ -162,7 +162,7 @@ module Lines
 
         # Allowed attribute with strong_params
         def article_params
-          params.require(:article).permit(:content, :hero_image, :short_hero_image, :published, :published_at, 
+          params.require(:article).permit(:content, :teaser, :hero_image, :short_hero_image, :published, :published_at, 
             :sub_title, :title, :pictures, :author_ids, :hero_image_cache, :tag_list, :gplus_url, :featured, 
             :document, :document_cache, :hero_image_file, :remove_document, :pictures, :authors,
             pictures_attributes: [:id, :image, :name, :article_id], author_ids: [] )

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

@@ -62,6 +62,16 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="label">
+        <h3><%= f.label :teaser, "Teaser" %></h3>
+      </div>
+      <div class="input input-textarea">
+        <%= f.text_area :teaser %>
+      </div>
+      <div class="additional"></div>
+    </div>
+
     <div class="row">
       <div class="label">
         <h3><%= f.label :content, "Content" %> <span class="required">*</span></h3>

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

@@ -16,6 +16,18 @@
 
   <div class="article_wrapper">
 
+    <div class="article_teaser">
+      <% if article.teaser.present? %>
+        <%= markdown article.teaser %>  
+      <% else %>
+        <%= format_code(article.content) %>
+      <% end -%>
+      <div class="more-link">
+        <%= link_to "Read full article", article_path(article) %>
+      </div>
+    </div>
+
+
     <div class="article_content">
       <%= markdown article.content %>
       <% if article.document? %>
@@ -25,12 +37,6 @@
       <% end %>
     </div>
 
-    <div class="article_teaser">
-      <%= format_code(article.content) %>
-      <div class="more-link">
-        <%= link_to "Read full article", article_path(article) %>
-      </div>
-    </div>
 
   </div>
 

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

@@ -8,7 +8,11 @@ atom_feed do |feed|
     feed.entry article, url: article_url(article), published: article.published_at do |entry|
       entry.title article.title
       entry.summary type: 'xhtml' do |xhtml|
-        xhtml << format_code(article.content)
+        if article.teaser.present?
+          xhtml << markdown(article.teaser)
+        else
+          xhtml << format_code(article.content)
+        end
       end
       entry.content type: 'xhtml' do |xhtml|
         xhtml << content_tag(:p,"<img src=\"#{article.image_url}\" alt=\"#{article.title}\"/>".html_safe).html_safe

data/db/migrate/20141027143656_add_teaser_to_article.rb

@@ -0,0 +1,5 @@
+class AddTeaserToArticle < ActiveRecord::Migration
+  def change
+    add_column :lines_articles, :teaser, :text
+  end
+end

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140702160604) do
+ActiveRecord::Schema.define(version: 20141027143656) do
 
   create_table "friendly_id_slugs", force: true do |t|
     t.string   "slug",                      null: false
@@ -38,6 +38,7 @@ ActiveRecord::Schema.define(version: 20140702160604) do
     t.boolean  "featured",         default: false
     t.string   "document"
     t.string   "short_hero_image"
+    t.text     "teaser"
   end
 
   add_index "lines_articles", ["slug"], name: "index_lines_articles_on_slug", unique: true, using: :btree

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Opoloo GbR
@@ -721,6 +721,7 @@ files:
 - db/migrate/20140702160602_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
 - db/migrate/20140702160603_add_missing_unique_indices.acts_as_taggable_on_engine.rb
 - db/migrate/20140702160604_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- db/migrate/20141027143656_add_teaser_to_article.rb
 - db/seeds.rb
 - lib/generators/lines/README
 - lib/generators/lines/install_generator.rb