From 945b9ff9cfd827bdb7e58790c8f9d4423199beff Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 7 Mar 2015 11:38:15 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8A=A8=E6=80=81=EF=BC=8C=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=BA=BA=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8C=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 00af13cb5..5e2f76705 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -443,15 +443,15 @@ class UsersController < ApplicationController
         activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
-        activity = activity.reject { |e|
-          !User.current.admin? &&
-              (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
-              (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
-              (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
-              (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
-              (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
-        }
       end
+      activity = activity.reject { |e|
+        !User.current.admin? &&
+            (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+                (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+                (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+                (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+                (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
+      }
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
       @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)

From e8bdc13f24e7263375b0cf6afbd2b6d8f5de03e1 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 7 Mar 2015 12:25:42 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=BC=BA=E9=99=B71975=EF=BC=8C=E6=89=93?=
 =?UTF-8?q?=E5=BC=80project=20330=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 6a47f07f0..37c7a81a7 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -21,7 +21,8 @@
   <div class="scroll">
     <% unless @events_pages.empty? %>
     <% @events_pages.each do |e| -%>
-      <% act = e.forge_act %>
+      <% act = e.forge_act;
+         next if act.nil? %>
       <% if e.forge_act_type == "Issue" %>
       <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;margin-top: 10px;">
         <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">

From 77f81ac171e088952e50f8279751da6cd7fb1ea3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 7 Mar 2015 14:32:34 +0800
Subject: [PATCH 3/7] =?UTF-8?q?kaminari=E5=88=86=E9=A1=B5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/initializers/kaminari_config.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index 2ae42e414..5505662f3 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -23,10 +23,10 @@
 Kaminari.configure do |config|
   # config.default_per_page = 25
   # config.max_per_page = nil
-  # config.window = 4
+   config.window = 2
   # config.outer_window = 3
-  # config.left = 0
-  # config.right = 0
+  # config.left = 2
+  # config.right = 2
   # config.page_method_name = :page
   # config.param_name = :page
 end

From 3f3bb6267887968164e3e9ac00cf91cfc7a8d8df Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 7 Mar 2015 14:43:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB=E3=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=8C=89=E9=92=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb |  2 +-
 app/views/news/_project_news.html.erb   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 25903f588..9a3b79051 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -45,7 +45,7 @@
     <%= link_to @topic_count,:controller => 'boards',:action => 'index' %>
     个贴子
   </span>
-  <% if @project.enabled_modules.where("name = 'boards'").count > 0 %>
+  <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
     <span>
         <%= link_to l(:label_message_new),
                     new_board_message_path(@board),
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index b18c2abd8..4d20c62f7 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -70,11 +70,11 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= label_tips %>
 </span>
-<% if @project.enabled_modules.where("name = 'news'").count > 0 %>
-<%= link_to(btn_tips,
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+<% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %>
+    <%= link_to(btn_tips,
+                new_project_news_path(@project),
+                :class => 'icon icon-add',
+                :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
 <% end %>
 <% if @project && User.current.allowed_to?(:manage_news, @project) %>
     <div id="add-news" class="add_frame" style="display:none;">

From 749e10592d65205991dfd6c6664f2580daddfbe0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 7 Mar 2015 14:47:12 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_invite_members_by_mail.html.erb | 5 ++++-
 app/views/projects/invite_members_by_mail.html.erb  | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb
index 68ab6fae4..12c8d31ad 100644
--- a/app/views/projects/_invite_members_by_mail.html.erb
+++ b/app/views/projects/_invite_members_by_mail.html.erb
@@ -1,10 +1,13 @@
+<div class="project_r_h">
+  <h2 class="project_h2">邀请加入</h2>
+</div>
 <div  class="floatbox" style="margin:100px;">
   <div ><a href="#" class="box_close"></a></div>
   <div class="cl"></div>
   <div class="box_main">
     <h3 class="box_h3">发送邮件邀请新用户</h3>
     <p class="box_p">输入好友邮箱地址，Trustie帮您免费发送！</p>
-    <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %>
+    <p style="padding-lef:20px;"><%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %></p>
     <ul>
       <li >
             <%= text_field_tag 'mail',  '邮箱', :class => "fb_item fl" %>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index c38aec404..c2a519167 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,2 +1 @@
-<%= stylesheet_link_tag  'project', :media => 'all' %>
 <%= render :partial => "invite_members_by_mail"%>
\ No newline at end of file

From ba09213023dbabc9cb7c16f7cebb863e60c0e6bb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 7 Mar 2015 15:32:50 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=81=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_project_news.html.erb               |  7 +++----
 app/views/news/_project_show.html.erb               |  3 +++
 app/views/projects/_invite_members_by_mail.html.erb | 10 ++--------
 app/views/projects/_tools_expand.html.erb           |  3 +++
 app/views/projects/invite_members.html.erb          |  2 +-
 config/locales/zh.yml                               |  1 +
 public/stylesheets/application.css                  |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index 4d20c62f7..a1966ea53 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
@@ -66,10 +69,6 @@
      label_tips = l(:label_news)
    end
 %>
-
-<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= label_tips %>
-</span>
 <% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %>
     <%= link_to(btn_tips,
                 new_project_news_path(@project),
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 7b4c209b0..874e89e1f 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb
index 12c8d31ad..1f6365664 100644
--- a/app/views/projects/_invite_members_by_mail.html.erb
+++ b/app/views/projects/_invite_members_by_mail.html.erb
@@ -1,22 +1,16 @@
 <div class="project_r_h">
   <h2 class="project_h2">邀请加入</h2>
 </div>
-<div  class="floatbox" style="margin:100px;">
+<div  class="floatbox" style="margin:120px;">
   <div ><a href="#" class="box_close"></a></div>
   <div class="cl"></div>
   <div class="box_main">
     <h3 class="box_h3">发送邮件邀请新用户</h3>
     <p class="box_p">输入好友邮箱地址，Trustie帮您免费发送！</p>
     <p style="padding-lef:20px;"><%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %></p>
-    <ul>
-      <li >
             <%= text_field_tag 'mail',  '邮箱', :class => "fb_item fl" %>
-      </li>
       <div class="cl"></div>
-
-      <div class="cl"></div>
-    </ul>
-    <%= submit_tag '免费发送', :class=> "btn_free" %>
+    <%= submit_tag '免费发送', :style=> "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>
 
     <% end %>
   </div>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index aaf48f0ec..fed10b3f2 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -3,6 +3,9 @@
         <%= link_to l(:label_settings), settings_project_path(@project) %>
     <% end %>
 </li>
+<li>
+  <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+</li>
 <li>
 	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
 </li>
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index e57696fc3..8b0a5a183 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -39,7 +39,7 @@
           <% end %>
         </p>
         <p>
-          <%= submit_tag l(:button_add), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
+          <%= submit_tag l(:label_invite_members), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
         </p>
        <% end %>
       <% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2763a59ad..4abc2eee5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1928,6 +1928,7 @@ zh:
   label_bids_task_list: 作业列表
   label_join_course: 加入
   label_invite_project: 邀请您加入项目
+  label_invite_members: 邀请用户
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 70b49de3b..c80012f6a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -91,7 +91,7 @@ a:hover.more{ color:#64bdd9;}
 .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*邮件邀请*/
-.box_main{ width:345px; margin:0 auto;}
+.box_main{ width:345px; margin:0 auto;padding-left:40px;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
 .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}

From 782071ab64a23fa2df1acfbe3d05f50ec5681391 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 7 Mar 2015 15:36:00 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E9=97=AE=E9=A2=98=EF=BC=8Capp?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb     |  4 ++++
 app/services/courses_service.rb         |  4 ++--
 app/views/admin/mobile_version.html.erb |  3 +--
 config/routes.rb                        |  1 +
 db/schema.rb                            | 19 +++++++------------
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 69aae8008..c77ebe704 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -336,4 +336,8 @@ class AdminController < ApplicationController
 
   end
 
+  def create_version
+
+  end
+
 end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 22b7f8cd3..46b59ef08 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -158,9 +158,9 @@ class CoursesService
 
 
   #显示课程
-  def show_course(params,currnet_user)
+  def show_course(params,current_user)
     course = Course.find(params[:id])
-    unless (course.is_public == 1 ||  currnet_user.member_of_course?(@course)|| currnet_user.admin?)
+    unless (course.is_public == 1 ||  current_user.member_of_course?(course) || current_user.admin?)
       raise '403'
     end
     {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
diff --git a/app/views/admin/mobile_version.html.erb b/app/views/admin/mobile_version.html.erb
index f8fd4ad6c..293b0ec46 100644
--- a/app/views/admin/mobile_version.html.erb
+++ b/app/views/admin/mobile_version.html.erb
@@ -2,9 +2,8 @@
 <a href="javascript:void(0)" onclick="$('#new_version').slideToggle(400); ">发布新版本</a>
 <div>
   <form id="new_version" style="display: none">
-
+    发布新版本
   </form>
-
 </div>
 <br/>
 <div>当前版本:</div>
diff --git a/config/routes.rb b/config/routes.rb
index b105dabc3..f867d1351 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -642,6 +642,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/web_footer_made', as: :web_footer_made
   match 'admin/enterprise_page_made', as: :enterprise_page_made
   match 'admin/mobile_version', as: :mobile_version
+  match 'admin/create_version', as: :create_version
   match 'admin/search',  :via => [:get, :post]
   match 'admin/plugins',  :via => :get
   match 'admin/info',  :via => :get
diff --git a/db/schema.rb b/db/schema.rb
index f4e6b09c7..bad1cf2ae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(:version => 20150305081132) do
-=======
-ActiveRecord::Schema.define(:version => 20150305011359) do
->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -819,19 +815,18 @@ ActiveRecord::Schema.define(:version => 20150305011359) do
     t.integer  "project_id"
   end
 
-<<<<<<< HEAD
-  create_table "phone_app_versions", :force => true do |t|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-=======
   create_table "organizations", :force => true do |t|
     t.string   "name"
     t.string   "logo_link"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8
+  end
+
+  create_table "phone_app_versions", :force => true do |t|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   create_table "poll_answers", :force => true do |t|