From 79c25f480bc538fafad0a956c3acad3579272876 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Fri, 3 Mar 2017 13:40:56 +0100
Subject: [PATCH 1/7] Styling changes on WP page

---
 .../content/work_packages/_table_hierarchy.sass            | 7 ++++++-
 app/assets/stylesheets/layout/_top_menu.sass               | 4 ++--
 app/assets/stylesheets/layout/_work_package.sass           | 3 +++
 .../moves/work_package_moves_new_copy.feature              | 4 ++--
 .../wp-create-button/wp-create-button.directive.html       | 2 +-
 .../wp-fast-table/builders/rows/hierarchy-rows-builder.ts  | 2 +-
 frontend/app/components/wp-table/wp-table.directive.html   | 2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/content/work_packages/_table_hierarchy.sass b/app/assets/stylesheets/content/work_packages/_table_hierarchy.sass
index 40794d015d..988b7f98bd 100644
--- a/app/assets/stylesheets/content/work_packages/_table_hierarchy.sass
+++ b/app/assets/stylesheets/content/work_packages/_table_hierarchy.sass
@@ -20,8 +20,10 @@
     display: inline
 
 .wp-table--hierarchy-span
-  text-align: center
+  text-align: end
   display: inline-block
+  margin-left: 5px
+  padding-right: 8px
 
 .wp-table--hierarchy-indicator-icon
   @include icon-common
@@ -62,6 +64,9 @@
 .wp-table--cell-td.subject:not(.-with-hierarchy)
   padding-left: 25px !important
 
+.wp-table--cell-td.subject.-with-hierarchy .wp-table--cell-span
+  padding-left: 0
+
 .hierarchy-header--icon
   display: inline-block
   width: 20px
diff --git a/app/assets/stylesheets/layout/_top_menu.sass b/app/assets/stylesheets/layout/_top_menu.sass
index 6408f95ed7..b9467338f4 100644
--- a/app/assets/stylesheets/layout/_top_menu.sass
+++ b/app/assets/stylesheets/layout/_top_menu.sass
@@ -36,7 +36,7 @@
     margin-top: 13px
     display: block
     background: $header-home-link-bg
-    background-size: 150px
+    background-size: 140px
     height: 42px
     text-indent: -9999em
 
@@ -309,7 +309,7 @@ input.top-menu-search--input
     overflow: hidden
     text-overflow: ellipsis
     padding-right: 34px
-    font-size: 16px
+    font-size: 18px
     font-weight: bold
 
     &:after
diff --git a/app/assets/stylesheets/layout/_work_package.sass b/app/assets/stylesheets/layout/_work_package.sass
index 0902b45f8e..34212d3909 100644
--- a/app/assets/stylesheets/layout/_work_package.sass
+++ b/app/assets/stylesheets/layout/_work_package.sass
@@ -297,6 +297,9 @@
     .form--field-container
       max-width: 400px
 
+  #breadcrumb
+    display: none
+
 %flex-grow-shrink-zero
   flex-grow: 0
   flex-shrink: 0
diff --git a/features/work_packages/moves/work_package_moves_new_copy.feature b/features/work_packages/moves/work_package_moves_new_copy.feature
index d0eda5db0a..677d9af1e4 100644
--- a/features/work_packages/moves/work_package_moves_new_copy.feature
+++ b/features/work_packages/moves/work_package_moves_new_copy.feature
@@ -87,7 +87,7 @@ Feature: Copying a work package
     When I click "Copy and follow"
     Then I should see "Successful creation."
     Then I should see "issue1" within ".wp-edit-field.subject"
-     And I should see "project_2" within ".breadcrumb"
+     And I should see "project_2" within "#projects-menu"
 
   @javascript @selenium
   Scenario: Issue children are moved
@@ -97,7 +97,7 @@ Feature: Copying a work package
     When I click "Move and follow"
     #Then I should see "Successful update."
     Then I should see "issue1" within ".wp-edit-field.subject"
-     And I should see "project_2" within ".breadcrumb"
+     And I should see "project_2" within "#projects-menu"
 
 
   Scenario: Move an issue to project with missing type
diff --git a/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html b/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html
index 3425d2714d..c9853cd8a2 100644
--- a/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html
+++ b/frontend/app/components/wp-buttons/wp-create-button/wp-create-button.directive.html
@@ -12,7 +12,7 @@
     <span class="button--text"
           ng-bind="::$ctrl.text.createWithDropdown"
           aria-hidden="true"></span>
-    <i class="button--icon icon-pulldown"></i>
+    <i class="button--icon icon-small icon-pulldown"></i>
   </button>
   <button class="button -alt-highlight add-work-package"
           ng-if="!$ctrl.projectIdentifier"
diff --git a/frontend/app/components/wp-fast-table/builders/rows/hierarchy-rows-builder.ts b/frontend/app/components/wp-fast-table/builders/rows/hierarchy-rows-builder.ts
index cd1047bb1e..0e448b921e 100644
--- a/frontend/app/components/wp-fast-table/builders/rows/hierarchy-rows-builder.ts
+++ b/frontend/app/components/wp-fast-table/builders/rows/hierarchy-rows-builder.ts
@@ -114,7 +114,7 @@ export class HierarchyRowsBuilder extends PlainRowsBuilder {
       const hierarchyIndicator = document.createElement('span');
       const collapsed = this.wpTableHierarchy.collapsed(workPackage.id);
       hierarchyIndicator.classList.add(hierarchyCellClassName);
-      hierarchyIndicator.style.width = 25 + (15 * level) + 'px';
+      hierarchyIndicator.style.width = 25 + (20 * level) + 'px';
 
       if (workPackage.$loaded && workPackage.isLeaf) {
         hierarchyIndicator.innerHTML = `
diff --git a/frontend/app/components/wp-table/wp-table.directive.html b/frontend/app/components/wp-table/wp-table.directive.html
index b46a65e6dd..c17e942766 100644
--- a/frontend/app/components/wp-table/wp-table.directive.html
+++ b/frontend/app/components/wp-table/wp-table.directive.html
@@ -31,7 +31,7 @@
               <accessible-by-keyboard
                           execute="openColumnsModal()"
                           link-class="wp-table--columns-selection">
-                <span class="icon-button icon-columns"></span>
+                <span class="icon-button icon-small icon-add"></span>
               </accessible-by-keyboard>
             </div>
           </th>

From de584216e801734604fe3e20a203ff8868c2d3b3 Mon Sep 17 00:00:00 2001
From: Markus Kahl <machisuji@gmail.com>
Date: Mon, 6 Mar 2017 10:27:17 +0000
Subject: [PATCH 2/7] fixed (and added spec for) adding options to existing cf

---
 app/controllers/custom_fields_controller.rb   |  7 ++++-
 .../custom_fields/custom_fields_spec.rb       | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index c7f8bfb007..ff704baae0 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -61,9 +61,14 @@ class CustomFieldsController < ApplicationController
   def edit; end
 
   def update
-    if @custom_field.update_attributes(@custom_field_params)
+    ok = @custom_field.update_attributes(@custom_field_params)
+
+    if ok
       set_custom_options!
+      ok = @custom_field.save
+    end
 
+    if ok
       if @custom_field.is_a? WorkPackageCustomField
         @custom_field.types.each do |type|
           TypesHelper.update_type_attribute_visibility! type
diff --git a/spec/features/custom_fields/custom_fields_spec.rb b/spec/features/custom_fields/custom_fields_spec.rb
index d904f76491..ec43198686 100644
--- a/spec/features/custom_fields/custom_fields_spec.rb
+++ b/spec/features/custom_fields/custom_fields_spec.rb
@@ -82,6 +82,32 @@ describe 'custom fields', js: true do
       click_on custom_field.name
     end
 
+    it "adds new options" do
+      click_on "add-custom-option"
+
+      expect(page).to have_selector('.custom-option-row', count: 5)
+      within all(".custom-option-row").last do
+        find("input.custom-option-value").set "Sega"
+      end
+
+      click_on "add-custom-option"
+
+      expect(page).to have_selector('.custom-option-row', count: 6)
+      within all(".custom-option-row").last do
+        find("input.custom-option-value").set "Atari"
+      end
+
+      click_on "Save"
+
+      expect(page).to have_text("Successful update")
+      expect(page).to have_text("Platform")
+      expect(page).to have_selector('.custom-option-row', count: 6)
+
+      values = all(".custom-option-value").map(&:value)
+
+      expect(values).to eq ["Playstation", "Xbox", "Nintendo", "PC", "Sega", "Atari"]
+    end
+
     it "updates the values and orders of the custom options" do
       expect(page).to have_text("Platform")
 

From 506213c4f581bc7b874d4354b5bc94d3a0831403 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Tue, 7 Mar 2017 08:34:06 +0100
Subject: [PATCH 3/7] Remove link to FAQ

---
 app/views/homescreen/blocks/_community.html.erb | 3 ---
 config/initializers/homescreen.rb               | 5 -----
 lib/redmine/menu_manager/top_menu/help_menu.rb  | 1 -
 3 files changed, 9 deletions(-)

diff --git a/app/views/homescreen/blocks/_community.html.erb b/app/views/homescreen/blocks/_community.html.erb
index 2e581a2cc0..2e6fccdd25 100644
--- a/app/views/homescreen/blocks/_community.html.erb
+++ b/app/views/homescreen/blocks/_community.html.erb
@@ -7,9 +7,6 @@
   <li>
     <%= static_link_to :user_guides %>
   </li>
-  <li>
-    <%= static_link_to :faq %>
-  </li>
   <li>
     <a title="<%= l('homescreen.links.shortcuts') %>"
        onClick="modalHelperInstance.createModal('/help/keyboard_shortcuts');">
diff --git a/config/initializers/homescreen.rb b/config/initializers/homescreen.rb
index a4defac299..d4eda8e777 100644
--- a/config/initializers/homescreen.rb
+++ b/config/initializers/homescreen.rb
@@ -58,11 +58,6 @@ OpenProject::Static::Homescreen.manage :links do |links|
       icon: 'icon-context icon-rename',
       url: static_links[:user_guides][:href]
     },
-    {
-      label: :faq,
-      icon: 'icon-context icon-faq',
-      url: static_links[:faq][:href]
-    },
     {
       label: :glossary,
       icon: 'icon-context icon-glossar',
diff --git a/lib/redmine/menu_manager/top_menu/help_menu.rb b/lib/redmine/menu_manager/top_menu/help_menu.rb
index ff2fb67b75..ad6969bf8f 100644
--- a/lib/redmine/menu_manager/top_menu/help_menu.rb
+++ b/lib/redmine/menu_manager/top_menu/help_menu.rb
@@ -87,7 +87,6 @@ module Redmine::MenuManager::TopMenu::HelpMenu
       result << static_link_item(:upsale, href_suffix: "?utm_source=ce-helpmenu")
     end
     result << static_link_item(:user_guides)
-    result << static_link_item(:faq)
     result << content_tag(:li) {
       link_to l('homescreen.links.shortcuts'),
               '',

From 6e034933e66dcaf2613f6e73b03e7ddb137d32ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 7 Mar 2017 10:24:24 +0100
Subject: [PATCH 4/7] tslint: Request non-whitespace in typedefs

[ci skip]
---
 tslint.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tslint.json b/tslint.json
index f6224e07c1..493ba0696c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -102,7 +102,7 @@
             "check-type"
         ],
         "typedef-whitespace": [
-            true,
+            false,
             {
                 "call-signature": "nospace",
                 "index-signature": "nospace",

From 0c1977e245c4af39e6f6885a5ad8fd9b6dea07cf Mon Sep 17 00:00:00 2001
From: RobinWagner <RobinWagner@users.noreply.github.com>
Date: Tue, 7 Mar 2017 11:03:20 +0100
Subject: [PATCH 5/7] Add FAQs to installation guide

Add frequently asked questions to packaged installation guide.
---
 doc/operation_guides/packager/installation-guide.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/operation_guides/packager/installation-guide.md b/doc/operation_guides/packager/installation-guide.md
index f41eb26aa2..24ef514141 100644
--- a/doc/operation_guides/packager/installation-guide.md
+++ b/doc/operation_guides/packager/installation-guide.md
@@ -337,3 +337,10 @@ openproject configure
 
 Using `configure` will take your previous decisions in the installer and simply re-apply them, which is an idempotent operation. It will detect the Gemfile config option being set and re-bundle the application.
 
+# Frequently asked questions (FAQ)
+
+## How can I install OpenProject?
+Follow the installation guide for the [packaged installation](https://www.openproject.org/open-source/download/packaged-installation-guide/). For more plugins and support take a look at the [Enterprise Edition](https://www.openproject.org/enterprise-edition/).
+
+## I encountered a problem while trying to install OpenProject. What can I do?
+Take a look at the [OpenProject installation forum](https://community.openproject.com/projects/openproject/boards/9). Other users may have had the same problem. If you don't find an answer feel free to ask a new question / open a new thread.

From 0bc8875c72b607dbe3195678bca754e055430deb Mon Sep 17 00:00:00 2001
From: RobinWagner <RobinWagner@users.noreply.github.com>
Date: Tue, 7 Mar 2017 11:05:59 +0100
Subject: [PATCH 6/7] Fix link

Fix link format for system requirements
---
 doc/operation_guides/packager/installation-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/operation_guides/packager/installation-guide.md b/doc/operation_guides/packager/installation-guide.md
index 24ef514141..6c2378a645 100644
--- a/doc/operation_guides/packager/installation-guide.md
+++ b/doc/operation_guides/packager/installation-guide.md
@@ -25,7 +25,7 @@ server machine.
 
 The installation procedure assumes the following prerequisites:
 
-* A server running one of the Linux distributions listed in the [system requirements]: https://www.openproject.org/systemrequirements  
+* A server running one of the Linux distributions listed in the [system requirements](https://www.openproject.org/systemrequirements).
 * A mail server that is accessible via SMTP that can be used for sending
   notification emails. OpenProject supports authentication, yet does not
 provide support for SMTP via SSL/TLS.

From 437b1f9a966311d1c3a1798e4abb56f19c4f5920 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Tue, 7 Mar 2017 10:36:13 +0100
Subject: [PATCH 7/7] Add hidden level information in repo table

---
 app/views/repositories/_dir_list.html.erb       | 17 +++++++++++++----
 .../repositories/_dir_list_content.html.erb     |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/views/repositories/_dir_list.html.erb b/app/views/repositories/_dir_list.html.erb
index b7d85c6a1e..0e480bdaa5 100644
--- a/app/views/repositories/_dir_list.html.erb
+++ b/app/views/repositories/_dir_list.html.erb
@@ -31,6 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
     <table class="generic-table entries" id="browser">
       <colgroup>
         <col highlight-col>
+        <col>
         <col highlight-col>
         <col highlight-col>
         <col highlight-col>
@@ -48,6 +49,15 @@ See doc/COPYRIGHT.rdoc for more details.
               </div>
             </div>
           </th>
+          <th class="hidden-for-sighted">
+            <div class="generic-table--sort-header-outer">
+              <div class="generic-table--sort-header">
+                <span>
+                  <%= I18n.t('js.tl_toolbar.outlines') %>
+                </span>
+              </div>
+            </div>
+          </th>
           <th>
             <div class="generic-table--sort-header-outer">
               <div class="generic-table--sort-header">
@@ -61,7 +71,7 @@ See doc/COPYRIGHT.rdoc for more details.
             <div class="generic-table--sort-header-outer">
               <div class="generic-table--sort-header">
                 <span>
-                  <%= l(:label_revision) %>
+                  <%= t(:label_revision) %>
                 </span>
               </div>
             </div>
@@ -70,7 +80,7 @@ See doc/COPYRIGHT.rdoc for more details.
             <div class="generic-table--sort-header-outer">
               <div class="generic-table--sort-header">
                 <span>
-                  <%= l(:label_age) %>
+                  <%= t(:label_age) %>
                 </span>
               </div>
             </div>
@@ -99,6 +109,5 @@ See doc/COPYRIGHT.rdoc for more details.
         <%= render partial: 'dir_list_content' %>
       </tbody>
     </table>
-    
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 01ad554b2f..9f78e4b29e 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -51,6 +51,7 @@ See doc/COPYRIGHT.rdoc for more details.
           {action: (entry.dir? ? 'show' : 'changes'), project_id: @project, path: to_path_param(ent_path), rev: @rev},
           class: (entry.dir? ? 'icon-context icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
     </td>
+    <td class="hidden-for-sighted"> <%= depth %></td>
     <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.dir? %></td>
     <% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
     <td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>