jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modified projects

This commit is contained in:
nieguanghui 2013-12-30 16:03:28 +08:00
parent 4c4e725b5c
commit 36289eba41
3 changed files with 41 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -80,7 +80,7 @@ class ProjectsController < ApplicationController
helper :documents
helper :watchers
# helper :watcherlist
helper :words
### added by william
include ActsAsTaggableOn::TagsHelper

4
app/views/projects/_new_respond.html.erb
View File

@ -1,13 +1,13 @@
<%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %>
<%= text_area_tag 'project_respond', "",
:class => 'noline', :required => true,
:style => "resize: none;", :rows => 6,
:style => "resize: none;", :rows => 3,
:placeholder => l(:label_projects_feedback_respond_content),
:maxlength => 250 %>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise"%>
<%end%>

86
app/views/projects/feedback.html.erb
View File

@ -1,57 +1,47 @@
<!-- fq -->
<h3><%= l(:label_user_response) %></h3>
<div style="width: 80%; margin-left:10%;">
<%= form_for('new_form', :method => :post,
:url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%>
<table border="0" width="525px" align="center" >
<tr>
<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :placeholder => "#{l(:label_welcome_my_respond)}", :style => "resize: none;", :class => 'noline'%></td>
</tr>
</table>
<table border="0" width="525px" align="center">
<tr>
<td align="right">
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn" %>
</td>
</tr>
</table>
<%= f.text_area 'project_message', :rows => 3, :cols => 65,
:placeholder => "#{l(:label_welcome_my_respond)}",
:style => "resize: none; width: 98%",
:class => 'noline'%>
<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%>
<% end %>
</div>
<div style="clear: both;"></div>
<% if @jour.size >0 %>
<% for journal in @jour%>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
<td>
<table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong> <%= link_to journal.user, user_path(journal.user)%></strong><span class="font_lighter"><%= l(:label_projects_feedback) %></span></td>
</tr>
<tr>
<td colspan="2" width="580px" >
<div class="font_description">
<%= textilizable journal.notes%>
</div></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span></td>
<td width="200" align="right" class="a">
<% ids = 'project_respond_form_'+journal.id.to_s%>
<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> </td>
</tr>
<tr>
<td colspan='2'>
<div id=<%= ids%> style="display: none">
<%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
</div></td>
</tr>
</table></td>
</tr>
</table>
<div class="line_under"></div>
<% end %>
<ul class="message-for-user">
<% for journal in @jour%>
<li class="outer-message-for-user">
<span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
<span class="body">
<span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
<span class="font_lighter"><%= l(:label_projects_feedback) %></span>
<p >
<%= textilizable journal.notes%>
</p>
<span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span>
<% id = 'project_respond_form_'+journal.id.to_s%>
<span><%= link_to l(:label_projects_feedback_respond),'',
{:focus => 'project_respond',
:onclick => "toggleAndSettingWordsVal($('##{id}'),
$('##{id} textarea'),
'#{l(:label_reply_plural)} #{m_reply_id.user.show_name}: ');
return false;"} %></span>
</span>
<div style="clear: both;"></div>
<div id='<%= id %>' class="respond-form">
<%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
</div>
<div style="clear: both;"></div>
<div>
<%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
</div>
</li>
<% end %>
</ul>
<% end %>
<div class="pagination" style="float:left;">