From ce5b2d9996f1df78e0976bfc5929f4dca749bf0f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Apr 2015 17:29:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb | 8 ++++----
 app/views/issues/_edit.html.erb         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index fa16fcb51..43cea4b4f 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -45,14 +45,14 @@
 
 <!-- 内容显示部分 -->
 <div class="talk_top">
-<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
+        	<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
 <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
         		<span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
                     		         :class => 'problem_new_btn fl c_dorange',
                     		         :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
   				<% end %>
-<div class="cl"></div>
-</div>
+            <div class="cl"></div>
+            </div>
           <!-- 帖子内容显示      -->
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
@@ -67,7 +67,7 @@
                 <%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %>
                 	&nbsp;<%= l(:label_post_by_time)%><%= format_time topic.created_on %>
             </div>
-                	<span class="talk_btn fr"><%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;line-height: 18px;" %></span>
+                	<%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :class => "talk_btn fr c_white" %>
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
              <% end %>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 5ce65ab12..fa3153012 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -5,9 +5,9 @@
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <div id="all_attributes" style="display:none;">
           <%= render :partial => 'form', :locals => {:f => f} %>
-          <a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">
-            <%= l(:button_submit) %>
-          </a>
+          <!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
+            <!--<%#= l(:button_submit) %>-->
+          <!--</a>-->
         </div>
     <% end %><!--end-->
     <div class="ping_C mb10"></div>

From fb0657191814db4b17af5b7c71925a0a51d94f8e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 16 Apr 2015 17:56:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=BC=95=E7=94=A8=E5=BC=BA=E5=88=B6=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/quote_resource_show_project.js.erb | 2 +-
 app/views/messages/_project_show.html.erb          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/files/quote_resource_show_project.js.erb b/app/views/files/quote_resource_show_project.js.erb
index 440004357..d1a44e90f 100644
--- a/app/views/files/quote_resource_show_project.js.erb
+++ b/app/views/files/quote_resource_show_project.js.erb
@@ -7,5 +7,5 @@
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().css("top","30%").css("left","35%");
 $('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 3dbfe3a8d..069fd9d80 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -50,11 +50,11 @@
         <div class="ping_C mb10" id="<%= "message-#{message.id}" %>">
           <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %></div>
           <div class="ping_discon">
-            <div class="ping_distop upload_img">
+            <div class="ping_distop upload_img break_word">
               <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
               <span class="c_grey fr"><%= format_time(message.created_on) %></span>
               <div class="cl"></div>
-              <p><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+              <p class="break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
               <%= link_to_attachments_course message, :author => false %>
             </div>
             <div class="ping_disfoot">