homeland 0.0.9 → 1.0.0.beta2

data/app/views/homeland/topics/_node_info.html.erb

@@ -0,0 +1,9 @@
+<% if @node %>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title"><%= node_tag(@node) %></h4>
+    <p class="card-text"><%= simple_format @node.description %></p>
+    <a href="<%= homeland.new_topic_path %>" class="btn btn-primary"><%= t('homeland.nav.new') %></a>
+  </div>
+</div>
+<% end %>

data/app/views/homeland/topics/_reply_form.html.erb

@@ -0,0 +1,16 @@
+<nav id="reply-panel">
+  <div class="container">
+    <%= form_for(Homeland::Reply.new, url: reply_topic_path(@topic.id)) do |f| %>
+      <%= f.hidden_field :reply_to_id %>
+
+      <div class="row">
+        <div class="col-sm-8">
+          <%= f.text_area :body, class: 'form-control', rows: 5, placeholder: t('homeland.topics.type_reply') %>
+        </div>
+        <div class="col-sm-2">
+          <button type="submit" class="btn btn-primary"><%= t('homeland.submit') %></button>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</nav>

data/app/views/homeland/topics/_topic.html.erb

@@ -1,26 +1,17 @@
-<div class="topic topic_line">
-  <div class="pull-left avatar">
-		<%= user_avatar_tag(topic.user) %>
-  </div>
-  <div class="right_info">
-    <div class="pull-right replies">
-      <a href="<%= topic_path(topic.id) %>#reply<%= topic.replies_count %>" class="count">
-      <%= topic.replies_count %>
-      </a>
-    </div>
-    <div class="infos">
-      <div class="title"><a href="<%= topic_path(topic) %>#reply<%= topic.replies_count %>" title="<%= topic.title %>"><%= truncate(topic.title, :length => 100) %></a></div>
-      <div class="info leader">
-        由 <%= user_name_tag(topic.user) %>
-        在 <a href="<%= node_topics_path(topic.node_id) %>"><%= topic.node.name %></a> 中发起
-      </div>
-      <div class="info time">
-        <% if topic.last_reply_user.blank? %>
-          发布于 <%= timeago(topic.created_at) %>
-        <% else %>
-          最后由 <%= user_name_tag(topic.last_reply_user) %> 回复于 <%= timeago(topic.replied_at) %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
+<tr class="topic">
+  <td class="title">
+    <%= link_to topic.title, homeland.topic_path(topic) %>
+  </td>
+  <td class="node">
+    <%= node_tag(topic.node) %>
+  </td>
+  <td class="author">
+    <%= user_avatar_tag(topic) %>
+  </td>
+  <td class="replies">
+    <%= topic.replies_count %>
+  </td>
+  <td class="activity">
+    <%= timeago topic.activity_at %>
+  </td>
+</tr>

data/app/views/homeland/topics/edit.html.erb

@@ -1,11 +1,7 @@
-<%= render 'base' %>
-<% content_for :breadcrumb do %>
-<li class="active">修改</li>
-<% end %>
+<ol class="breadcrumb">
+  <li><a href="<%= homeland.root_path %>"><%= t('homeland.nav.home') %></a></li>
+  <li><a href="<%= homeland.topic_path(@topic) %>" title="<%= @topic.title %>"><%= truncate @topic.title, length: 20 %></a></li>
+  <li class="active"><%= t('homeland.nav.edit') %></li>
+</ol>
 
-<%= render 'sidebar' %>
-<div class="content">
-	<div class="box">
-		<%= render 'form' %>
-	</div>
-</div>
+<%= render 'form' %>

data/app/views/homeland/topics/index.html.erb

@@ -1,53 +1,30 @@
-<%= render 'base' %>
-<% content_for :breadcrumb do %>
-	<% if @node.blank? %>
-	  <li>首页</li>
-  <% else %>
-    <li><%= @node.name %></li>
-	<% end %>
-<% end %>
-<%= render 'sidebar' %>
+<div class="topics">
+  <%= render 'node_info' %>
 
-<div class="content">
-	<div class="box">
-    <% if !@node.blank? %>
-    <div id="node_info">
-      <p>
-        <h1><%= @node.name %></h1>
-        <span class="total">共有 <%= @node.topics_count %> 个讨论主题</span>
-      </p>
-    </div>
-    <% else %>
-      <h1 class="bbs_name">论坛</h1>
-    <% end %>
-    <div class="topics">
-	 <%= render :partial => "topic", :collection => @topics %>
-    </div>
-      
-    <% if params[:action] == "index" %>
-      <div class="more">
-        <a href="<%= recent_topics_path %>">查看更多最近发布的帖子...</a>
-      </div>
-    <% elsif params[:action] == "node" or params[:action] == "search" %>
-      <%= will_paginate @topics %>
-    <% end %>
-	</div>
-	<% if params[:action] == "index" %>
-	<div id="sections" class="box">
-	<h2>节点分类导航</h2>
-	<ul>
-		<% @sections.each do |section| %>
-		<li>
-			<label><%= section.name %></label>
-      <div class="items">
-  			<% section.nodes.each do |node| %>
-  			<a href="<%= node_topics_path(node.id) %>" title="<%= node.name %>"><%= node.name %></a>
-  			<% end %>
-      </div>
-		</li>
-		<% end %>
-	</ul>
-	</div>
-	<% end %>
-</div>
+  <table class="table">
+    <thead class="thead-default">
+      <tr class="topic">
+        <th class="title"><%= t('activerecord.attributes.homeland/topic.title')%></th>
+        <th class="node"><%= t('activerecord.attributes.homeland/topic.node')%></th>
+        <th class="author"><%= t('activerecord.attributes.homeland/topic.user')%></th>
+        <th class="replies"><%= t('activerecord.attributes.homeland/topic.replies_count')%></th>
+        <th class="activity"><%= t('activerecord.attributes.homeland/topic.activity')%></th>
+      </tr>
+    </thad>
+    <tbody>
+      <% if @topics.blank? %>
+        <tr>
+          <th>
+            <span class="text-mutted">
+              <%= t('homeland.topics.empty') %>
+            </span>
+          </td>
+        </tr>
+      <% else %>
+        <%= render @topics %>
+      <% end %>
+    </tbody>
+  </table>
 
+  <%= homeland_paginate @topics %>
+</div>

data/app/views/homeland/topics/new.html.erb

@@ -1,11 +1,6 @@
-<%= render 'base' %>
-<% content_for :breadcrumb do %>
-  <li class="active">新建贴子</li>
-<% end %>
+<ol class="breadcrumb">
+  <li><a href="<%= homeland.root_path %>"><%= t('homeland.nav.home') %></a></li>
+  <li class="active"><%= t('homeland.nav.new') %></li>
+</ol>
 
-<%= render 'sidebar' %>
-<div class="content">
-	<div class="box">
-		<%= render 'form' %>
-	</div>
-</div>
+<%= render 'form' %>

data/app/views/homeland/topics/show.html.erb

@@ -1,94 +1,21 @@
-<%= render 'base' %>
-<%= content_for :breadcrumb do %>
-  <li class="active">查看贴子</li>
-<% end %>
-<%= render 'sidebar' %>
-<div class="content">
-	<div class="topics box">
-		<div class="topic">
-		  <div class="pull-right avatar_large">
-				<%= user_avatar_tag(@topic.user) %>
-			</div>
-	    <div class="infos">
-				<h1><%= truncate(@topic.title, :length => 100) %></h1>
-				<div class="info leader">
-					由 <%= user_name_tag(@topic.user) %>
-					在 <a href="<%= node_topics_path(@topic.node_id) %>"><%= @topic.node.name %></a> 节点中发起
-				</div>
-				<div class="info time">
-					<% if @topic.last_reply_user.blank? %>
-						发布于 <%= timeago(@topic.created_at) %>
-					<% else %>
-						最后由 <%= user_name_tag(@topic.last_reply_user) %> 回复于 <%= timeago(@topic.replied_at) %>
-					<% end %>
-				</div>
-			</div>
-		</div>
-		<div class="body">
-			<%= format_topic_body(@topic.body) %>
-		</div>
-		<div class="tools">
-		  <% if owner?(@topic) %>
-  			<a href="<%= edit_topic_path(@topic.id) %>">修改</a>
-  			<%= link_to "删除", topic_path(@topic.id), :method => :delete, :confirm => "确定要删除么？" %>
-			<% end %>
-		</div>
-	</div>
-  <% if @replies.blank? %>
-    <div class="no_result">
-      暂无回复。
+<div class="row">
+  <div class="topic-detail col-lg-9">
+    <h1>
+      <%= @topic.title %>
+      <%= node_tag(@topic.node) %>
+    </h1>
+
+    <div class="topic-content">
+      <%= render partial: 'homeland/replies/reply', locals: { reply: @topic } %>
     </div>
-  <% else %>
-  <div id="replies" class="box">
-    <div class="total">
-      截止 <%= l @topic.replied_at, :format => :long %>, 共收到 <%= @topic.replies_count %> 条回复
+
+    <div class="replies">
+      <%= render @replies %>
     </div>
-    <% @replies.each_with_index do |reply,i| %>
-      <div class="reply" id="reply<%= i + 1 %>">
-        <div class="pull-left face"><%= user_avatar_tag(reply.user) %></div>
-        <div class="infos">
-          <div class="info clearfix">
-            <span class="name"><%= user_name_tag(reply.user) %></span>
-            <span class="time"><%= i + 1 %>楼, 回复于 <%= timeago(reply.created_at) %>
-              <% if owner?(reply) %>
-          			<a href="<%= edit_reply_path(reply.id) %>">修改</a>
-        			<% end %>
-             </span>
-          </div>
-          <div class="body">
-            <%= format_topic_body(reply.body) %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-    <script type="text/javascript">
-      $(document).ready(function(){
-        atDatas = []
-        $(".reply .name a").text(function(idx,text) { atDatas.push(text) });
-        $('#reply_body').atWho("@",{'data':atDatas});
-      })
-    </script>
-  </div>
-  <% end %>
-	<% if current_user %>
-  <div id="reply" class="form box">
-    <h4>回复</h4>
-    <%= form_for(Homeland::Reply.new,:url => reply_topic_path(params[:id])) do |f| %>
-      <div class="pull-right">
-        <button type="submit" class="btn btn-primary">提交回复</button><br />
-        <span class="help-inline">Ctrl+Enter</span>
-      </div>
-      <div class="clearfix">
-        <%= f.text_area :body,:class => "span10", :rows => "4" %>
-      </div>
 
-    <% end %>
   </div>
-	<% else %>
-	<div id="reply" class="form box">
-		<div style="padding:20px;">
-		需要 <a href='/account/sign_in' class="btn btn-primary">登录</a> 后回复方可回复, 如果你还没有账号 <a href="/account/sign_up" class="btn btn-success"> 点击这里注册</a>。
-		</div>
-	</div>
-	<% end %>
+
+
 </div>
+
+<%= render 'reply_form' %>

data/app/views/layouts/homeland/application.html.erb

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= @page_title %></title>
+  <%= stylesheet_link_tag    "homeland/application", media: "all" %>
+  <%= javascript_include_tag "homeland/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+  <nav class="navbar navbar-light bg-faded">
+    <div class="container">
+      <a class="navbar-brand" href="<%= main_app.root_path %>"><%= t('homeland.nav.home') %></a>
+      <ul class="nav navbar-nav main-nav">
+        <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'index' %>">
+          <a class="nav-link" href="<%= homeland.root_path %>"><%= t('homeland.nav.latest') %></a>
+        </li>
+        <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'features' %>">
+          <a class="nav-link" href="<%= homeland.features_topics_path %>"><%= t('homeland.nav.features') %></a>
+        </li>
+        <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'recent' %>">
+          <a class="nav-link" href="<%= homeland.recent_topics_path %>"><%= t('homeland.nav.recent') %></a>
+        </li>
+      </ul>
+      <ul class="nav navbar-nav pull-xs-right">
+        <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'new' %>">
+          <a class="btn btn-primary-outline" href="<%= homeland.new_topic_path %>"><i class="fa fa-plus"></i> <%= t('homeland.nav.new') %></a>
+        </li>
+      </ul>
+    </div>
+  </nav>
+
+  <div class="main-layout">
+    <div class="container">
+      <%= notice_message %>
+
+      <%= yield %>
+    </div>
+  </div>
+
+</body>
+</html>

data/config/locales/homeland.en.yml

@@ -0,0 +1,40 @@
+en:
+  activerecord:
+    models:
+      homeland/topic: "Topic"
+      homeland/reply: "Reply"
+    attributes:
+      homeland/topic:
+        title: "Subject"
+        body: "Content"
+        node: "Channel"
+        replies_count: "Replies"
+        user: "Author"
+        activity: "Activity"
+      homeland/reply:
+        body: "Content"
+  homeland:
+    nav:
+      home: 'Homeland'
+      latest: 'Latest'
+      features: 'Features'
+      recent: 'Recent'
+      node: "Channel"
+      new: "New Topic"
+      edit: 'Edit'
+    topics:
+      empty: 'Ther have no subject created.'
+      type_reply: 'Write your reply here...'
+      reply_to: "Reply To"
+    submiting: 'Submiting...'
+    submit: 'Submit'
+    cancel: 'Cancel'
+    reply: 'Reply'
+    access_denied: "Access denied."
+    are_you_sure_to_delete: "Are you sure to delete?"
+    topic_created: "Topic created success."
+    topic_updated: "Topic updated success."
+    topic_deleted: "Topic deleted success."
+    reply_created: "Reply created success."
+    reply_deleted: "Reply deleted success."
+    reply_updated: "Reply updated success."

data/config/locales/homeland.zh-CN.yml

@@ -0,0 +1,8 @@
+zh-CN:
+  homeland:
+    nav:
+      home: '网站首页'
+      topics: '讨论区'
+    submiting: '提交中...'
+    submit: '提交'
+    cancel: '取消'

data/config/routes.rb

@@ -1,16 +1,14 @@
 Homeland::Engine.routes.draw do
-  root :to => "topics#index"
-  get "topics/node_:id", :to => "topics#node", :as => :node_topics
-  resources :topics do
+  root to: 'topics#index'
+  get 'c/:id', to: 'topics#node', as: :node_topics
+  resources :topics, path: 't' do
     member do
       post :reply
     end
     collection do
-      get :node
-      get :search
-      get :feed
       get :recent
+      get :features
     end
   end
-  resources :replies
-end
+  resources :replies, path: 'r'
+end

data/db/migrate/20160321125035_create_homeland_nodes.rb

@@ -0,0 +1,15 @@
+class CreateHomelandNodes < ActiveRecord::Migration
+  def change
+    create_table :homeland_nodes do |t|
+      t.string :name, null: false
+      t.string :description
+      t.string :color
+      t.integer :sort, default: 0, null: false
+      t.integer :topics_count, null: false, default: 0
+
+      t.timestamps null: false
+    end
+
+    add_index :homeland_nodes, 'sort'
+  end
+end

data/db/migrate/20160321125610_create_homeland_topics.rb

@@ -0,0 +1,25 @@
+class CreateHomelandTopics < ActiveRecord::Migration
+  def change
+    create_table :homeland_topics do |t|
+      t.integer :node_id, null: false
+      t.integer :user_id, null: false
+      t.string :title, null: false
+      t.text :body
+      t.text :body_html
+      t.integer :last_reply_id
+      t.integer :last_reply_user_id
+      t.integer :last_active_mark, null: false, default: 0
+      t.datetime :replied_at
+      t.integer :replies_count, null: false, default: 0
+      t.datetime :deleted_at
+
+      t.timestamps null: false
+    end
+
+    add_index :homeland_topics, :deleted_at
+    add_index :homeland_topics, [:node_id, :deleted_at]
+    add_index :homeland_topics, :user_id
+    add_index :homeland_topics, [:last_active_mark, :deleted_at]
+    add_index :homeland_topics, [:node_id, :last_active_mark]
+  end
+end