Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/documents/show.html.erb

@@ -1,3 +1,5 @@
+<div class="frame-wiki">
+  
 <div class="contextual">
 <% if User.current.allowed_to?(:edit_documents, @project) %>
 <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
@@ -7,24 +9,13 @@
 <% end %>
 </div>
 
-<!-- <h3><%=h @document.title %></h3>
+<h2><%=h @document.title %></h2>
 
 <p><em><%=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
 <div class="wiki">
-<%= textilizable @document.description, :attachments => @document.attachments %>
+<%= textilizable @document, :description, :attachments => @document.attachments %>
-</div> -->
+</div>
-<!--add by huang-->
-<table width="660px" align="center">
-	<tr><td><h3><strong><%=h @document.title %></strong></h3></td></tr>
-	<tr><td>
-		<div class="font_description">
-  			<%= textilizable @document.description, :attachments => @document.attachments %>
-		</div>
-	</td></tr>
-	<tr><td align="right"><p class="font_lighter"><%= format_date @document.created_on %></p></td></tr>
-	<tr><td class="line_under"></td></tr>
-</table>
  
 
 <h3><%= l(:label_attachment_plural) %></h3>
@@ -42,3 +33,4 @@
 <% end %>
 
 <% html_title @document.title -%>
+</div>

app/views/memos/show.html.erb

@@ -46,7 +46,6 @@
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
-			<!-- < %= textilizable(@memo, :content) %> -->
 			<%= raw @memo.content %>
 			<p>							
 				<% if @memo.attachments.any?%>

lib/redcloth3.rb

@@ -31,7 +31,7 @@
 #
 # == Sample Textile Text
 #
-#  h3. This is a title
+#  h2. This is a title
 #
 #  h3. This is a subhead
 #
@@ -129,7 +129,7 @@
 #
 # Will become:
 #
-#  <acronym title="American Civil Liberties Union">ACLU</acronym>
+#  <abbr title="American Civil Liberties Union">ACLU</abbr>
 #
 # == Adding Tables
 #
@@ -152,7 +152,7 @@
 #
 #  doc = RedCloth.new "
 #
-#  h3. Test document
+#  h2. Test document
 #
 #  Just a simple test."
 #
@@ -227,7 +227,7 @@ class RedCloth3 < String
   # refs_textile::          Textile references (i.e. [hobix]http://hobix.com/)
   # block_textile_table::   Textile table block structures
   # block_textile_lists::   Textile list structures
-    # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h3., etc.)
+  # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h2., etc.)
   # inline_textile_image::  Textile inline images
   # inline_textile_link::   Textile inline links
   # inline_textile_span::   Textile inline spans
@@ -457,7 +457,7 @@ class RedCloth3 < String
     #    text.gsub! re, resub
     #end
     text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |m|
-          "<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>"
+      "<abbr title=\"#{htmlesc $2}\">#{$1}</abbr>"
     end
   end
 
@@ -525,7 +525,7 @@ class RedCloth3 < String
       tatts = pba( tatts, 'table' )
       tatts = shelve( tatts ) if tatts
       rows = []
-
+      fullrow.gsub!(/([^|])\n/, "\\1<br />")
       fullrow.each_line do |row|
         ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
         cells = []
@@ -699,7 +699,7 @@ class RedCloth3 < String
   end
 
   alias textile_h1 textile_p
-    alias textile_h3 textile_p
+  alias textile_h2 textile_p
   alias textile_h3 textile_p
   alias textile_h4 textile_p
   alias textile_h5 textile_p
@@ -733,7 +733,7 @@ class RedCloth3 < String
   SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
   def block_markdown_setext( text )
     if text =~ SETEXT_RE
-            tag = if $2 == "="; "h1"; else; "h3"; end
+      tag = if $2 == "="; "h1"; else; "h2"; end
       blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
       blocks cont
       text.replace( blk + cont )
@@ -823,7 +823,7 @@ class RedCloth3 < String
             )
             (?=<|\s|$)
         /x
-#"
+  #"
   def inline_textile_link( text )
     text.gsub!( LINK_RE ) do |m|
       all,pre,atts,text,title,url,proto,slash,post = $~[1..9]
@@ -1166,7 +1166,7 @@ class RedCloth3 < String
       'li' => nil,
       'p' => nil,
       'h1' => nil,
-        'h3' => nil,
+      'h2' => nil,
       'h3' => nil,
       'h4' => nil,
       'h5' => nil,

public/stylesheets/nyan.css

@@ -1,3 +1,9 @@
+/* Temporary
+*******************************************************************************/
+.frame-wiki {
+  padding: 0 10px;
+}
+
 /* TODO: base/common/page 准备封装一些基本样式组合调用 参考YUI
 *******************************************************************************/
 * {

public/themes/redpenny-master/stylesheets/application.css

@@ -524,19 +524,8 @@ ul.projects li.root
 	margin:4px 20px 20px;
 	padding-bottom:15px;
 	text-align:left
-	/*font-size: 18px;*/
 }
 
-#footer a:hover
-{
-	/*background:#666 none repeat scroll 0 0;*/
-	/*color:#FFF!important*/
-}
-
-#footer a:link,#footer a:visited
-{
-	/*color:#666*/
-}
 
 #footer .bgr:after
 {
@@ -544,60 +533,6 @@ ul.projects li.root
 	float:right
 }
 
-h1,h2,h3,h4
-{
-	font-family:'微软雅黑',"PT Sans","Lucida Grande",arial,sans-serif /*modify by men*/
-}
-
-h1
-{
-	font-size:24px;  /*工作台界面框框大小*/
-	font-weight:400;
-	margin:0 0 0 .25em;
-	padding:0 0 10px;
-	text-align:left
-}
-
-h2,h3,h4,.wiki h1,.wiki h2,.wiki h3
-{
-	border-bottom:0
-}
-
-h2,.wiki h1
-{
-	background-color:#e0e0e0;  /*第三层背景非导航条*/
-	margin:-6px -10px 10px;
-	padding:10px 20px;
-	font-size:14px;
-	color:#fff;
-	border-top:1px #ddd solid
-}
-
-.wiki h1
-{
-	font-family:"PT Sans","Trebuchet MS",Helvetica,sans-serif;
-	font-weight:700
-}
-
-.wiki h2
-{
-	background-color:transparent
-}
-
-div.issue div.wiki h3
-{
-	text-decoration:underline
-}
-
-h3,h4
-{
-	font-weight:400
-}
-
-div.wiki h3,div.wiki h4
-{
-	font-weight:700
-}
 
 #sidebar h3
 {
@@ -2077,20 +2012,11 @@ div.avatar_user{
  * *
  *Designed for message.
  */
-li {
+
-	list-style-type: none;
-}
 .avatar-3{
 	width: 35px;
 	height: 35px;
 }
-.inner-right{
-	float: left;
-}
-.messages-for-user-reply{
-	margin-top: 10px;
-	padding-left: 60px;
-}
 
 ul.message-for-user {
 	list-style-type: none;