引用模式的修改

This commit is contained in:
huang 2015-07-03 15:00:15 +08:00
parent e986ee4e4e
commit 17280e78ab
3 changed files with 11 additions and 11 deletions

View File

@ -74,7 +74,7 @@ class JournalsController < ApplicationController
text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
@content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
@content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
@content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
# @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
@id = user.id
rescue ActiveRecord::RecordNotFound
render_404

View File

@ -1,11 +1,11 @@
$('#journal_issue_note').html("<%= raw escape_javascript(@content.html_safe) %>");
$("input[name='issue_quote_new']").val("<%= raw escape_javascript(@content.html_safe) %>");
$('#issue_notes').val("<%= raw escape_javascript(@content) %>");
<%
# when quoting a private journal, check the private checkbox
if @journal && @journal.private_notes?
%>
$('#issue_private_notes').attr('checked', true);
<% end %>
showAndScrollTo("update", "notes");
$('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;

View File

@ -103,7 +103,7 @@ default:
# autologin_cookie_name: the name of the cookie (default: autologin)
# autologin_cookie_path: the cookie path (default: /)
# autologin_cookie_secure: true sets the cookie secure flag (default: false)
autologin_cookie_name: "autologin_trustie"
autologin_cookie_name:
autologin_cookie_path:
autologin_cookie_secure:
@ -200,7 +200,7 @@ default:
# specific configuration options for production environment
# that overrides the default ones
production:
cookie_domain: ".trustie.net"
# CJK support
rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
email_delivery:
delivery_method: :smtp
@ -218,9 +218,9 @@ development:
email_delivery:
delivery_method: :smtp
smtp_settings:
address: mail.trustie.net
address: smtp.163.com
port: 25
domain: mail.trustie.net
authentication: :login
user_name: "mail@trustie.net"
password: "loong2010"
domain: smtp.163.com
authentication: :plain
user_name: huang.jingquan@163.com
password: 'xinhu1ji2qu366'