From 1a33510da17c7de7fe9303e363da7ae4efb4d32a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Apr 2015 17:31:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E8=A6=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E3=80=81=E6=88=91=E8=A6=81=E6=8F=90=E9=97=AE=E6=96=B0=E7=89=88?=
 =?UTF-8?q?Editor=E6=B2=A1=E6=9C=89=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/_topic_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb
index a18402acf..3ce8cdf9a 100644
--- a/app/views/memos/_topic_form.html.erb
+++ b/app/views/memos/_topic_form.html.erb
@@ -1,9 +1,9 @@
 <%= labelled_form_for(@memo, :url => forum_memos_path) do |f|  %>
 
-  <div class="actions" style="max-width:680px">
+  <div class="actions" style="max-width:680px;">
     <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
     <p><%= f.text_field :subject, :required => true, :size => 95 %></p>
-    <p style="max-width:680px"><%= f.kindeditor :content, :required => true %></p>
+    <p style="max-width:680px"><%= f.kindeditor :content,:width=>'99%', :required => true %></p>
     <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
     <br/>
 

From 7e833a472785d0a4ace534af211f541c3fa3b7a7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Apr 2015 17:41:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fed074bdb..3feb49547 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -329,7 +329,7 @@ module ApplicationHelper
     imagesize = attachment.thumbnail(:size => "50*50")
     imagepath = named_attachment_path(attachment, attachment.filename)
     if imagesize
-      link_to image_tag(thumbnail_path(attachment,"50")),
+      link_to image_tag(thumbnail_path(attachment), height: '73', width: '100'),
               imagepath,
               :title => attachment.filename
     else

From db8b79f3b4d2141129cf2c92d2af7955d6013935 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 27 Apr 2015 11:42:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=89=E7=A7=8D=E6=A8=A1=E5=BC=8F=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_join_exit_project.html.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 67744e4b8..1d302babf 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -10,6 +10,10 @@
   <!--退出项目-->
   <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)  %>
       <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>
+  <% end %>
+  <% if Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s.include?("Manager") || User.current.admin? %>
       <%= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
+  <% else %>
+      <%= exit_project_link(@project) %>
   <% end %>
 </div>

From 020e544b38a0fb9bb48e97bb1682c1793c1593e8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 27 Apr 2015 14:34:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88--=E4=B8=A4=E5=B1=82?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_new_respond.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index 34e7c1ccf..243f8b2c4 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -1,5 +1,5 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
-    <%= text_area_tag 'user_notes', "", :class => 'noline',
+    <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
                       :style => "resize: none;", :rows => 4,
                       :placeholder => l(:label_feedback_respond_content),
                       :maxlength => 250 %>
@@ -9,7 +9,7 @@
     <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
-                   :class => "enterprise",
+                   :class => "reply_btn",
                    :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
 
 <% end %>
\ No newline at end of file