Merge remote-tracking branch 'origin/release/12.3' into dev

app/views/onboarding/_configuration_modal.html.erb

@@ -46,6 +46,11 @@ See COPYRIGHT and LICENSE files for more details.
 
     <div class="onboarding--footer spot-action-bar">
       <div class="spot-action-bar--right">
+        <button
+          class="button button_no-margin spot-action-bar--action"
+          dynamic-content-modal-close-button
+          title=<%= t(:button_close) %>
+        ><%= t(:button_close) %></button>
         <%= styled_button_tag t(:button_save), class: 'button_no-margin -highlight -with-icon icon-checkmark spot-action-bar--action' %>
       </div>
     </div>

docs/bim-guide/README.md

@@ -79,7 +79,7 @@ Yes, you are able to use all known features. Within our BIM Edition you get the
 
 Yes, an existing OpenProject on-premises (self-hosted) installation can easily be switched to the BIM Edition without losing your settings and projects.
 
-In our [Installation & Upgrade Guide](../installation-and-operations/changing-to-bim-edition) you can find a description how to switch.
+In our [Installation & Upgrade Guide](../installation-and-operations/bim-edition/) you can find a description how to switch.
 
 
 
@@ -127,7 +127,7 @@ Yes, we want to develop some other integrations to stay interoparable with other
 
 The BCF Module and the included IFC viewer can be enabled or disabled for every single project. Here you can find the description how to [enable a module](../user-guide/projects/project-settings/modules/) within the project settings. 
 
-*The BCF Module is an OpenProject BIM Premium function. Please make sure, that you are already using the OpenProject BIM Edition ([switch to the BIM Edition](../installation-and-operations/changing-to-bim-edition))*
+*The BCF Module is an OpenProject BIM Premium function. Please make sure, that you are already using the OpenProject BIM Edition ([switch to the BIM Edition](../installation-and-operations/bim-edition/))*
 
  
 

docs/faq/README.md

@@ -213,7 +213,7 @@ IFC2x3 and IFC4. We accept those formats and convert them to some other format t
 
 ### Is there a way to use OpenProject BIM for free, too?
 
-Yes, (only) as part of the Community Edition you can use OpenProject BIM for free. Please have a look [here](../installation-and-operations/changing-to-bim-edition/) to find out how to activate the BIM modules in your on-premises installation.
+Yes, (only) as part of the Community Edition you can use OpenProject BIM for free. Please have a look [here](../installation-and-operations/bim-edition/) to find out how to activate the BIM modules in your on-premises installation.
 
 ### Can a BCF file created from other software e.g. BIMcollab, Solibri, etc. be opened in OpenProject?
 

docs/installation-and-operations/README.md

@@ -21,7 +21,7 @@ This page summarizes the options for getting OpenProject, some hosted and some o
 
 
 
-All editions can be enhanced by adding **[the BIM module](https://www.openproject.org/bim-project-management/)**, including features for construction project management, i.e. 3D model viewer, BCF management. See how to [switch to that edition](changing-to-bim-edition) in the documentation or how to start a [BIM cloud edition](https://start.openproject.com/go/bim).
+All editions can be enhanced by adding **[the BIM module](https://www.openproject.org/bim-project-management/)**, including features for construction project management, i.e. 3D model viewer, BCF management. See how to [switch to that edition](bim-edition/) in the documentation or how to start a [BIM cloud edition](https://start.openproject.com/go/bim).
 
 Compare the features of these versions [on the website](https://www.openproject.org/pricing/#features). The Community edition can easily be upgraded to the Enterprise edition.
 

docs/installation-and-operations/bim-edition/README.md

@@ -1,18 +1,21 @@
 ---
 sidebar_navigation:
-  title: Changing to BIM Edition
+  title: BIM edition
   priority: 100
 ---
 
-# Changing to BIM Edition
+# OpenProject BIM edition
 
-An existing OpenProject on-premises (self hosted) installation can easily be switched to the BIM Edition. The BIM Edition extends the capabilities of a normal OpenProject installation with special features for the construction industry.
+## Installing OpenProject BIM edition
 
-Switching to the BIM Edition will not affect your existing data. Your team will be able to continue working just as before. By switching to the BIM edition additional features will become available  when you activate the "BCF" module in the [project's settings](../../user-guide/projects/project-settings/modules).
+For installing the OpenProject BIM edition please follow the general [system requirements](../system-requirements/) and [installation guidelines](../installation/packaged/).
+Under [Step 1](../installation/packaged/#step-1-select-your-openproject-edition) please select OpenProject BIM.
 
-To choose the BIM edition during installation use [this instruction](../installation/packaged/#step-1-select-your-openproject-edition).
+## Changing to OpenProject BIM edition 
 
-## Instructions
+An existing OpenProject on-premises (self hosted) installation can easily be switched to the BIM Edition. The BIM Edition extends the capabilities of a normal OpenProject installation with special features for the construction industry.
+
+Switching to the BIM Edition will not affect your existing data. Your team will be able to continue working just as before. By switching to the BIM edition additional features will become available  when you activate the "BCF" module in the [project's settings](../../user-guide/projects/project-settings/modules).
 
 ### Backup and upgrade
 

docs/installation-and-operations/installation/docker/README.md

@@ -77,7 +77,7 @@ Please be aware that only those variables shall be edited which are documented a
 
 #### BIM Edition
 
-In order to install or change to BIM inside a Docker environment, please navigate to the [Docker](../../changing-to-bim-edition/#docker) paragraph at the [Changing to BIM Edition](../../changing-to-bim-edition/) documentation. 
+In order to install or change to BIM inside a Docker environment, please navigate to the [Docker](../../bim-edition/#docker) paragraph at the BIM Edition documentation. 
 
 ### Disabling services in the docker-compose file
 

frontend/src/app/features/boards/new-board-modal/new-board-modal.html

@@ -34,7 +34,7 @@
     <div class="spot-action-bar--right">
       <button
         type="button"
-        class="button button_no-margin spot-action-bar--action"
+        class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
         (click)="closeMe()"
         >
         {{ text.cancel_button }}

frontend/src/app/features/invite-user-modal/principal/principal.component.html

@@ -119,7 +119,7 @@
     <div class="spot-action-bar--right">
       <button
         type="button"
-        class="button button_no-margin spot-action-bar--action"
+        class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
         (click)="close.emit()"
         >
         {{ text.principal.cancelButton }}

frontend/src/app/features/invite-user-modal/project-selection/project-selection.component.html

@@ -66,7 +66,7 @@
     <div class="spot-action-bar--right">
       <button
         type="button"
-        class="button spot-action-bar--action"
+        class="button spot-action-bar--action spot-modal--cancel-button"
         (click)="close.emit()"> {{ text.cancelButton }}
       </button>
       <button class="button -highlight spot-action-bar--action">{{ text.nextButton }}</button>

frontend/src/app/features/invite-user-modal/summary/summary.component.html

@@ -42,7 +42,7 @@
     <div class="spot-action-bar--right">
       <button
         type="button"
-        class="button button_no-margin spot-action-bar--action"
+        class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
         (click)="close.emit()"
       >{{ text.cancelButton }}</button>
       <button

frontend/src/app/shared/components/attribute-help-texts/help-text.modal.html

@@ -28,7 +28,7 @@
     <div class="spot-action-bar--right">
       <button
         type="button"
-        class="button button_no-margin spot-action-bar--action"
+        class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
         (click)="closeMe()"
         >
         {{ text.close }}

frontend/src/app/shared/components/op-date-picker/datepicker.ts

@@ -176,7 +176,7 @@ export class DatePicker {
       onDayCreate: async (dObj:Date[], dStr:string, fp:flatpickr.Instance, dayElem:DayElement) => {
         await this.weekdaysPromise;
         if (this.weekdaysService.isNonWorkingDay(dayElem.dateObj)) {
-          dayElem.classList.add('flatpickr-non-working-day');
+          dayElem.classList.add('flatpickr-non-working-selectable-day');
         }
       },
       dateFormat: this.datepickerFormat,

frontend/src/global_styles/content/_datepicker.sass

@@ -43,6 +43,10 @@ $datepicker--border-radius: 5px
   border-radius: 0
   pointer-events: none
 
+@mixin non-working-selectable-day
+  background: $spot-color-basic-gray-6
+  border-radius: 0
+
 .flatpickr-current-month
   display: flex !important
 
@@ -56,6 +60,8 @@ $datepicker--border-radius: 5px
     @include disabled-day
   &.flatpickr-non-working-day
     @include non-working-day
+  &.flatpickr-non-working-selectable-day
+    @include non-working-selectable-day
 
 .flatpickr-calendar.inline
   box-shadow: none !important

modules/webhooks/app/cells/views/response_body.erb

@@ -23,7 +23,7 @@
     <div class="spot-action-bar">
       <div class="spot-action-bar--right">
         <button
-          class="button button_no-margin spot-action-bar--action"
+          class="button button_no-margin spot-action-bar--action spot-modal--cancel-button"
           title="<%= t(:button_close) %>"
           dynamic-content-modal-close-button
         >