Actualiza a Redmine 3.4.13 con adaptaciones

Archivos del código base de Redmine que se modifican para personalizar la composición de las páginas, el texto de bienvenida y la presentación de algunos contenidos.
2020-07-04 00:02:11 +02:00 · 2020-07-04 00:02:11 +02:00 · 723a54d68d
commit 723a54d68d
parent ecddcaf1d3
11 changed files with 311 additions and 31 deletions
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@ -1,27 +1,28 @@
 <%= call_hook :view_account_login_top %>

 <div id="login-form">
+  <h2><%= l(:label_login) %></h2>
  <%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>
  <%= back_url_hidden_field_tag %>
-  
+
  <label for="username"><%=l(:field_login)%></label>
  <%= text_field_tag 'username', params[:username], :tabindex => '1' %>
-  
+
  <label for="password">
    <%=l(:field_password)%>
    <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
  </label>
  <%= password_field_tag 'password', nil, :tabindex => '2' %>
-  
+
  <% if Setting.openid? %>
    <label for="openid_url"><%=l(:field_identity_url)%></label>
    <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
  <% end %>
-  
+
  <% if Setting.autologin? %>
    <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
  <% end %>
-  
+
  <input type="submit" name="login" value="<%=l(:button_login)%>" tabindex="5" id="login-submit" />
  <% end %>
 </div>
--- a/app/views/issues/_changesets.html.erb
+++ b/app/views/issues/_changesets.html.erb
@ -13,8 +13,6 @@
        <% end %>
        <br />
        <span class="author"><%= authoring(changeset.committed_on, changeset.author) %></span></p>
-    <div class="wiki changeset-comments">
-        <%= format_changeset_comments changeset %>
-    </div>
+        <div class="wiki changeset-comments"><%= format_changeset_comments changeset %></div>
    </div>
 <% end %>
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@ -2,28 +2,31 @@
 <html lang="<%= current_language %>">
 <head>
 <meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <title><%= html_title %></title>
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'application', 'responsive', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'cookieconsent.min', '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 %>
+<script src="/themes/circlepro/javascripts/cookieconsent.min.js"></script>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
 </head>
-<body class="<%= body_css_classes %>">
+<body class="<%= body_css_classes %><%= ' is-preload' if is_welcome %>">
 <%= call_hook :view_layouts_base_body_top %>
 <div id="wrapper">

 <div class="flyout-menu js-flyout-menu">

-
    <% if User.current.logged? || !Setting.login_required? %>
        <div class="flyout-menu__search">
            <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
@ -61,19 +64,29 @@
 <div id="wrapper2">
 <div id="wrapper3">
 <div id="top-menu">
+    <div id="wrapper-top-menu">
+    <ul class="social-menu">
+        <li class="social-link-blog"><a href="https://manuel.cillero.es" title="<%= l(:link_my_blog) %>" class="icon-blog"><span><%= l(:link_my_blog) %></span></a></li>
+        <li class="social-link-twitter"><a href="https://twitter.com/manuelcillero" title="Twitter" target="_blank" class="icon-twitter"><span>Twitter</span></a></li>
+        <li class="social-link-facebook"><a href="https://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span>Facebook</span></a></li>
+        <li class="social-link-linkedin"><a href="https://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span>Linkedin</span></a></li>
+        <li class="social-link-gitlab"><a href="https://gitlab.com/manuelcillero" title="Gitlab" target="_blank" class="icon-gitlab"><span>Gitlab</span></a></li>
+        <li class="social-link-mail"><a href="https://manuel.cillero.es/contacto/#suitepro" title="Mail" class="icon-mail"><span>Mail</span></a></li>
+    </ul>
    <div id="account">
        <%= render_menu :account_menu -%>
    </div>
    <%= 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? -%>
+    </div>
 </div>

 <div id="header">
-
    <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>

+    <div id="wrapper-header">
    <% if User.current.logged? || !Setting.login_required? %>
-    <div id="quick-search">
+    <div id="quick-search" class="hide-when-print">
        <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
        <%= hidden_field_tag 'scope', default_search_project_scope, :id => nil %>
        <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
@ -85,21 +98,24 @@
        <%= render_project_jump_box %>
    </div>
    <% end %>
-
    <h1><%= page_header_title %></h1>
+    </div>

    <% if display_main_menu?(@project) %>
    <div id="main-menu" class="tabs">
+        <div id="wrapper-main-menu">
        <%= render_main_menu(@project) %>
        <div class="tabs-buttons" style="display:none;">
            <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
            <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
        </div>
+        </div>
    </div>
    <% end %>
 </div>

 <div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
+    <div id="wrapper-main">
    <div id="sidebar">
        <%= yield :sidebar %>
        <%= view_layouts_base_sidebar_hook_response %>
@ -111,19 +127,51 @@
        <%= call_hook :view_layouts_base_content %>
        <div style="clear:both;"></div>
    </div>
+    </div>
 </div>
 </div>

+<a href="#" id="scrollup" class="hide-when-print"><%=l(:label_sort_higher)%></a><%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %>
+
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 <div id="ajax-modal" style="display:none;"></div>

 <div id="footer">
-  <div class="bgl"><div class="bgr">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2019 Jean-Philippe Lang
-  </div></div>
+<div id="wrapper-footer">
+    <ul class="social-menu">
+        <li class="social-link-blog"><a href="https://manuel.cillero.es" title="<%= l(:link_my_blog) %>" class="icon-blog"><span><%= l(:link_my_blog) %></span></a></li>
+        <li class="social-link-twitter"><a href="https://twitter.com/manuelcillero" title="Twitter" target="_blank" class="icon-twitter"><span>Twitter</span></a></li>
+        <li class="social-link-facebook"><a href="https://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span>Facebook</span></a></li>
+        <li class="social-link-linkedin"><a href="https://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span>Linkedin</span></a></li>
+        <li class="social-link-gitlab"><a href="https://gitlab.com/manuelcillero" title="Gitlab" target="_blank" class="icon-gitlab"><span>Gitlab</span></a></li>
+        <li class="social-link-mail"><a href="https://manuel.cillero.es/contacto/#suitepro" title="Mail" class="icon-mail"><span>Mail</span></a></li>
+    </ul>
+    <div class="bgl"><div class="bgr">
+        <div id="legal">
+        <span class="legal-legal"><a href="/projects/suitepro/wiki/Legal"><%= l(:label_legal) %></a></span>
+        <span class="legal-terms"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Condiciones_de_uso"><%= l(:label_legal_terms) %></a></span>
+        <span class="legal-privacy"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_privacidad"><%= l(:label_legal_privacy) %></a></span>
+        <span class="legal-cookies"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_cookies"><%= l(:label_legal_cookies) %></a></span>
+        </div>
+        <%= Time.current.year %> &copy; SuitePro (powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %>)
+    </div></div>
+    </div>
 </div>
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>
+
+<script>
+//<![CDATA[
+window.addEventListener("load", function(){
+window.cookieconsent.initialise({
+  "palette": { "popup": { "background": "rgba(20,20,20,0.8)" }, "button": { "background": "#fff" } },
+  "theme": "classic",
+  "position": "bottom-left",
+  "content": { "message": "<a href='https://suitepro.cillero.es'>SuitePro</a> requiere el uso de cookies para ofrecer la mejor experiencia de acceso a sus contenidos. Puedes aceptar su uso o abandonar la página si lo deseas.", "dismiss": "ACEPTO SU USO", "link": "Más información", "href": "/projects/suitepro/wiki/Pol%C3%ADtica_de_cookies", "target": "_self" }
+})});
+//]]>
+</script>
+
 </body>
 </html>
--- a/app/views/repositories/_changeset.html.erb
+++ b/app/views/repositories/_changeset.html.erb
@ -33,9 +33,7 @@

 </div>

-<div class="wiki changeset-comments">
-  <%= format_changeset_comments @changeset %>
-</div>
+<div class="wiki changeset-comments"><%= format_changeset_comments @changeset %></div>

 <% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
  <%= render :partial => 'related_issues' %>
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@ -1,3 +1,5 @@
+<% if User.current.logged? %>
+
 <h2><%= l(:label_home) %></h2>

 <div class="splitcontentleft">
@ -24,3 +26,149 @@
 <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
 <% end %>
+
+<% else %><!-- Frontpage -->
+
+<div id="fp"><%= text_field_tag 'forcetop', nil, :style => 'display: none;' %>
+
+  <!-- Banner -->
+    <section id="fp-banner">
+      <div class="inner">
+        <h2>SuitePro</h2>
+        <p><%= l(:welcome_suitepro) %></p>
+        <ul class="actions special">
+          <li><a href="#fp-login" class="button primary scrolly"><%= l(:label_login) %></a></li>
+        </ul>
+      </div>
+      <a href="#one" class="more scrolly"><%= l(:welcome_discover) %></a>
+    </section>
+
+  <!-- One -->
+    <section id="one" class="frapper style1 special">
+      <div class="inner">
+        <header class="major">
+          <h2>A SIMPLE WAY TO GET WORK DONE&nbsp;&nbsp;;)</h2>
+          <p><%= raw l(:welcome_suitepro_is_redmine, :suitepro => '<strong>SuitePro</strong>', :redmine => '<a href="https://www.redmine.org"><strong>Redmine</strong></a>') %></p>
+        </header>
+        <ul class="icons major">
+          <li><span class="fp-icon fp-icon_1 major style1"><span class="label">Lorem</span></span></li>
+          <li><span class="fp-icon fp-icon_2 major style2"><span class="label">Ipsum</span></span></li>
+          <li><span class="fp-icon fp-icon_3 major style3"><span class="label">Dolor</span></span></li>
+        </ul>
+      </div>
+    </section>
+
+  <!-- Two -->
+    <section id="two" class="frapper alt style2">
+      <section class="spotlight">
+        <div class="image"><%= image_tag '/themes/circlepro/images/pic01.jpg' %></div><div class="content">
+          <h2><%= raw l(:welcome_spotlight_1_title) %></h2>
+          <p><%= l(:welcome_spotlight_1_text) %></p>
+        </div>
+      </section>
+      <section class="spotlight">
+        <div class="image"><%= image_tag '/themes/circlepro/images/pic02.jpg' %></div><div class="content">
+          <h2><%= raw l(:welcome_spotlight_2_title) %></h2>
+          <p><%= l(:welcome_spotlight_2_text) %></p>
+        </div>
+      </section>
+      <section class="spotlight">
+        <div class="image"><%= image_tag '/themes/circlepro/images/pic03.jpg' %></div><div class="content">
+        <h2><%= raw l(:welcome_spotlight_3_title) %></h2>
+        <p><%= l(:welcome_spotlight_3_text) %></p>
+        </div>
+      </section>
+    </section>
+
+  <!-- Three -->
+    <section id="three" class="frapper style3 special">
+      <div class="inner">
+        <header class="major">
+          <h2><%= l(:welcome_other_features) %></h2>
+        </header>
+        <ul class="features">
+          <li class="fp-icon fp-icon_4">
+            <h3><%= l(:welcome_feature_1_title) %></h3>
+            <p><%= l(:welcome_feature_1_text) %></p>
+          </li>
+          <li class="fp-icon fp-icon_5">
+            <h3><%= l(:welcome_feature_2_title) %></h3>
+            <p><%= l(:welcome_feature_2_text) %></p>
+          </li>
+            <li class="fp-icon fp-icon_6">
+            <h3><%= l(:welcome_feature_3_title) %></h3>
+            <p><%= l(:welcome_feature_3_text) %></p>
+          </li>
+            <li class="fp-icon fp-icon_7">
+            <h3><%= l(:welcome_feature_4_title) %></h3>
+            <p><%= l(:welcome_feature_4_text) %></p>
+          </li>
+            <li class="fp-icon fp-icon_8">
+            <h3><%= l(:welcome_feature_5_title) %></h3>
+            <p><%= l(:welcome_feature_5_text) %></p>
+          </li>
+          <li class="fp-icon fp-icon_9">
+            <h3><%= l(:welcome_feature_6_title) %></h3>
+            <p><%= l(:welcome_feature_6_text) %></p>
+          </li>
+        </ul>
+      </div>
+    </section>
+
+  <!-- Login -->
+    <section id="fp-login" class="frapper style4">
+      <div class="inner">
+        <%= call_hook :view_account_login_top %>
+
+        <div id="login-form">
+          <h2><%= l(:label_login) %></h2>
+          <%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>
+          <%= back_url_hidden_field_tag %>
+
+          <label for="username"><%=l(:field_login)%></label>
+          <%= text_field_tag 'username', params[:username], :tabindex => '1' %>
+
+          <label for="password">
+            <%=l(:field_password)%>
+            <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
+          </label>
+          <%= password_field_tag 'password', nil, :tabindex => '2' %>
+
+          <% if Setting.openid? %>
+            <label for="openid_url"><%=l(:field_identity_url)%></label>
+            <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
+          <% end %>
+
+          <% if Setting.autologin? %>
+            <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
+          <% end %>
+
+          <input type="submit" name="login" value="<%=l(:button_login)%>" tabindex="5" id="login-submit" />
+          <% end %>
+        </div>
+      </div>
+    </section>
+
+  <!-- CTA -->
+    <section id="fp-cta" class="frapper style4">
+      <div class="inner">
+        <header>
+          <h2><%= l(:welcome_any_questions) %></h2>
+          <p><%= l(:welcome_please_contact) %></p>
+        </header>
+        <ul class="actions stacked">
+          <li><a href="https://manuel.cillero.es/contacto/#suitepro" class="button fit primary"><%= l(:welcome_contact) %></a></li>
+          <li><a href="https://manuel.cillero.es/sobre-mi" class="button fit"><%= l(:welcome_about_me) %></a></li>
+        </ul>
+      </div>
+    </section>
+
+</div>
+
+<script src="/themes/circlepro/javascripts/frontpage/jquery.scrolly.min.js"></script>
+<script src="/themes/circlepro/javascripts/frontpage/browser.min.js"></script>
+<script src="/themes/circlepro/javascripts/frontpage/breakpoints.min.js"></script>
+<script src="/themes/circlepro/javascripts/frontpage/util.js"></script>
+<script src="/themes/circlepro/javascripts/frontpage/main.js"></script>
+
+<% end %>
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@ -31,7 +31,7 @@
    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
    <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff',
                      :id => @page.title, :project_id => @page.project,
-                      :version => @content.version) + ')'.html_safe if @content.previous %> - 
+                      :version => @content.version) + ')'.html_safe if @content.previous %> -
    <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
                :id => @page.title, :project_id => @page.project,
                :version => @content.next.version) + " - " if @content.next %>
@ -46,12 +46,13 @@

 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>

-<fieldset class="collapsible collapsed hide-when-print">
+<% if @page.attachments.length > 0 || (@editable && authorize_for('wiki', 'add_attachment')) %>
+<fieldset class="collapsible collapsed<% if @page.attachments.length == 0 %> hide-when-print<% end %>">
  <legend onclick="toggleFieldset(this);"><%= l(:label_attachment_plural) %> (<%= @page.attachments.length %>)</legend>
  <div style="display: none;">

  <%= link_to_attachments @page, :thumbnails => true %>
-  
+
  <% if @editable && authorize_for('wiki', 'add_attachment') %>
  <div id="wiki_add_attachment">
    <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
@ -66,6 +67,7 @@
  <% end %>
 </div>
 </fieldset>
+<% end %>

 <% other_formats_links do |f| %>
  <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>