From e1afdab98852d5fda91a6dd75eb54b9fadcf6a27 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 26 Mar 2015 17:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_courses_jours.html.erb     |  6 ++--
 app/views/courses/_history.html.erb           |  8 ++---
 app/views/courses/feedback.html.erb           |  5 +--
 app/views/words/_journal_reply_items.html.erb | 33 +++++++++----------
 app/views/words/_new_respond_course.html.erb  | 10 +++---
 public/stylesheets/courses.css                |  4 ++-
 6 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index 680bafb46..385b945d9 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -12,10 +12,10 @@
   <% else %>
         <%= form_for('new_form', :method => :post,
                      :url => {:controller => 'words', :action => 'leave_course_message'}) do |f|%>
-            <%= f.text_area 'course_message',:id => "leave_meassge", :rows => 3, :cols => 65,
+            <%= f.text_area 'course_message',:id => "leave_meassge",
                             :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250%>
-            <a href="#">取&nbsp;&nbsp;消</a>
-            <a href="#"  onclick='$("#leave_meassge").parent().submit();'> <%= l(:button_leave_meassge)%></a>
+            <a href="#" class="grey_btn fr ml10">取&nbsp;&nbsp;消</a>
+            <a href="#"  onclick='$("#leave_meassge").parent().submit();' class="blue_btn fr"> <%= l(:button_leave_meassge)%></a>
         <% end %>
   <% end %>
 </div>
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 23d4909d9..01990602d 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -3,17 +3,15 @@
         <% for journal in journals %>
             <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
               <div class="ping_dispic">
-                <a target="_blank" href="#">
-                  <%= image_tag(url_to_avatar(journal.user),:width => '46',:height => '46')  %>
-                </a>
+                  <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
               </div>
               <div class="ping_discon" style="width: 610px;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%>
+                    <%= link_to journal.user, user_path(journal.user),:class => 'c_blue fb fl mb10', :target => "_blank"%>
                   </span>
-                  <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">
+                  <span class="c_grey fr">
                     <%= format_time(journal.created_on) %>
                   </span>
                   <div class="cl"></div>
diff --git a/app/views/courses/feedback.html.erb b/app/views/courses/feedback.html.erb
index b7713c4a9..0a8458a22 100644
--- a/app/views/courses/feedback.html.erb
+++ b/app/views/courses/feedback.html.erb
@@ -1,9 +1,10 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <!-- <#%= stylesheet_link_tag  'css', :media => 'all' %> -->
 <div class="project_r_h">
-  <h2 class="project_h2">用户留言</h2>
+  <h2 class="project_h2"><%= l(:label_contest_userresponse) %></h2>
 </div>
 
+
 <%= render :partial => 'courses_jours',
            :locals => { :contest => @contest, :journals => @jour, :state => false}
 %>
@@ -12,7 +13,7 @@
 <script>
 var W3CDOM = document.createElement && document.getElementsByTagName;
 
-window.onload = setMaxLength;
+//window.onload = setMaxLength;
 
 function setMaxLength() {
     if (!W3CDOM) return;
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 956fad81f..716a27ffe 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -22,15 +22,12 @@
         <% end %>
 
         <p>
-		    <span class="message-notes">
-              <%= reply.notes %>
-            </span>
+          <%= reply.notes %>
         </p>
-        <p>
-            <span class="time">
+            <span class="c_grey fl">
               <%= format_time reply.created_on %>
             </span>
-            <span class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+            <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
                 <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
                   <%= 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))  %>
@@ -39,18 +36,18 @@
                          <%= link_to l(:button_reply),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
-            </span>
-        </p>
-      </div>
-      <div id='<%=id%>' class="respond-form">
-        <% if reply_allow %>
-            <% if journal.jour_type == "Course" %>
-                <%= render :partial => "words/new_respond_course", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
-            <% else %>
-                <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
-            <% end %>
-        <% end %>
+            </div>
+        <div class="cl"></div>
+        <div id='<%=id%>' class="respond-form">
+          <% if reply_allow %>
+              <% if journal.jour_type == "Course" %>
+                  <%= render :partial => "words/new_respond_course", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
+              <% else %>
+                  <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %>
+              <% end %>
+          <% end %>
+        </div>
       </div>
-      <div style="clear: both;"></div>
+      <div class="cl"></div>
     </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 5395237d9..d32f5de85 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -1,15 +1,15 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
-    <%= text_area_tag 'user_notes', "", :class => 're_respond-form',
-                      :style => "resize: none;", :rows => 4,
+    <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
+
                       :placeholder => l(:label_feedback_respond_content),
-                      :width => '100%',
+
                       :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 %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
+
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
-                   :class => "sub_btn",
-                   :style => "float: right; margin-top: 1px; margin-right: 4px;"%>
+                   :class => "sub_btn"%>
 
 <% end %>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 9a315e558..0d995d095 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -177,7 +177,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
 /*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }*/
-.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}
+/*.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}*/
 
 
 /****评分弹框****/
@@ -341,6 +341,8 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
 .r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
+.respond-form{display: none;margin: auto;clear: both;}
+.sub_btn{display: block;margin-left: 470px;}