Merge branch 'wordh' into develop

app/views/words/_journal_reply_items.html.erb

@@ -1,4 +1,5 @@
-<li>
+ <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
+<li onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
 	<span class="portrait">
 		<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
 	</span>
@@ -7,9 +8,10 @@
 	    <span><%= link_to reply.user.name, user_path(reply.user) %>:&nbsp;</span>
 	    <span class="message-notes"> <%= reply.notes %></span>
 	        <% ids = 'project_respond_form_'+ journal.id.to_s%>
-	    <p style="margin-top: 4px; font-size: 9pt;">
+	       
+	    <p>
 	    	<span class="time"><%= format_time reply.created_on %></span>
-	    	<span style="float: right;">
+	    	<span style="display: none; margin-left: 4px;" id=<%= ids_r %>>
 	    		<%#= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %>
 	    		<%= link_to l(:label_projects_feedback_respond),'',
                     {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{reply.user.show_name}: '); return false;"}

app/views/words/_message.html.erb

@@ -12,9 +12,9 @@
 		<% else %> 
 			<span class="font_lighter"><%= l(:label_leave_others_message) %></span> 
 		<% end %>
-		<span>
+		<p>
 				<%= textilizable journal.notes%>
-		</span>
+		</p>
 		<span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span>
 				<% ids = 'project_respond_form_'+ journal.id.to_s%>
 				<%#= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>

public/themes/redpenny-master/stylesheets/application.css

@@ -2118,6 +2118,7 @@ span.body{
  
 ul.messages-for-user-reply li {
 	padding-bottom: 4px;
+	font-size: 9pt;
 }
 
 .respond-form{
@@ -2125,4 +2126,18 @@ ul.messages-for-user-reply li {
 	width: 100%; 
 	margin: auto;
 	clear:both;
+}
+
+.outer-message-for-use p {
+	margin: 0;
+	padding: 0;
+	margin-top: 5px;
+}
+
+.body p {
+	margin: 0;
+	padding: 0;
+	margin-top: 4px;
+	margin-left: 4px;
+	font-size: 9pt;
 }