commit
725c9559a6
@ -1,20 +1,26 @@
|
||||
<%= form_tag({:action => 'edit', :tab => 'projects'}) do %>
|
||||
<div class="box tabular settings">
|
||||
<p>
|
||||
<%= setting_check_box :default_projects_public %>
|
||||
</p>
|
||||
|
||||
<div class="box tabular settings">
|
||||
<p><%= setting_check_box :default_projects_public %></p>
|
||||
<p>
|
||||
<%= setting_multiselect(:default_projects_modules,
|
||||
Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %>
|
||||
</p>
|
||||
|
||||
<p><%= setting_multiselect(:default_projects_modules,
|
||||
Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %></p>
|
||||
<p>
|
||||
<%= setting_multiselect(:default_projects_tracker_ids, Tracker.sorted.all.collect {|t| [t.name, t.id.to_s]}) %>
|
||||
</p>
|
||||
|
||||
<p><%= setting_multiselect(:default_projects_tracker_ids,
|
||||
Tracker.sorted.all.collect {|t| [t.name, t.id.to_s]}) %></p>
|
||||
<p>
|
||||
<%= setting_check_box :sequential_project_identifiers %>
|
||||
</p>
|
||||
|
||||
<p><%= setting_check_box :sequential_project_identifiers %></p>
|
||||
<p style="display: none;"><%= setting_select :new_project_user_role_id, Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
|
||||
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<p><%= setting_select :new_project_user_role_id,
|
||||
Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
|
||||
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
|
||||
</div>
|
||||
|
||||
<%= submit_tag l(:button_save) %>
|
||||
<%= submit_tag l(:button_save) %>
|
||||
<% end %>
|
||||
|
@ -1,27 +1,33 @@
|
||||
<div class="contextual">
|
||||
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
|
||||
:class => 'icon icon-history') %>
|
||||
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
||||
</div>
|
||||
|
||||
<%= wiki_page_breadcrumb(@page) %>
|
||||
|
||||
<h3><%= h(@page.pretty_title) %></h3>
|
||||
<h3>
|
||||
<%= h(@page.pretty_title) %>
|
||||
</h3>
|
||||
|
||||
<p>
|
||||
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
||||
<em>(<%= @diff.content_from.author ?
|
||||
@diff.content_from.author.name : l(:label_user_anonymous)
|
||||
%>, <%= format_time(@diff.content_from.updated_on) %>)</em>
|
||||
<%= l(:label_version) %>
|
||||
<%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
||||
<em>
|
||||
(<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>,
|
||||
<%= format_time(@diff.content_from.updated_on) %>)
|
||||
</em>
|
||||
→
|
||||
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
|
||||
:id => @page.title, :project_id => @page.project,
|
||||
:version => @diff.content_to.version
|
||||
%>/<%= @page.content.version %>
|
||||
<em>(<%= @diff.content_to.author ?
|
||||
link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)
|
||||
%>, <%= format_time(@diff.content_to.updated_on) %>)</em>
|
||||
<%= l(:label_version) %>
|
||||
<%= link_to @diff.content_to.version, :action => 'show',
|
||||
:id => @page.title, :project_id => @page.project,
|
||||
:version => @diff.content_to.version %>
|
||||
/
|
||||
<%= @page.content.version %>
|
||||
<em>
|
||||
(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)%>,
|
||||
<%= format_time(@diff.content_to.updated_on) %>)
|
||||
</em>
|
||||
</p>
|
||||
|
||||
<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
|
||||
<%= simple_format_without_paragraph @diff.to_html %>
|
||||
<%= simple_format_without_paragraph @diff.to_html %>
|
||||
</div>
|
||||
|
Loading…
Reference in new issue