From a82c8dab1f96057f8e17f6af678ec5a1feb016f1 Mon Sep 17 00:00:00 2001
From: CI <operations+ci@openproject.com>
Date: Sat, 9 Apr 2016 00:48:22 +0000
Subject: [PATCH 1/5] Update reference to OpenProject-Translations
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index eca4d98e1c..371d9a89b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: af25dbbf6b4b2c734f8030d2398a821910a6ed03
+ revision: bb4a4cd2b9cc7d870c0df037b5380de69be3b860
branch: release/5.0
specs:
openproject-translations (5.0.17)
From 6371c7a2f4c283f26ebcd106b2bf09957c6ad96d Mon Sep 17 00:00:00 2001
From: CI <operations+ci@openproject.com>
Date: Sun, 10 Apr 2016 00:47:58 +0000
Subject: [PATCH 2/5] Update reference to OpenProject-Translations
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 371d9a89b6..4862cea5df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: bb4a4cd2b9cc7d870c0df037b5380de69be3b860
+ revision: 0bd8946c4cb8994e3a4c1b9ebb3747763450d5f2
branch: release/5.0
specs:
openproject-translations (5.0.17)
From ddcb8a9fd1fd2cf76cdf0ae07a6100301f5dbff5 Mon Sep 17 00:00:00 2001
From: HDinger <HDinger@users.noreply.github.com>
Date: Mon, 11 Apr 2016 08:01:00 +0200
Subject: [PATCH 3/5] Increase label width for simple filters (#4314)
This increases the width of filter labels. Thus longer words are also displayed, e.g in German language. If there are words in other languages which are even longer, they will be truncated.
---
app/assets/stylesheets/content/_simple_filters.sass | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/content/_simple_filters.sass b/app/assets/stylesheets/content/_simple_filters.sass
index 2cc6a98661..cd2dd32a42 100644
--- a/app/assets/stylesheets/content/_simple_filters.sass
+++ b/app/assets/stylesheets/content/_simple_filters.sass
@@ -82,9 +82,15 @@ $filters--border-color: $gray !default
max-width: 100%
.simple-filters--filter-name
- flex-basis: 20%
+ flex-basis: 25%
+ max-width: 25%
+ padding-right: 0
+ margin-right: 1rem
+ overflow: hidden
+ text-overflow: ellipsis
.simple-filters--filter-value
- flex-basis: 75%
+ flex-basis: 70%
+ max-width: 70%
// important for consistent padding between input and select fields
padding-right: 0.375rem
From 7137ff46d4ea7b8620b6b992f02fac124c879d97 Mon Sep 17 00:00:00 2001
From: HDinger <HDinger@users.noreply.github.com>
Date: Mon, 11 Apr 2016 08:02:24 +0200
Subject: [PATCH 4/5] Trigger label change in tab change (#4316)
This changes the hidden label about the position in the settings tabs.
---
app/assets/javascripts/tab_handling.js | 2 ++
app/helpers/accessibility_helper.rb | 10 +++++++---
app/views/common/_tabs.html.erb | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/tab_handling.js b/app/assets/javascripts/tab_handling.js
index 1e5a952a6b..585ce0ef7f 100644
--- a/app/assets/javascripts/tab_handling.js
+++ b/app/assets/javascripts/tab_handling.js
@@ -36,6 +36,8 @@
// Responsible to hide the old selected tab and show the content
// of the currently selected tab.
function showTab(name, url) {
+ jQuery('div#content .tabs .a .position-label').hide();
+ jQuery('div#content .tabs #tab-' + name + ' .position-label').show();
jQuery('div#content .tab-content').hide();
jQuery('div.tabs a').removeClass('selected');
jQuery('#tab-content-' + name).show();
diff --git a/app/helpers/accessibility_helper.rb b/app/helpers/accessibility_helper.rb
index acbc932e5f..29304297e2 100644
--- a/app/helpers/accessibility_helper.rb
+++ b/app/helpers/accessibility_helper.rb
@@ -28,10 +28,14 @@
#++
module AccessibilityHelper
- def you_are_here_info(condition = true)
- condition ?
- "<span class = 'hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe :
+ def you_are_here_info(condition = true, disabled = nil)
+ if condition && !disabled
+ "<span style = 'display: block' class = 'position-label hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe
+ elsif condition && disabled
+ "<span style = 'display: none' class = 'position-label hidden-for-sighted'>#{l(:description_current_position)}</span>".html_safe
+ else
''
+ end
end
def empty_element_tag
diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index 2a90076db4..f2912b74f7 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
<ul>
<% tabs.each do |tab| %>
<li><%=
- position_span = you_are_here_info(tab[:name] == selected_tab)
+ position_span = you_are_here_info(tab[:name], tab[:name] != selected_tab)
caption = case tab[:label]
when Proc
tab[:label].call
From ce68e65d5015471b88b1a8ab6ea36645458d565e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Mon, 11 Apr 2016 09:43:24 +0200
Subject: [PATCH 5/5] Release opf/openproject v5.0.17
---
Gemfile.lock | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 4862cea5df..95deedfcc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,8 +53,8 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 0bd8946c4cb8994e3a4c1b9ebb3747763450d5f2
- branch: release/5.0
+ revision: a9056536ff7ba39af18de01fe38328fe42d130fd
+ branch: stable/5
specs:
openproject-translations (5.0.17)
crowdin-api (~> 0.4.0)