- <% id = 'project_respond_form_'+ reply.id.to_s %>
-
<%= link_to reply.user.name, user_path(reply.user) %>:
-
<%= reply.notes %>
- <%# ids = 'project_respond_form_'+ journal.id.to_s%>
-
+
+ <% id = 'project_respond_form_'+ reply.id.to_s %>
+
+ <%= link_to reply.user.name, user_path(reply.user) %>:
+ <%= reply.notes %>
+
<%= format_time reply.created_on %>
<%= 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;"}
%>
-
<% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 50b9bc83..91950fad 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -30,13 +30,14 @@
- <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
-
-
- <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
-
-
-<% end %>
+ <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
+
+
+
+ <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
+
+
+ <% end %>
<% end %>
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index cc0a117f..43049c60 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -1,9 +1,45 @@
+
<%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %>
-<%= text_area_tag 'user_notes', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content) %>
+<%= text_area_tag 'user_notes', "", :class => 'noline',
+ :style => "resize: none;", :rows => 4,
+ :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 => "enterprise", :style => "margin-top: 1px;"%>
+<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
<% end %>
\ No newline at end of file
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index c3e02180..7eeea1b0 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -159,6 +159,7 @@ li {
margin: 0px;
padding: 0px;
background-color: rgb(252, 252, 252);
+ margin-top: 6px;
}
.d-p-index-newsource li,.d-p-index-hotproject ul.d-p-projectlist li{
color: rgb(102, 102, 102);
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 0dcca361..f57d1055 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2125,7 +2125,7 @@ ul.messages-for-user-reply li {
display: none;
width: 87%;
margin: auto;
- clear:both;
+ clear: both;
}
.outer-message-for-use p {
@@ -2134,10 +2134,20 @@ ul.messages-for-user-reply li {
margin-top: 5px;
}
-.body p {
+.message-body p {
margin: 0;
padding: 0;
margin-top: 4px;
margin-left: 4px;
font-size: 9pt;
+}
+
+.message-body {
+ margin: 0;
+ padding: 0;
+ margin-left: 40px;
+}
+
+.counter {
+ float: left;
}
\ No newline at end of file