From db596de662d781b33cab5710b020b7be03e1c3fe Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 28 Aug 2022 21:39:36 +0200 Subject: [PATCH 01/16] =?UTF-8?q?=F0=9F=92=84=20Sustituye=20el=20enlace=20?= =?UTF-8?q?a=20GitLab=20por=20GitHub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index ee96da7..0c4cf8d 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -72,7 +72,7 @@
  • <%= l(:link_my_blog) %>
  • Twitter
  • Linkedin
    • -
  • Gitlab
    • +
  • Github
  • Mail
    • @@ -150,7 +150,7 @@ - +
    From 55458d34792fd7d0ef5c0a9ee149bcb89e3004ff Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Wed, 23 Nov 2022 20:24:54 +0100 Subject: [PATCH 02/16] =?UTF-8?q?=F0=9F=92=84=20Sustituye=20el=20enlace=20?= =?UTF-8?q?a=20Twitter=20por=20Mastodon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base.html.erb | 4 ++-- public/themes/circlepro/font/fontello.eot | Bin 10568 -> 11716 bytes public/themes/circlepro/font/fontello.svg | 6 ++++-- public/themes/circlepro/font/fontello.ttf | Bin 10400 -> 11548 bytes public/themes/circlepro/font/fontello.woff | Bin 6696 -> 7376 bytes public/themes/circlepro/font/fontello.woff2 | Bin 5596 -> 6184 bytes .../circlepro/stylesheets/application.css | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 0c4cf8d..ac84b3b 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -70,7 +70,7 @@

    <%= time_entry.text_field :comments, :size => 60 %>

    - <% @time_entry.custom_field_values.each do |value| %> + <% @time_entry.editable_custom_field_values.each do |value| %>

    <%= custom_field_tag_with_label :time_entry, value %>

    <% end %> <% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 880c953..b05b6cc 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -13,7 +13,7 @@ <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'}, - :class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %> + :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %> <% end %>
    diff --git a/app/views/issues/tabs/_changesets.html.erb b/app/views/issues/tabs/_changesets.html.erb index 5a1d012..f869a5d 100644 --- a/app/views/issues/tabs/_changesets.html.erb +++ b/app/views/issues/tabs/_changesets.html.erb @@ -16,7 +16,9 @@ :rev => changeset.identifier) %>) <% end %>

    -
    <%= format_changeset_comments changeset %>
    +
    + <%= format_changeset_comments changeset %> +
    <%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %> <% end %> diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index ac84b3b..2f04a5a 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -2,27 +2,22 @@ - + <%= html_title %> - + <%= csrf_meta_tag %> <%= favicon %> -<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'cookieconsent.min', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %> +<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - -<% is_welcome = !User.current.logged? && current_page?(:controller => 'welcome', :action => 'index') %> -<%= stylesheet_link_tag 'frontpage', :media => 'all' if is_welcome %> - <%= javascript_heads %> - <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - + <%= call_hook :view_layouts_base_body_top %>
    @@ -65,31 +60,20 @@
    -
    -
    -
    <%= render_menu :account_menu -%>
    <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -
    - -
    - -<%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %> + +
    - - -
    - - - <%= call_hook :view_layouts_base_body_bottom %> - - - diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index de99eea..c8745be 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -31,7 +31,7 @@ <%= textilizable @project.description %> <% end %> - <% if @project.homepage.present? || @project.visible_custom_field_values.any?(&:present?) %> + <% if @project.homepage.present? || @project.visible_custom_field_values.any? { |o| o.value.present? } %>