Se corrige posición de la etiqueta de privacidad y se ajusta su presentación

This commit is contained in:
Manuel Cillero 2019-01-30 20:58:10 +01:00
parent 49913ad11b
commit a255a56704
7 changed files with 21 additions and 11 deletions

View file

@ -3,7 +3,7 @@
<!--If the wiki is private, set PRIVATE flag-->
<% if @page.private? and User.current.allowed_to?(:view_privates_wiki, @project) %>
<span class=private_wiki_flag><%= l(:private_flag) %></span>
<span class="private_page_flag" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span>
<% end %>
<!--If authorized, allow user to see changing privacy buttons-->
@ -11,7 +11,7 @@
<%= link_to_if_authorized(l(:button_setpublic_wiki), {:action => 'change_privacy', :id => @page.title, :private => 0}, :method => :post, :class => 'icon icon-setpublic') if @page.private? %>
<script type="text/javascript">
$('.contextual:first').prepend($('.private_wiki_flag'));
$('.contextual:first').prepend($('.private_page_flag'));
$('.contextual:first').append($('.icon-setprivate'));
$('.contextual:first').append($('.icon-setpublic'));
</script>

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;''><%= l(:private_flag) %></span></li>
<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>
<% 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;''><%= l(:private_flag) %></span></li>
<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>
<% end %>
</ul>
<% end %>

View file

@ -1,14 +1,16 @@
.private_page_flag,
.private_wiki_flag {
background: #D22;
background: #d22;
color: white;
padding: 2px 2px 2px 2px;
padding: 1px 2px;
border-radius: 2px;
cursor: default;
}
.icon-setprivate{
background-image: url(../images/hide.png);
background-image: url(../images/hide.png);
}
.icon-setpublic{
background-image: url(../images/reveal.png);
background-image: url(../images/reveal.png);
}

View file

@ -2,4 +2,5 @@
en:
button_setprivate_wiki: Set Private
button_setpublic_wiki: Set Public
private_flag: PRIVATE
private_flag: P!
private_title: Private page

View file

@ -0,0 +1,6 @@
# Spanish strings go here for Rails i18n
es:
button_setprivate_wiki: Priv.
button_setpublic_wiki: Pub.
private_flag: P!
private_title: Página privada

View file

@ -2,4 +2,5 @@
fr:
button_setprivate_wiki: Rendre Privé
button_setpublic_wiki: Rendre Public
private_flag: PRIVÉ
private_flag: P!
private_title: Privé

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;''>" + l(:private_flag) + " </span>"
content << '&nbsp;&nbsp;&nbsp;&nbsp;<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