Oliver Günther 8 years ago
parent 45ddfc01c5
commit 039103a4ea
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 4
      app/assets/javascripts/flash_messages.js
  2. 9
      app/views/timelines/show.html.erb
  3. 8
      config/locales/en.yml

@ -27,9 +27,9 @@
//++
jQuery(document).ready(function($) {
$('body').on('click keydown touchend', '.close-handler', function (e) {
$('body').on('click keydown touchend', '.close-handler,.notification-box--close', function (e) {
if (e.type == 'click' || e.keyCode == 13) {
$(this).parent('.flash, .errorExplanation').remove();
$(this).parent('.flash, .errorExplanation, .notification-box').remove();
}
});

@ -39,6 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
</li>
<% end %>
<% if timeline_action_authorized?(:edit) %>
<li class="toolbar-item">
<%= edit_timeline_link @project, @timeline do %>
@ -67,6 +68,14 @@ See doc/COPYRIGHT.rdoc for more details.
</li>
<% end %>
<div class="notification-box -warning">
<a title="close" class="notification-box--close icon-context icon-close"></a>
<div class="notification-box--content">
<p><%=raw t('deprecations.old_timeline') %></p>
</div>
</div>
<div id="timeline">
<%= form_tag '', {id: "specialForm", 'ng-controller' => 'TimelineSelectionController'} do %>
<div class="form--field">

@ -68,6 +68,14 @@ en:
no_results_title_text: There are currently no custom fields.
no_results_content_text: Create a new custom field
deprecations:
old_timeline: |-
This timelines module will be replaced by an interactive timelines view embedded into
the work packages module. This module is being removed from OpenProject 7.0.
<br/>
Please note that all data within this module will NOT be migrated to the new view,
please make all necessary preparations to recreate the information in the new view.
groups:
index:
no_results_title_text: There are currently no groups.

Loading…
Cancel
Save