Merge pull request #264 from humhub/enh-modal-btn-positions

Modals Unification Tasks - P1 Buttons
humhub · Nov 27, 2024 · fb34aa4 · fb34aa4
2 parents 3bbd4f6 + cc5f292
commit fb34aa4
Show file tree

Hide file tree

Showing 68 changed files with 68 additions and 3 deletions.
diff --git a/CalendarUtils.php b/CalendarUtils.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/Events.php b/Events.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/controllers/ConfigContainerController.php b/controllers/ConfigContainerController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG

diff --git a/controllers/GlobalController.php b/controllers/GlobalController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: kingb

diff --git a/controllers/ListController.php b/controllers/ListController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/controllers/SearchController.php b/controllers/SearchController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/controllers/rest/TaskListController.php b/controllers/rest/TaskListController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2019 HumHub GmbH & Co. KG

diff --git a/controllers/rest/TasksController.php b/controllers/rest/TasksController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2019 HumHub GmbH & Co. KG

diff --git a/helpers/RestDefinitions.php b/helpers/RestDefinitions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2019 HumHub GmbH & Co. KG

diff --git a/integration/calendar/TaskCalendar.php b/integration/calendar/TaskCalendar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/integration/calendar/TaskCalendarQuery.php b/integration/calendar/TaskCalendarQuery.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/jobs/SendReminder.php b/jobs/SendReminder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/Sortable.php b/models/Sortable.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: buddha

diff --git a/models/Task.php b/models/Task.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/checklist/TaskItem.php b/models/checklist/TaskItem.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/forms/ConfigureContainerForm.php b/models/forms/ConfigureContainerForm.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2023 HumHub GmbH & Co. KG

diff --git a/models/forms/ItemDrop.php b/models/forms/ItemDrop.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/forms/TaskFilter.php b/models/forms/TaskFilter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/lists/TaskList.php b/models/lists/TaskList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/lists/TaskListInterface.php b/models/lists/TaskListInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: buddha

diff --git a/models/lists/TaskListSettings.php b/models/lists/TaskListSettings.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/scheduling/TaskReminder.php b/models/scheduling/TaskReminder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/scheduling/TaskScheduling.php b/models/scheduling/TaskScheduling.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/search/TaskPicker.php b/models/search/TaskPicker.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/models/user/TaskUser.php b/models/user/TaskUser.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG

diff --git a/tests/codeception/_support/AcceptanceTester.php b/tests/codeception/_support/AcceptanceTester.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/_support/FunctionalTester.php b/tests/codeception/_support/FunctionalTester.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/_support/UnitTester.php b/tests/codeception/_support/UnitTester.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/acceptance/TaskListCest.php b/tests/codeception/acceptance/TaskListCest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/codeception/acceptance/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php

diff --git a/tests/codeception/api/_bootstrap.php b/tests/codeception/api/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php

diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php

diff --git a/tests/codeception/unit/TaskNotificationTest.php b/tests/codeception/unit/TaskNotificationTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/unit/TaskQueryTest.php b/tests/codeception/unit/TaskQueryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/unit/TaskSortTest.php b/tests/codeception/unit/TaskSortTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/unit/TaskStateTest.php b/tests/codeception/unit/TaskStateTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/codeception/unit/_bootstrap.php b/tests/codeception/unit/_bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Initialize the HumHub Application for functional testing. The default application configuration for this suite can be overwritten
  * in @tests/config/functional.php

diff --git a/tests/config/api.php b/tests/config/api.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite your functional humhub config. The default config resiedes in @humhubTests/codeception/config/config.php
  */

diff --git a/tests/config/common.php b/tests/config/common.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This config is shared by all suites (unit/functional/acceptance) and can be overwritten by a suite config (e.g. functional.php)
  */

diff --git a/tests/config/functional.php b/tests/config/functional.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite the default config for the functional suite. The default config resides in @humhubTests/codeception/config/config.php
  */

diff --git a/tests/config/test.php b/tests/config/test.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/tests/config/unit.php b/tests/config/unit.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Here you can overwrite your functional humhub config. The default config resiedes in @humhubTests/codeception/config/config.php
  */

diff --git a/views/list/edit.php b/views/list/edit.php
@@ -32,8 +32,8 @@
             </div>
         </div>
         <div class="modal-footer">
-            <?= ModalButton::submitModal() ?>
             <?= ModalButton::cancel() ?>
+            <?= ModalButton::submitModal() ?>
         </div>
     <?php ActiveForm::end() ?>
 <?php ModalDialog::end() ?>
diff --git a/views/task/edit.php b/views/task/edit.php
@@ -35,8 +35,8 @@
 
         <div class="modal-footer">
             <div class="col-md-12 text-center">
-                <?= ModalButton::submitModal($taskForm->getSubmitUrl()); ?>
                 <?= ModalButton::cancel(); ?>
+                <?= ModalButton::submitModal($taskForm->getSubmitUrl()); ?>
             </div>
         </div>
 

diff --git a/views/task/modal.php b/views/task/modal.php
@@ -21,9 +21,9 @@
         <?= $this->renderAjax('modal_entry', ['task' => $task])?>
     </div>
     <div class="modal-footer">
+        <?= ModalButton::cancel(Yii::t('TasksModule.base', 'Close')) ?>
         <?php if($canManageEntries): ?>
             <?= ModalButton::primary(Yii::t('TasksModule.base', 'Edit'))->load($editUrl)->loader(true); ?>
         <?php endif; ?>
-        <?= ModalButton::cancel(Yii::t('TasksModule.base', 'Close')) ?>
     </div>
 <?php ModalDialog::end(); ?>
diff --git a/widgets/AddItemsInput.php b/widgets/AddItemsInput.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/ContentTagDropDown.php b/widgets/ContentTagDropDown.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG

diff --git a/widgets/MyTasks.php b/widgets/MyTasks.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/TaskBadge.php b/widgets/TaskBadge.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/TaskContextMenu.php b/widgets/TaskContextMenu.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) HumHub GmbH & Co. KG

diff --git a/widgets/TaskDetails.php b/widgets/TaskDetails.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) HumHub GmbH & Co. KG

diff --git a/widgets/TaskIcon.php b/widgets/TaskIcon.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/TaskPercentageBar.php b/widgets/TaskPercentageBar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/TaskPicker.php b/widgets/TaskPicker.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/TaskSubMenu.php b/widgets/TaskSubMenu.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/checklist/TaskChecklist.php b/widgets/checklist/TaskChecklist.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/checklist/TaskChecklistItem.php b/widgets/checklist/TaskChecklistItem.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/lists/CompletedTaskListView.php b/widgets/lists/CompletedTaskListView.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2017 HumHub GmbH & Co. KG

diff --git a/widgets/lists/TaskListItem.php b/widgets/lists/TaskListItem.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/lists/TaskListWidget.php b/widgets/lists/TaskListWidget.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/search/CheckboxFilterInput.php b/widgets/search/CheckboxFilterInput.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG

diff --git a/widgets/search/DateFilter.php b/widgets/search/DateFilter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG

diff --git a/widgets/search/PickerFilterInput.php b/widgets/search/PickerFilterInput.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.humhub.org/
  * @copyright Copyright (c) 2022 HumHub GmbH & Co. KG
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * Here you can overwrite your functional humhub config. The default config resiedes in @humhubTests/codeception/config/config.php
      */
@@ Expand Down @@