lines-engine 0.6.2 → 0.9.0

data/app/assets/stylesheets/lines/pagination.scss

@@ -1,38 +1,15 @@
 #pagination {
-  font-family: $Merriweather;
-  display: block;
-  overflow: visible;
-  border-top: 1px solid #ccc;
-  margin: 0px auto;
-  width: 100%;
+  font-family: $SourceSansPro;
+  font-weight: 600;
+  margin: 1.8em auto 0 auto;
   text-transform: uppercase;
-  font-size: 1.5em;
-  padding: 30px 0 0 0;
+  font-size: 1.25rem;
   text-align: center;
-  position: relative;
   a {
-    color: $lightgrey;
-    &:hover { color: $darkgrey; }
-  }
-  .newer, .older { position: absolute; display: inline-block; }
-  .newer { left: 0px; }
-  .older { right: 0px; }
-  .prev, .first {
-    float: left;
-    padding: 0 10px;
-  }
-  .next, .last {
-    float: right;
-    padding: 0 10px;
+    color: $grey;
+    &:hover { color: lighen($grey, 10%); }
   }
 
-  .pages {
-    font-size: 0.7em;
-    color: lighten($lightgrey,30%);
-    a {
-      color: lighten($lightgrey,30%);
-      &:hover { color: $lightgrey; }
-    }
-    .current { color: $lightgrey; font-size: 1.50em; }
-  }
+  .newer, .older, .page { margin: 0 1em;}
+  .current { color: $black; }
 }

data/app/assets/stylesheets/lines/pygments.css.erb

@@ -1,3 +1,2 @@
 <% require 'pygments.rb' %>
-<%#= Pygments.css(style: "fruity") %>
-<%= Pygments.css(style: "friendly") %>
+<%= Pygments.css(style: "murphy") %>

data/app/assets/stylesheets/lines/variables_and_mixins.scss

@@ -1,3 +1,5 @@
+@import 'lines/admin/variables_and_mixins';
+
 $max-width: 960px;
 
 $darkgrey: #333;
@@ -8,6 +10,8 @@ $red: #c10020;
 $black: #100719;
 $grey: #9793a0;
 $white: #fff;
+$green: #00c289;
+$darkred: #730035;
 
 $SourceSansPro: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;
 $MerriweatherSans: 'Merriweather Sans', 'Helvetica', 'Arial', sans-serif;

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

@@ -18,7 +18,7 @@ module Lines
       # <tt>@articles_published</tt> to distinguish between published and
       # unpublished articles
       def index
-        @articles = Article.order('published ASC, featured DESC, published_at DESC').page(params[:page]).per(25)
+        @articles = Article.order('published ASC, created_at DESC').page(params[:page]).per(25)
         @articles_unpublished = @articles.select{|a| a.published == false}
         @articles_published = @articles.select{|a| a.published == true}
         respond_to do |format|
@@ -56,7 +56,7 @@ module Lines
 
         respond_to do |format|
           if @article.save
-            format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully created.' }
+            format.html { redirect_to admin_article_path(@article) }
           else
             format.html { render action: "new" }
           end
@@ -82,7 +82,7 @@ module Lines
         respond_to do |format|
           if @article.update_attributes(article_params)
             ActionController::Base.new.expire_fragment(@article)
-            format.html { redirect_to admin_article_path(@article), notice: 'Article was successfully updated.' }
+            format.html { redirect_to admin_article_path(@article) }
           else
             format.html { render action: "edit" }
           end
@@ -103,7 +103,8 @@ module Lines
       def toggle_publish
         @article = Article.find(params[:article_id])
         @article.update_attributes(published: !@article.published)
-        redirect_to admin_articles_url, notice: 'Article updated!'
+        flash[:success] = "“#{@article.title}” has been #{'un' if !@article.published}published."
+        redirect_to admin_articles_url
       end
 
       # Toggles featured state of an article
@@ -116,7 +117,7 @@ module Lines
           end
         end
         @article.update_attributes(featured: !@article.featured)
-        redirect_to admin_articles_url, notice: 'Article updated!'
+        redirect_to admin_articles_url
       end
 
       # Handles base64 encoded file uploads
@@ -127,6 +128,7 @@ module Lines
 
           picture_filename = "hero_image"
           picture_original_filename = "hero_image"
+          raise params[:article][:hero_image_file].inspect
           picture_content_type = splitBase64(params[:article][:hero_image_file])[:type]
           picture_data = splitBase64(params[:article][:hero_image_file])[:data]
 
@@ -164,7 +166,7 @@ module Lines
         def article_params
           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,
+            :document, :document_cache, :hero_image_file, :remove_document, :remove_hero_image, :pictures, :authors,
             pictures_attributes: [:id, :image, :name, :article_id], author_ids: [] )
         end
 

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

@@ -31,7 +31,7 @@ module Lines
         @author = Author.new(author_params)
 
         if @author.save
-          redirect_to admin_author_path @author, notice: 'Author was successfully created.'
+          redirect_to admin_author_path @author
         else
           render action: "new"
         end
@@ -42,7 +42,7 @@ module Lines
         @author = Author.find(params[:id])
 
         if @author.update_attributes(author_params)
-          redirect_to admin_author_path @author, notice: 'Author was successfully updated.'
+          redirect_to admin_author_path(@author)
         else
           render action: "edit"
         end

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

@@ -15,7 +15,7 @@ module Lines
 
         respond_to do |format|
           if @picture.update_attributes(picture_params[:picture])
-            format.html { redirect_to @picture, notice: 'Picture was successfully updated.' }
+            format.html { redirect_to @picture }
           else
             format.html { render action: "edit" }
           end

data/app/controllers/lines/application_controller.rb

@@ -11,7 +11,7 @@ module Lines
 
       # checks if current user is authorized. Redirects to login_url if not
       def authorize
-        redirect_to login_url, alert: "Not authorized" if current_lines_user.nil?
+        redirect_to login_url, notice: "Please log in to access the administration area." if current_lines_user.nil?
       end
 
   end

data/app/controllers/lines/articles_controller.rb

@@ -34,7 +34,7 @@ module Lines
                         keywords: KEYWORDS,
                         open_graph: { title: SITE_TITLE,
                                         type: 'website',
-                                        url: 'meta_og_url',
+                                        url: articles_url,
                                         site_name: SITE_TITLE,
                                         image: CONFIG[:og_logo]
                                       }
@@ -63,6 +63,8 @@ module Lines
       if request.path != article_path(@article)
         return redirect_to @article, status: :moved_permanently
       end
+
+      @related_articles = Article.published.where('id != ?', @article.id).order('').limit(2)
     end
 
   end

data/app/controllers/lines/password_resets_controller.rb

@@ -16,12 +16,9 @@ module Lines
       if @user
         @user.create_reset_digest
         @user.send_password_reset_email
-        flash[:info] = "Email sent with password reset instructions"
-        redirect_to root_url
-      else
-        flash.now[:error] = "Email address not found"
-        render 'new'
       end
+      flash[:success] = "Reset instructions have been sent to this email-address, if the user is registered."
+      redirect_to root_url
     end
 
     def edit
@@ -32,12 +29,12 @@ module Lines
         flash.now[:error] = "Password can't be blank"
         render 'edit'
       elsif wrong_password_confirmation?
-        flash.now[:error] = "Password confirmation does not match"
+        flash.now[:error] = "Password confirmation does not match."
         render 'edit'
       elsif @user.update_attributes(user_params)
         # deletr reset_digest and reset_sent_at
         @user.update_attributes(reset_digest: nil, reset_sent_at: nil)        
-        flash[:success] = "Password has been reset. You can now log in with your new password."
+        flash[:success] = "Password has been reset. You can now log in with the new password."
         redirect_to new_session_path
       else
         render 'edit'

data/app/controllers/lines/sessions_controller.rb

@@ -17,9 +17,9 @@ module Lines
       user = Lines::User.find_by(email: params[:email])
       if user && user.authenticate(params[:password])
         session[:user_id] = user.id
-        redirect_to admin_root_url, notice: "Logged in!"
+        redirect_to admin_root_url
       else
-        flash.now.alert = "Email or password is invalid"
+        flash.now[:error] = "Email or password is invalid"
         render "new"
       end
     end
@@ -27,7 +27,7 @@ module Lines
     # Destroys the current session (logout)
     def destroy
       session[:user_id] = nil
-      redirect_to root_url, notice: "Logged out!"
+      redirect_to root_url
     end
   end
 

data/app/helpers/lines/application_helper.rb

@@ -20,7 +20,11 @@ module Lines
       def block_code(code, language)
         sha = Digest::SHA1.hexdigest(code)
         Rails.cache.fetch ["code", language, sha].join('-') do
-          Pygments.highlight(code, lexer: language)
+          begin
+            Pygments.highlight(code, lexer: language)
+          rescue => e
+            "<div class=\"highlight\"><pre>#{code}</pre></div>"
+          end
         end
       end
     end
@@ -54,7 +58,7 @@ module Lines
     def display_article_authors(article, with_info=false)
       authors = article.authors.map{|author| author.gplus_profile.blank? ? author.name : link_to(author.name, author.gplus_profile)}.to_sentence(two_words_connector: " & ", last_word_connector: " & ").html_safe
       if with_info
-        authors += (" - " + article.authors.map{|author| content_tag(:span, "#{author.description}", class: 'author_description') }.join(" -- ")).html_safe
+        authors += (" — " + article.authors.map{|author| content_tag(:span, "#{author.description}", class: 'author_description') }.join(" — ")).html_safe
       end
       authors
     end
@@ -68,7 +72,24 @@ module Lines
       html = content_tag(:div, id: 'navbar') do
         content_tag(:div, class: 'navbar-inner') do
           if current_lines_user
-            content_tag(:span, link_to('', admin_articles_path), class: 'backlink', title: 'Dashboard') + content_tag(:span, action_link, class: 'actionlink') + content_tag(:span, class: 'buttons', &block) + content_tag(:span, link_to('Logout', logout_path), class: 'logout') + content_tag(:span, "Logged in as #{current_lines_user.email}", class: 'logged-in-as')
+            #content_tag(:span, link_to('', admin_articles_path), class: 'backlink', title: 'Dashboard') + content_tag(:span, action_link, class: 'actionlink') + content_tag(:span, class: 'buttons', &block) + content_tag(:span, link_to('Logout', logout_path), class: 'logout') + content_tag(:span, "Logged in as #{current_lines_user.email}", class: 'logged-in-as')
+            content_tag(:span, class: 'buttons', &block) + "<div class='btn-menu'><dic class='stripes'></div></div>".html_safe + 
+            "<div class='submenu'>
+              <div class='submenu-inner'>
+                <ul>
+                  <li>#{link_to("Dashboard", admin_articles_path)}</li>
+                  <li>#{link_to("Authors", admin_authors_path)}</li>
+                </ul>
+                <ul>
+                  <li class='small'>Logged in as #{current_lines_user.email}</li>
+                  <li>#{link_to("Logout", logout_path)}</li>
+                </ul>
+                <ul>
+                  <li>#{link_to("Formatting Help", "#", class: "btn-cheatsheet")}</li>
+                  <li>#{link_to("About Lines", "http://lines.opoloo.com")}</li>
+                </ul>
+              </div>
+            </div>".html_safe
           else
             content_tag(:span, link_to('', lines.root_path), class: 'backlink') + content_tag(:span, action_link, class: 'actionlink')
           end
@@ -98,7 +119,7 @@ module Lines
 
     # Returns HTML for code blocks formatted with Pygment
     def format_code(text)
-      simple_format( truncate( Sanitize.clean(markdown(text)), length: 300, separator: ' ', omission: ' ...' ))
+      simple_format( truncate( Sanitize.clean(markdown(text)).html_safe, escape: false, length: 300, separator: ' ', omission: ' …' ))
     end
 
   end

data/app/mailers/lines/user_mailer.rb

@@ -4,7 +4,7 @@ module Lines
     
     def password_reset(user)
       @user = user
-      mail to: user.email, subject: "Password reset"
+      mail to: user.email, subject: "Forgot your LINES password?"
     end
 
   end

data/app/models/lines/article.rb

@@ -37,13 +37,13 @@ module Lines
 
     # Validations
     validates :title, :content, :author_ids, :published_at, presence: true
-    validate :one_image_selected
+    #validate :one_image_selected
 
     # Callbacks
     after_save :update_used_images, :refresh_sitemap
 
     # Model Scopes
-    scope :published, -> { where(published: true).order("featured DESC, published_at DESC") }
+    scope :published, -> { where(published: true).order("featured DESC, published_at DESC, created_at DESC") }
 
     # Predifined hero images.
     # Images are loaded from the <tt>public/heroes</tt> directory
@@ -63,7 +63,12 @@ module Lines
 
     # Returns the url for the hero image
     def image_url
-      self.hero_image? ? self.hero_image.url : self.short_hero_image
+      image = self.hero_image? ? self.hero_image.url : self.short_hero_image
+    end
+
+    # Returns the absolute url for the hero image
+    def absolute_image_url
+      absolute_url_for(image_url)
     end
 
     # Returns value of subtitle
@@ -113,5 +118,10 @@ module Lines
       !hero_image.present? && !short_hero_image.present?
     end
 
+    # Get absolute URL (with host and port) for an image
+    def absolute_url_for(image)
+      image = "//#{CONFIG[Rails.env.to_sym]['host']}#{image}"
+    end
+
   end
 end

data/app/models/lines/user.rb

@@ -21,7 +21,7 @@ module Lines
     attr_accessor :reset_token
 
     # Validations
-    validates :password, length: { minimum: 6 }, if: :validate_password?
+    validates :password, length: { minimum: 8 }, if: :validate_password?
     validates :password, presence: true, on: :create
     validates :email, uniqueness: true, presence: true
 
@@ -34,7 +34,7 @@ module Lines
 
     # Sends email with instructions how to reset password.
     def send_password_reset_email
-      UserMailer.password_reset(self).deliver
+      UserMailer.password_reset(self).deliver_now
     end
 
     # Returns true if the given token matches the digest.

data/app/uploaders/picture_uploader.rb

@@ -19,7 +19,7 @@ class PictureUploader < CarrierWave::Uploader::Base
 
   # Generates +preview+ version.
   version :preview do
-    resize_to_limit(100, 100)
+    resize_to_limit(400, 300)
   end
 
   # Add a white list of extensions which are allowed to be uploaded.

data/app/views/layouts/lines/_markdown_cheatsheet.html.erb

@@ -0,0 +1,72 @@
+<div class="cheatsheet">
+  <div class="cheatsheet-close icon-close"></div>
+  <div class="cheatsheet-inner">
+    <h2>Markdown Cheat Sheet</h2>
+
+    <p>
+      <strong>Headlines</strong><br />
+      <span class="formatting">#</span> Headline 1<br />
+      <span class="formatting">##</span> Headline 2<br />
+      <span class="formatting">###</span> Headline 3
+    </p>
+
+    <p>
+      <strong>Styling</strong><br />
+      <span class="formatting">*</span><em>italic</em><span class="formatting">*</span><br />
+      <span class="formatting">**</span><strong>bold</strong><span class="formatting">**</span><br />
+      <span class="formatting">~~</span><s>strike through</s><span class="formatting">~~</span>
+    </p>
+
+    <p>
+      <strong>Links</strong><br />
+      <a href="http://url.com">http://url.com</a><br />
+      <span class="formatting">[</span>link text<span class="formatting">](</span>http://www.url.com<span class="formatting">)</span>
+    </p>
+
+    <p>
+      <strong>Quotes</strong><br />
+      <span class="formatting">></span> Quote text<br />
+      <span class="formatting">***</span>Johnny Author<span class="formatting">***</span>
+    </p>
+
+    <p>
+      <strong>Images</strong><br />
+      <span class="formatting">![</span>image alt text<span class="formatting">](</span>image url<span class="formatting">)</span><br />
+      <span class="formatting">***</span>Image caption, description<span class="formatting">***</span>
+    </p>
+
+    <p>
+      <strong>Horizontal rule</strong><br />
+      <span class="formatting">---</span>
+    </p>
+
+    <p>
+      <strong>Inline Code</strong><br />
+      <span class="formatting">`</span>var name = "John Doe";<span class="formatting">`</span>
+    </p>
+
+    <p>
+      <strong>Code block with syntax highlighting</strong><br />
+      <span class="formatting">``` codelanguage</span><br />
+      function foo() {<br />
+      &nbsp;&nbsp;return bar;<br />
+      }<br />
+      <span class="formatting">```</span>
+    </p>
+
+    <p>
+      <strong>Bulleted list</strong><br />
+      <span class="formatting">-</span> item 1<br />
+      <span class="formatting">-</span> item 2<br />
+      <span class="formatting">-</span> item 3
+    </p>
+
+    <p>
+      <strong>Numbered list</strong><br />
+      <span class="formatting">1.</span> item 1<br />
+      <span class="formatting">2.</span> item 2<br />
+      <span class="formatting">3.</span> item 3
+    </p>
+  </div>
+  <div class="cheatsheet-overlay"></div>
+</div>