Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

.gitignore

@@ -6,8 +6,9 @@
 /log/*
 /test/*
 /tmp/*
-
+.gitignore
 /config/database.yml
 /public/images/avatars/*
 /Gemfile
 /Gemfile.lock
+/db/schema.da

app/controllers/words_controller.rb

@@ -42,6 +42,14 @@ class WordsController < ApplicationController
 
   
   def create_reply
+    # 这里是创建回复所使用的方法，此方法只针对回复，每一个新的留言并不在此方法管理范围内。
+    # 由于多个地方用到了留言，而之前的表设计也有jour_type/jour_id这类信息
+    # 所以在方法 add_reply_adapter 中判断所有调用此方法的来源页面，
+    # 为了保证兼容以往所有的代码，保证以往的方法可以调用，在返回页面中都做了各式各样的判断。
+    # 页面保证 render new_respond/journal_reply
+    # 修改 add_reply_adapter 中可以确保留言创建成功
+    # 删除留言功能要调用destroy，也记得在destroy.js中修改
+
     # deny api. api useless
     parent_id = params[:reference_id]
     author_id = User.current.id

app/views/layouts/_base_header.html.erb

@@ -10,4 +10,5 @@
 		<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>			
 </div>
 <div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 0px;margin-top: -10px;"></div>
+<div style="clear:left;"></div>
 

app/views/projects/feedback.html.erb

@@ -70,7 +70,7 @@ function checkMaxLength() {
 		</span>
 		<div style="clear: both;"></div>
 		<div id='<%= id %>' class="respond-form">
-			<%= render :partial => 'new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
+			<%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
 		</div>
 		<div style="clear: both;"></div>
 		<div>

app/views/welcome/index.html.erb

@@ -1,12 +1,14 @@
-<div style="height:200px; margin:0 auto;">
+<div class='top_bar' style="">
-	<div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 60px;">
+	<div style="float: left;">
-		<p>
+		<%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %>
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
+		<div style="margin: -15px 0px 0px 0px;"><h3 style="color: #000000; font-size: 15px; text-align:center ">微信扫码</h3></div>
-		</p>
 	</div>
-	<div style="display:inline;">
+	<div class="welcome_left" style="">
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
+	</div>
+	<div class='loginForm' style="">
 		<%= call_hook :view_account_login_top %>
-		<div id="login-form_new" style="margin-left: 510px;">
+		<div id="login-form_new" style="">
 			<%= form_tag(signin_path) do %>
 				<%= back_url_hidden_field_tag if is_logout? %>
 				<% unless User.current.logged? %> 
@@ -67,6 +69,7 @@
 	</div>
 </div>
 
+	<div style="clear:both"></div>
 <script type="text/javascript" language="javascript">
 	function clearInfo(id, content) {
 		var text = $('#' + id);
@@ -76,7 +79,7 @@
 	}
 	
     $(function(){
-    	$("a").attr("target", "_blank");
+    	$("#main").find("a").attr("target", "_blank");
     });
     
 	function showInfo(id, content) {

app/views/words/_message.html.erb

@@ -43,11 +43,6 @@ function checkMaxLength() {
 	    <span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
 	    <span class="body">
             <span class="user"><%= link_to journal.user, user_path(journal.user)%></span>
-		<% if @user == User.current %> 
-			<span class="font_lighter"><%= l(:label_leave_me_message) %>&nbsp;:</span>
-		<% else %> 
-			<span class="font_lighter"><%= l(:label_leave_others_message) %>&nbsp;:</span> 
-		<% end %>
 		<p>
 				<%= textilizable journal.notes%>
 		</p>

config/configuration.yml

@@ -173,7 +173,7 @@ default:
 
   # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
   # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
-  imagemagick_convert_command: '/opt/redmine-2.3.1-1/common/bin/convert'
+  imagemagick_convert_command: '/home/pdl/redmine-2.3.1-1/common/bin/convert'
 
   # Configuration of RMagcik font.
   #

public/stylesheets/application.css

@@ -741,10 +741,11 @@ ul.tool li{list-style-type:none;
 .spaceright{float:left; width:620px;}
 
 .welcome_left{
-	margin-top: 70px;		
 	float:left;
-	padding-left: 10px;
+	display:inline-block;
-	width: 49%;
+	margin-top: 50px;		
+	padding-left: 20px;
+	max-width: 380px;
 }
 
 .welcome_right{	
@@ -1483,9 +1484,10 @@ margin-left:-10px;
 	height:50px;
 }
 
-#header a {font-family:'微软雅黑', Verdana, sans-serif; font-size: 12px; color:#808080;}
+/*#header a {font-family:'微软雅黑', Verdana, sans-serif; font-size: 12px; color:#808080;}*/
 #login-form_new table/*Added by young*/
 {
+	height: 165px;
 	padding:20px 25px;
 	background:#fff;
 	text-align:left;
@@ -1493,7 +1495,7 @@ margin-left:-10px;
 	margin-top: 50px;
 	width:320px;
 	
-	font-family:微软雅黑,lucida grande,verdana;
+	/*font-family:微软雅黑,lucida grande,verdana;*/
 	font-size:12px;
 	-webkit-border-radius:10px;
 	-moz-border-radius:10px;

public/stylesheets/welcome.css

@@ -58,7 +58,16 @@ span.grey {
     padding:5px 5px;
     margin:0;
 }*/
-
+.top_bar{
+    height: auto;
+}
+img.weixin{
+    display: inline-block;
+}
+div.loginForm{
+    float: left;
+    margin-top: -30px;
+}
 .welcome-message-list li.message-brief-intro{
 	position: relative;
     display: block;