hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1384修复wiki注释超出边框的问题

Browse Source
course_group
sw 11 years ago
parent 42f3fbd4b8
commit 56ac9222ef
3 changed files with 132 additions and 112 deletions
Show Stats Download Patch File Download Diff File

45
app/views/wiki/edit.html.erb
Unescape View File

@ -1,7 +1,9 @@
<%= wiki_page_breadcrumb(@page) %> <%= wiki_page_breadcrumb(@page) %>
<script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script> <script src="http://<%= Setting.host_name%>/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
<h3><%= h @page.pretty_title %></h3> <h3>
<%= h @page.pretty_title %>
</h3>
<%= form_for @content, :as => :content, <%= form_for @content, :as => :content,
:url => {:action => 'update', :id => @page.title}, :url => {:action => 'update', :id => @page.title},
@ -14,44 +16,47 @@
<%= error_messages_for 'content' %> <%= error_messages_for 'content' %>
<div class="actions" style="max-width:680px"> <div class="actions" style="max-width:680px">
<p style="max-width:680px;"><%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %></p> <p style="max-width:680px;">
<%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %>
</p>
<script type="text/javascript"> <script type="text/javascript">
var ckeditor=CKEDITOR.replace('editor02',{height: '300'}); var ckeditor=CKEDITOR.replace('editor02',{height: '300'});
</script> </script>
</div> </div>
<div class="box tabular"> <div class="box tabular">
<%#= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
:class => 'wiki-edit', :accesskey => accesskey(:edit) %>
<!--p style="max-width:680px"><input id="editor02" required="true" /><%#= f.text_area :comments, :required => true, :id => 'editor02' %></p>
<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script-->
<% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %> <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
<%= fields_for @page do |fp| %> <%= fields_for @page do |fp| %>
<p> <p>
<label><%= l(:field_parent_title) %></label> <label>
<%= fp.select :parent_id, <%= l(:field_parent_title) %>
content_tag('option', '', :value => '') + </label>
wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - <%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
@page.self_and_descendants, @page.parent) %>
</p> </p>
<% end %> <% end %>
<% end %> <% end %>
<p style="width: 100%;"><label><%= l(:field_comments) %></label><%= f.text_field :comments, :style => "width:75%;" %></p> <p style="width: 100%;">
<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p> <label>
<%= l(:field_comments) %>
</label>
<%= f.text_field :comments, :style => "width:75%;" %>
</p>
<p>
<label>
<%=l(:label_attachment_plural)%>
</label>
<%= render :partial => 'attachments/form' %>
</p>
</div> </div>
<p><%= submit_tag l(:button_save) %> <p>
<%#= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p> <%= submit_tag l(:button_save) %>
</p>
<%= wikitoolbar_for 'content_text' %> <%= wikitoolbar_for 'content_text' %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= robot_exclusion_tag %> <%= robot_exclusion_tag %>
<% end %> <% end %>
<% html_title @page.pretty_title %> <% html_title @page.pretty_title %>

34
app/views/wiki/history.html.erb
Unescape View File

@ -8,7 +8,8 @@
:project_id => @page.project, :id => @page.title}, :project_id => @page.project, :id => @page.title},
:method => :get) do %> :method => :get) do %>
<table class="list wiki-page-versions"> <table class="list wiki-page-versions">
<thead><tr> <thead>
<tr>
<th>#</th> <th>#</th>
<th></th> <th></th>
<th></th> <th></th>
@ -16,18 +17,31 @@
<th><%= l(:field_author) %></th> <th><%= l(:field_author) %></th>
<th><%= l(:field_comments) %></th> <th><%= l(:field_comments) %></th>
<th></th> <th></th>
</tr></thead> </tr>
</thead>
<tbody> <tbody>
<% show_diff = @versions.size > 1 %> <% show_diff = @versions.size > 1 %>
<% line_num = 1 %> <% line_num = 1 %>
<% @versions.each do |ver| %> <% @versions.each do |ver| %>
<tr class="wiki-page-version <%= cycle("odd", "even") %>"> <tr class="wiki-page-version <%= cycle("odd", "even") %>">
<td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td> <td class="id">
<td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked', true);") if show_diff && (line_num < @versions.size) %></td> <%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %>
<td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td> </td>
<td class="updated_on"><%= format_time(ver.updated_on) %></td> <td class="checkbox">
<td class="author"><%= link_to_user ver.author %></td> <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked', true);") if show_diff && (line_num < @versions.size) %>
<td class="comments"><%=h ver.comments %></td> </td>
<td class="checkbox">
<%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %>
</td>
<td class="updated_on">
<%= format_time(ver.updated_on) %>
</td>
<td class="author">
<%= link_to_user ver.author %>
</td>
<td class="comments" style="word-break: break-all;word-wrap: break-word;" title="<%= h ver.comments%>">
<%=h ver.comments.truncate(25,ommision:'...') %>
</td>
<td class="buttons"> <td class="buttons">
<%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %> <%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %>
<%= delete_link wiki_page_path(@page, :version => ver.version) if User.current.allowed_to?(:delete_wiki_pages, @page.project) && @version_count > 1 %> <%= delete_link wiki_page_path(@page, :version => ver.version) if User.current.allowed_to?(:delete_wiki_pages, @page.project) && @version_count > 1 %>
@ -38,5 +52,7 @@
</tbody> </tbody>
</table> </table>
<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %> <%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
<span class="pagination"><%= pagination_links_full @version_pages, @version_count %></span> <span class="pagination">
<%= pagination_links_full @version_pages, @version_count %>
</span>
<% end %> <% end %>

21
app/views/wiki/show.html.erb
Unescape View File

@ -13,9 +13,7 @@
<% end %> <% end %>
<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %> <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div> </div>
<%= wiki_page_breadcrumb(@page) %> <%= wiki_page_breadcrumb(@page) %>
<% unless @content.current_version? %> <% unless @content.current_version? %>
<p> <p>
<%= link_to(("\xc2\xab " + l(:label_previous)), <%= link_to(("\xc2\xab " + l(:label_previous)),
@ -30,27 +28,30 @@
:version => @content.next.version) + " - " if @content.next %> :version => @content.next.version) + " - " if @content.next %>
<%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %> <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %>
<br /> <br />
<em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous) <em>
%>, <%= format_time(@content.updated_on) %> </em><br /> <%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)%>,
<%= format_time(@content.updated_on) %>
</em>
<br />
<%=h @content.comments %> <%=h @content.comments %>
</p> </p>
<hr /> <hr />
<% end %> <% end %>
<%= render(:partial => "wiki/content", :locals => {:content => @content}) %> <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
<%= link_to_attachments @page %> <%= link_to_attachments @page %>
<% if @editable && authorize_for('wiki', 'add_attachment') %> <% if @editable && authorize_for('wiki', 'add_attachment') %>
<div id="wiki_add_attachment"> <div id="wiki_add_attachment">
<p><%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;", <p>
<%= link_to l(:label_attachment_new), {}, :onclick => "$('#add_attachment_form').show(); return false;",
:id => 'attach_files_link' %></p> :id => 'attach_files_link' %></p>
<%= form_tag({:controller => 'wiki', :action => 'add_attachment', <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
:project_id => @project, :id => @page.title}, :project_id => @project, :id => @page.title},
:multipart => true, :id => "add_attachment_form", :multipart => true, :id => "add_attachment_form",
:style => "display:none;") do %> :style => "display:none;") do %>
<div class="box"> <div class="box">
<p><%= render :partial => 'attachments/form' %></p> <p>
<%= render :partial => 'attachments/form' %>
</p>
</div> </div>
<%= submit_tag l(:button_add) %> <%= submit_tag l(:button_add) %>
<%= link_to l(:button_cancel), {}, :onclick => "$('#add_attachment_form').hide(); return false;" %> <%= link_to l(:button_cancel), {}, :onclick => "$('#add_attachment_form').hide(); return false;" %>
@ -63,9 +64,7 @@
<%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %> <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
<%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %> <%= f.link_to 'TXT', :url => {:id => @page.title, :version => params[:version]} %>
<% end if User.current.allowed_to?(:export_wiki_pages, @project) %> <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<%= render :partial => 'sidebar' %> <%= render :partial => 'sidebar' %>
<% end %> <% end %>
<% html_title @page.pretty_title %> <% html_title @page.pretty_title %>

Write Preview
Loading…
Cancel
Save