Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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

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>

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/>
 

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 %>