Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-04 19:41:25 +01:00
Code Issues Packages Projects Releases Activity

removed page title when showing a wiki page

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@304 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2007-03-06 18:35:25 +00:00
parent 2a0cdcb631
commit 67b92ae1df
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wiki/app/controllers/wiki_controller.rb
View File

@@ -44,6 +44,7 @@ class WikiController < ApplicationController
@page = @wiki.find_or_new_page(params[:page])
@page.content = WikiContent.new(:page => @page) if @page.new_record?
@content = @page.content
@content.text = "h1. #{@page.pretty_title}" if @content.text.empty?
@content.comment = nil
if request.post?
@content.text = params[:content][:text]

20
wiki/app/views/wiki/show.rhtml
View File

@@ -4,19 +4,17 @@
<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
</div>
<h2><%=h @page.pretty_title %></h2>
<% if @content.version != @page.content.version %>
<div class="box">
<div style="float:right;">
<%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %> (<%= @page.content.version %>)
<%= " - " + link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) if @content.version > 1 %>
<%= " - " + link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) if @content.version < @page.content.version %>
</div>
<%= "<strong>#{l(:label_version)} #{@content.version}</strong> - #{format_time(@content.updated_on)}" %>
<em>(<%= @content.author ? @content.author.name : "anonyme" %>)</em><br />
<p>
<%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
<%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> -
<%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
<%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
<br />
<em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
<%=h @content.comment %>
</div>
</p>
<hr />
<% end %>
<div class="wiki">

5
wiki/public/stylesheets/application.css
View File

@@ -185,7 +185,7 @@ border-left: 1px dashed #c0c0c0;
}
#content h2{
#content h2, #content div.wiki h1 {
display:block;
margin:0 0 16px 0;
font-size:1.7em;
@@ -585,8 +585,7 @@ margin-left: 3px;
/***** Wiki sections ****/
#content div.wiki { font-size: 110%}
#content div.wiki h1, div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
#content div.wiki h1 { font-size: 1.5em; border-bottom: dotted 1px #c0c0c0;}
#content div.wiki h2, div.wiki h3 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; color:#606060; }
#content div.wiki h2 { font-size: 1.4em;}
#content div.wiki h3 { font-size: 1.2em;}