From 398e35cf19e8b19262353afb64bdc5e3279f46c2 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Sat, 28 Dec 2013 10:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_new_respond.html.erb | 39 +++++++++++++++++- app/views/welcome/index.html.erb | 20 ++++++---- app/views/words/_journal_reply_items.html.erb | 8 ++-- app/views/words/_message.html.erb | 3 +- app/views/words/_new_respond.html.erb | 40 ++++++++++++++++++- .../stylesheets/application.css | 14 ++++++- 6 files changed, 107 insertions(+), 17 deletions(-) diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index e6b072399..25e448ff4 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -1,5 +1,42 @@ + <%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %> -<%= text_area_tag 'project_respond', "", :class => 'noline', :required => true, :style => "resize: none;", :rows => 6, :placeholder => l(:label_projects_feedback_respond_content) %> +<%= text_area_tag 'project_respond', "", + :class => 'noline', :required => true, + :style => "resize: none;", :rows => 6, + :placeholder => l(:label_projects_feedback_respond_content), + :maxlength => 250 %> <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 2f0279578..6141a724f 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -74,7 +74,11 @@ $('#' + id).val(''); } } - + + $(function(){ + $("a").attr("target", "_blank"); + }); + function showInfo(id, content) { var text = $('#' + id); if (text.val() == '') { @@ -90,10 +94,10 @@ <%= stylesheet_link_tag 'welcome' %> -
+ -
-
    +
    +

      贴吧动态

      @@ -108,7 +112,7 @@ <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
      - <%=time_tag_welcome(topic_last_time topic)%>前 + <%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前 由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %> 发表 @@ -120,8 +124,8 @@
    -
    -
      +
      +

        用户动态

        <%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank" %>
        @@ -139,7 +143,7 @@
      -
    +

    热门项目

    diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 9408722d9..738ce2132 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -3,10 +3,12 @@ <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %> -
    +
    <% id = 'project_respond_form_'+ reply.id.to_s %> - <%= link_to reply.user.name, user_path(reply.user) %>:  - <%= reply.notes %> +

    + <%= link_to reply.user.name, user_path(reply.user) %>:  + <%= reply.notes %> +

    <%# ids = 'project_respond_form_'+ journal.id.to_s%>

    diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index e9e14034d..781b8eea9 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -31,7 +31,8 @@

    <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal.id} %> -
    +
    +
    <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
    diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 25d4b7fcf..adc897e40 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 => journal.user.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_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/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 0dcca361b..f57d10552 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