homeland-press 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dd63a97785ef7985557ff8d64479b3bd2c697ee
-  data.tar.gz: fcfdb253b853734d940b42e2f8bc4c178e778700
+  metadata.gz: e9cc3c455c07a0670af45ab7a72ff155d5447688
+  data.tar.gz: ec7204dbc3eceb92ea1c36a2ecb5f695e76c3a10
 SHA512:
-  metadata.gz: 6e961f4e3b141921d4f0bfe510a0c0a4f12a14261d538d851c9057172e833bb4f105afbbf5376ade1748643b6501ebba67dbed544743929d77a02cef5aa601df
-  data.tar.gz: 6b7d790e587e9e820dfb732d2ceec1399fb019cfcdd155ed0a7d151d226c169d358c54feb5cbe264a58f172d55537b75cad1e88f19f8c5e08ce6f797a66e2dd3
+  metadata.gz: b0f854ec0699c3e0567385da2d5cab44c4a198e17963b1664a5dfc978417db886b9064e2b982ed0af23b753f8dc5d0536222d51e11488ced7aa7028b828e0635
+  data.tar.gz: e97c740289298fe1f58ece76c606d7e46c6f5c8c7689c5e392c7cd90fa3e09365399e002a06e809ec4ac9a07dd36920f663c2d3c1dc86ab741987ab2e3b61efd

data/README.md

@@ -19,18 +19,21 @@ gem 'homeland-press'
 
 修改 Homeland 的 `modules` 配置，增加 `press` 以启用。
 
-```
+```yml
 defaults: &defaults
   # add "press" to modules
   modules: 'topic,...,press'
 ```
 
+## Screenshot
+
+![2017-02-28 10 52 08](https://cloud.githubusercontent.com/assets/5518/23389601/f72025f2-fda3-11e6-8340-7845c21e3a06.png)
 
 ## Contributing
 
 如果你需要开发此插件，你需要同时准备好 Homeland 项目的开发环境，并修改 Homeland 项目 Gemfile:
 
-```
+```rb
 gem 'homeland-press', path: '../homeland-press'
 ````
 

data/app/assets/stylesheets/homeland/press/application.scss

@@ -1,12 +1,6 @@
 /*
  *= require_self
  */
-
-.sub-navbar .container,
-.main-container {
-  max-width: 960px;
-}
-
 #homeland-press {
 
 
@@ -27,9 +21,10 @@
     }
 
     .post {
+      margin: 0 -15px;
+      padding: 0 15px 15px 15px;
       margin-bottom: 15px;
       border-bottom: 1px solid #eee;
-      padding-bottom: 15px;
 
       &:last-child {
         border-bottom: 0;
@@ -37,6 +32,23 @@
       }
     }
 
+    .post-likes {
+      width: 60px;
+      text-align: center;
+      padding-top: 0px;
+      color: #666;
+
+      &.active {
+        .icon { color: #EB5424; }
+      }
+
+      .icon {
+        font-size: 22px; margin-bottom: 0px;
+
+      }
+      .counter { font-size: 14px; }
+    }
+
     .post-title { font-size: 18px; line-height: 22px; margin-bottom: 0px; }
     .post-summary {
       padding: 10px 0;
@@ -44,6 +56,7 @@
     }
     .post-info {
       color: #aaa;
+      font-size: 12px;
       a { color: #aaa; }
     }
 
@@ -55,7 +68,7 @@
 
   #post-detail {
     .panel-body {
-      padding: 60px;
+      padding: 30px 50px;
     }
 
     h1 {
@@ -74,16 +87,21 @@
       .media-object { display: inline; }
       a { color: #777;}
       a.user-name { color: #0069D6; font-weight: bold; }
+      margin-bottom: 20px;
     }
 
     .post-actions {
       margin-top: 15px;
-      .likeable {
-        padding: 10px 20px;
+      .btn {
+        padding: 8px 20px 6px 20px;
         border-radius: 6px;
+        font-size: 16px;
+        margin: 0 5px;
+      }
 
+      .likeable {
         &.active {
-          color: #D83227;
+          color: #EB5424;
           background: #fff !important;
           box-shadow: 0 0 0;
         }
@@ -91,3 +109,15 @@
     }
   }
 }
+
+.post-upcoming {
+  .post {
+    .title {
+      font-size: 16px;
+      a { color: #2e3ebd; }
+      a:visited { color: #777; }
+    }
+    .author,
+    .time { width: 120px; }
+  }
+}

data/app/controllers/homeland/press/admin/posts_controller.rb

@@ -0,0 +1,15 @@
+module Homeland::Press::Admin
+  class PostsController < ::Admin::ApplicationController
+    layout '/layouts/admin'
+
+    def index
+      @posts = Post.includes(:user).order("id desc").page(params[:page])
+    end
+
+    def destroy
+      @post = Post.find_by_slug!(params[:id])
+      @post.destroy
+      redirect_to admin_posts_path
+    end
+  end
+end

data/app/controllers/homeland/press/posts_controller.rb

@@ -5,12 +5,11 @@ module Homeland::Press
 
     # GET /posts
     def index
-      @posts = Post.published.order('published_at desc, id desc').page(params[:page]).per(10)
+      @posts = Post.includes(:user).published.order('published_at desc, id desc').page(params[:page]).per(10)
     end
 
     def upcoming
-      @posts = Post.upcoming.order('id desc').page(params[:page]).per(10)
-      render 'index'
+      @posts = Post.includes(:user).upcoming.order('id desc').page(params[:page]).per(10)
     end
 
     # GET /posts/1

data/app/views/homeland/press/admin/posts/index.html.erb

@@ -0,0 +1,26 @@
+<% content_for :sitemap do %>
+  <span class="current">头条</span>
+<% end %>
+
+<table class="table table-bordered table-striped table-condensed">
+<tr>
+  <th>#</th>
+  <th>状态</th>
+  <th>标题</th>
+  <th>提交人</th>
+  <th>更新时间</th>
+  <th style="width:100px"></th>
+</tr>
+<% @posts.each do |post| %>
+<tr class="post">
+  <td><%= post.id %></td>
+  <td><%= post.status %></td>
+  <td class="title"><%= link_to post.title, post %></td>
+  <td class="author"><%= user_name_tag(post.user) %></td>
+  <td class="time"><%= l post.updated_at, format: :long %></td>
+  <td><%= link_to "", admin_post_path(post), 'data-confirm' => 'Are you sure?', method: :delete, class: "fa fa-trash" %></td>
+</tr>
+<% end %>
+</table>
+
+<%= paginate @posts %>

data/app/views/homeland/press/posts/_post.html.erb

@@ -1,14 +1,21 @@
-<div class="post" id="post-<= post.id %>">
-  <div class="post-title"><%= link_to post.title, post %></div>
-  <% if post.published? %>
-  <div class="post-summary markdown">
-    <%= simple_format post.summary %>
+<div class="post media" id="post-<= post.id %>">
+  <div class="media-left">
+    <div class="post-likes<%= ' active' if post.likes_count >= 1 %>">
+      <div class="icon"><i class="fa fa-heart"></i></div>
+      <div class="counter"><%= post.likes_count %></div>
+    </div>
   </div>
-  <div class="post-info">
-    <%= user_name_tag(post.user) %> ·
-    <%= timeago(post.created_at) %> ·
-    <%= link_to "#{post.likes_count} 个赞", post %> ·
-    <%= link_to "#{post.comments_count} 条评论", post_path(post, anchor: 'comments') %>
+  <div class="media-body">
+    <div class="post-title"><%= link_to post.title, post %></div>
+    <% if post.published? %>
+    <div class="post-summary markdown">
+      <%= simple_format post.summary %>
+    </div>
+    <div class="post-info">
+      <%= user_name_tag(post.user) %> ·
+      <span class="time" title="发布时间"><i class="fa fa-clock-o"></i> <%= timeago(post.created_at) %></span> ·
+      <%= link_to "#{post.comments_count} 条评论", post_path(post, anchor: 'comments') %>
+    </div>
+    <% end %>
   </div>
-  <% end %>
 </div>

data/app/views/homeland/press/posts/_sidebar.html.erb

@@ -0,0 +1,17 @@
+<div class="sidebar col-md-3 hide-ios">
+  <div class="panel panel-default">
+    <div class="panel-body">
+      <% if can? :create, Post %>
+        <%= link_to "提交新文章", new_post_path, class: 'btn btn-block btn-primary' %>
+      <% end %>
+
+      <% if can? :publish, Post %>
+      <hr />
+      <a href="<%= upcoming_posts_path %>" data-turbolinks-action="replace">
+        <i class="fa fa-newspaper-o"></i> 待审核列表...
+      </a>
+      <% end %>
+    </div>
+  </div>
+  <%= raw Setting.topic_index_sidebar_html %>
+</div>

data/app/views/homeland/press/posts/index.html.erb

@@ -1,36 +1,18 @@
 <% title_tag "头条" %>
 
-<% content_for :sub_navbar do %>
-  <div class="sub-navbar node-header hide-ios">
-    <div class="container">
-      <div class="pull-right">
-        <% if can? :create, Post %>
-          <%= link_to "提交新文章", new_post_path, class: 'btn btn-sm btn-primary' %>
+<div class="row">
+  <div class="col-md-9">
+    <div id="post-list" class="panel panel-default post-<%= action_name %>">
+      <div class="panel-body">
+        <% if @posts.blank? %>
+          <div class="no-result">暂无任何文章</div>
+        <% else %>
+          <%= render partial: 'post', collection: @posts %>
         <% end %>
-      </div>
 
-      <ul class="filter nav nav-pills">
-        <li class="<%= ' active' if action_name == 'index' %>">
-          <a href="<%= posts_path %>" data-turbolinks-action="replace">最近发布</a>
-        </li>
-        <% if can? :publish, Post %>
-        <li class="<%= ' active' if action_name == 'upcoming' %>">
-          <a href="<%= upcoming_posts_path %>" data-turbolinks-action="replace">待审核</a>
-        </li>
-        <% end %>
-      </ul>
+        <%= paginate @posts %>
+      </div>
     </div>
   </div>
-<% end %>
-
-<div id="post-list" class="panel panel-default post-<%= action_name %>">
-  <div class="panel-body">
-    <% if @posts.blank? %>
-      <div class="no-result">暂无任何文章</div>
-    <% else %>
-      <%= render partial: 'post', collection: @posts %>
-    <% end %>
-
-    <%= paginate @posts %>
-  </div>
+  <%= render 'sidebar' %>
 </div>

data/app/views/homeland/press/posts/show.html.erb

@@ -2,31 +2,39 @@
 
 <div id="post-detail" class="panel panel-default">
   <div class="panel-body">
-    <div class="post-opts">
-      <% if can?(:update, @post) %>
-      <%= link_to '编辑', edit_post_path, class: 'btn btn-sm btn-default' %>
-      <% end %>
+    <div class="post-opts clearfix">
+      <div class="pull-left">
+        <a href="<%= posts_path %>" class="btn btn-default"><i class="fa fa-chevron-left"></i> 返回文章列表</a>
+      </div>
 
-      <% if can?(:publish, @post) && @post.upcoming? %>
-      <%= link_to '审核通过', publish_post_path, method: 'put', class: 'btn btn-sm btn-success' %>
-      <% end %>
+      <div class="pull-right">
+        <% if can?(:update, @post) %>
+        <%= link_to '编辑', edit_post_path, class: 'btn btn-sm btn-default' %>
+        <% end %>
 
-      <% if can?(:destroy, @post) && @post.upcoming? %>
-      <%= link_to '删除', @post, method: 'delete', class: 'btn btn-sm btn-danger', data: { confirm: "确定要删除么？" } %>
-      <% end %>
+        <% if can?(:publish, @post) && @post.upcoming? %>
+        <%= link_to '审核通过', publish_post_path, method: 'put', class: 'btn btn-sm btn-success' %>
+        <% end %>
+
+        <% if can?(:destroy, @post) && @post.upcoming? %>
+        <%= link_to '删除', @post, method: 'delete', class: 'btn btn-sm btn-danger', data: { confirm: "确定要删除么？" } %>
+        <% end %>
+      </div>
     </div>
     <h1><%= @post.title %></h1>
     <div class="post-info">
       <%= user_name_tag(@post.user) %> ·
-      <%= timeago @post.created_at %> ·
+      <span class="time" title="发布时间"><i class="fa fa-clock-o"></i> <%= timeago @post.created_at %></span> ·
       <%= @post.hits %> 次阅读 ·
-      <a href="#comments"><%= @post.comments_count %> 条评论</a>
+      <a href="#comments"><i class="fa fa-comments-o"></i> <%= @post.comments_count %> 条评论</a>
     </div>
     <div class="post-body markdown">
       <%= markdown @post.body %>
     </div>
     <div class="post-actions">
       <%= likeable_tag(@post, class: 'btn btn-lg btn-default') %>
+
+      <%= reward_user_tag(@post.user, class: 'btn btn-lg btn-default') %>
     </div>
   </div>
 </div>

data/app/views/homeland/press/posts/upcoming.html.erb

@@ -0,0 +1,34 @@
+<% title_tag "头条" %>
+
+<div class="row">
+  <div class="col-md-9">
+    <div id="post-upcoming" class="panel panel-default post-<%= action_name %>">
+      <div class="panel-heading">待审核列表</div>
+      <div class="panel-body">
+        <% if @posts.blank? %>
+          <div class="no-result">暂无任何文章</div>
+        <% else %>
+          <table class="table table-bordered table-striped table-condensed">
+            <tr>
+              <th>#</th>
+              <th>标题</th>
+              <th>提交人</th>
+              <th>更新时间</th>
+            </tr>
+            <% @posts.each do |post| %>
+            <tr class="post">
+              <td><%= post.id %></td>
+              <td class="title"><%= link_to post.title, post %></td>
+              <td class="author"><%= user_name_tag(post.user) %></td>
+              <td class="time"><%= timeago post.updated_at %></td>
+            </tr>
+            <% end %>
+          </table>
+        <% end %>
+
+        <%= paginate @posts %>
+      </div>
+    </div>
+  </div>
+  <%= render 'sidebar' %>
+</div>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Homeland::Press::Engine.routes.draw do
-  resources :posts, path: '' do
+  resources :posts do
     collection do
       get :upcoming
       post :preview
@@ -8,4 +8,7 @@ Homeland::Press::Engine.routes.draw do
       put :publish
     end
   end
+  namespace :admin do
+    resources :posts
+  end
 end

data/lib/homeland/press/engine.rb

@@ -10,15 +10,17 @@ module Homeland
             plugin.display_name   = '头条'
             plugin.description    = 'A Press plugin for Homeland.'
             plugin.navbar_link    = true
+            plugin.admin_navbar_link = true
             plugin.user_menu_link = true
             plugin.root_path      = "/posts"
+            plugin.admin_path     = "/admin/posts"
             plugin.spec_path      = config.root.join('spec')
           end
 
           User.send :include, Homeland::Press::UserMixin
 
           app.routes.prepend do
-            mount Homeland::Press::Engine, at: '/posts'
+            mount Homeland::Press::Engine => '/'
           end
 
           app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded)

data/lib/homeland/press/version.rb

@@ -1,6 +1,6 @@
 module Homeland
   module Press
     NAME    = 'press'
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeland-press
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Lee
@@ -38,17 +38,21 @@ files:
 - app/assets/config/homeland_press_manifest.js
 - app/assets/javascripts/homeland/press/application.coffee
 - app/assets/stylesheets/homeland/press/application.scss
+- app/controllers/homeland/press/admin/posts_controller.rb
 - app/controllers/homeland/press/application_controller.rb
 - app/controllers/homeland/press/posts_controller.rb
 - app/helpers/homeland/press/application_helper.rb
 - app/models/homeland/press/ability.rb
 - app/models/post.rb
+- app/views/homeland/press/admin/posts/index.html.erb
 - app/views/homeland/press/posts/_form.html.erb
 - app/views/homeland/press/posts/_post.html.erb
+- app/views/homeland/press/posts/_sidebar.html.erb
 - app/views/homeland/press/posts/edit.html.erb
 - app/views/homeland/press/posts/index.html.erb
 - app/views/homeland/press/posts/new.html.erb
 - app/views/homeland/press/posts/show.html.erb
+- app/views/homeland/press/posts/upcoming.html.erb
 - app/views/layouts/homeland/press/application.html.erb
 - app/views/notifications/_press_published.html.erb
 - config/locales/homeland.press.zh-CN.yml