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 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 "#{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 "#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%> + <% else %> + <%= exit_project_link(@project) %> <% end %> 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| %> -
<%= f.text_field :subject, :required => true, :size => 95 %>
-<%= f.kindeditor :content, :required => true %>
+<%= f.kindeditor :content,:width=>'99%', :required => true %>