From a255a56704008d9021815d83f4b2526ecd71d016 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 30 Jan 2019 20:58:10 +0100 Subject: [PATCH] =?UTF-8?q?Se=20corrige=20posici=C3=B3n=20de=20la=20etique?= =?UTF-8?q?ta=20de=20privacidad=20y=20se=20ajusta=20su=20presentaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_body_bottom.html.erb | 4 ++-- .../app/views/wiki/date_index.html.erb | 4 ++-- .../assets/stylesheets/private_wiki.css | 10 ++++++---- plugins/redmine_private_wiki/config/locales/en.yml | 3 ++- plugins/redmine_private_wiki/config/locales/es.yml | 6 ++++++ plugins/redmine_private_wiki/config/locales/fr.yml | 3 ++- .../lib/wiki_patches/application_helper_patch.rb | 2 +- 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100755 plugins/redmine_private_wiki/config/locales/es.yml diff --git a/plugins/redmine_private_wiki/app/views/private_wiki_management_views/_body_bottom.html.erb b/plugins/redmine_private_wiki/app/views/private_wiki_management_views/_body_bottom.html.erb index 1c33e0f..86a950a 100755 --- a/plugins/redmine_private_wiki/app/views/private_wiki_management_views/_body_bottom.html.erb +++ b/plugins/redmine_private_wiki/app/views/private_wiki_management_views/_body_bottom.html.erb @@ -3,7 +3,7 @@ <% if @page.private? and User.current.allowed_to?(:view_privates_wiki, @project) %> - <%= l(:private_flag) %> + <%= l(:private_flag) %> <% end %> @@ -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? %> diff --git a/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb b/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb index 6141cdb..6ca99d7 100755 --- a/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb +++ b/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb @@ -27,7 +27,7 @@ <% if !page.private? %>
  • <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>
    • <% elsif User.current.allowed_to?(:view_privates_wiki, @project) %> -
  • <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>    <%= l(:private_flag) %>
    • +
  • <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>    <%= l(:private_flag) %>
    • <% end %> <% end %> @@ -35,7 +35,7 @@

    <%= format_date(date) %>

    <% end %> diff --git a/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css b/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css index ce9d833..cbf7dc7 100755 --- a/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css +++ b/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css @@ -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); } diff --git a/plugins/redmine_private_wiki/config/locales/en.yml b/plugins/redmine_private_wiki/config/locales/en.yml index f2e4454..a325637 100755 --- a/plugins/redmine_private_wiki/config/locales/en.yml +++ b/plugins/redmine_private_wiki/config/locales/en.yml @@ -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 diff --git a/plugins/redmine_private_wiki/config/locales/es.yml b/plugins/redmine_private_wiki/config/locales/es.yml new file mode 100755 index 0000000..cbe8f85 --- /dev/null +++ b/plugins/redmine_private_wiki/config/locales/es.yml @@ -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 diff --git a/plugins/redmine_private_wiki/config/locales/fr.yml b/plugins/redmine_private_wiki/config/locales/fr.yml index 3212d88..1d1149e 100755 --- a/plugins/redmine_private_wiki/config/locales/fr.yml +++ b/plugins/redmine_private_wiki/config/locales/fr.yml @@ -2,4 +2,5 @@ fr: button_setprivate_wiki: Rendre Privé button_setpublic_wiki: Rendre Public - private_flag: PRIVÉ + private_flag: P! + private_title: Privé diff --git a/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb b/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb index 9ee6403..fe08883 100755 --- a/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb +++ b/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb @@ -20,7 +20,7 @@ module WikiPatches content << "
  • " 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 << "    " + l(:private_flag) + " " + content << '    ' + l(:private_flag) + '' content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id] content << "
    • \n" end