Corregidos estilos de la lista de páginas hija y la página <Sidebar> del wiki al mostrarla en menú lateral desplegable

This commit is contained in:
Manuel Cillero 2019-02-09 08:19:00 +01:00
parent 70726a920b
commit 320de5f168
5 changed files with 90 additions and 29 deletions

View file

@ -27,7 +27,7 @@
<% if !page.private? %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %></li>
<% elsif User.current.allowed_to?(:view_privates_wiki, @project) %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<% end %>
<% end %>
</ul>
@ -35,7 +35,7 @@
<h3><%= format_date(date) %></h3>
<ul>
<% @pages_by_date[date].each do |page| %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<% end %>
</ul>
<% end %>

View file

@ -6,6 +6,9 @@
border-radius: 2px;
cursor: default;
}
.private_wiki_flag {
margin-left: .44em;
}
.icon-setprivate{
background-image: url(../images/hide.png);

View file

@ -20,7 +20,7 @@ module WikiPatches
content << "<li>"
content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil},
:title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
content << '&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="' + l(:private_title) + '">' + l(:private_flag) + '</span>'
content << ' <span class="private_wiki_flag" style="display:inline-block;" title="' + l(:private_title) + '">' + l(:private_flag) + '</span>'
content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
content << "</li>\n"
end