From 3b58810528a1bc07ed65990437e2faf7d8b5d149 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 7 May 2015 17:38:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84js=20Signed-off-by:=20alan?=
 =?UTF-8?q?=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb        | 18 ++++++-------
 app/views/boards/_project_show.html.erb       | 25 ++++++++++---------
 app/views/boards/show.html.erb                | 17 +------------
 .../layouts/_base_development_group.html.erb  |  4 +--
 app/views/layouts/base_projects.html.erb      |  4 +--
 .../projects/settings/_new_members.html.erb   |  7 +++++-
 public/javascripts/project.js                 | 11 ++++----
 public/stylesheets/courses.css                |  3 ++-
 public/stylesheets/pleft.css                  |  1 +
 public/stylesheets/project.css                |  3 ++-
 10 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 357071214..8f2cddc48 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -44,17 +44,15 @@
 
 
               <br/>
-
-              <p class="break_word" id="contentmessage<%=topic.id %>">
-                <%= topic.content %> </p>
-              <div class="lg-foot" style="display: block" id="lg-foot<%= topic.id %>" onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');">
-                <label id="expend_more_information<%= topic.id%>"  value="show_more"><%= l(:label_expend_information)%></label>
-                        <span class="g-arr-down">
-                            <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                        </span>
+                <p>
+              <div  id="contentmessage<%=topic.id %>" class="project_board_content">
+                <%= topic.content %>
               </div>
-
-
+              <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+                <span class="g-arr-down">
+                    <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
+                </span>
+              </p>
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
             </div>
             <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 490c1a584..ef2591b30 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -1,5 +1,4 @@
-
-<div class="project_r_h">
+<div class="project_r_h" xmlns="http://www.w3.org/1999/html">
   <h2 class="project_h2 fl">
     <% if User.current.language == "zh"%>
         <%= h @board.name %>
@@ -36,24 +35,25 @@
           <div class="talkmain_box" style="border:none; margin-bottom:0;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
-              <% author = topic.author.to_s + "：" %>
+               <% author = topic.author.to_s + "：" %>
               <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
               <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
                 	<% if topic.sticky? %>
                 		<a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
                 	<% end %>
 
+              <div class="cl"></div>
+
+               <p  id="contentmessage<%=topic.id %>" class="project_board_content">
+                 <%= topic.content %>
+               </p>     <p>
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+                <span class="g-arr-down">
+                    <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
+                </span>
 
-              <br/>
+              </p>
 
-              <p class="break_word" id="contentmessage<%=topic.id %>">
-                <%= topic.content %> </p>
-              <div class="lg-foot" style="display: block" id="lg-foot<%= topic.id %>" onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');">
-                <label id="expend_more_information<%= topic.id%>"  value="show_more"><%= l(:label_expend_information)%></label>
-                        <span class="g-arr-down">
-                            <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
-                        </span>
-              </div>
 
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -166,6 +166,7 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
 <% end %>
+  </div>
 <script type="text/javascript">
     //    var flag = false;
     //    jQuery(document).ready(function($) {
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 50d33be39..3b810a4b2 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -50,22 +50,7 @@ function show_newreply()
 {
     $("#replyContent").toggle();
 }
-function show_more() {
-    $("#contentmessage").toggleClass("course_description_none");
-    var information = $("#expend_more_information2");
-    var arrow = $("#arrow2");
-    var val = information.attr("value");
-    if (val == "show_more") {
-        $("#expend_more_information2").text("收起");
-        information.attr("value", "hide_more");
-        arrow.attr("src", "/images/jiantouup.jpg")
-    }
-    else {
-        $("#expend_more_information2").text("展开");
-        information.attr("value", "show_more");
-        arrow.attr("src", "/images/jiantou.jpg")
-    }
-}
+
 function regexContent()
 {
     var content = $.trim($("#message_content").val());
diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb
index 6550ed874..570bbd063 100644
--- a/app/views/layouts/_base_development_group.html.erb
+++ b/app/views/layouts/_base_development_group.html.erb
@@ -46,7 +46,7 @@
       <% end %><!--meny end -->
 
   <!-- more -->
-  <div class="subNav subNav_jiantou" onclick="expand_tools_expand();" id="expand_tools_expand"><%= l(:label_project_more) %></div>
-  <ul class="navContent">
+  <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
+  <ul class="navContent" id="navContent">
     <%= render 'projects/tools_expand' %>
   </ul>
\ No newline at end of file
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 958d62975..51f8b9a80 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -157,8 +157,8 @@
                   <!--邀请加入-->
                   <div class="subNavBox">
                     <% if User.current.member_of?(@project) %>
-                        <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" onclick="expand_tools_expand('invit');"><%= l(:label_invite)%></div>
-                        <ul class="navContent " style="display:block">
+                        <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" onclick="$('#navContent_invit').toggle(500);"><%= l(:label_invite)%></div>
+                        <ul class="navContent " style="display:block" id="navContent_invit">
                           <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
                           <% if User.current.allowed_to?(:manage_members, @project) %>
                             <li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 2cdcd4cf5..7d219d7d0 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -2,7 +2,12 @@
 <%
    roles = Role.givable.all
    if @project.project_type == Project::ProjectType_course
-     roles = roles[3..5]
+     if User.current.language == "zh"
+       roles = ["管理人员","开发者","报告人员"]
+     else
+       roles = ["管理人员","开发者","报告人员"]
+       # roles = roles[3..5]
+     end
    else
      roles = roles[0..2]
    end
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 6dbc90271..9a8aaecfd 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -33,9 +33,10 @@ function expand_tools_expand(content) {
         $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
     }
     else {
-        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
-        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
-        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+//        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+//        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+//        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+        $("#navContent").toggle(500);
     }
 
     // 修改数字控制速度， slideUp(500)控制卷起速度
@@ -64,12 +65,12 @@ function show_more_reply(contentid, id2, id3) {
     var arrow = $(id3);
     var val = information.attr("value");
     if (val == "show_more") {
-        $(id2).text("收起");
+        $(id2).text("[收起]");
         information.attr("value", "hide_more");
         arrow.attr("src", "/images/jiantouup.jpg")
     }
     else {
-        $(id2).text("展开更多信息");
+        $(id2).text("[展开]");
         information.attr("value", "show_more");
         arrow.attr("src", "/images/jiantou.jpg")
     }
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index c303cd6ca..4643be06b 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -534,7 +534,7 @@ a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; pa
 .w664{ width:664px;}
 .w140{ width:140px;}
 .talklist_box{  }
-.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; padding-bottom:20px; margin-bottom:20px;}
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
 .talkmain_pic{}
 a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
 a:hover.talkmain_pic{border:1px solid #64bdd9;}
@@ -576,3 +576,4 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 
 
 
+
diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css
index baca16c9c..4d495e999 100644
--- a/public/stylesheets/pleft.css
+++ b/public/stylesheets/pleft.css
@@ -49,6 +49,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 /*简介*/
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 50px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 4da93d6ea..98194b73c 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -697,7 +697,7 @@ tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);
 .w664{ width:664px;}
 .w140{ width:140px;}
 .talklist_box{  }
-.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9; padding-bottom:20px; margin-bottom:20px;}
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
 .talkmain_pic{}
 a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
 a:hover.talkmain_pic{border:1px solid #64bdd9;}
@@ -726,3 +726,4 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .newtalk { margin-top:8px; margin-right:8px;}
 .talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
 #about_newtalk{ display:none;}
+

From de921be762df4e6c6d9508504f9060d20ae631bc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 8 May 2015 08:53:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=E5=88=97=E8=A1=A8=E6=8A=A5key=20not=20find:r?=
 =?UTF-8?q?ealname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 94efb375a..22249b953 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -86,7 +86,7 @@ class CoursesService
       gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
       work_unit = get_user_work_unit m.user
       location = get_user_location m.user
-      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction}
+      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
     end
     users
   end