From 6cc879dffe7796ac72863e048d26d97b21230ec3 Mon Sep 17 00:00:00 2001 From: mbugeia Date: Sat, 23 Jul 2016 14:11:39 +0200 Subject: [PATCH] Update kanboard to v1.0.31 --- README.markdown | 4 +- conf/config.php | 31 +- sources/.htaccess | 26 + sources/ChangeLog | 132 + sources/app/Action/CommentCreation.php | 4 +- .../Action/CommentCreationMoveTaskColumn.php | 8 +- .../app/Action/TaskAssignCategoryColor.php | 6 +- .../app/Action/TaskAssignCategoryLabel.php | 2 +- sources/app/Action/TaskAssignCategoryLink.php | 8 +- .../app/Action/TaskAssignColorCategory.php | 6 +- sources/app/Action/TaskAssignColorColumn.php | 8 +- sources/app/Action/TaskAssignColorLink.php | 6 +- .../app/Action/TaskAssignColorPriority.php | 95 + sources/app/Action/TaskAssignColorUser.php | 8 +- sources/app/Action/TaskAssignCurrentUser.php | 6 +- .../Action/TaskAssignCurrentUserColumn.php | 6 +- sources/app/Action/TaskAssignSpecificUser.php | 8 +- sources/app/Action/TaskAssignUser.php | 4 +- sources/app/Action/TaskClose.php | 2 +- sources/app/Action/TaskCloseColumn.php | 6 +- sources/app/Action/TaskCloseNoActivity.php | 6 +- sources/app/Action/TaskCreation.php | 2 +- .../Action/TaskDuplicateAnotherProject.php | 11 +- sources/app/Action/TaskEmail.php | 12 +- sources/app/Action/TaskEmailNoActivity.php | 10 +- sources/app/Action/TaskMoveAnotherProject.php | 8 +- sources/app/Action/TaskMoveColumnAssigned.php | 10 +- .../Action/TaskMoveColumnCategoryChange.php | 8 +- .../app/Action/TaskMoveColumnUnAssigned.php | 10 +- sources/app/Action/TaskOpen.php | 2 +- sources/app/Action/TaskUpdateStartDate.php | 6 +- .../Analytic/AverageLeadCycleTimeAnalytic.php | 4 +- .../AverageTimeSpentColumnAnalytic.php | 8 +- .../EstimatedTimeComparisonAnalytic.php | 6 +- .../app/Analytic/TaskDistributionAnalytic.php | 4 +- .../app/Analytic/UserDistributionAnalytic.php | 4 +- .../Api/Authorization/ActionAuthorization.php | 19 + .../Authorization/CategoryAuthorization.php | 19 + .../Api/Authorization/ColumnAuthorization.php | 19 + .../Authorization/CommentAuthorization.php | 19 + .../Authorization/ProcedureAuthorization.php | 32 + .../Authorization/ProjectAuthorization.php | 35 + .../Authorization/SubtaskAuthorization.php | 19 + .../Api/Authorization/TaskAuthorization.php | 19 + .../Authorization/TaskFileAuthorization.php | 19 + .../Authorization/TaskLinkAuthorization.php | 19 + .../Api/Authorization/UserAuthorization.php | 22 + sources/app/Api/Base.php | 117 - sources/app/Api/Board.php | 18 - sources/app/Api/Category.php | 49 - sources/app/Api/Column.php | 42 - sources/app/Api/Comment.php | 52 - sources/app/Api/File.php | 90 - sources/app/Api/GroupMember.php | 32 - sources/app/Api/Me.php | 72 - .../AuthenticationMiddleware.php} | 43 +- .../ActionProcedure.php} | 18 +- .../{App.php => Procedure/AppProcedure.php} | 14 +- sources/app/Api/Procedure/BaseProcedure.php | 85 + sources/app/Api/Procedure/BoardProcedure.php | 25 + .../app/Api/Procedure/CategoryProcedure.php | 59 + sources/app/Api/Procedure/ColumnProcedure.php | 51 + .../app/Api/Procedure/CommentProcedure.php | 62 + .../Api/Procedure/GroupMemberProcedure.php | 37 + .../GroupProcedure.php} | 16 +- .../{Link.php => Procedure/LinkProcedure.php} | 20 +- sources/app/Api/Procedure/MeProcedure.php | 72 + .../Api/Procedure/ProjectFileProcedure.php | 68 + .../Procedure/ProjectPermissionProcedure.php | 69 + .../app/Api/Procedure/ProjectProcedure.php | 113 + .../SubtaskProcedure.php} | 26 +- .../SubtaskTimeTrackingProcedure.php | 39 + .../app/Api/Procedure/SwimlaneProcedure.php | 91 + .../Procedure/TaskExternalLinkProcedure.php | 106 + .../app/Api/Procedure/TaskFileProcedure.php | 70 + .../TaskLinkProcedure.php} | 24 +- .../{Task.php => Procedure/TaskProcedure.php} | 89 +- .../{User.php => Procedure/UserProcedure.php} | 36 +- sources/app/Api/Project.php | 87 - sources/app/Api/ProjectPermission.php | 72 - sources/app/Api/Swimlane.php | 78 - sources/app/Auth/DatabaseAuth.php | 6 +- sources/app/Auth/LdapAuth.php | 2 +- sources/app/Auth/RememberMeAuth.php | 6 +- sources/app/Auth/ReverseProxyAuth.php | 3 +- sources/app/Console/Base.php | 61 - sources/app/Console/BaseCommand.php | 67 + .../{Cronjob.php => CronjobCommand.php} | 2 +- ...arator.php => LocaleComparatorCommand.php} | 2 +- .../{LocaleSync.php => LocaleSyncCommand.php} | 2 +- sources/app/Console/PluginInstallCommand.php | 36 + .../app/Console/PluginUninstallCommand.php | 36 + sources/app/Console/PluginUpgradeCommand.php | 55 + ... ProjectDailyColumnStatsExportCommand.php} | 4 +- ...> ProjectDailyStatsCalculationCommand.php} | 10 +- sources/app/Console/ResetPasswordCommand.php | 79 + sources/app/Console/ResetTwoFactorCommand.php | 38 + ...askExport.php => SubtaskExportCommand.php} | 2 +- .../{TaskExport.php => TaskExportCommand.php} | 2 +- .../app/Console/TaskOverdueNotification.php | 116 - .../TaskOverdueNotificationCommand.php | 191 + ...TaskTrigger.php => TaskTriggerCommand.php} | 10 +- ...Export.php => TransitionExportCommand.php} | 2 +- sources/app/Console/WorkerCommand.php | 28 + .../{Action.php => ActionController.php} | 28 +- ...ation.php => ActionCreationController.php} | 27 +- .../{Activity.php => ActivityController.php} | 12 +- .../{Analytic.php => AnalyticController.php} | 27 +- sources/app/Controller/AppController.php | 46 + .../{Auth.php => AuthController.php} | 36 +- ...vatarFile.php => AvatarFileController.php} | 20 +- sources/app/Controller/Base.php | 290 -- sources/app/Controller/BaseController.php | 158 + sources/app/Controller/Board.php | 186 - .../app/Controller/BoardAjaxController.php | 140 + sources/app/Controller/BoardPopover.php | 135 - .../app/Controller/BoardPopoverController.php | 47 + ...Tooltip.php => BoardTooltipController.php} | 22 +- .../app/Controller/BoardViewController.php | 69 + .../{Calendar.php => CalendarController.php} | 53 +- .../{Captcha.php => CaptchaController.php} | 6 +- .../{Category.php => CategoryController.php} | 47 +- .../{Column.php => ColumnController.php} | 41 +- .../{Comment.php => CommentController.php} | 43 +- .../{Config.php => ConfigController.php} | 143 +- .../{Currency.php => CurrencyController.php} | 25 +- ...mfilter.php => CustomFilterController.php} | 45 +- .../{App.php => DashboardController.php} | 58 +- sources/app/Controller/Doc.php | 92 - .../Controller/DocumentationController.php | 136 + .../{Export.php => ExportController.php} | 47 +- .../{Feed.php => FeedController.php} | 19 +- ...ileViewer.php => FileViewerController.php} | 56 +- sources/app/Controller/Gantt.php | 153 - sources/app/Controller/Group.php | 250 - .../app/Controller/GroupAjaxController.php | 26 + .../Controller/GroupCreationController.php | 49 + sources/app/Controller/GroupHelper.php | 24 - .../app/Controller/GroupListController.php | 173 + .../GroupModificationController.php | 53 + .../app/Controller/ICalendarController.php | 101 + sources/app/Controller/Ical.php | 115 - .../{Link.php => LinkController.php} | 38 +- .../{Oauth.php => OAuthController.php} | 14 +- ...dReset.php => PasswordResetController.php} | 46 +- sources/app/Controller/PluginController.php | 126 + sources/app/Controller/Project.php | 243 - ...=> ProjectActionDuplicationController.php} | 14 +- ...tion.php => ProjectCreationController.php} | 20 +- ...jectEdit.php => ProjectEditController.php} | 26 +- ...jectFile.php => ProjectFileController.php} | 16 +- .../app/Controller/ProjectGanttController.php | 57 + .../app/Controller/ProjectListController.php | 41 + ...view.php => ProjectOverviewController.php} | 14 +- ...on.php => ProjectPermissionController.php} | 45 +- .../Controller/ProjectStatusController.php | 102 + .../app/Controller/ProjectTagController.php | 134 + ....php => ProjectUserOverviewController.php} | 32 +- .../app/Controller/ProjectViewController.php | 162 + sources/app/Controller/Search.php | 49 - sources/app/Controller/SearchController.php | 67 + .../{Subtask.php => SubtaskController.php} | 49 +- .../Controller/SubtaskConverterController.php | 39 + ...n.php => SubtaskRestrictionController.php} | 20 +- ...Status.php => SubtaskStatusController.php} | 15 +- .../{Swimlane.php => SwimlaneController.php} | 86 +- sources/app/Controller/TagController.php | 121 + sources/app/Controller/Task.php | 174 - sources/app/Controller/TaskAjaxController.php | 49 + sources/app/Controller/TaskBulkController.php | 89 + ...reation.php => TaskCreationController.php} | 32 +- ...tion.php => TaskDuplicationController.php} | 36 +- ...ink.php => TaskExternalLinkController.php} | 45 +- .../{TaskFile.php => TaskFileController.php} | 22 +- .../app/Controller/TaskGanttController.php | 62 + .../TaskGanttCreationController.php | 70 + sources/app/Controller/TaskHelper.php | 41 - sources/app/Controller/TaskImport.php | 72 - .../app/Controller/TaskImportController.php | 74 + ...ink.php => TaskInternalLinkController.php} | 41 +- .../{Listing.php => TaskListController.php} | 20 +- .../Controller/TaskModificationController.php | 78 + .../app/Controller/TaskPopoverController.php | 26 + ...rence.php => TaskRecurrenceController.php} | 22 +- ...askstatus.php => TaskStatusController.php} | 10 +- .../Controller/TaskSuppressionController.php | 53 + sources/app/Controller/TaskViewController.php | 147 + sources/app/Controller/Taskmodification.php | 122 - ...{Twofactor.php => TwoFactorController.php} | 30 +- sources/app/Controller/User.php | 408 -- sources/app/Controller/UserAjaxController.php | 52 + .../app/Controller/UserCreationController.php | 83 + .../Controller/UserCredentialController.php | 109 + sources/app/Controller/UserHelper.php | 37 - ...serImport.php => UserImportController.php} | 53 +- sources/app/Controller/UserListController.php | 32 + .../Controller/UserModificationController.php | 69 + ...serStatus.php => UserStatusController.php} | 16 +- sources/app/Controller/UserViewController.php | 217 + sources/app/Controller/WebNotification.php | 50 - .../Controller/WebNotificationController.php | 79 + sources/app/Controller/Webhook.php | 42 - sources/app/Core/Action/ActionManager.php | 6 +- sources/app/Core/Base.php | 289 +- .../Controller/AccessForbiddenException.php | 14 + sources/app/Core/Controller/BaseException.php | 52 + .../app/Core/Controller/BaseMiddleware.php | 58 + .../Core/Controller/PageNotFoundException.php | 14 + sources/app/Core/Controller/Runner.php | 105 + sources/app/Core/DateParser.php | 78 +- sources/app/Core/Event/EventManager.php | 22 +- .../Core/ExternalLink/ExternalLinkManager.php | 26 +- sources/app/Core/Filter/CriteriaInterface.php | 40 + sources/app/Core/Filter/FilterInterface.php | 56 + .../app/Core/Filter/FormatterInterface.php | 31 + sources/app/Core/Filter/Lexer.php | 155 + sources/app/Core/Filter/LexerBuilder.php | 151 + sources/app/Core/Filter/OrCriteria.php | 68 + sources/app/Core/Filter/QueryBuilder.php | 103 + sources/app/Core/Helper.php | 6 +- sources/app/Core/Http/Client.php | 54 +- sources/app/Core/Http/Response.php | 451 +- sources/app/Core/Http/Route.php | 4 +- sources/app/Core/Http/Router.php | 62 +- sources/app/Core/Ldap/Group.php | 7 +- sources/app/Core/Ldap/Query.php | 4 + sources/app/Core/Ldap/User.php | 160 +- sources/app/Core/Lexer.php | 161 - sources/app/Core/Mail/Client.php | 47 +- sources/app/Core/Mail/Transport/Mail.php | 2 +- sources/app/Core/Markdown.php | 85 +- .../Notification/NotificationInterface.php | 4 +- sources/app/Core/Plugin/Base.php | 16 +- sources/app/Core/Plugin/Directory.php | 56 + sources/app/Core/Plugin/Hook.php | 4 +- sources/app/Core/Plugin/Installer.php | 162 + sources/app/Core/Plugin/Loader.php | 155 +- .../Core/Plugin/PluginInstallerException.php | 15 + sources/app/Core/Plugin/SchemaHandler.php | 122 + sources/app/Core/Queue/JobHandler.php | 70 + sources/app/Core/Queue/QueueManager.php | 71 + sources/app/Core/Session/SessionStorage.php | 1 + sources/app/Core/Template.php | 2 +- sources/app/Core/Tool.php | 20 - sources/app/Core/User/GroupSync.php | 50 +- sources/app/Core/User/UserProfile.php | 10 +- sources/app/Core/User/UserProperty.php | 6 +- sources/app/Core/User/UserSession.php | 2 +- sources/app/Core/User/UserSync.php | 10 +- sources/app/Event/UserProfileSyncEvent.php | 64 + sources/app/Export/SubtaskExport.php | 24 +- sources/app/Export/TaskExport.php | 8 +- sources/app/Export/TransitionExport.php | 5 +- sources/app/Filter/BaseDateFilter.php | 103 + sources/app/Filter/BaseFilter.php | 74 + .../ProjectActivityCreationDateFilter.php | 38 + .../Filter/ProjectActivityCreatorFilter.php | 65 + .../Filter/ProjectActivityProjectIdFilter.php | 38 + .../ProjectActivityProjectIdsFilter.php | 43 + .../ProjectActivityProjectNameFilter.php | 38 + .../Filter/ProjectActivityTaskIdFilter.php | 38 + .../ProjectActivityTaskStatusFilter.php | 43 + .../Filter/ProjectActivityTaskTitleFilter.php | 25 + .../Filter/ProjectGroupRoleProjectFilter.php | 38 + .../Filter/ProjectGroupRoleUsernameFilter.php | 44 + sources/app/Filter/ProjectIdsFilter.php | 43 + sources/app/Filter/ProjectStatusFilter.php | 45 + sources/app/Filter/ProjectTypeFilter.php | 45 + .../Filter/ProjectUserRoleProjectFilter.php | 38 + .../Filter/ProjectUserRoleUsernameFilter.php | 41 + sources/app/Filter/TaskAssigneeFilter.php | 75 + sources/app/Filter/TaskCategoryFilter.php | 46 + sources/app/Filter/TaskColorFilter.php | 60 + sources/app/Filter/TaskColumnFilter.php | 44 + sources/app/Filter/TaskCommentFilter.php | 41 + .../app/Filter/TaskCompletionDateFilter.php | 38 + sources/app/Filter/TaskCreationDateFilter.php | 38 + sources/app/Filter/TaskCreatorFilter.php | 74 + sources/app/Filter/TaskDescriptionFilter.php | 38 + sources/app/Filter/TaskDueDateFilter.php | 41 + sources/app/Filter/TaskDueDateRangeFilter.php | 39 + sources/app/Filter/TaskIdExclusionFilter.php | 38 + sources/app/Filter/TaskIdFilter.php | 38 + sources/app/Filter/TaskLinkFilter.php | 85 + .../app/Filter/TaskModificationDateFilter.php | 38 + sources/app/Filter/TaskProjectFilter.php | 44 + sources/app/Filter/TaskProjectsFilter.php | 43 + sources/app/Filter/TaskReferenceFilter.php | 38 + sources/app/Filter/TaskStartDateFilter.php | 38 + sources/app/Filter/TaskStatusFilter.php | 43 + .../app/Filter/TaskSubtaskAssigneeFilter.php | 140 + sources/app/Filter/TaskSwimlaneFilter.php | 50 + sources/app/Filter/TaskTagFilter.php | 74 + sources/app/Filter/TaskTitleFilter.php | 46 + sources/app/Filter/UserNameFilter.php | 35 + sources/app/Formatter/BaseFormatter.php | 50 + ...vent.php => BaseTaskCalendarFormatter.php} | 37 +- .../app/Formatter/BoardColumnFormatter.php | 94 + sources/app/Formatter/BoardFormatter.php | 66 + .../app/Formatter/BoardSwimlaneFormatter.php | 120 + sources/app/Formatter/BoardTaskFormatter.php | 96 + sources/app/Formatter/FormatterInterface.php | 14 - .../Formatter/GroupAutoCompleteFormatter.php | 28 +- .../ProjectActivityEventFormatter.php | 61 + .../app/Formatter/ProjectGanttFormatter.php | 49 +- .../SubtaskTimeTrackingCalendarFormatter.php | 38 + .../Formatter/TaskAutoCompleteFormatter.php | 33 + .../app/Formatter/TaskCalendarFormatter.php | 74 + .../TaskFilterAutoCompleteFormatter.php | 33 - .../Formatter/TaskFilterCalendarFormatter.php | 52 - ...ttFormatter.php => TaskGanttFormatter.php} | 22 +- ...darFormatter.php => TaskICalFormatter.php} | 36 +- ...tter.php => UserAutoCompleteFormatter.php} | 10 +- .../Group/DatabaseBackendGroupProvider.php | 2 +- sources/app/Helper/AppHelper.php | 39 +- sources/app/Helper/AssetHelper.php | 6 +- sources/app/Helper/CalendarHelper.php | 112 + sources/app/Helper/DateHelper.php | 6 +- sources/app/Helper/ICalHelper.php | 38 + sources/app/Helper/LayoutHelper.php | 24 +- sources/app/Helper/MailHelper.php | 82 + sources/app/Helper/ProjectActivityHelper.php | 105 + sources/app/Helper/ProjectHeaderHelper.php | 6 +- sources/app/Helper/SubtaskHelper.php | 6 +- sources/app/Helper/TaskHelper.php | 88 +- sources/app/Helper/TextHelper.php | 20 +- sources/app/Helper/UrlHelper.php | 4 +- sources/app/Helper/UserHelper.php | 49 +- sources/app/Import/TaskImport.php | 14 +- sources/app/Import/UserImport.php | 6 +- sources/app/Job/BaseJob.php | 33 + sources/app/Job/EmailJob.php | 55 + sources/app/Job/HttpAsyncJob.php | 43 + sources/app/Job/NotificationJob.php | 85 + sources/app/Job/ProjectMetricJob.php | 40 + sources/app/Locale/bs_BA/translations.php | 143 +- sources/app/Locale/cs_CZ/translations.php | 225 +- sources/app/Locale/da_DK/translations.php | 91 +- sources/app/Locale/de_DE/translations.php | 189 +- sources/app/Locale/el_GR/translations.php | 91 +- sources/app/Locale/es_ES/translations.php | 945 ++-- sources/app/Locale/fi_FI/translations.php | 91 +- sources/app/Locale/fr_FR/translations.php | 94 +- sources/app/Locale/hu_HU/translations.php | 1257 ++--- sources/app/Locale/id_ID/translations.php | 91 +- sources/app/Locale/it_IT/translations.php | 145 +- sources/app/Locale/ja_JP/translations.php | 91 +- sources/app/Locale/ko_KR/translations.php | 965 ++-- sources/app/Locale/my_MY/translations.php | 91 +- sources/app/Locale/nb_NO/translations.php | 91 +- sources/app/Locale/nl_NL/translations.php | 91 +- sources/app/Locale/pl_PL/translations.php | 595 +-- sources/app/Locale/pt_BR/translations.php | 295 +- sources/app/Locale/pt_PT/translations.php | 129 +- sources/app/Locale/ru_RU/translations.php | 99 +- .../app/Locale/sr_Latn_RS/translations.php | 91 +- sources/app/Locale/sv_SE/translations.php | 91 +- sources/app/Locale/th_TH/translations.php | 91 +- sources/app/Locale/tr_TR/translations.php | 91 +- sources/app/Locale/zh_CN/translations.php | 91 +- .../ApplicationAuthorizationMiddleware.php | 27 + .../Middleware/AuthenticationMiddleware.php | 56 + .../app/Middleware/BootstrapMiddleware.php | 44 + .../PostAuthenticationMiddleware.php | 36 + .../ProjectAuthorizationMiddleware.php | 34 + .../app/Model/{Action.php => ActionModel.php} | 34 +- ...Parameter.php => ActionParameterModel.php} | 14 +- .../{AvatarFile.php => AvatarFileModel.php} | 54 +- sources/app/Model/Base.php | 58 - .../app/Model/{Board.php => BoardModel.php} | 76 +- .../Model/{Category.php => CategoryModel.php} | 24 +- .../app/Model/{Color.php => ColorModel.php} | 8 +- .../app/Model/{Column.php => ColumnModel.php} | 20 +- .../Model/{Comment.php => CommentModel.php} | 45 +- sources/app/Model/Config.php | 255 - sources/app/Model/ConfigModel.php | 89 + .../Model/{Currency.php => CurrencyModel.php} | 8 +- ...CustomFilter.php => CustomFilterModel.php} | 14 +- sources/app/Model/{File.php => FileModel.php} | 88 +- .../{GroupMember.php => GroupMemberModel.php} | 27 +- .../app/Model/{Group.php => GroupModel.php} | 10 +- sources/app/Model/LanguageModel.php | 179 + .../{LastLogin.php => LastLoginModel.php} | 8 +- sources/app/Model/{Link.php => LinkModel.php} | 5 +- .../Model/{Metadata.php => MetadataModel.php} | 30 +- ...Notification.php => NotificationModel.php} | 105 +- ...tionType.php => NotificationTypeModel.php} | 7 +- ...sswordReset.php => PasswordResetModel.php} | 8 +- sources/app/Model/ProjectActivity.php | 211 - sources/app/Model/ProjectActivityModel.php | 94 + ...s.php => ProjectDailyColumnStatsModel.php} | 20 +- ...lyStats.php => ProjectDailyStatsModel.php} | 6 +- ...cation.php => ProjectDuplicationModel.php} | 41 +- sources/app/Model/ProjectFile.php | 40 - sources/app/Model/ProjectFileModel.php | 74 + sources/app/Model/ProjectGroupRoleFilter.php | 89 - ...roupRole.php => ProjectGroupRoleModel.php} | 45 +- sources/app/Model/ProjectMetadata.php | 30 - sources/app/Model/ProjectMetadataModel.php | 54 + .../Model/{Project.php => ProjectModel.php} | 51 +- ...ation.php => ProjectNotificationModel.php} | 18 +- ...e.php => ProjectNotificationTypeModel.php} | 4 +- ...mission.php => ProjectPermissionModel.php} | 61 +- .../app/Model/ProjectTaskDuplicationModel.php | 35 + .../app/Model/ProjectTaskPriorityModel.php | 74 + sources/app/Model/ProjectUserRoleFilter.php | 88 - ...tUserRole.php => ProjectUserRoleModel.php} | 64 +- ...Session.php => RememberMeSessionModel.php} | 5 +- .../Model/{Setting.php => SettingModel.php} | 7 +- .../Model/{Subtask.php => SubtaskModel.php} | 94 +- ...cking.php => SubtaskTimeTrackingModel.php} | 157 +- .../Model/{Swimlane.php => SwimlaneModel.php} | 53 +- sources/app/Model/TagDuplicationModel.php | 87 + sources/app/Model/TagModel.php | 180 + sources/app/Model/Task.php | 223 - ...TaskAnalytic.php => TaskAnalyticModel.php} | 10 +- ...TaskCreation.php => TaskCreationModel.php} | 41 +- sources/app/Model/TaskDuplication.php | 269 -- sources/app/Model/TaskDuplicationModel.php | 145 + ...rnalLink.php => TaskExternalLinkModel.php} | 12 +- sources/app/Model/TaskFile.php | 54 - sources/app/Model/TaskFileModel.php | 104 + sources/app/Model/TaskFilter.php | 745 --- .../{TaskFinder.php => TaskFinderModel.php} | 238 +- .../Model/{TaskLink.php => TaskLinkModel.php} | 77 +- ...TaskMetadata.php => TaskMetadataModel.php} | 15 +- sources/app/Model/TaskModel.php | 146 + ...fication.php => TaskModificationModel.php} | 37 +- sources/app/Model/TaskPermission.php | 34 - ...TaskPosition.php => TaskPositionModel.php} | 27 +- .../app/Model/TaskProjectDuplicationModel.php | 60 + sources/app/Model/TaskProjectMoveModel.php | 68 + sources/app/Model/TaskRecurrenceModel.php | 147 + .../{TaskStatus.php => TaskStatusModel.php} | 31 +- sources/app/Model/TaskTagModel.php | 184 + sources/app/Model/TimezoneModel.php | 58 + .../{Transition.php => TransitionModel.php} | 32 +- sources/app/Model/UserFilter.php | 80 - .../{UserLocking.php => UserLockingModel.php} | 16 +- .../{UserMention.php => UserMentionModel.php} | 11 +- ...UserMetadata.php => UserMetadataModel.php} | 15 +- sources/app/Model/{User.php => UserModel.php} | 33 +- ...er.php => UserNotificationFilterModel.php} | 10 +- ...fication.php => UserNotificationModel.php} | 70 +- ...Type.php => UserNotificationTypeModel.php} | 4 +- ...on.php => UserUnreadNotificationModel.php} | 32 +- ...eam.php => ActivityStreamNotification.php} | 7 +- .../{Mail.php => MailNotification.php} | 47 +- .../{Web.php => WebNotification.php} | 7 +- .../{Webhook.php => WebhookNotification.php} | 9 +- sources/app/Schema/Mysql.php | 25 +- sources/app/Schema/Postgres.php | 24 +- sources/app/Schema/Sqlite.php | 24 +- .../app/ServiceProvider/ActionProvider.php | 4 +- sources/app/ServiceProvider/ApiProvider.php | 81 + .../AuthenticationProvider.php | 177 +- .../app/ServiceProvider/AvatarProvider.php | 2 +- sources/app/ServiceProvider/ClassProvider.php | 145 +- .../app/ServiceProvider/CommandProvider.php | 62 + .../app/ServiceProvider/DatabaseProvider.php | 25 +- .../EventDispatcherProvider.php | 11 + .../ServiceProvider/ExternalLinkProvider.php | 2 +- .../app/ServiceProvider/FilterProvider.php | 178 + sources/app/ServiceProvider/GroupProvider.php | 2 +- .../app/ServiceProvider/HelperProvider.php | 10 + .../app/ServiceProvider/LoggingProvider.php | 35 +- sources/app/ServiceProvider/MailProvider.php | 34 + .../ServiceProvider/NotificationProvider.php | 26 +- .../app/ServiceProvider/PluginProvider.php | 2 +- sources/app/ServiceProvider/QueueProvider.php | 27 + sources/app/ServiceProvider/RouteProvider.php | 222 +- .../app/ServiceProvider/SessionProvider.php | 2 +- sources/app/Subscriber/AuthSubscriber.php | 16 +- sources/app/Subscriber/BaseSubscriber.php | 1 - .../app/Subscriber/BootstrapSubscriber.php | 16 +- .../Subscriber/LdapUserPhotoSubscriber.php | 49 + .../app/Subscriber/NotificationSubscriber.php | 86 +- .../ProjectDailySummarySubscriber.php | 16 +- .../ProjectModificationDateSubscriber.php | 20 +- .../Subscriber/RecurringTaskSubscriber.php | 20 +- .../SubtaskTimeTrackingSubscriber.php | 20 +- .../app/Subscriber/TransitionSubscriber.php | 6 +- sources/app/Template/action/index.php | 8 +- sources/app/Template/action/remove.php | 6 +- .../app/Template/action_creation/create.php | 6 +- .../app/Template/action_creation/event.php | 6 +- .../app/Template/action_creation/params.php | 9 +- .../app/Template/activity/filter_dropdown.php | 14 + sources/app/Template/activity/project.php | 8 +- sources/app/Template/analytic/burndown.php | 2 +- sources/app/Template/analytic/cfd.php | 2 +- .../app/Template/analytic/compare_hours.php | 6 +- sources/app/Template/analytic/layout.php | 5 +- .../app/Template/analytic/lead_cycle_time.php | 2 +- sources/app/Template/analytic/sidebar.php | 32 +- sources/app/Template/app/calendar.php | 5 - sources/app/Template/app/sidebar.php | 27 - sources/app/Template/auth/index.php | 8 +- sources/app/Template/avatar_file/show.php | 19 +- .../app/Template/board/popover_assignee.php | 20 - .../app/Template/board/popover_category.php | 20 - sources/app/Template/board/table_column.php | 22 +- .../app/Template/board/table_container.php | 10 +- sources/app/Template/board/table_swimlane.php | 2 +- sources/app/Template/board/task_avatar.php | 4 +- sources/app/Template/board/task_footer.php | 44 +- sources/app/Template/board/task_menu.php | 18 - sources/app/Template/board/task_private.php | 16 +- sources/app/Template/board/task_public.php | 6 +- sources/app/Template/board/tooltip_files.php | 4 +- .../app/Template/board/tooltip_tasklinks.php | 4 +- sources/app/Template/board/view_private.php | 2 +- .../close_all_tasks_column.php} | 6 +- sources/app/Template/calendar/show.php | 8 +- sources/app/Template/category/edit.php | 6 +- sources/app/Template/category/index.php | 8 +- sources/app/Template/category/remove.php | 6 +- sources/app/Template/column/create.php | 4 +- sources/app/Template/column/edit.php | 6 +- sources/app/Template/column/index.php | 12 +- sources/app/Template/column/remove.php | 6 +- sources/app/Template/comment/create.php | 6 +- sources/app/Template/comment/edit.php | 4 +- sources/app/Template/comment/remove.php | 6 +- sources/app/Template/comment/show.php | 28 +- sources/app/Template/comments/create.php | 4 +- sources/app/Template/comments/show.php | 4 +- sources/app/Template/config/about.php | 10 +- sources/app/Template/config/api.php | 4 +- sources/app/Template/config/application.php | 2 +- sources/app/Template/config/board.php | 2 +- sources/app/Template/config/calendar.php | 4 +- sources/app/Template/config/email.php | 18 + sources/app/Template/config/integrations.php | 4 +- .../Template/config/keyboard_shortcuts.php | 3 +- sources/app/Template/config/layout.php | 3 +- sources/app/Template/config/plugins.php | 30 - sources/app/Template/config/project.php | 2 +- sources/app/Template/config/sidebar.php | 49 +- sources/app/Template/config/webhook.php | 12 +- sources/app/Template/currency/index.php | 4 +- sources/app/Template/custom_filter/add.php | 6 +- sources/app/Template/custom_filter/edit.php | 8 +- sources/app/Template/custom_filter/index.php | 6 +- sources/app/Template/custom_filter/remove.php | 4 +- .../Template/{app => dashboard}/activity.php | 0 sources/app/Template/dashboard/calendar.php | 5 + .../Template/{app => dashboard}/layout.php | 12 +- .../{app => dashboard}/notifications.php | 20 +- .../Template/{app => dashboard}/projects.php | 23 +- .../{app/overview.php => dashboard/show.php} | 8 +- sources/app/Template/dashboard/sidebar.php | 27 + .../Template/{app => dashboard}/subtasks.php | 8 +- .../app/Template/{app => dashboard}/tasks.php | 20 +- sources/app/Template/doc/show.php | 4 +- sources/app/Template/event/comment_create.php | 2 +- sources/app/Template/event/comment_update.php | 2 +- sources/app/Template/event/subtask_create.php | 4 +- sources/app/Template/event/subtask_update.php | 2 +- .../Template/event/task_assignee_change.php | 6 +- sources/app/Template/event/task_close.php | 2 +- sources/app/Template/event/task_create.php | 2 +- .../app/Template/event/task_file_create.php | 2 +- .../app/Template/event/task_move_column.php | 2 +- .../app/Template/event/task_move_position.php | 2 +- .../app/Template/event/task_move_swimlane.php | 4 +- sources/app/Template/event/task_open.php | 2 +- sources/app/Template/event/task_update.php | 2 +- sources/app/Template/export/sidebar.php | 18 +- sources/app/Template/feed/project.php | 8 +- sources/app/Template/feed/user.php | 8 +- sources/app/Template/file_viewer/show.php | 4 +- sources/app/Template/gantt/task_creation.php | 35 - sources/app/Template/group/associate.php | 41 +- sources/app/Template/group/create.php | 19 - sources/app/Template/group/dissociate.php | 25 +- sources/app/Template/group/edit.php | 22 - sources/app/Template/group/index.php | 14 +- sources/app/Template/group/remove.php | 25 +- sources/app/Template/group/users.php | 11 +- sources/app/Template/group_creation/show.php | 15 + .../app/Template/group_modification/show.php | 18 + sources/app/Template/header.php | 47 +- sources/app/Template/layout.php | 38 +- sources/app/Template/link/create.php | 4 +- sources/app/Template/link/edit.php | 4 +- sources/app/Template/link/index.php | 6 +- sources/app/Template/link/remove.php | 6 +- sources/app/Template/notification/footer.php | 4 +- .../Template/notification/task_overdue.php | 43 +- .../app/Template/password_reset/change.php | 4 +- .../app/Template/password_reset/create.php | 6 +- sources/app/Template/password_reset/email.php | 4 +- sources/app/Template/plugin/directory.php | 55 + sources/app/Template/plugin/layout.php | 9 + sources/app/Template/plugin/remove.php | 13 + sources/app/Template/plugin/show.php | 41 + sources/app/Template/plugin/sidebar.php | 11 + sources/app/Template/project/disable.php | 14 - sources/app/Template/project/dropdown.php | 76 +- sources/app/Template/project/duplicate.php | 27 - sources/app/Template/project/enable.php | 14 - sources/app/Template/project/layout.php | 4 +- sources/app/Template/project/remove.php | 14 - sources/app/Template/project/share.php | 19 - sources/app/Template/project/sidebar.php | 72 +- .../show.php} | 5 +- .../app/Template/project_creation/create.php | 15 +- sources/app/Template/project_edit/dates.php | 10 +- .../app/Template/project_edit/description.php | 10 +- sources/app/Template/project_edit/general.php | 12 +- .../Template/project_edit/task_priority.php | 10 +- sources/app/Template/project_file/create.php | 8 +- sources/app/Template/project_file/remove.php | 6 +- .../projects.php => project_gantt/show.php} | 12 +- .../app/Template/project_header/dropdown.php | 68 +- .../app/Template/project_header/search.php | 8 +- sources/app/Template/project_header/views.php | 24 +- .../index.php => project_list/show.php} | 23 +- .../Template/project_overview/attachments.php | 4 +- .../Template/project_overview/description.php | 4 +- .../app/Template/project_overview/files.php | 8 +- .../app/Template/project_overview/images.php | 8 +- .../Template/project_overview/information.php | 6 +- .../app/Template/project_overview/show.php | 2 +- .../app/Template/project_permission/index.php | 18 +- .../app/Template/project_status/disable.php | 14 + .../app/Template/project_status/enable.php | 14 + .../app/Template/project_status/remove.php | 14 + sources/app/Template/project_tag/create.php | 16 + sources/app/Template/project_tag/edit.php | 17 + sources/app/Template/project_tag/index.php | 31 + sources/app/Template/project_tag/remove.php | 15 + sources/app/Template/project_user/sidebar.php | 30 - .../layout.php | 8 +- .../roles.php | 8 +- .../project_user_overview/sidebar.php | 30 + .../tasks.php | 6 +- .../tooltip_users.php | 12 +- .../app/Template/project_view/duplicate.php | 29 + .../integrations.php | 4 +- .../notifications.php | 6 +- sources/app/Template/project_view/share.php | 18 + .../{project => project_view}/show.php | 12 +- sources/app/Template/search/activity.php | 39 + sources/app/Template/search/index.php | 6 +- sources/app/Template/search/results.php | 8 +- sources/app/Template/subtask/create.php | 4 +- sources/app/Template/subtask/edit.php | 4 +- sources/app/Template/subtask/menu.php | 10 +- sources/app/Template/subtask/remove.php | 17 +- sources/app/Template/subtask/table.php | 6 +- .../app/Template/subtask_converter/show.php | 20 + .../{popover.php => show.php} | 6 +- sources/app/Template/swimlane/create.php | 4 +- sources/app/Template/swimlane/edit.php | 6 +- .../app/Template/swimlane/edit_default.php | 4 +- sources/app/Template/swimlane/index.php | 2 +- sources/app/Template/swimlane/remove.php | 6 +- sources/app/Template/swimlane/table.php | 18 +- sources/app/Template/tag/create.php | 16 + sources/app/Template/tag/edit.php | 17 + sources/app/Template/tag/index.php | 31 + sources/app/Template/tag/remove.php | 15 + sources/app/Template/task/analytics.php | 3 - sources/app/Template/task/color_picker.php | 11 - sources/app/Template/task/description.php | 26 +- sources/app/Template/task/details.php | 281 +- sources/app/Template/task/dropdown.php | 40 +- sources/app/Template/task/layout.php | 14 +- sources/app/Template/task/public.php | 7 +- sources/app/Template/task/remove.php | 15 - sources/app/Template/task/show.php | 7 +- sources/app/Template/task/sidebar.php | 62 +- .../Template/task/time_tracking_details.php | 6 +- sources/app/Template/task/transitions.php | 4 +- sources/app/Template/task_bulk/show.php | 24 + sources/app/Template/task_creation/form.php | 53 - sources/app/Template/task_creation/show.php | 49 + .../app/Template/task_duplication/copy.php | 8 +- .../Template/task_duplication/duplicate.php | 6 +- .../app/Template/task_duplication/move.php | 8 +- .../Template/task_external_link/create.php | 6 +- .../app/Template/task_external_link/edit.php | 6 +- .../app/Template/task_external_link/find.php | 6 +- .../Template/task_external_link/remove.php | 6 +- .../app/Template/task_external_link/table.php | 8 +- sources/app/Template/task_file/create.php | 8 +- sources/app/Template/task_file/files.php | 10 +- sources/app/Template/task_file/images.php | 10 +- sources/app/Template/task_file/remove.php | 6 +- sources/app/Template/task_file/screenshot.php | 6 +- .../project.php => task_gantt/show.php} | 12 +- .../app/Template/task_gantt_creation/show.php | 46 + .../task_import/{step1.php => show.php} | 4 +- sources/app/Template/task_import/sidebar.php | 9 + .../Template/task_internal_link/create.php | 8 +- .../app/Template/task_internal_link/edit.php | 8 +- .../Template/task_internal_link/remove.php | 6 +- .../app/Template/task_internal_link/table.php | 12 +- .../Template/{listing => task_list}/show.php | 10 +- .../task_modification/edit_description.php | 27 - .../Template/task_modification/edit_task.php | 35 - .../app/Template/task_modification/show.php | 44 + sources/app/Template/task_recurrence/edit.php | 10 +- sources/app/Template/task_recurrence/info.php | 10 +- sources/app/Template/task_status/close.php | 6 +- sources/app/Template/task_status/open.php | 6 +- .../app/Template/task_suppression/remove.php | 15 + sources/app/Template/twofactor/check.php | 4 +- sources/app/Template/twofactor/disable.php | 6 +- sources/app/Template/twofactor/index.php | 2 +- sources/app/Template/twofactor/show.php | 4 +- sources/app/Template/user/dropdown.php | 27 - sources/app/Template/user/layout.php | 19 - sources/app/Template/user/share.php | 18 - sources/app/Template/user/sidebar.php | 83 - .../local.php} | 32 +- .../remote.php} | 46 +- .../authentication.php | 7 +- .../{user => user_credential}/password.php | 11 +- sources/app/Template/user_import/show.php | 41 + sources/app/Template/user_import/step1.php | 46 - sources/app/Template/user_list/dropdown.php | 27 + .../{user/index.php => user_list/show.php} | 19 +- .../edit.php => user_modification/show.php} | 6 +- sources/app/Template/user_status/disable.php | 4 +- sources/app/Template/user_status/enable.php | 4 +- sources/app/Template/user_status/remove.php | 4 +- .../Template/{user => user_view}/external.php | 0 .../{user => user_view}/integrations.php | 2 +- .../app/Template/{user => user_view}/last.php | 0 sources/app/Template/user_view/layout.php | 19 + .../{user => user_view}/notifications.php | 6 +- .../{user => user_view}/password_reset.php | 0 .../Template/{user => user_view}/profile.php | 0 .../Template/{user => user_view}/sessions.php | 2 +- sources/app/Template/user_view/share.php | 15 + .../app/Template/{user => user_view}/show.php | 8 +- sources/app/Template/user_view/sidebar.php | 83 + .../{user => user_view}/timesheet.php | 6 +- .../app/User/Avatar/AvatarFileProvider.php | 2 +- sources/app/User/Avatar/GravatarProvider.php | 2 +- .../app/User/Avatar/LetterAvatarProvider.php | 8 +- sources/app/User/LdapUserProvider.php | 48 +- sources/app/User/ReverseProxyUserProvider.php | 21 +- sources/app/Validator/ActionValidator.php | 4 +- sources/app/Validator/AuthValidator.php | 8 +- .../Validator/{Base.php => BaseValidator.php} | 5 +- sources/app/Validator/CategoryValidator.php | 4 +- sources/app/Validator/ColumnValidator.php | 4 +- sources/app/Validator/CommentValidator.php | 4 +- sources/app/Validator/CurrencyValidator.php | 4 +- .../app/Validator/CustomFilterValidator.php | 4 +- .../app/Validator/ExternalLinkValidator.php | 4 +- sources/app/Validator/GroupValidator.php | 8 +- sources/app/Validator/LinkValidator.php | 10 +- .../app/Validator/PasswordResetValidator.php | 6 +- sources/app/Validator/ProjectValidator.php | 16 +- sources/app/Validator/SubtaskValidator.php | 4 +- sources/app/Validator/SwimlaneValidator.php | 4 +- sources/app/Validator/TagValidator.php | 76 + sources/app/Validator/TaskLinkValidator.php | 8 +- sources/app/Validator/TaskValidator.php | 81 +- sources/app/Validator/UserValidator.php | 8 +- sources/app/check_setup.php | 4 +- sources/app/common.php | 64 +- sources/app/constants.php | 48 +- sources/app/functions.php | 76 + sources/assets/css/app.css | 27 - sources/assets/css/app.min.css | 1 + sources/assets/css/chosen-sprite.png | Bin 0 -> 538 bytes sources/assets/css/chosen-sprite@2x.png | Bin 0 -> 738 bytes .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 180 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 178 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 120 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 105 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 111 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 110 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 101 bytes .../css/images/ui-icons_222222_256x240.png | Bin 6922 -> 4369 bytes .../css/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 4369 bytes .../css/images/ui-icons_444444_256x240.png | Bin 0 -> 6992 bytes .../css/images/ui-icons_454545_256x240.png | Bin 6992 -> 4369 bytes .../css/images/ui-icons_555555_256x240.png | Bin 0 -> 6988 bytes .../css/images/ui-icons_777620_256x240.png | Bin 0 -> 4549 bytes .../css/images/ui-icons_777777_256x240.png | Bin 0 -> 6999 bytes .../css/images/ui-icons_888888_256x240.png | Bin 6999 -> 4369 bytes .../css/images/ui-icons_cc0000_256x240.png | Bin 0 -> 4549 bytes .../css/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 4369 bytes .../css/images/ui-icons_ffffff_256x240.png | Bin 0 -> 6299 bytes sources/assets/css/print.css | 27 - sources/assets/css/print.min.css | 1 + sources/assets/css/src/board.css | 13 - sources/assets/css/src/form.css | 35 +- sources/assets/css/src/header.css | 6 +- sources/assets/css/src/sidebar.css | 24 +- sources/assets/css/src/task.css | 63 +- sources/assets/css/src/tooltip.css | 4 + sources/assets/css/vendor.min.css | 481 ++ sources/assets/css/vendor/c3.min.css | 1 - sources/assets/css/vendor/chosen.min.css | 3 - .../assets/css/vendor/font-awesome.min.css | 4 - .../assets/css/vendor/fullcalendar.min.css | 5 - .../vendor/jquery-ui-timepicker-addon.min.css | 5 - sources/assets/css/vendor/jquery-ui.min.css | 7 - .../assets/css/vendor/jquery-ui.theme.min.css | 5 - sources/assets/css/vendor/simplemde.min.css | 7 - sources/assets/fonts/FontAwesome.otf | Bin 109688 -> 124988 bytes sources/assets/fonts/fontawesome-webfont.eot | Bin 70807 -> 76518 bytes sources/assets/fonts/fontawesome-webfont.svg | 58 +- sources/assets/fonts/fontawesome-webfont.ttf | Bin 142072 -> 152796 bytes sources/assets/fonts/fontawesome-webfont.woff | Bin 83588 -> 90412 bytes .../assets/fonts/fontawesome-webfont.woff2 | Bin 66624 -> 71896 bytes sources/assets/img/chosen-sprite.png | Bin 646 -> 0 bytes sources/assets/img/chosen-sprite@2x.png | Bin 872 -> 0 bytes sources/assets/js/app.js | 67 - sources/assets/js/app.min.js | 2 + sources/assets/js/src/App.js | 36 +- sources/assets/js/src/BoardDragAndDrop.js | 2 +- .../js/src/{bootstrap.js => Bootstrap.js} | 0 sources/assets/js/src/Gantt.js | 40 +- sources/assets/js/src/Popover.js | 22 +- sources/assets/js/src/Search.js | 10 +- sources/assets/js/src/Task.js | 28 +- sources/assets/js/vendor.min.js | 4244 +++++++++++++++++ sources/assets/js/vendor/c3.min.js | 5 - sources/assets/js/vendor/chosen.jquery.min.js | 2 - sources/assets/js/vendor/d3.v3.min.js | 5 - sources/assets/js/vendor/fullcalendar.min.js | 9 - sources/assets/js/vendor/jquery-1.11.3.min.js | 5 - .../vendor/jquery-ui-timepicker-addon.min.js | 5 - sources/assets/js/vendor/jquery-ui.min.js | 10 - .../js/vendor/jquery.ui.touch-punch.min.js | 11 - sources/assets/js/vendor/lang/ar-ma.js | 1 - sources/assets/js/vendor/lang/ar-sa.js | 1 - sources/assets/js/vendor/lang/ar-tn.js | 1 - sources/assets/js/vendor/lang/ar.js | 1 - sources/assets/js/vendor/lang/bg.js | 1 - sources/assets/js/vendor/lang/ca.js | 1 - sources/assets/js/vendor/lang/cs.js | 1 - sources/assets/js/vendor/lang/da.js | 1 - sources/assets/js/vendor/lang/de-at.js | 1 - sources/assets/js/vendor/lang/de.js | 1 - sources/assets/js/vendor/lang/el.js | 1 - sources/assets/js/vendor/lang/en-au.js | 1 - sources/assets/js/vendor/lang/en-ca.js | 1 - sources/assets/js/vendor/lang/en-gb.js | 1 - sources/assets/js/vendor/lang/es.js | 1 - sources/assets/js/vendor/lang/fa.js | 1 - sources/assets/js/vendor/lang/fi.js | 1 - sources/assets/js/vendor/lang/fr-ca.js | 1 - sources/assets/js/vendor/lang/fr.js | 1 - sources/assets/js/vendor/lang/he.js | 1 - sources/assets/js/vendor/lang/hi.js | 1 - sources/assets/js/vendor/lang/hr.js | 1 - sources/assets/js/vendor/lang/hu.js | 1 - sources/assets/js/vendor/lang/id.js | 1 - sources/assets/js/vendor/lang/is.js | 1 - sources/assets/js/vendor/lang/it.js | 1 - sources/assets/js/vendor/lang/ja.js | 1 - sources/assets/js/vendor/lang/ko.js | 1 - sources/assets/js/vendor/lang/lt.js | 1 - sources/assets/js/vendor/lang/lv.js | 1 - sources/assets/js/vendor/lang/nb.js | 1 - sources/assets/js/vendor/lang/nl.js | 1 - sources/assets/js/vendor/lang/pl.js | 1 - sources/assets/js/vendor/lang/pt-br.js | 1 - sources/assets/js/vendor/lang/pt.js | 1 - sources/assets/js/vendor/lang/ro.js | 1 - sources/assets/js/vendor/lang/ru.js | 1 - sources/assets/js/vendor/lang/sk.js | 1 - sources/assets/js/vendor/lang/sl.js | 1 - sources/assets/js/vendor/lang/sr-cyrl.js | 1 - sources/assets/js/vendor/lang/sr.js | 1 - sources/assets/js/vendor/lang/sv.js | 1 - sources/assets/js/vendor/lang/th.js | 1 - sources/assets/js/vendor/lang/tr.js | 1 - sources/assets/js/vendor/lang/uk.js | 1 - sources/assets/js/vendor/lang/vi.js | 1 - sources/assets/js/vendor/lang/zh-cn.js | 1 - sources/assets/js/vendor/lang/zh-tw.js | 1 - sources/assets/js/vendor/moment.min.js | 7 - .../js/vendor/mousetrap-global-bind.min.js | 1 - sources/assets/js/vendor/mousetrap.min.js | 9 - sources/assets/js/vendor/simplemde.min.js | 14 - sources/config.default.php | 34 +- sources/data/web.config | 6 + sources/doc/2fa.markdown | 4 +- sources/doc/analytics-tasks.markdown | 4 +- sources/doc/analytics.markdown | 12 +- sources/doc/api-authentication.markdown | 53 +- ...api-external-task-link-procedures.markdown | 221 + .../doc/api-group-member-procedures.markdown | 36 + ...api-internal-task-link-procedures.markdown | 187 + sources/doc/api-json-rpc.markdown | 18 +- sources/doc/api-link-procedures.markdown | 185 - .../doc/api-project-file-procedures.markdown | 221 + ...api-project-permission-procedures.markdown | 33 + sources/doc/api-project-procedures.markdown | 59 +- ...-subtask-time-tracking-procedures.markdown | 102 + ...down => api-task-file-procedures.markdown} | 4 +- sources/doc/api-task-procedures.markdown | 61 + .../doc/application-configuration.markdown | 2 +- sources/doc/assets.markdown | 44 +- sources/doc/board-configuration.markdown | 2 +- sources/doc/board-show-hide-columns.markdown | 2 +- sources/doc/calendar-configuration.markdown | 2 +- sources/doc/calendar.markdown | 2 +- sources/doc/centos-installation.markdown | 6 +- sources/doc/cli.markdown | 56 + sources/doc/closing-tasks.markdown | 4 +- sources/doc/config.markdown | 66 +- sources/doc/contributing.markdown | 2 +- sources/doc/creating-tasks.markdown | 23 +- sources/doc/currency-rate.markdown | 4 +- sources/doc/custom-filters.markdown | 4 +- sources/doc/debian-installation.markdown | 6 +- sources/doc/docker.markdown | 14 +- sources/doc/duplicate-move-tasks.markdown | 4 +- sources/doc/email-configuration.markdown | 2 +- sources/doc/env.markdown | 4 +- .../doc/es_ES/calendar-configuration.markdown | 43 + .../doc/es_ES/email-configuration.markdown | 115 + .../es_ES/kanban-vs-todo-and-scrum.markdown | 38 + sources/doc/faq.markdown | 20 + sources/doc/{fr => fr_FR}/2fa.markdown | 2 +- .../{fr => fr_FR}/analytics-tasks.markdown | 4 +- sources/doc/{fr => fr_FR}/analytics.markdown | 12 +- .../application-configuration.markdown | 2 +- .../application-configuration.markup | 4 +- .../{fr => fr_FR}/automatic-actions.markdown | 0 .../board-collapsed-expanded.markdown | 0 .../board-configuration.markdown | 2 +- ...zontal-scrolling-and-compact-view.markdown | 0 .../board-show-hide-columns.markdown | 0 .../calendar-configuration.markdown | 2 +- sources/doc/{fr => fr_FR}/calendar.markdown | 2 +- .../doc/{fr => fr_FR}/closing-tasks.markdown | 4 +- .../create-tasks-by-email.markdown | 6 +- .../{fr => fr_FR}/creating-projects.markdown | 0 .../doc/{fr => fr_FR}/creating-tasks.markdown | 14 +- .../doc/{fr => fr_FR}/currency-rate.markdown | 2 +- .../duplicate-move-tasks.markdown | 4 +- .../{fr => fr_FR}/editing-projects.markdown | 0 .../gantt-chart-projects.markdown | 2 +- .../{fr => fr_FR}/gantt-chart-tasks.markdown | 4 +- sources/doc/{fr => fr_FR}/index.markdown | 1 + .../kanban-vs-todo-and-scrum.markdown | 0 .../{fr => fr_FR}/keyboard-shortcuts.markdown | 0 .../doc/{fr => fr_FR}/link-labels.markdown | 4 +- .../doc/{fr => fr_FR}/notifications.markdown | 6 +- .../project-configuration.markdown | 4 +- .../project-permissions.markdown | 0 .../doc/{fr => fr_FR}/project-types.markdown | 0 .../doc/{fr => fr_FR}/project-views.markdown | 0 .../{fr => fr_FR}/recurring-tasks.markdown | 2 +- sources/doc/fr_FR/removing-projects.markdown | 10 + sources/doc/{fr => fr_FR}/roles.markdown | 0 .../doc/{fr => fr_FR}/screenshots.markdown | 4 +- .../screenshots/automatic-action-creation.png | Bin .../screenshots/board-collapsed-mode.png | Bin .../screenshots/board-compact-mode.png | Bin .../screenshots/board-expanded-mode.png | Bin .../screenshots/board-task-limit.png | Bin .../{fr => fr_FR}/screenshots/board-view.png | Bin .../screenshots/calendar-view.png | Bin .../{fr => fr_FR}/screenshots/gantt-view.png | Bin .../{fr => fr_FR}/screenshots/hide-column.png | Bin .../{fr => fr_FR}/screenshots/list-view.png | Bin .../{fr => fr_FR}/screenshots/new-project.png | Bin .../{fr => fr_FR}/screenshots/new-user.png | Bin .../screenshots/project-disable-sharing.png | Bin .../screenshots/project-edition.png | Bin .../screenshots/project-enable-sharing.png | Bin .../screenshots/project-permissions.png | Bin .../screenshots/project-view.png | Bin .../{fr => fr_FR}/screenshots/show-column.png | Bin .../screenshots/swimlane-configuration.png | Bin .../{fr => fr_FR}/screenshots/swimlanes.png | Bin .../fr_FR/screenshots/task-creation-board.png | Bin 0 -> 3915 bytes .../fr_FR/screenshots/task-creation-form.png | Bin 0 -> 42123 bytes .../{fr => fr_FR}/sharing-projects.markdown | 0 sources/doc/{fr => fr_FR}/subtasks.markdown | 8 +- sources/doc/{fr => fr_FR}/swimlanes.markdown | 0 sources/doc/{fr => fr_FR}/task-links.markdown | 2 +- .../doc/{fr => fr_FR}/time-tracking.markdown | 8 +- .../doc/{fr => fr_FR}/transitions.markdown | 4 +- .../doc/{fr => fr_FR}/usage-examples.markdown | 0 .../{fr => fr_FR}/user-management.markdown | 0 .../doc/{fr => fr_FR}/what-is-kanban.markdown | 0 sources/doc/gantt-chart-projects.markdown | 2 +- sources/doc/gantt-chart-tasks.markdown | 4 +- sources/doc/heroku.markdown | 2 +- sources/doc/ical.markdown | 14 +- sources/doc/index.markdown | 8 + sources/doc/installation.markdown | 34 +- sources/doc/ldap-authentication.markdown | 4 +- .../doc/ldap-configuration-examples.markdown | 221 + sources/doc/ldap-group-sync.markdown | 28 +- sources/doc/ldap-parameters.markdown | 3 + sources/doc/ldap-profile-picture.markdown | 27 + sources/doc/link-labels.markdown | 4 +- sources/doc/mysql-configuration.markdown | 25 +- sources/doc/nice-urls.markdown | 18 +- sources/doc/nitrous.markdown | 10 + sources/doc/notifications.markdown | 6 +- sources/doc/performances.markdown | 39 + sources/doc/plugin-directory.markdown | 15 + sources/doc/plugin-hooks.markdown | 29 +- sources/doc/plugin-metadata.markdown | 18 +- sources/doc/plugin-notifications.markdown | 6 +- sources/doc/plugin-registration.markdown | 49 +- sources/doc/project-configuration.markdown | 4 +- sources/doc/project-views.markdown | 2 +- sources/doc/recurring-tasks.markdown | 2 +- sources/doc/removing-projects.markdown | 10 + sources/doc/requirements.markdown | 31 +- sources/doc/rss.markdown | 4 +- sources/doc/screenshots.markdown | 4 +- sources/doc/screenshots/project-remove.png | Bin 0 -> 4330 bytes sources/doc/screenshots/tags-board.png | Bin 0 -> 7405 bytes sources/doc/screenshots/tags-global.png | Bin 0 -> 9617 bytes sources/doc/screenshots/tags-projects.png | Bin 0 -> 13718 bytes sources/doc/screenshots/tags-search.png | Bin 0 -> 3904 bytes sources/doc/screenshots/tags-task.png | Bin 0 -> 4766 bytes .../doc/screenshots/task-creation-board.png | Bin 0 -> 10242 bytes .../doc/screenshots/task-creation-form.png | Bin 0 -> 34726 bytes sources/doc/search.markdown | 107 +- sources/doc/subtasks.markdown | 8 +- sources/doc/suse-installation.markdown | 2 +- sources/doc/syntax-guide.markdown | 8 +- sources/doc/tags.markdown | 28 + sources/doc/task-links.markdown | 2 +- sources/doc/tests.markdown | 62 +- sources/doc/time-tracking.markdown | 8 +- sources/doc/transitions.markdown | 4 +- sources/doc/translations.markdown | 2 +- sources/doc/ubuntu-installation.markdown | 6 +- sources/doc/update.markdown | 5 +- sources/doc/webhooks.markdown | 33 - sources/doc/windows-iis-installation.markdown | 40 +- sources/doc/worker.markdown | 35 + sources/index.php | 4 + sources/jsonrpc.php | 46 +- sources/kanboard | 35 +- sources/vendor/autoload.php | 2 +- .../christian-riesen/base32/src/Base32.php | 8 +- .../otp/src/Otp/GoogleAuthenticator.php | 84 +- sources/vendor/composer/ClassLoader.php | 8 +- sources/vendor/composer/LICENSE | 2 +- sources/vendor/composer/autoload_classmap.php | 526 +- sources/vendor/composer/autoload_files.php | 12 +- sources/vendor/composer/autoload_psr4.php | 2 +- sources/vendor/composer/autoload_real.php | 53 +- sources/vendor/composer/autoload_static.php | 850 ++++ sources/vendor/composer/installed.json | 222 +- sources/vendor/eluceo/ical/.php_cs | 26 + sources/vendor/eluceo/ical/CHANGELOG.md | 31 + sources/vendor/eluceo/ical/UPGRADE.md | 7 +- .../vendor/eluceo/ical/examples/example7.php | 33 + sources/vendor/eluceo/ical/phpunit.xml.dist | 21 + .../eluceo/ical/src/Eluceo/iCal/Component.php | 78 +- .../ical/src/Eluceo/iCal/Component/Alarm.php | 8 +- .../src/Eluceo/iCal/Component/Calendar.php | 43 +- .../ical/src/Eluceo/iCal/Component/Event.php | 135 +- .../src/Eluceo/iCal/Component/Timezone.php | 4 +- .../Eluceo/iCal/Component/TimezoneRule.php | 18 +- .../ical/src/Eluceo/iCal/ParameterBag.php | 9 + .../eluceo/ical/src/Eluceo/iCal/Property.php | 11 +- .../src/Eluceo/iCal/Property/ArrayValue.php | 9 + .../Eluceo/iCal/Property/DateTimeProperty.php | 66 +- .../iCal/Property/DateTimesProperty.php | 41 + .../Eluceo/iCal/Property/Event/Attendees.php | 15 +- .../iCal/Property/Event/Description.php | 66 + .../Eluceo/iCal/Property/Event/Organizer.php | 26 +- .../iCal/Property/Event/RecurrenceId.php | 130 + .../iCal/Property/Event/RecurrenceRule.php | 42 +- .../src/Eluceo/iCal/Property/StringValue.php | 9 + .../Eluceo/iCal/Property/ValueInterface.php | 9 + .../ical/src/Eluceo/iCal/PropertyBag.php | 5 +- .../src/Eluceo/iCal/Util/ComponentUtil.php | 10 +- .../ical/src/Eluceo/iCal/Util/DateUtil.php | 69 + .../Eluceo/iCal/Util/PropertyValueUtil.php | 33 +- .../src/JsonRPC/AccessDeniedException.php | 7 - .../fguillot/json-rpc/src/JsonRPC/Client.php | 380 +- .../Exception/AccessDeniedException.php | 15 + .../AuthenticationFailureException.php | 15 + .../Exception/ConnectionFailureException.php | 15 + .../Exception/InvalidJsonFormatException.php | 15 + .../InvalidJsonRpcFormatException.php | 15 + .../ResponseEncodingFailureException.php | 15 + .../{ => Exception}/ResponseException.php | 7 +- .../Exception/ServerErrorException.php | 15 + .../json-rpc/src/JsonRPC/HttpClient.php | 365 ++ .../src/JsonRPC/MiddlewareHandler.php | 114 + .../src/JsonRPC/MiddlewareInterface.php | 27 + .../json-rpc/src/JsonRPC/ProcedureHandler.php | 264 + .../JsonRPC/Request/BatchRequestParser.php | 55 + .../src/JsonRPC/Request/RequestBuilder.php | 129 + .../src/JsonRPC/Request/RequestParser.php | 200 + .../src/JsonRPC/Response/ResponseBuilder.php | 324 ++ .../src/JsonRPC/Response/ResponseParser.php | 154 + .../fguillot/json-rpc/src/JsonRPC/Server.php | 660 +-- .../src/JsonRPC/Validator/HostValidator.php | 30 + .../Validator/JsonEncodingValidator.php | 44 + .../JsonRPC/Validator/JsonFormatValidator.php | 30 + .../JsonRPC/Validator/RpcFormatValidator.php | 35 + .../src/JsonRPC/Validator/UserValidator.php | 21 + .../picodb/lib/PicoDb/Builder/BaseBuilder.php | 86 + .../ConditionBuilder.php} | 24 +- .../lib/PicoDb/Builder/InsertBuilder.php | 36 + .../lib/PicoDb/Builder/UpdateBuilder.php | 56 + .../fguillot/picodb/lib/PicoDb/Database.php | 198 +- .../picodb/lib/PicoDb/Driver/Base.php | 9 +- .../picodb/lib/PicoDb/Driver/Mssql.php | 1 + .../picodb/lib/PicoDb/Driver/Mysql.php | 54 +- .../picodb/lib/PicoDb/Driver/Postgres.php | 5 +- .../picodb/lib/PicoDb/Driver/Sqlite.php | 7 +- .../picodb/lib/PicoDb/DriverFactory.php | 45 + .../fguillot/picodb/lib/PicoDb/Hashtable.php | 13 +- .../picodb/lib/PicoDb/LargeObject.php | 167 + .../picodb/lib/PicoDb/SQLException.php | 3 +- .../fguillot/picodb/lib/PicoDb/Schema.php | 37 +- .../picodb/lib/PicoDb/StatementHandler.php | 353 ++ .../fguillot/picodb/lib/PicoDb/Table.php | 198 +- .../fguillot/picodb/lib/PicoDb/UrlParser.php | 93 + sources/vendor/fguillot/simple-queue/LICENSE | 21 + .../src/Adapter/AmqpQueueAdapter.php | 138 + .../src/Adapter/AwsSqsQueueAdapter.php | 150 + .../src/Adapter/BeanstalkQueueAdapter.php | 120 + .../src/Adapter/DisqueQueueAdapter.php | 109 + .../src/Adapter/MemoryQueueAdapter.php | 100 + .../src/Exception/NotSupportedException.php | 14 + .../vendor/fguillot/simple-queue/src/Job.php | 98 + .../fguillot/simple-queue/src/Queue.php | 92 + .../src/QueueAdapterInterface.php | 58 + .../SimpleValidator/Validators/NotEmpty.php | 15 + .../simpleLogger/src/SimpleLogger/Base.php | 13 + .../simpleLogger/src/SimpleLogger/File.php | 12 +- .../simpleLogger/src/SimpleLogger/Logger.php | 8 +- .../simpleLogger/src/SimpleLogger/Stderr.php | 25 + .../simpleLogger/src/SimpleLogger/Stdout.php | 25 + .../simpleLogger/src/SimpleLogger/Syslog.php | 15 +- .../paragonie/random_compat/CHANGELOG.md | 6 + .../random_compat/lib/byte_safe_strings.php | 8 + .../paragonie/random_compat/lib/random.php | 6 +- .../vendor/swiftmailer/swiftmailer/CHANGES | 15 + .../vendor/swiftmailer/swiftmailer/LICENSE | 2 +- sources/vendor/swiftmailer/swiftmailer/README | 1 - .../vendor/swiftmailer/swiftmailer/VERSION | 2 +- .../AbstractFilterableInputStream.php | 2 + .../Swift/ByteStream/ArrayByteStream.php | 4 +- .../Swift/ByteStream/FileByteStream.php | 4 +- .../GenericFixedWidthReader.php | 2 +- .../Swift/CharacterReader/UsAsciiReader.php | 4 +- .../Swift/CharacterReader/Utf8Reader.php | 5 +- .../CharacterStream/NgCharacterStream.php | 12 +- .../lib/classes/Swift/DependencyContainer.php | 8 +- .../lib/classes/Swift/Encoder/QpEncoder.php | 15 +- .../lib/classes/Swift/FileSpool.php | 4 +- .../classes/Swift/KeyCache/DiskKeyCache.php | 5 +- .../swiftmailer/lib/classes/Swift/Mailer.php | 2 +- .../lib/classes/Swift/MemorySpool.php | 30 +- .../lib/classes/Swift/Mime/Attachment.php | 8 +- .../Mime/ContentEncoder/QpContentEncoder.php | 15 +- .../ContentEncoder/QpContentEncoderProxy.php | 1 + .../lib/classes/Swift/Mime/Grammar.php | 8 +- .../Mime/Headers/ParameterizedHeader.php | 4 +- .../lib/classes/Swift/Mime/MimePart.php | 6 +- .../Swift/Mime/SimpleHeaderFactory.php | 7 +- .../classes/Swift/Mime/SimpleHeaderSet.php | 15 +- .../lib/classes/Swift/Mime/SimpleMessage.php | 2 +- .../classes/Swift/Mime/SimpleMimeEntity.php | 70 +- .../classes/Swift/Plugins/DecoratorPlugin.php | 7 +- .../classes/Swift/Plugins/ReporterPlugin.php | 18 +- .../classes/Swift/Plugins/ThrottlerPlugin.php | 4 +- .../lib/classes/Swift/Signers/DKIMSigner.php | 24 +- .../classes/Swift/Signers/DomainKeySigner.php | 22 +- .../classes/Swift/Signers/OpenDKIMSigner.php | 17 +- .../lib/classes/Swift/Signers/SMimeSigner.php | 9 +- .../Swift/Transport/AbstractSmtpTransport.php | 18 +- .../Esmtp/Auth/NTLMAuthenticator.php | 4 +- .../Swift/Transport/Esmtp/AuthHandler.php | 2 +- .../Swift/Transport/EsmtpTransport.php | 29 +- .../Swift/Transport/FailoverTransport.php | 11 +- .../Swift/Transport/LoadBalancedTransport.php | 19 +- .../classes/Swift/Transport/MailTransport.php | 22 +- .../Swift/Transport/SendmailTransport.php | 1 + .../Swift/Transport/SimpleMailInvoker.php | 4 +- .../classes/Swift/Transport/StreamBuffer.php | 6 +- .../swiftmailer/swiftmailer/phpunit.xml.dist | 2 +- .../symfony/console/Command/Command.php | 9 +- .../vendor/symfony/console/Helper/Helper.php | 30 +- .../symfony/console/Helper/ProgressBar.php | 38 +- .../console/Helper/ProgressIndicator.php | 10 +- .../vendor/symfony/console/Helper/Table.php | 39 +- .../symfony/console/Output/StreamOutput.php | 10 +- .../symfony/console/Style/SymfonyStyle.php | 43 +- .../symfony/console/Tests/ApplicationTest.php | 27 + .../console/Tests/Command/CommandTest.php | 10 + .../Style/SymfonyStyle/command/command_10.php | 17 + .../Style/SymfonyStyle/command/command_11.php | 13 + .../Style/SymfonyStyle/command/command_8.php | 26 + .../Style/SymfonyStyle/command/command_9.php | 11 + .../Style/SymfonyStyle/output/output_10.txt | 7 + .../Style/SymfonyStyle/output/output_11.txt | 6 + .../Style/SymfonyStyle/output/output_5.txt | 7 +- .../Style/SymfonyStyle/output/output_8.txt | 9 + .../Style/SymfonyStyle/output/output_9.txt | 5 + .../console/Tests/Helper/HelperTest.php | 54 + .../console/Tests/Helper/ProgressBarTest.php | 18 +- .../console/Tests/Helper/TableTest.php | 74 +- .../console/Tests/Style/SymfonyStyleTest.php | 2 +- .../ContainerAwareEventDispatcher.php | 10 - .../Debug/TraceableEventDispatcher.php | 43 +- .../event-dispatcher/EventDispatcher.php | 27 +- .../symfony/event-dispatcher/GenericEvent.php | 8 +- .../ImmutableEventDispatcher.php | 8 - .../Tests/AbstractEventDispatcherTest.php | 14 - .../ContainerAwareEventDispatcherTest.php | 4 - .../Debug/TraceableEventDispatcherTest.php | 41 +- .../symfony/polyfill-mbstring/Mbstring.php | 4 +- .../Resources/unidata/lowerCase.php | 1101 +++++ .../Resources/unidata/lowerCase.ser | 1 - .../Resources/unidata/upperCase.php | 1109 +++++ .../Resources/unidata/upperCase.ser | 1 - sources/web.config | 15 +- 1229 files changed, 39417 insertions(+), 16044 deletions(-) create mode 100644 sources/.htaccess create mode 100644 sources/app/Action/TaskAssignColorPriority.php create mode 100644 sources/app/Api/Authorization/ActionAuthorization.php create mode 100644 sources/app/Api/Authorization/CategoryAuthorization.php create mode 100644 sources/app/Api/Authorization/ColumnAuthorization.php create mode 100644 sources/app/Api/Authorization/CommentAuthorization.php create mode 100644 sources/app/Api/Authorization/ProcedureAuthorization.php create mode 100644 sources/app/Api/Authorization/ProjectAuthorization.php create mode 100644 sources/app/Api/Authorization/SubtaskAuthorization.php create mode 100644 sources/app/Api/Authorization/TaskAuthorization.php create mode 100644 sources/app/Api/Authorization/TaskFileAuthorization.php create mode 100644 sources/app/Api/Authorization/TaskLinkAuthorization.php create mode 100644 sources/app/Api/Authorization/UserAuthorization.php delete mode 100644 sources/app/Api/Base.php delete mode 100644 sources/app/Api/Board.php delete mode 100644 sources/app/Api/Category.php delete mode 100644 sources/app/Api/Column.php delete mode 100644 sources/app/Api/Comment.php delete mode 100644 sources/app/Api/File.php delete mode 100644 sources/app/Api/GroupMember.php delete mode 100644 sources/app/Api/Me.php rename sources/app/Api/{Auth.php => Middleware/AuthenticationMiddleware.php} (51%) rename sources/app/Api/{Action.php => Procedure/ActionProcedure.php} (70%) rename sources/app/Api/{App.php => Procedure/AppProcedure.php} (63%) create mode 100644 sources/app/Api/Procedure/BaseProcedure.php create mode 100644 sources/app/Api/Procedure/BoardProcedure.php create mode 100644 sources/app/Api/Procedure/CategoryProcedure.php create mode 100644 sources/app/Api/Procedure/ColumnProcedure.php create mode 100644 sources/app/Api/Procedure/CommentProcedure.php create mode 100644 sources/app/Api/Procedure/GroupMemberProcedure.php rename sources/app/Api/{Group.php => Procedure/GroupProcedure.php} (64%) rename sources/app/Api/{Link.php => Procedure/LinkProcedure.php} (78%) create mode 100644 sources/app/Api/Procedure/MeProcedure.php create mode 100644 sources/app/Api/Procedure/ProjectFileProcedure.php create mode 100644 sources/app/Api/Procedure/ProjectPermissionProcedure.php create mode 100644 sources/app/Api/Procedure/ProjectProcedure.php rename sources/app/Api/{Subtask.php => Procedure/SubtaskProcedure.php} (55%) create mode 100644 sources/app/Api/Procedure/SubtaskTimeTrackingProcedure.php create mode 100644 sources/app/Api/Procedure/SwimlaneProcedure.php create mode 100644 sources/app/Api/Procedure/TaskExternalLinkProcedure.php create mode 100644 sources/app/Api/Procedure/TaskFileProcedure.php rename sources/app/Api/{TaskLink.php => Procedure/TaskLinkProcedure.php} (56%) rename sources/app/Api/{Task.php => Procedure/TaskProcedure.php} (51%) rename sources/app/Api/{User.php => Procedure/UserProcedure.php} (79%) delete mode 100644 sources/app/Api/Project.php delete mode 100644 sources/app/Api/ProjectPermission.php delete mode 100644 sources/app/Api/Swimlane.php delete mode 100644 sources/app/Console/Base.php create mode 100644 sources/app/Console/BaseCommand.php rename sources/app/Console/{Cronjob.php => CronjobCommand.php} (95%) rename sources/app/Console/{LocaleComparator.php => LocaleComparatorCommand.php} (97%) rename sources/app/Console/{LocaleSync.php => LocaleSyncCommand.php} (97%) create mode 100644 sources/app/Console/PluginInstallCommand.php create mode 100644 sources/app/Console/PluginUninstallCommand.php create mode 100644 sources/app/Console/PluginUpgradeCommand.php rename sources/app/Console/{ProjectDailyColumnStatsExport.php => ProjectDailyColumnStatsExportCommand.php} (88%) rename sources/app/Console/{ProjectDailyStatsCalculation.php => ProjectDailyStatsCalculationCommand.php} (60%) create mode 100644 sources/app/Console/ResetPasswordCommand.php create mode 100644 sources/app/Console/ResetTwoFactorCommand.php rename sources/app/Console/{SubtaskExport.php => SubtaskExportCommand.php} (95%) rename sources/app/Console/{TaskExport.php => TaskExportCommand.php} (95%) delete mode 100644 sources/app/Console/TaskOverdueNotification.php create mode 100644 sources/app/Console/TaskOverdueNotificationCommand.php rename sources/app/Console/{TaskTrigger.php => TaskTriggerCommand.php} (79%) rename sources/app/Console/{TransitionExport.php => TransitionExportCommand.php} (95%) create mode 100644 sources/app/Console/WorkerCommand.php rename sources/app/Controller/{Action.php => ActionController.php} (60%) rename sources/app/Controller/{ActionCreation.php => ActionCreationController.php} (73%) rename sources/app/Controller/{Activity.php => ActivityController.php} (68%) rename sources/app/Controller/{Analytic.php => AnalyticController.php} (83%) create mode 100644 sources/app/Controller/AppController.php rename sources/app/Controller/{Auth.php => AuthController.php} (61%) rename sources/app/Controller/{AvatarFile.php => AvatarFileController.php} (74%) delete mode 100644 sources/app/Controller/Base.php create mode 100644 sources/app/Controller/BaseController.php delete mode 100644 sources/app/Controller/Board.php create mode 100644 sources/app/Controller/BoardAjaxController.php delete mode 100644 sources/app/Controller/BoardPopover.php create mode 100644 sources/app/Controller/BoardPopoverController.php rename sources/app/Controller/{BoardTooltip.php => BoardTooltipController.php} (73%) create mode 100644 sources/app/Controller/BoardViewController.php rename sources/app/Controller/{Calendar.php => CalendarController.php} (50%) rename sources/app/Controller/{Captcha.php => CaptchaController.php} (74%) rename sources/app/Controller/{Category.php => CategoryController.php} (68%) rename sources/app/Controller/{Column.php => ColumnController.php} (70%) rename sources/app/Controller/{Comment.php => CommentController.php} (70%) rename sources/app/Controller/{Config.php => ConfigController.php} (59%) rename sources/app/Controller/{Currency.php => CurrencyController.php} (66%) rename sources/app/Controller/{Customfilter.php => CustomFilterController.php} (66%) rename sources/app/Controller/{App.php => DashboardController.php} (74%) delete mode 100644 sources/app/Controller/Doc.php create mode 100644 sources/app/Controller/DocumentationController.php rename sources/app/Controller/{Export.php => ExportController.php} (51%) rename sources/app/Controller/{Feed.php => FeedController.php} (56%) rename sources/app/Controller/{FileViewer.php => FileViewerController.php} (61%) delete mode 100644 sources/app/Controller/Gantt.php delete mode 100644 sources/app/Controller/Group.php create mode 100644 sources/app/Controller/GroupAjaxController.php create mode 100644 sources/app/Controller/GroupCreationController.php delete mode 100644 sources/app/Controller/GroupHelper.php create mode 100644 sources/app/Controller/GroupListController.php create mode 100644 sources/app/Controller/GroupModificationController.php create mode 100644 sources/app/Controller/ICalendarController.php delete mode 100644 sources/app/Controller/Ical.php rename sources/app/Controller/{Link.php => LinkController.php} (70%) rename sources/app/Controller/{Oauth.php => OAuthController.php} (86%) rename sources/app/Controller/{PasswordReset.php => PasswordResetController.php} (62%) create mode 100644 sources/app/Controller/PluginController.php delete mode 100644 sources/app/Controller/Project.php rename sources/app/Controller/{ActionProject.php => ProjectActionDuplicationController.php} (55%) rename sources/app/Controller/{ProjectCreation.php => ProjectCreationController.php} (81%) rename sources/app/Controller/{ProjectEdit.php => ProjectEditController.php} (78%) rename sources/app/Controller/{ProjectFile.php => ProjectFileController.php} (72%) create mode 100644 sources/app/Controller/ProjectGanttController.php create mode 100644 sources/app/Controller/ProjectListController.php rename sources/app/Controller/{ProjectOverview.php => ProjectOverviewController.php} (53%) rename sources/app/Controller/{ProjectPermission.php => ProjectPermissionController.php} (71%) create mode 100644 sources/app/Controller/ProjectStatusController.php create mode 100644 sources/app/Controller/ProjectTagController.php rename sources/app/Controller/{Projectuser.php => ProjectUserOverviewController.php} (72%) create mode 100644 sources/app/Controller/ProjectViewController.php delete mode 100644 sources/app/Controller/Search.php create mode 100644 sources/app/Controller/SearchController.php rename sources/app/Controller/{Subtask.php => SubtaskController.php} (67%) create mode 100644 sources/app/Controller/SubtaskConverterController.php rename sources/app/Controller/{SubtaskRestriction.php => SubtaskRestrictionController.php} (66%) rename sources/app/Controller/{SubtaskStatus.php => SubtaskStatusController.php} (73%) rename sources/app/Controller/{Swimlane.php => SwimlaneController.php} (66%) create mode 100644 sources/app/Controller/TagController.php delete mode 100644 sources/app/Controller/Task.php create mode 100644 sources/app/Controller/TaskAjaxController.php create mode 100644 sources/app/Controller/TaskBulkController.php rename sources/app/Controller/{Taskcreation.php => TaskCreationController.php} (67%) rename sources/app/Controller/{Taskduplication.php => TaskDuplicationController.php} (65%) rename sources/app/Controller/{TaskExternalLink.php => TaskExternalLinkController.php} (71%) rename sources/app/Controller/{TaskFile.php => TaskFileController.php} (60%) create mode 100644 sources/app/Controller/TaskGanttController.php create mode 100644 sources/app/Controller/TaskGanttCreationController.php delete mode 100644 sources/app/Controller/TaskHelper.php delete mode 100644 sources/app/Controller/TaskImport.php create mode 100644 sources/app/Controller/TaskImportController.php rename sources/app/Controller/{TaskInternalLink.php => TaskInternalLinkController.php} (65%) rename sources/app/Controller/{Listing.php => TaskListController.php} (57%) create mode 100644 sources/app/Controller/TaskModificationController.php create mode 100644 sources/app/Controller/TaskPopoverController.php rename sources/app/Controller/{TaskRecurrence.php => TaskRecurrenceController.php} (53%) rename sources/app/Controller/{Taskstatus.php => TaskStatusController.php} (79%) create mode 100644 sources/app/Controller/TaskSuppressionController.php create mode 100644 sources/app/Controller/TaskViewController.php delete mode 100644 sources/app/Controller/Taskmodification.php rename sources/app/Controller/{Twofactor.php => TwoFactorController.php} (81%) delete mode 100644 sources/app/Controller/User.php create mode 100644 sources/app/Controller/UserAjaxController.php create mode 100644 sources/app/Controller/UserCreationController.php create mode 100644 sources/app/Controller/UserCredentialController.php delete mode 100644 sources/app/Controller/UserHelper.php rename sources/app/Controller/{UserImport.php => UserImportController.php} (61%) create mode 100644 sources/app/Controller/UserListController.php create mode 100644 sources/app/Controller/UserModificationController.php rename sources/app/Controller/{UserStatus.php => UserStatusController.php} (79%) create mode 100644 sources/app/Controller/UserViewController.php delete mode 100644 sources/app/Controller/WebNotification.php create mode 100644 sources/app/Controller/WebNotificationController.php delete mode 100644 sources/app/Controller/Webhook.php create mode 100644 sources/app/Core/Controller/AccessForbiddenException.php create mode 100644 sources/app/Core/Controller/BaseException.php create mode 100644 sources/app/Core/Controller/BaseMiddleware.php create mode 100644 sources/app/Core/Controller/PageNotFoundException.php create mode 100644 sources/app/Core/Controller/Runner.php create mode 100644 sources/app/Core/Filter/CriteriaInterface.php create mode 100644 sources/app/Core/Filter/FilterInterface.php create mode 100644 sources/app/Core/Filter/FormatterInterface.php create mode 100644 sources/app/Core/Filter/Lexer.php create mode 100644 sources/app/Core/Filter/LexerBuilder.php create mode 100644 sources/app/Core/Filter/OrCriteria.php create mode 100644 sources/app/Core/Filter/QueryBuilder.php delete mode 100644 sources/app/Core/Lexer.php rename sources/app/{ => Core}/Notification/NotificationInterface.php (89%) create mode 100644 sources/app/Core/Plugin/Directory.php create mode 100644 sources/app/Core/Plugin/Installer.php create mode 100644 sources/app/Core/Plugin/PluginInstallerException.php create mode 100644 sources/app/Core/Plugin/SchemaHandler.php create mode 100644 sources/app/Core/Queue/JobHandler.php create mode 100644 sources/app/Core/Queue/QueueManager.php create mode 100644 sources/app/Event/UserProfileSyncEvent.php create mode 100644 sources/app/Filter/BaseDateFilter.php create mode 100644 sources/app/Filter/BaseFilter.php create mode 100644 sources/app/Filter/ProjectActivityCreationDateFilter.php create mode 100644 sources/app/Filter/ProjectActivityCreatorFilter.php create mode 100644 sources/app/Filter/ProjectActivityProjectIdFilter.php create mode 100644 sources/app/Filter/ProjectActivityProjectIdsFilter.php create mode 100644 sources/app/Filter/ProjectActivityProjectNameFilter.php create mode 100644 sources/app/Filter/ProjectActivityTaskIdFilter.php create mode 100644 sources/app/Filter/ProjectActivityTaskStatusFilter.php create mode 100644 sources/app/Filter/ProjectActivityTaskTitleFilter.php create mode 100644 sources/app/Filter/ProjectGroupRoleProjectFilter.php create mode 100644 sources/app/Filter/ProjectGroupRoleUsernameFilter.php create mode 100644 sources/app/Filter/ProjectIdsFilter.php create mode 100644 sources/app/Filter/ProjectStatusFilter.php create mode 100644 sources/app/Filter/ProjectTypeFilter.php create mode 100644 sources/app/Filter/ProjectUserRoleProjectFilter.php create mode 100644 sources/app/Filter/ProjectUserRoleUsernameFilter.php create mode 100644 sources/app/Filter/TaskAssigneeFilter.php create mode 100644 sources/app/Filter/TaskCategoryFilter.php create mode 100644 sources/app/Filter/TaskColorFilter.php create mode 100644 sources/app/Filter/TaskColumnFilter.php create mode 100644 sources/app/Filter/TaskCommentFilter.php create mode 100644 sources/app/Filter/TaskCompletionDateFilter.php create mode 100644 sources/app/Filter/TaskCreationDateFilter.php create mode 100644 sources/app/Filter/TaskCreatorFilter.php create mode 100644 sources/app/Filter/TaskDescriptionFilter.php create mode 100644 sources/app/Filter/TaskDueDateFilter.php create mode 100644 sources/app/Filter/TaskDueDateRangeFilter.php create mode 100644 sources/app/Filter/TaskIdExclusionFilter.php create mode 100644 sources/app/Filter/TaskIdFilter.php create mode 100644 sources/app/Filter/TaskLinkFilter.php create mode 100644 sources/app/Filter/TaskModificationDateFilter.php create mode 100644 sources/app/Filter/TaskProjectFilter.php create mode 100644 sources/app/Filter/TaskProjectsFilter.php create mode 100644 sources/app/Filter/TaskReferenceFilter.php create mode 100644 sources/app/Filter/TaskStartDateFilter.php create mode 100644 sources/app/Filter/TaskStatusFilter.php create mode 100644 sources/app/Filter/TaskSubtaskAssigneeFilter.php create mode 100644 sources/app/Filter/TaskSwimlaneFilter.php create mode 100644 sources/app/Filter/TaskTagFilter.php create mode 100644 sources/app/Filter/TaskTitleFilter.php create mode 100644 sources/app/Filter/UserNameFilter.php create mode 100644 sources/app/Formatter/BaseFormatter.php rename sources/app/Formatter/{TaskFilterCalendarEvent.php => BaseTaskCalendarFormatter.php} (56%) create mode 100644 sources/app/Formatter/BoardColumnFormatter.php create mode 100644 sources/app/Formatter/BoardFormatter.php create mode 100644 sources/app/Formatter/BoardSwimlaneFormatter.php create mode 100644 sources/app/Formatter/BoardTaskFormatter.php delete mode 100644 sources/app/Formatter/FormatterInterface.php create mode 100644 sources/app/Formatter/ProjectActivityEventFormatter.php create mode 100644 sources/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php create mode 100644 sources/app/Formatter/TaskAutoCompleteFormatter.php create mode 100644 sources/app/Formatter/TaskCalendarFormatter.php delete mode 100644 sources/app/Formatter/TaskFilterAutoCompleteFormatter.php delete mode 100644 sources/app/Formatter/TaskFilterCalendarFormatter.php rename sources/app/Formatter/{TaskFilterGanttFormatter.php => TaskGanttFormatter.php} (69%) rename sources/app/Formatter/{TaskFilterICalendarFormatter.php => TaskICalFormatter.php} (71%) rename sources/app/Formatter/{UserFilterAutoCompleteFormatter.php => UserAutoCompleteFormatter.php} (64%) create mode 100644 sources/app/Helper/CalendarHelper.php create mode 100644 sources/app/Helper/ICalHelper.php create mode 100644 sources/app/Helper/MailHelper.php create mode 100644 sources/app/Helper/ProjectActivityHelper.php create mode 100644 sources/app/Job/BaseJob.php create mode 100644 sources/app/Job/EmailJob.php create mode 100644 sources/app/Job/HttpAsyncJob.php create mode 100644 sources/app/Job/NotificationJob.php create mode 100644 sources/app/Job/ProjectMetricJob.php create mode 100644 sources/app/Middleware/ApplicationAuthorizationMiddleware.php create mode 100644 sources/app/Middleware/AuthenticationMiddleware.php create mode 100644 sources/app/Middleware/BootstrapMiddleware.php create mode 100644 sources/app/Middleware/PostAuthenticationMiddleware.php create mode 100644 sources/app/Middleware/ProjectAuthorizationMiddleware.php rename sources/app/Model/{Action.php => ActionModel.php} (79%) rename sources/app/Model/{ActionParameter.php => ActionParameterModel.php} (87%) rename sources/app/Model/{AvatarFile.php => AvatarFileModel.php} (57%) delete mode 100644 sources/app/Model/Base.php rename sources/app/Model/{Board.php => BoardModel.php} (51%) rename sources/app/Model/{Category.php => CategoryModel.php} (88%) rename sources/app/Model/{Color.php => ColorModel.php} (97%) rename sources/app/Model/{Column.php => ColumnModel.php} (92%) rename sources/app/Model/{Comment.php => CommentModel.php} (73%) delete mode 100644 sources/app/Model/Config.php create mode 100644 sources/app/Model/ConfigModel.php rename sources/app/Model/{Currency.php => CurrencyModel.php} (94%) rename sources/app/Model/{CustomFilter.php => CustomFilterModel.php} (86%) rename sources/app/Model/{File.php => FileModel.php} (77%) rename sources/app/Model/{GroupMember.php => GroupMemberModel.php} (75%) rename sources/app/Model/{Group.php => GroupModel.php} (92%) create mode 100644 sources/app/Model/LanguageModel.php rename sources/app/Model/{LastLogin.php => LastLoginModel.php} (93%) rename sources/app/Model/{Link.php => LinkModel.php} (98%) rename sources/app/Model/{Metadata.php => MetadataModel.php} (80%) rename sources/app/Model/{Notification.php => NotificationModel.php} (63%) rename sources/app/Model/{NotificationType.php => NotificationTypeModel.php} (92%) rename sources/app/Model/{PasswordReset.php => PasswordResetModel.php} (89%) delete mode 100644 sources/app/Model/ProjectActivity.php create mode 100644 sources/app/Model/ProjectActivityModel.php rename sources/app/Model/{ProjectDailyColumnStats.php => ProjectDailyColumnStatsModel.php} (92%) rename sources/app/Model/{ProjectDailyStats.php => ProjectDailyStatsModel.php} (95%) rename sources/app/Model/{ProjectDuplication.php => ProjectDuplicationModel.php} (74%) delete mode 100644 sources/app/Model/ProjectFile.php create mode 100644 sources/app/Model/ProjectFileModel.php delete mode 100644 sources/app/Model/ProjectGroupRoleFilter.php rename sources/app/Model/{ProjectGroupRole.php => ProjectGroupRoleModel.php} (74%) delete mode 100644 sources/app/Model/ProjectMetadata.php create mode 100644 sources/app/Model/ProjectMetadataModel.php rename sources/app/Model/{Project.php => ProjectModel.php} (88%) rename sources/app/Model/{ProjectNotification.php => ProjectNotificationModel.php} (68%) rename sources/app/Model/{ProjectNotificationType.php => ProjectNotificationTypeModel.php} (93%) rename sources/app/Model/{ProjectPermission.php => ProjectPermissionModel.php} (56%) create mode 100644 sources/app/Model/ProjectTaskDuplicationModel.php create mode 100644 sources/app/Model/ProjectTaskPriorityModel.php delete mode 100644 sources/app/Model/ProjectUserRoleFilter.php rename sources/app/Model/{ProjectUserRole.php => ProjectUserRoleModel.php} (74%) rename sources/app/Model/{RememberMeSession.php => RememberMeSessionModel.php} (97%) rename sources/app/Model/{Setting.php => SettingModel.php} (95%) rename sources/app/Model/{Subtask.php => SubtaskModel.php} (78%) rename sources/app/Model/{SubtaskTimeTracking.php => SubtaskTimeTrackingModel.php} (60%) rename sources/app/Model/{Swimlane.php => SwimlaneModel.php} (90%) create mode 100644 sources/app/Model/TagDuplicationModel.php create mode 100644 sources/app/Model/TagModel.php delete mode 100644 sources/app/Model/Task.php rename sources/app/Model/{TaskAnalytic.php => TaskAnalyticModel.php} (86%) rename sources/app/Model/{TaskCreation.php => TaskCreationModel.php} (57%) delete mode 100644 sources/app/Model/TaskDuplication.php create mode 100644 sources/app/Model/TaskDuplicationModel.php rename sources/app/Model/{TaskExternalLink.php => TaskExternalLinkModel.php} (85%) delete mode 100644 sources/app/Model/TaskFile.php create mode 100644 sources/app/Model/TaskFileModel.php delete mode 100644 sources/app/Model/TaskFilter.php rename sources/app/Model/{TaskFinder.php => TaskFinderModel.php} (53%) rename sources/app/Model/{TaskLink.php => TaskLinkModel.php} (70%) rename sources/app/Model/{TaskMetadata.php => TaskMetadataModel.php} (55%) create mode 100644 sources/app/Model/TaskModel.php rename sources/app/Model/{TaskModification.php => TaskModificationModel.php} (70%) delete mode 100644 sources/app/Model/TaskPermission.php rename sources/app/Model/{TaskPosition.php => TaskPositionModel.php} (87%) create mode 100644 sources/app/Model/TaskProjectDuplicationModel.php create mode 100644 sources/app/Model/TaskProjectMoveModel.php create mode 100644 sources/app/Model/TaskRecurrenceModel.php rename sources/app/Model/{TaskStatus.php => TaskStatusModel.php} (74%) create mode 100644 sources/app/Model/TaskTagModel.php create mode 100644 sources/app/Model/TimezoneModel.php rename sources/app/Model/{Transition.php => TransitionModel.php} (76%) delete mode 100644 sources/app/Model/UserFilter.php rename sources/app/Model/{UserLocking.php => UserLockingModel.php} (86%) rename sources/app/Model/{UserMention.php => UserMentionModel.php} (79%) rename sources/app/Model/{UserMetadata.php => UserMetadataModel.php} (55%) rename sources/app/Model/{User.php => UserModel.php} (88%) rename sources/app/Model/{UserNotificationFilter.php => UserNotificationFilterModel.php} (94%) rename sources/app/Model/{UserNotification.php => UserNotificationModel.php} (60%) rename sources/app/Model/{UserNotificationType.php => UserNotificationTypeModel.php} (92%) rename sources/app/Model/{UserUnreadNotification.php => UserUnreadNotificationModel.php} (72%) rename sources/app/Notification/{ActivityStream.php => ActivityStreamNotification.php} (81%) rename sources/app/Notification/{Mail.php => MailNotification.php} (79%) rename sources/app/Notification/{Web.php => WebNotification.php} (75%) rename sources/app/Notification/{Webhook.php => WebhookNotification.php} (79%) create mode 100644 sources/app/ServiceProvider/ApiProvider.php create mode 100644 sources/app/ServiceProvider/CommandProvider.php create mode 100644 sources/app/ServiceProvider/FilterProvider.php create mode 100644 sources/app/ServiceProvider/MailProvider.php create mode 100644 sources/app/ServiceProvider/QueueProvider.php create mode 100644 sources/app/Subscriber/LdapUserPhotoSubscriber.php create mode 100644 sources/app/Template/activity/filter_dropdown.php delete mode 100644 sources/app/Template/app/calendar.php delete mode 100644 sources/app/Template/app/sidebar.php delete mode 100644 sources/app/Template/board/popover_assignee.php delete mode 100644 sources/app/Template/board/popover_category.php delete mode 100644 sources/app/Template/board/task_menu.php rename sources/app/Template/{board/popover_close_all_tasks_column.php => board_popover/close_all_tasks_column.php} (74%) create mode 100644 sources/app/Template/config/email.php delete mode 100644 sources/app/Template/config/plugins.php rename sources/app/Template/{app => dashboard}/activity.php (100%) create mode 100644 sources/app/Template/dashboard/calendar.php rename sources/app/Template/{app => dashboard}/layout.php (69%) rename sources/app/Template/{app => dashboard}/notifications.php (59%) rename sources/app/Template/{app => dashboard}/projects.php (61%) rename sources/app/Template/{app/overview.php => dashboard/show.php} (60%) create mode 100644 sources/app/Template/dashboard/sidebar.php rename sources/app/Template/{app => dashboard}/subtasks.php (81%) rename sources/app/Template/{app => dashboard}/tasks.php (64%) delete mode 100644 sources/app/Template/gantt/task_creation.php delete mode 100644 sources/app/Template/group/create.php delete mode 100644 sources/app/Template/group/edit.php create mode 100644 sources/app/Template/group_creation/show.php create mode 100644 sources/app/Template/group_modification/show.php create mode 100644 sources/app/Template/plugin/directory.php create mode 100644 sources/app/Template/plugin/layout.php create mode 100644 sources/app/Template/plugin/remove.php create mode 100644 sources/app/Template/plugin/show.php create mode 100644 sources/app/Template/plugin/sidebar.php delete mode 100644 sources/app/Template/project/disable.php delete mode 100644 sources/app/Template/project/duplicate.php delete mode 100644 sources/app/Template/project/enable.php delete mode 100644 sources/app/Template/project/remove.php delete mode 100644 sources/app/Template/project/share.php rename sources/app/Template/{action_project/project.php => project_action_duplication/show.php} (84%) rename sources/app/Template/{gantt/projects.php => project_gantt/show.php} (67%) rename sources/app/Template/{project/index.php => project_list/show.php} (70%) create mode 100644 sources/app/Template/project_status/disable.php create mode 100644 sources/app/Template/project_status/enable.php create mode 100644 sources/app/Template/project_status/remove.php create mode 100644 sources/app/Template/project_tag/create.php create mode 100644 sources/app/Template/project_tag/edit.php create mode 100644 sources/app/Template/project_tag/index.php create mode 100644 sources/app/Template/project_tag/remove.php delete mode 100644 sources/app/Template/project_user/sidebar.php rename sources/app/Template/{project_user => project_user_overview}/layout.php (75%) rename sources/app/Template/{project_user => project_user_overview}/roles.php (76%) create mode 100644 sources/app/Template/project_user_overview/sidebar.php rename sources/app/Template/{project_user => project_user_overview}/tasks.php (83%) rename sources/app/Template/{project_user => project_user_overview}/tooltip_users.php (55%) create mode 100644 sources/app/Template/project_view/duplicate.php rename sources/app/Template/{project => project_view}/integrations.php (74%) rename sources/app/Template/{project => project_view}/notifications.php (67%) create mode 100644 sources/app/Template/project_view/share.php rename sources/app/Template/{project => project_view}/show.php (79%) create mode 100644 sources/app/Template/search/activity.php create mode 100644 sources/app/Template/subtask_converter/show.php rename sources/app/Template/subtask_restriction/{popover.php => show.php} (62%) create mode 100644 sources/app/Template/tag/create.php create mode 100644 sources/app/Template/tag/edit.php create mode 100644 sources/app/Template/tag/index.php create mode 100644 sources/app/Template/tag/remove.php delete mode 100644 sources/app/Template/task/color_picker.php delete mode 100644 sources/app/Template/task/remove.php create mode 100644 sources/app/Template/task_bulk/show.php delete mode 100644 sources/app/Template/task_creation/form.php create mode 100644 sources/app/Template/task_creation/show.php rename sources/app/Template/{gantt/project.php => task_gantt/show.php} (62%) create mode 100644 sources/app/Template/task_gantt_creation/show.php rename sources/app/Template/task_import/{step1.php => show.php} (82%) create mode 100644 sources/app/Template/task_import/sidebar.php rename sources/app/Template/{listing => task_list}/show.php (87%) delete mode 100644 sources/app/Template/task_modification/edit_description.php delete mode 100644 sources/app/Template/task_modification/edit_task.php create mode 100644 sources/app/Template/task_modification/show.php create mode 100644 sources/app/Template/task_suppression/remove.php delete mode 100644 sources/app/Template/user/dropdown.php delete mode 100644 sources/app/Template/user/layout.php delete mode 100644 sources/app/Template/user/share.php delete mode 100644 sources/app/Template/user/sidebar.php rename sources/app/Template/{user/create_local.php => user_creation/local.php} (69%) rename sources/app/Template/{user/create_remote.php => user_creation/remote.php} (59%) rename sources/app/Template/{user => user_credential}/authentication.php (80%) rename sources/app/Template/{user => user_credential}/password.php (57%) create mode 100644 sources/app/Template/user_import/show.php delete mode 100644 sources/app/Template/user_import/step1.php create mode 100644 sources/app/Template/user_list/dropdown.php rename sources/app/Template/{user/index.php => user_list/show.php} (76%) rename sources/app/Template/{user/edit.php => user_modification/show.php} (82%) rename sources/app/Template/{user => user_view}/external.php (100%) rename sources/app/Template/{user => user_view}/integrations.php (72%) rename sources/app/Template/{user => user_view}/last.php (100%) create mode 100644 sources/app/Template/user_view/layout.php rename sources/app/Template/{user => user_view}/notifications.php (74%) rename sources/app/Template/{user => user_view}/password_reset.php (100%) rename sources/app/Template/{user => user_view}/profile.php (100%) rename sources/app/Template/{user => user_view}/sessions.php (85%) create mode 100644 sources/app/Template/user_view/share.php rename sources/app/Template/{user => user_view}/show.php (75%) create mode 100644 sources/app/Template/user_view/sidebar.php rename sources/app/Template/{user => user_view}/timesheet.php (82%) rename sources/app/Validator/{Base.php => BaseValidator.php} (93%) create mode 100644 sources/app/Validator/TagValidator.php delete mode 100644 sources/assets/css/app.css create mode 100644 sources/assets/css/app.min.css create mode 100644 sources/assets/css/chosen-sprite.png create mode 100644 sources/assets/css/chosen-sprite@2x.png create mode 100644 sources/assets/css/images/ui-icons_444444_256x240.png create mode 100644 sources/assets/css/images/ui-icons_555555_256x240.png create mode 100644 sources/assets/css/images/ui-icons_777620_256x240.png create mode 100644 sources/assets/css/images/ui-icons_777777_256x240.png create mode 100644 sources/assets/css/images/ui-icons_cc0000_256x240.png create mode 100644 sources/assets/css/images/ui-icons_ffffff_256x240.png delete mode 100644 sources/assets/css/print.css create mode 100644 sources/assets/css/print.min.css create mode 100644 sources/assets/css/vendor.min.css delete mode 100644 sources/assets/css/vendor/c3.min.css delete mode 100755 sources/assets/css/vendor/chosen.min.css delete mode 100644 sources/assets/css/vendor/font-awesome.min.css delete mode 100644 sources/assets/css/vendor/fullcalendar.min.css delete mode 100644 sources/assets/css/vendor/jquery-ui-timepicker-addon.min.css delete mode 100755 sources/assets/css/vendor/jquery-ui.min.css delete mode 100755 sources/assets/css/vendor/jquery-ui.theme.min.css delete mode 100644 sources/assets/css/vendor/simplemde.min.css delete mode 100644 sources/assets/img/chosen-sprite.png delete mode 100644 sources/assets/img/chosen-sprite@2x.png delete mode 100644 sources/assets/js/app.js create mode 100644 sources/assets/js/app.min.js rename sources/assets/js/src/{bootstrap.js => Bootstrap.js} (100%) create mode 100644 sources/assets/js/vendor.min.js delete mode 100644 sources/assets/js/vendor/c3.min.js delete mode 100644 sources/assets/js/vendor/chosen.jquery.min.js delete mode 100644 sources/assets/js/vendor/d3.v3.min.js delete mode 100644 sources/assets/js/vendor/fullcalendar.min.js delete mode 100644 sources/assets/js/vendor/jquery-1.11.3.min.js delete mode 100644 sources/assets/js/vendor/jquery-ui-timepicker-addon.min.js delete mode 100644 sources/assets/js/vendor/jquery-ui.min.js delete mode 100644 sources/assets/js/vendor/jquery.ui.touch-punch.min.js delete mode 100644 sources/assets/js/vendor/lang/ar-ma.js delete mode 100644 sources/assets/js/vendor/lang/ar-sa.js delete mode 100644 sources/assets/js/vendor/lang/ar-tn.js delete mode 100644 sources/assets/js/vendor/lang/ar.js delete mode 100644 sources/assets/js/vendor/lang/bg.js delete mode 100644 sources/assets/js/vendor/lang/ca.js delete mode 100644 sources/assets/js/vendor/lang/cs.js delete mode 100644 sources/assets/js/vendor/lang/da.js delete mode 100644 sources/assets/js/vendor/lang/de-at.js delete mode 100644 sources/assets/js/vendor/lang/de.js delete mode 100644 sources/assets/js/vendor/lang/el.js delete mode 100644 sources/assets/js/vendor/lang/en-au.js delete mode 100644 sources/assets/js/vendor/lang/en-ca.js delete mode 100644 sources/assets/js/vendor/lang/en-gb.js delete mode 100644 sources/assets/js/vendor/lang/es.js delete mode 100644 sources/assets/js/vendor/lang/fa.js delete mode 100644 sources/assets/js/vendor/lang/fi.js delete mode 100644 sources/assets/js/vendor/lang/fr-ca.js delete mode 100644 sources/assets/js/vendor/lang/fr.js delete mode 100644 sources/assets/js/vendor/lang/he.js delete mode 100644 sources/assets/js/vendor/lang/hi.js delete mode 100644 sources/assets/js/vendor/lang/hr.js delete mode 100644 sources/assets/js/vendor/lang/hu.js delete mode 100644 sources/assets/js/vendor/lang/id.js delete mode 100644 sources/assets/js/vendor/lang/is.js delete mode 100644 sources/assets/js/vendor/lang/it.js delete mode 100644 sources/assets/js/vendor/lang/ja.js delete mode 100644 sources/assets/js/vendor/lang/ko.js delete mode 100644 sources/assets/js/vendor/lang/lt.js delete mode 100644 sources/assets/js/vendor/lang/lv.js delete mode 100644 sources/assets/js/vendor/lang/nb.js delete mode 100644 sources/assets/js/vendor/lang/nl.js delete mode 100644 sources/assets/js/vendor/lang/pl.js delete mode 100644 sources/assets/js/vendor/lang/pt-br.js delete mode 100644 sources/assets/js/vendor/lang/pt.js delete mode 100644 sources/assets/js/vendor/lang/ro.js delete mode 100644 sources/assets/js/vendor/lang/ru.js delete mode 100644 sources/assets/js/vendor/lang/sk.js delete mode 100644 sources/assets/js/vendor/lang/sl.js delete mode 100644 sources/assets/js/vendor/lang/sr-cyrl.js delete mode 100644 sources/assets/js/vendor/lang/sr.js delete mode 100644 sources/assets/js/vendor/lang/sv.js delete mode 100644 sources/assets/js/vendor/lang/th.js delete mode 100644 sources/assets/js/vendor/lang/tr.js delete mode 100644 sources/assets/js/vendor/lang/uk.js delete mode 100644 sources/assets/js/vendor/lang/vi.js delete mode 100644 sources/assets/js/vendor/lang/zh-cn.js delete mode 100644 sources/assets/js/vendor/lang/zh-tw.js delete mode 100644 sources/assets/js/vendor/moment.min.js delete mode 100644 sources/assets/js/vendor/mousetrap-global-bind.min.js delete mode 100644 sources/assets/js/vendor/mousetrap.min.js delete mode 100644 sources/assets/js/vendor/simplemde.min.js create mode 100644 sources/data/web.config create mode 100644 sources/doc/api-external-task-link-procedures.markdown create mode 100644 sources/doc/api-internal-task-link-procedures.markdown create mode 100644 sources/doc/api-project-file-procedures.markdown create mode 100644 sources/doc/api-subtask-time-tracking-procedures.markdown rename sources/doc/{api-file-procedures.markdown => api-task-file-procedures.markdown} (98%) create mode 100644 sources/doc/es_ES/calendar-configuration.markdown create mode 100644 sources/doc/es_ES/email-configuration.markdown create mode 100644 sources/doc/es_ES/kanban-vs-todo-and-scrum.markdown rename sources/doc/{fr => fr_FR}/2fa.markdown (96%) rename sources/doc/{fr => fr_FR}/analytics-tasks.markdown (82%) rename sources/doc/{fr => fr_FR}/analytics.markdown (80%) rename sources/doc/{fr => fr_FR}/application-configuration.markdown (92%) rename sources/doc/{fr => fr_FR}/application-configuration.markup (90%) rename sources/doc/{fr => fr_FR}/automatic-actions.markdown (100%) rename sources/doc/{fr => fr_FR}/board-collapsed-expanded.markdown (100%) rename sources/doc/{fr => fr_FR}/board-configuration.markdown (90%) rename sources/doc/{fr => fr_FR}/board-horizontal-scrolling-and-compact-view.markdown (100%) rename sources/doc/{fr => fr_FR}/board-show-hide-columns.markdown (100%) rename sources/doc/{fr => fr_FR}/calendar-configuration.markdown (94%) rename sources/doc/{fr => fr_FR}/calendar.markdown (92%) rename sources/doc/{fr => fr_FR}/closing-tasks.markdown (76%) rename sources/doc/{fr => fr_FR}/create-tasks-by-email.markdown (91%) rename sources/doc/{fr => fr_FR}/creating-projects.markdown (100%) rename sources/doc/{fr => fr_FR}/creating-tasks.markdown (72%) rename sources/doc/{fr => fr_FR}/currency-rate.markdown (83%) rename sources/doc/{fr => fr_FR}/duplicate-move-tasks.markdown (86%) rename sources/doc/{fr => fr_FR}/editing-projects.markdown (100%) rename sources/doc/{fr => fr_FR}/gantt-chart-projects.markdown (88%) rename sources/doc/{fr => fr_FR}/gantt-chart-tasks.markdown (85%) rename sources/doc/{fr => fr_FR}/index.markdown (97%) rename sources/doc/{fr => fr_FR}/kanban-vs-todo-and-scrum.markdown (100%) rename sources/doc/{fr => fr_FR}/keyboard-shortcuts.markdown (100%) rename sources/doc/{fr => fr_FR}/link-labels.markdown (63%) rename sources/doc/{fr => fr_FR}/notifications.markdown (84%) rename sources/doc/{fr => fr_FR}/project-configuration.markdown (88%) rename sources/doc/{fr => fr_FR}/project-permissions.markdown (100%) rename sources/doc/{fr => fr_FR}/project-types.markdown (100%) rename sources/doc/{fr => fr_FR}/project-views.markdown (100%) rename sources/doc/{fr => fr_FR}/recurring-tasks.markdown (92%) create mode 100644 sources/doc/fr_FR/removing-projects.markdown rename sources/doc/{fr => fr_FR}/roles.markdown (100%) rename sources/doc/{fr => fr_FR}/screenshots.markdown (86%) rename sources/doc/{fr => fr_FR}/screenshots/automatic-action-creation.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/board-collapsed-mode.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/board-compact-mode.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/board-expanded-mode.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/board-task-limit.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/board-view.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/calendar-view.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/gantt-view.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/hide-column.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/list-view.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/new-project.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/new-user.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/project-disable-sharing.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/project-edition.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/project-enable-sharing.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/project-permissions.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/project-view.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/show-column.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/swimlane-configuration.png (100%) rename sources/doc/{fr => fr_FR}/screenshots/swimlanes.png (100%) create mode 100644 sources/doc/fr_FR/screenshots/task-creation-board.png create mode 100644 sources/doc/fr_FR/screenshots/task-creation-form.png rename sources/doc/{fr => fr_FR}/sharing-projects.markdown (100%) rename sources/doc/{fr => fr_FR}/subtasks.markdown (79%) rename sources/doc/{fr => fr_FR}/swimlanes.markdown (100%) rename sources/doc/{fr => fr_FR}/task-links.markdown (90%) rename sources/doc/{fr => fr_FR}/time-tracking.markdown (78%) rename sources/doc/{fr => fr_FR}/transitions.markdown (78%) rename sources/doc/{fr => fr_FR}/usage-examples.markdown (100%) rename sources/doc/{fr => fr_FR}/user-management.markdown (100%) rename sources/doc/{fr => fr_FR}/what-is-kanban.markdown (100%) create mode 100644 sources/doc/ldap-configuration-examples.markdown create mode 100644 sources/doc/ldap-profile-picture.markdown create mode 100644 sources/doc/nitrous.markdown create mode 100644 sources/doc/performances.markdown create mode 100644 sources/doc/plugin-directory.markdown create mode 100644 sources/doc/removing-projects.markdown create mode 100644 sources/doc/screenshots/project-remove.png create mode 100644 sources/doc/screenshots/tags-board.png create mode 100644 sources/doc/screenshots/tags-global.png create mode 100644 sources/doc/screenshots/tags-projects.png create mode 100644 sources/doc/screenshots/tags-search.png create mode 100644 sources/doc/screenshots/tags-task.png create mode 100644 sources/doc/screenshots/task-creation-board.png create mode 100644 sources/doc/screenshots/task-creation-form.png create mode 100644 sources/doc/tags.markdown create mode 100644 sources/doc/worker.markdown create mode 100644 sources/vendor/composer/autoload_static.php create mode 100644 sources/vendor/eluceo/ical/.php_cs create mode 100644 sources/vendor/eluceo/ical/CHANGELOG.md create mode 100644 sources/vendor/eluceo/ical/examples/example7.php create mode 100644 sources/vendor/eluceo/ical/phpunit.xml.dist create mode 100644 sources/vendor/eluceo/ical/src/Eluceo/iCal/Property/DateTimesProperty.php create mode 100644 sources/vendor/eluceo/ical/src/Eluceo/iCal/Property/Event/Description.php create mode 100644 sources/vendor/eluceo/ical/src/Eluceo/iCal/Property/Event/RecurrenceId.php create mode 100644 sources/vendor/eluceo/ical/src/Eluceo/iCal/Util/DateUtil.php delete mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/AccessDeniedException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/AccessDeniedException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/AuthenticationFailureException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/ConnectionFailureException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/InvalidJsonFormatException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/InvalidJsonRpcFormatException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/ResponseEncodingFailureException.php rename sources/vendor/fguillot/json-rpc/src/JsonRPC/{ => Exception}/ResponseException.php (91%) create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Exception/ServerErrorException.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/HttpClient.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/MiddlewareHandler.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/MiddlewareInterface.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/ProcedureHandler.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Request/BatchRequestParser.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Request/RequestBuilder.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Request/RequestParser.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Response/ResponseBuilder.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Response/ResponseParser.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Validator/HostValidator.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Validator/JsonEncodingValidator.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Validator/JsonFormatValidator.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Validator/RpcFormatValidator.php create mode 100644 sources/vendor/fguillot/json-rpc/src/JsonRPC/Validator/UserValidator.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/Builder/BaseBuilder.php rename sources/vendor/fguillot/picodb/lib/PicoDb/{Condition.php => Builder/ConditionBuilder.php} (90%) create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/Builder/InsertBuilder.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/Builder/UpdateBuilder.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/DriverFactory.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/LargeObject.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/StatementHandler.php create mode 100644 sources/vendor/fguillot/picodb/lib/PicoDb/UrlParser.php create mode 100644 sources/vendor/fguillot/simple-queue/LICENSE create mode 100644 sources/vendor/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Adapter/BeanstalkQueueAdapter.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Adapter/DisqueQueueAdapter.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Adapter/MemoryQueueAdapter.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Exception/NotSupportedException.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Job.php create mode 100644 sources/vendor/fguillot/simple-queue/src/Queue.php create mode 100644 sources/vendor/fguillot/simple-queue/src/QueueAdapterInterface.php create mode 100644 sources/vendor/fguillot/simple-validator/src/SimpleValidator/Validators/NotEmpty.php create mode 100644 sources/vendor/fguillot/simpleLogger/src/SimpleLogger/Stderr.php create mode 100644 sources/vendor/fguillot/simpleLogger/src/SimpleLogger/Stdout.php create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_10.php create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_11.php create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_9.php create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_10.txt create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_11.txt create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt create mode 100644 sources/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_9.txt create mode 100644 sources/vendor/symfony/console/Tests/Helper/HelperTest.php create mode 100644 sources/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php delete mode 100644 sources/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.ser create mode 100644 sources/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php delete mode 100644 sources/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.ser diff --git a/README.markdown b/README.markdown index 5b4e2f1..e1216e6 100644 --- a/README.markdown +++ b/README.markdown @@ -33,7 +33,7 @@ From command line: Infos ----- -Kanboard v1.0.27 +Kanboard v1.0.31 Yunohost forum thread: @@ -63,7 +63,7 @@ Test it Test or upgrade to dev version: ``` su - admin -git clone -b dev https://github.com/mbugeia/kanboard_ynh +git clone -b dev https://github.com/YunoHost-Apps/kanboard_ynh # to install sudo yunohost app install -l Kanboard /home/admin/kanboard_ynh # to upgrade diff --git a/conf/config.php b/conf/config.php index 272b14e..1bf41e4 100644 --- a/conf/config.php +++ b/conf/config.php @@ -3,8 +3,11 @@ // Enable/Disable debug define('DEBUG', false); -// Debug file path -define('DEBUG_FILE', __DIR__.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'debug.log'); +// Available log drivers: syslog, stderr, stdout or file +define('LOG_DRIVER', ''); + +// Log filename if the log driver is "file" +define('LOG_FILE', __DIR__.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'debug.log'); // Plugins directory define('PLUGINS_DIR', 'plugins'); @@ -46,6 +49,15 @@ define('DB_NAME', 'yuno_dbuser'); // Mysql/Postgres custom port (null = default port) define('DB_PORT', null); +// Mysql SSL key +define('DB_SSL_KEY', null); + +// Mysql SSL certificate +define('DB_SSL_CERT', null); + +// Mysql SSL CA +define('DB_SSL_CA', null); + // Enable LDAP authentication (false by default) define('LDAP_AUTH', false); @@ -101,6 +113,13 @@ define('LDAP_USER_ATTRIBUTE_EMAIL', 'mail'); // LDAP attribute to find groups in user profile define('LDAP_USER_ATTRIBUTE_GROUPS', 'memberof'); +// LDAP attribute for user avatar image: thumbnailPhoto or jpegPhoto +define('LDAP_USER_ATTRIBUTE_PHOTO', ''); + +// LDAP attribute for user language, example: 'preferredlanguage' +// Put an empty string to disable language sync +define('LDAP_USER_ATTRIBUTE_LANGUAGE', ''); + // Allow automatic LDAP user creation define('LDAP_USER_CREATION', true); @@ -123,6 +142,11 @@ define('LDAP_GROUP_BASE_DN', ''); // Example for ActiveDirectory: (&(objectClass=group)(sAMAccountName=%s*)) define('LDAP_GROUP_FILTER', ''); +// LDAP user group filter +// If this filter is configured, Kanboard will search user groups in LDAP_GROUP_BASE_DN with this filter +// Example for OpenLDAP: (&(objectClass=posixGroup)(memberUid=%s)) +define('LDAP_GROUP_USER_FILTER', ''); + // LDAP attribute for the group name define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn'); @@ -147,9 +171,6 @@ define('ENABLE_HSTS', false); // Enable or disable "X-Frame-Options: DENY" HTTP header define('ENABLE_XFRAME', true); -// Enable syslog logging -define('ENABLE_SYSLOG', true); - // Escape html inside markdown text define('MARKDOWN_ESCAPE_HTML', true); diff --git a/sources/.htaccess b/sources/.htaccess new file mode 100644 index 0000000..45123a9 --- /dev/null +++ b/sources/.htaccess @@ -0,0 +1,26 @@ + + Options -MultiViews + + SetEnv HTTP_MOD_REWRITE On + + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.php [QSA,L] + + + + + = 2.3> + Require all denied + + + Order allow,deny + Deny from all + + + + + Order allow,deny + Deny from all + + diff --git a/sources/ChangeLog b/sources/ChangeLog index f07ba9e..7e6662d 100644 --- a/sources/ChangeLog +++ b/sources/ChangeLog @@ -1,3 +1,135 @@ +Version 1.0.31 +-------------- + +New features: + +* Added tags: global and specific by project +* Added application and project roles validation for API procedure calls +* Added new API call: "getProjectByIdentifier" +* Added new API calls for external task links, project attachments and subtask time tracking + +Improvements: + +* Use PHP 7 for the Docker image +* Preserve role for existing users when using ReverseProxy authentication +* Handle priority for task and project duplication +* Expose task reference field to the user interface +* Improve ICal export +* Added argument owner_id and identifier to project API calls +* Rewrite integration tests to run with Docker containers +* Use the same task form layout everywhere +* Removed some tasks dropdown menus that are now available with task edit form +* Make embedded documentation readable in multiple languages (if a translation is available) +* Added acceptance tests (browser tests) + +Bug fixes: + +* Fixed broken CSV exports +* Fixed identical background color for LetterAvatar on 32bits platforms (Hash greater than PHP_MAX_INT) +* Fixed lexer issue with non word characters +* Flush memory cache in worker to get latest config values +* Fixed empty title for web notification with only one overdue task +* Take default swimlane into consideration for SwimlaneModel::getFirstActiveSwimlane() +* Fixed "due today" highlighting + +Version 1.0.30 +-------------- + +Improvements: + +* Show tasks that are due today in a different color + +Bug fixes: + +* Fixed wrong controller for search in dashboard +* Fixed plural form in alert message +* Fixed CSS cosmetic issue with popover and tooltips + +Version 1.0.29 +-------------- + +New features: + +* Manage plugin from the user interface and from the command line +* Added support for background workers +* Added the possibility to convert a subtask to a task +* Added menu entry to add tasks from all project views +* Add tasks in bulk from the board +* Add dropdown for projects +* Added config parameter to allow self-signed certificates for the HTTP client + +Improvements: + +* Display local date format in date picker +* Configure email settings with the user interface in addition to config file +* Upgrade Docker image to Alpine Linux 3.4 +* Move task import to a separate section +* Mark web notification as read when clicking on it +* Support strtotime strings for date search +* Reset failed login counter and unlock user when changing password +* Task do not open anymore in a new window on the Gantt chart +* Do not display task progress for tasks with no start/end date +* Use Gulp and Bower to manage assets +* Controller and Middleware refactoring +* Replace jQuery mobile detection by the library isMobile + +Bug fixes: + +* Fixed user date format parsing for dates that can be valid in multiple formats +* Do not sync user role if LDAP groups are not configured +* Fixed issue with unicode handling for letter based avatars and user initials +* Do not send notifications to disabled users +* Fixed wrong redirect when removing a task from the task view page + +Breaking changes: + +* Webhook to create tasks have been removed, use the API instead +* All controllers have been renamed, people who are not using URL rewriting will see different URLs +* All models have been renamed, plugin maintainers will have to update their plugins + +Version 1.0.28 +-------------- + +New features: + +* Added automated action to change task color based on the priority +* Added support for LDAP Posix Groups (OpenLDAP with memberUid or groupOfNames) +* Added support for LDAP user photo attribute (Avatar image) +* Added support for language LDAP attribute +* Added support for Mysql SSL connection +* Search in activity stream +* Search in comments +* Search by task creator +* Added command line utility to reset user password and to disable 2FA + +Improvements: + +* Improve Avatar upload form +* User roles are now synced with LDAP at each login +* Improve web page title on the task view +* Unify task drop-down menu between different views +* Improve LDAP user group membership synchronization +* Category and user filters do not append anymore in search field +* Added more template hooks +* Added tasks search with the API +* Added priority field to API procedures +* Added API procedure "getMemberGroups" +* Added parameters for overdue tasks notifications: group by projects and send only to managers +* Allow people to install Kanboard outside of the DocumentRoot +* Allow plugins to be loaded from another folder +* Filter/Lexer/QueryBuilder refactoring + +Bug fixes: + +* Allow a project owner to manage his own public project +* Fixed PHP warning when removing a user with no Avatar image +* Fixed improper Markdown escaping for some tooltips +* Closing all tasks by column, also update closed tasks +* Fixed wrong task link generation within Markdown text +* Fixed wrong URL on comment toggle link for sorting +* Fixed form submission with Meta+Enter keyboard shortcut +* Removed PHP notices in comment suppression view + Version 1.0.27 -------------- diff --git a/sources/app/Action/CommentCreation.php b/sources/app/Action/CommentCreation.php index b91e39e..60ca24f 100644 --- a/sources/app/Action/CommentCreation.php +++ b/sources/app/Action/CommentCreation.php @@ -65,11 +65,11 @@ class CommentCreation extends Base */ public function doAction(array $data) { - return (bool) $this->comment->create(array( + return (bool) $this->commentModel->create(array( 'reference' => isset($data['reference']) ? $data['reference'] : '', 'comment' => $data['comment'], 'task_id' => $data['task_id'], - 'user_id' => isset($data['user_id']) && $this->projectPermission->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0, + 'user_id' => isset($data['user_id']) && $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0, )); } diff --git a/sources/app/Action/CommentCreationMoveTaskColumn.php b/sources/app/Action/CommentCreationMoveTaskColumn.php index 11224d6..1b16f48 100644 --- a/sources/app/Action/CommentCreationMoveTaskColumn.php +++ b/sources/app/Action/CommentCreationMoveTaskColumn.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Add a comment of the triggering event to the task description. @@ -32,7 +32,7 @@ class CommentCreationMoveTaskColumn extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -71,9 +71,9 @@ class CommentCreationMoveTaskColumn extends Base return false; } - $column = $this->column->getById($data['column_id']); + $column = $this->columnModel->getById($data['column_id']); - return (bool) $this->comment->create(array( + return (bool) $this->commentModel->create(array( 'comment' => t('Moved to column %s', $column['title']), 'task_id' => $data['task_id'], 'user_id' => $this->userSession->getId(), diff --git a/sources/app/Action/TaskAssignCategoryColor.php b/sources/app/Action/TaskAssignCategoryColor.php index f5085cb..fc48687 100644 --- a/sources/app/Action/TaskAssignCategoryColor.php +++ b/sources/app/Action/TaskAssignCategoryColor.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Set a category automatically according to the color @@ -32,7 +32,7 @@ class TaskAssignCategoryColor extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE_UPDATE, + TaskModel::EVENT_CREATE_UPDATE, ); } @@ -78,7 +78,7 @@ class TaskAssignCategoryColor extends Base 'category_id' => $this->getParam('category_id'), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** diff --git a/sources/app/Action/TaskAssignCategoryLabel.php b/sources/app/Action/TaskAssignCategoryLabel.php index 95fa116..4829901 100644 --- a/sources/app/Action/TaskAssignCategoryLabel.php +++ b/sources/app/Action/TaskAssignCategoryLabel.php @@ -74,7 +74,7 @@ class TaskAssignCategoryLabel extends Base 'category_id' => $this->getParam('category_id'), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** diff --git a/sources/app/Action/TaskAssignCategoryLink.php b/sources/app/Action/TaskAssignCategoryLink.php index b39e41b..6937edd 100644 --- a/sources/app/Action/TaskAssignCategoryLink.php +++ b/sources/app/Action/TaskAssignCategoryLink.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\TaskLink; +use Kanboard\Model\TaskLinkModel; /** * Set a category automatically according to a task link @@ -33,7 +33,7 @@ class TaskAssignCategoryLink extends Base public function getCompatibleEvents() { return array( - TaskLink::EVENT_CREATE_UPDATE, + TaskLinkModel::EVENT_CREATE_UPDATE, ); } @@ -79,7 +79,7 @@ class TaskAssignCategoryLink extends Base 'category_id' => $this->getParam('category_id'), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** @@ -92,7 +92,7 @@ class TaskAssignCategoryLink extends Base public function hasRequiredCondition(array $data) { if ($data['link_id'] == $this->getParam('link_id')) { - $task = $this->taskFinder->getById($data['task_id']); + $task = $this->taskFinderModel->getById($data['task_id']); return empty($task['category_id']); } diff --git a/sources/app/Action/TaskAssignColorCategory.php b/sources/app/Action/TaskAssignColorCategory.php index 139c24c..284b8f4 100644 --- a/sources/app/Action/TaskAssignColorCategory.php +++ b/sources/app/Action/TaskAssignColorCategory.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a color to a specific category @@ -32,7 +32,7 @@ class TaskAssignColorCategory extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE_UPDATE, + TaskModel::EVENT_CREATE_UPDATE, ); } @@ -78,7 +78,7 @@ class TaskAssignColorCategory extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values, false); + return $this->taskModificationModel->update($values, false); } /** diff --git a/sources/app/Action/TaskAssignColorColumn.php b/sources/app/Action/TaskAssignColorColumn.php index 9241273..57fd6f4 100644 --- a/sources/app/Action/TaskAssignColorColumn.php +++ b/sources/app/Action/TaskAssignColorColumn.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a color to a task @@ -32,8 +32,8 @@ class TaskAssignColorColumn extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE, - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_CREATE, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -79,7 +79,7 @@ class TaskAssignColorColumn extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values, false); + return $this->taskModificationModel->update($values, false); } /** diff --git a/sources/app/Action/TaskAssignColorLink.php b/sources/app/Action/TaskAssignColorLink.php index 12ceabb..9ab5458 100644 --- a/sources/app/Action/TaskAssignColorLink.php +++ b/sources/app/Action/TaskAssignColorLink.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\TaskLink; +use Kanboard\Model\TaskLinkModel; /** * Assign a color to a specific task link @@ -32,7 +32,7 @@ class TaskAssignColorLink extends Base public function getCompatibleEvents() { return array( - TaskLink::EVENT_CREATE_UPDATE, + TaskLinkModel::EVENT_CREATE_UPDATE, ); } @@ -78,7 +78,7 @@ class TaskAssignColorLink extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values, false); + return $this->taskModificationModel->update($values, false); } /** diff --git a/sources/app/Action/TaskAssignColorPriority.php b/sources/app/Action/TaskAssignColorPriority.php new file mode 100644 index 0000000..eae1b77 --- /dev/null +++ b/sources/app/Action/TaskAssignColorPriority.php @@ -0,0 +1,95 @@ + t('Color'), + 'priority' => t('Priority'), + ); + } + + /** + * Get the required parameter for the event + * + * @access public + * @return string[] + */ + public function getEventRequiredParameters() + { + return array( + 'task_id', + 'priority', + ); + } + + /** + * Execute the action (change the task color) + * + * @access public + * @param array $data Event data dictionary + * @return bool True if the action was executed or false when not executed + */ + public function doAction(array $data) + { + $values = array( + 'id' => $data['task_id'], + 'color_id' => $this->getParam('color_id'), + ); + + return $this->taskModificationModel->update($values, false); + } + + /** + * Check if the event data meet the action condition + * + * @access public + * @param array $data Event data dictionary + * @return bool + */ + public function hasRequiredCondition(array $data) + { + return $data['priority'] == $this->getParam('priority'); + } +} diff --git a/sources/app/Action/TaskAssignColorUser.php b/sources/app/Action/TaskAssignColorUser.php index 6ec8ce9..4bcf7a5 100644 --- a/sources/app/Action/TaskAssignColorUser.php +++ b/sources/app/Action/TaskAssignColorUser.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a color to a specific user @@ -32,8 +32,8 @@ class TaskAssignColorUser extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE, - Task::EVENT_ASSIGNEE_CHANGE, + TaskModel::EVENT_CREATE, + TaskModel::EVENT_ASSIGNEE_CHANGE, ); } @@ -79,7 +79,7 @@ class TaskAssignColorUser extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values, false); + return $this->taskModificationModel->update($values, false); } /** diff --git a/sources/app/Action/TaskAssignCurrentUser.php b/sources/app/Action/TaskAssignCurrentUser.php index 192a120..997aa98 100644 --- a/sources/app/Action/TaskAssignCurrentUser.php +++ b/sources/app/Action/TaskAssignCurrentUser.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a task to the logged user @@ -32,7 +32,7 @@ class TaskAssignCurrentUser extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE, + TaskModel::EVENT_CREATE, ); } @@ -78,7 +78,7 @@ class TaskAssignCurrentUser extends Base 'owner_id' => $this->userSession->getId(), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** diff --git a/sources/app/Action/TaskAssignCurrentUserColumn.php b/sources/app/Action/TaskAssignCurrentUserColumn.php index 05d08dd..bc28a90 100644 --- a/sources/app/Action/TaskAssignCurrentUserColumn.php +++ b/sources/app/Action/TaskAssignCurrentUserColumn.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a task to the logged user on column change @@ -32,7 +32,7 @@ class TaskAssignCurrentUserColumn extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -81,7 +81,7 @@ class TaskAssignCurrentUserColumn extends Base 'owner_id' => $this->userSession->getId(), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** diff --git a/sources/app/Action/TaskAssignSpecificUser.php b/sources/app/Action/TaskAssignSpecificUser.php index 2dc3e96..50a2b2a 100644 --- a/sources/app/Action/TaskAssignSpecificUser.php +++ b/sources/app/Action/TaskAssignSpecificUser.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Assign a task to a specific user @@ -32,8 +32,8 @@ class TaskAssignSpecificUser extends Base public function getCompatibleEvents() { return array( - Task::EVENT_CREATE_UPDATE, - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_CREATE_UPDATE, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -79,7 +79,7 @@ class TaskAssignSpecificUser extends Base 'owner_id' => $this->getParam('user_id'), ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** diff --git a/sources/app/Action/TaskAssignUser.php b/sources/app/Action/TaskAssignUser.php index da54d18..9ea2298 100644 --- a/sources/app/Action/TaskAssignUser.php +++ b/sources/app/Action/TaskAssignUser.php @@ -71,7 +71,7 @@ class TaskAssignUser extends Base 'owner_id' => $data['owner_id'], ); - return $this->taskModification->update($values); + return $this->taskModificationModel->update($values); } /** @@ -83,6 +83,6 @@ class TaskAssignUser extends Base */ public function hasRequiredCondition(array $data) { - return $this->projectPermission->isAssignable($this->getProjectId(), $data['owner_id']); + return $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['owner_id']); } } diff --git a/sources/app/Action/TaskClose.php b/sources/app/Action/TaskClose.php index cf91e83..91e8cf4 100644 --- a/sources/app/Action/TaskClose.php +++ b/sources/app/Action/TaskClose.php @@ -63,7 +63,7 @@ class TaskClose extends Base */ public function doAction(array $data) { - return $this->taskStatus->close($data['task_id']); + return $this->taskStatusModel->close($data['task_id']); } /** diff --git a/sources/app/Action/TaskCloseColumn.php b/sources/app/Action/TaskCloseColumn.php index 09af3b9..1edce8f 100644 --- a/sources/app/Action/TaskCloseColumn.php +++ b/sources/app/Action/TaskCloseColumn.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Close automatically a task in a specific column @@ -32,7 +32,7 @@ class TaskCloseColumn extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -67,7 +67,7 @@ class TaskCloseColumn extends Base */ public function doAction(array $data) { - return $this->taskStatus->close($data['task_id']); + return $this->taskStatusModel->close($data['task_id']); } /** diff --git a/sources/app/Action/TaskCloseNoActivity.php b/sources/app/Action/TaskCloseNoActivity.php index 59f7f56..5a10510 100644 --- a/sources/app/Action/TaskCloseNoActivity.php +++ b/sources/app/Action/TaskCloseNoActivity.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Close automatically a task after when inactive @@ -31,7 +31,7 @@ class TaskCloseNoActivity extends Base */ public function getCompatibleEvents() { - return array(Task::EVENT_DAILY_CRONJOB); + return array(TaskModel::EVENT_DAILY_CRONJOB); } /** @@ -74,7 +74,7 @@ class TaskCloseNoActivity extends Base $duration = time() - $task['date_modification']; if ($duration > $max) { - $results[] = $this->taskStatus->close($task['id']); + $results[] = $this->taskStatusModel->close($task['id']); } } diff --git a/sources/app/Action/TaskCreation.php b/sources/app/Action/TaskCreation.php index 290c31e..e9e5c5f 100644 --- a/sources/app/Action/TaskCreation.php +++ b/sources/app/Action/TaskCreation.php @@ -66,7 +66,7 @@ class TaskCreation extends Base */ public function doAction(array $data) { - return (bool) $this->taskCreation->create(array( + return (bool) $this->taskCreationModel->create(array( 'project_id' => $data['project_id'], 'title' => $data['title'], 'reference' => $data['reference'], diff --git a/sources/app/Action/TaskDuplicateAnotherProject.php b/sources/app/Action/TaskDuplicateAnotherProject.php index 5f05136..d70d2ee 100644 --- a/sources/app/Action/TaskDuplicateAnotherProject.php +++ b/sources/app/Action/TaskDuplicateAnotherProject.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Duplicate a task to another project @@ -32,8 +32,9 @@ class TaskDuplicateAnotherProject extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, - Task::EVENT_CLOSE, + TaskModel::EVENT_MOVE_COLUMN, + TaskModel::EVENT_CLOSE, + TaskModel::EVENT_CREATE, ); } @@ -74,8 +75,8 @@ class TaskDuplicateAnotherProject extends Base */ public function doAction(array $data) { - $destination_column_id = $this->column->getFirstColumnId($this->getParam('project_id')); - return (bool) $this->taskDuplication->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id); + $destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id')); + return (bool) $this->taskProjectDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id); } /** diff --git a/sources/app/Action/TaskEmail.php b/sources/app/Action/TaskEmail.php index 4e0e06a..7f9ba41 100644 --- a/sources/app/Action/TaskEmail.php +++ b/sources/app/Action/TaskEmail.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Email a task to someone @@ -32,8 +32,8 @@ class TaskEmail extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, - Task::EVENT_CLOSE, + TaskModel::EVENT_MOVE_COLUMN, + TaskModel::EVENT_CLOSE, ); } @@ -75,16 +75,16 @@ class TaskEmail extends Base */ public function doAction(array $data) { - $user = $this->user->getById($this->getParam('user_id')); + $user = $this->userModel->getById($this->getParam('user_id')); if (! empty($user['email'])) { - $task = $this->taskFinder->getDetails($data['task_id']); + $task = $this->taskFinderModel->getDetails($data['task_id']); $this->emailClient->send( $user['email'], $user['name'] ?: $user['username'], $this->getParam('subject'), - $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url'))) + $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url'))) ); return true; diff --git a/sources/app/Action/TaskEmailNoActivity.php b/sources/app/Action/TaskEmailNoActivity.php index c5d7a79..c60702f 100644 --- a/sources/app/Action/TaskEmailNoActivity.php +++ b/sources/app/Action/TaskEmailNoActivity.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Email a task with no activity @@ -32,7 +32,7 @@ class TaskEmailNoActivity extends Base public function getCompatibleEvents() { return array( - Task::EVENT_DAILY_CRONJOB, + TaskModel::EVENT_DAILY_CRONJOB, ); } @@ -85,7 +85,7 @@ class TaskEmailNoActivity extends Base { $results = array(); $max = $this->getParam('duration') * 86400; - $user = $this->user->getById($this->getParam('user_id')); + $user = $this->userModel->getById($this->getParam('user_id')); if (! empty($user['email'])) { foreach ($data['tasks'] as $task) { @@ -110,13 +110,13 @@ class TaskEmailNoActivity extends Base */ private function sendEmail($task_id, array $user) { - $task = $this->taskFinder->getDetails($task_id); + $task = $this->taskFinderModel->getDetails($task_id); $this->emailClient->send( $user['email'], $user['name'] ?: $user['username'], $this->getParam('subject'), - $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url'))) + $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url'))) ); return true; diff --git a/sources/app/Action/TaskMoveAnotherProject.php b/sources/app/Action/TaskMoveAnotherProject.php index fdff0d8..66635a6 100644 --- a/sources/app/Action/TaskMoveAnotherProject.php +++ b/sources/app/Action/TaskMoveAnotherProject.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Move a task to another project @@ -32,8 +32,8 @@ class TaskMoveAnotherProject extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, - Task::EVENT_CLOSE, + TaskModel::EVENT_MOVE_COLUMN, + TaskModel::EVENT_CLOSE, ); } @@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base */ public function doAction(array $data) { - return $this->taskDuplication->moveToProject($data['task_id'], $this->getParam('project_id')); + return $this->taskProjectMoveModel->moveToProject($data['task_id'], $this->getParam('project_id')); } /** diff --git a/sources/app/Action/TaskMoveColumnAssigned.php b/sources/app/Action/TaskMoveColumnAssigned.php index 1b23a59..7e3db9c 100644 --- a/sources/app/Action/TaskMoveColumnAssigned.php +++ b/sources/app/Action/TaskMoveColumnAssigned.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Move a task to another column when an assignee is set @@ -32,8 +32,8 @@ class TaskMoveColumnAssigned extends Base public function getCompatibleEvents() { return array( - Task::EVENT_ASSIGNEE_CHANGE, - Task::EVENT_UPDATE, + TaskModel::EVENT_ASSIGNEE_CHANGE, + TaskModel::EVENT_UPDATE, ); } @@ -75,9 +75,9 @@ class TaskMoveColumnAssigned extends Base */ public function doAction(array $data) { - $original_task = $this->taskFinder->getById($data['task_id']); + $original_task = $this->taskFinderModel->getById($data['task_id']); - return $this->taskPosition->movePosition( + return $this->taskPositionModel->movePosition( $data['project_id'], $data['task_id'], $this->getParam('dest_column_id'), diff --git a/sources/app/Action/TaskMoveColumnCategoryChange.php b/sources/app/Action/TaskMoveColumnCategoryChange.php index 0f591ed..e4f8876 100644 --- a/sources/app/Action/TaskMoveColumnCategoryChange.php +++ b/sources/app/Action/TaskMoveColumnCategoryChange.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Move a task to another column when the category is changed @@ -32,7 +32,7 @@ class TaskMoveColumnCategoryChange extends Base public function getCompatibleEvents() { return array( - Task::EVENT_UPDATE, + TaskModel::EVENT_UPDATE, ); } @@ -74,9 +74,9 @@ class TaskMoveColumnCategoryChange extends Base */ public function doAction(array $data) { - $original_task = $this->taskFinder->getById($data['task_id']); + $original_task = $this->taskFinderModel->getById($data['task_id']); - return $this->taskPosition->movePosition( + return $this->taskPositionModel->movePosition( $data['project_id'], $data['task_id'], $this->getParam('dest_column_id'), diff --git a/sources/app/Action/TaskMoveColumnUnAssigned.php b/sources/app/Action/TaskMoveColumnUnAssigned.php index 99ef935..c3ae9e1 100644 --- a/sources/app/Action/TaskMoveColumnUnAssigned.php +++ b/sources/app/Action/TaskMoveColumnUnAssigned.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Move a task to another column when an assignee is cleared @@ -32,8 +32,8 @@ class TaskMoveColumnUnAssigned extends Base public function getCompatibleEvents() { return array( - Task::EVENT_ASSIGNEE_CHANGE, - Task::EVENT_UPDATE, + TaskModel::EVENT_ASSIGNEE_CHANGE, + TaskModel::EVENT_UPDATE, ); } @@ -75,9 +75,9 @@ class TaskMoveColumnUnAssigned extends Base */ public function doAction(array $data) { - $original_task = $this->taskFinder->getById($data['task_id']); + $original_task = $this->taskFinderModel->getById($data['task_id']); - return $this->taskPosition->movePosition( + return $this->taskPositionModel->movePosition( $data['project_id'], $data['task_id'], $this->getParam('dest_column_id'), diff --git a/sources/app/Action/TaskOpen.php b/sources/app/Action/TaskOpen.php index ec0f96f..8e847b8 100644 --- a/sources/app/Action/TaskOpen.php +++ b/sources/app/Action/TaskOpen.php @@ -63,7 +63,7 @@ class TaskOpen extends Base */ public function doAction(array $data) { - return $this->taskStatus->open($data['task_id']); + return $this->taskStatusModel->open($data['task_id']); } /** diff --git a/sources/app/Action/TaskUpdateStartDate.php b/sources/app/Action/TaskUpdateStartDate.php index e5cea01..e5410a8 100644 --- a/sources/app/Action/TaskUpdateStartDate.php +++ b/sources/app/Action/TaskUpdateStartDate.php @@ -2,7 +2,7 @@ namespace Kanboard\Action; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Set the start date of task @@ -32,7 +32,7 @@ class TaskUpdateStartDate extends Base public function getCompatibleEvents() { return array( - Task::EVENT_MOVE_COLUMN, + TaskModel::EVENT_MOVE_COLUMN, ); } @@ -77,7 +77,7 @@ class TaskUpdateStartDate extends Base 'date_started' => time(), ); - return $this->taskModification->update($values, false); + return $this->taskModificationModel->update($values, false); } /** diff --git a/sources/app/Analytic/AverageLeadCycleTimeAnalytic.php b/sources/app/Analytic/AverageLeadCycleTimeAnalytic.php index 62c8355..d6cd1f8 100644 --- a/sources/app/Analytic/AverageLeadCycleTimeAnalytic.php +++ b/sources/app/Analytic/AverageLeadCycleTimeAnalytic.php @@ -3,7 +3,7 @@ namespace Kanboard\Analytic; use Kanboard\Core\Base; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Average Lead and Cycle Time @@ -106,7 +106,7 @@ class AverageLeadCycleTimeAnalytic extends Base private function getTasks($project_id) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->columns('date_completed', 'date_creation', 'date_started') ->eq('project_id', $project_id) ->desc('id') diff --git a/sources/app/Analytic/AverageTimeSpentColumnAnalytic.php b/sources/app/Analytic/AverageTimeSpentColumnAnalytic.php index 1107832..3556fb9 100644 --- a/sources/app/Analytic/AverageTimeSpentColumnAnalytic.php +++ b/sources/app/Analytic/AverageTimeSpentColumnAnalytic.php @@ -3,7 +3,7 @@ namespace Kanboard\Analytic; use Kanboard\Core\Base; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Average Time Spent by Column @@ -40,7 +40,7 @@ class AverageTimeSpentColumnAnalytic extends Base private function initialize($project_id) { $stats = array(); - $columns = $this->column->getList($project_id); + $columns = $this->columnModel->getList($project_id); foreach ($columns as $column_id => $column_title) { $stats[$column_id] = array( @@ -110,7 +110,7 @@ class AverageTimeSpentColumnAnalytic extends Base */ private function getTaskTimeByColumns(array &$task) { - $columns = $this->transition->getTimeSpentByTask($task['id']); + $columns = $this->transitionModel->getTimeSpentByTask($task['id']); if (! isset($columns[$task['column_id']])) { $columns[$task['column_id']] = 0; @@ -144,7 +144,7 @@ class AverageTimeSpentColumnAnalytic extends Base private function getTasks($project_id) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->columns('id', 'date_completed', 'date_moved', 'column_id') ->eq('project_id', $project_id) ->desc('id') diff --git a/sources/app/Analytic/EstimatedTimeComparisonAnalytic.php b/sources/app/Analytic/EstimatedTimeComparisonAnalytic.php index 490bcd5..d9aea32 100644 --- a/sources/app/Analytic/EstimatedTimeComparisonAnalytic.php +++ b/sources/app/Analytic/EstimatedTimeComparisonAnalytic.php @@ -3,7 +3,7 @@ namespace Kanboard\Analytic; use Kanboard\Core\Base; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Estimated/Spent Time Comparison @@ -22,7 +22,7 @@ class EstimatedTimeComparisonAnalytic extends Base */ public function build($project_id) { - $rows = $this->db->table(Task::TABLE) + $rows = $this->db->table(TaskModel::TABLE) ->columns('SUM(time_estimated) AS time_estimated', 'SUM(time_spent) AS time_spent', 'is_active') ->eq('project_id', $project_id) ->groupBy('is_active') @@ -40,7 +40,7 @@ class EstimatedTimeComparisonAnalytic extends Base ); foreach ($rows as $row) { - $key = $row['is_active'] == Task::STATUS_OPEN ? 'open' : 'closed'; + $key = $row['is_active'] == TaskModel::STATUS_OPEN ? 'open' : 'closed'; $metrics[$key]['time_spent'] = $row['time_spent']; $metrics[$key]['time_estimated'] = $row['time_estimated']; } diff --git a/sources/app/Analytic/TaskDistributionAnalytic.php b/sources/app/Analytic/TaskDistributionAnalytic.php index 838652e..447d88a 100644 --- a/sources/app/Analytic/TaskDistributionAnalytic.php +++ b/sources/app/Analytic/TaskDistributionAnalytic.php @@ -23,10 +23,10 @@ class TaskDistributionAnalytic extends Base { $metrics = array(); $total = 0; - $columns = $this->column->getAll($project_id); + $columns = $this->columnModel->getAll($project_id); foreach ($columns as $column) { - $nb_tasks = $this->taskFinder->countByColumnId($project_id, $column['id']); + $nb_tasks = $this->taskFinderModel->countByColumnId($project_id, $column['id']); $total += $nb_tasks; $metrics[] = array( diff --git a/sources/app/Analytic/UserDistributionAnalytic.php b/sources/app/Analytic/UserDistributionAnalytic.php index e1815f9..421d424 100644 --- a/sources/app/Analytic/UserDistributionAnalytic.php +++ b/sources/app/Analytic/UserDistributionAnalytic.php @@ -23,8 +23,8 @@ class UserDistributionAnalytic extends Base { $metrics = array(); $total = 0; - $tasks = $this->taskFinder->getAll($project_id); - $users = $this->projectUserRole->getAssignableUsersList($project_id); + $tasks = $this->taskFinderModel->getAll($project_id); + $users = $this->projectUserRoleModel->getAssignableUsersList($project_id); foreach ($tasks as $task) { $user = isset($users[$task['owner_id']]) ? $users[$task['owner_id']] : $users[0]; diff --git a/sources/app/Api/Authorization/ActionAuthorization.php b/sources/app/Api/Authorization/ActionAuthorization.php new file mode 100644 index 0000000..4b41ad8 --- /dev/null +++ b/sources/app/Api/Authorization/ActionAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->actionModel->getProjectId($action_id)); + } + } +} diff --git a/sources/app/Api/Authorization/CategoryAuthorization.php b/sources/app/Api/Authorization/CategoryAuthorization.php new file mode 100644 index 0000000..f17265a --- /dev/null +++ b/sources/app/Api/Authorization/CategoryAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->categoryModel->getProjectId($category_id)); + } + } +} diff --git a/sources/app/Api/Authorization/ColumnAuthorization.php b/sources/app/Api/Authorization/ColumnAuthorization.php new file mode 100644 index 0000000..37aecda --- /dev/null +++ b/sources/app/Api/Authorization/ColumnAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->columnModel->getProjectId($column_id)); + } + } +} diff --git a/sources/app/Api/Authorization/CommentAuthorization.php b/sources/app/Api/Authorization/CommentAuthorization.php new file mode 100644 index 0000000..ed15512 --- /dev/null +++ b/sources/app/Api/Authorization/CommentAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->commentModel->getProjectId($comment_id)); + } + } +} diff --git a/sources/app/Api/Authorization/ProcedureAuthorization.php b/sources/app/Api/Authorization/ProcedureAuthorization.php new file mode 100644 index 0000000..070a637 --- /dev/null +++ b/sources/app/Api/Authorization/ProcedureAuthorization.php @@ -0,0 +1,32 @@ +userSession->isLogged() && in_array($procedure, $this->userSpecificProcedures)) { + throw new AccessDeniedException('This procedure is not available with the API credentials'); + } + } +} diff --git a/sources/app/Api/Authorization/ProjectAuthorization.php b/sources/app/Api/Authorization/ProjectAuthorization.php new file mode 100644 index 0000000..21ecf31 --- /dev/null +++ b/sources/app/Api/Authorization/ProjectAuthorization.php @@ -0,0 +1,35 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $project_id); + } + } + + protected function checkProjectPermission($class, $method, $project_id) + { + if (empty($project_id)) { + throw new AccessDeniedException('Project not found'); + } + + $role = $this->projectUserRoleModel->getUserRole($project_id, $this->userSession->getId()); + + if (! $this->apiProjectAuthorization->isAllowed($class, $method, $role)) { + throw new AccessDeniedException('Project access denied'); + } + } +} diff --git a/sources/app/Api/Authorization/SubtaskAuthorization.php b/sources/app/Api/Authorization/SubtaskAuthorization.php new file mode 100644 index 0000000..fcb5792 --- /dev/null +++ b/sources/app/Api/Authorization/SubtaskAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->subtaskModel->getProjectId($subtask_id)); + } + } +} diff --git a/sources/app/Api/Authorization/TaskAuthorization.php b/sources/app/Api/Authorization/TaskAuthorization.php new file mode 100644 index 0000000..db93b76 --- /dev/null +++ b/sources/app/Api/Authorization/TaskAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->taskFinderModel->getProjectId($category_id)); + } + } +} diff --git a/sources/app/Api/Authorization/TaskFileAuthorization.php b/sources/app/Api/Authorization/TaskFileAuthorization.php new file mode 100644 index 0000000..e40783e --- /dev/null +++ b/sources/app/Api/Authorization/TaskFileAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->taskFileModel->getProjectId($file_id)); + } + } +} diff --git a/sources/app/Api/Authorization/TaskLinkAuthorization.php b/sources/app/Api/Authorization/TaskLinkAuthorization.php new file mode 100644 index 0000000..2f5fc8d --- /dev/null +++ b/sources/app/Api/Authorization/TaskLinkAuthorization.php @@ -0,0 +1,19 @@ +userSession->isLogged()) { + $this->checkProjectPermission($class, $method, $this->taskLinkModel->getProjectId($task_link_id)); + } + } +} diff --git a/sources/app/Api/Authorization/UserAuthorization.php b/sources/app/Api/Authorization/UserAuthorization.php new file mode 100644 index 0000000..3fd6865 --- /dev/null +++ b/sources/app/Api/Authorization/UserAuthorization.php @@ -0,0 +1,22 @@ +userSession->isLogged() && ! $this->apiAuthorization->isAllowed($class, $method, $this->userSession->getRole())) { + throw new AccessDeniedException('You are not allowed to access to this resource'); + } + } +} diff --git a/sources/app/Api/Base.php b/sources/app/Api/Base.php deleted file mode 100644 index 0959817..0000000 --- a/sources/app/Api/Base.php +++ /dev/null @@ -1,117 +0,0 @@ -both_allowed_procedures); - $is_user_procedure = in_array($procedure, $this->user_allowed_procedures); - - if ($is_user && ! $is_both_procedure && ! $is_user_procedure) { - throw new AccessDeniedException('Permission denied'); - } elseif (! $is_user && ! $is_both_procedure && $is_user_procedure) { - throw new AccessDeniedException('Permission denied'); - } - - $this->logger->debug('API call: '.$procedure); - } - - public function checkProjectPermission($project_id) - { - if ($this->userSession->isLogged() && ! $this->projectPermission->isUserAllowed($project_id, $this->userSession->getId())) { - throw new AccessDeniedException('Permission denied'); - } - } - - public function checkTaskPermission($task_id) - { - if ($this->userSession->isLogged()) { - $this->checkProjectPermission($this->taskFinder->getProjectId($task_id)); - } - } - - protected function formatTask($task) - { - if (! empty($task)) { - $task['url'] = $this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), '', true); - $task['color'] = $this->color->getColorProperties($task['color_id']); - } - - return $task; - } - - protected function formatTasks($tasks) - { - if (! empty($tasks)) { - foreach ($tasks as &$task) { - $task = $this->formatTask($task); - } - } - - return $tasks; - } - - protected function formatProject($project) - { - if (! empty($project)) { - $project['url'] = array( - 'board' => $this->helper->url->to('board', 'show', array('project_id' => $project['id']), '', true), - 'calendar' => $this->helper->url->to('calendar', 'show', array('project_id' => $project['id']), '', true), - 'list' => $this->helper->url->to('listing', 'show', array('project_id' => $project['id']), '', true), - ); - } - - return $project; - } - - protected function formatProjects($projects) - { - if (! empty($projects)) { - foreach ($projects as &$project) { - $project = $this->formatProject($project); - } - } - - return $projects; - } -} diff --git a/sources/app/Api/Board.php b/sources/app/Api/Board.php deleted file mode 100644 index 185ac51..0000000 --- a/sources/app/Api/Board.php +++ /dev/null @@ -1,18 +0,0 @@ -checkProjectPermission($project_id); - return $this->board->getBoard($project_id); - } -} diff --git a/sources/app/Api/Category.php b/sources/app/Api/Category.php deleted file mode 100644 index fbd61c5..0000000 --- a/sources/app/Api/Category.php +++ /dev/null @@ -1,49 +0,0 @@ -category->getById($category_id); - } - - public function getAllCategories($project_id) - { - return $this->category->getAll($project_id); - } - - public function removeCategory($category_id) - { - return $this->category->remove($category_id); - } - - public function createCategory($project_id, $name) - { - $values = array( - 'project_id' => $project_id, - 'name' => $name, - ); - - list($valid, ) = $this->categoryValidator->validateCreation($values); - return $valid ? $this->category->create($values) : false; - } - - public function updateCategory($id, $name) - { - $values = array( - 'id' => $id, - 'name' => $name, - ); - - list($valid, ) = $this->categoryValidator->validateModification($values); - return $valid && $this->category->update($values); - } -} diff --git a/sources/app/Api/Column.php b/sources/app/Api/Column.php deleted file mode 100644 index ddc3a5d..0000000 --- a/sources/app/Api/Column.php +++ /dev/null @@ -1,42 +0,0 @@ -column->getAll($project_id); - } - - public function getColumn($column_id) - { - return $this->column->getById($column_id); - } - - public function updateColumn($column_id, $title, $task_limit = 0, $description = '') - { - return $this->column->update($column_id, $title, $task_limit, $description); - } - - public function addColumn($project_id, $title, $task_limit = 0, $description = '') - { - return $this->column->create($project_id, $title, $task_limit, $description); - } - - public function removeColumn($column_id) - { - return $this->column->remove($column_id); - } - - public function changeColumnPosition($project_id, $column_id, $position) - { - return $this->column->changePosition($project_id, $column_id, $position); - } -} diff --git a/sources/app/Api/Comment.php b/sources/app/Api/Comment.php deleted file mode 100644 index 1fc1c70..0000000 --- a/sources/app/Api/Comment.php +++ /dev/null @@ -1,52 +0,0 @@ -comment->getById($comment_id); - } - - public function getAllComments($task_id) - { - return $this->comment->getAll($task_id); - } - - public function removeComment($comment_id) - { - return $this->comment->remove($comment_id); - } - - public function createComment($task_id, $user_id, $content, $reference = '') - { - $values = array( - 'task_id' => $task_id, - 'user_id' => $user_id, - 'comment' => $content, - 'reference' => $reference, - ); - - list($valid, ) = $this->commentValidator->validateCreation($values); - - return $valid ? $this->comment->create($values) : false; - } - - public function updateComment($id, $content) - { - $values = array( - 'id' => $id, - 'comment' => $content, - ); - - list($valid, ) = $this->commentValidator->validateModification($values); - return $valid && $this->comment->update($values); - } -} diff --git a/sources/app/Api/File.php b/sources/app/Api/File.php deleted file mode 100644 index 71c31c7..0000000 --- a/sources/app/Api/File.php +++ /dev/null @@ -1,90 +0,0 @@ -taskFile->getById($file_id); - } - - public function getAllTaskFiles($task_id) - { - return $this->taskFile->getAll($task_id); - } - - public function downloadTaskFile($file_id) - { - try { - $file = $this->taskFile->getById($file_id); - - if (! empty($file)) { - return base64_encode($this->objectStorage->get($file['path'])); - } - } catch (ObjectStorageException $e) { - $this->logger->error($e->getMessage()); - return ''; - } - } - - public function createTaskFile($project_id, $task_id, $filename, $blob) - { - try { - return $this->taskFile->uploadContent($task_id, $filename, $blob); - } catch (ObjectStorageException $e) { - $this->logger->error($e->getMessage()); - return false; - } - } - - public function removeTaskFile($file_id) - { - return $this->taskFile->remove($file_id); - } - - public function removeAllTaskFiles($task_id) - { - return $this->taskFile->removeAll($task_id); - } - - // Deprecated procedures - - public function getFile($file_id) - { - return $this->getTaskFile($file_id); - } - - public function getAllFiles($task_id) - { - return $this->getAllTaskFiles($task_id); - } - - public function downloadFile($file_id) - { - return $this->downloadTaskFile($file_id); - } - - public function createFile($project_id, $task_id, $filename, $blob) - { - return $this->createTaskFile($project_id, $task_id, $filename, $blob); - } - - public function removeFile($file_id) - { - return $this->removeTaskFile($file_id); - } - - public function removeAllFiles($task_id) - { - return $this->removeAllTaskFiles($task_id); - } -} diff --git a/sources/app/Api/GroupMember.php b/sources/app/Api/GroupMember.php deleted file mode 100644 index de62f0c..0000000 --- a/sources/app/Api/GroupMember.php +++ /dev/null @@ -1,32 +0,0 @@ -groupMember->getMembers($group_id); - } - - public function addGroupMember($group_id, $user_id) - { - return $this->groupMember->addUser($group_id, $user_id); - } - - public function removeGroupMember($group_id, $user_id) - { - return $this->groupMember->removeUser($group_id, $user_id); - } - - public function isGroupMember($group_id, $user_id) - { - return $this->groupMember->isMember($group_id, $user_id); - } -} diff --git a/sources/app/Api/Me.php b/sources/app/Api/Me.php deleted file mode 100644 index ccc809e..0000000 --- a/sources/app/Api/Me.php +++ /dev/null @@ -1,72 +0,0 @@ -sessionStorage->user; - } - - public function getMyDashboard() - { - $user_id = $this->userSession->getId(); - $projects = $this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id))->findAll(); - $tasks = $this->taskFinder->getUserQuery($user_id)->findAll(); - - return array( - 'projects' => $this->formatProjects($projects), - 'tasks' => $this->formatTasks($tasks), - 'subtasks' => $this->subtask->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS))->findAll(), - ); - } - - public function getMyActivityStream() - { - $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); - return $this->projectActivity->getProjects($project_ids, 100); - } - - public function createMyPrivateProject($name, $description = null) - { - if ($this->config->get('disable_private_project', 0) == 1) { - return false; - } - - $values = array( - 'name' => $name, - 'description' => $description, - 'is_private' => 1, - ); - - list($valid, ) = $this->projectValidator->validateCreation($values); - return $valid ? $this->project->create($values, $this->userSession->getId(), true) : false; - } - - public function getMyProjectsList() - { - return $this->projectUserRole->getProjectsByUser($this->userSession->getId()); - } - - public function getMyOverdueTasks() - { - return $this->taskFinder->getOverdueTasksByUser($this->userSession->getId()); - } - - public function getMyProjects() - { - $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); - $projects = $this->project->getAllByIds($project_ids); - - return $this->formatProjects($projects); - } -} diff --git a/sources/app/Api/Auth.php b/sources/app/Api/Middleware/AuthenticationMiddleware.php similarity index 51% rename from sources/app/Api/Auth.php rename to sources/app/Api/Middleware/AuthenticationMiddleware.php index 6c6e1eb..8e30959 100644 --- a/sources/app/Api/Auth.php +++ b/sources/app/Api/Middleware/AuthenticationMiddleware.php @@ -1,38 +1,39 @@ dispatcher->dispatch('app.bootstrap'); if ($this->isUserAuthenticated($username, $password)) { - $this->checkProcedurePermission(true, $method); - $this->userSession->initialize($this->user->getByUsername($username)); - } elseif ($this->isAppAuthenticated($username, $password)) { - $this->checkProcedurePermission(false, $method); - } else { + $this->userSession->initialize($this->userModel->getByUsername($username)); + } elseif (! $this->isAppAuthenticated($username, $password)) { $this->logger->error('API authentication failure for '.$username); - throw new AuthenticationFailure('Wrong credentials'); + throw new AuthenticationFailureException('Wrong credentials'); } } @@ -47,8 +48,8 @@ class Auth extends Base private function isUserAuthenticated($username, $password) { return $username !== 'jsonrpc' && - ! $this->userLocking->isLocked($username) && - $this->authenticationManager->passwordAuthentication($username, $password); + ! $this->userLockingModel->isLocked($username) && + $this->authenticationManager->passwordAuthentication($username, $password); } /** @@ -76,6 +77,6 @@ class Auth extends Base return API_AUTHENTICATION_TOKEN; } - return $this->config->get('api_token'); + return $this->configModel->get('api_token'); } } diff --git a/sources/app/Api/Action.php b/sources/app/Api/Procedure/ActionProcedure.php similarity index 70% rename from sources/app/Api/Action.php rename to sources/app/Api/Procedure/ActionProcedure.php index 9e3b86f..4043dbb 100644 --- a/sources/app/Api/Action.php +++ b/sources/app/Api/Procedure/ActionProcedure.php @@ -1,14 +1,17 @@ action->remove($action_id); + ActionAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeAction', $action_id); + return $this->actionModel->remove($action_id); } public function getActions($project_id) { - return $this->action->getAllByProject($project_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getActions', $project_id); + return $this->actionModel->getAllByProject($project_id); } public function createAction($project_id, $event_name, $action_name, array $params) { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createAction', $project_id); $values = array( 'project_id' => $project_id, 'event_name' => $event_name, @@ -80,6 +86,6 @@ class Action extends \Kanboard\Core\Base } } - return $this->action->create($values); + return $this->actionModel->create($values); } } diff --git a/sources/app/Api/App.php b/sources/app/Api/Procedure/AppProcedure.php similarity index 63% rename from sources/app/Api/App.php rename to sources/app/Api/Procedure/AppProcedure.php index 635f1ce..60af4a6 100644 --- a/sources/app/Api/App.php +++ b/sources/app/Api/Procedure/AppProcedure.php @@ -1,18 +1,18 @@ config->get('application_timezone'); + return $this->timezoneModel->getCurrentTimezone(); } public function getVersion() @@ -22,17 +22,17 @@ class App extends \Kanboard\Core\Base public function getDefaultTaskColor() { - return $this->color->getDefaultColor(); + return $this->colorModel->getDefaultColor(); } public function getDefaultTaskColors() { - return $this->color->getDefaultColors(); + return $this->colorModel->getDefaultColors(); } public function getColorList() { - return $this->color->getList(); + return $this->colorModel->getList(); } public function getApplicationRoles() diff --git a/sources/app/Api/Procedure/BaseProcedure.php b/sources/app/Api/Procedure/BaseProcedure.php new file mode 100644 index 0000000..e31b302 --- /dev/null +++ b/sources/app/Api/Procedure/BaseProcedure.php @@ -0,0 +1,85 @@ +container)->check($procedure); + UserAuthorization::getInstance($this->container)->check($this->getClassName(), $procedure); + } + + protected function formatTask($task) + { + if (! empty($task)) { + $task['url'] = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), '', true); + $task['color'] = $this->colorModel->getColorProperties($task['color_id']); + } + + return $task; + } + + protected function formatTasks($tasks) + { + if (! empty($tasks)) { + foreach ($tasks as &$task) { + $task = $this->formatTask($task); + } + } + + return $tasks; + } + + protected function formatProject($project) + { + if (! empty($project)) { + $project['url'] = array( + 'board' => $this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id']), '', true), + 'calendar' => $this->helper->url->to('CalendarController', 'show', array('project_id' => $project['id']), '', true), + 'list' => $this->helper->url->to('TaskListController', 'show', array('project_id' => $project['id']), '', true), + ); + } + + return $project; + } + + protected function formatProjects($projects) + { + if (! empty($projects)) { + foreach ($projects as &$project) { + $project = $this->formatProject($project); + } + } + + return $projects; + } + + protected function filterValues(array $values) + { + foreach ($values as $key => $value) { + if (is_null($value)) { + unset($values[$key]); + } + } + + return $values; + } + + protected function getClassName() + { + $reflection = new ReflectionClass(get_called_class()); + return $reflection->getShortName(); + } +} diff --git a/sources/app/Api/Procedure/BoardProcedure.php b/sources/app/Api/Procedure/BoardProcedure.php new file mode 100644 index 0000000..674b546 --- /dev/null +++ b/sources/app/Api/Procedure/BoardProcedure.php @@ -0,0 +1,25 @@ +container)->check($this->getClassName(), 'getBoard', $project_id); + + return BoardFormatter::getInstance($this->container) + ->withProjectId($project_id) + ->withQuery($this->taskFinderModel->getExtendedQuery()) + ->format(); + } +} diff --git a/sources/app/Api/Procedure/CategoryProcedure.php b/sources/app/Api/Procedure/CategoryProcedure.php new file mode 100644 index 0000000..3ebbd90 --- /dev/null +++ b/sources/app/Api/Procedure/CategoryProcedure.php @@ -0,0 +1,59 @@ +container)->check($this->getClassName(), 'getCategory', $category_id); + return $this->categoryModel->getById($category_id); + } + + public function getAllCategories($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllCategories', $project_id); + return $this->categoryModel->getAll($project_id); + } + + public function removeCategory($category_id) + { + CategoryAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeCategory', $category_id); + return $this->categoryModel->remove($category_id); + } + + public function createCategory($project_id, $name) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createCategory', $project_id); + + $values = array( + 'project_id' => $project_id, + 'name' => $name, + ); + + list($valid, ) = $this->categoryValidator->validateCreation($values); + return $valid ? $this->categoryModel->create($values) : false; + } + + public function updateCategory($id, $name) + { + CategoryAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateCategory', $id); + + $values = array( + 'id' => $id, + 'name' => $name, + ); + + list($valid, ) = $this->categoryValidator->validateModification($values); + return $valid && $this->categoryModel->update($values); + } +} diff --git a/sources/app/Api/Procedure/ColumnProcedure.php b/sources/app/Api/Procedure/ColumnProcedure.php new file mode 100644 index 0000000..ab9d173 --- /dev/null +++ b/sources/app/Api/Procedure/ColumnProcedure.php @@ -0,0 +1,51 @@ +container)->check($this->getClassName(), 'getColumns', $project_id); + return $this->columnModel->getAll($project_id); + } + + public function getColumn($column_id) + { + ColumnAuthorization::getInstance($this->container)->check($this->getClassName(), 'getColumn', $column_id); + return $this->columnModel->getById($column_id); + } + + public function updateColumn($column_id, $title, $task_limit = 0, $description = '') + { + ColumnAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateColumn', $column_id); + return $this->columnModel->update($column_id, $title, $task_limit, $description); + } + + public function addColumn($project_id, $title, $task_limit = 0, $description = '') + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'addColumn', $project_id); + return $this->columnModel->create($project_id, $title, $task_limit, $description); + } + + public function removeColumn($column_id) + { + ColumnAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeColumn', $column_id); + return $this->columnModel->remove($column_id); + } + + public function changeColumnPosition($project_id, $column_id, $position) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'changeColumnPosition', $project_id); + return $this->columnModel->changePosition($project_id, $column_id, $position); + } +} diff --git a/sources/app/Api/Procedure/CommentProcedure.php b/sources/app/Api/Procedure/CommentProcedure.php new file mode 100644 index 0000000..019a49b --- /dev/null +++ b/sources/app/Api/Procedure/CommentProcedure.php @@ -0,0 +1,62 @@ +container)->check($this->getClassName(), 'getComment', $comment_id); + return $this->commentModel->getById($comment_id); + } + + public function getAllComments($task_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllComments', $task_id); + return $this->commentModel->getAll($task_id); + } + + public function removeComment($comment_id) + { + CommentAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeComment', $comment_id); + return $this->commentModel->remove($comment_id); + } + + public function createComment($task_id, $user_id, $content, $reference = '') + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'createComment', $task_id); + + $values = array( + 'task_id' => $task_id, + 'user_id' => $user_id, + 'comment' => $content, + 'reference' => $reference, + ); + + list($valid, ) = $this->commentValidator->validateCreation($values); + + return $valid ? $this->commentModel->create($values) : false; + } + + public function updateComment($id, $content) + { + CommentAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateComment', $id); + + $values = array( + 'id' => $id, + 'comment' => $content, + ); + + list($valid, ) = $this->commentValidator->validateModification($values); + return $valid && $this->commentModel->update($values); + } +} diff --git a/sources/app/Api/Procedure/GroupMemberProcedure.php b/sources/app/Api/Procedure/GroupMemberProcedure.php new file mode 100644 index 0000000..081d6ac --- /dev/null +++ b/sources/app/Api/Procedure/GroupMemberProcedure.php @@ -0,0 +1,37 @@ +groupMemberModel->getGroups($user_id); + } + + public function getGroupMembers($group_id) + { + return $this->groupMemberModel->getMembers($group_id); + } + + public function addGroupMember($group_id, $user_id) + { + return $this->groupMemberModel->addUser($group_id, $user_id); + } + + public function removeGroupMember($group_id, $user_id) + { + return $this->groupMemberModel->removeUser($group_id, $user_id); + } + + public function isGroupMember($group_id, $user_id) + { + return $this->groupMemberModel->isMember($group_id, $user_id); + } +} diff --git a/sources/app/Api/Group.php b/sources/app/Api/Procedure/GroupProcedure.php similarity index 64% rename from sources/app/Api/Group.php rename to sources/app/Api/Procedure/GroupProcedure.php index a1e0a73..804940a 100644 --- a/sources/app/Api/Group.php +++ b/sources/app/Api/Procedure/GroupProcedure.php @@ -1,18 +1,18 @@ group->create($name, $external_id); + return $this->groupModel->create($name, $external_id); } public function updateGroup($group_id, $name = null, $external_id = null) @@ -29,21 +29,21 @@ class Group extends \Kanboard\Core\Base } } - return $this->group->update($values); + return $this->groupModel->update($values); } public function removeGroup($group_id) { - return $this->group->remove($group_id); + return $this->groupModel->remove($group_id); } public function getGroup($group_id) { - return $this->group->getById($group_id); + return $this->groupModel->getById($group_id); } public function getAllGroups() { - return $this->group->getAll(); + return $this->groupModel->getAll(); } } diff --git a/sources/app/Api/Link.php b/sources/app/Api/Procedure/LinkProcedure.php similarity index 78% rename from sources/app/Api/Link.php rename to sources/app/Api/Procedure/LinkProcedure.php index 23a9916..b4cecf3 100644 --- a/sources/app/Api/Link.php +++ b/sources/app/Api/Procedure/LinkProcedure.php @@ -1,14 +1,14 @@ link->getById($link_id); + return $this->linkModel->getById($link_id); } /** @@ -31,7 +31,7 @@ class Link extends \Kanboard\Core\Base */ public function getLinkByLabel($label) { - return $this->link->getByLabel($label); + return $this->linkModel->getByLabel($label); } /** @@ -43,7 +43,7 @@ class Link extends \Kanboard\Core\Base */ public function getOppositeLinkId($link_id) { - return $this->link->getOppositeLinkId($link_id); + return $this->linkModel->getOppositeLinkId($link_id); } /** @@ -54,7 +54,7 @@ class Link extends \Kanboard\Core\Base */ public function getAllLinks() { - return $this->link->getAll(); + return $this->linkModel->getAll(); } /** @@ -73,7 +73,7 @@ class Link extends \Kanboard\Core\Base ); list($valid, ) = $this->linkValidator->validateCreation($values); - return $valid ? $this->link->create($label, $opposite_label) : false; + return $valid ? $this->linkModel->create($label, $opposite_label) : false; } /** @@ -94,7 +94,7 @@ class Link extends \Kanboard\Core\Base ); list($valid, ) = $this->linkValidator->validateModification($values); - return $valid && $this->link->update($values); + return $valid && $this->linkModel->update($values); } /** @@ -106,6 +106,6 @@ class Link extends \Kanboard\Core\Base */ public function removeLink($link_id) { - return $this->link->remove($link_id); + return $this->linkModel->remove($link_id); } } diff --git a/sources/app/Api/Procedure/MeProcedure.php b/sources/app/Api/Procedure/MeProcedure.php new file mode 100644 index 0000000..e59e652 --- /dev/null +++ b/sources/app/Api/Procedure/MeProcedure.php @@ -0,0 +1,72 @@ +sessionStorage->user; + } + + public function getMyDashboard() + { + $user_id = $this->userSession->getId(); + $projects = $this->projectModel->getQueryColumnStats($this->projectPermissionModel->getActiveProjectIds($user_id))->findAll(); + $tasks = $this->taskFinderModel->getUserQuery($user_id)->findAll(); + + return array( + 'projects' => $this->formatProjects($projects), + 'tasks' => $this->formatTasks($tasks), + 'subtasks' => $this->subtaskModel->getUserQuery($user_id, array(SubtaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS))->findAll(), + ); + } + + public function getMyActivityStream() + { + $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId()); + return $this->helper->projectActivity->getProjectsEvents($project_ids, 100); + } + + public function createMyPrivateProject($name, $description = null) + { + if ($this->configModel->get('disable_private_project', 0) == 1) { + return false; + } + + $values = array( + 'name' => $name, + 'description' => $description, + 'is_private' => 1, + ); + + list($valid, ) = $this->projectValidator->validateCreation($values); + return $valid ? $this->projectModel->create($values, $this->userSession->getId(), true) : false; + } + + public function getMyProjectsList() + { + return $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId()); + } + + public function getMyOverdueTasks() + { + return $this->taskFinderModel->getOverdueTasksByUser($this->userSession->getId()); + } + + public function getMyProjects() + { + $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId()); + $projects = $this->projectModel->getAllByIds($project_ids); + + return $this->formatProjects($projects); + } +} diff --git a/sources/app/Api/Procedure/ProjectFileProcedure.php b/sources/app/Api/Procedure/ProjectFileProcedure.php new file mode 100644 index 0000000..48466ce --- /dev/null +++ b/sources/app/Api/Procedure/ProjectFileProcedure.php @@ -0,0 +1,68 @@ +container)->check($this->getClassName(), 'getProjectFile', $project_id); + return $this->projectFileModel->getById($file_id); + } + + public function getAllProjectFiles($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllProjectFiles', $project_id); + return $this->projectFileModel->getAll($project_id); + } + + public function downloadProjectFile($project_id, $file_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'downloadProjectFile', $project_id); + + try { + $file = $this->projectFileModel->getById($file_id); + + if (! empty($file)) { + return base64_encode($this->objectStorage->get($file['path'])); + } + } catch (ObjectStorageException $e) { + $this->logger->error($e->getMessage()); + } + + return ''; + } + + public function createProjectFile($project_id, $filename, $blob) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createProjectFile', $project_id); + + try { + return $this->projectFileModel->uploadContent($project_id, $filename, $blob); + } catch (ObjectStorageException $e) { + $this->logger->error(__METHOD__.': '.$e->getMessage()); + return false; + } + } + + public function removeProjectFile($project_id, $file_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeProjectFile', $project_id); + return $this->projectFileModel->remove($file_id); + } + + public function removeAllProjectFiles($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeAllProjectFiles', $project_id); + return $this->projectFileModel->removeAll($project_id); + } +} diff --git a/sources/app/Api/Procedure/ProjectPermissionProcedure.php b/sources/app/Api/Procedure/ProjectPermissionProcedure.php new file mode 100644 index 0000000..e22e1d6 --- /dev/null +++ b/sources/app/Api/Procedure/ProjectPermissionProcedure.php @@ -0,0 +1,69 @@ +container)->check($this->getClassName(), 'getProjectUsers', $project_id); + return $this->projectUserRoleModel->getAllUsers($project_id); + } + + public function getAssignableUsers($project_id, $prepend_unassigned = false) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAssignableUsers', $project_id); + return $this->projectUserRoleModel->getAssignableUsersList($project_id, $prepend_unassigned); + } + + public function addProjectUser($project_id, $user_id, $role = Role::PROJECT_MEMBER) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'addProjectUser', $project_id); + return $this->projectUserRoleModel->addUser($project_id, $user_id, $role); + } + + public function addProjectGroup($project_id, $group_id, $role = Role::PROJECT_MEMBER) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'addProjectGroup', $project_id); + return $this->projectGroupRoleModel->addGroup($project_id, $group_id, $role); + } + + public function removeProjectUser($project_id, $user_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeProjectUser', $project_id); + return $this->projectUserRoleModel->removeUser($project_id, $user_id); + } + + public function removeProjectGroup($project_id, $group_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeProjectGroup', $project_id); + return $this->projectGroupRoleModel->removeGroup($project_id, $group_id); + } + + public function changeProjectUserRole($project_id, $user_id, $role) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'changeProjectUserRole', $project_id); + return $this->projectUserRoleModel->changeUserRole($project_id, $user_id, $role); + } + + public function changeProjectGroupRole($project_id, $group_id, $role) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'changeProjectGroupRole', $project_id); + return $this->projectGroupRoleModel->changeGroupRole($project_id, $group_id, $role); + } + + public function getProjectUserRole($project_id, $user_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getProjectUserRole', $project_id); + return $this->projectUserRoleModel->getUserRole($project_id, $user_id); + } +} diff --git a/sources/app/Api/Procedure/ProjectProcedure.php b/sources/app/Api/Procedure/ProjectProcedure.php new file mode 100644 index 0000000..a580c8d --- /dev/null +++ b/sources/app/Api/Procedure/ProjectProcedure.php @@ -0,0 +1,113 @@ +container)->check($this->getClassName(), 'getProjectById', $project_id); + return $this->formatProject($this->projectModel->getById($project_id)); + } + + public function getProjectByName($name) + { + $project = $this->projectModel->getByName($name); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getProjectByName', $project['id']); + return $this->formatProject($project); + } + + public function getProjectByIdentifier($identifier) + { + $project = $this->formatProject($this->projectModel->getByIdentifier($identifier)); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getProjectByIdentifier', $project['id']); + return $this->formatProject($project); + } + + public function getAllProjects() + { + return $this->formatProjects($this->projectModel->getAll()); + } + + public function removeProject($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeProject', $project_id); + return $this->projectModel->remove($project_id); + } + + public function enableProject($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'enableProject', $project_id); + return $this->projectModel->enable($project_id); + } + + public function disableProject($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'disableProject', $project_id); + return $this->projectModel->disable($project_id); + } + + public function enableProjectPublicAccess($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'enableProjectPublicAccess', $project_id); + return $this->projectModel->enablePublicAccess($project_id); + } + + public function disableProjectPublicAccess($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'disableProjectPublicAccess', $project_id); + return $this->projectModel->disablePublicAccess($project_id); + } + + public function getProjectActivities(array $project_ids) + { + foreach ($project_ids as $project_id) { + ProjectAuthorization::getInstance($this->container) + ->check($this->getClassName(), 'getProjectActivities', $project_id); + } + + return $this->helper->projectActivity->getProjectsEvents($project_ids); + } + + public function getProjectActivity($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getProjectActivity', $project_id); + return $this->helper->projectActivity->getProjectEvents($project_id); + } + + public function createProject($name, $description = null, $owner_id = 0, $identifier = null) + { + $values = $this->filterValues(array( + 'name' => $name, + 'description' => $description, + 'identifier' => $identifier, + )); + + list($valid, ) = $this->projectValidator->validateCreation($values); + return $valid ? $this->projectModel->create($values, $owner_id, $this->userSession->isLogged()) : false; + } + + public function updateProject($project_id, $name = null, $description = null, $owner_id = null, $identifier = null) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateProject', $project_id); + + $values = $this->filterValues(array( + 'id' => $project_id, + 'name' => $name, + 'description' => $description, + 'owner_id' => $owner_id, + 'identifier' => $identifier, + )); + + list($valid, ) = $this->projectValidator->validateModification($values); + return $valid && $this->projectModel->update($values); + } +} diff --git a/sources/app/Api/Subtask.php b/sources/app/Api/Procedure/SubtaskProcedure.php similarity index 55% rename from sources/app/Api/Subtask.php rename to sources/app/Api/Procedure/SubtaskProcedure.php index 782fdb0..e240091 100644 --- a/sources/app/Api/Subtask.php +++ b/sources/app/Api/Procedure/SubtaskProcedure.php @@ -1,32 +1,40 @@ subtask->getById($subtask_id); + SubtaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getSubtask', $subtask_id); + return $this->subtaskModel->getById($subtask_id); } public function getAllSubtasks($task_id) { - return $this->subtask->getAll($task_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllSubtasks', $task_id); + return $this->subtaskModel->getAll($task_id); } public function removeSubtask($subtask_id) { - return $this->subtask->remove($subtask_id); + SubtaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeSubtask', $subtask_id); + return $this->subtaskModel->remove($subtask_id); } public function createSubtask($task_id, $title, $user_id = 0, $time_estimated = 0, $time_spent = 0, $status = 0) { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'createSubtask', $task_id); + $values = array( 'title' => $title, 'task_id' => $task_id, @@ -37,11 +45,13 @@ class Subtask extends \Kanboard\Core\Base ); list($valid, ) = $this->subtaskValidator->validateCreation($values); - return $valid ? $this->subtask->create($values) : false; + return $valid ? $this->subtaskModel->create($values) : false; } public function updateSubtask($id, $task_id, $title = null, $user_id = null, $time_estimated = null, $time_spent = null, $status = null) { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateSubtask', $task_id); + $values = array( 'id' => $id, 'task_id' => $task_id, @@ -59,6 +69,6 @@ class Subtask extends \Kanboard\Core\Base } list($valid, ) = $this->subtaskValidator->validateApiModification($values); - return $valid && $this->subtask->update($values); + return $valid && $this->subtaskModel->update($values); } } diff --git a/sources/app/Api/Procedure/SubtaskTimeTrackingProcedure.php b/sources/app/Api/Procedure/SubtaskTimeTrackingProcedure.php new file mode 100644 index 0000000..5ceaa08 --- /dev/null +++ b/sources/app/Api/Procedure/SubtaskTimeTrackingProcedure.php @@ -0,0 +1,39 @@ +container)->check($this->getClassName(), 'hasSubtaskTimer', $subtask_id); + return $this->subtaskTimeTrackingModel->hasTimer($subtask_id, $user_id); + } + + public function setSubtaskStartTime($subtask_id, $user_id) + { + SubtaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'setSubtaskStartTime', $subtask_id); + return $this->subtaskTimeTrackingModel->logStartTime($subtask_id, $user_id); + } + + public function setSubtaskEndTime($subtask_id, $user_id) + { + SubtaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'setSubtaskEndTime', $subtask_id); + return $this->subtaskTimeTrackingModel->logEndTime($subtask_id, $user_id); + } + + public function getSubtaskTimeSpent($subtask_id, $user_id) + { + SubtaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getSubtaskTimeSpent', $subtask_id); + return $this->subtaskTimeTrackingModel->getTimeSpent($subtask_id, $user_id); + } +} diff --git a/sources/app/Api/Procedure/SwimlaneProcedure.php b/sources/app/Api/Procedure/SwimlaneProcedure.php new file mode 100644 index 0000000..9b7d181 --- /dev/null +++ b/sources/app/Api/Procedure/SwimlaneProcedure.php @@ -0,0 +1,91 @@ +container)->check($this->getClassName(), 'getActiveSwimlanes', $project_id); + return $this->swimlaneModel->getSwimlanes($project_id); + } + + public function getAllSwimlanes($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllSwimlanes', $project_id); + return $this->swimlaneModel->getAll($project_id); + } + + public function getSwimlaneById($swimlane_id) + { + $swimlane = $this->swimlaneModel->getById($swimlane_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getSwimlaneById', $swimlane['project_id']); + return $swimlane; + } + + public function getSwimlaneByName($project_id, $name) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getSwimlaneByName', $project_id); + return $this->swimlaneModel->getByName($project_id, $name); + } + + public function getSwimlane($swimlane_id) + { + return $this->swimlaneModel->getById($swimlane_id); + } + + public function getDefaultSwimlane($project_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getDefaultSwimlane', $project_id); + return $this->swimlaneModel->getDefault($project_id); + } + + public function addSwimlane($project_id, $name, $description = '') + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'addSwimlane', $project_id); + return $this->swimlaneModel->create(array('project_id' => $project_id, 'name' => $name, 'description' => $description)); + } + + public function updateSwimlane($swimlane_id, $name, $description = null) + { + $values = array('id' => $swimlane_id, 'name' => $name); + + if (!is_null($description)) { + $values['description'] = $description; + } + + return $this->swimlaneModel->update($values); + } + + public function removeSwimlane($project_id, $swimlane_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeSwimlane', $project_id); + return $this->swimlaneModel->remove($project_id, $swimlane_id); + } + + public function disableSwimlane($project_id, $swimlane_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'disableSwimlane', $project_id); + return $this->swimlaneModel->disable($project_id, $swimlane_id); + } + + public function enableSwimlane($project_id, $swimlane_id) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'enableSwimlane', $project_id); + return $this->swimlaneModel->enable($project_id, $swimlane_id); + } + + public function changeSwimlanePosition($project_id, $swimlane_id, $position) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'changeSwimlanePosition', $project_id); + return $this->swimlaneModel->changePosition($project_id, $swimlane_id, $position); + } +} diff --git a/sources/app/Api/Procedure/TaskExternalLinkProcedure.php b/sources/app/Api/Procedure/TaskExternalLinkProcedure.php new file mode 100644 index 0000000..05ec690 --- /dev/null +++ b/sources/app/Api/Procedure/TaskExternalLinkProcedure.php @@ -0,0 +1,106 @@ +externalLinkManager->getTypes(); + } + + public function getExternalTaskLinkProviderDependencies($providerName) + { + try { + return $this->externalLinkManager->getProvider($providerName)->getDependencies(); + } catch (ExternalLinkProviderNotFound $e) { + $this->logger->error(__METHOD__.': '.$e->getMessage()); + return false; + } + } + + public function getExternalTaskLinkById($task_id, $link_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getExternalTaskLink', $task_id); + return $this->taskExternalLinkModel->getById($link_id); + } + + public function getAllExternalTaskLinks($task_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getExternalTaskLinks', $task_id); + return $this->taskExternalLinkModel->getAll($task_id); + } + + public function createExternalTaskLink($task_id, $url, $dependency, $type = ExternalLinkManager::TYPE_AUTO, $title = '') + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'createExternalTaskLink', $task_id); + + try { + $provider = $this->externalLinkManager + ->setUserInputText($url) + ->setUserInputType($type) + ->find(); + + $link = $provider->getLink(); + + $values = array( + 'task_id' => $task_id, + 'title' => $title ?: $link->getTitle(), + 'url' => $link->getUrl(), + 'link_type' => $provider->getType(), + 'dependency' => $dependency, + ); + + list($valid, $errors) = $this->externalLinkValidator->validateCreation($values); + + if (! $valid) { + $this->logger->error(__METHOD__.': '.var_export($errors)); + return false; + } + + return $this->taskExternalLinkModel->create($values); + } catch (ExternalLinkProviderNotFound $e) { + $this->logger->error(__METHOD__.': '.$e->getMessage()); + } + + return false; + } + + public function updateExternalTaskLink($task_id, $link_id, $title = null, $url = null, $dependency = null) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateExternalTaskLink', $task_id); + + $link = $this->taskExternalLinkModel->getById($link_id); + $values = $this->filterValues(array( + 'title' => $title, + 'url' => $url, + 'dependency' => $dependency, + )); + + $values = array_merge($link, $values); + list($valid, $errors) = $this->externalLinkValidator->validateModification($values); + + if (! $valid) { + $this->logger->error(__METHOD__.': '.var_export($errors)); + return false; + } + + return $this->taskExternalLinkModel->update($values); + } + + public function removeExternalTaskLink($task_id, $link_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeExternalTaskLink', $task_id); + return $this->taskExternalLinkModel->remove($link_id); + } +} diff --git a/sources/app/Api/Procedure/TaskFileProcedure.php b/sources/app/Api/Procedure/TaskFileProcedure.php new file mode 100644 index 0000000..bd00657 --- /dev/null +++ b/sources/app/Api/Procedure/TaskFileProcedure.php @@ -0,0 +1,70 @@ +container)->check($this->getClassName(), 'getTaskFile', $file_id); + return $this->taskFileModel->getById($file_id); + } + + public function getAllTaskFiles($task_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllTaskFiles', $task_id); + return $this->taskFileModel->getAll($task_id); + } + + public function downloadTaskFile($file_id) + { + TaskFileAuthorization::getInstance($this->container)->check($this->getClassName(), 'downloadTaskFile', $file_id); + + try { + $file = $this->taskFileModel->getById($file_id); + + if (! empty($file)) { + return base64_encode($this->objectStorage->get($file['path'])); + } + } catch (ObjectStorageException $e) { + $this->logger->error($e->getMessage()); + } + + return ''; + } + + public function createTaskFile($project_id, $task_id, $filename, $blob) + { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTaskFile', $project_id); + + try { + return $this->taskFileModel->uploadContent($task_id, $filename, $blob); + } catch (ObjectStorageException $e) { + $this->logger->error(__METHOD__.': '.$e->getMessage()); + return false; + } + } + + public function removeTaskFile($file_id) + { + TaskFileAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeTaskFile', $file_id); + return $this->taskFileModel->remove($file_id); + } + + public function removeAllTaskFiles($task_id) + { + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeAllTaskFiles', $task_id); + return $this->taskFileModel->removeAll($task_id); + } +} diff --git a/sources/app/Api/TaskLink.php b/sources/app/Api/Procedure/TaskLinkProcedure.php similarity index 56% rename from sources/app/Api/TaskLink.php rename to sources/app/Api/Procedure/TaskLinkProcedure.php index 47d70d1..375266f 100644 --- a/sources/app/Api/TaskLink.php +++ b/sources/app/Api/Procedure/TaskLinkProcedure.php @@ -1,14 +1,17 @@ taskLink->getById($task_link_id); + TaskLinkAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTaskLinkById', $task_link_id); + return $this->taskLinkModel->getById($task_link_id); } /** @@ -31,7 +35,8 @@ class TaskLink extends \Kanboard\Core\Base */ public function getAllTaskLinks($task_id) { - return $this->taskLink->getAll($task_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllTaskLinks', $task_id); + return $this->taskLinkModel->getAll($task_id); } /** @@ -45,7 +50,8 @@ class TaskLink extends \Kanboard\Core\Base */ public function createTaskLink($task_id, $opposite_task_id, $link_id) { - return $this->taskLink->create($task_id, $opposite_task_id, $link_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTaskLink', $task_id); + return $this->taskLinkModel->create($task_id, $opposite_task_id, $link_id); } /** @@ -60,7 +66,8 @@ class TaskLink extends \Kanboard\Core\Base */ public function updateTaskLink($task_link_id, $task_id, $opposite_task_id, $link_id) { - return $this->taskLink->update($task_link_id, $task_id, $opposite_task_id, $link_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTaskLink', $task_id); + return $this->taskLinkModel->update($task_link_id, $task_id, $opposite_task_id, $link_id); } /** @@ -72,6 +79,7 @@ class TaskLink extends \Kanboard\Core\Base */ public function removeTaskLink($task_link_id) { - return $this->taskLink->remove($task_link_id); + TaskLinkAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeTaskLink', $task_link_id); + return $this->taskLinkModel->remove($task_link_id); } } diff --git a/sources/app/Api/Task.php b/sources/app/Api/Procedure/TaskProcedure.php similarity index 51% rename from sources/app/Api/Task.php rename to sources/app/Api/Procedure/TaskProcedure.php index 177a09c..8661dee 100644 --- a/sources/app/Api/Task.php +++ b/sources/app/Api/Procedure/TaskProcedure.php @@ -1,87 +1,99 @@ container)->check($this->getClassName(), 'searchTasks', $project_id); + return $this->taskLexer->build($query)->withFilter(new TaskProjectFilter($project_id))->toArray(); + } + public function getTask($task_id) { - $this->checkTaskPermission($task_id); - return $this->formatTask($this->taskFinder->getById($task_id)); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id); + return $this->formatTask($this->taskFinderModel->getById($task_id)); } public function getTaskByReference($project_id, $reference) { - $this->checkProjectPermission($project_id); - return $this->formatTask($this->taskFinder->getByReference($project_id, $reference)); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTaskByReference', $project_id); + return $this->formatTask($this->taskFinderModel->getByReference($project_id, $reference)); } public function getAllTasks($project_id, $status_id = TaskModel::STATUS_OPEN) { - $this->checkProjectPermission($project_id); - return $this->formatTasks($this->taskFinder->getAll($project_id, $status_id)); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getAllTasks', $project_id); + return $this->formatTasks($this->taskFinderModel->getAll($project_id, $status_id)); } public function getOverdueTasks() { - return $this->taskFinder->getOverdueTasks(); + return $this->taskFinderModel->getOverdueTasks(); } public function getOverdueTasksByProject($project_id) { - $this->checkProjectPermission($project_id); - return $this->taskFinder->getOverdueTasksByProject($project_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'getOverdueTasksByProject', $project_id); + return $this->taskFinderModel->getOverdueTasksByProject($project_id); } public function openTask($task_id) { - $this->checkTaskPermission($task_id); - return $this->taskStatus->open($task_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'openTask', $task_id); + return $this->taskStatusModel->open($task_id); } public function closeTask($task_id) { - $this->checkTaskPermission($task_id); - return $this->taskStatus->close($task_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'closeTask', $task_id); + return $this->taskStatusModel->close($task_id); } public function removeTask($task_id) { - return $this->task->remove($task_id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'removeTask', $task_id); + return $this->taskModel->remove($task_id); } public function moveTaskPosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0) { - $this->checkProjectPermission($project_id); - return $this->taskPosition->movePosition($project_id, $task_id, $column_id, $position, $swimlane_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'moveTaskPosition', $project_id); + return $this->taskPositionModel->movePosition($project_id, $task_id, $column_id, $position, $swimlane_id); } public function moveTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null) { - return $this->taskDuplication->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'moveTaskToProject', $project_id); + return $this->taskProjectMoveModel->moveToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id); } public function duplicateTaskToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null) { - return $this->taskDuplication->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id); + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'duplicateTaskToProject', $project_id); + return $this->taskProjectDuplicationModel->duplicateToProject($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id); } public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0, - $date_due = '', $description = '', $category_id = 0, $score = 0, $swimlane_id = 0, + $date_due = '', $description = '', $category_id = 0, $score = 0, $swimlane_id = 0, $priority = 0, $recurrence_status = 0, $recurrence_trigger = 0, $recurrence_factor = 0, $recurrence_timeframe = 0, $recurrence_basedate = 0, $reference = '') { - $this->checkProjectPermission($project_id); - - if ($owner_id !== 0 && ! $this->projectPermission->isAssignable($project_id, $owner_id)) { + ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTask', $project_id); + + if ($owner_id !== 0 && ! $this->projectPermissionModel->isAssignable($project_id, $owner_id)) { return false; } @@ -107,31 +119,31 @@ class Task extends Base 'recurrence_timeframe' => $recurrence_timeframe, 'recurrence_basedate' => $recurrence_basedate, 'reference' => $reference, + 'priority' => $priority, ); list($valid, ) = $this->taskValidator->validateCreation($values); - return $valid ? $this->taskCreation->create($values) : false; + return $valid ? $this->taskCreationModel->create($values) : false; } public function updateTask($id, $title = null, $color_id = null, $owner_id = null, - $date_due = null, $description = null, $category_id = null, $score = null, + $date_due = null, $description = null, $category_id = null, $score = null, $priority = null, $recurrence_status = null, $recurrence_trigger = null, $recurrence_factor = null, $recurrence_timeframe = null, $recurrence_basedate = null, $reference = null) { - $this->checkTaskPermission($id); - - $project_id = $this->taskFinder->getProjectId($id); + TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $id); + $project_id = $this->taskFinderModel->getProjectId($id); if ($project_id === 0) { return false; } - if ($owner_id !== null && $owner_id != 0 && ! $this->projectPermission->isAssignable($project_id, $owner_id)) { + if ($owner_id !== null && $owner_id != 0 && ! $this->projectPermissionModel->isAssignable($project_id, $owner_id)) { return false; } - $values = array( + $values = $this->filterValues(array( 'id' => $id, 'title' => $title, 'color_id' => $color_id, @@ -146,15 +158,10 @@ class Task extends Base 'recurrence_timeframe' => $recurrence_timeframe, 'recurrence_basedate' => $recurrence_basedate, 'reference' => $reference, - ); - - foreach ($values as $key => $value) { - if (is_null($value)) { - unset($values[$key]); - } - } + 'priority' => $priority, + )); list($valid) = $this->taskValidator->validateApiModification($values); - return $valid && $this->taskModification->update($values); + return $valid && $this->taskModificationModel->update($values); } } diff --git a/sources/app/Api/User.php b/sources/app/Api/Procedure/UserProcedure.php similarity index 79% rename from sources/app/Api/User.php rename to sources/app/Api/Procedure/UserProcedure.php index 6ee935a..145f85b 100644 --- a/sources/app/Api/User.php +++ b/sources/app/Api/Procedure/UserProcedure.php @@ -1,6 +1,6 @@ user->getById($user_id); + return $this->userModel->getById($user_id); } public function getUserByName($username) { - return $this->user->getByUsername($username); + return $this->userModel->getByUsername($username); } public function getAllUsers() { - return $this->user->getAll(); + return $this->userModel->getAll(); } public function removeUser($user_id) { - return $this->user->remove($user_id); + return $this->userModel->remove($user_id); } public function disableUser($user_id) { - return $this->user->disable($user_id); + return $this->userModel->disable($user_id); } public function enableUser($user_id) { - return $this->user->enable($user_id); + return $this->userModel->enable($user_id); } public function isActiveUser($user_id) { - return $this->user->isActive($user_id); + return $this->userModel->isActive($user_id); } public function createUser($username, $password, $name = '', $email = '', $role = Role::APP_USER) @@ -63,7 +63,7 @@ class User extends \Kanboard\Core\Base ); list($valid, ) = $this->userValidator->validateCreation($values); - return $valid ? $this->user->create($values) : false; + return $valid ? $this->userModel->create($values) : false; } /** @@ -107,7 +107,7 @@ class User extends \Kanboard\Core\Base 'is_ldap_user' => 1, ); - return $this->user->create($values); + return $this->userModel->create($values); } catch (LdapException $e) { $this->logger->error($e->getMessage()); @@ -117,21 +117,15 @@ class User extends \Kanboard\Core\Base public function updateUser($id, $username = null, $name = null, $email = null, $role = null) { - $values = array( + $values = $this->filterValues(array( 'id' => $id, 'username' => $username, 'name' => $name, 'email' => $email, 'role' => $role, - ); - - foreach ($values as $key => $value) { - if (is_null($value)) { - unset($values[$key]); - } - } + )); list($valid, ) = $this->userValidator->validateApiModification($values); - return $valid && $this->user->update($values); + return $valid && $this->userModel->update($values); } } diff --git a/sources/app/Api/Project.php b/sources/app/Api/Project.php deleted file mode 100644 index 8e311f7..0000000 --- a/sources/app/Api/Project.php +++ /dev/null @@ -1,87 +0,0 @@ -checkProjectPermission($project_id); - return $this->formatProject($this->project->getById($project_id)); - } - - public function getProjectByName($name) - { - return $this->formatProject($this->project->getByName($name)); - } - - public function getAllProjects() - { - return $this->formatProjects($this->project->getAll()); - } - - public function removeProject($project_id) - { - return $this->project->remove($project_id); - } - - public function enableProject($project_id) - { - return $this->project->enable($project_id); - } - - public function disableProject($project_id) - { - return $this->project->disable($project_id); - } - - public function enableProjectPublicAccess($project_id) - { - return $this->project->enablePublicAccess($project_id); - } - - public function disableProjectPublicAccess($project_id) - { - return $this->project->disablePublicAccess($project_id); - } - - public function getProjectActivities(array $project_ids) - { - return $this->projectActivity->getProjects($project_ids); - } - - public function getProjectActivity($project_id) - { - $this->checkProjectPermission($project_id); - return $this->projectActivity->getProject($project_id); - } - - public function createProject($name, $description = null) - { - $values = array( - 'name' => $name, - 'description' => $description - ); - - list($valid, ) = $this->projectValidator->validateCreation($values); - return $valid ? $this->project->create($values) : false; - } - - public function updateProject($id, $name, $description = null) - { - $values = array( - 'id' => $id, - 'name' => $name, - 'description' => $description - ); - - list($valid, ) = $this->projectValidator->validateModification($values); - return $valid && $this->project->update($values); - } -} diff --git a/sources/app/Api/ProjectPermission.php b/sources/app/Api/ProjectPermission.php deleted file mode 100644 index 11e92af..0000000 --- a/sources/app/Api/ProjectPermission.php +++ /dev/null @@ -1,72 +0,0 @@ -projectUserRole->getAllUsers($project_id); - } - - public function getAssignableUsers($project_id, $prepend_unassigned = false) - { - return $this->projectUserRole->getAssignableUsersList($project_id, $prepend_unassigned); - } - - public function addProjectUser($project_id, $user_id, $role = Role::PROJECT_MEMBER) - { - return $this->projectUserRole->addUser($project_id, $user_id, $role); - } - - public function addProjectGroup($project_id, $group_id, $role = Role::PROJECT_MEMBER) - { - return $this->projectGroupRole->addGroup($project_id, $group_id, $role); - } - - public function removeProjectUser($project_id, $user_id) - { - return $this->projectUserRole->removeUser($project_id, $user_id); - } - - public function removeProjectGroup($project_id, $group_id) - { - return $this->projectGroupRole->removeGroup($project_id, $group_id); - } - - public function changeProjectUserRole($project_id, $user_id, $role) - { - return $this->projectUserRole->changeUserRole($project_id, $user_id, $role); - } - - public function changeProjectGroupRole($project_id, $group_id, $role) - { - return $this->projectGroupRole->changeGroupRole($project_id, $group_id, $role); - } - - // Deprecated - public function getMembers($project_id) - { - return $this->getProjectUsers($project_id); - } - - // Deprecated - public function revokeUser($project_id, $user_id) - { - return $this->removeProjectUser($project_id, $user_id); - } - - // Deprecated - public function allowUser($project_id, $user_id) - { - return $this->addProjectUser($project_id, $user_id); - } -} diff --git a/sources/app/Api/Swimlane.php b/sources/app/Api/Swimlane.php deleted file mode 100644 index 03a2819..0000000 --- a/sources/app/Api/Swimlane.php +++ /dev/null @@ -1,78 +0,0 @@ -swimlane->getSwimlanes($project_id); - } - - public function getAllSwimlanes($project_id) - { - return $this->swimlane->getAll($project_id); - } - - public function getSwimlaneById($swimlane_id) - { - return $this->swimlane->getById($swimlane_id); - } - - public function getSwimlaneByName($project_id, $name) - { - return $this->swimlane->getByName($project_id, $name); - } - - public function getSwimlane($swimlane_id) - { - return $this->swimlane->getById($swimlane_id); - } - - public function getDefaultSwimlane($project_id) - { - return $this->swimlane->getDefault($project_id); - } - - public function addSwimlane($project_id, $name, $description = '') - { - return $this->swimlane->create(array('project_id' => $project_id, 'name' => $name, 'description' => $description)); - } - - public function updateSwimlane($swimlane_id, $name, $description = null) - { - $values = array('id' => $swimlane_id, 'name' => $name); - - if (!is_null($description)) { - $values['description'] = $description; - } - - return $this->swimlane->update($values); - } - - public function removeSwimlane($project_id, $swimlane_id) - { - return $this->swimlane->remove($project_id, $swimlane_id); - } - - public function disableSwimlane($project_id, $swimlane_id) - { - return $this->swimlane->disable($project_id, $swimlane_id); - } - - public function enableSwimlane($project_id, $swimlane_id) - { - return $this->swimlane->enable($project_id, $swimlane_id); - } - - public function changeSwimlanePosition($project_id, $swimlane_id, $position) - { - return $this->swimlane->changePosition($project_id, $swimlane_id, $position); - } -} diff --git a/sources/app/Auth/DatabaseAuth.php b/sources/app/Auth/DatabaseAuth.php index c13af68..ecb42c1 100644 --- a/sources/app/Auth/DatabaseAuth.php +++ b/sources/app/Auth/DatabaseAuth.php @@ -5,7 +5,7 @@ namespace Kanboard\Auth; use Kanboard\Core\Base; use Kanboard\Core\Security\PasswordAuthenticationProviderInterface; use Kanboard\Core\Security\SessionCheckProviderInterface; -use Kanboard\Model\User; +use Kanboard\Model\UserModel; use Kanboard\User\DatabaseUserProvider; /** @@ -60,7 +60,7 @@ class DatabaseAuth extends Base implements PasswordAuthenticationProviderInterfa public function authenticate() { $user = $this->db - ->table(User::TABLE) + ->table(UserModel::TABLE) ->columns('id', 'password') ->eq('username', $this->username) ->eq('disable_login_form', 0) @@ -84,7 +84,7 @@ class DatabaseAuth extends Base implements PasswordAuthenticationProviderInterfa */ public function isValidSession() { - return $this->user->isActive($this->userSession->getId()); + return $this->userModel->isActive($this->userSession->getId()); } /** diff --git a/sources/app/Auth/LdapAuth.php b/sources/app/Auth/LdapAuth.php index c942358..a8dcfcb 100644 --- a/sources/app/Auth/LdapAuth.php +++ b/sources/app/Auth/LdapAuth.php @@ -76,7 +76,7 @@ class LdapAuth extends Base implements PasswordAuthenticationProviderInterface throw new LogicException('Username not found in LDAP profile, check the parameter LDAP_USER_ATTRIBUTE_USERNAME'); } - $this->logger->info('Authenticate user: '.$user->getDn()); + $this->logger->info('Authenticate this user: '.$user->getDn()); if ($client->authenticate($user->getDn(), $this->password)) { $this->userInfo = $user; diff --git a/sources/app/Auth/RememberMeAuth.php b/sources/app/Auth/RememberMeAuth.php index 509a511..5d0a8b2 100644 --- a/sources/app/Auth/RememberMeAuth.php +++ b/sources/app/Auth/RememberMeAuth.php @@ -44,16 +44,16 @@ class RememberMeAuth extends Base implements PreAuthenticationProviderInterface $credentials = $this->rememberMeCookie->read(); if ($credentials !== false) { - $session = $this->rememberMeSession->find($credentials['token'], $credentials['sequence']); + $session = $this->rememberMeSessionModel->find($credentials['token'], $credentials['sequence']); if (! empty($session)) { $this->rememberMeCookie->write( $session['token'], - $this->rememberMeSession->updateSequence($session['token']), + $this->rememberMeSessionModel->updateSequence($session['token']), $session['expiration'] ); - $this->userInfo = $this->user->getById($session['user_id']); + $this->userInfo = $this->userModel->getById($session['user_id']); return true; } diff --git a/sources/app/Auth/ReverseProxyAuth.php b/sources/app/Auth/ReverseProxyAuth.php index b9730c5..fdf936b 100644 --- a/sources/app/Auth/ReverseProxyAuth.php +++ b/sources/app/Auth/ReverseProxyAuth.php @@ -45,7 +45,8 @@ class ReverseProxyAuth extends Base implements PreAuthenticationProviderInterfac $username = $this->request->getRemoteUser(); if (! empty($username)) { - $this->userInfo = new ReverseProxyUserProvider($username); + $userProfile = $this->userModel->getByUsername($username); + $this->userInfo = new ReverseProxyUserProvider($username, $userProfile ?: array()); return true; } diff --git a/sources/app/Console/Base.php b/sources/app/Console/Base.php deleted file mode 100644 index 25d48e4..0000000 --- a/sources/app/Console/Base.php +++ /dev/null @@ -1,61 +0,0 @@ -container = $container; - } - - /** - * Load automatically models - * - * @access public - * @param string $name Model name - * @return mixed - */ - public function __get($name) - { - return $this->container[$name]; - } -} diff --git a/sources/app/Console/BaseCommand.php b/sources/app/Console/BaseCommand.php new file mode 100644 index 0000000..5041707 --- /dev/null +++ b/sources/app/Console/BaseCommand.php @@ -0,0 +1,67 @@ +container = $container; + } + + /** + * Load automatically models + * + * @access public + * @param string $name Model name + * @return mixed + */ + public function __get($name) + { + return $this->container[$name]; + } +} diff --git a/sources/app/Console/Cronjob.php b/sources/app/Console/CronjobCommand.php similarity index 95% rename from sources/app/Console/Cronjob.php rename to sources/app/Console/CronjobCommand.php index 3a5c559..dae13af 100644 --- a/sources/app/Console/Cronjob.php +++ b/sources/app/Console/CronjobCommand.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\NullOutput; -class Cronjob extends Base +class CronjobCommand extends BaseCommand { private $commands = array( 'projects:daily-stats', diff --git a/sources/app/Console/LocaleComparator.php b/sources/app/Console/LocaleComparatorCommand.php similarity index 97% rename from sources/app/Console/LocaleComparator.php rename to sources/app/Console/LocaleComparatorCommand.php index 8e5e090..de83714 100644 --- a/sources/app/Console/LocaleComparator.php +++ b/sources/app/Console/LocaleComparatorCommand.php @@ -7,7 +7,7 @@ use RecursiveDirectoryIterator; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class LocaleComparator extends Base +class LocaleComparatorCommand extends BaseCommand { const REF_LOCALE = 'fr_FR'; diff --git a/sources/app/Console/LocaleSync.php b/sources/app/Console/LocaleSyncCommand.php similarity index 97% rename from sources/app/Console/LocaleSync.php rename to sources/app/Console/LocaleSyncCommand.php index d62b40b..11cfbde 100644 --- a/sources/app/Console/LocaleSync.php +++ b/sources/app/Console/LocaleSyncCommand.php @@ -6,7 +6,7 @@ use DirectoryIterator; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class LocaleSync extends Base +class LocaleSyncCommand extends BaseCommand { const REF_LOCALE = 'fr_FR'; diff --git a/sources/app/Console/PluginInstallCommand.php b/sources/app/Console/PluginInstallCommand.php new file mode 100644 index 0000000..a82f006 --- /dev/null +++ b/sources/app/Console/PluginInstallCommand.php @@ -0,0 +1,36 @@ +setName('plugin:install') + ->setDescription('Install a plugin from a remote Zip archive') + ->addArgument('url', InputArgument::REQUIRED, 'Archive URL'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if (!Installer::isConfigured()) { + throw new LogicException('Kanboard is not configured to install plugins itself'); + } + + try { + $installer = new Installer($this->container); + $installer->install($input->getArgument('url')); + $output->writeln('Plugin installed successfully'); + } catch (PluginInstallerException $e) { + $output->writeln(''.$e->getMessage().''); + } + } +} diff --git a/sources/app/Console/PluginUninstallCommand.php b/sources/app/Console/PluginUninstallCommand.php new file mode 100644 index 0000000..4872213 --- /dev/null +++ b/sources/app/Console/PluginUninstallCommand.php @@ -0,0 +1,36 @@ +setName('plugin:uninstall') + ->setDescription('Remove a plugin') + ->addArgument('pluginId', InputArgument::REQUIRED, 'Plugin directory name'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if (!Installer::isConfigured()) { + throw new LogicException('Kanboard is not configured to install plugins itself'); + } + + try { + $installer = new Installer($this->container); + $installer->uninstall($input->getArgument('pluginId')); + $output->writeln('Plugin removed successfully'); + } catch (PluginInstallerException $e) { + $output->writeln(''.$e->getMessage().''); + } + } +} diff --git a/sources/app/Console/PluginUpgradeCommand.php b/sources/app/Console/PluginUpgradeCommand.php new file mode 100644 index 0000000..6c66e91 --- /dev/null +++ b/sources/app/Console/PluginUpgradeCommand.php @@ -0,0 +1,55 @@ +setName('plugin:upgrade') + ->setDescription('Update all installed plugins') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if (!Installer::isConfigured()) { + throw new LogicException('Kanboard is not configured to install plugins itself'); + } + + $installer = new Installer($this->container); + $availablePlugins = Directory::getInstance($this->container)->getAvailablePlugins(); + + foreach ($this->pluginLoader->getPlugins() as $installedPlugin) { + $pluginDetails = $this->getPluginDetails($availablePlugins, $installedPlugin); + + if ($pluginDetails === null) { + $output->writeln('* Plugin not available in the directory: '.$installedPlugin->getPluginName().''); + } elseif ($pluginDetails['version'] > $installedPlugin->getPluginVersion()) { + $output->writeln('* Updating plugin: '.$installedPlugin->getPluginName().''); + $installer->update($pluginDetails['download']); + } else { + $output->writeln('* Plugin up to date: '.$installedPlugin->getPluginName().''); + } + } + } + + protected function getPluginDetails(array $availablePlugins, BasePlugin $installedPlugin) + { + foreach ($availablePlugins as $availablePlugin) { + if ($availablePlugin['title'] === $installedPlugin->getPluginName()) { + return $availablePlugin; + } + } + + return null; + } +} diff --git a/sources/app/Console/ProjectDailyColumnStatsExport.php b/sources/app/Console/ProjectDailyColumnStatsExportCommand.php similarity index 88% rename from sources/app/Console/ProjectDailyColumnStatsExport.php rename to sources/app/Console/ProjectDailyColumnStatsExportCommand.php index 2513fbf..1e8af72 100644 --- a/sources/app/Console/ProjectDailyColumnStatsExport.php +++ b/sources/app/Console/ProjectDailyColumnStatsExportCommand.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class ProjectDailyColumnStatsExport extends Base +class ProjectDailyColumnStatsExportCommand extends BaseCommand { protected function configure() { @@ -21,7 +21,7 @@ class ProjectDailyColumnStatsExport extends Base protected function execute(InputInterface $input, OutputInterface $output) { - $data = $this->projectDailyColumnStats->getAggregatedMetrics( + $data = $this->projectDailyColumnStatsModel->getAggregatedMetrics( $input->getArgument('project_id'), $input->getArgument('start_date'), $input->getArgument('end_date') diff --git a/sources/app/Console/ProjectDailyStatsCalculation.php b/sources/app/Console/ProjectDailyStatsCalculationCommand.php similarity index 60% rename from sources/app/Console/ProjectDailyStatsCalculation.php rename to sources/app/Console/ProjectDailyStatsCalculationCommand.php index 9884cc1..8dde8a7 100644 --- a/sources/app/Console/ProjectDailyStatsCalculation.php +++ b/sources/app/Console/ProjectDailyStatsCalculationCommand.php @@ -2,11 +2,11 @@ namespace Kanboard\Console; -use Kanboard\Model\Project; +use Kanboard\Model\ProjectModel; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class ProjectDailyStatsCalculation extends Base +class ProjectDailyStatsCalculationCommand extends BaseCommand { protected function configure() { @@ -17,12 +17,12 @@ class ProjectDailyStatsCalculation extends Base protected function execute(InputInterface $input, OutputInterface $output) { - $projects = $this->project->getAllByStatus(Project::ACTIVE); + $projects = $this->projectModel->getAllByStatus(ProjectModel::ACTIVE); foreach ($projects as $project) { $output->writeln('Run calculation for '.$project['name']); - $this->projectDailyColumnStats->updateTotals($project['id'], date('Y-m-d')); - $this->projectDailyStats->updateTotals($project['id'], date('Y-m-d')); + $this->projectDailyColumnStatsModel->updateTotals($project['id'], date('Y-m-d')); + $this->projectDailyStatsModel->updateTotals($project['id'], date('Y-m-d')); } } } diff --git a/sources/app/Console/ResetPasswordCommand.php b/sources/app/Console/ResetPasswordCommand.php new file mode 100644 index 0000000..b483f90 --- /dev/null +++ b/sources/app/Console/ResetPasswordCommand.php @@ -0,0 +1,79 @@ +setName('user:reset-password') + ->setDescription('Change user password') + ->addArgument('username', InputArgument::REQUIRED, 'Username') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $helper = $this->getHelper('question'); + $username = $input->getArgument('username'); + + $passwordQuestion = new Question('What is the new password for '.$username.'? (characters are not printed)'.PHP_EOL); + $passwordQuestion->setHidden(true); + $passwordQuestion->setHiddenFallback(false); + + $password = $helper->ask($input, $output, $passwordQuestion); + + $confirmationQuestion = new Question('Confirmation:'.PHP_EOL); + $confirmationQuestion->setHidden(true); + $confirmationQuestion->setHiddenFallback(false); + + $confirmation = $helper->ask($input, $output, $confirmationQuestion); + + if ($this->validatePassword($output, $password, $confirmation)) { + $this->resetPassword($output, $username, $password); + } + } + + private function validatePassword(OutputInterface $output, $password, $confirmation) + { + list($valid, $errors) = $this->passwordResetValidator->validateModification(array( + 'password' => $password, + 'confirmation' => $confirmation, + )); + + if (!$valid) { + foreach ($errors as $error_list) { + foreach ($error_list as $error) { + $output->writeln(''.$error.''); + } + } + } + + return $valid; + } + + private function resetPassword(OutputInterface $output, $username, $password) + { + $userId = $this->userModel->getIdByUsername($username); + + if (empty($userId)) { + $output->writeln('User not found'); + return false; + } + + if (!$this->userModel->update(array('id' => $userId, 'password' => $password))) { + $output->writeln('Unable to update password'); + return false; + } + + $output->writeln('Password updated successfully'); + + return true; + } +} diff --git a/sources/app/Console/ResetTwoFactorCommand.php b/sources/app/Console/ResetTwoFactorCommand.php new file mode 100644 index 0000000..a64206b --- /dev/null +++ b/sources/app/Console/ResetTwoFactorCommand.php @@ -0,0 +1,38 @@ +setName('user:reset-2fa') + ->setDescription('Remove two-factor authentication for a user') + ->addArgument('username', InputArgument::REQUIRED, 'Username'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $username = $input->getArgument('username'); + $userId = $this->userModel->getIdByUsername($username); + + if (empty($userId)) { + $output->writeln('User not found'); + return false; + } + + if (!$this->userModel->update(array('id' => $userId, 'twofactor_activated' => 0, 'twofactor_secret' => ''))) { + $output->writeln('Unable to update user profile'); + return false; + } + + $output->writeln('Two-factor authentication disabled'); + + return true; + } +} diff --git a/sources/app/Console/SubtaskExport.php b/sources/app/Console/SubtaskExportCommand.php similarity index 95% rename from sources/app/Console/SubtaskExport.php rename to sources/app/Console/SubtaskExportCommand.php index aaa9527..986af1a 100644 --- a/sources/app/Console/SubtaskExport.php +++ b/sources/app/Console/SubtaskExportCommand.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class SubtaskExport extends Base +class SubtaskExportCommand extends BaseCommand { protected function configure() { diff --git a/sources/app/Console/TaskExport.php b/sources/app/Console/TaskExportCommand.php similarity index 95% rename from sources/app/Console/TaskExport.php rename to sources/app/Console/TaskExportCommand.php index 4515bf9..789245b 100644 --- a/sources/app/Console/TaskExport.php +++ b/sources/app/Console/TaskExportCommand.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class TaskExport extends Base +class TaskExportCommand extends BaseCommand { protected function configure() { diff --git a/sources/app/Console/TaskOverdueNotification.php b/sources/app/Console/TaskOverdueNotification.php deleted file mode 100644 index 43be4df..0000000 --- a/sources/app/Console/TaskOverdueNotification.php +++ /dev/null @@ -1,116 +0,0 @@ -setName('notification:overdue-tasks') - ->setDescription('Send notifications for overdue tasks') - ->addOption('show', null, InputOption::VALUE_NONE, 'Show sent overdue tasks'); - } - - protected function execute(InputInterface $input, OutputInterface $output) - { - $tasks = $this->sendOverdueTaskNotifications(); - - if ($input->getOption('show')) { - $this->showTable($output, $tasks); - } - } - - public function showTable(OutputInterface $output, array $tasks) - { - $rows = array(); - - foreach ($tasks as $task) { - $rows[] = array( - $task['id'], - $task['title'], - date('Y-m-d', $task['date_due']), - $task['project_id'], - $task['project_name'], - $task['assignee_name'] ?: $task['assignee_username'], - ); - } - - $table = new Table($output); - $table - ->setHeaders(array('Id', 'Title', 'Due date', 'Project Id', 'Project name', 'Assignee')) - ->setRows($rows) - ->render(); - } - - /** - * Send overdue tasks - * - * @access public - */ - public function sendOverdueTaskNotifications() - { - $tasks = $this->taskFinder->getOverdueTasks(); - - foreach ($this->groupByColumn($tasks, 'project_id') as $project_id => $project_tasks) { - $users = $this->userNotification->getUsersWithNotificationEnabled($project_id); - - foreach ($users as $user) { - $this->sendUserOverdueTaskNotifications($user, $project_tasks); - } - } - - return $tasks; - } - - /** - * Send overdue tasks for a given user - * - * @access public - * @param array $user - * @param array $tasks - */ - public function sendUserOverdueTaskNotifications(array $user, array $tasks) - { - $user_tasks = array(); - - foreach ($tasks as $task) { - if ($this->userNotificationFilter->shouldReceiveNotification($user, array('task' => $task))) { - $user_tasks[] = $task; - } - } - - if (! empty($user_tasks)) { - $this->userNotification->sendUserNotification( - $user, - Task::EVENT_OVERDUE, - array('tasks' => $user_tasks, 'project_name' => $tasks[0]['project_name']) - ); - } - } - - /** - * Group a collection of records by a column - * - * @access public - * @param array $collection - * @param string $column - * @return array - */ - public function groupByColumn(array $collection, $column) - { - $result = array(); - - foreach ($collection as $item) { - $result[$item[$column]][] = $item; - } - - return $result; - } -} diff --git a/sources/app/Console/TaskOverdueNotificationCommand.php b/sources/app/Console/TaskOverdueNotificationCommand.php new file mode 100644 index 0000000..3627661 --- /dev/null +++ b/sources/app/Console/TaskOverdueNotificationCommand.php @@ -0,0 +1,191 @@ +setName('notification:overdue-tasks') + ->setDescription('Send notifications for overdue tasks') + ->addOption('show', null, InputOption::VALUE_NONE, 'Show sent overdue tasks') + ->addOption('group', null, InputOption::VALUE_NONE, 'Group all overdue tasks for one user (from all projects) in one email') + ->addOption('manager', null, InputOption::VALUE_NONE, 'Send all overdue tasks to project manager(s) in one email'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + if ($input->getOption('group')) { + $tasks = $this->sendGroupOverdueTaskNotifications(); + } elseif ($input->getOption('manager')) { + $tasks = $this->sendOverdueTaskNotificationsToManagers(); + } else { + $tasks = $this->sendOverdueTaskNotifications(); + } + + if ($input->getOption('show')) { + $this->showTable($output, $tasks); + } + } + + public function showTable(OutputInterface $output, array $tasks) + { + $rows = array(); + + foreach ($tasks as $task) { + $rows[] = array( + $task['id'], + $task['title'], + date('Y-m-d', $task['date_due']), + $task['project_id'], + $task['project_name'], + $task['assignee_name'] ?: $task['assignee_username'], + ); + } + + $table = new Table($output); + $table + ->setHeaders(array('Id', 'Title', 'Due date', 'Project Id', 'Project name', 'Assignee')) + ->setRows($rows) + ->render(); + } + + /** + * Send all overdue tasks for one user in one email + * + * @access public + */ + public function sendGroupOverdueTaskNotifications() + { + $tasks = $this->taskFinderModel->getOverdueTasks(); + + foreach ($this->groupByColumn($tasks, 'owner_id') as $user_tasks) { + $users = $this->userNotificationModel->getUsersWithNotificationEnabled($user_tasks[0]['project_id']); + + foreach ($users as $user) { + $this->sendUserOverdueTaskNotifications($user, $user_tasks); + } + } + + return $tasks; + } + + /** + * Send all overdue tasks in one email to project manager(s) + * + * @access public + */ + public function sendOverdueTaskNotificationsToManagers() + { + $tasks = $this->taskFinderModel->getOverdueTasks(); + + foreach ($this->groupByColumn($tasks, 'project_id') as $project_id => $project_tasks) { + $users = $this->userNotificationModel->getUsersWithNotificationEnabled($project_id); + $managers = array(); + + foreach ($users as $user) { + $role = $this->projectUserRoleModel->getUserRole($project_id, $user['id']); + if($role == Role::PROJECT_MANAGER) { + $managers[] = $user; + } + } + + foreach ($managers as $manager) { + $this->sendUserOverdueTaskNotificationsToManagers($manager, $project_tasks); + } + } + + return $tasks; + } + + /** + * Send overdue tasks + * + * @access public + */ + public function sendOverdueTaskNotifications() + { + $tasks = $this->taskFinderModel->getOverdueTasks(); + + foreach ($this->groupByColumn($tasks, 'project_id') as $project_id => $project_tasks) { + $users = $this->userNotificationModel->getUsersWithNotificationEnabled($project_id); + + foreach ($users as $user) { + $this->sendUserOverdueTaskNotifications($user, $project_tasks); + } + } + + return $tasks; + } + + /** + * Send overdue tasks for a given user + * + * @access public + * @param array $user + * @param array $tasks + */ + public function sendUserOverdueTaskNotifications(array $user, array $tasks) + { + $user_tasks = array(); + $project_names = array(); + + foreach ($tasks as $task) { + if ($this->userNotificationFilterModel->shouldReceiveNotification($user, array('task' => $task))) { + $user_tasks[] = $task; + $project_names[$task['project_id']] = $task['project_name']; + } + } + + if (! empty($user_tasks)) { + $this->userNotificationModel->sendUserNotification( + $user, + TaskModel::EVENT_OVERDUE, + array('tasks' => $user_tasks, 'project_name' => implode(', ', $project_names)) + ); + } + } + + /** + * Send overdue tasks for a project manager(s) + * + * @access public + * @param array $manager + * @param array $tasks + */ + public function sendUserOverdueTaskNotificationsToManagers(array $manager, array $tasks) + { + $this->userNotificationModel->sendUserNotification( + $manager, + TaskModel::EVENT_OVERDUE, + array('tasks' => $tasks, 'project_name' => $tasks[0]['project_name']) + ); + } + + /** + * Group a collection of records by a column + * + * @access public + * @param array $collection + * @param string $column + * @return array + */ + public function groupByColumn(array $collection, $column) + { + $result = array(); + + foreach ($collection as $item) { + $result[$item[$column]][] = $item; + } + + return $result; + } +} diff --git a/sources/app/Console/TaskTrigger.php b/sources/app/Console/TaskTriggerCommand.php similarity index 79% rename from sources/app/Console/TaskTrigger.php rename to sources/app/Console/TaskTriggerCommand.php index 8d70721..a1f4dcc 100644 --- a/sources/app/Console/TaskTrigger.php +++ b/sources/app/Console/TaskTriggerCommand.php @@ -4,10 +4,10 @@ namespace Kanboard\Console; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; use Kanboard\Event\TaskListEvent; -class TaskTrigger extends Base +class TaskTriggerCommand extends BaseCommand { protected function configure() { @@ -19,7 +19,7 @@ class TaskTrigger extends Base protected function execute(InputInterface $input, OutputInterface $output) { foreach ($this->getProjectIds() as $project_id) { - $tasks = $this->taskFinder->getAll($project_id); + $tasks = $this->taskFinderModel->getAll($project_id); $nb_tasks = count($tasks); if ($nb_tasks > 0) { @@ -31,7 +31,7 @@ class TaskTrigger extends Base private function getProjectIds() { - $listeners = $this->dispatcher->getListeners(Task::EVENT_DAILY_CRONJOB); + $listeners = $this->dispatcher->getListeners(TaskModel::EVENT_DAILY_CRONJOB); $project_ids = array(); foreach ($listeners as $listener) { @@ -46,6 +46,6 @@ class TaskTrigger extends Base $event = new TaskListEvent(array('project_id' => $project_id)); $event->setTasks($tasks); - $this->dispatcher->dispatch(Task::EVENT_DAILY_CRONJOB, $event); + $this->dispatcher->dispatch(TaskModel::EVENT_DAILY_CRONJOB, $event); } } diff --git a/sources/app/Console/TransitionExport.php b/sources/app/Console/TransitionExportCommand.php similarity index 95% rename from sources/app/Console/TransitionExport.php rename to sources/app/Console/TransitionExportCommand.php index d9f805a..265757b 100644 --- a/sources/app/Console/TransitionExport.php +++ b/sources/app/Console/TransitionExportCommand.php @@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -class TransitionExport extends Base +class TransitionExportCommand extends BaseCommand { protected function configure() { diff --git a/sources/app/Console/WorkerCommand.php b/sources/app/Console/WorkerCommand.php new file mode 100644 index 0000000..e332624 --- /dev/null +++ b/sources/app/Console/WorkerCommand.php @@ -0,0 +1,28 @@ +setName('worker') + ->setDescription('Execute queue worker') + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $this->queueManager->listen(); + } +} diff --git a/sources/app/Controller/Action.php b/sources/app/Controller/ActionController.php similarity index 60% rename from sources/app/Controller/Action.php rename to sources/app/Controller/ActionController.php index 8881e8e..097640f 100644 --- a/sources/app/Controller/Action.php +++ b/sources/app/Controller/ActionController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Automatic Actions + * Automatic Actions Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Action extends Base +class ActionController extends BaseController { /** * List of automatic actions for a given project @@ -18,7 +18,7 @@ class Action extends Base public function index() { $project = $this->getProject(); - $actions = $this->action->getAllByProject($project['id']); + $actions = $this->actionModel->getAllByProject($project['id']); $this->response->html($this->helper->layout->project('action/index', array( 'values' => array('project_id' => $project['id']), @@ -27,12 +27,12 @@ class Action extends Base 'available_actions' => $this->actionManager->getAvailableActions(), 'available_events' => $this->eventManager->getAll(), 'available_params' => $this->actionManager->getAvailableParameters($actions), - 'columns_list' => $this->column->getList($project['id']), - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']), - 'projects_list' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()), - 'colors_list' => $this->color->getList(), - 'categories_list' => $this->category->getList($project['id']), - 'links_list' => $this->link->getList(0, false), + 'columns_list' => $this->columnModel->getList($project['id']), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']), + 'projects_list' => $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId()), + 'colors_list' => $this->colorModel->getList(), + 'categories_list' => $this->categoryModel->getList($project['id']), + 'links_list' => $this->linkModel->getList(0, false), 'title' => t('Automatic actions') ))); } @@ -47,7 +47,7 @@ class Action extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->project('action/remove', array( - 'action' => $this->action->getById($this->request->getIntegerParam('action_id')), + 'action' => $this->actionModel->getById($this->request->getIntegerParam('action_id')), 'available_events' => $this->eventManager->getAll(), 'available_actions' => $this->actionManager->getAvailableActions(), 'project' => $project, @@ -64,14 +64,14 @@ class Action extends Base { $this->checkCSRFParam(); $project = $this->getProject(); - $action = $this->action->getById($this->request->getIntegerParam('action_id')); + $action = $this->actionModel->getById($this->request->getIntegerParam('action_id')); - if (! empty($action) && $this->action->remove($action['id'])) { + if (! empty($action) && $this->actionModel->remove($action['id'])) { $this->flash->success(t('Action removed successfully.')); } else { $this->flash->failure(t('Unable to remove this action.')); } - $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id']))); } } diff --git a/sources/app/Controller/ActionCreation.php b/sources/app/Controller/ActionCreationController.php similarity index 73% rename from sources/app/Controller/ActionCreation.php rename to sources/app/Controller/ActionCreationController.php index 24a12d9..9b228f2 100644 --- a/sources/app/Controller/ActionCreation.php +++ b/sources/app/Controller/ActionCreationController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Action Creation + * Action Creation Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ActionCreation extends Base +class ActionCreationController extends BaseController { /** * Show the form (step 1) @@ -40,7 +40,7 @@ class ActionCreation extends Base return $this->create(); } - $this->response->html($this->template->render('action_creation/event', array( + return $this->response->html($this->template->render('action_creation/event', array( 'values' => $values, 'project' => $project, 'available_actions' => $this->actionManager->getAvailableActions(), @@ -69,18 +69,19 @@ class ActionCreation extends Base $this->doCreation($project, $values + array('params' => array())); } - $projects_list = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); + $projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId()); unset($projects_list[$project['id']]); - $this->response->html($this->template->render('action_creation/params', array( + return $this->response->html($this->template->render('action_creation/params', array( 'values' => $values, 'action_params' => $action_params, - 'columns_list' => $this->column->getList($project['id']), - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']), + 'columns_list' => $this->columnModel->getList($project['id']), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']), 'projects_list' => $projects_list, - 'colors_list' => $this->color->getList(), - 'categories_list' => $this->category->getList($project['id']), - 'links_list' => $this->link->getList(0, false), + 'colors_list' => $this->colorModel->getList(), + 'categories_list' => $this->categoryModel->getList($project['id']), + 'links_list' => $this->linkModel->getList(0, false), + 'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project), 'project' => $project, 'available_actions' => $this->actionManager->getAvailableActions(), 'events' => $this->actionManager->getCompatibleEvents($values['action_name']), @@ -109,13 +110,13 @@ class ActionCreation extends Base list($valid, ) = $this->actionValidator->validateCreation($values); if ($valid) { - if ($this->action->create($values) !== false) { + if ($this->actionModel->create($values) !== false) { $this->flash->success(t('Your automatic action have been created successfully.')); } else { $this->flash->failure(t('Unable to create your automatic action.')); } } - $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id']))); } } diff --git a/sources/app/Controller/Activity.php b/sources/app/Controller/ActivityController.php similarity index 68% rename from sources/app/Controller/Activity.php rename to sources/app/Controller/ActivityController.php index e455b1d..9f9841a 100644 --- a/sources/app/Controller/Activity.php +++ b/sources/app/Controller/ActivityController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Activity stream + * Activity Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Activity extends Base +class ActivityController extends BaseController { /** * Activity page for a project @@ -20,7 +20,7 @@ class Activity extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->app('activity/project', array( - 'events' => $this->projectActivity->getProject($project['id']), + 'events' => $this->helper->projectActivity->getProjectEvents($project['id']), 'project' => $project, 'title' => t('%s\'s activity', $project['name']) ))); @@ -38,8 +38,8 @@ class Activity extends Base $this->response->html($this->helper->layout->task('activity/task', array( 'title' => $task['title'], 'task' => $task, - 'project' => $this->project->getById($task['project_id']), - 'events' => $this->projectActivity->getTask($task['id']), + 'project' => $this->projectModel->getById($task['project_id']), + 'events' => $this->helper->projectActivity->getTaskEvents($task['id']), ))); } } diff --git a/sources/app/Controller/Analytic.php b/sources/app/Controller/AnalyticController.php similarity index 83% rename from sources/app/Controller/Analytic.php rename to sources/app/Controller/AnalyticController.php index 6b0730b..cf3ba03 100644 --- a/sources/app/Controller/Analytic.php +++ b/sources/app/Controller/AnalyticController.php @@ -2,15 +2,16 @@ namespace Kanboard\Controller; -use Kanboard\Model\Task as TaskModel; +use Kanboard\Filter\TaskProjectFilter; +use Kanboard\Model\TaskModel; /** - * Project Analytic controller + * Project Analytic Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Analytic extends Base +class AnalyticController extends BaseController { /** * Show average Lead and Cycle time @@ -29,8 +30,8 @@ class Analytic extends Base ), 'project' => $project, 'average' => $this->averageLeadCycleTimeAnalytic->build($project['id']), - 'metrics' => $this->projectDailyStats->getRawMetrics($project['id'], $from, $to), - 'date_format' => $this->config->get('application_date_format'), + 'metrics' => $this->projectDailyStatsModel->getRawMetrics($project['id'], $from, $to), + 'date_format' => $this->configModel->get('application_date_format'), 'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()), 'title' => t('Lead and Cycle time for "%s"', $project['name']), ))); @@ -44,13 +45,15 @@ class Analytic extends Base public function compareHours() { $project = $this->getProject(); - $query = $this->taskFilter->create()->filterByProject($project['id'])->getQuery(); $paginator = $this->paginator - ->setUrl('analytic', 'compareHours', array('project_id' => $project['id'])) + ->setUrl('AnalyticController', 'compareHours', array('project_id' => $project['id'])) ->setMax(30) ->setOrder(TaskModel::TABLE.'.id') - ->setQuery($query) + ->setQuery($this->taskQuery + ->withFilter(new TaskProjectFilter($project['id'])) + ->getQuery() + ) ->calculate(); $this->response->html($this->helper->layout->analytic('analytic/compare_hours', array( @@ -142,7 +145,7 @@ class Analytic extends Base $project = $this->getProject(); list($from, $to) = $this->getDates(); - $display_graph = $this->projectDailyColumnStats->countDays($project['id'], $from, $to) >= 2; + $display_graph = $this->projectDailyColumnStatsModel->countDays($project['id'], $from, $to) >= 2; $this->response->html($this->helper->layout->analytic($template, array( 'values' => array( @@ -150,9 +153,9 @@ class Analytic extends Base 'to' => $to, ), 'display_graph' => $display_graph, - 'metrics' => $display_graph ? $this->projectDailyColumnStats->getAggregatedMetrics($project['id'], $from, $to, $column) : array(), + 'metrics' => $display_graph ? $this->projectDailyColumnStatsModel->getAggregatedMetrics($project['id'], $from, $to, $column) : array(), 'project' => $project, - 'date_format' => $this->config->get('application_date_format'), + 'date_format' => $this->configModel->get('application_date_format'), 'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()), 'title' => t($title, $project['name']), ))); diff --git a/sources/app/Controller/AppController.php b/sources/app/Controller/AppController.php new file mode 100644 index 0000000..45cf39a --- /dev/null +++ b/sources/app/Controller/AppController.php @@ -0,0 +1,46 @@ +request->isAjax()) { + $this->response->json(array('message' => 'Access Forbidden'), 403); + } + + $this->response->html($this->helper->layout->app('app/forbidden', array( + 'title' => t('Access Forbidden'), + 'no_layout' => $withoutLayout, + ))); + } + + /** + * Page not found + * + * @access public + * @param boolean $withoutLayout + */ + public function notFound($withoutLayout = false) + { + $this->response->html($this->helper->layout->app('app/notfound', array( + 'title' => t('Page not found'), + 'no_layout' => $withoutLayout, + ))); + } +} diff --git a/sources/app/Controller/Auth.php b/sources/app/Controller/AuthController.php similarity index 61% rename from sources/app/Controller/Auth.php rename to sources/app/Controller/AuthController.php index b882a72..d1fba92 100644 --- a/sources/app/Controller/Auth.php +++ b/sources/app/Controller/AuthController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Authentication controller + * Authentication Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Auth extends Base +class AuthController extends BaseController { /** * Display the form login @@ -20,16 +20,16 @@ class Auth extends Base public function login(array $values = array(), array $errors = array()) { if ($this->userSession->isLogged()) { - $this->response->redirect($this->helper->url->to('app', 'index')); + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); + } else { + $this->response->html($this->helper->layout->app('auth/index', array( + 'captcha' => ! empty($values['username']) && $this->userLockingModel->hasCaptcha($values['username']), + 'errors' => $errors, + 'values' => $values, + 'no_layout' => true, + 'title' => t('Login') + ))); } - - $this->response->html($this->helper->layout->app('auth/index', array( - 'captcha' => ! empty($values['username']) && $this->userLocking->hasCaptcha($values['username']), - 'errors' => $errors, - 'values' => $values, - 'no_layout' => true, - 'title' => t('Login') - ))); } /** @@ -45,9 +45,9 @@ class Auth extends Base if ($valid) { $this->redirectAfterLogin(); + } else { + $this->login($values, $errors); } - - $this->login($values, $errors); } /** @@ -59,9 +59,9 @@ class Auth extends Base { if (! DISABLE_LOGOUT) { $this->sessionManager->close(); - $this->response->redirect($this->helper->url->to('auth', 'login')); + $this->response->redirect($this->helper->url->to('AuthController', 'login')); } else { - $this->response->redirect($this->helper->url->to('auth', 'index')); + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); } } @@ -76,8 +76,8 @@ class Auth extends Base $redirect = $this->sessionStorage->redirectAfterLogin; unset($this->sessionStorage->redirectAfterLogin); $this->response->redirect($redirect); + } else { + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); } - - $this->response->redirect($this->helper->url->to('app', 'index')); } } diff --git a/sources/app/Controller/AvatarFile.php b/sources/app/Controller/AvatarFileController.php similarity index 74% rename from sources/app/Controller/AvatarFile.php rename to sources/app/Controller/AvatarFileController.php index a47cca6..6879c57 100644 --- a/sources/app/Controller/AvatarFile.php +++ b/sources/app/Controller/AvatarFileController.php @@ -8,10 +8,10 @@ use Kanboard\Core\Thumbnail; /** * Avatar File Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class AvatarFile extends Base +class AvatarFileController extends BaseController { /** * Display avatar page @@ -32,11 +32,11 @@ class AvatarFile extends Base { $user = $this->getUser(); - if (! $this->avatarFile->uploadFile($user['id'], $this->request->getFileInfo('avatar'))) { + if (! $this->avatarFileModel->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) { $this->flash->failure(t('Unable to upload the file.')); } - $this->response->redirect($this->helper->url->to('AvatarFile', 'show', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id']))); } /** @@ -46,8 +46,9 @@ class AvatarFile extends Base { $this->checkCSRFParam(); $user = $this->getUser(); - $this->avatarFile->remove($user['id']); - $this->response->redirect($this->helper->url->to('AvatarFile', 'show', array('user_id' => $user['id']))); + $this->avatarFileModel->remove($user['id']); + $this->userSession->refresh($user['id']); + $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id']))); } /** @@ -57,13 +58,14 @@ class AvatarFile extends Base { $user_id = $this->request->getIntegerParam('user_id'); $size = $this->request->getStringParam('size', 48); - $filename = $this->avatarFile->getFilename($user_id); + $filename = $this->avatarFileModel->getFilename($user_id); $etag = md5($filename.$size); - $this->response->cache(365 * 86400, $etag); - $this->response->contentType('image/jpeg'); + $this->response->withCache(365 * 86400, $etag); + $this->response->withContentType('image/jpeg'); if ($this->request->getHeader('If-None-Match') !== '"'.$etag.'"') { + $this->response->send(); $this->render($filename, $size); } else { $this->response->status(304); diff --git a/sources/app/Controller/Base.php b/sources/app/Controller/Base.php deleted file mode 100644 index beb5690..0000000 --- a/sources/app/Controller/Base.php +++ /dev/null @@ -1,290 +0,0 @@ -sessionManager->open(); - $this->dispatcher->dispatch('app.bootstrap'); - $this->sendHeaders(); - $this->authenticationManager->checkCurrentSession(); - - if (! $this->applicationAuthorization->isAllowed($this->router->getController(), $this->router->getAction(), Role::APP_PUBLIC)) { - $this->handleAuthentication(); - $this->handlePostAuthentication(); - $this->checkApplicationAuthorization(); - $this->checkProjectAuthorization(); - } - } - - /** - * Send HTTP headers - * - * @access private - */ - private function sendHeaders() - { - // HTTP secure headers - $this->response->csp($this->container['cspRules']); - $this->response->nosniff(); - $this->response->xss(); - - // Allow the public board iframe inclusion - if (ENABLE_XFRAME && $this->router->getAction() !== 'readonly') { - $this->response->xframe(); - } - - if (ENABLE_HSTS) { - $this->response->hsts(); - } - } - - /** - * Check authentication - * - * @access private - */ - private function handleAuthentication() - { - if (! $this->userSession->isLogged() && ! $this->authenticationManager->preAuthentication()) { - if ($this->request->isAjax()) { - $this->response->text('Not Authorized', 401); - } - - $this->sessionStorage->redirectAfterLogin = $this->request->getUri(); - $this->response->redirect($this->helper->url->to('auth', 'login')); - } - } - - /** - * Handle Post-Authentication (2FA) - * - * @access private - */ - private function handlePostAuthentication() - { - $controller = strtolower($this->router->getController()); - $action = strtolower($this->router->getAction()); - $ignore = ($controller === 'twofactor' && in_array($action, array('code', 'check'))) || ($controller === 'auth' && $action === 'logout'); - - if ($ignore === false && $this->userSession->hasPostAuthentication() && ! $this->userSession->isPostAuthenticationValidated()) { - if ($this->request->isAjax()) { - $this->response->text('Not Authorized', 401); - } - - $this->response->redirect($this->helper->url->to('twofactor', 'code')); - } - } - - /** - * Check application authorization - * - * @access private - */ - private function checkApplicationAuthorization() - { - if (! $this->helper->user->hasAccess($this->router->getController(), $this->router->getAction())) { - $this->forbidden(); - } - } - - /** - * Check project authorization - * - * @access private - */ - private function checkProjectAuthorization() - { - $project_id = $this->request->getIntegerParam('project_id'); - $task_id = $this->request->getIntegerParam('task_id'); - - // Allow urls without "project_id" - if ($task_id > 0 && $project_id === 0) { - $project_id = $this->taskFinder->getProjectId($task_id); - } - - if ($project_id > 0 && ! $this->helper->user->hasProjectAccess($this->router->getController(), $this->router->getAction(), $project_id)) { - $this->forbidden(); - } - } - - /** - * Application not found page (404 error) - * - * @access protected - * @param boolean $no_layout Display the layout or not - */ - protected function notfound($no_layout = false) - { - $this->response->html($this->helper->layout->app('app/notfound', array( - 'title' => t('Page not found'), - 'no_layout' => $no_layout, - ))); - } - - /** - * Application forbidden page - * - * @access protected - * @param boolean $no_layout Display the layout or not - */ - protected function forbidden($no_layout = false) - { - if ($this->request->isAjax()) { - $this->response->text('Access Forbidden', 403); - } - - $this->response->html($this->helper->layout->app('app/forbidden', array( - 'title' => t('Access Forbidden'), - 'no_layout' => $no_layout, - ))); - } - - /** - * Check if the CSRF token from the URL is correct - * - * @access protected - */ - protected function checkCSRFParam() - { - if (! $this->token->validateCSRFToken($this->request->getStringParam('csrf_token'))) { - $this->forbidden(); - } - } - - /** - * Check webhook token - * - * @access protected - */ - protected function checkWebhookToken() - { - if ($this->config->get('webhook_token') !== $this->request->getStringParam('token')) { - $this->response->text('Not Authorized', 401); - } - } - - /** - * Common method to get a task for task views - * - * @access protected - * @return array - */ - protected function getTask() - { - $project_id = $this->request->getIntegerParam('project_id'); - $task = $this->taskFinder->getDetails($this->request->getIntegerParam('task_id')); - - if (empty($task)) { - $this->notfound(); - } - - if ($project_id !== 0 && $project_id != $task['project_id']) { - $this->forbidden(); - } - - return $task; - } - - /** - * Get Task or Project file - * - * @access protected - */ - protected function getFile() - { - $task_id = $this->request->getIntegerParam('task_id'); - $file_id = $this->request->getIntegerParam('file_id'); - $model = 'projectFile'; - - if ($task_id > 0) { - $model = 'taskFile'; - $project_id = $this->taskFinder->getProjectId($task_id); - - if ($project_id !== $this->request->getIntegerParam('project_id')) { - $this->forbidden(); - } - } - - $file = $this->$model->getById($file_id); - - if (empty($file)) { - $this->notfound(); - } - - $file['model'] = $model; - return $file; - } - - /** - * Common method to get a project - * - * @access protected - * @param integer $project_id Default project id - * @return array - */ - protected function getProject($project_id = 0) - { - $project_id = $this->request->getIntegerParam('project_id', $project_id); - $project = $this->project->getByIdWithOwner($project_id); - - if (empty($project)) { - $this->notfound(); - } - - return $project; - } - - /** - * Common method to get the user - * - * @access protected - * @return array - */ - protected function getUser() - { - $user = $this->user->getById($this->request->getIntegerParam('user_id', $this->userSession->getId())); - - if (empty($user)) { - $this->notfound(); - } - - if (! $this->userSession->isAdmin() && $this->userSession->getId() != $user['id']) { - $this->forbidden(); - } - - return $user; - } - - /** - * Get the current subtask - * - * @access protected - * @return array - */ - protected function getSubtask() - { - $subtask = $this->subtask->getById($this->request->getIntegerParam('subtask_id')); - - if (empty($subtask)) { - $this->notfound(); - } - - return $subtask; - } -} diff --git a/sources/app/Controller/BaseController.php b/sources/app/Controller/BaseController.php new file mode 100644 index 0000000..5233e27 --- /dev/null +++ b/sources/app/Controller/BaseController.php @@ -0,0 +1,158 @@ +token->validateCSRFToken($this->request->getStringParam('csrf_token'))) { + throw new AccessForbiddenException(); + } + } + + /** + * Check webhook token + * + * @access protected + */ + protected function checkWebhookToken() + { + if ($this->configModel->get('webhook_token') !== $this->request->getStringParam('token')) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + } + + /** + * Common method to get a task for task views + * + * @access protected + * @return array + * @throws PageNotFoundException + * @throws AccessForbiddenException + */ + protected function getTask() + { + $project_id = $this->request->getIntegerParam('project_id'); + $task = $this->taskFinderModel->getDetails($this->request->getIntegerParam('task_id')); + + if (empty($task)) { + throw new PageNotFoundException(); + } + + if ($project_id !== 0 && $project_id != $task['project_id']) { + throw new AccessForbiddenException(); + } + + return $task; + } + + /** + * Get Task or Project file + * + * @access protected + * @return array + * @throws PageNotFoundException + * @throws AccessForbiddenException + */ + protected function getFile() + { + $task_id = $this->request->getIntegerParam('task_id'); + $file_id = $this->request->getIntegerParam('file_id'); + $model = 'projectFileModel'; + + if ($task_id > 0) { + $model = 'taskFileModel'; + $project_id = $this->taskFinderModel->getProjectId($task_id); + + if ($project_id !== $this->request->getIntegerParam('project_id')) { + throw new AccessForbiddenException(); + } + } + + $file = $this->$model->getById($file_id); + + if (empty($file)) { + throw new PageNotFoundException(); + } + + $file['model'] = $model; + return $file; + } + + /** + * Common method to get a project + * + * @access protected + * @param integer $project_id Default project id + * @return array + * @throws PageNotFoundException + */ + protected function getProject($project_id = 0) + { + $project_id = $this->request->getIntegerParam('project_id', $project_id); + $project = $this->projectModel->getByIdWithOwner($project_id); + + if (empty($project)) { + throw new PageNotFoundException(); + } + + return $project; + } + + /** + * Common method to get the user + * + * @access protected + * @return array + * @throws PageNotFoundException + * @throws AccessForbiddenException + */ + protected function getUser() + { + $user = $this->userModel->getById($this->request->getIntegerParam('user_id', $this->userSession->getId())); + + if (empty($user)) { + throw new PageNotFoundException(); + } + + if (! $this->userSession->isAdmin() && $this->userSession->getId() != $user['id']) { + throw new AccessForbiddenException(); + } + + return $user; + } + + /** + * Get the current subtask + * + * @access protected + * @return array + * @throws PageNotFoundException + */ + protected function getSubtask() + { + $subtask = $this->subtaskModel->getById($this->request->getIntegerParam('subtask_id')); + + if (empty($subtask)) { + throw new PageNotFoundException(); + } + + return $subtask; + } +} diff --git a/sources/app/Controller/Board.php b/sources/app/Controller/Board.php deleted file mode 100644 index 51344bd..0000000 --- a/sources/app/Controller/Board.php +++ /dev/null @@ -1,186 +0,0 @@ -request->getStringParam('token'); - $project = $this->project->getByToken($token); - - // Token verification - if (empty($project)) { - $this->forbidden(true); - } - - // Display the board with a specific layout - $this->response->html($this->helper->layout->app('board/view_public', array( - 'project' => $project, - 'swimlanes' => $this->board->getBoard($project['id']), - 'title' => $project['name'], - 'description' => $project['description'], - 'no_layout' => true, - 'not_editable' => true, - 'board_public_refresh_interval' => $this->config->get('board_public_refresh_interval'), - 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), - 'board_highlight_period' => $this->config->get('board_highlight_period'), - ))); - } - - /** - * Show a board for a given project - * - * @access public - */ - public function show() - { - $project = $this->getProject(); - $search = $this->helper->projectHeader->getSearchQuery($project); - - $this->response->html($this->helper->layout->app('board/view_private', array( - 'swimlanes' => $this->taskFilter->search($search)->getBoard($project['id']), - 'project' => $project, - 'title' => $project['name'], - 'description' => $this->helper->projectHeader->getDescription($project), - 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), - 'board_highlight_period' => $this->config->get('board_highlight_period'), - ))); - } - - /** - * Save the board (Ajax request made by the drag and drop) - * - * @access public - */ - public function save() - { - $project_id = $this->request->getIntegerParam('project_id'); - - if (! $project_id || ! $this->request->isAjax()) { - return $this->response->status(403); - } - - $values = $this->request->getJson(); - - $result =$this->taskPosition->movePosition( - $project_id, - $values['task_id'], - $values['column_id'], - $values['position'], - $values['swimlane_id'] - ); - - if (! $result) { - return $this->response->status(400); - } - - $this->response->html($this->renderBoard($project_id), 201); - } - - /** - * Check if the board have been changed - * - * @access public - */ - public function check() - { - $project_id = $this->request->getIntegerParam('project_id'); - $timestamp = $this->request->getIntegerParam('timestamp'); - - if (! $project_id || ! $this->request->isAjax()) { - return $this->response->status(403); - } - - if (! $this->project->isModifiedSince($project_id, $timestamp)) { - return $this->response->status(304); - } - - return $this->response->html($this->renderBoard($project_id)); - } - - /** - * Reload the board with new filters - * - * @access public - */ - public function reload() - { - $project_id = $this->request->getIntegerParam('project_id'); - - if (! $project_id || ! $this->request->isAjax()) { - return $this->response->status(403); - } - - $values = $this->request->getJson(); - $this->userSession->setFilters($project_id, empty($values['search']) ? '' : $values['search']); - - $this->response->html($this->renderBoard($project_id)); - } - - /** - * Enable collapsed mode - * - * @access public - */ - public function collapse() - { - $this->changeDisplayMode(true); - } - - /** - * Enable expanded mode - * - * @access public - */ - public function expand() - { - $this->changeDisplayMode(false); - } - - /** - * Change display mode - * - * @access private - * @param boolean $mode - */ - private function changeDisplayMode($mode) - { - $project_id = $this->request->getIntegerParam('project_id'); - $this->userSession->setBoardDisplayMode($project_id, $mode); - - if ($this->request->isAjax()) { - $this->response->html($this->renderBoard($project_id)); - } else { - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project_id))); - } - } - - /** - * Render board - * - * @access private - * @param integer $project_id - */ - private function renderBoard($project_id) - { - return $this->template->render('board/table_container', array( - 'project' => $this->project->getById($project_id), - 'swimlanes' => $this->taskFilter->search($this->userSession->getFilters($project_id))->getBoard($project_id), - 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), - 'board_highlight_period' => $this->config->get('board_highlight_period'), - )); - } -} diff --git a/sources/app/Controller/BoardAjaxController.php b/sources/app/Controller/BoardAjaxController.php new file mode 100644 index 0000000..9b721f0 --- /dev/null +++ b/sources/app/Controller/BoardAjaxController.php @@ -0,0 +1,140 @@ +request->getIntegerParam('project_id'); + + if (! $project_id || ! $this->request->isAjax()) { + throw new AccessForbiddenException(); + } + + $values = $this->request->getJson(); + + $result =$this->taskPositionModel->movePosition( + $project_id, + $values['task_id'], + $values['column_id'], + $values['position'], + $values['swimlane_id'] + ); + + if (! $result) { + $this->response->status(400); + } else { + $this->response->html($this->renderBoard($project_id), 201); + } + } + + /** + * Check if the board have been changed + * + * @access public + */ + public function check() + { + $project_id = $this->request->getIntegerParam('project_id'); + $timestamp = $this->request->getIntegerParam('timestamp'); + + if (! $project_id || ! $this->request->isAjax()) { + throw new AccessForbiddenException(); + } elseif (! $this->projectModel->isModifiedSince($project_id, $timestamp)) { + $this->response->status(304); + } else { + $this->response->html($this->renderBoard($project_id)); + } + } + + /** + * Reload the board with new filters + * + * @access public + */ + public function reload() + { + $project_id = $this->request->getIntegerParam('project_id'); + + if (! $project_id || ! $this->request->isAjax()) { + throw new AccessForbiddenException(); + } + + $values = $this->request->getJson(); + $this->userSession->setFilters($project_id, empty($values['search']) ? '' : $values['search']); + + $this->response->html($this->renderBoard($project_id)); + } + + /** + * Enable collapsed mode + * + * @access public + */ + public function collapse() + { + $this->changeDisplayMode(true); + } + + /** + * Enable expanded mode + * + * @access public + */ + public function expand() + { + $this->changeDisplayMode(false); + } + + /** + * Change display mode + * + * @access private + * @param boolean $mode + */ + private function changeDisplayMode($mode) + { + $project_id = $this->request->getIntegerParam('project_id'); + $this->userSession->setBoardDisplayMode($project_id, $mode); + + if ($this->request->isAjax()) { + $this->response->html($this->renderBoard($project_id)); + } else { + $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project_id))); + } + } + + /** + * Render board + * + * @access protected + * @param integer $project_id + * @return string + */ + protected function renderBoard($project_id) + { + return $this->template->render('board/table_container', array( + 'project' => $this->projectModel->getById($project_id), + 'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'), + 'board_highlight_period' => $this->configModel->get('board_highlight_period'), + 'swimlanes' => $this->taskLexer + ->build($this->userSession->getFilters($project_id)) + ->format(BoardFormatter::getInstance($this->container)->withProjectId($project_id)) + )); + } +} diff --git a/sources/app/Controller/BoardPopover.php b/sources/app/Controller/BoardPopover.php deleted file mode 100644 index 63dab30..0000000 --- a/sources/app/Controller/BoardPopover.php +++ /dev/null @@ -1,135 +0,0 @@ -getTask(); - $project = $this->project->getById($task['project_id']); - - $this->response->html($this->template->render('board/popover_assignee', array( - 'values' => $task, - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']), - 'project' => $project, - ))); - } - - /** - * Validate an assignee modification - * - * @access public - */ - public function updateAssignee() - { - $values = $this->request->getValues(); - - list($valid, ) = $this->taskValidator->validateAssigneeModification($values); - - if ($valid && $this->taskModification->update($values)) { - $this->flash->success(t('Task updated successfully.')); - } else { - $this->flash->failure(t('Unable to update your task.')); - } - - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $values['project_id']))); - } - - /** - * Change a task category directly from the board - * - * @access public - */ - public function changeCategory() - { - $task = $this->getTask(); - $project = $this->project->getById($task['project_id']); - - $this->response->html($this->template->render('board/popover_category', array( - 'values' => $task, - 'categories_list' => $this->category->getList($project['id']), - 'project' => $project, - ))); - } - - /** - * Validate a category modification - * - * @access public - */ - public function updateCategory() - { - $values = $this->request->getValues(); - - list($valid, ) = $this->taskValidator->validateCategoryModification($values); - - if ($valid && $this->taskModification->update($values)) { - $this->flash->success(t('Task updated successfully.')); - } else { - $this->flash->failure(t('Unable to update your task.')); - } - - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $values['project_id']))); - } - - /** - * Screenshot popover - * - * @access public - */ - public function screenshot() - { - $task = $this->getTask(); - - $this->response->html($this->template->render('task_file/screenshot', array( - 'task' => $task, - ))); - } - - /** - * Confirmation before to close all column tasks - * - * @access public - */ - public function confirmCloseColumnTasks() - { - $project = $this->getProject(); - $column_id = $this->request->getIntegerParam('column_id'); - $swimlane_id = $this->request->getIntegerParam('swimlane_id'); - - $this->response->html($this->template->render('board/popover_close_all_tasks_column', array( - 'project' => $project, - 'nb_tasks' => $this->taskFinder->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id), - 'column' => $this->column->getColumnTitleById($column_id), - 'swimlane' => $this->swimlane->getNameById($swimlane_id) ?: t($project['default_swimlane']), - 'values' => array('column_id' => $column_id, 'swimlane_id' => $swimlane_id), - ))); - } - - /** - * Close all column tasks - * - * @access public - */ - public function closeColumnTasks() - { - $project = $this->getProject(); - $values = $this->request->getValues(); - - $this->taskStatus->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']); - $this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->column->getColumnTitleById($values['column_id']), $this->swimlane->getNameById($values['swimlane_id']) ?: t($project['default_swimlane']))); - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id']))); - } -} diff --git a/sources/app/Controller/BoardPopoverController.php b/sources/app/Controller/BoardPopoverController.php new file mode 100644 index 0000000..a0f5ae1 --- /dev/null +++ b/sources/app/Controller/BoardPopoverController.php @@ -0,0 +1,47 @@ +getProject(); + $column_id = $this->request->getIntegerParam('column_id'); + $swimlane_id = $this->request->getIntegerParam('swimlane_id'); + + $this->response->html($this->template->render('board_popover/close_all_tasks_column', array( + 'project' => $project, + 'nb_tasks' => $this->taskFinderModel->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id), + 'column' => $this->columnModel->getColumnTitleById($column_id), + 'swimlane' => $this->swimlaneModel->getNameById($swimlane_id) ?: t($project['default_swimlane']), + 'values' => array('column_id' => $column_id, 'swimlane_id' => $swimlane_id), + ))); + } + + /** + * Close all column tasks + * + * @access public + */ + public function closeColumnTasks() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + + $this->taskStatusModel->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']); + $this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->columnModel->getColumnTitleById($values['column_id']), $this->swimlaneModel->getNameById($values['swimlane_id']) ?: t($project['default_swimlane']))); + $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id']))); + } +} diff --git a/sources/app/Controller/BoardTooltip.php b/sources/app/Controller/BoardTooltipController.php similarity index 73% rename from sources/app/Controller/BoardTooltip.php rename to sources/app/Controller/BoardTooltipController.php index c7819bc..134d728 100644 --- a/sources/app/Controller/BoardTooltip.php +++ b/sources/app/Controller/BoardTooltipController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Board Tooltip * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class BoardTooltip extends Base +class BoardTooltipController extends BaseController { /** * Get links on mouseover @@ -19,7 +19,7 @@ class BoardTooltip extends Base { $task = $this->getTask(); $this->response->html($this->template->render('board/tooltip_tasklinks', array( - 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), + 'links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']), 'task' => $task, ))); } @@ -33,7 +33,7 @@ class BoardTooltip extends Base { $task = $this->getTask(); $this->response->html($this->template->render('board/tooltip_external_links', array( - 'links' => $this->taskExternalLink->getAll($task['id']), + 'links' => $this->taskExternalLinkModel->getAll($task['id']), 'task' => $task, ))); } @@ -47,7 +47,7 @@ class BoardTooltip extends Base { $task = $this->getTask(); $this->response->html($this->template->render('board/tooltip_subtasks', array( - 'subtasks' => $this->subtask->getAll($task['id']), + 'subtasks' => $this->subtaskModel->getAll($task['id']), 'task' => $task, ))); } @@ -62,7 +62,7 @@ class BoardTooltip extends Base $task = $this->getTask(); $this->response->html($this->template->render('board/tooltip_files', array( - 'files' => $this->taskFile->getAll($task['id']), + 'files' => $this->taskFileModel->getAll($task['id']), 'task' => $task, ))); } @@ -78,7 +78,7 @@ class BoardTooltip extends Base $this->response->html($this->template->render('board/tooltip_comments', array( 'task' => $task, - 'comments' => $this->comment->getAll($task['id'], $this->userSession->getCommentSorting()) + 'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting()) ))); } @@ -107,9 +107,9 @@ class BoardTooltip extends Base $this->response->html($this->template->render('task_recurrence/info', array( 'task' => $task, - 'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(), - 'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(), - 'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(), + 'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(), + 'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(), + 'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(), ))); } @@ -121,7 +121,7 @@ class BoardTooltip extends Base public function swimlane() { $this->getProject(); - $swimlane = $this->swimlane->getById($this->request->getIntegerParam('swimlane_id')); + $swimlane = $this->swimlaneModel->getById($this->request->getIntegerParam('swimlane_id')); $this->response->html($this->template->render('board/tooltip_description', array('task' => $swimlane))); } } diff --git a/sources/app/Controller/BoardViewController.php b/sources/app/Controller/BoardViewController.php new file mode 100644 index 0000000..97c99d1 --- /dev/null +++ b/sources/app/Controller/BoardViewController.php @@ -0,0 +1,69 @@ +request->getStringParam('token'); + $project = $this->projectModel->getByToken($token); + + if (empty($project)) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + $this->response->html($this->helper->layout->app('board/view_public', array( + 'project' => $project, + 'swimlanes' => BoardFormatter::getInstance($this->container) + ->withProjectId($project['id']) + ->withQuery($this->taskFinderModel->getExtendedQuery()) + ->format() + , + 'title' => $project['name'], + 'description' => $project['description'], + 'no_layout' => true, + 'not_editable' => true, + 'board_public_refresh_interval' => $this->configModel->get('board_public_refresh_interval'), + 'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'), + 'board_highlight_period' => $this->configModel->get('board_highlight_period'), + ))); + } + + /** + * Show a board for a given project + * + * @access public + */ + public function show() + { + $project = $this->getProject(); + $search = $this->helper->projectHeader->getSearchQuery($project); + + $this->response->html($this->helper->layout->app('board/view_private', array( + 'project' => $project, + 'title' => $project['name'], + 'description' => $this->helper->projectHeader->getDescription($project), + 'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'), + 'board_highlight_period' => $this->configModel->get('board_highlight_period'), + 'swimlanes' => $this->taskLexer + ->build($search) + ->format(BoardFormatter::getInstance($this->container)->withProjectId($project['id'])) + ))); + } +} diff --git a/sources/app/Controller/Calendar.php b/sources/app/Controller/CalendarController.php similarity index 50% rename from sources/app/Controller/Calendar.php rename to sources/app/Controller/CalendarController.php index af31ae4..e5114f0 100644 --- a/sources/app/Controller/Calendar.php +++ b/sources/app/Controller/CalendarController.php @@ -2,16 +2,19 @@ namespace Kanboard\Controller; -use Kanboard\Model\Task as TaskModel; +use Kanboard\Filter\TaskAssigneeFilter; +use Kanboard\Filter\TaskProjectFilter; +use Kanboard\Filter\TaskStatusFilter; +use Kanboard\Model\TaskModel; /** - * Project Calendar controller + * Calendar Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot * @author Timo Litzbarski */ -class Calendar extends Base +class CalendarController extends BaseController { /** * Show calendar view for projects @@ -26,7 +29,7 @@ class Calendar extends Base 'project' => $project, 'title' => $project['name'], 'description' => $this->helper->projectHeader->getDescription($project), - 'check_interval' => $this->config->get('board_private_refresh_interval'), + 'check_interval' => $this->configModel->get('board_private_refresh_interval'), ))); } @@ -40,21 +43,11 @@ class Calendar extends Base $project_id = $this->request->getIntegerParam('project_id'); $start = $this->request->getStringParam('start'); $end = $this->request->getStringParam('end'); + $search = $this->userSession->getFilters($project_id); + $queryBuilder = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project_id)); - // Common filter - $filter = $this->taskFilterCalendarFormatter - ->search($this->userSession->getFilters($project_id)) - ->filterByProject($project_id); - - // Tasks - if ($this->config->get('calendar_project_tasks', 'date_started') === 'date_creation') { - $events = $filter->copy()->filterByCreationDateRange($start, $end)->setColumns('date_creation', 'date_completed')->format(); - } else { - $events = $filter->copy()->filterByStartDateRange($start, $end)->setColumns('date_started', 'date_completed')->format(); - } - - // Tasks with due date - $events = array_merge($events, $filter->copy()->filterByDueDateRange($start, $end)->setColumns('date_due')->setFullDay()->format()); + $events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end); + $events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end)); $events = $this->hook->merge('controller:calendar:project:events', $events, array( 'project_id' => $project_id, @@ -75,21 +68,15 @@ class Calendar extends Base $user_id = $this->request->getIntegerParam('user_id'); $start = $this->request->getStringParam('start'); $end = $this->request->getStringParam('end'); - $filter = $this->taskFilterCalendarFormatter->create()->filterByOwner($user_id)->filterByStatus(TaskModel::STATUS_OPEN); + $queryBuilder = $this->taskQuery + ->withFilter(new TaskAssigneeFilter($user_id)) + ->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN)); - // Task with due date - $events = $filter->copy()->filterByDueDateRange($start, $end)->setColumns('date_due')->setFullDay()->format(); + $events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end); + $events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end)); - // Tasks - if ($this->config->get('calendar_user_tasks', 'date_started') === 'date_creation') { - $events = array_merge($events, $filter->copy()->filterByCreationDateRange($start, $end)->setColumns('date_creation', 'date_completed')->format()); - } else { - $events = array_merge($events, $filter->copy()->filterByStartDateRange($start, $end)->setColumns('date_started', 'date_completed')->format()); - } - - // Subtasks time tracking - if ($this->config->get('calendar_user_subtasks_time_tracking') == 1) { - $events = array_merge($events, $this->subtaskTimeTracking->getUserCalendarEvents($user_id, $start, $end)); + if ($this->configModel->get('calendar_user_subtasks_time_tracking') == 1) { + $events = array_merge($events, $this->helper->calendar->getSubtaskTimeTrackingEvents($user_id, $start, $end)); } $events = $this->hook->merge('controller:calendar:user:events', $events, array( @@ -111,7 +98,7 @@ class Calendar extends Base if ($this->request->isAjax() && $this->request->isPost()) { $values = $this->request->getJson(); - $this->taskModification->update(array( + $this->taskModificationModel->update(array( 'id' => $values['task_id'], 'date_due' => substr($values['date_due'], 0, 10), )); diff --git a/sources/app/Controller/Captcha.php b/sources/app/Controller/CaptchaController.php similarity index 74% rename from sources/app/Controller/Captcha.php rename to sources/app/Controller/CaptchaController.php index fcf081e..43b2f82 100644 --- a/sources/app/Controller/Captcha.php +++ b/sources/app/Controller/CaptchaController.php @@ -7,10 +7,10 @@ use Gregwar\Captcha\CaptchaBuilder; /** * Captcha Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Captcha extends Base +class CaptchaController extends BaseController { /** * Display captcha image @@ -19,7 +19,7 @@ class Captcha extends Base */ public function image() { - $this->response->contentType('image/jpeg'); + $this->response->withContentType('image/jpeg')->send(); $builder = new CaptchaBuilder; $builder->build(); diff --git a/sources/app/Controller/Category.php b/sources/app/Controller/CategoryController.php similarity index 68% rename from sources/app/Controller/Category.php rename to sources/app/Controller/CategoryController.php index 258a3b7..dd6e1c3 100644 --- a/sources/app/Controller/Category.php +++ b/sources/app/Controller/CategoryController.php @@ -2,28 +2,29 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\PageNotFoundException; + /** - * Category management + * Category Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Category extends Base +class CategoryController extends BaseController { /** * Get the category (common method between actions) * * @access private - * @param integer $project_id * @return array + * @throws PageNotFoundException */ - private function getCategory($project_id) + private function getCategory() { - $category = $this->category->getById($this->request->getIntegerParam('category_id')); + $category = $this->categoryModel->getById($this->request->getIntegerParam('category_id')); if (empty($category)) { - $this->flash->failure(t('Category not found.')); - $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project_id))); + throw new PageNotFoundException(); } return $category; @@ -33,13 +34,16 @@ class Category extends Base * List of categories for a given project * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException */ public function index(array $values = array(), array $errors = array()) { $project = $this->getProject(); $this->response->html($this->helper->layout->project('category/index', array( - 'categories' => $this->category->getList($project['id'], false), + 'categories' => $this->categoryModel->getList($project['id'], false), 'values' => $values + array('project_id' => $project['id']), 'errors' => $errors, 'project' => $project, @@ -60,26 +64,29 @@ class Category extends Base list($valid, $errors) = $this->categoryValidator->validateCreation($values); if ($valid) { - if ($this->category->create($values)) { + if ($this->categoryModel->create($values) !== false) { $this->flash->success(t('Your category have been created successfully.')); - $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id']))); } else { $this->flash->failure(t('Unable to create your category.')); } } - $this->index($values, $errors); + return $this->index($values, $errors); } /** * Edit a category (display the form) * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $category = $this->getCategory($project['id']); + $category = $this->getCategory(); $this->response->html($this->helper->layout->project('category/edit', array( 'values' => empty($values) ? $category : $values, @@ -102,15 +109,15 @@ class Category extends Base list($valid, $errors) = $this->categoryValidator->validateModification($values); if ($valid) { - if ($this->category->update($values)) { + if ($this->categoryModel->update($values)) { $this->flash->success(t('Your category have been updated successfully.')); - $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id']))); } else { $this->flash->failure(t('Unable to update your category.')); } } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -121,7 +128,7 @@ class Category extends Base public function confirm() { $project = $this->getProject(); - $category = $this->getCategory($project['id']); + $category = $this->getCategory(); $this->response->html($this->helper->layout->project('category/remove', array( 'project' => $project, @@ -139,14 +146,14 @@ class Category extends Base { $this->checkCSRFParam(); $project = $this->getProject(); - $category = $this->getCategory($project['id']); + $category = $this->getCategory(); - if ($this->category->remove($category['id'])) { + if ($this->categoryModel->remove($category['id'])) { $this->flash->success(t('Category removed successfully.')); } else { $this->flash->failure(t('Unable to remove this category.')); } - $this->response->redirect($this->helper->url->to('category', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id']))); } } diff --git a/sources/app/Controller/Column.php b/sources/app/Controller/ColumnController.php similarity index 70% rename from sources/app/Controller/Column.php rename to sources/app/Controller/ColumnController.php index bbe12fe..95fbcaa 100644 --- a/sources/app/Controller/Column.php +++ b/sources/app/Controller/ColumnController.php @@ -2,13 +2,15 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; + /** - * Column controller + * Column Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Column extends Base +class ColumnController extends BaseController { /** * Display columns list @@ -18,7 +20,7 @@ class Column extends Base public function index() { $project = $this->getProject(); - $columns = $this->column->getAll($project['id']); + $columns = $this->columnModel->getAll($project['id']); $this->response->html($this->helper->layout->project('column/index', array( 'columns' => $columns, @@ -31,6 +33,9 @@ class Column extends Base * Show form to create a new column * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function create(array $values = array(), array $errors = array()) { @@ -61,15 +66,15 @@ class Column extends Base list($valid, $errors) = $this->columnValidator->validateCreation($values); if ($valid) { - if ($this->column->create($project['id'], $values['title'], $values['task_limit'], $values['description'])) { + if ($this->columnModel->create($project['id'], $values['title'], $values['task_limit'], $values['description']) !== false) { $this->flash->success(t('Column created successfully.')); - return $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id'])), true); + return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])), true); } else { $errors['title'] = array(t('Another column with the same name exists in the project')); } } - $this->create($values, $errors); + return $this->create($values, $errors); } /** @@ -82,7 +87,7 @@ class Column extends Base public function edit(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $column = $this->column->getById($this->request->getIntegerParam('column_id')); + $column = $this->columnModel->getById($this->request->getIntegerParam('column_id')); $this->response->html($this->helper->layout->project('column/edit', array( 'errors' => $errors, @@ -106,15 +111,15 @@ class Column extends Base list($valid, $errors) = $this->columnValidator->validateModification($values); if ($valid) { - if ($this->column->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) { + if ($this->columnModel->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) { $this->flash->success(t('Board updated successfully.')); - $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id']))); } else { $this->flash->failure(t('Unable to update this board.')); } } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -128,11 +133,11 @@ class Column extends Base $values = $this->request->getJson(); if (! empty($values) && isset($values['column_id']) && isset($values['position'])) { - $result = $this->column->changePosition($project['id'], $values['column_id'], $values['position']); - return $this->response->json(array('result' => $result)); + $result = $this->columnModel->changePosition($project['id'], $values['column_id'], $values['position']); + $this->response->json(array('result' => $result)); + } else { + throw new AccessForbiddenException(); } - - $this->forbidden(); } /** @@ -145,7 +150,7 @@ class Column extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->project('column/remove', array( - 'column' => $this->column->getById($this->request->getIntegerParam('column_id')), + 'column' => $this->columnModel->getById($this->request->getIntegerParam('column_id')), 'project' => $project, 'title' => t('Remove a column from a board') ))); @@ -162,12 +167,12 @@ class Column extends Base $this->checkCSRFParam(); $column_id = $this->request->getIntegerParam('column_id'); - if ($this->column->remove($column_id)) { + if ($this->columnModel->remove($column_id)) { $this->flash->success(t('Column removed successfully.')); } else { $this->flash->failure(t('Unable to remove this column.')); } - $this->response->redirect($this->helper->url->to('column', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id']))); } } diff --git a/sources/app/Controller/Comment.php b/sources/app/Controller/CommentController.php similarity index 70% rename from sources/app/Controller/Comment.php rename to sources/app/Controller/CommentController.php index ff7ec30..2a8c258 100644 --- a/sources/app/Controller/Comment.php +++ b/sources/app/Controller/CommentController.php @@ -2,30 +2,35 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; +use Kanboard\Core\Controller\PageNotFoundException; + /** - * Comment controller + * Comment Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Comment extends Base +class CommentController extends BaseController { /** * Get the current comment * * @access private * @return array + * @throws PageNotFoundException + * @throws AccessForbiddenException */ private function getComment() { - $comment = $this->comment->getById($this->request->getIntegerParam('comment_id')); + $comment = $this->commentModel->getById($this->request->getIntegerParam('comment_id')); if (empty($comment)) { - return $this->notfound(); + throw new PageNotFoundException(); } if (! $this->userSession->isAdmin() && $comment['user_id'] != $this->userSession->getId()) { - return $this->forbidden(); + throw new AccessForbiddenException(); } return $comment; @@ -35,6 +40,10 @@ class Comment extends Base * Add comment form * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException + * @throws PageNotFoundException */ public function create(array $values = array(), array $errors = array()) { @@ -67,22 +76,26 @@ class Comment extends Base list($valid, $errors) = $this->commentValidator->validateCreation($values); if ($valid) { - if ($this->comment->create($values)) { + if ($this->commentModel->create($values) !== false) { $this->flash->success(t('Comment added successfully.')); } else { $this->flash->failure(t('Unable to create your comment.')); } - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); } - $this->create($values, $errors); + return $this->create($values, $errors); } /** * Edit a comment * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException + * @throws PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { @@ -112,16 +125,16 @@ class Comment extends Base list($valid, $errors) = $this->commentValidator->validateModification($values); if ($valid) { - if ($this->comment->update($values)) { + if ($this->commentModel->update($values)) { $this->flash->success(t('Comment updated successfully.')); } else { $this->flash->failure(t('Unable to update your comment.')); } - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), false); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), false); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -152,13 +165,13 @@ class Comment extends Base $task = $this->getTask(); $comment = $this->getComment(); - if ($this->comment->remove($comment['id'])) { + if ($this->commentModel->remove($comment['id'])) { $this->flash->success(t('Comment removed successfully.')); } else { $this->flash->failure(t('Unable to remove this comment.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments')); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments')); } /** @@ -173,6 +186,6 @@ class Comment extends Base $order = $this->userSession->getCommentSorting() === 'ASC' ? 'DESC' : 'ASC'; $this->userSession->setCommentSorting($order); - $this->response->redirect($this->helper->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'comments')); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments')); } } diff --git a/sources/app/Controller/Config.php b/sources/app/Controller/ConfigController.php similarity index 59% rename from sources/app/Controller/Config.php rename to sources/app/Controller/ConfigController.php index a1b8c2a..8285ee1 100644 --- a/sources/app/Controller/Config.php +++ b/sources/app/Controller/ConfigController.php @@ -3,55 +3,13 @@ namespace Kanboard\Controller; /** - * Config controller + * Config Controller * - * @package controller + * @package Kanboard/Controller * @author Frederic Guillot */ -class Config extends Base +class ConfigController extends BaseController { - /** - * Common method between pages - * - * @access private - * @param string $redirect Action to redirect after saving the form - */ - private function common($redirect) - { - if ($this->request->isPost()) { - $values = $this->request->getValues(); - - switch ($redirect) { - case 'application': - $values += array('password_reset' => 0); - break; - case 'project': - $values += array( - 'subtask_restriction' => 0, - 'subtask_time_tracking' => 0, - 'cfd_include_closed_tasks' => 0, - 'disable_private_project' => 0, - ); - break; - case 'integrations': - $values += array('integration_gravatar' => 0); - break; - case 'calendar': - $values += array('calendar_user_subtasks_time_tracking' => 0); - break; - } - - if ($this->config->save($values)) { - $this->config->reload(); - $this->flash->success(t('Settings saved successfully.')); - } else { - $this->flash->failure(t('Unable to save your settings.')); - } - - $this->response->redirect($this->helper->url->to('config', $redirect)); - } - } - /** * Display the about page * @@ -60,7 +18,7 @@ class Config extends Base public function index() { $this->response->html($this->helper->layout->config('config/about', array( - 'db_size' => $this->config->getDatabaseSize(), + 'db_size' => $this->configModel->getDatabaseSize(), 'db_version' => $this->db->getDriver()->getDatabaseVersion(), 'user_agent' => $this->request->getServerVariable('HTTP_USER_AGENT'), 'title' => t('Settings').' > '.t('About'), @@ -68,16 +26,42 @@ class Config extends Base } /** - * Display the plugin page + * Save settings * - * @access public */ - public function plugins() + public function save() { - $this->response->html($this->helper->layout->config('config/plugins', array( - 'plugins' => $this->pluginLoader->plugins, - 'title' => t('Settings').' > '.t('Plugins'), - ))); + $values = $this->request->getValues(); + $redirect = $this->request->getStringParam('redirect', 'application'); + + switch ($redirect) { + case 'application': + $values += array('password_reset' => 0); + break; + case 'project': + $values += array( + 'subtask_restriction' => 0, + 'subtask_time_tracking' => 0, + 'cfd_include_closed_tasks' => 0, + 'disable_private_project' => 0, + ); + break; + case 'integrations': + $values += array('integration_gravatar' => 0); + break; + case 'calendar': + $values += array('calendar_user_subtasks_time_tracking' => 0); + break; + } + + if ($this->configModel->save($values)) { + $this->languageModel->loadCurrentLanguage(); + $this->flash->success(t('Settings saved successfully.')); + } else { + $this->flash->failure(t('Unable to save your settings.')); + } + + $this->response->redirect($this->helper->url->to('ConfigController', $redirect)); } /** @@ -87,11 +71,10 @@ class Config extends Base */ public function application() { - $this->common('application'); - $this->response->html($this->helper->layout->config('config/application', array( - 'languages' => $this->config->getLanguages(), - 'timezones' => $this->config->getTimezones(), + 'mail_transports' => $this->emailClient->getAvailableTransports(), + 'languages' => $this->languageModel->getLanguages(), + 'timezones' => $this->timezoneModel->getTimezones(), 'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()), 'datetime_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateTimeFormats()), 'time_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getTimeFormats()), @@ -99,6 +82,26 @@ class Config extends Base ))); } + /** + * Display the email settings page + * + * @access public + */ + public function email() + { + $values = $this->configModel->getAll(); + + if (empty($values['mail_transport'])) { + $values['mail_transport'] = MAIL_TRANSPORT; + } + + $this->response->html($this->helper->layout->config('config/email', array( + 'values' => $values, + 'mail_transports' => $this->emailClient->getAvailableTransports(), + 'title' => t('Settings').' > '.t('Email settings'), + ))); + } + /** * Display the project settings page * @@ -106,11 +109,9 @@ class Config extends Base */ public function project() { - $this->common('project'); - $this->response->html($this->helper->layout->config('config/project', array( - 'colors' => $this->color->getList(), - 'default_columns' => implode(', ', $this->board->getDefaultColumns()), + 'colors' => $this->colorModel->getList(), + 'default_columns' => implode(', ', $this->boardModel->getDefaultColumns()), 'title' => t('Settings').' > '.t('Project settings'), ))); } @@ -122,8 +123,6 @@ class Config extends Base */ public function board() { - $this->common('board'); - $this->response->html($this->helper->layout->config('config/board', array( 'title' => t('Settings').' > '.t('Board settings'), ))); @@ -136,8 +135,6 @@ class Config extends Base */ public function calendar() { - $this->common('calendar'); - $this->response->html($this->helper->layout->config('config/calendar', array( 'title' => t('Settings').' > '.t('Calendar settings'), ))); @@ -150,8 +147,6 @@ class Config extends Base */ public function integrations() { - $this->common('integrations'); - $this->response->html($this->helper->layout->config('config/integrations', array( 'title' => t('Settings').' > '.t('Integrations'), ))); @@ -164,8 +159,6 @@ class Config extends Base */ public function webhook() { - $this->common('webhook'); - $this->response->html($this->helper->layout->config('config/webhook', array( 'title' => t('Settings').' > '.t('Webhook settings'), ))); @@ -191,8 +184,8 @@ class Config extends Base public function downloadDb() { $this->checkCSRFParam(); - $this->response->forceDownload('db.sqlite.gz'); - $this->response->binary($this->config->downloadDatabase()); + $this->response->withFileDownload('db.sqlite.gz'); + $this->response->binary($this->configModel->downloadDatabase()); } /** @@ -203,9 +196,9 @@ class Config extends Base public function optimizeDb() { $this->checkCSRFParam(); - $this->config->optimizeDatabase(); + $this->configModel->optimizeDatabase(); $this->flash->success(t('Database optimization done.')); - $this->response->redirect($this->helper->url->to('config', 'index')); + $this->response->redirect($this->helper->url->to('ConfigController', 'index')); } /** @@ -218,9 +211,9 @@ class Config extends Base $type = $this->request->getStringParam('type'); $this->checkCSRFParam(); - $this->config->regenerateToken($type.'_token'); + $this->configModel->regenerateToken($type.'_token'); $this->flash->success(t('Token regenerated.')); - $this->response->redirect($this->helper->url->to('config', $type)); + $this->response->redirect($this->helper->url->to('ConfigController', $type)); } } diff --git a/sources/app/Controller/Currency.php b/sources/app/Controller/CurrencyController.php similarity index 66% rename from sources/app/Controller/Currency.php rename to sources/app/Controller/CurrencyController.php index ecaa983..ad59003 100644 --- a/sources/app/Controller/Currency.php +++ b/sources/app/Controller/CurrencyController.php @@ -3,26 +3,28 @@ namespace Kanboard\Controller; /** - * Currency controller + * Currency Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Currency extends Base +class CurrencyController extends BaseController { /** * Display all currency rates and form * * @access public + * @param array $values + * @param array $errors */ public function index(array $values = array(), array $errors = array()) { $this->response->html($this->helper->layout->config('currency/index', array( - 'config_values' => array('application_currency' => $this->config->get('application_currency')), + 'config_values' => array('application_currency' => $this->configModel->get('application_currency')), 'values' => $values, 'errors' => $errors, - 'rates' => $this->currency->getAll(), - 'currencies' => $this->currency->getCurrencies(), + 'rates' => $this->currencyModel->getAll(), + 'currencies' => $this->currencyModel->getCurrencies(), 'title' => t('Settings').' > '.t('Currency rates'), ))); } @@ -38,15 +40,15 @@ class Currency extends Base list($valid, $errors) = $this->currencyValidator->validateCreation($values); if ($valid) { - if ($this->currency->create($values['currency'], $values['rate'])) { + if ($this->currencyModel->create($values['currency'], $values['rate'])) { $this->flash->success(t('The currency rate have been added successfully.')); - $this->response->redirect($this->helper->url->to('currency', 'index')); + return $this->response->redirect($this->helper->url->to('CurrencyController', 'index')); } else { $this->flash->failure(t('Unable to add this currency rate.')); } } - $this->index($values, $errors); + return $this->index($values, $errors); } /** @@ -58,13 +60,12 @@ class Currency extends Base { $values = $this->request->getValues(); - if ($this->config->save($values)) { - $this->config->reload(); + if ($this->configModel->save($values)) { $this->flash->success(t('Settings saved successfully.')); } else { $this->flash->failure(t('Unable to save your settings.')); } - $this->response->redirect($this->helper->url->to('currency', 'index')); + $this->response->redirect($this->helper->url->to('CurrencyController', 'index')); } } diff --git a/sources/app/Controller/Customfilter.php b/sources/app/Controller/CustomFilterController.php similarity index 66% rename from sources/app/Controller/Customfilter.php rename to sources/app/Controller/CustomFilterController.php index 41da0b1..e5f674c 100644 --- a/sources/app/Controller/Customfilter.php +++ b/sources/app/Controller/CustomFilterController.php @@ -2,20 +2,25 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; use Kanboard\Core\Security\Role; /** - * Custom Filter management + * Custom Filter Controller * - * @package controller + * @package Kanboard\Controller * @author Timo Litzbarski + * @author Frederic Guillot */ -class Customfilter extends Base +class CustomFilterController extends BaseController { /** * Display list of filters * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function index(array $values = array(), array $errors = array()) { @@ -25,7 +30,7 @@ class Customfilter extends Base 'values' => $values + array('project_id' => $project['id']), 'errors' => $errors, 'project' => $project, - 'custom_filters' => $this->customFilter->getAll($project['id'], $this->userSession->getId()), + 'custom_filters' => $this->customFilterModel->getAll($project['id'], $this->userSession->getId()), 'title' => t('Custom filters'), ))); } @@ -45,15 +50,15 @@ class Customfilter extends Base list($valid, $errors) = $this->customFilterValidator->validateCreation($values); if ($valid) { - if ($this->customFilter->create($values)) { + if ($this->customFilterModel->create($values) !== false) { $this->flash->success(t('Your custom filter have been created successfully.')); - $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id']))); } else { $this->flash->failure(t('Unable to create your custom filter.')); } } - $this->index($values, $errors); + return $this->index($values, $errors); } /** @@ -64,7 +69,7 @@ class Customfilter extends Base public function confirm() { $project = $this->getProject(); - $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id')); + $filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id')); $this->response->html($this->helper->layout->project('custom_filter/remove', array( 'project' => $project, @@ -82,28 +87,32 @@ class Customfilter extends Base { $this->checkCSRFParam(); $project = $this->getProject(); - $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id')); + $filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id')); $this->checkPermission($project, $filter); - if ($this->customFilter->remove($filter['id'])) { + if ($this->customFilterModel->remove($filter['id'])) { $this->flash->success(t('Custom filter removed successfully.')); } else { $this->flash->failure(t('Unable to remove this custom filter.')); } - $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id']))); } /** * Edit a custom filter (display the form) * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id')); + $filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id')); $this->checkPermission($project, $filter); @@ -124,7 +133,7 @@ class Customfilter extends Base public function update() { $project = $this->getProject(); - $filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id')); + $filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id')); $this->checkPermission($project, $filter); @@ -141,23 +150,23 @@ class Customfilter extends Base list($valid, $errors) = $this->customFilterValidator->validateModification($values); if ($valid) { - if ($this->customFilter->update($values)) { + if ($this->customFilterModel->update($values)) { $this->flash->success(t('Your custom filter have been updated successfully.')); - $this->response->redirect($this->helper->url->to('customfilter', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id']))); } else { $this->flash->failure(t('Unable to update custom filter.')); } } - $this->edit($values, $errors); + return $this->edit($values, $errors); } private function checkPermission(array $project, array $filter) { $user_id = $this->userSession->getId(); - if ($filter['user_id'] != $user_id && ($this->projectUserRole->getUserRole($project['id'], $user_id) === Role::PROJECT_MANAGER || ! $this->userSession->isAdmin())) { - $this->forbidden(); + if ($filter['user_id'] != $user_id && ($this->projectUserRoleModel->getUserRole($project['id'], $user_id) === Role::PROJECT_MANAGER || ! $this->userSession->isAdmin())) { + throw new AccessForbiddenException(); } } } diff --git a/sources/app/Controller/App.php b/sources/app/Controller/DashboardController.php similarity index 74% rename from sources/app/Controller/App.php rename to sources/app/Controller/DashboardController.php index df1d3c9..4487454 100644 --- a/sources/app/Controller/App.php +++ b/sources/app/Controller/DashboardController.php @@ -2,16 +2,16 @@ namespace Kanboard\Controller; -use Kanboard\Model\Project as ProjectModel; -use Kanboard\Model\Subtask as SubtaskModel; +use Kanboard\Model\ProjectModel; +use Kanboard\Model\SubtaskModel; /** - * Application controller + * Dashboard Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class App extends Base +class DashboardController extends BaseController { /** * Get project pagination @@ -25,10 +25,10 @@ class App extends Base private function getProjectPaginator($user_id, $action, $max) { return $this->paginator - ->setUrl('app', $action, array('pagination' => 'projects', 'user_id' => $user_id)) + ->setUrl('DashboardController', $action, array('pagination' => 'projects', 'user_id' => $user_id)) ->setMax($max) ->setOrder(ProjectModel::TABLE.'.name') - ->setQuery($this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id))) + ->setQuery($this->projectModel->getQueryColumnStats($this->projectPermissionModel->getActiveProjectIds($user_id))) ->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects'); } @@ -44,10 +44,10 @@ class App extends Base private function getTaskPaginator($user_id, $action, $max) { return $this->paginator - ->setUrl('app', $action, array('pagination' => 'tasks', 'user_id' => $user_id)) + ->setUrl('DashboardController', $action, array('pagination' => 'tasks', 'user_id' => $user_id)) ->setMax($max) ->setOrder('tasks.id') - ->setQuery($this->taskFinder->getUserQuery($user_id)) + ->setQuery($this->taskFinderModel->getUserQuery($user_id)) ->calculateOnlyIf($this->request->getStringParam('pagination') === 'tasks'); } @@ -63,37 +63,27 @@ class App extends Base private function getSubtaskPaginator($user_id, $action, $max) { return $this->paginator - ->setUrl('app', $action, array('pagination' => 'subtasks', 'user_id' => $user_id)) + ->setUrl('DashboardController', $action, array('pagination' => 'subtasks', 'user_id' => $user_id)) ->setMax($max) ->setOrder('tasks.id') - ->setQuery($this->subtask->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS))) + ->setQuery($this->subtaskModel->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS))) ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); } - /** - * Check if the user is connected - * - * @access public - */ - public function status() - { - $this->response->text('OK'); - } - /** * Dashboard overview * * @access public */ - public function index() + public function show() { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/overview', array( + $this->response->html($this->helper->layout->dashboard('dashboard/show', array( 'title' => t('Dashboard'), - 'project_paginator' => $this->getProjectPaginator($user['id'], 'index', 10), - 'task_paginator' => $this->getTaskPaginator($user['id'], 'index', 10), - 'subtask_paginator' => $this->getSubtaskPaginator($user['id'], 'index', 10), + 'project_paginator' => $this->getProjectPaginator($user['id'], 'show', 10), + 'task_paginator' => $this->getTaskPaginator($user['id'], 'show', 10), + 'subtask_paginator' => $this->getSubtaskPaginator($user['id'], 'show', 10), 'user' => $user, ))); } @@ -107,7 +97,7 @@ class App extends Base { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/tasks', array( + $this->response->html($this->helper->layout->dashboard('dashboard/tasks', array( 'title' => t('My tasks'), 'paginator' => $this->getTaskPaginator($user['id'], 'tasks', 50), 'user' => $user, @@ -123,7 +113,7 @@ class App extends Base { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/subtasks', array( + $this->response->html($this->helper->layout->dashboard('dashboard/subtasks', array( 'title' => t('My subtasks'), 'paginator' => $this->getSubtaskPaginator($user['id'], 'subtasks', 50), 'user' => $user, @@ -139,7 +129,7 @@ class App extends Base { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/projects', array( + $this->response->html($this->helper->layout->dashboard('dashboard/projects', array( 'title' => t('My projects'), 'paginator' => $this->getProjectPaginator($user['id'], 'projects', 25), 'user' => $user, @@ -155,9 +145,9 @@ class App extends Base { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/activity', array( + $this->response->html($this->helper->layout->dashboard('dashboard/activity', array( 'title' => t('My activity stream'), - 'events' => $this->projectActivity->getProjects($this->projectPermission->getActiveProjectIds($user['id']), 100), + 'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100), 'user' => $user, ))); } @@ -169,7 +159,7 @@ class App extends Base */ public function calendar() { - $this->response->html($this->helper->layout->dashboard('app/calendar', array( + $this->response->html($this->helper->layout->dashboard('dashboard/calendar', array( 'title' => t('My calendar'), 'user' => $this->getUser(), ))); @@ -184,9 +174,9 @@ class App extends Base { $user = $this->getUser(); - $this->response->html($this->helper->layout->dashboard('app/notifications', array( + $this->response->html($this->helper->layout->dashboard('dashboard/notifications', array( 'title' => t('My notifications'), - 'notifications' => $this->userUnreadNotification->getAll($user['id']), + 'notifications' => $this->userUnreadNotificationModel->getAll($user['id']), 'user' => $user, ))); } diff --git a/sources/app/Controller/Doc.php b/sources/app/Controller/Doc.php deleted file mode 100644 index 00b9e58..0000000 --- a/sources/app/Controller/Doc.php +++ /dev/null @@ -1,92 +0,0 @@ -request->getStringParam('file', 'index'); - - if (!preg_match('/^[a-z0-9\-]+/', $page)) { - $page = 'index'; - } - - if ($this->config->getCurrentLanguage() === 'fr_FR') { - $filename = __DIR__.'/../../doc/fr/' . $page . '.markdown'; - } else { - $filename = __DIR__ . '/../../doc/' . $page . '.markdown'; - } - - if (!file_exists($filename)) { - $filename = __DIR__.'/../../doc/index.markdown'; - } - - $this->response->html($this->helper->layout->app('doc/show', $this->render($filename))); - } - - /** - * Display keyboard shortcut - */ - public function shortcuts() - { - $this->response->html($this->template->render('config/keyboard_shortcuts')); - } - - /** - * Prepare Markdown file - * - * @access private - * @param string $filename - * @return array - */ - private function render($filename) - { - $data = file_get_contents($filename); - $content = preg_replace_callback('/\((.*.markdown)\)/', array($this, 'replaceMarkdownUrl'), $data); - $content = preg_replace_callback('/\((screenshots.*\.png)\)/', array($this, 'replaceImageUrl'), $content); - - list($title, ) = explode("\n", $data, 2); - - return array( - 'content' => Parsedown::instance()->text($content), - 'title' => $title !== 'Documentation' ? t('Documentation: %s', $title) : $title, - ); - } - - /** - * Regex callback to replace Markdown links - * - * @access public - * @param array $matches - * @return string - */ - public function replaceMarkdownUrl(array $matches) - { - return '('.$this->helper->url->to('doc', 'show', array('file' => str_replace('.markdown', '', $matches[1]))).')'; - } - - /** - * Regex callback to replace image links - * - * @access public - * @param array $matches - * @return string - */ - public function replaceImageUrl(array $matches) - { - if ($this->config->getCurrentLanguage() === 'fr_FR') { - return '('.$this->helper->url->base().'doc/fr/'.$matches[1].')'; - } - - return '('.$this->helper->url->base().'doc/'.$matches[1].')'; - } -} diff --git a/sources/app/Controller/DocumentationController.php b/sources/app/Controller/DocumentationController.php new file mode 100644 index 0000000..0d02ebd --- /dev/null +++ b/sources/app/Controller/DocumentationController.php @@ -0,0 +1,136 @@ +request->getStringParam('file', 'index'); + + if (!preg_match('/^[a-z0-9\-]+/', $page)) { + $page = 'index'; + } + + $filename = $this->getPageFilename($page); + $this->response->html($this->helper->layout->app('doc/show', $this->render($filename))); + } + + /** + * Display keyboard shortcut + */ + public function shortcuts() + { + $this->response->html($this->template->render('config/keyboard_shortcuts')); + } + + /** + * Prepare Markdown file + * + * @access private + * @param string $filename + * @return array + */ + private function render($filename) + { + $data = file_get_contents($filename); + $content = preg_replace_callback('/\((.*.markdown)\)/', array($this, 'replaceMarkdownUrl'), $data); + $content = preg_replace_callback('/\((screenshots.*\.png)\)/', array($this, 'replaceImageUrl'), $content); + + list($title, ) = explode("\n", $data, 2); + + return array( + 'content' => Parsedown::instance()->text($content), + 'title' => $title !== 'Documentation' ? t('Documentation: %s', $title) : $title, + ); + } + + /** + * Regex callback to replace Markdown links + * + * @access public + * @param array $matches + * @return string + */ + public function replaceMarkdownUrl(array $matches) + { + return '('.$this->helper->url->to('DocumentationController', 'show', array('file' => str_replace('.markdown', '', $matches[1]))).')'; + } + + /** + * Regex callback to replace image links + * + * @access public + * @param array $matches + * @return string + */ + public function replaceImageUrl(array $matches) + { + return '('.$this->getFileBaseUrl($matches[1]).')'; + } + + /** + * Get Markdown file according to the current language + * + * @access private + * @param string $page + * @return string + */ + private function getPageFilename($page) + { + return $this->getFileLocation($page . '.markdown') ?: + implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', 'index.markdown')); + } + + /** + * Get base URL for Markdown links + * + * @access private + * @param string $filename + * @return string + */ + private function getFileBaseUrl($filename) + { + $language = $this->languageModel->getCurrentLanguage(); + $path = $this->getFileLocation($filename); + + if (strpos($path, $language) !== false) { + $url = implode('/', array('doc', $language, $filename)); + } else { + $url = implode('/', array('doc', $filename)); + } + + return $this->helper->url->base().$url; + } + + /** + * Get file location according to the current language + * + * @access private + * @param string $filename + * @return string + */ + private function getFileLocation($filename) + { + $files = array( + implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', $this->languageModel->getCurrentLanguage(), $filename)), + implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', $filename)), + ); + + foreach ($files as $filename) { + if (file_exists($filename)) { + return $filename; + } + } + + return ''; + } +} diff --git a/sources/app/Controller/Export.php b/sources/app/Controller/ExportController.php similarity index 51% rename from sources/app/Controller/Export.php rename to sources/app/Controller/ExportController.php index c2ff652..27046c7 100644 --- a/sources/app/Controller/Export.php +++ b/sources/app/Controller/ExportController.php @@ -3,17 +3,23 @@ namespace Kanboard\Controller; /** - * Export controller + * Export Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Export extends Base +class ExportController extends BaseController { /** * Common export method * * @access private + * @param string $model + * @param string $method + * @param string $filename + * @param string $action + * @param string $page_title + * @throws \Kanboard\Core\Controller\PageNotFoundException */ private function common($model, $method, $filename, $action, $page_title) { @@ -23,24 +29,25 @@ class Export extends Base if ($from && $to) { $data = $this->$model->$method($project['id'], $from, $to); - $this->response->forceDownload($filename.'.csv'); + $this->response->withFileDownload($filename.'.csv'); $this->response->csv($data); - } + } else { - $this->response->html($this->helper->layout->project('export/'.$action, array( - 'values' => array( - 'controller' => 'export', - 'action' => $action, - 'project_id' => $project['id'], - 'from' => $from, - 'to' => $to, - ), - 'errors' => array(), - 'date_format' => $this->config->get('application_date_format'), - 'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()), - 'project' => $project, - 'title' => $page_title, - ), 'export/sidebar')); + $this->response->html($this->helper->layout->project('export/'.$action, array( + 'values' => array( + 'controller' => 'ExportController', + 'action' => $action, + 'project_id' => $project['id'], + 'from' => $from, + 'to' => $to, + ), + 'errors' => array(), + 'date_format' => $this->configModel->get('application_date_format'), + 'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()), + 'project' => $project, + 'title' => $page_title, + ), 'export/sidebar')); + } } /** @@ -70,7 +77,7 @@ class Export extends Base */ public function summary() { - $this->common('projectDailyColumnStats', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export')); + $this->common('projectDailyColumnStatsModel', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export')); } /** diff --git a/sources/app/Controller/Feed.php b/sources/app/Controller/FeedController.php similarity index 56% rename from sources/app/Controller/Feed.php rename to sources/app/Controller/FeedController.php index 8457c38..cf2b108 100644 --- a/sources/app/Controller/Feed.php +++ b/sources/app/Controller/FeedController.php @@ -2,13 +2,15 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; + /** * Atom/RSS Feed controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Feed extends Base +class FeedController extends BaseController { /** * RSS feed for a user @@ -18,15 +20,15 @@ class Feed extends Base public function user() { $token = $this->request->getStringParam('token'); - $user = $this->user->getByToken($token); + $user = $this->userModel->getByToken($token); // Token verification if (empty($user)) { - $this->forbidden(true); + throw AccessForbiddenException::getInstance()->withoutLayout(); } $this->response->xml($this->template->render('feed/user', array( - 'events' => $this->projectActivity->getProjects($this->projectPermission->getActiveProjectIds($user['id'])), + 'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id'])), 'user' => $user, ))); } @@ -39,15 +41,14 @@ class Feed extends Base public function project() { $token = $this->request->getStringParam('token'); - $project = $this->project->getByToken($token); + $project = $this->projectModel->getByToken($token); - // Token verification if (empty($project)) { - $this->forbidden(true); + throw AccessForbiddenException::getInstance()->withoutLayout(); } $this->response->xml($this->template->render('feed/project', array( - 'events' => $this->projectActivity->getProject($project['id']), + 'events' => $this->helper->projectActivity->getProjectEvents($project['id']), 'project' => $project, ))); } diff --git a/sources/app/Controller/FileViewer.php b/sources/app/Controller/FileViewerController.php similarity index 61% rename from sources/app/Controller/FileViewer.php rename to sources/app/Controller/FileViewerController.php index 3be4ea1..518f5b0 100644 --- a/sources/app/Controller/FileViewer.php +++ b/sources/app/Controller/FileViewerController.php @@ -7,10 +7,10 @@ use Kanboard\Core\ObjectStorage\ObjectStorageException; /** * File Viewer Controller * - * @package controller + * @package Kanbaord\Controller * @author Frederic Guillot */ -class FileViewer extends Base +class FileViewerController extends BaseController { /** * Get file content from object storage @@ -24,11 +24,9 @@ class FileViewer extends Base $content = ''; try { - if ($file['is_image'] == 0) { $content = $this->objectStorage->get($file['path']); } - } catch (ObjectStorageException $e) { $this->logger->error($e->getMessage()); } @@ -47,7 +45,7 @@ class FileViewer extends Base $type = $this->helper->file->getPreviewType($file['name']); $params = array('file_id' => $file['id'], 'project_id' => $this->request->getIntegerParam('project_id')); - if ($file['model'] === 'taskFile') { + if ($file['model'] === 'taskFileModel') { $params['task_id'] = $file['task_id']; } @@ -68,17 +66,19 @@ class FileViewer extends Base { $file = $this->getFile(); $etag = md5($file['path']); - $this->response->contentType($this->helper->file->getImageMimeType($file['name'])); - $this->response->cache(5 * 86400, $etag); + $this->response->withContentType($this->helper->file->getImageMimeType($file['name'])); + $this->response->withCache(5 * 86400, $etag); if ($this->request->getHeader('If-None-Match') === '"'.$etag.'"') { - return $this->response->status(304); - } + $this->response->status(304); + } else { - try { - $this->objectStorage->output($file['path']); - } catch (ObjectStorageException $e) { - $this->logger->error($e->getMessage()); + try { + $this->response->send(); + $this->objectStorage->output($file['path']); + } catch (ObjectStorageException $e) { + $this->logger->error($e->getMessage()); + } } } @@ -94,23 +94,26 @@ class FileViewer extends Base $filename = $this->$model->getThumbnailPath($file['path']); $etag = md5($filename); - $this->response->cache(5 * 86400, $etag); - $this->response->contentType('image/jpeg'); + $this->response->withCache(5 * 86400, $etag); + $this->response->withContentType('image/jpeg'); if ($this->request->getHeader('If-None-Match') === '"'.$etag.'"') { - return $this->response->status(304); - } + $this->response->status(304); + } else { - try { + $this->response->send(); - $this->objectStorage->output($filename); - } catch (ObjectStorageException $e) { - $this->logger->error($e->getMessage()); + try { - // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19 - $data = $this->objectStorage->get($file['path']); - $this->$model->generateThumbnailFromData($file['path'], $data); - $this->objectStorage->output($this->$model->getThumbnailPath($file['path'])); + $this->objectStorage->output($filename); + } catch (ObjectStorageException $e) { + $this->logger->error($e->getMessage()); + + // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19 + $data = $this->objectStorage->get($file['path']); + $this->$model->generateThumbnailFromData($file['path'], $data); + $this->objectStorage->output($this->$model->getThumbnailPath($file['path'])); + } } } @@ -123,7 +126,8 @@ class FileViewer extends Base { try { $file = $this->getFile(); - $this->response->forceDownload($file['name']); + $this->response->withFileDownload($file['name']); + $this->response->send(); $this->objectStorage->output($file['path']); } catch (ObjectStorageException $e) { $this->logger->error($e->getMessage()); diff --git a/sources/app/Controller/Gantt.php b/sources/app/Controller/Gantt.php deleted file mode 100644 index 02ee946..0000000 --- a/sources/app/Controller/Gantt.php +++ /dev/null @@ -1,153 +0,0 @@ -userSession->isAdmin()) { - $project_ids = $this->project->getAllIds(); - } else { - $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); - } - - $this->response->html($this->helper->layout->app('gantt/projects', array( - 'projects' => $this->projectGanttFormatter->filter($project_ids)->format(), - 'title' => t('Gantt chart for all projects'), - ))); - } - - /** - * Save new project start date and end date - */ - public function saveProjectDate() - { - $values = $this->request->getJson(); - - $result = $this->project->update(array( - 'id' => $values['id'], - 'start_date' => $this->dateParser->getIsoDate(strtotime($values['start'])), - 'end_date' => $this->dateParser->getIsoDate(strtotime($values['end'])), - )); - - if (! $result) { - $this->response->json(array('message' => 'Unable to save project'), 400); - } - - $this->response->json(array('message' => 'OK'), 201); - } - - /** - * Show Gantt chart for one project - */ - public function project() - { - $project = $this->getProject(); - $search = $this->helper->projectHeader->getSearchQuery($project); - $filter = $this->taskFilterGanttFormatter->search($search)->filterByProject($project['id']); - $sorting = $this->request->getStringParam('sorting', 'board'); - - if ($sorting === 'date') { - $filter->getQuery()->asc(TaskModel::TABLE.'.date_started')->asc(TaskModel::TABLE.'.date_creation'); - } else { - $filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position'); - } - - $this->response->html($this->helper->layout->app('gantt/project', array( - 'project' => $project, - 'title' => $project['name'], - 'description' => $this->helper->projectHeader->getDescription($project), - 'sorting' => $sorting, - 'tasks' => $filter->format(), - ))); - } - - /** - * Save new task start date and due date - */ - public function saveTaskDate() - { - $this->getProject(); - $values = $this->request->getJson(); - - $result = $this->taskModification->update(array( - 'id' => $values['id'], - 'date_started' => strtotime($values['start']), - 'date_due' => strtotime($values['end']), - )); - - if (! $result) { - $this->response->json(array('message' => 'Unable to save task'), 400); - } - - $this->response->json(array('message' => 'OK'), 201); - } - - /** - * Simplified form to create a new task - * - * @access public - */ - public function task(array $values = array(), array $errors = array()) - { - $project = $this->getProject(); - - $values = $values + array( - 'project_id' => $project['id'], - 'column_id' => $this->column->getFirstColumnId($project['id']), - 'position' => 1 - ); - - $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values)); - $values = $this->hook->merge('controller:gantt:task:form:default', $values, array('default_values' => $values)); - - $this->response->html($this->template->render('gantt/task_creation', array( - 'project' => $project, - 'errors' => $errors, - 'values' => $values, - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true), - 'colors_list' => $this->color->getList(), - 'categories_list' => $this->category->getList($project['id']), - 'swimlanes_list' => $this->swimlane->getList($project['id'], false, true), - 'title' => $project['name'].' > '.t('New task') - ))); - } - - /** - * Validate and save a new task - * - * @access public - */ - public function saveTask() - { - $project = $this->getProject(); - $values = $this->request->getValues(); - - list($valid, $errors) = $this->taskValidator->validateCreation($values); - - if ($valid) { - $task_id = $this->taskCreation->create($values); - - if ($task_id !== false) { - $this->flash->success(t('Task created successfully.')); - $this->response->redirect($this->helper->url->to('gantt', 'project', array('project_id' => $project['id']))); - } else { - $this->flash->failure(t('Unable to create your task.')); - } - } - - $this->task($values, $errors); - } -} diff --git a/sources/app/Controller/Group.php b/sources/app/Controller/Group.php deleted file mode 100644 index fa47f42..0000000 --- a/sources/app/Controller/Group.php +++ /dev/null @@ -1,250 +0,0 @@ -paginator - ->setUrl('group', 'index') - ->setMax(30) - ->setOrder('name') - ->setQuery($this->group->getQuery()) - ->calculate(); - - $this->response->html($this->helper->layout->app('group/index', array( - 'title' => t('Groups').' ('.$paginator->getTotal().')', - 'paginator' => $paginator, - ))); - } - - /** - * List all users - * - * @access public - */ - public function users() - { - $group_id = $this->request->getIntegerParam('group_id'); - $group = $this->group->getById($group_id); - - $paginator = $this->paginator - ->setUrl('group', 'users', array('group_id' => $group_id)) - ->setMax(30) - ->setOrder('username') - ->setQuery($this->groupMember->getQuery($group_id)) - ->calculate(); - - $this->response->html($this->helper->layout->app('group/users', array( - 'title' => t('Members of %s', $group['name']).' ('.$paginator->getTotal().')', - 'paginator' => $paginator, - 'group' => $group, - ))); - } - - /** - * Display a form to create a new group - * - * @access public - */ - public function create(array $values = array(), array $errors = array()) - { - $this->response->html($this->helper->layout->app('group/create', array( - 'errors' => $errors, - 'values' => $values, - 'title' => t('New group') - ))); - } - - /** - * Validate and save a new group - * - * @access public - */ - public function save() - { - $values = $this->request->getValues(); - list($valid, $errors) = $this->groupValidator->validateCreation($values); - - if ($valid) { - if ($this->group->create($values['name']) !== false) { - $this->flash->success(t('Group created successfully.')); - $this->response->redirect($this->helper->url->to('group', 'index')); - } else { - $this->flash->failure(t('Unable to create your group.')); - } - } - - $this->create($values, $errors); - } - - /** - * Display a form to update a group - * - * @access public - */ - public function edit(array $values = array(), array $errors = array()) - { - if (empty($values)) { - $values = $this->group->getById($this->request->getIntegerParam('group_id')); - } - - $this->response->html($this->helper->layout->app('group/edit', array( - 'errors' => $errors, - 'values' => $values, - 'title' => t('Edit group') - ))); - } - - /** - * Validate and save a group - * - * @access public - */ - public function update() - { - $values = $this->request->getValues(); - list($valid, $errors) = $this->groupValidator->validateModification($values); - - if ($valid) { - if ($this->group->update($values) !== false) { - $this->flash->success(t('Group updated successfully.')); - $this->response->redirect($this->helper->url->to('group', 'index')); - } else { - $this->flash->failure(t('Unable to update your group.')); - } - } - - $this->edit($values, $errors); - } - - /** - * Form to associate a user to a group - * - * @access public - */ - public function associate(array $values = array(), array $errors = array()) - { - $group_id = $this->request->getIntegerParam('group_id'); - $group = $this->group->getbyId($group_id); - - if (empty($values)) { - $values['group_id'] = $group_id; - } - - $this->response->html($this->helper->layout->app('group/associate', array( - 'users' => $this->user->prepareList($this->groupMember->getNotMembers($group_id)), - 'group' => $group, - 'errors' => $errors, - 'values' => $values, - 'title' => t('Add group member to "%s"', $group['name']), - ))); - } - - /** - * Add user to a group - * - * @access public - */ - public function addUser() - { - $values = $this->request->getValues(); - - if (isset($values['group_id']) && isset($values['user_id'])) { - if ($this->groupMember->addUser($values['group_id'], $values['user_id'])) { - $this->flash->success(t('Group member added successfully.')); - $this->response->redirect($this->helper->url->to('group', 'users', array('group_id' => $values['group_id']))); - } else { - $this->flash->failure(t('Unable to add group member.')); - } - } - - $this->associate($values); - } - - /** - * Confirmation dialog to remove a user from a group - * - * @access public - */ - public function dissociate() - { - $group_id = $this->request->getIntegerParam('group_id'); - $user_id = $this->request->getIntegerParam('user_id'); - $group = $this->group->getById($group_id); - $user = $this->user->getById($user_id); - - $this->response->html($this->helper->layout->app('group/dissociate', array( - 'group' => $group, - 'user' => $user, - 'title' => t('Remove user from group "%s"', $group['name']), - ))); - } - - /** - * Remove a user from a group - * - * @access public - */ - public function removeUser() - { - $this->checkCSRFParam(); - $group_id = $this->request->getIntegerParam('group_id'); - $user_id = $this->request->getIntegerParam('user_id'); - - if ($this->groupMember->removeUser($group_id, $user_id)) { - $this->flash->success(t('User removed successfully from this group.')); - } else { - $this->flash->failure(t('Unable to remove this user from the group.')); - } - - $this->response->redirect($this->helper->url->to('group', 'users', array('group_id' => $group_id))); - } - - /** - * Confirmation dialog to remove a group - * - * @access public - */ - public function confirm() - { - $group_id = $this->request->getIntegerParam('group_id'); - $group = $this->group->getById($group_id); - - $this->response->html($this->helper->layout->app('group/remove', array( - 'group' => $group, - 'title' => t('Remove group'), - ))); - } - - /** - * Remove a group - * - * @access public - */ - public function remove() - { - $this->checkCSRFParam(); - $group_id = $this->request->getIntegerParam('group_id'); - - if ($this->group->remove($group_id)) { - $this->flash->success(t('Group removed successfully.')); - } else { - $this->flash->failure(t('Unable to remove this group.')); - } - - $this->response->redirect($this->helper->url->to('group', 'index')); - } -} diff --git a/sources/app/Controller/GroupAjaxController.php b/sources/app/Controller/GroupAjaxController.php new file mode 100644 index 0000000..496e9ef --- /dev/null +++ b/sources/app/Controller/GroupAjaxController.php @@ -0,0 +1,26 @@ +request->getStringParam('term'); + $formatter = new GroupAutoCompleteFormatter($this->groupManager->find($search)); + $this->response->json($formatter->format()); + } +} diff --git a/sources/app/Controller/GroupCreationController.php b/sources/app/Controller/GroupCreationController.php new file mode 100644 index 0000000..b297b19 --- /dev/null +++ b/sources/app/Controller/GroupCreationController.php @@ -0,0 +1,49 @@ +response->html($this->template->render('group_creation/show', array( + 'errors' => $errors, + 'values' => $values, + ))); + } + + /** + * Validate and save a new group + * + * @access public + */ + public function save() + { + $values = $this->request->getValues(); + list($valid, $errors) = $this->groupValidator->validateCreation($values); + + if ($valid) { + if ($this->groupModel->create($values['name']) !== false) { + $this->flash->success(t('Group created successfully.')); + return $this->response->redirect($this->helper->url->to('GroupListController', 'index'), true); + } else { + $this->flash->failure(t('Unable to create your group.')); + } + } + + return $this->show($values, $errors); + } +} diff --git a/sources/app/Controller/GroupHelper.php b/sources/app/Controller/GroupHelper.php deleted file mode 100644 index 34f522a..0000000 --- a/sources/app/Controller/GroupHelper.php +++ /dev/null @@ -1,24 +0,0 @@ -request->getStringParam('term'); - $groups = $this->groupManager->find($search); - $this->response->json($this->groupAutoCompleteFormatter->setGroups($groups)->format()); - } -} diff --git a/sources/app/Controller/GroupListController.php b/sources/app/Controller/GroupListController.php new file mode 100644 index 0000000..4486bbf --- /dev/null +++ b/sources/app/Controller/GroupListController.php @@ -0,0 +1,173 @@ +paginator + ->setUrl('GroupListController', 'index') + ->setMax(30) + ->setOrder('name') + ->setQuery($this->groupModel->getQuery()) + ->calculate(); + + $this->response->html($this->helper->layout->app('group/index', array( + 'title' => t('Groups').' ('.$paginator->getTotal().')', + 'paginator' => $paginator, + ))); + } + + /** + * List all users + * + * @access public + */ + public function users() + { + $group_id = $this->request->getIntegerParam('group_id'); + $group = $this->groupModel->getById($group_id); + + $paginator = $this->paginator + ->setUrl('GroupListController', 'users', array('group_id' => $group_id)) + ->setMax(30) + ->setOrder('username') + ->setQuery($this->groupMemberModel->getQuery($group_id)) + ->calculate(); + + $this->response->html($this->helper->layout->app('group/users', array( + 'title' => t('Members of %s', $group['name']).' ('.$paginator->getTotal().')', + 'paginator' => $paginator, + 'group' => $group, + ))); + } + + /** + * Form to associate a user to a group + * + * @access public + * @param array $values + * @param array $errors + */ + public function associate(array $values = array(), array $errors = array()) + { + $group_id = $this->request->getIntegerParam('group_id'); + $group = $this->groupModel->getById($group_id); + + if (empty($values)) { + $values['group_id'] = $group_id; + } + + $this->response->html($this->template->render('group/associate', array( + 'users' => $this->userModel->prepareList($this->groupMemberModel->getNotMembers($group_id)), + 'group' => $group, + 'errors' => $errors, + 'values' => $values, + ))); + } + + /** + * Add user to a group + * + * @access public + */ + public function addUser() + { + $values = $this->request->getValues(); + + if (isset($values['group_id']) && isset($values['user_id'])) { + if ($this->groupMemberModel->addUser($values['group_id'], $values['user_id'])) { + $this->flash->success(t('Group member added successfully.')); + return $this->response->redirect($this->helper->url->to('GroupListController', 'users', array('group_id' => $values['group_id'])), true); + } else { + $this->flash->failure(t('Unable to add group member.')); + } + } + + return $this->associate($values); + } + + /** + * Confirmation dialog to remove a user from a group + * + * @access public + */ + public function dissociate() + { + $group_id = $this->request->getIntegerParam('group_id'); + $user_id = $this->request->getIntegerParam('user_id'); + $group = $this->groupModel->getById($group_id); + $user = $this->userModel->getById($user_id); + + $this->response->html($this->template->render('group/dissociate', array( + 'group' => $group, + 'user' => $user, + ))); + } + + /** + * Remove a user from a group + * + * @access public + */ + public function removeUser() + { + $this->checkCSRFParam(); + $group_id = $this->request->getIntegerParam('group_id'); + $user_id = $this->request->getIntegerParam('user_id'); + + if ($this->groupMemberModel->removeUser($group_id, $user_id)) { + $this->flash->success(t('User removed successfully from this group.')); + } else { + $this->flash->failure(t('Unable to remove this user from the group.')); + } + + $this->response->redirect($this->helper->url->to('GroupListController', 'users', array('group_id' => $group_id)), true); + } + + /** + * Confirmation dialog to remove a group + * + * @access public + */ + public function confirm() + { + $group_id = $this->request->getIntegerParam('group_id'); + $group = $this->groupModel->getById($group_id); + + $this->response->html($this->template->render('group/remove', array( + 'group' => $group, + ))); + } + + /** + * Remove a group + * + * @access public + */ + public function remove() + { + $this->checkCSRFParam(); + $group_id = $this->request->getIntegerParam('group_id'); + + if ($this->groupModel->remove($group_id)) { + $this->flash->success(t('Group removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this group.')); + } + + $this->response->redirect($this->helper->url->to('GroupListController', 'index'), true); + } +} diff --git a/sources/app/Controller/GroupModificationController.php b/sources/app/Controller/GroupModificationController.php new file mode 100644 index 0000000..bd181b7 --- /dev/null +++ b/sources/app/Controller/GroupModificationController.php @@ -0,0 +1,53 @@ +groupModel->getById($this->request->getIntegerParam('group_id')); + } + + $this->response->html($this->template->render('group_modification/show', array( + 'errors' => $errors, + 'values' => $values, + ))); + } + + /** + * Validate and save a group + * + * @access public + */ + public function save() + { + $values = $this->request->getValues(); + list($valid, $errors) = $this->groupValidator->validateModification($values); + + if ($valid) { + if ($this->groupModel->update($values) !== false) { + $this->flash->success(t('Group updated successfully.')); + return $this->response->redirect($this->helper->url->to('GroupListController', 'index'), true); + } else { + $this->flash->failure(t('Unable to update your group.')); + } + } + + return $this->show($values, $errors); + } +} diff --git a/sources/app/Controller/ICalendarController.php b/sources/app/Controller/ICalendarController.php new file mode 100644 index 0000000..e354c6f --- /dev/null +++ b/sources/app/Controller/ICalendarController.php @@ -0,0 +1,101 @@ +request->getStringParam('token'); + $user = $this->userModel->getByToken($token); + + // Token verification + if (empty($user)) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + // Common filter + $queryBuilder = new QueryBuilder(); + $queryBuilder + ->withQuery($this->taskFinderModel->getICalQuery()) + ->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN)) + ->withFilter(new TaskAssigneeFilter($user['id'])); + + // Calendar properties + $calendar = new iCalendar('Kanboard'); + $calendar->setName($user['name'] ?: $user['username']); + $calendar->setDescription($user['name'] ?: $user['username']); + $calendar->setPublishedTTL('PT1H'); + + $this->renderCalendar($queryBuilder, $calendar); + } + + /** + * Get project iCalendar + * + * @access public + */ + public function project() + { + $token = $this->request->getStringParam('token'); + $project = $this->projectModel->getByToken($token); + + // Token verification + if (empty($project)) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + // Common filter + $queryBuilder = new QueryBuilder(); + $queryBuilder + ->withQuery($this->taskFinderModel->getICalQuery()) + ->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN)) + ->withFilter(new TaskProjectFilter($project['id'])); + + // Calendar properties + $calendar = new iCalendar('Kanboard'); + $calendar->setName($project['name']); + $calendar->setDescription($project['name']); + $calendar->setPublishedTTL('PT1H'); + + $this->renderCalendar($queryBuilder, $calendar); + } + + /** + * Common method to render iCal events + * + * @access private + * @param QueryBuilder $queryBuilder + * @param iCalendar $calendar + */ + private function renderCalendar(QueryBuilder $queryBuilder, iCalendar $calendar) + { + $start = $this->request->getStringParam('start', strtotime('-2 month')); + $end = $this->request->getStringParam('end', strtotime('+6 months')); + + $this->helper->ical->addTaskDateDueEvents($queryBuilder, $calendar, $start, $end); + + $formatter = new TaskICalFormatter($this->container); + $this->response->ical($formatter->setCalendar($calendar)->format()); + } +} diff --git a/sources/app/Controller/Ical.php b/sources/app/Controller/Ical.php deleted file mode 100644 index f1ea6d8..0000000 --- a/sources/app/Controller/Ical.php +++ /dev/null @@ -1,115 +0,0 @@ -request->getStringParam('token'); - $user = $this->user->getByToken($token); - - // Token verification - if (empty($user)) { - $this->forbidden(true); - } - - // Common filter - $filter = $this->taskFilterICalendarFormatter - ->create() - ->filterByStatus(TaskModel::STATUS_OPEN) - ->filterByOwner($user['id']); - - // Calendar properties - $calendar = new iCalendar('Kanboard'); - $calendar->setName($user['name'] ?: $user['username']); - $calendar->setDescription($user['name'] ?: $user['username']); - $calendar->setPublishedTTL('PT1H'); - - $this->renderCalendar($filter, $calendar); - } - - /** - * Get project iCalendar - * - * @access public - */ - public function project() - { - $token = $this->request->getStringParam('token'); - $project = $this->project->getByToken($token); - - // Token verification - if (empty($project)) { - $this->forbidden(true); - } - - // Common filter - $filter = $this->taskFilterICalendarFormatter - ->create() - ->filterByStatus(TaskModel::STATUS_OPEN) - ->filterByProject($project['id']); - - // Calendar properties - $calendar = new iCalendar('Kanboard'); - $calendar->setName($project['name']); - $calendar->setDescription($project['name']); - $calendar->setPublishedTTL('PT1H'); - - $this->renderCalendar($filter, $calendar); - } - - /** - * Common method to render iCal events - * - * @access private - */ - private function renderCalendar(TaskFilter $filter, iCalendar $calendar) - { - $start = $this->request->getStringParam('start', strtotime('-2 month')); - $end = $this->request->getStringParam('end', strtotime('+6 months')); - - // Tasks - if ($this->config->get('calendar_project_tasks', 'date_started') === 'date_creation') { - $filter - ->copy() - ->filterByCreationDateRange($start, $end) - ->setColumns('date_creation', 'date_completed') - ->setCalendar($calendar) - ->addDateTimeEvents(); - } else { - $filter - ->copy() - ->filterByStartDateRange($start, $end) - ->setColumns('date_started', 'date_completed') - ->setCalendar($calendar) - ->addDateTimeEvents($calendar); - } - - // Tasks with due date - $filter - ->copy() - ->filterByDueDateRange($start, $end) - ->setColumns('date_due') - ->setCalendar($calendar) - ->addFullDayEvents($calendar); - - $this->response->contentType('text/calendar; charset=utf-8'); - echo $filter->setCalendar($calendar)->format(); - } -} diff --git a/sources/app/Controller/Link.php b/sources/app/Controller/LinkController.php similarity index 70% rename from sources/app/Controller/Link.php rename to sources/app/Controller/LinkController.php index ec7ab1a..477b25a 100644 --- a/sources/app/Controller/Link.php +++ b/sources/app/Controller/LinkController.php @@ -2,27 +2,30 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\PageNotFoundException; + /** - * Link controller + * Link Controller * - * @package controller + * @package Kanboard\Controller * @author Olivier Maridat * @author Frederic Guillot */ -class Link extends Base +class LinkController extends BaseController { /** * Get the current link * * @access private * @return array + * @throws PageNotFoundException */ private function getLink() { - $link = $this->link->getById($this->request->getIntegerParam('link_id')); + $link = $this->linkModel->getById($this->request->getIntegerParam('link_id')); if (empty($link)) { - $this->notfound(); + throw new PageNotFoundException(); } return $link; @@ -32,11 +35,13 @@ class Link extends Base * List of links * * @access public + * @param array $values + * @param array $errors */ public function index(array $values = array(), array $errors = array()) { $this->response->html($this->helper->layout->config('link/index', array( - 'links' => $this->link->getMergedList(), + 'links' => $this->linkModel->getMergedList(), 'values' => $values, 'errors' => $errors, 'title' => t('Settings').' > '.t('Task\'s links'), @@ -54,21 +59,24 @@ class Link extends Base list($valid, $errors) = $this->linkValidator->validateCreation($values); if ($valid) { - if ($this->link->create($values['label'], $values['opposite_label']) !== false) { + if ($this->linkModel->create($values['label'], $values['opposite_label']) !== false) { $this->flash->success(t('Link added successfully.')); - $this->response->redirect($this->helper->url->to('link', 'index')); + return $this->response->redirect($this->helper->url->to('LinkController', 'index')); } else { $this->flash->failure(t('Unable to create your link.')); } } - $this->index($values, $errors); + return $this->index($values, $errors); } /** * Edit form * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { @@ -78,7 +86,7 @@ class Link extends Base $this->response->html($this->helper->layout->config('link/edit', array( 'values' => $values ?: $link, 'errors' => $errors, - 'labels' => $this->link->getList($link['id']), + 'labels' => $this->linkModel->getList($link['id']), 'link' => $link, 'title' => t('Link modification') ))); @@ -95,15 +103,15 @@ class Link extends Base list($valid, $errors) = $this->linkValidator->validateModification($values); if ($valid) { - if ($this->link->update($values)) { + if ($this->linkModel->update($values)) { $this->flash->success(t('Link updated successfully.')); - $this->response->redirect($this->helper->url->to('link', 'index')); + return $this->response->redirect($this->helper->url->to('LinkController', 'index')); } else { $this->flash->failure(t('Unable to update your link.')); } } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -131,12 +139,12 @@ class Link extends Base $this->checkCSRFParam(); $link = $this->getLink(); - if ($this->link->remove($link['id'])) { + if ($this->linkModel->remove($link['id'])) { $this->flash->success(t('Link removed successfully.')); } else { $this->flash->failure(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url->to('link', 'index')); + $this->response->redirect($this->helper->url->to('LinkController', 'index')); } } diff --git a/sources/app/Controller/Oauth.php b/sources/app/Controller/OAuthController.php similarity index 86% rename from sources/app/Controller/Oauth.php rename to sources/app/Controller/OAuthController.php index 12b9114..7663ddc 100644 --- a/sources/app/Controller/Oauth.php +++ b/sources/app/Controller/OAuthController.php @@ -5,12 +5,12 @@ namespace Kanboard\Controller; use Kanboard\Core\Security\OAuthAuthenticationProviderInterface; /** - * OAuth controller + * OAuth Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Oauth extends Base +class OAuthController extends BaseController { /** * Redirect to the provider if no code received @@ -49,7 +49,7 @@ class Oauth extends Base $this->link($provider); } else { $this->flash->failure(t('The OAuth2 state parameter is invalid')); - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } } else { if ($hasValidState) { @@ -75,7 +75,7 @@ class Oauth extends Base $this->flash->success(t('Your external account is linked to your profile successfully.')); } - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } /** @@ -94,7 +94,7 @@ class Oauth extends Base $this->flash->failure(t('Unable to unlink your external account.')); } - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } /** @@ -106,7 +106,7 @@ class Oauth extends Base protected function authenticate($providerName) { if ($this->authenticationManager->oauthAuthentication($providerName)) { - $this->response->redirect($this->helper->url->to('app', 'index')); + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); } else { $this->authenticationFailure(t('External authentication failed')); } diff --git a/sources/app/Controller/PasswordReset.php b/sources/app/Controller/PasswordResetController.php similarity index 62% rename from sources/app/Controller/PasswordReset.php rename to sources/app/Controller/PasswordResetController.php index f6a0eb8..a1780ed 100644 --- a/sources/app/Controller/PasswordReset.php +++ b/sources/app/Controller/PasswordResetController.php @@ -2,16 +2,22 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; + /** * Password Reset Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class PasswordReset extends Base +class PasswordResetController extends BaseController { /** * Show the form to reset the password + * + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\BaseException */ public function create(array $values = array(), array $errors = array()) { @@ -36,21 +42,25 @@ class PasswordReset extends Base if ($valid) { $this->sendEmail($values['username']); - $this->response->redirect($this->helper->url->to('auth', 'login')); + $this->response->redirect($this->helper->url->to('AuthController', 'login')); + } else { + $this->create($values, $errors); } - - $this->create($values, $errors); } /** * Show the form to set a new password + * + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\BaseException */ public function change(array $values = array(), array $errors = array()) { $this->checkActivation(); $token = $this->request->getStringParam('token'); - $user_id = $this->passwordReset->getUserIdByToken($token); + $user_id = $this->passwordResetModel->getUserIdByToken($token); if ($user_id !== false) { $this->response->html($this->helper->layout->app('password_reset/change', array( @@ -59,9 +69,9 @@ class PasswordReset extends Base 'values' => $values, 'no_layout' => true, ))); + } else { + $this->response->redirect($this->helper->url->to('AuthController', 'login')); } - - $this->response->redirect($this->helper->url->to('auth', 'login')); } /** @@ -76,28 +86,30 @@ class PasswordReset extends Base list($valid, $errors) = $this->passwordResetValidator->validateModification($values); if ($valid) { - $user_id = $this->passwordReset->getUserIdByToken($token); + $user_id = $this->passwordResetModel->getUserIdByToken($token); if ($user_id !== false) { - $this->user->update(array('id' => $user_id, 'password' => $values['password'])); - $this->passwordReset->disable($user_id); + $this->userModel->update(array('id' => $user_id, 'password' => $values['password'])); + $this->passwordResetModel->disable($user_id); } - $this->response->redirect($this->helper->url->to('auth', 'login')); + return $this->response->redirect($this->helper->url->to('AuthController', 'login')); } - $this->change($values, $errors); + return $this->change($values, $errors); } /** * Send the email + * + * @param string $username */ private function sendEmail($username) { - $token = $this->passwordReset->create($username); + $token = $this->passwordResetModel->create($username); if ($token !== false) { - $user = $this->user->getByUsername($username); + $user = $this->userModel->getByUsername($username); $this->emailClient->send( $user['email'], @@ -113,8 +125,8 @@ class PasswordReset extends Base */ private function checkActivation() { - if ($this->config->get('password_reset', 0) == 0) { - $this->response->redirect($this->helper->url->to('auth', 'login')); + if ($this->configModel->get('password_reset', 0) == 0) { + throw AccessForbiddenException::getInstance()->withoutLayout(); } } } diff --git a/sources/app/Controller/PluginController.php b/sources/app/Controller/PluginController.php new file mode 100644 index 0000000..7b9d64d --- /dev/null +++ b/sources/app/Controller/PluginController.php @@ -0,0 +1,126 @@ +response->html($this->helper->layout->plugin('plugin/show', array( + 'plugins' => $this->pluginLoader->getPlugins(), + 'title' => t('Installed Plugins'), + 'is_configured' => Installer::isConfigured(), + ))); + } + + /** + * Display list of available plugins + */ + public function directory() + { + $installedPlugins = array(); + + foreach ($this->pluginLoader->getPlugins() as $plugin) { + $installedPlugins[$plugin->getPluginName()] = $plugin->getPluginVersion(); + } + + $this->response->html($this->helper->layout->plugin('plugin/directory', array( + 'installed_plugins' => $installedPlugins, + 'available_plugins' => Directory::getInstance($this->container)->getAvailablePlugins(), + 'title' => t('Plugin Directory'), + 'is_configured' => Installer::isConfigured(), + ))); + } + + /** + * Install plugin from URL + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + */ + public function install() + { + $this->checkCSRFParam(); + $pluginArchiveUrl = urldecode($this->request->getStringParam('archive_url')); + + try { + $installer = new Installer($this->container); + $installer->install($pluginArchiveUrl); + $this->flash->success(t('Plugin installed successfully.')); + } catch (PluginInstallerException $e) { + $this->flash->failure($e->getMessage()); + } + + $this->response->redirect($this->helper->url->to('PluginController', 'show')); + } + + /** + * Update plugin from URL + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + */ + public function update() + { + $this->checkCSRFParam(); + $pluginArchiveUrl = urldecode($this->request->getStringParam('archive_url')); + + try { + $installer = new Installer($this->container); + $installer->update($pluginArchiveUrl); + $this->flash->success(t('Plugin updated successfully.')); + } catch (PluginInstallerException $e) { + $this->flash->failure($e->getMessage()); + } + + $this->response->redirect($this->helper->url->to('PluginController', 'show')); + } + + /** + * Confirmation before to remove the plugin + */ + public function confirm() + { + $pluginId = $this->request->getStringParam('pluginId'); + $plugins = $this->pluginLoader->getPlugins(); + + $this->response->html($this->template->render('plugin/remove', array( + 'plugin_id' => $pluginId, + 'plugin' => $plugins[$pluginId], + ))); + } + + /** + * Remove a plugin + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + */ + public function uninstall() + { + $this->checkCSRFParam(); + $pluginId = $this->request->getStringParam('pluginId'); + + try { + $installer = new Installer($this->container); + $installer->uninstall($pluginId); + $this->flash->success(t('Plugin removed successfully.')); + } catch (PluginInstallerException $e) { + $this->flash->failure($e->getMessage()); + } + + $this->response->redirect($this->helper->url->to('PluginController', 'show')); + } +} diff --git a/sources/app/Controller/Project.php b/sources/app/Controller/Project.php deleted file mode 100644 index cdfbd94..0000000 --- a/sources/app/Controller/Project.php +++ /dev/null @@ -1,243 +0,0 @@ -userSession->isAdmin()) { - $project_ids = $this->project->getAllIds(); - } else { - $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); - } - - $nb_projects = count($project_ids); - - $paginator = $this->paginator - ->setUrl('project', 'index') - ->setMax(20) - ->setOrder('name') - ->setQuery($this->project->getQueryColumnStats($project_ids)) - ->calculate(); - - $this->response->html($this->helper->layout->app('project/index', array( - 'paginator' => $paginator, - 'nb_projects' => $nb_projects, - 'title' => t('Projects').' ('.$nb_projects.')' - ))); - } - - /** - * Show the project information page - * - * @access public - */ - public function show() - { - $project = $this->getProject(); - - $this->response->html($this->helper->layout->project('project/show', array( - 'project' => $project, - 'stats' => $this->project->getTaskStats($project['id']), - 'title' => $project['name'], - ))); - } - - /** - * Public access management - * - * @access public - */ - public function share() - { - $project = $this->getProject(); - $switch = $this->request->getStringParam('switch'); - - if ($switch === 'enable' || $switch === 'disable') { - $this->checkCSRFParam(); - - if ($this->project->{$switch.'PublicAccess'}($project['id'])) { - $this->flash->success(t('Project updated successfully.')); - } else { - $this->flash->failure(t('Unable to update this project.')); - } - - $this->response->redirect($this->helper->url->to('project', 'share', array('project_id' => $project['id']))); - } - - $this->response->html($this->helper->layout->project('project/share', array( - 'project' => $project, - 'title' => t('Public access'), - ))); - } - - /** - * Integrations page - * - * @access public - */ - public function integrations() - { - $project = $this->getProject(); - - if ($this->request->isPost()) { - $this->projectMetadata->save($project['id'], $this->request->getValues()); - $this->flash->success(t('Project updated successfully.')); - $this->response->redirect($this->helper->url->to('project', 'integrations', array('project_id' => $project['id']))); - } - - $this->response->html($this->helper->layout->project('project/integrations', array( - 'project' => $project, - 'title' => t('Integrations'), - 'webhook_token' => $this->config->get('webhook_token'), - 'values' => $this->projectMetadata->getAll($project['id']), - 'errors' => array(), - ))); - } - - /** - * Display project notifications - * - * @access public - */ - public function notifications() - { - $project = $this->getProject(); - - if ($this->request->isPost()) { - $values = $this->request->getValues(); - $this->projectNotification->saveSettings($project['id'], $values); - $this->flash->success(t('Project updated successfully.')); - $this->response->redirect($this->helper->url->to('project', 'notifications', array('project_id' => $project['id']))); - } - - $this->response->html($this->helper->layout->project('project/notifications', array( - 'notifications' => $this->projectNotification->readSettings($project['id']), - 'types' => $this->projectNotificationType->getTypes(), - 'project' => $project, - 'title' => t('Notifications'), - ))); - } - - /** - * Remove a project - * - * @access public - */ - public function remove() - { - $project = $this->getProject(); - - if ($this->request->getStringParam('remove') === 'yes') { - $this->checkCSRFParam(); - - if ($this->project->remove($project['id'])) { - $this->flash->success(t('Project removed successfully.')); - } else { - $this->flash->failure(t('Unable to remove this project.')); - } - - $this->response->redirect($this->helper->url->to('project', 'index')); - } - - $this->response->html($this->helper->layout->project('project/remove', array( - 'project' => $project, - 'title' => t('Remove project') - ))); - } - - /** - * Duplicate a project - * - * @author Antonio Rabelo - * @author Michael Lüpkes - * @access public - */ - public function duplicate() - { - $project = $this->getProject(); - - if ($this->request->getStringParam('duplicate') === 'yes') { - $project_id = $this->projectDuplication->duplicate($project['id'], array_keys($this->request->getValues()), $this->userSession->getId()); - - if ($project_id !== false) { - $this->flash->success(t('Project cloned successfully.')); - } else { - $this->flash->failure(t('Unable to clone this project.')); - } - - $this->response->redirect($this->helper->url->to('project', 'show', array('project_id' => $project_id))); - } - - $this->response->html($this->helper->layout->project('project/duplicate', array( - 'project' => $project, - 'title' => t('Clone this project') - ))); - } - - /** - * Disable a project - * - * @access public - */ - public function disable() - { - $project = $this->getProject(); - - if ($this->request->getStringParam('disable') === 'yes') { - $this->checkCSRFParam(); - - if ($this->project->disable($project['id'])) { - $this->flash->success(t('Project disabled successfully.')); - } else { - $this->flash->failure(t('Unable to disable this project.')); - } - - $this->response->redirect($this->helper->url->to('project', 'show', array('project_id' => $project['id']))); - } - - $this->response->html($this->helper->layout->project('project/disable', array( - 'project' => $project, - 'title' => t('Project activation') - ))); - } - - /** - * Enable a project - * - * @access public - */ - public function enable() - { - $project = $this->getProject(); - - if ($this->request->getStringParam('enable') === 'yes') { - $this->checkCSRFParam(); - - if ($this->project->enable($project['id'])) { - $this->flash->success(t('Project activated successfully.')); - } else { - $this->flash->failure(t('Unable to activate this project.')); - } - - $this->response->redirect($this->helper->url->to('project', 'show', array('project_id' => $project['id']))); - } - - $this->response->html($this->helper->layout->project('project/enable', array( - 'project' => $project, - 'title' => t('Project activation') - ))); - } -} diff --git a/sources/app/Controller/ActionProject.php b/sources/app/Controller/ProjectActionDuplicationController.php similarity index 55% rename from sources/app/Controller/ActionProject.php rename to sources/app/Controller/ProjectActionDuplicationController.php index e5063f7..a4993cc 100644 --- a/sources/app/Controller/ActionProject.php +++ b/sources/app/Controller/ProjectActionDuplicationController.php @@ -5,18 +5,18 @@ namespace Kanboard\Controller; /** * Duplicate automatic action from another project * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ActionProject extends Base +class ProjectActionDuplicationController extends BaseController { - public function project() + public function show() { $project = $this->getProject(); - $projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId()); + $projects = $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId()); unset($projects[$project['id']]); - $this->response->html($this->template->render('action_project/project', array( + $this->response->html($this->template->render('project_action_duplication/show', array( 'project' => $project, 'projects_list' => $projects, ))); @@ -27,12 +27,12 @@ class ActionProject extends Base $project = $this->getProject(); $src_project_id = $this->request->getValue('src_project_id'); - if ($this->action->duplicate($src_project_id, $project['id'])) { + if ($this->actionModel->duplicate($src_project_id, $project['id'])) { $this->flash->success(t('Actions duplicated successfully.')); } else { $this->flash->failure(t('Unable to duplicate actions.')); } - $this->response->redirect($this->helper->url->to('action', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ActionController', 'index', array('project_id' => $project['id']))); } } diff --git a/sources/app/Controller/ProjectCreation.php b/sources/app/Controller/ProjectCreationController.php similarity index 81% rename from sources/app/Controller/ProjectCreation.php rename to sources/app/Controller/ProjectCreationController.php index 88f41fc..c471cfd 100644 --- a/sources/app/Controller/ProjectCreation.php +++ b/sources/app/Controller/ProjectCreationController.php @@ -5,20 +5,22 @@ namespace Kanboard\Controller; /** * Project Creation Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ProjectCreation extends Base +class ProjectCreationController extends BaseController { /** * Display a form to create a new project * * @access public + * @param array $values + * @param array $errors */ public function create(array $values = array(), array $errors = array()) { $is_private = isset($values['is_private']) && $values['is_private'] == 1; - $projects_list = array(0 => t('Do not duplicate anything')) + $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); + $projects_list = array(0 => t('Do not duplicate anything')) + $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId()); $this->response->html($this->helper->layout->app('project_creation/create', array( 'values' => $values, @@ -33,6 +35,8 @@ class ProjectCreation extends Base * Display a form to create a private project * * @access public + * @param array $values + * @param array $errors */ public function createPrivate(array $values = array(), array $errors = array()) { @@ -55,13 +59,13 @@ class ProjectCreation extends Base if ($project_id > 0) { $this->flash->success(t('Your project have been created successfully.')); - return $this->response->redirect($this->helper->url->to('project', 'show', array('project_id' => $project_id))); + return $this->response->redirect($this->helper->url->to('ProjectViewController', 'show', array('project_id' => $project_id))); } $this->flash->failure(t('Unable to create your project.')); } - $this->create($values, $errors); + return $this->create($values, $errors); } /** @@ -94,7 +98,7 @@ class ProjectCreation extends Base 'is_private' => $values['is_private'], ); - return $this->project->create($project, $this->userSession->getId(), true); + return $this->projectModel->create($project, $this->userSession->getId(), true); } /** @@ -108,13 +112,13 @@ class ProjectCreation extends Base { $selection = array(); - foreach ($this->projectDuplication->getOptionalSelection() as $item) { + foreach ($this->projectDuplicationModel->getOptionalSelection() as $item) { if (isset($values[$item]) && $values[$item] == 1) { $selection[] = $item; } } - return $this->projectDuplication->duplicate( + return $this->projectDuplicationModel->duplicate( $values['src_project_id'], $selection, $this->userSession->getId(), diff --git a/sources/app/Controller/ProjectEdit.php b/sources/app/Controller/ProjectEditController.php similarity index 78% rename from sources/app/Controller/ProjectEdit.php rename to sources/app/Controller/ProjectEditController.php index 94be020..228d681 100644 --- a/sources/app/Controller/ProjectEdit.php +++ b/sources/app/Controller/ProjectEditController.php @@ -5,15 +5,17 @@ namespace Kanboard\Controller; /** * Project Edit Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ProjectEdit extends Base +class ProjectEditController extends BaseController { /** * General edition (most common operations) * * @access public + * @param array $values + * @param array $errors */ public function edit(array $values = array(), array $errors = array()) { @@ -24,6 +26,8 @@ class ProjectEdit extends Base * Change start and end dates * * @access public + * @param array $values + * @param array $errors */ public function dates(array $values = array(), array $errors = array()) { @@ -34,6 +38,8 @@ class ProjectEdit extends Base * Change project description * * @access public + * @param array $values + * @param array $errors */ public function description(array $values = array(), array $errors = array()) { @@ -44,6 +50,8 @@ class ProjectEdit extends Base * Change task priority * * @access public + * @param array $values + * @param array $errors */ public function priority(array $values = array(), array $errors = array()) { @@ -65,15 +73,15 @@ class ProjectEdit extends Base list($valid, $errors) = $this->projectValidator->validateModification($values); if ($valid) { - if ($this->project->update($values)) { + if ($this->projectModel->update($values)) { $this->flash->success(t('Project updated successfully.')); - $this->response->redirect($this->helper->url->to('ProjectEdit', $redirect, array('project_id' => $project['id'])), true); + return $this->response->redirect($this->helper->url->to('ProjectEditController', $redirect, array('project_id' => $project['id'])), true); } else { $this->flash->failure(t('Unable to update this project.')); } } - $this->$redirect($values, $errors); + return $this->$redirect($values, $errors); } /** @@ -89,11 +97,11 @@ class ProjectEdit extends Base { if ($redirect === 'edit') { if (isset($values['is_private'])) { - if (! $this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) { + if (! $this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) { unset($values['is_private']); } } elseif ($project['is_private'] == 1 && ! isset($values['is_private'])) { - if ($this->helper->user->hasProjectAccess('ProjectCreation', 'create', $project['id'])) { + if ($this->helper->user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])) { $values += array('is_private' => 0); } } @@ -103,7 +111,7 @@ class ProjectEdit extends Base } /** - * Common metthod to render different views + * Common method to render different views * * @access private * @param string $template @@ -115,7 +123,7 @@ class ProjectEdit extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->project($template, array( - 'owners' => $this->projectUserRole->getAssignableUsersList($project['id'], true), + 'owners' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true), 'values' => empty($values) ? $project : $values, 'errors' => $errors, 'project' => $project, diff --git a/sources/app/Controller/ProjectFile.php b/sources/app/Controller/ProjectFileController.php similarity index 72% rename from sources/app/Controller/ProjectFile.php rename to sources/app/Controller/ProjectFileController.php index 96764a9..cbe4867 100644 --- a/sources/app/Controller/ProjectFile.php +++ b/sources/app/Controller/ProjectFileController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Project File Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ProjectFile extends Base +class ProjectFileController extends BaseController { /** * File upload form @@ -34,11 +34,11 @@ class ProjectFile extends Base { $project = $this->getProject(); - if (! $this->projectFile->uploadFiles($project['id'], $this->request->getFileInfo('files'))) { + if (! $this->projectFileModel->uploadFiles($project['id'], $this->request->getFileInfo('files'))) { $this->flash->failure(t('Unable to upload the file.')); } - $this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id'])), true); + $this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])), true); } /** @@ -50,15 +50,15 @@ class ProjectFile extends Base { $this->checkCSRFParam(); $project = $this->getProject(); - $file = $this->projectFile->getById($this->request->getIntegerParam('file_id')); + $file = $this->projectFileModel->getById($this->request->getIntegerParam('file_id')); - if ($this->projectFile->remove($file['id'])) { + if ($this->projectFileModel->remove($file['id'])) { $this->flash->success(t('File removed successfully.')); } else { $this->flash->failure(t('Unable to remove this file.')); } - $this->response->redirect($this->helper->url->to('ProjectOverview', 'show', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id']))); } /** @@ -69,7 +69,7 @@ class ProjectFile extends Base public function confirm() { $project = $this->getProject(); - $file = $this->projectFile->getById($this->request->getIntegerParam('file_id')); + $file = $this->projectFileModel->getById($this->request->getIntegerParam('file_id')); $this->response->html($this->template->render('project_file/remove', array( 'project' => $project, diff --git a/sources/app/Controller/ProjectGanttController.php b/sources/app/Controller/ProjectGanttController.php new file mode 100644 index 0000000..a70d9ee --- /dev/null +++ b/sources/app/Controller/ProjectGanttController.php @@ -0,0 +1,57 @@ +projectPermissionModel->getActiveProjectIds($this->userSession->getId()); + $filter = $this->projectQuery + ->withFilter(new ProjectTypeFilter(ProjectModel::TYPE_TEAM)) + ->withFilter(new ProjectStatusFilter(ProjectModel::ACTIVE)) + ->withFilter(new ProjectIdsFilter($project_ids)); + + $filter->getQuery()->asc(ProjectModel::TABLE.'.start_date'); + + $this->response->html($this->helper->layout->app('project_gantt/show', array( + 'projects' => $filter->format(new ProjectGanttFormatter($this->container)), + 'title' => t('Gantt chart for all projects'), + ))); + } + + /** + * Save new project start date and end date + */ + public function save() + { + $values = $this->request->getJson(); + + $result = $this->projectModel->update(array( + 'id' => $values['id'], + 'start_date' => $this->dateParser->getIsoDate(strtotime($values['start'])), + 'end_date' => $this->dateParser->getIsoDate(strtotime($values['end'])), + )); + + if (! $result) { + $this->response->json(array('message' => 'Unable to save project'), 400); + } else { + $this->response->json(array('message' => 'OK'), 201); + } + } +} diff --git a/sources/app/Controller/ProjectListController.php b/sources/app/Controller/ProjectListController.php new file mode 100644 index 0000000..e117240 --- /dev/null +++ b/sources/app/Controller/ProjectListController.php @@ -0,0 +1,41 @@ +userSession->isAdmin()) { + $project_ids = $this->projectModel->getAllIds(); + } else { + $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId()); + } + + $nb_projects = count($project_ids); + + $paginator = $this->paginator + ->setUrl('ProjectListController', 'show') + ->setMax(20) + ->setOrder('name') + ->setQuery($this->projectModel->getQueryColumnStats($project_ids)) + ->calculate(); + + $this->response->html($this->helper->layout->app('project_list/show', array( + 'paginator' => $paginator, + 'nb_projects' => $nb_projects, + 'title' => t('Projects').' ('.$nb_projects.')' + ))); + } +} diff --git a/sources/app/Controller/ProjectOverview.php b/sources/app/Controller/ProjectOverviewController.php similarity index 53% rename from sources/app/Controller/ProjectOverview.php rename to sources/app/Controller/ProjectOverviewController.php index 0464580..abdff65 100644 --- a/sources/app/Controller/ProjectOverview.php +++ b/sources/app/Controller/ProjectOverviewController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Project Overview Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ProjectOverview extends Base +class ProjectOverviewController extends BaseController { /** * Show project overview @@ -16,17 +16,17 @@ class ProjectOverview extends Base public function show() { $project = $this->getProject(); - $this->project->getColumnStats($project); + $this->projectModel->getColumnStats($project); $this->response->html($this->helper->layout->app('project_overview/show', array( 'project' => $project, 'title' => $project['name'], 'description' => $this->helper->projectHeader->getDescription($project), - 'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']), + 'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']), 'roles' => $this->role->getProjectRoles(), - 'events' => $this->projectActivity->getProject($project['id'], 10), - 'images' => $this->projectFile->getAllImages($project['id']), - 'files' => $this->projectFile->getAllDocuments($project['id']), + 'events' => $this->helper->projectActivity->getProjectEvents($project['id'], 10), + 'images' => $this->projectFileModel->getAllImages($project['id']), + 'files' => $this->projectFileModel->getAllDocuments($project['id']), ))); } } diff --git a/sources/app/Controller/ProjectPermission.php b/sources/app/Controller/ProjectPermissionController.php similarity index 71% rename from sources/app/Controller/ProjectPermission.php rename to sources/app/Controller/ProjectPermissionController.php index 800da02..f3ca6ed 100644 --- a/sources/app/Controller/ProjectPermission.php +++ b/sources/app/Controller/ProjectPermissionController.php @@ -2,15 +2,16 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; use Kanboard\Core\Security\Role; /** - * Project Permission + * Project Permission Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class ProjectPermission extends Base +class ProjectPermissionController extends BaseController { /** * Permissions are only available for team projects @@ -18,13 +19,14 @@ class ProjectPermission extends Base * @access protected * @param integer $project_id Default project id * @return array + * @throws AccessForbiddenException */ protected function getProject($project_id = 0) { $project = parent::getProject($project_id); if ($project['is_private'] == 1) { - $this->forbidden(); + throw new AccessForbiddenException(); } return $project; @@ -34,6 +36,9 @@ class ProjectPermission extends Base * Show all permissions * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException */ public function index(array $values = array(), array $errors = array()) { @@ -45,8 +50,8 @@ class ProjectPermission extends Base $this->response->html($this->helper->layout->project('project_permission/index', array( 'project' => $project, - 'users' => $this->projectUserRole->getUsers($project['id']), - 'groups' => $this->projectGroupRole->getGroups($project['id']), + 'users' => $this->projectUserRoleModel->getUsers($project['id']), + 'groups' => $this->projectGroupRoleModel->getGroups($project['id']), 'roles' => $this->role->getProjectRoles(), 'values' => $values, 'errors' => $errors, @@ -64,13 +69,13 @@ class ProjectPermission extends Base $project = $this->getProject(); $values = $this->request->getValues() + array('is_everybody_allowed' => 0); - if ($this->project->update($values)) { + if ($this->projectModel->update($values)) { $this->flash->success(t('Project updated successfully.')); } else { $this->flash->failure(t('Unable to update this project.')); } - $this->response->redirect($this->helper->url->to('ProjectPermission', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); } /** @@ -83,13 +88,15 @@ class ProjectPermission extends Base $project = $this->getProject(); $values = $this->request->getValues(); - if ($this->projectUserRole->addUser($values['project_id'], $values['user_id'], $values['role'])) { + if (empty($values['user_id'])) { + $this->flash->failure(t('User not found.')); + } elseif ($this->projectUserRoleModel->addUser($values['project_id'], $values['user_id'], $values['role'])) { $this->flash->success(t('Project updated successfully.')); } else { $this->flash->failure(t('Unable to update this project.')); } - $this->response->redirect($this->helper->url->to('ProjectPermission', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); } /** @@ -103,13 +110,13 @@ class ProjectPermission extends Base $project = $this->getProject(); $user_id = $this->request->getIntegerParam('user_id'); - if ($this->projectUserRole->removeUser($project['id'], $user_id)) { + if ($this->projectUserRoleModel->removeUser($project['id'], $user_id)) { $this->flash->success(t('Project updated successfully.')); } else { $this->flash->failure(t('Unable to update this project.')); } - $this->response->redirect($this->helper->url->to('ProjectPermission', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); } /** @@ -122,7 +129,7 @@ class ProjectPermission extends Base $project = $this->getProject(); $values = $this->request->getJson(); - if (! empty($project) && ! empty($values) && $this->projectUserRole->changeUserRole($project['id'], $values['id'], $values['role'])) { + if (! empty($project) && ! empty($values) && $this->projectUserRoleModel->changeUserRole($project['id'], $values['id'], $values['role'])) { $this->response->json(array('status' => 'ok')); } else { $this->response->json(array('status' => 'error')); @@ -140,16 +147,16 @@ class ProjectPermission extends Base $values = $this->request->getValues(); if (empty($values['group_id']) && ! empty($values['external_id'])) { - $values['group_id'] = $this->group->create($values['name'], $values['external_id']); + $values['group_id'] = $this->groupModel->create($values['name'], $values['external_id']); } - if ($this->projectGroupRole->addGroup($project['id'], $values['group_id'], $values['role'])) { + if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) { $this->flash->success(t('Project updated successfully.')); } else { $this->flash->failure(t('Unable to update this project.')); } - $this->response->redirect($this->helper->url->to('ProjectPermission', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); } /** @@ -163,13 +170,13 @@ class ProjectPermission extends Base $project = $this->getProject(); $group_id = $this->request->getIntegerParam('group_id'); - if ($this->projectGroupRole->removeGroup($project['id'], $group_id)) { + if ($this->projectGroupRoleModel->removeGroup($project['id'], $group_id)) { $this->flash->success(t('Project updated successfully.')); } else { $this->flash->failure(t('Unable to update this project.')); } - $this->response->redirect($this->helper->url->to('ProjectPermission', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('ProjectPermissionController', 'index', array('project_id' => $project['id']))); } /** @@ -182,7 +189,7 @@ class ProjectPermission extends Base $project = $this->getProject(); $values = $this->request->getJson(); - if (! empty($project) && ! empty($values) && $this->projectGroupRole->changeGroupRole($project['id'], $values['id'], $values['role'])) { + if (! empty($project) && ! empty($values) && $this->projectGroupRoleModel->changeGroupRole($project['id'], $values['id'], $values['role'])) { $this->response->json(array('status' => 'ok')); } else { $this->response->json(array('status' => 'error')); diff --git a/sources/app/Controller/ProjectStatusController.php b/sources/app/Controller/ProjectStatusController.php new file mode 100644 index 0000000..78e7787 --- /dev/null +++ b/sources/app/Controller/ProjectStatusController.php @@ -0,0 +1,102 @@ +getProject(); + + $this->response->html($this->template->render('project_status/enable', array( + 'project' => $project, + 'title' => t('Project activation') + ))); + } + + /** + * Enable the project + */ + public function enable() + { + $project = $this->getProject(); + $this->checkCSRFParam(); + + if ($this->projectModel->enable($project['id'])) { + $this->flash->success(t('Project activated successfully.')); + } else { + $this->flash->failure(t('Unable to activate this project.')); + } + + $this->response->redirect($this->helper->url->to('ProjectViewController', 'show', array('project_id' => $project['id'])), true); + } + + /** + * Disable a project (confirmation dialog box) + */ + public function confirmDisable() + { + $project = $this->getProject(); + + $this->response->html($this->template->render('project_status/disable', array( + 'project' => $project, + 'title' => t('Project activation') + ))); + } + + /** + * Disable a project + */ + public function disable() + { + $project = $this->getProject(); + $this->checkCSRFParam(); + + if ($this->projectModel->disable($project['id'])) { + $this->flash->success(t('Project disabled successfully.')); + } else { + $this->flash->failure(t('Unable to disable this project.')); + } + + $this->response->redirect($this->helper->url->to('ProjectViewController', 'show', array('project_id' => $project['id'])), true); + } + + /** + * Remove a project (confirmation dialog box) + */ + public function confirmRemove() + { + $project = $this->getProject(); + + $this->response->html($this->template->render('project_status/remove', array( + 'project' => $project, + 'title' => t('Remove project') + ))); + } + + /** + * Remove a project + */ + public function remove() + { + $project = $this->getProject(); + $this->checkCSRFParam(); + + if ($this->projectModel->remove($project['id'])) { + $this->flash->success(t('Project removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this project.')); + } + + $this->response->redirect($this->helper->url->to('ProjectListController', 'show'), true); + } +} diff --git a/sources/app/Controller/ProjectTagController.php b/sources/app/Controller/ProjectTagController.php new file mode 100644 index 0000000..acf514d --- /dev/null +++ b/sources/app/Controller/ProjectTagController.php @@ -0,0 +1,134 @@ +getProject(); + + $this->response->html($this->helper->layout->project('project_tag/index', array( + 'project' => $project, + 'tags' => $this->tagModel->getAllByProject($project['id']), + 'title' => t('Project tags management'), + ))); + } + + public function create(array $values = array(), array $errors = array()) + { + $project = $this->getProject(); + + if (empty($values)) { + $values['project_id'] = $project['id']; + } + + $this->response->html($this->template->render('project_tag/create', array( + 'project' => $project, + 'values' => $values, + 'errors' => $errors, + ))); + } + + public function save() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + list($valid, $errors) = $this->tagValidator->validateCreation($values); + + if ($valid) { + if ($this->tagModel->create($project['id'], $values['name']) > 0) { + $this->flash->success(t('Tag created successfully.')); + } else { + $this->flash->failure(t('Unable to create this tag.')); + } + + $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id']))); + } else { + $this->create($values, $errors); + } + } + + public function edit(array $values = array(), array $errors = array()) + { + $project = $this->getProject(); + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + if (empty($values)) { + $values = $tag; + } + + $this->response->html($this->template->render('project_tag/edit', array( + 'project' => $project, + 'tag' => $tag, + 'values' => $values, + 'errors' => $errors, + ))); + } + + public function update() + { + $project = $this->getProject(); + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + $values = $this->request->getValues(); + list($valid, $errors) = $this->tagValidator->validateModification($values); + + if ($tag['project_id'] != $project['id']) { + throw new AccessForbiddenException(); + } + + if ($valid) { + if ($this->tagModel->update($values['id'], $values['name'])) { + $this->flash->success(t('Tag updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this tag.')); + } + + $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id']))); + } else { + $this->edit($values, $errors); + } + } + + public function confirm() + { + $project = $this->getProject(); + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + $this->response->html($this->template->render('project_tag/remove', array( + 'tag' => $tag, + 'project' => $project, + ))); + } + + public function remove() + { + $this->checkCSRFParam(); + $project = $this->getProject(); + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + if ($tag['project_id'] != $project['id']) { + throw new AccessForbiddenException(); + } + + if ($this->tagModel->remove($tag_id)) { + $this->flash->success(t('Tag removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this tag.')); + } + + $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id']))); + } +} diff --git a/sources/app/Controller/Projectuser.php b/sources/app/Controller/ProjectUserOverviewController.php similarity index 72% rename from sources/app/Controller/Projectuser.php rename to sources/app/Controller/ProjectUserOverviewController.php index a6d4fe4..686de83 100644 --- a/sources/app/Controller/Projectuser.php +++ b/sources/app/Controller/ProjectUserOverviewController.php @@ -2,36 +2,36 @@ namespace Kanboard\Controller; -use Kanboard\Model\User as UserModel; -use Kanboard\Model\Task as TaskModel; +use Kanboard\Model\UserModel; +use Kanboard\Model\TaskModel; use Kanboard\Core\Security\Role; /** * Project User overview * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Projectuser extends Base +class ProjectUserOverviewController extends BaseController { private function common() { $user_id = $this->request->getIntegerParam('user_id', UserModel::EVERYBODY_ID); if ($this->userSession->isAdmin()) { - $project_ids = $this->project->getAllIds(); + $project_ids = $this->projectModel->getAllIds(); } else { - $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); + $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId()); } - return array($user_id, $project_ids, $this->user->getActiveUsersList(true)); + return array($user_id, $project_ids, $this->userModel->getActiveUsersList(true)); } private function role($role, $action, $title, $title_user) { list($user_id, $project_ids, $users) = $this->common(); - $query = $this->projectPermission->getQueryByRole($project_ids, $role)->callback(array($this->project, 'applyColumnStats')); + $query = $this->projectPermissionModel->getQueryByRole($project_ids, $role)->callback(array($this->projectModel, 'applyColumnStats')); if ($user_id !== UserModel::EVERYBODY_ID && isset($users[$user_id])) { $query->eq(UserModel::TABLE.'.id', $user_id); @@ -39,13 +39,13 @@ class Projectuser extends Base } $paginator = $this->paginator - ->setUrl('projectuser', $action, array('user_id' => $user_id)) + ->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id)) ->setMax(30) ->setOrder('projects.name') ->setQuery($query) ->calculate(); - $this->response->html($this->helper->layout->projectUser('project_user/roles', array( + $this->response->html($this->helper->layout->projectUser('project_user_overview/roles', array( 'paginator' => $paginator, 'title' => $title, 'user_id' => $user_id, @@ -57,7 +57,7 @@ class Projectuser extends Base { list($user_id, $project_ids, $users) = $this->common(); - $query = $this->taskFinder->getProjectUserOverviewQuery($project_ids, $is_active); + $query = $this->taskFinderModel->getProjectUserOverviewQuery($project_ids, $is_active); if ($user_id !== UserModel::EVERYBODY_ID && isset($users[$user_id])) { $query->eq(TaskModel::TABLE.'.owner_id', $user_id); @@ -65,13 +65,13 @@ class Projectuser extends Base } $paginator = $this->paginator - ->setUrl('projectuser', $action, array('user_id' => $user_id)) + ->setUrl('ProjectUserOverviewController', $action, array('user_id' => $user_id)) ->setMax(50) ->setOrder(TaskModel::TABLE.'.id') ->setQuery($query) ->calculate(); - $this->response->html($this->helper->layout->projectUser('project_user/tasks', array( + $this->response->html($this->helper->layout->projectUser('project_user_overview/tasks', array( 'paginator' => $paginator, 'title' => $title, 'user_id' => $user_id, @@ -94,7 +94,7 @@ class Projectuser extends Base */ public function members() { - $this->role(ROLE::PROJECT_MEMBER, 'members', t('People who are project members'), 'Projects where "%s" is member'); + $this->role(Role::PROJECT_MEMBER, 'members', t('People who are project members'), 'Projects where "%s" is member'); } /** @@ -122,8 +122,8 @@ class Projectuser extends Base { $project = $this->getProject(); - return $this->response->html($this->template->render('project_user/tooltip_users', array( - 'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']), + return $this->response->html($this->template->render('project_user_overview/tooltip_users', array( + 'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']), 'roles' => $this->role->getProjectRoles(), ))); } diff --git a/sources/app/Controller/ProjectViewController.php b/sources/app/Controller/ProjectViewController.php new file mode 100644 index 0000000..92b9380 --- /dev/null +++ b/sources/app/Controller/ProjectViewController.php @@ -0,0 +1,162 @@ +getProject(); + + $this->response->html($this->helper->layout->project('project_view/show', array( + 'project' => $project, + 'stats' => $this->projectModel->getTaskStats($project['id']), + 'title' => $project['name'], + ))); + } + + /** + * Public access management + * + * @access public + */ + public function share() + { + $project = $this->getProject(); + + $this->response->html($this->helper->layout->project('project_view/share', array( + 'project' => $project, + 'title' => t('Public access'), + ))); + } + + /** + * Change project sharing + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function updateSharing() + { + $project = $this->getProject(); + $this->checkCSRFParam(); + $switch = $this->request->getStringParam('switch'); + + if ($this->projectModel->{$switch.'PublicAccess'}($project['id'])) { + $this->flash->success(t('Project updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this project.')); + } + + $this->response->redirect($this->helper->url->to('ProjectViewController', 'share', array('project_id' => $project['id']))); + } + + /** + * Integrations page + * + * @access public + */ + public function integrations() + { + $project = $this->getProject(); + + $this->response->html($this->helper->layout->project('project_view/integrations', array( + 'project' => $project, + 'title' => t('Integrations'), + 'webhook_token' => $this->configModel->get('webhook_token'), + 'values' => $this->projectMetadataModel->getAll($project['id']), + 'errors' => array(), + ))); + } + + /** + * Update integrations + * + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function updateIntegrations() + { + $project = $this->getProject(); + + $this->projectMetadataModel->save($project['id'], $this->request->getValues()); + $this->flash->success(t('Project updated successfully.')); + $this->response->redirect($this->helper->url->to('ProjectViewController', 'integrations', array('project_id' => $project['id']))); + } + + /** + * Display project notifications + * + * @access public + */ + public function notifications() + { + $project = $this->getProject(); + + $this->response->html($this->helper->layout->project('project_view/notifications', array( + 'notifications' => $this->projectNotificationModel->readSettings($project['id']), + 'types' => $this->projectNotificationTypeModel->getTypes(), + 'project' => $project, + 'title' => t('Notifications'), + ))); + } + + /** + * Update notifications + * + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function updateNotifications() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + + $this->projectNotificationModel->saveSettings($project['id'], $values); + $this->flash->success(t('Project updated successfully.')); + $this->response->redirect($this->helper->url->to('ProjectViewController', 'notifications', array('project_id' => $project['id']))); + } + + /** + * Duplicate a project + * + * @author Antonio Rabelo + * @author Michael Lüpkes + * @access public + */ + public function duplicate() + { + $project = $this->getProject(); + + $this->response->html($this->helper->layout->project('project_view/duplicate', array( + 'project' => $project, + 'title' => t('Clone this project') + ))); + } + + /** + * Do project duplication + */ + public function doDuplication() + { + $project = $this->getProject(); + $project_id = $this->projectDuplicationModel->duplicate($project['id'], array_keys($this->request->getValues()), $this->userSession->getId()); + + if ($project_id !== false) { + $this->flash->success(t('Project cloned successfully.')); + } else { + $this->flash->failure(t('Unable to clone this project.')); + } + + $this->response->redirect($this->helper->url->to('ProjectViewController', 'show', array('project_id' => $project_id))); + } +} diff --git a/sources/app/Controller/Search.php b/sources/app/Controller/Search.php deleted file mode 100644 index 9b9b9e6..0000000 --- a/sources/app/Controller/Search.php +++ /dev/null @@ -1,49 +0,0 @@ -projectUserRole->getProjectsByUser($this->userSession->getId()); - $search = urldecode($this->request->getStringParam('search')); - $nb_tasks = 0; - - $paginator = $this->paginator - ->setUrl('search', 'index', array('search' => $search)) - ->setMax(30) - ->setOrder('tasks.id') - ->setDirection('DESC'); - - if ($search !== '' && ! empty($projects)) { - $query = $this - ->taskFilter - ->search($search) - ->filterByProjects(array_keys($projects)) - ->getQuery(); - - $paginator - ->setQuery($query) - ->calculate(); - - $nb_tasks = $paginator->getTotal(); - } - - $this->response->html($this->helper->layout->app('search/index', array( - 'values' => array( - 'search' => $search, - 'controller' => 'search', - 'action' => 'index', - ), - 'paginator' => $paginator, - 'title' => t('Search tasks').($nb_tasks > 0 ? ' ('.$nb_tasks.')' : '') - ))); - } -} diff --git a/sources/app/Controller/SearchController.php b/sources/app/Controller/SearchController.php new file mode 100644 index 0000000..8557b18 --- /dev/null +++ b/sources/app/Controller/SearchController.php @@ -0,0 +1,67 @@ +projectUserRoleModel->getProjectsByUser($this->userSession->getId()); + $search = urldecode($this->request->getStringParam('search')); + $nb_tasks = 0; + + $paginator = $this->paginator + ->setUrl('SearchController', 'index', array('search' => $search)) + ->setMax(30) + ->setOrder('tasks.id') + ->setDirection('DESC'); + + if ($search !== '' && ! empty($projects)) { + $paginator + ->setQuery($this->taskLexer + ->build($search) + ->withFilter(new TaskProjectsFilter(array_keys($projects))) + ->getQuery() + ) + ->calculate(); + + $nb_tasks = $paginator->getTotal(); + } + + $this->response->html($this->helper->layout->app('search/index', array( + 'values' => array( + 'search' => $search, + 'controller' => 'SearchController', + 'action' => 'index', + ), + 'paginator' => $paginator, + 'title' => t('Search tasks').($nb_tasks > 0 ? ' ('.$nb_tasks.')' : '') + ))); + } + + public function activity() + { + $search = urldecode($this->request->getStringParam('search')); + $events = $this->helper->projectActivity->searchEvents($search); + $nb_events = count($events); + + $this->response->html($this->helper->layout->app('search/activity', array( + 'values' => array( + 'search' => $search, + 'controller' => 'SearchController', + 'action' => 'activity', + ), + 'title' => t('Search in activity stream').($nb_events > 0 ? ' ('.$nb_events.')' : ''), + 'nb_events' => $nb_events, + 'events' => $events, + ))); + } +} diff --git a/sources/app/Controller/Subtask.php b/sources/app/Controller/SubtaskController.php similarity index 67% rename from sources/app/Controller/Subtask.php rename to sources/app/Controller/SubtaskController.php index dea2b08..93dab5c 100644 --- a/sources/app/Controller/Subtask.php +++ b/sources/app/Controller/SubtaskController.php @@ -2,18 +2,25 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; +use Kanboard\Core\Controller\PageNotFoundException; + /** * Subtask controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Subtask extends Base +class SubtaskController extends BaseController { /** * Creation form * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException + * @throws PageNotFoundException */ public function create(array $values = array(), array $errors = array()) { @@ -29,7 +36,7 @@ class Subtask extends Base $this->response->html($this->template->render('subtask/create', array( 'values' => $values, 'errors' => $errors, - 'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']), 'task' => $task, ))); } @@ -47,7 +54,7 @@ class Subtask extends Base list($valid, $errors) = $this->subtaskValidator->validateCreation($values); if ($valid) { - if ($this->subtask->create($values)) { + if ($this->subtaskModel->create($values) !== false) { $this->flash->success(t('Sub-task added successfully.')); } else { $this->flash->failure(t('Unable to create your sub-task.')); @@ -57,27 +64,31 @@ class Subtask extends Base return $this->create(array('project_id' => $task['project_id'], 'task_id' => $task['id'], 'another_subtask' => 1)); } - return $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true); } - $this->create($values, $errors); + return $this->create($values, $errors); } /** * Edit form * * @access public + * @param array $values + * @param array $errors + * @throws AccessForbiddenException + * @throws PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { $task = $this->getTask(); - $subtask = $this->getSubTask(); + $subtask = $this->getSubtask(); $this->response->html($this->template->render('subtask/edit', array( 'values' => empty($values) ? $subtask : $values, 'errors' => $errors, - 'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']), - 'status_list' => $this->subtask->getStatusList(), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']), + 'status_list' => $this->subtaskModel->getStatusList(), 'subtask' => $subtask, 'task' => $task, ))); @@ -97,16 +108,16 @@ class Subtask extends Base list($valid, $errors) = $this->subtaskValidator->validateModification($values); if ($valid) { - if ($this->subtask->update($values)) { + if ($this->subtaskModel->update($values)) { $this->flash->success(t('Sub-task updated successfully.')); } else { $this->flash->failure(t('Unable to update your sub-task.')); } - return $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -136,13 +147,13 @@ class Subtask extends Base $task = $this->getTask(); $subtask = $this->getSubtask(); - if ($this->subtask->remove($subtask['id'])) { + if ($this->subtaskModel->remove($subtask['id'])) { $this->flash->success(t('Sub-task removed successfully.')); } else { $this->flash->failure(t('Unable to remove this sub-task.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); } /** @@ -156,11 +167,11 @@ class Subtask extends Base $task_id = $this->request->getIntegerParam('task_id'); $values = $this->request->getJson(); - if (! empty($values) && $this->helper->user->hasProjectAccess('Subtask', 'movePosition', $project_id)) { - $result = $this->subtask->changePosition($task_id, $values['subtask_id'], $values['position']); - return $this->response->json(array('result' => $result)); + if (! empty($values) && $this->helper->user->hasProjectAccess('SubtaskController', 'movePosition', $project_id)) { + $result = $this->subtaskModel->changePosition($task_id, $values['subtask_id'], $values['position']); + $this->response->json(array('result' => $result)); + } else { + throw new AccessForbiddenException(); } - - $this->forbidden(); } } diff --git a/sources/app/Controller/SubtaskConverterController.php b/sources/app/Controller/SubtaskConverterController.php new file mode 100644 index 0000000..65bcd2d --- /dev/null +++ b/sources/app/Controller/SubtaskConverterController.php @@ -0,0 +1,39 @@ +getTask(); + $subtask = $this->getSubtask(); + + $this->response->html($this->template->render('subtask_converter/show', array( + 'subtask' => $subtask, + 'task' => $task, + ))); + } + + public function save() + { + $project = $this->getProject(); + $subtask = $this->getSubtask(); + + $task_id = $this->subtaskModel->convertToTask($project['id'], $subtask['id']); + + if ($task_id !== false) { + $this->flash->success(t('Subtask converted to task successfully.')); + } else { + $this->flash->failure(t('Unable to convert the subtask.')); + } + + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $project['id'], 'task_id' => $task_id)), true); + } +} diff --git a/sources/app/Controller/SubtaskRestriction.php b/sources/app/Controller/SubtaskRestrictionController.php similarity index 66% rename from sources/app/Controller/SubtaskRestriction.php rename to sources/app/Controller/SubtaskRestrictionController.php index 5602486..084fc0d 100644 --- a/sources/app/Controller/SubtaskRestriction.php +++ b/sources/app/Controller/SubtaskRestrictionController.php @@ -2,32 +2,32 @@ namespace Kanboard\Controller; -use Kanboard\Model\Subtask as SubtaskModel; +use Kanboard\Model\SubtaskModel; /** * Subtask Restriction * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class SubtaskRestriction extends Base +class SubtaskRestrictionController extends BaseController { /** * Show popup * * @access public */ - public function popover() + public function show() { $task = $this->getTask(); $subtask = $this->getSubtask(); - $this->response->html($this->template->render('subtask_restriction/popover', array( + $this->response->html($this->template->render('subtask_restriction/show', array( 'status_list' => array( SubtaskModel::STATUS_TODO => t('Todo'), SubtaskModel::STATUS_DONE => t('Done'), ), - 'subtask_inprogress' => $this->subtask->getSubtaskInProgress($this->userSession->getId()), + 'subtask_inprogress' => $this->subtaskModel->getSubtaskInProgress($this->userSession->getId()), 'subtask' => $subtask, 'task' => $task, ))); @@ -38,24 +38,24 @@ class SubtaskRestriction extends Base * * @access public */ - public function update() + public function save() { $task = $this->getTask(); $subtask = $this->getSubtask(); $values = $this->request->getValues(); // Change status of the previous "in progress" subtask - $this->subtask->update(array( + $this->subtaskModel->update(array( 'id' => $values['id'], 'status' => $values['status'], )); // Set the current subtask to "in progress" - $this->subtask->update(array( + $this->subtaskModel->update(array( 'id' => $subtask['id'], 'status' => SubtaskModel::STATUS_INPROGRESS, )); - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); } } diff --git a/sources/app/Controller/SubtaskStatus.php b/sources/app/Controller/SubtaskStatusController.php similarity index 73% rename from sources/app/Controller/SubtaskStatus.php rename to sources/app/Controller/SubtaskStatusController.php index 4fb82fc..699951f 100644 --- a/sources/app/Controller/SubtaskStatus.php +++ b/sources/app/Controller/SubtaskStatusController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Subtask Status * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class SubtaskStatus extends Base +class SubtaskStatusController extends BaseController { /** * Change status to the next status: Toto -> In Progress -> Done @@ -20,7 +20,7 @@ class SubtaskStatus extends Base $task = $this->getTask(); $subtask = $this->getSubtask(); - $status = $this->subtask->toggleStatus($subtask['id']); + $status = $this->subtaskModel->toggleStatus($subtask['id']); if ($this->request->getIntegerParam('refresh-table') === 0) { $subtask['status'] = $status; @@ -44,10 +44,10 @@ class SubtaskStatus extends Base $timer = $this->request->getStringParam('timer'); if ($timer === 'start') { - $this->subtaskTimeTracking->logStartTime($subtask_id, $this->userSession->getId()); + $this->subtaskTimeTrackingModel->logStartTime($subtask_id, $this->userSession->getId()); } elseif ($timer === 'stop') { - $this->subtaskTimeTracking->logEndTime($subtask_id, $this->userSession->getId()); - $this->subtaskTimeTracking->updateTaskTimeTracking($task['id']); + $this->subtaskTimeTrackingModel->logEndTime($subtask_id, $this->userSession->getId()); + $this->subtaskTimeTrackingModel->updateTaskTimeTracking($task['id']); } $this->response->html($this->renderTable($task)); @@ -64,9 +64,8 @@ class SubtaskStatus extends Base { return $this->template->render('subtask/table', array( 'task' => $task, - 'subtasks' => $this->subtask->getAll($task['id']), + 'subtasks' => $this->subtaskModel->getAll($task['id']), 'editable' => true, - 'redirect' => 'task', )); } } diff --git a/sources/app/Controller/Swimlane.php b/sources/app/Controller/SwimlaneController.php similarity index 66% rename from sources/app/Controller/Swimlane.php rename to sources/app/Controller/SwimlaneController.php index 8270a16..c7c20ce 100644 --- a/sources/app/Controller/Swimlane.php +++ b/sources/app/Controller/SwimlaneController.php @@ -2,30 +2,31 @@ namespace Kanboard\Controller; -use Kanboard\Model\Swimlane as SwimlaneModel; +use Kanboard\Core\Controller\AccessForbiddenException; +use Kanboard\Core\Controller\PageNotFoundException; +use Kanboard\Model\SwimlaneModel; /** - * Swimlanes + * Swimlanes Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Swimlane extends Base +class SwimlaneController extends BaseController { /** * Get the swimlane (common method between actions) * * @access private - * @param integer $project_id * @return array + * @throws PageNotFoundException */ - private function getSwimlane($project_id) + private function getSwimlane() { - $swimlane = $this->swimlane->getById($this->request->getIntegerParam('swimlane_id')); + $swimlane = $this->swimlaneModel->getById($this->request->getIntegerParam('swimlane_id')); if (empty($swimlane)) { - $this->flash->failure(t('Swimlane not found.')); - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project_id))); + throw new PageNotFoundException(); } return $swimlane; @@ -41,9 +42,9 @@ class Swimlane extends Base $project = $this->getProject(); $this->response->html($this->helper->layout->project('swimlane/index', array( - 'default_swimlane' => $this->swimlane->getDefault($project['id']), - 'active_swimlanes' => $this->swimlane->getAllByStatus($project['id'], SwimlaneModel::ACTIVE), - 'inactive_swimlanes' => $this->swimlane->getAllByStatus($project['id'], SwimlaneModel::INACTIVE), + 'default_swimlane' => $this->swimlaneModel->getDefault($project['id']), + 'active_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::ACTIVE), + 'inactive_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::INACTIVE), 'project' => $project, 'title' => t('Swimlanes') ))); @@ -53,6 +54,9 @@ class Swimlane extends Base * Create a new swimlane * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function create(array $values = array(), array $errors = array()) { @@ -77,26 +81,29 @@ class Swimlane extends Base list($valid, $errors) = $this->swimlaneValidator->validateCreation($values); if ($valid) { - if ($this->swimlane->create($values)) { + if ($this->swimlaneModel->create($values) !== false) { $this->flash->success(t('Your swimlane have been created successfully.')); - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } else { $errors = array('name' => array(t('Another swimlane with the same name exists in the project'))); } } - $this->create($values, $errors); + return $this->create($values, $errors); } /** * Edit default swimlane (display the form) * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function editDefault(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $swimlane = $this->swimlane->getDefault($project['id']); + $swimlane = $this->swimlaneModel->getDefault($project['id']); $this->response->html($this->helper->layout->project('swimlane/edit_default', array( 'values' => empty($values) ? $swimlane : $values, @@ -118,26 +125,29 @@ class Swimlane extends Base list($valid, $errors) = $this->swimlaneValidator->validateDefaultModification($values); if ($valid) { - if ($this->swimlane->updateDefault($values)) { + if ($this->swimlaneModel->updateDefault($values)) { $this->flash->success(t('The default swimlane have been updated successfully.')); - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id'])), true); + return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])), true); } else { $this->flash->failure(t('Unable to update this swimlane.')); } } - $this->editDefault($values, $errors); + return $this->editDefault($values, $errors); } /** * Edit a swimlane (display the form) * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $swimlane = $this->getSwimlane($project['id']); + $swimlane = $this->getSwimlane(); $this->response->html($this->helper->layout->project('swimlane/edit', array( 'values' => empty($values) ? $swimlane : $values, @@ -159,15 +169,15 @@ class Swimlane extends Base list($valid, $errors) = $this->swimlaneValidator->validateModification($values); if ($valid) { - if ($this->swimlane->update($values)) { + if ($this->swimlaneModel->update($values)) { $this->flash->success(t('Swimlane updated successfully.')); - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } else { $errors = array('name' => array(t('Another swimlane with the same name exists in the project'))); } } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -178,7 +188,7 @@ class Swimlane extends Base public function confirm() { $project = $this->getProject(); - $swimlane = $this->getSwimlane($project['id']); + $swimlane = $this->getSwimlane(); $this->response->html($this->helper->layout->project('swimlane/remove', array( 'project' => $project, @@ -197,13 +207,13 @@ class Swimlane extends Base $project = $this->getProject(); $swimlane_id = $this->request->getIntegerParam('swimlane_id'); - if ($this->swimlane->remove($project['id'], $swimlane_id)) { + if ($this->swimlaneModel->remove($project['id'], $swimlane_id)) { $this->flash->success(t('Swimlane removed successfully.')); } else { $this->flash->failure(t('Unable to remove this swimlane.')); } - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } /** @@ -217,13 +227,13 @@ class Swimlane extends Base $project = $this->getProject(); $swimlane_id = $this->request->getIntegerParam('swimlane_id'); - if ($this->swimlane->disable($project['id'], $swimlane_id)) { + if ($this->swimlaneModel->disable($project['id'], $swimlane_id)) { $this->flash->success(t('Swimlane updated successfully.')); } else { $this->flash->failure(t('Unable to update this swimlane.')); } - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } /** @@ -236,13 +246,13 @@ class Swimlane extends Base $this->checkCSRFParam(); $project = $this->getProject(); - if ($this->swimlane->disableDefault($project['id'])) { + if ($this->swimlaneModel->disableDefault($project['id'])) { $this->flash->success(t('Swimlane updated successfully.')); } else { $this->flash->failure(t('Unable to update this swimlane.')); } - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } /** @@ -256,13 +266,13 @@ class Swimlane extends Base $project = $this->getProject(); $swimlane_id = $this->request->getIntegerParam('swimlane_id'); - if ($this->swimlane->enable($project['id'], $swimlane_id)) { + if ($this->swimlaneModel->enable($project['id'], $swimlane_id)) { $this->flash->success(t('Swimlane updated successfully.')); } else { $this->flash->failure(t('Unable to update this swimlane.')); } - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } /** @@ -275,13 +285,13 @@ class Swimlane extends Base $this->checkCSRFParam(); $project = $this->getProject(); - if ($this->swimlane->enableDefault($project['id'])) { + if ($this->swimlaneModel->enableDefault($project['id'])) { $this->flash->success(t('Swimlane updated successfully.')); } else { $this->flash->failure(t('Unable to update this swimlane.')); } - $this->response->redirect($this->helper->url->to('swimlane', 'index', array('project_id' => $project['id']))); + $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id']))); } /** @@ -295,10 +305,10 @@ class Swimlane extends Base $values = $this->request->getJson(); if (! empty($values) && isset($values['swimlane_id']) && isset($values['position'])) { - $result = $this->swimlane->changePosition($project['id'], $values['swimlane_id'], $values['position']); - return $this->response->json(array('result' => $result)); + $result = $this->swimlaneModel->changePosition($project['id'], $values['swimlane_id'], $values['position']); + $this->response->json(array('result' => $result)); + } else { + throw new AccessForbiddenException(); } - - $this->forbidden(); } } diff --git a/sources/app/Controller/TagController.php b/sources/app/Controller/TagController.php new file mode 100644 index 0000000..b838991 --- /dev/null +++ b/sources/app/Controller/TagController.php @@ -0,0 +1,121 @@ +response->html($this->helper->layout->config('tag/index', array( + 'tags' => $this->tagModel->getAllByProject(0), + 'title' => t('Settings').' > '.t('Global tags management'), + ))); + } + + public function create(array $values = array(), array $errors = array()) + { + if (empty($values)) { + $values['project_id'] = 0; + } + + $this->response->html($this->template->render('tag/create', array( + 'values' => $values, + 'errors' => $errors, + ))); + } + + public function save() + { + $values = $this->request->getValues(); + list($valid, $errors) = $this->tagValidator->validateCreation($values); + + if ($valid) { + if ($this->tagModel->create(0, $values['name']) > 0) { + $this->flash->success(t('Tag created successfully.')); + } else { + $this->flash->failure(t('Unable to create this tag.')); + } + + $this->response->redirect($this->helper->url->to('TagController', 'index')); + } else { + $this->create($values, $errors); + } + } + + public function edit(array $values = array(), array $errors = array()) + { + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + if (empty($values)) { + $values = $tag; + } + + $this->response->html($this->template->render('tag/edit', array( + 'tag' => $tag, + 'values' => $values, + 'errors' => $errors, + ))); + } + + public function update() + { + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + $values = $this->request->getValues(); + list($valid, $errors) = $this->tagValidator->validateModification($values); + + if ($tag['project_id'] != 0) { + throw new AccessForbiddenException(); + } + + if ($valid) { + if ($this->tagModel->update($values['id'], $values['name'])) { + $this->flash->success(t('Tag updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this tag.')); + } + + $this->response->redirect($this->helper->url->to('TagController', 'index')); + } else { + $this->edit($values, $errors); + } + } + + public function confirm() + { + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + $this->response->html($this->template->render('tag/remove', array( + 'tag' => $tag, + ))); + } + + public function remove() + { + $this->checkCSRFParam(); + $tag_id = $this->request->getIntegerParam('tag_id'); + $tag = $this->tagModel->getById($tag_id); + + if ($tag['project_id'] != 0) { + throw new AccessForbiddenException(); + } + + if ($this->tagModel->remove($tag_id)) { + $this->flash->success(t('Tag removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this tag.')); + } + + $this->response->redirect($this->helper->url->to('TagController', 'index')); + } +} diff --git a/sources/app/Controller/Task.php b/sources/app/Controller/Task.php deleted file mode 100644 index 902a32d..0000000 --- a/sources/app/Controller/Task.php +++ /dev/null @@ -1,174 +0,0 @@ -project->getByToken($this->request->getStringParam('token')); - - // Token verification - if (empty($project)) { - return $this->forbidden(true); - } - - $task = $this->taskFinder->getDetails($this->request->getIntegerParam('task_id')); - - if (empty($task)) { - return $this->notfound(true); - } - - if ($task['project_id'] != $project['id']) { - return $this->forbidden(true); - } - - $this->response->html($this->helper->layout->app('task/public', array( - 'project' => $project, - 'comments' => $this->comment->getAll($task['id']), - 'subtasks' => $this->subtask->getAll($task['id']), - 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), - 'task' => $task, - 'columns_list' => $this->column->getList($task['project_id']), - 'colors_list' => $this->color->getList(), - 'title' => $task['title'], - 'no_layout' => true, - 'auto_refresh' => true, - 'not_editable' => true, - ))); - } - - /** - * Show a task - * - * @access public - */ - public function show() - { - $task = $this->getTask(); - $subtasks = $this->subtask->getAll($task['id']); - - $values = array( - 'id' => $task['id'], - 'date_started' => $task['date_started'], - 'time_estimated' => $task['time_estimated'] ?: '', - 'time_spent' => $task['time_spent'] ?: '', - ); - - $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT)); - - $this->response->html($this->helper->layout->task('task/show', array( - 'task' => $task, - 'project' => $this->project->getById($task['project_id']), - 'values' => $values, - 'files' => $this->taskFile->getAllDocuments($task['id']), - 'images' => $this->taskFile->getAllImages($task['id']), - 'comments' => $this->comment->getAll($task['id'], $this->userSession->getCommentSorting()), - 'subtasks' => $subtasks, - 'internal_links' => $this->taskLink->getAllGroupedByLabel($task['id']), - 'external_links' => $this->taskExternalLink->getAll($task['id']), - 'link_label_list' => $this->link->getList(0, false), - ))); - } - - /** - * Display task analytics - * - * @access public - */ - public function analytics() - { - $task = $this->getTask(); - - $this->response->html($this->helper->layout->task('task/analytics', array( - 'task' => $task, - 'project' => $this->project->getById($task['project_id']), - 'lead_time' => $this->taskAnalytic->getLeadTime($task), - 'cycle_time' => $this->taskAnalytic->getCycleTime($task), - 'time_spent_columns' => $this->taskAnalytic->getTimeSpentByColumn($task), - ))); - } - - /** - * Display the time tracking details - * - * @access public - */ - public function timetracking() - { - $task = $this->getTask(); - - $subtask_paginator = $this->paginator - ->setUrl('task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks')) - ->setMax(15) - ->setOrder('start') - ->setDirection('DESC') - ->setQuery($this->subtaskTimeTracking->getTaskQuery($task['id'])) - ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); - - $this->response->html($this->helper->layout->task('task/time_tracking_details', array( - 'task' => $task, - 'project' => $this->project->getById($task['project_id']), - 'subtask_paginator' => $subtask_paginator, - ))); - } - - /** - * Display the task transitions - * - * @access public - */ - public function transitions() - { - $task = $this->getTask(); - - $this->response->html($this->helper->layout->task('task/transitions', array( - 'task' => $task, - 'project' => $this->project->getById($task['project_id']), - 'transitions' => $this->transition->getAllByTask($task['id']), - ))); - } - - /** - * Remove a task - * - * @access public - */ - public function remove() - { - $task = $this->getTask(); - - if (! $this->taskPermission->canRemoveTask($task)) { - $this->forbidden(); - } - - if ($this->request->getStringParam('confirmation') === 'yes') { - $this->checkCSRFParam(); - - if ($this->task->remove($task['id'])) { - $this->flash->success(t('Task removed successfully.')); - } else { - $this->flash->failure(t('Unable to remove this task.')); - } - - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id']))); - } - - $this->response->html($this->template->render('task/remove', array( - 'task' => $task, - ))); - } -} diff --git a/sources/app/Controller/TaskAjaxController.php b/sources/app/Controller/TaskAjaxController.php new file mode 100644 index 0000000..f9feff1 --- /dev/null +++ b/sources/app/Controller/TaskAjaxController.php @@ -0,0 +1,49 @@ +request->getStringParam('term'); + $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId()); + $exclude_task_id = $this->request->getIntegerParam('exclude_task_id'); + + if (empty($project_ids)) { + $this->response->json(array()); + } else { + + $filter = $this->taskQuery->withFilter(new TaskProjectsFilter($project_ids)); + + if (! empty($exclude_task_id)) { + $filter->withFilter(new TaskIdExclusionFilter(array($exclude_task_id))); + } + + if (ctype_digit($search)) { + $filter->withFilter(new TaskIdFilter($search)); + } else { + $filter->withFilter(new TaskTitleFilter($search)); + } + + $this->response->json($filter->format(new TaskAutoCompleteFormatter($this->container))); + } + } +} diff --git a/sources/app/Controller/TaskBulkController.php b/sources/app/Controller/TaskBulkController.php new file mode 100644 index 0000000..df7f589 --- /dev/null +++ b/sources/app/Controller/TaskBulkController.php @@ -0,0 +1,89 @@ +getProject(); + + if (empty($values)) { + $values = array( + 'swimlane_id' => $this->request->getIntegerParam('swimlane_id'), + 'column_id' => $this->request->getIntegerParam('column_id'), + 'project_id' => $project['id'], + ); + } + + $this->response->html($this->template->render('task_bulk/show', array( + 'project' => $project, + 'values' => $values, + 'errors' => $errors, + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true), + 'colors_list' => $this->colorModel->getList(), + 'categories_list' => $this->categoryModel->getList($project['id']), + ))); + } + + /** + * Save all tasks in the database + */ + public function save() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + list($valid, $errors) = $this->taskValidator->validateBulkCreation($values); + + if ($valid) { + $this->createTasks($project, $values); + $this->response->redirect($this->helper->url->to( + 'BoardViewController', + 'show', + array('project_id' => $project['id']), + 'swimlane-'. $values['swimlane_id'] + ), true); + } else { + $this->show($values, $errors); + } + } + + /** + * Create all tasks + * + * @param array $project + * @param array $values + */ + protected function createTasks(array $project, array $values) + { + $tasks = preg_split('/\r\n|[\r\n]/', $values['tasks']); + + foreach ($tasks as $title) { + $title = trim($title); + + if (! empty($title)) { + $this->taskCreationModel->create(array( + 'title' => $title, + 'column_id' => $values['column_id'], + 'swimlane_id' => $values['swimlane_id'], + 'category_id' => empty($values['category_id']) ? 0 : $values['category_id'], + 'owner_id' => empty($values['owner_id']) ? 0 : $values['owner_id'], + 'color_id' => $values['color_id'], + 'project_id' => $project['id'], + )); + } + } + } +} diff --git a/sources/app/Controller/Taskcreation.php b/sources/app/Controller/TaskCreationController.php similarity index 67% rename from sources/app/Controller/Taskcreation.php rename to sources/app/Controller/TaskCreationController.php index 1d8a0e2..073b31b 100644 --- a/sources/app/Controller/Taskcreation.php +++ b/sources/app/Controller/TaskCreationController.php @@ -3,28 +3,31 @@ namespace Kanboard\Controller; /** - * Task Creation controller + * Task Creation Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Taskcreation extends Base +class TaskCreationController extends BaseController { /** * Display a form to create a new task * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\PageNotFoundException */ - public function create(array $values = array(), array $errors = array()) + public function show(array $values = array(), array $errors = array()) { $project = $this->getProject(); - $swimlanes_list = $this->swimlane->getList($project['id'], false, true); + $swimlanes_list = $this->swimlaneModel->getList($project['id'], false, true); if (empty($values)) { $values = array( 'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)), 'column_id' => $this->request->getIntegerParam('column_id'), - 'color_id' => $this->color->getDefaultColor(), + 'color_id' => $this->colorModel->getDefaultColor(), 'owner_id' => $this->userSession->getId(), ); @@ -32,14 +35,13 @@ class Taskcreation extends Base $values = $this->hook->merge('controller:task-creation:form:default', $values, array('default_values' => $values)); } - $this->response->html($this->template->render('task_creation/form', array( + $this->response->html($this->template->render('task_creation/show', array( 'project' => $project, 'errors' => $errors, 'values' => $values + array('project_id' => $project['id']), - 'columns_list' => $this->column->getList($project['id']), - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true), - 'colors_list' => $this->color->getList(), - 'categories_list' => $this->category->getList($project['id']), + 'columns_list' => $this->columnModel->getList($project['id']), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true), + 'categories_list' => $this->categoryModel->getList($project['id']), 'swimlanes_list' => $swimlanes_list, 'title' => $project['name'].' > '.t('New task') ))); @@ -57,19 +59,19 @@ class Taskcreation extends Base list($valid, $errors) = $this->taskValidator->validateCreation($values); - if ($valid && $this->taskCreation->create($values)) { + if ($valid && $this->taskCreationModel->create($values)) { $this->flash->success(t('Task created successfully.')); return $this->afterSave($project, $values); } $this->flash->failure(t('Unable to create your task.')); - $this->create($values, $errors); + return $this->show($values, $errors); } private function afterSave(array $project, array &$values) { if (isset($values['another_task']) && $values['another_task'] == 1) { - return $this->create(array( + return $this->show(array( 'owner_id' => $values['owner_id'], 'color_id' => $values['color_id'], 'category_id' => isset($values['category_id']) ? $values['category_id'] : 0, @@ -79,6 +81,6 @@ class Taskcreation extends Base )); } - $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id']))); + return $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])), true); } } diff --git a/sources/app/Controller/Taskduplication.php b/sources/app/Controller/TaskDuplicationController.php similarity index 65% rename from sources/app/Controller/Taskduplication.php rename to sources/app/Controller/TaskDuplicationController.php index 8fca930..915bf8f 100644 --- a/sources/app/Controller/Taskduplication.php +++ b/sources/app/Controller/TaskDuplicationController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Task Duplication controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Taskduplication extends Base +class TaskDuplicationController extends BaseController { /** * Duplicate a task @@ -21,18 +21,18 @@ class Taskduplication extends Base if ($this->request->getStringParam('confirmation') === 'yes') { $this->checkCSRFParam(); - $task_id = $this->taskDuplication->duplicate($task['id']); + $task_id = $this->taskDuplicationModel->duplicate($task['id']); if ($task_id > 0) { $this->flash->success(t('Task created successfully.')); - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id))); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id))); } else { $this->flash->failure(t('Unable to create this task.')); - $this->response->redirect($this->helper->url->to('taskduplication', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); } } - $this->response->html($this->template->render('task_duplication/duplicate', array( + return $this->response->html($this->template->render('task_duplication/duplicate', array( 'task' => $task, ))); } @@ -50,20 +50,20 @@ class Taskduplication extends Base $values = $this->request->getValues(); list($valid, ) = $this->taskValidator->validateProjectModification($values); - if ($valid && $this->taskDuplication->moveToProject($task['id'], + if ($valid && $this->taskProjectMoveModel->moveToProject($task['id'], $values['project_id'], $values['swimlane_id'], $values['column_id'], $values['category_id'], $values['owner_id'])) { $this->flash->success(t('Task updated successfully.')); - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $values['project_id'], 'task_id' => $task['id']))); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $values['project_id'], 'task_id' => $task['id']))); } $this->flash->failure(t('Unable to update your task.')); } - $this->chooseDestination($task, 'task_duplication/move'); + return $this->chooseDestination($task, 'task_duplication/move'); } /** @@ -80,21 +80,21 @@ class Taskduplication extends Base list($valid, ) = $this->taskValidator->validateProjectModification($values); if ($valid) { - $task_id = $this->taskDuplication->duplicateToProject( + $task_id = $this->taskProjectDuplicationModel->duplicateToProject( $task['id'], $values['project_id'], $values['swimlane_id'], $values['column_id'], $values['category_id'], $values['owner_id'] ); if ($task_id > 0) { $this->flash->success(t('Task created successfully.')); - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $values['project_id'], 'task_id' => $task_id))); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $values['project_id'], 'task_id' => $task_id))); } } $this->flash->failure(t('Unable to create your task.')); } - $this->chooseDestination($task, 'task_duplication/copy'); + return $this->chooseDestination($task, 'task_duplication/copy'); } /** @@ -107,19 +107,19 @@ class Taskduplication extends Base private function chooseDestination(array $task, $template) { $values = array(); - $projects_list = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); + $projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId()); unset($projects_list[$task['project_id']]); if (! empty($projects_list)) { $dst_project_id = $this->request->getIntegerParam('dst_project_id', key($projects_list)); - $swimlanes_list = $this->swimlane->getList($dst_project_id, false, true); - $columns_list = $this->column->getList($dst_project_id); - $categories_list = $this->category->getList($dst_project_id); - $users_list = $this->projectUserRole->getAssignableUsersList($dst_project_id); + $swimlanes_list = $this->swimlaneModel->getList($dst_project_id, false, true); + $columns_list = $this->columnModel->getList($dst_project_id); + $categories_list = $this->categoryModel->getList($dst_project_id); + $users_list = $this->projectUserRoleModel->getAssignableUsersList($dst_project_id); - $values = $this->taskDuplication->checkDestinationProjectValues($task); + $values = $this->taskDuplicationModel->checkDestinationProjectValues($task); $values['project_id'] = $dst_project_id; } else { $swimlanes_list = array(); diff --git a/sources/app/Controller/TaskExternalLink.php b/sources/app/Controller/TaskExternalLinkController.php similarity index 71% rename from sources/app/Controller/TaskExternalLink.php rename to sources/app/Controller/TaskExternalLinkController.php index 0db8ec3..9c04eb0 100644 --- a/sources/app/Controller/TaskExternalLink.php +++ b/sources/app/Controller/TaskExternalLinkController.php @@ -2,20 +2,25 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\PageNotFoundException; use Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound; /** * Task External Link Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class TaskExternalLink extends Base +class TaskExternalLinkController extends BaseController { /** * First creation form * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException + * @throws \Kanboard\Core\Controller\AccessForbiddenException */ public function find(array $values = array(), array $errors = array()) { @@ -36,11 +41,10 @@ class TaskExternalLink extends Base */ public function create() { + $task = $this->getTask(); + $values = $this->request->getValues(); + try { - - $task = $this->getTask(); - $values = $this->request->getValues(); - $provider = $this->externalLinkManager->setUserInput($values)->find(); $link = $provider->getLink(); @@ -72,18 +76,23 @@ class TaskExternalLink extends Base $values = $this->request->getValues(); list($valid, $errors) = $this->externalLinkValidator->validateCreation($values); - if ($valid && $this->taskExternalLink->create($values)) { + if ($valid && $this->taskExternalLinkModel->create($values) !== false) { $this->flash->success(t('Link added successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** * Edit form * * @access public + * @param array $values + * @param array $errors + * @throws ExternalLinkProviderNotFound + * @throws PageNotFoundException + * @throws \Kanboard\Core\Controller\AccessForbiddenException */ public function edit(array $values = array(), array $errors = array()) { @@ -91,11 +100,11 @@ class TaskExternalLink extends Base $link_id = $this->request->getIntegerParam('link_id'); if ($link_id > 0) { - $values = $this->taskExternalLink->getById($link_id); + $values = $this->taskExternalLinkModel->getById($link_id); } if (empty($values)) { - return $this->notfound(); + throw new PageNotFoundException(); } $provider = $this->externalLinkManager->getProvider($values['link_type']); @@ -119,12 +128,12 @@ class TaskExternalLink extends Base $values = $this->request->getValues(); list($valid, $errors) = $this->externalLinkValidator->validateModification($values); - if ($valid && $this->taskExternalLink->update($values)) { + if ($valid && $this->taskExternalLinkModel->update($values)) { $this->flash->success(t('Link updated successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -136,10 +145,10 @@ class TaskExternalLink extends Base { $task = $this->getTask(); $link_id = $this->request->getIntegerParam('link_id'); - $link = $this->taskExternalLink->getById($link_id); + $link = $this->taskExternalLinkModel->getById($link_id); if (empty($link)) { - return $this->notfound(); + throw new PageNotFoundException(); } $this->response->html($this->template->render('task_external_link/remove', array( @@ -158,12 +167,12 @@ class TaskExternalLink extends Base $this->checkCSRFParam(); $task = $this->getTask(); - if ($this->taskExternalLink->remove($this->request->getIntegerParam('link_id'))) { + if ($this->taskExternalLinkModel->remove($this->request->getIntegerParam('link_id'))) { $this->flash->success(t('Link removed successfully.')); } else { $this->flash->failure(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); } } diff --git a/sources/app/Controller/TaskFile.php b/sources/app/Controller/TaskFileController.php similarity index 60% rename from sources/app/Controller/TaskFile.php rename to sources/app/Controller/TaskFileController.php index 2b0152a..77c0c02 100644 --- a/sources/app/Controller/TaskFile.php +++ b/sources/app/Controller/TaskFileController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Task File Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class TaskFile extends Base +class TaskFileController extends BaseController { /** * Screenshot @@ -19,12 +19,12 @@ class TaskFile extends Base { $task = $this->getTask(); - if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) { + if ($this->request->isPost() && $this->taskFileModel->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) { $this->flash->success(t('Screenshot uploaded successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } - $this->response->html($this->template->render('task_file/screenshot', array( + return $this->response->html($this->template->render('task_file/screenshot', array( 'task' => $task, ))); } @@ -53,11 +53,11 @@ class TaskFile extends Base { $task = $this->getTask(); - if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) { + if (! $this->taskFileModel->uploadFiles($task['id'], $this->request->getFileInfo('files'))) { $this->flash->failure(t('Unable to upload the file.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } /** @@ -69,15 +69,15 @@ class TaskFile extends Base { $this->checkCSRFParam(); $task = $this->getTask(); - $file = $this->taskFile->getById($this->request->getIntegerParam('file_id')); + $file = $this->taskFileModel->getById($this->request->getIntegerParam('file_id')); - if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) { + if ($file['task_id'] == $task['id'] && $this->taskFileModel->remove($file['id'])) { $this->flash->success(t('File removed successfully.')); } else { $this->flash->failure(t('Unable to remove this file.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); } /** @@ -88,7 +88,7 @@ class TaskFile extends Base public function confirm() { $task = $this->getTask(); - $file = $this->taskFile->getById($this->request->getIntegerParam('file_id')); + $file = $this->taskFileModel->getById($this->request->getIntegerParam('file_id')); $this->response->html($this->template->render('task_file/remove', array( 'task' => $task, diff --git a/sources/app/Controller/TaskGanttController.php b/sources/app/Controller/TaskGanttController.php new file mode 100644 index 0000000..868368e --- /dev/null +++ b/sources/app/Controller/TaskGanttController.php @@ -0,0 +1,62 @@ +getProject(); + $search = $this->helper->projectHeader->getSearchQuery($project); + $sorting = $this->request->getStringParam('sorting', 'board'); + $filter = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project['id'])); + + if ($sorting === 'date') { + $filter->getQuery()->asc(TaskModel::TABLE.'.date_started')->asc(TaskModel::TABLE.'.date_creation'); + } else { + $filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position'); + } + + $this->response->html($this->helper->layout->app('task_gantt/show', array( + 'project' => $project, + 'title' => $project['name'], + 'description' => $this->helper->projectHeader->getDescription($project), + 'sorting' => $sorting, + 'tasks' => $filter->format(new TaskGanttFormatter($this->container)), + ))); + } + + /** + * Save new task start date and due date + */ + public function save() + { + $this->getProject(); + $values = $this->request->getJson(); + + $result = $this->taskModificationModel->update(array( + 'id' => $values['id'], + 'date_started' => strtotime($values['start']), + 'date_due' => strtotime($values['end']), + )); + + if (! $result) { + $this->response->json(array('message' => 'Unable to save task'), 400); + } else { + $this->response->json(array('message' => 'OK'), 201); + } + } +} diff --git a/sources/app/Controller/TaskGanttCreationController.php b/sources/app/Controller/TaskGanttCreationController.php new file mode 100644 index 0000000..07b74a4 --- /dev/null +++ b/sources/app/Controller/TaskGanttCreationController.php @@ -0,0 +1,70 @@ +getProject(); + + $values = $values + array( + 'project_id' => $project['id'], + 'column_id' => $this->columnModel->getFirstColumnId($project['id']), + 'position' => 1 + ); + + $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values)); + $values = $this->hook->merge('controller:gantt:task:form:default', $values, array('default_values' => $values)); + + $this->response->html($this->template->render('task_gantt_creation/show', array( + 'project' => $project, + 'errors' => $errors, + 'values' => $values, + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true), + 'categories_list' => $this->categoryModel->getList($project['id']), + 'swimlanes_list' => $this->swimlaneModel->getList($project['id'], false, true), + 'title' => $project['name'].' > '.t('New task') + ))); + } + + /** + * Validate and save a new task + * + * @access public + */ + public function save() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->taskValidator->validateCreation($values); + + if ($valid) { + $task_id = $this->taskCreationModel->create($values); + + if ($task_id !== false) { + $this->flash->success(t('Task created successfully.')); + return $this->response->redirect($this->helper->url->to('TaskGanttController', 'show', array('project_id' => $project['id']))); + } else { + $this->flash->failure(t('Unable to create your task.')); + } + } + + return $this->show($values, $errors); + } +} diff --git a/sources/app/Controller/TaskHelper.php b/sources/app/Controller/TaskHelper.php deleted file mode 100644 index 7e340a6..0000000 --- a/sources/app/Controller/TaskHelper.php +++ /dev/null @@ -1,41 +0,0 @@ -request->getStringParam('term'); - $projects = $this->projectPermission->getActiveProjectIds($this->userSession->getId()); - - if (empty($projects)) { - $this->response->json(array()); - } - - $filter = $this->taskFilterAutoCompleteFormatter - ->create() - ->filterByProjects($projects) - ->excludeTasks(array($this->request->getIntegerParam('exclude_task_id'))); - - // Search by task id or by title - if (ctype_digit($search)) { - $filter->filterById($search); - } else { - $filter->filterByTitle($search); - } - - $this->response->json($filter->format()); - } -} diff --git a/sources/app/Controller/TaskImport.php b/sources/app/Controller/TaskImport.php deleted file mode 100644 index 460c608..0000000 --- a/sources/app/Controller/TaskImport.php +++ /dev/null @@ -1,72 +0,0 @@ -getProject(); - - $this->response->html($this->helper->layout->project('task_import/step1', array( - 'project' => $project, - 'values' => $values, - 'errors' => $errors, - 'max_size' => ini_get('upload_max_filesize'), - 'delimiters' => Csv::getDelimiters(), - 'enclosures' => Csv::getEnclosures(), - 'title' => t('Import tasks from CSV file'), - ))); - } - - /** - * Process CSV file - * - */ - public function step2() - { - $project = $this->getProject(); - $values = $this->request->getValues(); - $filename = $this->request->getFilePath('file'); - - if (! file_exists($filename)) { - $this->step1($values, array('file' => array(t('Unable to read your file')))); - } - - $this->taskImport->projectId = $project['id']; - - $csv = new Csv($values['delimiter'], $values['enclosure']); - $csv->setColumnMapping($this->taskImport->getColumnMapping()); - $csv->read($filename, array($this->taskImport, 'import')); - - if ($this->taskImport->counter > 0) { - $this->flash->success(t('%d task(s) have been imported successfully.', $this->taskImport->counter)); - } else { - $this->flash->failure(t('Nothing have been imported!')); - } - - $this->response->redirect($this->helper->url->to('taskImport', 'step1', array('project_id' => $project['id']))); - } - - /** - * Generate template - * - */ - public function template() - { - $this->response->forceDownload('tasks.csv'); - $this->response->csv(array($this->taskImport->getColumnMapping())); - } -} diff --git a/sources/app/Controller/TaskImportController.php b/sources/app/Controller/TaskImportController.php new file mode 100644 index 0000000..aff2d39 --- /dev/null +++ b/sources/app/Controller/TaskImportController.php @@ -0,0 +1,74 @@ +getProject(); + + $this->response->html($this->helper->layout->project('task_import/show', array( + 'project' => $project, + 'values' => $values, + 'errors' => $errors, + 'max_size' => ini_get('upload_max_filesize'), + 'delimiters' => Csv::getDelimiters(), + 'enclosures' => Csv::getEnclosures(), + 'title' => t('Import tasks from CSV file'), + ), 'task_import/sidebar')); + } + + /** + * Process CSV file + */ + public function save() + { + $project = $this->getProject(); + $values = $this->request->getValues(); + $filename = $this->request->getFilePath('file'); + + if (! file_exists($filename)) { + $this->show($values, array('file' => array(t('Unable to read your file')))); + } else { + $this->taskImport->projectId = $project['id']; + + $csv = new Csv($values['delimiter'], $values['enclosure']); + $csv->setColumnMapping($this->taskImport->getColumnMapping()); + $csv->read($filename, array($this->taskImport, 'import')); + + if ($this->taskImport->counter > 0) { + $this->flash->success(t('%d task(s) have been imported successfully.', $this->taskImport->counter)); + } else { + $this->flash->failure(t('Nothing have been imported!')); + } + + $this->response->redirect($this->helper->url->to('TaskImportController', 'show', array('project_id' => $project['id']))); + } + } + + /** + * Generate template + * + */ + public function template() + { + $this->response->withFileDownload('tasks.csv'); + $this->response->csv(array($this->taskImport->getColumnMapping())); + } +} diff --git a/sources/app/Controller/TaskInternalLink.php b/sources/app/Controller/TaskInternalLinkController.php similarity index 65% rename from sources/app/Controller/TaskInternalLink.php rename to sources/app/Controller/TaskInternalLinkController.php index ac5e04b..a140f1f 100644 --- a/sources/app/Controller/TaskInternalLink.php +++ b/sources/app/Controller/TaskInternalLinkController.php @@ -2,27 +2,30 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\PageNotFoundException; + /** * TaskInternalLink Controller * - * @package controller + * @package Kanboard\Controller * @author Olivier Maridat * @author Frederic Guillot */ -class TaskInternalLink extends Base +class TaskInternalLinkController extends BaseController { /** * Get the current link * * @access private * @return array + * @throws PageNotFoundException */ private function getTaskLink() { - $link = $this->taskLink->getById($this->request->getIntegerParam('link_id')); + $link = $this->taskLinkModel->getById($this->request->getIntegerParam('link_id')); if (empty($link)) { - return $this->notfound(); + throw new PageNotFoundException(); } return $link; @@ -32,6 +35,10 @@ class TaskInternalLink extends Base * Creation form * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException + * @throws \Kanboard\Core\Controller\AccessForbiddenException */ public function create(array $values = array(), array $errors = array()) { @@ -41,7 +48,7 @@ class TaskInternalLink extends Base 'values' => $values, 'errors' => $errors, 'task' => $task, - 'labels' => $this->link->getList(0, false), + 'labels' => $this->linkModel->getList(0, false), ))); } @@ -58,22 +65,26 @@ class TaskInternalLink extends Base list($valid, $errors) = $this->taskLinkValidator->validateCreation($values); if ($valid) { - if ($this->taskLink->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) { + if ($this->taskLinkModel->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) { $this->flash->success(t('Link added successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } $errors = array('title' => array(t('The exact same link already exists'))); $this->flash->failure(t('Unable to create your link.')); } - $this->create($values, $errors); + return $this->create($values, $errors); } /** * Edit form * * @access public + * @param array $values + * @param array $errors + * @throws PageNotFoundException + * @throws \Kanboard\Core\Controller\AccessForbiddenException */ public function edit(array $values = array(), array $errors = array()) { @@ -81,7 +92,7 @@ class TaskInternalLink extends Base $task_link = $this->getTaskLink(); if (empty($values)) { - $opposite_task = $this->taskFinder->getById($task_link['opposite_task_id']); + $opposite_task = $this->taskFinderModel->getById($task_link['opposite_task_id']); $values = $task_link; $values['title'] = '#'.$opposite_task['id'].' - '.$opposite_task['title']; } @@ -91,7 +102,7 @@ class TaskInternalLink extends Base 'errors' => $errors, 'task_link' => $task_link, 'task' => $task, - 'labels' => $this->link->getList(0, false) + 'labels' => $this->linkModel->getList(0, false) ))); } @@ -108,15 +119,15 @@ class TaskInternalLink extends Base list($valid, $errors) = $this->taskLinkValidator->validateModification($values); if ($valid) { - if ($this->taskLink->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) { + if ($this->taskLinkModel->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) { $this->flash->success(t('Link updated successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); } $this->flash->failure(t('Unable to update your link.')); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } /** @@ -145,12 +156,12 @@ class TaskInternalLink extends Base $this->checkCSRFParam(); $task = $this->getTask(); - if ($this->taskLink->remove($this->request->getIntegerParam('link_id'))) { + if ($this->taskLinkModel->remove($this->request->getIntegerParam('link_id'))) { $this->flash->success(t('Link removed successfully.')); } else { $this->flash->failure(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); } } diff --git a/sources/app/Controller/Listing.php b/sources/app/Controller/TaskListController.php similarity index 57% rename from sources/app/Controller/Listing.php rename to sources/app/Controller/TaskListController.php index 9931c34..c6d1fa9 100644 --- a/sources/app/Controller/Listing.php +++ b/sources/app/Controller/TaskListController.php @@ -2,15 +2,16 @@ namespace Kanboard\Controller; -use Kanboard\Model\Task as TaskModel; +use Kanboard\Filter\TaskProjectFilter; +use Kanboard\Model\TaskModel; /** - * List view controller + * Task List Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Listing extends Base +class TaskListController extends BaseController { /** * Show list view for projects @@ -21,17 +22,20 @@ class Listing extends Base { $project = $this->getProject(); $search = $this->helper->projectHeader->getSearchQuery($project); - $query = $this->taskFilter->search($search)->filterByProject($project['id'])->getQuery(); $paginator = $this->paginator - ->setUrl('listing', 'show', array('project_id' => $project['id'])) + ->setUrl('TaskListController', 'show', array('project_id' => $project['id'])) ->setMax(30) ->setOrder(TaskModel::TABLE.'.id') ->setDirection('DESC') - ->setQuery($query) + ->setQuery($this->taskLexer + ->build($search) + ->withFilter(new TaskProjectFilter($project['id'])) + ->getQuery() + ) ->calculate(); - $this->response->html($this->helper->layout->app('listing/show', array( + $this->response->html($this->helper->layout->app('task_list/show', array( 'project' => $project, 'title' => $project['name'], 'description' => $this->helper->projectHeader->getDescription($project), diff --git a/sources/app/Controller/TaskModificationController.php b/sources/app/Controller/TaskModificationController.php new file mode 100644 index 0000000..b064123 --- /dev/null +++ b/sources/app/Controller/TaskModificationController.php @@ -0,0 +1,78 @@ +getTask(); + $this->taskModificationModel->update(array('id' => $task['id'], 'date_started' => time())); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']))); + } + + /** + * Display a form to edit a task + * + * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function edit(array $values = array(), array $errors = array()) + { + $task = $this->getTask(); + $project = $this->projectModel->getById($task['project_id']); + + if (empty($values)) { + $values = $task; + $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values)); + $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values)); + $values = $this->dateParser->format($values, array('date_due'), $this->dateParser->getUserDateFormat()); + $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat()); + } + + $this->response->html($this->template->render('task_modification/show', array( + 'project' => $project, + 'values' => $values, + 'errors' => $errors, + 'task' => $task, + 'tags' => $this->taskTagModel->getList($task['id']), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']), + 'categories_list' => $this->categoryModel->getList($task['project_id']), + ))); + } + + /** + * Validate and update a task + * + * @access public + */ + public function update() + { + $task = $this->getTask(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->taskValidator->validateModification($values); + + if ($valid && $this->taskModificationModel->update($values)) { + $this->flash->success(t('Task updated successfully.')); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + } else { + $this->flash->failure(t('Unable to update your task.')); + $this->edit($values, $errors); + } + } +} diff --git a/sources/app/Controller/TaskPopoverController.php b/sources/app/Controller/TaskPopoverController.php new file mode 100644 index 0000000..4e3c11a --- /dev/null +++ b/sources/app/Controller/TaskPopoverController.php @@ -0,0 +1,26 @@ +getTask(); + + $this->response->html($this->template->render('task_file/screenshot', array( + 'task' => $task, + ))); + } +} diff --git a/sources/app/Controller/TaskRecurrence.php b/sources/app/Controller/TaskRecurrenceController.php similarity index 53% rename from sources/app/Controller/TaskRecurrence.php rename to sources/app/Controller/TaskRecurrenceController.php index 569ef8d..c6fdfa3 100644 --- a/sources/app/Controller/TaskRecurrence.php +++ b/sources/app/Controller/TaskRecurrenceController.php @@ -5,15 +5,19 @@ namespace Kanboard\Controller; /** * Task Recurrence controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class TaskRecurrence extends Base +class TaskRecurrenceController extends BaseController { /** * Edit recurrence form * * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { @@ -27,10 +31,10 @@ class TaskRecurrence extends Base 'values' => $values, 'errors' => $errors, 'task' => $task, - 'recurrence_status_list' => $this->task->getRecurrenceStatusList(), - 'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(), - 'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(), - 'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(), + 'recurrence_status_list' => $this->taskRecurrenceModel->getRecurrenceStatusList(), + 'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(), + 'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(), + 'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(), ))); } @@ -47,15 +51,15 @@ class TaskRecurrence extends Base list($valid, $errors) = $this->taskValidator->validateEditRecurrence($values); if ($valid) { - if ($this->taskModification->update($values)) { + if ($this->taskModificationModel->update($values)) { $this->flash->success(t('Task updated successfully.')); } else { $this->flash->failure(t('Unable to update your task.')); } - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); } - $this->edit($values, $errors); + return $this->edit($values, $errors); } } diff --git a/sources/app/Controller/Taskstatus.php b/sources/app/Controller/TaskStatusController.php similarity index 79% rename from sources/app/Controller/Taskstatus.php rename to sources/app/Controller/TaskStatusController.php index a67459c..82b4f9c 100644 --- a/sources/app/Controller/Taskstatus.php +++ b/sources/app/Controller/TaskStatusController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Task Status controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Taskstatus extends Base +class TaskStatusController extends BaseController { /** * Close a task @@ -46,16 +46,16 @@ class Taskstatus extends Base if ($this->request->getStringParam('confirmation') === 'yes') { $this->checkCSRFParam(); - if ($this->taskStatus->$method($task['id'])) { + if ($this->taskStatusModel->$method($task['id'])) { $this->flash->success($success_message); } else { $this->flash->failure($failure_message); } - return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); } - $this->response->html($this->template->render($template, array( + return $this->response->html($this->template->render($template, array( 'task' => $task, ))); } diff --git a/sources/app/Controller/TaskSuppressionController.php b/sources/app/Controller/TaskSuppressionController.php new file mode 100644 index 0000000..600107c --- /dev/null +++ b/sources/app/Controller/TaskSuppressionController.php @@ -0,0 +1,53 @@ +getTask(); + + if (! $this->helper->user->canRemoveTask($task)) { + throw new AccessForbiddenException(); + } + + $this->response->html($this->template->render('task_suppression/remove', array( + 'task' => $task, + 'redirect' => $this->request->getStringParam('redirect'), + ))); + } + + /** + * Remove a task + */ + public function remove() + { + $task = $this->getTask(); + $this->checkCSRFParam(); + + if (! $this->helper->user->canRemoveTask($task)) { + throw new AccessForbiddenException(); + } + + if ($this->taskModel->remove($task['id'])) { + $this->flash->success(t('Task removed successfully.')); + } else { + $this->flash->failure(t('Unable to remove this task.')); + } + + $redirect = $this->request->getStringParam('redirect') === ''; + $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $task['project_id'])), $redirect); + } +} diff --git a/sources/app/Controller/TaskViewController.php b/sources/app/Controller/TaskViewController.php new file mode 100644 index 0000000..f40f8be --- /dev/null +++ b/sources/app/Controller/TaskViewController.php @@ -0,0 +1,147 @@ +projectModel->getByToken($this->request->getStringParam('token')); + + // Token verification + if (empty($project)) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + $task = $this->taskFinderModel->getDetails($this->request->getIntegerParam('task_id')); + + if (empty($task)) { + throw PageNotFoundException::getInstance()->withoutLayout(); + } + + if ($task['project_id'] != $project['id']) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + $this->response->html($this->helper->layout->app('task/public', array( + 'project' => $project, + 'comments' => $this->commentModel->getAll($task['id']), + 'subtasks' => $this->subtaskModel->getAll($task['id']), + 'links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']), + 'task' => $task, + 'columns_list' => $this->columnModel->getList($task['project_id']), + 'colors_list' => $this->colorModel->getList(), + 'tags' => $this->taskTagModel->getList($task['id']), + 'title' => $task['title'], + 'no_layout' => true, + 'auto_refresh' => true, + 'not_editable' => true, + ))); + } + + /** + * Show a task + * + * @access public + */ + public function show() + { + $task = $this->getTask(); + $subtasks = $this->subtaskModel->getAll($task['id']); + + $values = array( + 'id' => $task['id'], + 'date_started' => $task['date_started'], + 'time_estimated' => $task['time_estimated'] ?: '', + 'time_spent' => $task['time_spent'] ?: '', + ); + + $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat()); + + $this->response->html($this->helper->layout->task('task/show', array( + 'task' => $task, + 'project' => $this->projectModel->getById($task['project_id']), + 'values' => $values, + 'files' => $this->taskFileModel->getAllDocuments($task['id']), + 'images' => $this->taskFileModel->getAllImages($task['id']), + 'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting()), + 'subtasks' => $subtasks, + 'internal_links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']), + 'external_links' => $this->taskExternalLinkModel->getAll($task['id']), + 'link_label_list' => $this->linkModel->getList(0, false), + 'tags' => $this->taskTagModel->getList($task['id']), + ))); + } + + /** + * Display task analytics + * + * @access public + */ + public function analytics() + { + $task = $this->getTask(); + + $this->response->html($this->helper->layout->task('task/analytics', array( + 'task' => $task, + 'project' => $this->projectModel->getById($task['project_id']), + 'lead_time' => $this->taskAnalyticModel->getLeadTime($task), + 'cycle_time' => $this->taskAnalyticModel->getCycleTime($task), + 'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task), + ))); + } + + /** + * Display the time tracking details + * + * @access public + */ + public function timetracking() + { + $task = $this->getTask(); + + $subtask_paginator = $this->paginator + ->setUrl('TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks')) + ->setMax(15) + ->setOrder('start') + ->setDirection('DESC') + ->setQuery($this->subtaskTimeTrackingModel->getTaskQuery($task['id'])) + ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); + + $this->response->html($this->helper->layout->task('task/time_tracking_details', array( + 'task' => $task, + 'project' => $this->projectModel->getById($task['project_id']), + 'subtask_paginator' => $subtask_paginator, + ))); + } + + /** + * Display the task transitions + * + * @access public + */ + public function transitions() + { + $task = $this->getTask(); + + $this->response->html($this->helper->layout->task('task/transitions', array( + 'task' => $task, + 'project' => $this->projectModel->getById($task['project_id']), + 'transitions' => $this->transitionModel->getAllByTask($task['id']), + ))); + } +} diff --git a/sources/app/Controller/Taskmodification.php b/sources/app/Controller/Taskmodification.php deleted file mode 100644 index 6b945f3..0000000 --- a/sources/app/Controller/Taskmodification.php +++ /dev/null @@ -1,122 +0,0 @@ -getTask(); - $this->taskModification->update(array('id' => $task['id'], 'date_started' => time())); - $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']))); - } - - /** - * Edit description form - * - * @access public - */ - public function description(array $values = array(), array $errors = array()) - { - $task = $this->getTask(); - - if (empty($values)) { - $values = array('id' => $task['id'], 'description' => $task['description']); - } - - $this->response->html($this->template->render('task_modification/edit_description', array( - 'values' => $values, - 'errors' => $errors, - 'task' => $task, - ))); - } - - /** - * Update description - * - * @access public - */ - public function updateDescription() - { - $task = $this->getTask(); - $values = $this->request->getValues(); - - list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values); - - if ($valid) { - if ($this->taskModification->update($values)) { - $this->flash->success(t('Task updated successfully.')); - } else { - $this->flash->failure(t('Unable to update your task.')); - } - - return $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); - } - - $this->description($values, $errors); - } - - /** - * Display a form to edit a task - * - * @access public - */ - public function edit(array $values = array(), array $errors = array()) - { - $task = $this->getTask(); - $project = $this->project->getById($task['project_id']); - - if (empty($values)) { - $values = $task; - $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values)); - $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values)); - } - - $values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', DateParser::DATE_FORMAT)); - $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT)); - - $this->response->html($this->template->render('task_modification/edit_task', array( - 'project' => $project, - 'values' => $values, - 'errors' => $errors, - 'task' => $task, - 'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']), - 'colors_list' => $this->color->getList(), - 'categories_list' => $this->category->getList($task['project_id']), - ))); - } - - /** - * Validate and update a task - * - * @access public - */ - public function update() - { - $task = $this->getTask(); - $values = $this->request->getValues(); - - list($valid, $errors) = $this->taskValidator->validateModification($values); - - if ($valid && $this->taskModification->update($values)) { - $this->flash->success(t('Task updated successfully.')); - return $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); - } else { - $this->flash->failure(t('Unable to update your task.')); - $this->edit($values, $errors); - } - } -} diff --git a/sources/app/Controller/Twofactor.php b/sources/app/Controller/TwoFactorController.php similarity index 81% rename from sources/app/Controller/Twofactor.php rename to sources/app/Controller/TwoFactorController.php index 1029226..d02c895 100644 --- a/sources/app/Controller/Twofactor.php +++ b/sources/app/Controller/TwoFactorController.php @@ -2,23 +2,27 @@ namespace Kanboard\Controller; +use Kanboard\Core\Controller\AccessForbiddenException; + /** * Two Factor Auth controller * - * @package controller + * @package Kanboard/Controller * @author Frederic Guillot */ -class Twofactor extends User +class TwoFactorController extends UserViewController { /** * Only the current user can access to 2FA settings * * @access private + * @param array $user + * @throws AccessForbiddenException */ private function checkCurrentUser(array $user) { if ($user['id'] != $this->userSession->getId()) { - $this->forbidden(); + throw new AccessForbiddenException(); } } @@ -87,7 +91,7 @@ class Twofactor extends User if ($provider->authenticate()) { $this->flash->success(t('The two factor authentication code is valid.')); - $this->user->update(array( + $this->userModel->update(array( 'id' => $user['id'], 'twofactor_activated' => 1, 'twofactor_secret' => $this->authenticationManager->getPostAuthenticationProvider()->getSecret(), @@ -96,10 +100,10 @@ class Twofactor extends User unset($this->sessionStorage->twoFactorSecret); $this->userSession->disablePostAuthentication(); - $this->response->redirect($this->helper->url->to('twofactor', 'index', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('TwoFactorController', 'index', array('user_id' => $user['id']))); } else { $this->flash->failure(t('The two factor authentication code is not valid.')); - $this->response->redirect($this->helper->url->to('twofactor', 'show', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('TwoFactorController', 'show', array('user_id' => $user['id']))); } } @@ -113,7 +117,7 @@ class Twofactor extends User $user = $this->getUser(); $this->checkCurrentUser($user); - $this->user->update(array( + $this->userModel->update(array( 'id' => $user['id'], 'twofactor_activated' => 0, 'twofactor_secret' => '', @@ -123,7 +127,7 @@ class Twofactor extends User $this->userSession->disablePostAuthentication(); $this->flash->success(t('User updated successfully.')); - $this->response->redirect($this->helper->url->to('twofactor', 'index', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('TwoFactorController', 'index', array('user_id' => $user['id']))); } /** @@ -145,10 +149,10 @@ class Twofactor extends User if ($provider->authenticate()) { $this->userSession->validatePostAuthentication(); $this->flash->success(t('The two factor authentication code is valid.')); - $this->response->redirect($this->helper->url->to('app', 'index')); + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); } else { $this->flash->failure(t('The two factor authentication code is not valid.')); - $this->response->redirect($this->helper->url->to('twofactor', 'code')); + $this->response->redirect($this->helper->url->to('TwoFactorController', 'code')); } } @@ -182,16 +186,16 @@ class Twofactor extends User if ($this->request->getStringParam('disable') === 'yes') { $this->checkCSRFParam(); - $this->user->update(array( + $this->userModel->update(array( 'id' => $user['id'], 'twofactor_activated' => 0, 'twofactor_secret' => '', )); - $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); } - $this->response->html($this->helper->layout->user('twofactor/disable', array( + return $this->response->html($this->helper->layout->user('twofactor/disable', array( 'user' => $user, ))); } diff --git a/sources/app/Controller/User.php b/sources/app/Controller/User.php deleted file mode 100644 index f7d7d2e..0000000 --- a/sources/app/Controller/User.php +++ /dev/null @@ -1,408 +0,0 @@ -paginator - ->setUrl('user', 'index') - ->setMax(30) - ->setOrder('username') - ->setQuery($this->user->getQuery()) - ->calculate(); - - $this->response->html( - $this->helper->layout->app('user/index', array( - 'title' => t('Users').' ('.$paginator->getTotal().')', - 'paginator' => $paginator, - ) - )); - } - - /** - * Public user profile - * - * @access public - */ - public function profile() - { - $user = $this->user->getById($this->request->getIntegerParam('user_id')); - - if (empty($user)) { - $this->notfound(); - } - - $this->response->html( - $this->helper->layout->app('user/profile', array( - 'title' => $user['name'] ?: $user['username'], - 'user' => $user, - ) - )); - } - - /** - * Display a form to create a new user - * - * @access public - */ - public function create(array $values = array(), array $errors = array()) - { - $is_remote = $this->request->getIntegerParam('remote') == 1 || (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1); - - $this->response->html($this->helper->layout->app($is_remote ? 'user/create_remote' : 'user/create_local', array( - 'timezones' => $this->config->getTimezones(true), - 'languages' => $this->config->getLanguages(true), - 'roles' => $this->role->getApplicationRoles(), - 'projects' => $this->project->getList(), - 'errors' => $errors, - 'values' => $values + array('role' => Role::APP_USER), - 'title' => t('New user') - ))); - } - - /** - * Validate and save a new user - * - * @access public - */ - public function save() - { - $values = $this->request->getValues(); - list($valid, $errors) = $this->userValidator->validateCreation($values); - - if ($valid) { - $project_id = empty($values['project_id']) ? 0 : $values['project_id']; - unset($values['project_id']); - - $user_id = $this->user->create($values); - - if ($user_id !== false) { - $this->projectUserRole->addUser($project_id, $user_id, Role::PROJECT_MEMBER); - - if (! empty($values['notifications_enabled'])) { - $this->userNotificationType->saveSelectedTypes($user_id, array(MailNotification::TYPE)); - } - - $this->flash->success(t('User created successfully.')); - $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user_id))); - } else { - $this->flash->failure(t('Unable to create your user.')); - $values['project_id'] = $project_id; - } - } - - $this->create($values, $errors); - } - - /** - * Display user information - * - * @access public - */ - public function show() - { - $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/show', array( - 'user' => $user, - 'timezones' => $this->config->getTimezones(true), - 'languages' => $this->config->getLanguages(true), - ))); - } - - /** - * Display timesheet - * - * @access public - */ - public function timesheet() - { - $user = $this->getUser(); - - $subtask_paginator = $this->paginator - ->setUrl('user', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks')) - ->setMax(20) - ->setOrder('start') - ->setDirection('DESC') - ->setQuery($this->subtaskTimeTracking->getUserQuery($user['id'])) - ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); - - $this->response->html($this->helper->layout->user('user/timesheet', array( - 'subtask_paginator' => $subtask_paginator, - 'user' => $user, - ))); - } - - /** - * Display last password reset - * - * @access public - */ - public function passwordReset() - { - $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/password_reset', array( - 'tokens' => $this->passwordReset->getAll($user['id']), - 'user' => $user, - ))); - } - - /** - * Display last connections - * - * @access public - */ - public function last() - { - $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/last', array( - 'last_logins' => $this->lastLogin->getAll($user['id']), - 'user' => $user, - ))); - } - - /** - * Display user sessions - * - * @access public - */ - public function sessions() - { - $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/sessions', array( - 'sessions' => $this->rememberMeSession->getAll($user['id']), - 'user' => $user, - ))); - } - - /** - * Remove a "RememberMe" token - * - * @access public - */ - public function removeSession() - { - $this->checkCSRFParam(); - $user = $this->getUser(); - $this->rememberMeSession->remove($this->request->getIntegerParam('id')); - $this->response->redirect($this->helper->url->to('user', 'sessions', array('user_id' => $user['id']))); - } - - /** - * Display user notifications - * - * @access public - */ - public function notifications() - { - $user = $this->getUser(); - - if ($this->request->isPost()) { - $values = $this->request->getValues(); - $this->userNotification->saveSettings($user['id'], $values); - $this->flash->success(t('User updated successfully.')); - $this->response->redirect($this->helper->url->to('user', 'notifications', array('user_id' => $user['id']))); - } - - $this->response->html($this->helper->layout->user('user/notifications', array( - 'projects' => $this->projectUserRole->getProjectsByUser($user['id'], array(ProjectModel::ACTIVE)), - 'notifications' => $this->userNotification->readSettings($user['id']), - 'types' => $this->userNotificationType->getTypes(), - 'filters' => $this->userNotificationFilter->getFilters(), - 'user' => $user, - ))); - } - - /** - * Display user integrations - * - * @access public - */ - public function integrations() - { - $user = $this->getUser(); - - if ($this->request->isPost()) { - $values = $this->request->getValues(); - $this->userMetadata->save($user['id'], $values); - $this->flash->success(t('User updated successfully.')); - $this->response->redirect($this->helper->url->to('user', 'integrations', array('user_id' => $user['id']))); - } - - $this->response->html($this->helper->layout->user('user/integrations', array( - 'user' => $user, - 'values' => $this->userMetadata->getall($user['id']), - ))); - } - - /** - * Display external accounts - * - * @access public - */ - public function external() - { - $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/external', array( - 'last_logins' => $this->lastLogin->getAll($user['id']), - 'user' => $user, - ))); - } - - /** - * Public access management - * - * @access public - */ - public function share() - { - $user = $this->getUser(); - $switch = $this->request->getStringParam('switch'); - - if ($switch === 'enable' || $switch === 'disable') { - $this->checkCSRFParam(); - - if ($this->user->{$switch.'PublicAccess'}($user['id'])) { - $this->flash->success(t('User updated successfully.')); - } else { - $this->flash->failure(t('Unable to update this user.')); - } - - $this->response->redirect($this->helper->url->to('user', 'share', array('user_id' => $user['id']))); - } - - $this->response->html($this->helper->layout->user('user/share', array( - 'user' => $user, - 'title' => t('Public access'), - ))); - } - - /** - * Password modification - * - * @access public - */ - public function password() - { - $user = $this->getUser(); - $values = array('id' => $user['id']); - $errors = array(); - - if ($this->request->isPost()) { - $values = $this->request->getValues(); - list($valid, $errors) = $this->userValidator->validatePasswordModification($values); - - if ($valid) { - if ($this->user->update($values)) { - $this->flash->success(t('Password modified successfully.')); - } else { - $this->flash->failure(t('Unable to change the password.')); - } - - $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); - } - } - - $this->response->html($this->helper->layout->user('user/password', array( - 'values' => $values, - 'errors' => $errors, - 'user' => $user, - ))); - } - - /** - * Display a form to edit a user - * - * @access public - */ - public function edit() - { - $user = $this->getUser(); - $values = $user; - $errors = array(); - - unset($values['password']); - - if ($this->request->isPost()) { - $values = $this->request->getValues(); - - if (! $this->userSession->isAdmin()) { - if (isset($values['role'])) { - unset($values['role']); - } - } - - list($valid, $errors) = $this->userValidator->validateModification($values); - - if ($valid) { - if ($this->user->update($values)) { - $this->flash->success(t('User updated successfully.')); - } else { - $this->flash->failure(t('Unable to update your user.')); - } - - $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); - } - } - - $this->response->html($this->helper->layout->user('user/edit', array( - 'values' => $values, - 'errors' => $errors, - 'user' => $user, - 'timezones' => $this->config->getTimezones(true), - 'languages' => $this->config->getLanguages(true), - 'roles' => $this->role->getApplicationRoles(), - ))); - } - - /** - * Display a form to edit authentication - * - * @access public - */ - public function authentication() - { - $user = $this->getUser(); - $values = $user; - $errors = array(); - - unset($values['password']); - - if ($this->request->isPost()) { - $values = $this->request->getValues() + array('disable_login_form' => 0, 'is_ldap_user' => 0); - list($valid, $errors) = $this->userValidator->validateModification($values); - - if ($valid) { - if ($this->user->update($values)) { - $this->flash->success(t('User updated successfully.')); - } else { - $this->flash->failure(t('Unable to update your user.')); - } - - $this->response->redirect($this->helper->url->to('user', 'authentication', array('user_id' => $user['id']))); - } - } - - $this->response->html($this->helper->layout->user('user/authentication', array( - 'values' => $values, - 'errors' => $errors, - 'user' => $user, - ))); - } -} diff --git a/sources/app/Controller/UserAjaxController.php b/sources/app/Controller/UserAjaxController.php new file mode 100644 index 0000000..ed18047 --- /dev/null +++ b/sources/app/Controller/UserAjaxController.php @@ -0,0 +1,52 @@ +request->getStringParam('term'); + $filter = $this->userQuery->withFilter(new UserNameFilter($search)); + $filter->getQuery()->asc(UserModel::TABLE.'.name')->asc(UserModel::TABLE.'.username'); + $this->response->json($filter->format(new UserAutoCompleteFormatter($this->container))); + } + + /** + * User mention auto-completion (Ajax) + * + * @access public + */ + public function mention() + { + $project_id = $this->request->getStringParam('project_id'); + $query = $this->request->getStringParam('q'); + $users = $this->projectPermissionModel->findUsernames($project_id, $query); + $this->response->json($users); + } + + /** + * Check if the user is connected + * + * @access public + */ + public function status() + { + $this->response->text('OK'); + } +} diff --git a/sources/app/Controller/UserCreationController.php b/sources/app/Controller/UserCreationController.php new file mode 100644 index 0000000..9c873f8 --- /dev/null +++ b/sources/app/Controller/UserCreationController.php @@ -0,0 +1,83 @@ +request->getIntegerParam('remote') == 1 || (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1); + $template = $isRemote ? 'user_creation/remote' : 'user_creation/local'; + + $this->response->html($this->template->render($template, array( + 'timezones' => $this->timezoneModel->getTimezones(true), + 'languages' => $this->languageModel->getLanguages(true), + 'roles' => $this->role->getApplicationRoles(), + 'projects' => $this->projectModel->getList(), + 'errors' => $errors, + 'values' => $values + array('role' => Role::APP_USER), + ))); + } + + /** + * Validate and save a new user + * + * @access public + */ + public function save() + { + $values = $this->request->getValues(); + list($valid, $errors) = $this->userValidator->validateCreation($values); + + if ($valid) { + $this->createUser($values); + } else { + $this->show($values, $errors); + } + } + + /** + * Create user + * + * @param array $values + */ + private function createUser(array $values) + { + $project_id = empty($values['project_id']) ? 0 : $values['project_id']; + unset($values['project_id']); + + $user_id = $this->userModel->create($values); + + if ($user_id !== false) { + if ($project_id !== 0) { + $this->projectUserRoleModel->addUser($project_id, $user_id, Role::PROJECT_MEMBER); + } + + if (! empty($values['notifications_enabled'])) { + $this->userNotificationTypeModel->saveSelectedTypes($user_id, array(MailNotification::TYPE)); + } + + $this->flash->success(t('User created successfully.')); + $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user_id))); + } else { + $this->flash->failure(t('Unable to create your user.')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); + } + } +} diff --git a/sources/app/Controller/UserCredentialController.php b/sources/app/Controller/UserCredentialController.php new file mode 100644 index 0000000..4021dc3 --- /dev/null +++ b/sources/app/Controller/UserCredentialController.php @@ -0,0 +1,109 @@ +getUser(); + + return $this->response->html($this->helper->layout->user('user_credential/password', array( + 'values' => $values + array('id' => $user['id']), + 'errors' => $errors, + 'user' => $user, + ))); + } + + /** + * Save new password + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function savePassword() + { + $user = $this->getUser(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->userValidator->validatePasswordModification($values); + + if ($valid) { + if ($this->userModel->update($values)) { + $this->flash->success(t('Password modified successfully.')); + $this->userLockingModel->resetFailedLogin($user['username']); + } else { + $this->flash->failure(t('Unable to change the password.')); + } + + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); + } + + return $this->changePassword($values, $errors); + } + + /** + * Display a form to edit authentication + * + * @access public + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function changeAuthentication(array $values = array(), array $errors = array()) + { + $user = $this->getUser(); + + if (empty($values)) { + $values = $user; + unset($values['password']); + } + + return $this->response->html($this->helper->layout->user('user_credential/authentication', array( + 'values' => $values, + 'errors' => $errors, + 'user' => $user, + ))); + } + + /** + * Save authentication + * + * @throws \Kanboard\Core\Controller\AccessForbiddenException + * @throws \Kanboard\Core\Controller\PageNotFoundException + */ + public function saveAuthentication() + { + $user = $this->getUser(); + $values = $this->request->getValues() + array('disable_login_form' => 0, 'is_ldap_user' => 0); + list($valid, $errors) = $this->userValidator->validateModification($values); + + if ($valid) { + if ($this->userModel->update($values)) { + $this->flash->success(t('User updated successfully.')); + } else { + $this->flash->failure(t('Unable to update your user.')); + } + + return $this->response->redirect($this->helper->url->to('UserCredentialController', 'changeAuthentication', array('user_id' => $user['id']))); + } + + return $this->changeAuthentication($values, $errors); + } +} diff --git a/sources/app/Controller/UserHelper.php b/sources/app/Controller/UserHelper.php deleted file mode 100644 index 041ed2c..0000000 --- a/sources/app/Controller/UserHelper.php +++ /dev/null @@ -1,37 +0,0 @@ -request->getStringParam('term'); - $users = $this->userFilterAutoCompleteFormatter->create($search)->filterByUsernameOrByName()->format(); - $this->response->json($users); - } - - /** - * User mention autocompletion (Ajax) - * - * @access public - */ - public function mention() - { - $project_id = $this->request->getStringParam('project_id'); - $query = $this->request->getStringParam('q'); - $users = $this->projectPermission->findUsernames($project_id, $query); - $this->response->json($users); - } -} diff --git a/sources/app/Controller/UserImport.php b/sources/app/Controller/UserImportController.php similarity index 61% rename from sources/app/Controller/UserImport.php rename to sources/app/Controller/UserImportController.php index debd69e..fec9a31 100644 --- a/sources/app/Controller/UserImport.php +++ b/sources/app/Controller/UserImportController.php @@ -7,40 +7,63 @@ use Kanboard\Core\Csv; /** * User Import controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class UserImport extends Base +class UserImportController extends BaseController { /** * Upload the file and ask settings * + * @param array $values + * @param array $errors */ - public function step1(array $values = array(), array $errors = array()) + public function show(array $values = array(), array $errors = array()) { - $this->response->html($this->helper->layout->app('user_import/step1', array( + $this->response->html($this->template->render('user_import/show', array( 'values' => $values, 'errors' => $errors, 'max_size' => ini_get('upload_max_filesize'), 'delimiters' => Csv::getDelimiters(), 'enclosures' => Csv::getEnclosures(), - 'title' => t('Import users from CSV file'), ))); } /** - * Process CSV file - * + * Submit form */ - public function step2() + public function save() { $values = $this->request->getValues(); $filename = $this->request->getFilePath('file'); if (! file_exists($filename)) { - $this->step1($values, array('file' => array(t('Unable to read your file')))); + $this->flash->failure(t('Unable to read your file')); + } else { + $this->importFile($values, $filename); } + $this->response->redirect($this->helper->url->to('UserListController', 'show')); + } + + /** + * Generate template + * + */ + public function template() + { + $this->response->withFileDownload('users.csv'); + $this->response->csv(array($this->userImport->getColumnMapping())); + } + + /** + * Process file + * + * @param array $values + * @param $filename + */ + private function importFile(array $values, $filename) + { $csv = new Csv($values['delimiter'], $values['enclosure']); $csv->setColumnMapping($this->userImport->getColumnMapping()); $csv->read($filename, array($this->userImport, 'import')); @@ -50,17 +73,5 @@ class UserImport extends Base } else { $this->flash->failure(t('Nothing have been imported!')); } - - $this->response->redirect($this->helper->url->to('userImport', 'step1')); - } - - /** - * Generate template - * - */ - public function template() - { - $this->response->forceDownload('users.csv'); - $this->response->csv(array($this->userImport->getColumnMapping())); } } diff --git a/sources/app/Controller/UserListController.php b/sources/app/Controller/UserListController.php new file mode 100644 index 0000000..31fcdd4 --- /dev/null +++ b/sources/app/Controller/UserListController.php @@ -0,0 +1,32 @@ +paginator + ->setUrl('UserListController', 'show') + ->setMax(30) + ->setOrder('username') + ->setQuery($this->userModel->getQuery()) + ->calculate(); + + $this->response->html($this->helper->layout->app('user_list/show', array( + 'title' => t('Users').' ('.$paginator->getTotal().')', + 'paginator' => $paginator, + ))); + } +} diff --git a/sources/app/Controller/UserModificationController.php b/sources/app/Controller/UserModificationController.php new file mode 100644 index 0000000..d339fd9 --- /dev/null +++ b/sources/app/Controller/UserModificationController.php @@ -0,0 +1,69 @@ +getUser(); + + if (empty($values)) { + $values = $user; + unset($values['password']); + } + + return $this->response->html($this->helper->layout->user('user_modification/show', array( + 'values' => $values, + 'errors' => $errors, + 'user' => $user, + 'timezones' => $this->timezoneModel->getTimezones(true), + 'languages' => $this->languageModel->getLanguages(true), + 'roles' => $this->role->getApplicationRoles(), + ))); + } + + /** + * Save user information + */ + public function save() + { + $user = $this->getUser(); + $values = $this->request->getValues(); + + if (! $this->userSession->isAdmin()) { + if (isset($values['role'])) { + unset($values['role']); + } + } + + list($valid, $errors) = $this->userValidator->validateModification($values); + + if ($valid) { + if ($this->userModel->update($values)) { + $this->flash->success(t('User updated successfully.')); + } else { + $this->flash->failure(t('Unable to update your user.')); + } + + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); + } + + return $this->show($values, $errors); + } +} diff --git a/sources/app/Controller/UserStatus.php b/sources/app/Controller/UserStatusController.php similarity index 79% rename from sources/app/Controller/UserStatus.php rename to sources/app/Controller/UserStatusController.php index b8ee5c9..070fb6f 100644 --- a/sources/app/Controller/UserStatus.php +++ b/sources/app/Controller/UserStatusController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * User Status Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class UserStatus extends Base +class UserStatusController extends BaseController { /** * Confirm remove a user @@ -34,13 +34,13 @@ class UserStatus extends Base $user = $this->getUser(); $this->checkCSRFParam(); - if ($this->user->remove($user['id'])) { + if ($this->userModel->remove($user['id'])) { $this->flash->success(t('User removed successfully.')); } else { $this->flash->failure(t('Unable to remove this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } /** @@ -67,13 +67,13 @@ class UserStatus extends Base $user = $this->getUser(); $this->checkCSRFParam(); - if ($this->user->enable($user['id'])) { + if ($this->userModel->enable($user['id'])) { $this->flash->success(t('User activated successfully.')); } else { $this->flash->failure(t('Unable to enable this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } /** @@ -100,12 +100,12 @@ class UserStatus extends Base $user = $this->getUser(); $this->checkCSRFParam(); - if ($this->user->disable($user['id'])) { + if ($this->userModel->disable($user['id'])) { $this->flash->success(t('User disabled successfully.')); } else { $this->flash->failure(t('Unable to disable this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } } diff --git a/sources/app/Controller/UserViewController.php b/sources/app/Controller/UserViewController.php new file mode 100644 index 0000000..a73c5c5 --- /dev/null +++ b/sources/app/Controller/UserViewController.php @@ -0,0 +1,217 @@ +userModel->getById($this->request->getIntegerParam('user_id')); + + if (empty($user)) { + throw new PageNotFoundException(); + } + + $this->response->html($this->helper->layout->app('user_view/profile', array( + 'title' => $user['name'] ?: $user['username'], + 'user' => $user, + ))); + } + + /** + * Display user information + * + * @access public + */ + public function show() + { + $user = $this->getUser(); + $this->response->html($this->helper->layout->user('user_view/show', array( + 'user' => $user, + 'timezones' => $this->timezoneModel->getTimezones(true), + 'languages' => $this->languageModel->getLanguages(true), + ))); + } + + /** + * Display timesheet + * + * @access public + */ + public function timesheet() + { + $user = $this->getUser(); + + $subtask_paginator = $this->paginator + ->setUrl('UserViewController', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks')) + ->setMax(20) + ->setOrder('start') + ->setDirection('DESC') + ->setQuery($this->subtaskTimeTrackingModel->getUserQuery($user['id'])) + ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); + + $this->response->html($this->helper->layout->user('user_view/timesheet', array( + 'subtask_paginator' => $subtask_paginator, + 'user' => $user, + ))); + } + + /** + * Display last password reset + * + * @access public + */ + public function passwordReset() + { + $user = $this->getUser(); + $this->response->html($this->helper->layout->user('user_view/password_reset', array( + 'tokens' => $this->passwordResetModel->getAll($user['id']), + 'user' => $user, + ))); + } + + /** + * Display last connections + * + * @access public + */ + public function lastLogin() + { + $user = $this->getUser(); + $this->response->html($this->helper->layout->user('user_view/last', array( + 'last_logins' => $this->lastLoginModel->getAll($user['id']), + 'user' => $user, + ))); + } + + /** + * Display user sessions + * + * @access public + */ + public function sessions() + { + $user = $this->getUser(); + $this->response->html($this->helper->layout->user('user_view/sessions', array( + 'sessions' => $this->rememberMeSessionModel->getAll($user['id']), + 'user' => $user, + ))); + } + + /** + * Remove a "RememberMe" token + * + * @access public + */ + public function removeSession() + { + $this->checkCSRFParam(); + $user = $this->getUser(); + $this->rememberMeSessionModel->remove($this->request->getIntegerParam('id')); + $this->response->redirect($this->helper->url->to('UserViewController', 'sessions', array('user_id' => $user['id']))); + } + + /** + * Display user notifications + * + * @access public + */ + public function notifications() + { + $user = $this->getUser(); + + if ($this->request->isPost()) { + $values = $this->request->getValues(); + $this->userNotificationModel->saveSettings($user['id'], $values); + $this->flash->success(t('User updated successfully.')); + return $this->response->redirect($this->helper->url->to('UserViewController', 'notifications', array('user_id' => $user['id']))); + } + + return $this->response->html($this->helper->layout->user('user_view/notifications', array( + 'projects' => $this->projectUserRoleModel->getProjectsByUser($user['id'], array(ProjectModel::ACTIVE)), + 'notifications' => $this->userNotificationModel->readSettings($user['id']), + 'types' => $this->userNotificationTypeModel->getTypes(), + 'filters' => $this->userNotificationFilterModel->getFilters(), + 'user' => $user, + ))); + } + + /** + * Display user integrations + * + * @access public + */ + public function integrations() + { + $user = $this->getUser(); + + if ($this->request->isPost()) { + $values = $this->request->getValues(); + $this->userMetadataModel->save($user['id'], $values); + $this->flash->success(t('User updated successfully.')); + $this->response->redirect($this->helper->url->to('UserViewController', 'integrations', array('user_id' => $user['id']))); + } + + $this->response->html($this->helper->layout->user('user_view/integrations', array( + 'user' => $user, + 'values' => $this->userMetadataModel->getAll($user['id']), + ))); + } + + /** + * Display external accounts + * + * @access public + */ + public function external() + { + $user = $this->getUser(); + $this->response->html($this->helper->layout->user('user_view/external', array( + 'last_logins' => $this->lastLoginModel->getAll($user['id']), + 'user' => $user, + ))); + } + + /** + * Public access management + * + * @access public + */ + public function share() + { + $user = $this->getUser(); + $switch = $this->request->getStringParam('switch'); + + if ($switch === 'enable' || $switch === 'disable') { + $this->checkCSRFParam(); + + if ($this->userModel->{$switch . 'PublicAccess'}($user['id'])) { + $this->flash->success(t('User updated successfully.')); + } else { + $this->flash->failure(t('Unable to update this user.')); + } + + return $this->response->redirect($this->helper->url->to('UserViewController', 'share', array('user_id' => $user['id']))); + } + + return $this->response->html($this->helper->layout->user('user_view/share', array( + 'user' => $user, + 'title' => t('Public access'), + ))); + } +} diff --git a/sources/app/Controller/WebNotification.php b/sources/app/Controller/WebNotification.php deleted file mode 100644 index dca5cb4..0000000 --- a/sources/app/Controller/WebNotification.php +++ /dev/null @@ -1,50 +0,0 @@ -getUserId(); - - $this->userUnreadNotification->markAllAsRead($user_id); - $this->response->redirect($this->helper->url->to('app', 'notifications', array('user_id' => $user_id))); - } - - /** - * Mark a notification as read - * - * @access public - */ - public function remove() - { - $user_id = $this->getUserId(); - $notification_id = $this->request->getIntegerParam('notification_id'); - - $this->userUnreadNotification->markAsRead($user_id, $notification_id); - $this->response->redirect($this->helper->url->to('app', 'notifications', array('user_id' => $user_id))); - } - - private function getUserId() - { - $user_id = $this->request->getIntegerParam('user_id'); - - if (! $this->userSession->isAdmin() && $user_id != $this->userSession->getId()) { - $user_id = $this->userSession->getId(); - } - - return $user_id; - } -} diff --git a/sources/app/Controller/WebNotificationController.php b/sources/app/Controller/WebNotificationController.php new file mode 100644 index 0000000..30e317f --- /dev/null +++ b/sources/app/Controller/WebNotificationController.php @@ -0,0 +1,79 @@ +getUserId(); + + $this->userUnreadNotificationModel->markAllAsRead($user_id); + $this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id))); + } + + /** + * Mark a notification as read + * + * @access public + */ + public function remove() + { + $user_id = $this->getUserId(); + $notification_id = $this->request->getIntegerParam('notification_id'); + + $this->userUnreadNotificationModel->markAsRead($user_id, $notification_id); + $this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id))); + } + + /** + * Redirect to the task and mark notification as read + */ + public function redirect() + { + $user_id = $this->getUserId(); + $notification_id = $this->request->getIntegerParam('notification_id'); + + $notification = $this->userUnreadNotificationModel->getById($notification_id); + $this->userUnreadNotificationModel->markAsRead($user_id, $notification_id); + + if (empty($notification)) { + $this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id))); + } elseif ($this->helper->text->contains($notification['event_name'], 'comment')) { + $this->response->redirect($this->helper->url->to( + 'TaskViewController', + 'show', + array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data'])), + 'comment-'.$notification['event_data']['comment']['id'] + )); + } else { + $this->response->redirect($this->helper->url->to( + 'TaskViewController', + 'show', + array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data'])) + )); + } + } + + private function getUserId() + { + $user_id = $this->request->getIntegerParam('user_id'); + + if (! $this->userSession->isAdmin() && $user_id != $this->userSession->getId()) { + $user_id = $this->userSession->getId(); + } + + return $user_id; + } +} diff --git a/sources/app/Controller/Webhook.php b/sources/app/Controller/Webhook.php deleted file mode 100644 index 0eafe3e..0000000 --- a/sources/app/Controller/Webhook.php +++ /dev/null @@ -1,42 +0,0 @@ -checkWebhookToken(); - - $defaultProject = $this->project->getFirst(); - - $values = array( - 'title' => $this->request->getStringParam('title'), - 'description' => $this->request->getStringParam('description'), - 'color_id' => $this->request->getStringParam('color_id'), - 'project_id' => $this->request->getIntegerParam('project_id', $defaultProject['id']), - 'owner_id' => $this->request->getIntegerParam('owner_id'), - 'column_id' => $this->request->getIntegerParam('column_id'), - 'category_id' => $this->request->getIntegerParam('category_id'), - ); - - list($valid, ) = $this->taskValidator->validateCreation($values); - - if ($valid && $this->taskCreation->create($values)) { - $this->response->text('OK'); - } - - $this->response->text('FAILED'); - } -} diff --git a/sources/app/Core/Action/ActionManager.php b/sources/app/Core/Action/ActionManager.php index f1ea8ab..1dfd820 100644 --- a/sources/app/Core/Action/ActionManager.php +++ b/sources/app/Core/Action/ActionManager.php @@ -18,7 +18,7 @@ class ActionManager extends Base * List of automatic actions * * @access private - * @var array + * @var ActionBase[] */ private $actions = array(); @@ -121,9 +121,9 @@ class ActionManager extends Base public function attachEvents() { if ($this->userSession->isLogged()) { - $actions = $this->action->getAllByUser($this->userSession->getId()); + $actions = $this->actionModel->getAllByUser($this->userSession->getId()); } else { - $actions = $this->action->getAll(); + $actions = $this->actionModel->getAll(); } foreach ($actions as $action) { diff --git a/sources/app/Core/Base.php b/sources/app/Core/Base.php index 74573e9..8103ec1 100644 --- a/sources/app/Core/Base.php +++ b/sources/app/Core/Base.php @@ -10,136 +10,151 @@ use Pimple\Container; * @package core * @author Frederic Guillot * - * @property \Kanboard\Analytic\TaskDistributionAnalytic $taskDistributionAnalytic - * @property \Kanboard\Analytic\UserDistributionAnalytic $userDistributionAnalytic - * @property \Kanboard\Analytic\EstimatedTimeComparisonAnalytic $estimatedTimeComparisonAnalytic - * @property \Kanboard\Analytic\AverageLeadCycleTimeAnalytic $averageLeadCycleTimeAnalytic - * @property \Kanboard\Analytic\AverageTimeSpentColumnAnalytic $averageTimeSpentColumnAnalytic - * @property \Kanboard\Core\Action\ActionManager $actionManager - * @property \Kanboard\Core\ExternalLink\ExternalLinkManager $externalLinkManager - * @property \Kanboard\Core\Cache\MemoryCache $memoryCache - * @property \Kanboard\Core\Event\EventManager $eventManager - * @property \Kanboard\Core\Group\GroupManager $groupManager - * @property \Kanboard\Core\Http\Client $httpClient - * @property \Kanboard\Core\Http\OAuth2 $oauth - * @property \Kanboard\Core\Http\RememberMeCookie $rememberMeCookie - * @property \Kanboard\Core\Http\Request $request - * @property \Kanboard\Core\Http\Response $response - * @property \Kanboard\Core\Http\Router $router - * @property \Kanboard\Core\Http\Route $route - * @property \Kanboard\Core\Mail\Client $emailClient - * @property \Kanboard\Core\ObjectStorage\ObjectStorageInterface $objectStorage - * @property \Kanboard\Core\Plugin\Hook $hook - * @property \Kanboard\Core\Plugin\Loader $pluginLoader - * @property \Kanboard\Core\Security\AuthenticationManager $authenticationManager - * @property \Kanboard\Core\Security\AccessMap $applicationAccessMap - * @property \Kanboard\Core\Security\AccessMap $projectAccessMap - * @property \Kanboard\Core\Security\Authorization $applicationAuthorization - * @property \Kanboard\Core\Security\Authorization $projectAuthorization - * @property \Kanboard\Core\Security\Role $role - * @property \Kanboard\Core\Security\Token $token - * @property \Kanboard\Core\Session\FlashMessage $flash - * @property \Kanboard\Core\Session\SessionManager $sessionManager - * @property \Kanboard\Core\Session\SessionStorage $sessionStorage - * @property \Kanboard\Core\User\Avatar\AvatarManager $avatarManager - * @property \Kanboard\Core\User\GroupSync $groupSync - * @property \Kanboard\Core\User\UserProfile $userProfile - * @property \Kanboard\Core\User\UserSync $userSync - * @property \Kanboard\Core\User\UserSession $userSession - * @property \Kanboard\Core\DateParser $dateParser - * @property \Kanboard\Core\Helper $helper - * @property \Kanboard\Core\Lexer $lexer - * @property \Kanboard\Core\Paginator $paginator - * @property \Kanboard\Core\Template $template - * @property \Kanboard\Formatter\ProjectGanttFormatter $projectGanttFormatter - * @property \Kanboard\Formatter\TaskFilterGanttFormatter $taskFilterGanttFormatter - * @property \Kanboard\Formatter\TaskFilterAutoCompleteFormatter $taskFilterAutoCompleteFormatter - * @property \Kanboard\Formatter\TaskFilterCalendarFormatter $taskFilterCalendarFormatter - * @property \Kanboard\Formatter\TaskFilterICalendarFormatter $taskFilterICalendarFormatter - * @property \Kanboard\Formatter\UserFilterAutoCompleteFormatter $userFilterAutoCompleteFormatter - * @property \Kanboard\Formatter\GroupAutoCompleteFormatter $groupAutoCompleteFormatter - * @property \Kanboard\Model\Action $action - * @property \Kanboard\Model\ActionParameter $actionParameter - * @property \Kanboard\Model\AvatarFile $avatarFile - * @property \Kanboard\Model\Board $board - * @property \Kanboard\Model\Category $category - * @property \Kanboard\Model\Color $color - * @property \Kanboard\Model\Column $column - * @property \Kanboard\Model\Comment $comment - * @property \Kanboard\Model\Config $config - * @property \Kanboard\Model\Currency $currency - * @property \Kanboard\Model\CustomFilter $customFilter - * @property \Kanboard\Model\TaskFile $taskFile - * @property \Kanboard\Model\ProjectFile $projectFile - * @property \Kanboard\Model\Group $group - * @property \Kanboard\Model\GroupMember $groupMember - * @property \Kanboard\Model\LastLogin $lastLogin - * @property \Kanboard\Model\Link $link - * @property \Kanboard\Model\Notification $notification - * @property \Kanboard\Model\PasswordReset $passwordReset - * @property \Kanboard\Model\Project $project - * @property \Kanboard\Model\ProjectActivity $projectActivity - * @property \Kanboard\Model\ProjectDuplication $projectDuplication - * @property \Kanboard\Model\ProjectDailyColumnStats $projectDailyColumnStats - * @property \Kanboard\Model\ProjectDailyStats $projectDailyStats - * @property \Kanboard\Model\ProjectMetadata $projectMetadata - * @property \Kanboard\Model\ProjectPermission $projectPermission - * @property \Kanboard\Model\ProjectUserRole $projectUserRole - * @property \Kanboard\Model\projectUserRoleFilter $projectUserRoleFilter - * @property \Kanboard\Model\ProjectGroupRole $projectGroupRole - * @property \Kanboard\Model\ProjectNotification $projectNotification - * @property \Kanboard\Model\ProjectNotificationType $projectNotificationType - * @property \Kanboard\Model\RememberMeSession $rememberMeSession - * @property \Kanboard\Model\Subtask $subtask - * @property \Kanboard\Model\SubtaskTimeTracking $subtaskTimeTracking - * @property \Kanboard\Model\Swimlane $swimlane - * @property \Kanboard\Model\Task $task - * @property \Kanboard\Model\TaskAnalytic $taskAnalytic - * @property \Kanboard\Model\TaskCreation $taskCreation - * @property \Kanboard\Model\TaskDuplication $taskDuplication - * @property \Kanboard\Model\TaskExternalLink $taskExternalLink - * @property \Kanboard\Model\TaskFinder $taskFinder - * @property \Kanboard\Model\TaskFilter $taskFilter - * @property \Kanboard\Model\TaskLink $taskLink - * @property \Kanboard\Model\TaskModification $taskModification - * @property \Kanboard\Model\TaskPermission $taskPermission - * @property \Kanboard\Model\TaskPosition $taskPosition - * @property \Kanboard\Model\TaskStatus $taskStatus - * @property \Kanboard\Model\TaskMetadata $taskMetadata - * @property \Kanboard\Model\Transition $transition - * @property \Kanboard\Model\User $user - * @property \Kanboard\Model\UserLocking $userLocking - * @property \Kanboard\Model\UserMention $userMention - * @property \Kanboard\Model\UserNotification $userNotification - * @property \Kanboard\Model\UserNotificationType $userNotificationType - * @property \Kanboard\Model\UserNotificationFilter $userNotificationFilter - * @property \Kanboard\Model\UserUnreadNotification $userUnreadNotification - * @property \Kanboard\Model\UserMetadata $userMetadata - * @property \Kanboard\Validator\ActionValidator $actionValidator - * @property \Kanboard\Validator\AuthValidator $authValidator - * @property \Kanboard\Validator\ColumnValidator $columnValidator - * @property \Kanboard\Validator\CategoryValidator $categoryValidator - * @property \Kanboard\Validator\CommentValidator $commentValidator - * @property \Kanboard\Validator\CurrencyValidator $currencyValidator - * @property \Kanboard\Validator\CustomFilterValidator $customFilterValidator - * @property \Kanboard\Validator\GroupValidator $groupValidator - * @property \Kanboard\Validator\LinkValidator $linkValidator - * @property \Kanboard\Validator\PasswordResetValidator $passwordResetValidator - * @property \Kanboard\Validator\ProjectValidator $projectValidator - * @property \Kanboard\Validator\SubtaskValidator $subtaskValidator - * @property \Kanboard\Validator\SwimlaneValidator $swimlaneValidator - * @property \Kanboard\Validator\TaskLinkValidator $taskLinkValidator - * @property \Kanboard\Validator\ExternalLinkValidator $externalLinkValidator - * @property \Kanboard\Validator\TaskValidator $taskValidator - * @property \Kanboard\Validator\UserValidator $userValidator - * @property \Kanboard\Import\TaskImport $taskImport - * @property \Kanboard\Import\UserImport $userImport - * @property \Kanboard\Export\SubtaskExport $subtaskExport - * @property \Kanboard\Export\TaskExport $taskExport - * @property \Kanboard\Export\TransitionExport $transitionExport - * @property \Psr\Log\LoggerInterface $logger - * @property \PicoDb\Database $db - * @property \Symfony\Component\EventDispatcher\EventDispatcher $dispatcher + * @property \Kanboard\Analytic\TaskDistributionAnalytic $taskDistributionAnalytic + * @property \Kanboard\Analytic\UserDistributionAnalytic $userDistributionAnalytic + * @property \Kanboard\Analytic\EstimatedTimeComparisonAnalytic $estimatedTimeComparisonAnalytic + * @property \Kanboard\Analytic\AverageLeadCycleTimeAnalytic $averageLeadCycleTimeAnalytic + * @property \Kanboard\Analytic\AverageTimeSpentColumnAnalytic $averageTimeSpentColumnAnalytic + * @property \Kanboard\Core\Action\ActionManager $actionManager + * @property \Kanboard\Core\ExternalLink\ExternalLinkManager $externalLinkManager + * @property \Kanboard\Core\Cache\MemoryCache $memoryCache + * @property \Kanboard\Core\Event\EventManager $eventManager + * @property \Kanboard\Core\Group\GroupManager $groupManager + * @property \Kanboard\Core\Http\Client $httpClient + * @property \Kanboard\Core\Http\OAuth2 $oauth + * @property \Kanboard\Core\Http\RememberMeCookie $rememberMeCookie + * @property \Kanboard\Core\Http\Request $request + * @property \Kanboard\Core\Http\Response $response + * @property \Kanboard\Core\Http\Router $router + * @property \Kanboard\Core\Http\Route $route + * @property \Kanboard\Core\Queue\QueueManager $queueManager + * @property \Kanboard\Core\Mail\Client $emailClient + * @property \Kanboard\Core\ObjectStorage\ObjectStorageInterface $objectStorage + * @property \Kanboard\Core\Plugin\Hook $hook + * @property \Kanboard\Core\Plugin\Loader $pluginLoader + * @property \Kanboard\Core\Security\AuthenticationManager $authenticationManager + * @property \Kanboard\Core\Security\AccessMap $applicationAccessMap + * @property \Kanboard\Core\Security\AccessMap $projectAccessMap + * @property \Kanboard\Core\Security\AccessMap $apiAccessMap + * @property \Kanboard\Core\Security\AccessMap $apiProjectAccessMap + * @property \Kanboard\Core\Security\Authorization $applicationAuthorization + * @property \Kanboard\Core\Security\Authorization $projectAuthorization + * @property \Kanboard\Core\Security\Authorization $apiAuthorization + * @property \Kanboard\Core\Security\Authorization $apiProjectAuthorization + * @property \Kanboard\Core\Security\Role $role + * @property \Kanboard\Core\Security\Token $token + * @property \Kanboard\Core\Session\FlashMessage $flash + * @property \Kanboard\Core\Session\SessionManager $sessionManager + * @property \Kanboard\Core\Session\SessionStorage $sessionStorage + * @property \Kanboard\Core\User\Avatar\AvatarManager $avatarManager + * @property \Kanboard\Core\User\GroupSync $groupSync + * @property \Kanboard\Core\User\UserProfile $userProfile + * @property \Kanboard\Core\User\UserSync $userSync + * @property \Kanboard\Core\User\UserSession $userSession + * @property \Kanboard\Core\DateParser $dateParser + * @property \Kanboard\Core\Helper $helper + * @property \Kanboard\Core\Paginator $paginator + * @property \Kanboard\Core\Template $template + * @property \Kanboard\Model\ActionModel $actionModel + * @property \Kanboard\Model\ActionParameterModel $actionParameterModel + * @property \Kanboard\Model\AvatarFileModel $avatarFileModel + * @property \Kanboard\Model\BoardModel $boardModel + * @property \Kanboard\Model\CategoryModel $categoryModel + * @property \Kanboard\Model\ColorModel $colorModel + * @property \Kanboard\Model\ColumnModel $columnModel + * @property \Kanboard\Model\CommentModel $commentModel + * @property \Kanboard\Model\ConfigModel $configModel + * @property \Kanboard\Model\CurrencyModel $currencyModel + * @property \Kanboard\Model\CustomFilterModel $customFilterModel + * @property \Kanboard\Model\TaskFileModel $taskFileModel + * @property \Kanboard\Model\ProjectFileModel $projectFileModel + * @property \Kanboard\Model\GroupModel $groupModel + * @property \Kanboard\Model\GroupMemberModel $groupMemberModel + * @property \Kanboard\Model\LanguageModel $languageModel + * @property \Kanboard\Model\LastLoginModel $lastLoginModel + * @property \Kanboard\Model\LinkModel $linkModel + * @property \Kanboard\Model\NotificationModel $notificationModel + * @property \Kanboard\Model\PasswordResetModel $passwordResetModel + * @property \Kanboard\Model\ProjectModel $projectModel + * @property \Kanboard\Model\ProjectActivityModel $projectActivityModel + * @property \Kanboard\Model\ProjectDuplicationModel $projectDuplicationModel + * @property \Kanboard\Model\ProjectDailyColumnStatsModel $projectDailyColumnStatsModel + * @property \Kanboard\Model\ProjectDailyStatsModel $projectDailyStatsModel + * @property \Kanboard\Model\ProjectMetadataModel $projectMetadataModel + * @property \Kanboard\Model\ProjectPermissionModel $projectPermissionModel + * @property \Kanboard\Model\ProjectUserRoleModel $projectUserRoleModel + * @property \Kanboard\Model\ProjectGroupRoleModel $projectGroupRoleModel + * @property \Kanboard\Model\ProjectNotificationModel $projectNotificationModel + * @property \Kanboard\Model\ProjectNotificationTypeModel $projectNotificationTypeModel + * @property \Kanboard\Model\ProjectTaskDuplicationModel $projectTaskDuplicationModel + * @property \Kanboard\Model\ProjectTaskPriorityModel $projectTaskPriorityModel + * @property \Kanboard\Model\RememberMeSessionModel $rememberMeSessionModel + * @property \Kanboard\Model\SubtaskModel $subtaskModel + * @property \Kanboard\Model\SubtaskTimeTrackingModel $subtaskTimeTrackingModel + * @property \Kanboard\Model\SwimlaneModel $swimlaneModel + * @property \Kanboard\Model\TagDuplicationModel $tagDuplicationModel + * @property \Kanboard\Model\TagModel $tagModel + * @property \Kanboard\Model\TaskModel $taskModel + * @property \Kanboard\Model\TaskAnalyticModel $taskAnalyticModel + * @property \Kanboard\Model\TaskCreationModel $taskCreationModel + * @property \Kanboard\Model\TaskDuplicationModel $taskDuplicationModel + * @property \Kanboard\Model\TaskProjectDuplicationModel $taskProjectDuplicationModel + * @property \Kanboard\Model\TaskProjectMoveModel $taskProjectMoveModel + * @property \Kanboard\Model\TaskRecurrenceModel $taskRecurrenceModel + * @property \Kanboard\Model\TaskExternalLinkModel $taskExternalLinkModel + * @property \Kanboard\Model\TaskFinderModel $taskFinderModel + * @property \Kanboard\Model\TaskLinkModel $taskLinkModel + * @property \Kanboard\Model\TaskModificationModel $taskModificationModel + * @property \Kanboard\Model\TaskPositionModel $taskPositionModel + * @property \Kanboard\Model\TaskStatusModel $taskStatusModel + * @property \Kanboard\Model\TaskTagModel $taskTagModel + * @property \Kanboard\Model\TaskMetadataModel $taskMetadataModel + * @property \Kanboard\Model\TimezoneModel $timezoneModel + * @property \Kanboard\Model\TransitionModel $transitionModel + * @property \Kanboard\Model\UserModel $userModel + * @property \Kanboard\Model\UserLockingModel $userLockingModel + * @property \Kanboard\Model\UserMentionModel $userMentionModel + * @property \Kanboard\Model\UserNotificationModel $userNotificationModel + * @property \Kanboard\Model\UserNotificationTypeModel $userNotificationTypeModel + * @property \Kanboard\Model\UserNotificationFilterModel $userNotificationFilterModel + * @property \Kanboard\Model\UserUnreadNotificationModel $userUnreadNotificationModel + * @property \Kanboard\Model\UserMetadataModel $userMetadataModel + * @property \Kanboard\Validator\ActionValidator $actionValidator + * @property \Kanboard\Validator\AuthValidator $authValidator + * @property \Kanboard\Validator\ColumnValidator $columnValidator + * @property \Kanboard\Validator\CategoryValidator $categoryValidator + * @property \Kanboard\Validator\CommentValidator $commentValidator + * @property \Kanboard\Validator\CurrencyValidator $currencyValidator + * @property \Kanboard\Validator\CustomFilterValidator $customFilterValidator + * @property \Kanboard\Validator\ExternalLinkValidator $externalLinkValidator + * @property \Kanboard\Validator\GroupValidator $groupValidator + * @property \Kanboard\Validator\LinkValidator $linkValidator + * @property \Kanboard\Validator\PasswordResetValidator $passwordResetValidator + * @property \Kanboard\Validator\ProjectValidator $projectValidator + * @property \Kanboard\Validator\SubtaskValidator $subtaskValidator + * @property \Kanboard\Validator\SwimlaneValidator $swimlaneValidator + * @property \Kanboard\Validator\TagValidator $tagValidator + * @property \Kanboard\Validator\TaskLinkValidator $taskLinkValidator + * @property \Kanboard\Validator\TaskValidator $taskValidator + * @property \Kanboard\Validator\UserValidator $userValidator + * @property \Kanboard\Import\TaskImport $taskImport + * @property \Kanboard\Import\UserImport $userImport + * @property \Kanboard\Export\SubtaskExport $subtaskExport + * @property \Kanboard\Export\TaskExport $taskExport + * @property \Kanboard\Export\TransitionExport $transitionExport + * @property \Kanboard\Core\Filter\QueryBuilder $projectGroupRoleQuery + * @property \Kanboard\Core\Filter\QueryBuilder $projectUserRoleQuery + * @property \Kanboard\Core\Filter\QueryBuilder $projectActivityQuery + * @property \Kanboard\Core\Filter\QueryBuilder $userQuery + * @property \Kanboard\Core\Filter\QueryBuilder $projectQuery + * @property \Kanboard\Core\Filter\QueryBuilder $taskQuery + * @property \Kanboard\Core\Filter\LexerBuilder $taskLexer + * @property \Kanboard\Core\Filter\LexerBuilder $projectActivityLexer + * @property \Psr\Log\LoggerInterface $logger + * @property \PicoDb\Database $db + * @property \Symfony\Component\EventDispatcher\EventDispatcher $dispatcher + * @property \Symfony\Component\Console\Application $cli + * @property \JsonRPC\Server $api */ abstract class Base { @@ -173,4 +188,18 @@ abstract class Base { return $this->container[$name]; } + + /** + * Get object instance + * + * @static + * @access public + * @param Container $container + * @return static + */ + public static function getInstance(Container $container) + { + $self = new static($container); + return $self; + } } diff --git a/sources/app/Core/Controller/AccessForbiddenException.php b/sources/app/Core/Controller/AccessForbiddenException.php new file mode 100644 index 0000000..b5dccb7 --- /dev/null +++ b/sources/app/Core/Controller/AccessForbiddenException.php @@ -0,0 +1,14 @@ +withoutLayout = true; + return $this; + } + + /** + * Return true if no layout + * + * @access public + * @return boolean + */ + public function hasLayout() + { + return $this->withoutLayout; + } +} diff --git a/sources/app/Core/Controller/BaseMiddleware.php b/sources/app/Core/Controller/BaseMiddleware.php new file mode 100644 index 0000000..e94ad95 --- /dev/null +++ b/sources/app/Core/Controller/BaseMiddleware.php @@ -0,0 +1,58 @@ +nextMiddleware = $nextMiddleware; + return $this; + } + + /** + * @return BaseMiddleware + */ + public function getNextMiddleware() + { + return $this->nextMiddleware; + } + + /** + * Move to next middleware + */ + public function next() + { + if ($this->nextMiddleware !== null) { + if (DEBUG) { + $this->logger->debug(__METHOD__.' => ' . get_class($this->nextMiddleware)); + } + + $this->nextMiddleware->execute(); + } + } +} diff --git a/sources/app/Core/Controller/PageNotFoundException.php b/sources/app/Core/Controller/PageNotFoundException.php new file mode 100644 index 0000000..e96a205 --- /dev/null +++ b/sources/app/Core/Controller/PageNotFoundException.php @@ -0,0 +1,14 @@ +executeMiddleware(); + + if (!$this->response->isResponseAlreadySent()) { + $this->executeController(); + } + } catch (PageNotFoundException $e) { + $controllerObject = new AppController($this->container); + $controllerObject->notFound($e->hasLayout()); + } catch (AccessForbiddenException $e) { + $controllerObject = new AppController($this->container); + $controllerObject->accessForbidden($e->hasLayout()); + } + } + + /** + * Execute all middleware + */ + protected function executeMiddleware() + { + if (DEBUG) { + $this->logger->debug(__METHOD__); + } + + $bootstrapMiddleware = new BootstrapMiddleware($this->container); + $authenticationMiddleware = new AuthenticationMiddleware($this->container); + $postAuthenticationMiddleware = new PostAuthenticationMiddleware($this->container); + $appAuthorizationMiddleware = new ApplicationAuthorizationMiddleware($this->container); + $projectAuthorizationMiddleware = new ProjectAuthorizationMiddleware($this->container); + + $bootstrapMiddleware->setNextMiddleware($authenticationMiddleware); + $authenticationMiddleware->setNextMiddleware($postAuthenticationMiddleware); + $postAuthenticationMiddleware->setNextMiddleware($appAuthorizationMiddleware); + $appAuthorizationMiddleware->setNextMiddleware($projectAuthorizationMiddleware); + + $bootstrapMiddleware->execute(); + } + + /** + * Execute the controller + */ + protected function executeController() + { + $className = $this->getControllerClassName(); + + if (DEBUG) { + $this->logger->debug(__METHOD__.' => '.$className.'::'.$this->router->getAction()); + } + + $controllerObject = new $className($this->container); + $controllerObject->{$this->router->getAction()}(); + } + + /** + * Get controller class name + * + * @access protected + * @return string + * @throws RuntimeException + */ + protected function getControllerClassName() + { + if ($this->router->getPlugin() !== '') { + $className = '\Kanboard\Plugin\\'.$this->router->getPlugin().'\Controller\\'.$this->router->getController(); + } else { + $className = '\Kanboard\Controller\\'.$this->router->getController(); + } + + if (! class_exists($className)) { + throw new RuntimeException('Controller not found'); + } + + if (! method_exists($className, $this->router->getAction())) { + throw new RuntimeException('Action not implemented'); + } + + return $className; + } +} diff --git a/sources/app/Core/DateParser.php b/sources/app/Core/DateParser.php index 835eb3e..a7b10a7 100644 --- a/sources/app/Core/DateParser.php +++ b/sources/app/Core/DateParser.php @@ -14,6 +14,40 @@ class DateParser extends Base { const DATE_FORMAT = 'm/d/Y'; const DATE_TIME_FORMAT = 'm/d/Y H:i'; + const TIME_FORMAT = 'H:i'; + + /** + * Get date format from settings + * + * @access public + * @return string + */ + public function getUserDateFormat() + { + return $this->configModel->get('application_date_format', DateParser::DATE_FORMAT); + } + + /** + * Get date time format from settings + * + * @access public + * @return string + */ + public function getUserDateTimeFormat() + { + return $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT); + } + + /** + * Get time format from settings + * + * @access public + * @return string + */ + public function getUserTimeFormat() + { + return $this->configModel->get('application_time_format', DateParser::TIME_FORMAT); + } /** * List of time formats @@ -38,19 +72,29 @@ class DateParser extends Base */ public function getDateFormats($iso = false) { - $iso_formats = array( + $formats = array( + $this->getUserDateFormat(), + ); + + $isoFormats = array( 'Y-m-d', 'Y_m_d', ); - $user_formats = array( + $userFormats = array( 'm/d/Y', 'd/m/Y', 'Y/m/d', 'd.m.Y', ); - return $iso ? array_merge($iso_formats, $user_formats) : $user_formats; + if ($iso) { + $formats = array_merge($formats, $isoFormats, $userFormats); + } else { + $formats = array_merge($formats, $userFormats); + } + + return array_unique($formats); } /** @@ -62,7 +106,9 @@ class DateParser extends Base */ public function getDateTimeFormats($iso = false) { - $formats = array(); + $formats = array( + $this->getUserDateTimeFormat(), + ); foreach ($this->getDateFormats($iso) as $date) { foreach ($this->getTimeFormats() as $time) { @@ -70,7 +116,7 @@ class DateParser extends Base } } - return $formats; + return array_unique($formats); } /** @@ -97,12 +143,30 @@ class DateParser extends Base $values = array(); foreach ($formats as $format) { - $values[$format] = date($format); + $values[$format] = date($format).' ('.$format.')'; } return $values; } + /** + * Get formats for date parsing + * + * @access public + * @return array + */ + public function getParserFormats() + { + return array( + $this->getUserDateFormat(), + 'Y-m-d', + 'Y_m_d', + $this->getUserDateTimeFormat(), + 'Y-m-d H:i', + 'Y_m_d H:i', + ); + } + /** * Parse a date and return a unix timestamp, try different date formats * @@ -116,7 +180,7 @@ class DateParser extends Base return (int) $value; } - foreach ($this->getAllDateFormats(true) as $format) { + foreach ($this->getParserFormats() as $format) { $timestamp = $this->getValidDate($value, $format); if ($timestamp !== 0) { diff --git a/sources/app/Core/Event/EventManager.php b/sources/app/Core/Event/EventManager.php index 162d23e..9ae4317 100644 --- a/sources/app/Core/Event/EventManager.php +++ b/sources/app/Core/Event/EventManager.php @@ -2,8 +2,8 @@ namespace Kanboard\Core\Event; -use Kanboard\Model\Task; -use Kanboard\Model\TaskLink; +use Kanboard\Model\TaskModel; +use Kanboard\Model\TaskLinkModel; /** * Event Manager @@ -44,15 +44,15 @@ class EventManager public function getAll() { $events = array( - TaskLink::EVENT_CREATE_UPDATE => t('Task link creation or modification'), - Task::EVENT_MOVE_COLUMN => t('Move a task to another column'), - Task::EVENT_UPDATE => t('Task modification'), - Task::EVENT_CREATE => t('Task creation'), - Task::EVENT_OPEN => t('Reopen a task'), - Task::EVENT_CLOSE => t('Closing a task'), - Task::EVENT_CREATE_UPDATE => t('Task creation or modification'), - Task::EVENT_ASSIGNEE_CHANGE => t('Task assignee change'), - Task::EVENT_DAILY_CRONJOB => t('Daily background job for tasks'), + TaskLinkModel::EVENT_CREATE_UPDATE => t('Task link creation or modification'), + TaskModel::EVENT_MOVE_COLUMN => t('Move a task to another column'), + TaskModel::EVENT_UPDATE => t('Task modification'), + TaskModel::EVENT_CREATE => t('Task creation'), + TaskModel::EVENT_OPEN => t('Reopen a task'), + TaskModel::EVENT_CLOSE => t('Closing a task'), + TaskModel::EVENT_CREATE_UPDATE => t('Task creation or modification'), + TaskModel::EVENT_ASSIGNEE_CHANGE => t('Task assignee change'), + TaskModel::EVENT_DAILY_CRONJOB => t('Daily background job for tasks'), ); $events = array_merge($events, $this->events); diff --git a/sources/app/Core/ExternalLink/ExternalLinkManager.php b/sources/app/Core/ExternalLink/ExternalLinkManager.php index 1fa423c..5a03799 100644 --- a/sources/app/Core/ExternalLink/ExternalLinkManager.php +++ b/sources/app/Core/ExternalLink/ExternalLinkManager.php @@ -23,7 +23,7 @@ class ExternalLinkManager extends Base * Registered providers * * @access private - * @var array + * @var ExternalLinkProviderInterface[] */ private $providers = array(); @@ -152,6 +152,30 @@ class ExternalLinkManager extends Base return $this; } + /** + * Set provider type + * + * @access public + * @param string $userInputType + * @return ExternalLinkManager + */ + public function setUserInputType($userInputType) + { + $this->userInputType = $userInputType; + return $this; + } + + /** + * Set external link + * @param string $userInputText + * @return ExternalLinkManager + */ + public function setUserInputText($userInputText) + { + $this->userInputText = $userInputText; + return $this; + } + /** * Find a provider that user input * diff --git a/sources/app/Core/Filter/CriteriaInterface.php b/sources/app/Core/Filter/CriteriaInterface.php new file mode 100644 index 0000000..009c4bd --- /dev/null +++ b/sources/app/Core/Filter/CriteriaInterface.php @@ -0,0 +1,40 @@ + 'T_WHITESPACE', + '/^([<=>]{0,2}[0-9]{4}-[0-9]{2}-[0-9]{2})/' => 'T_STRING', + '/^([<=>]{1,2}\w+)/u' => 'T_STRING', + '/^([<=>]{1,2}".+")/' => 'T_STRING', + '/^("(.+)")/' => 'T_STRING', + '/^(\S+)/u' => 'T_STRING', + '/^(#\d+)/' => 'T_STRING', + ); + + /** + * Default token + * + * @access private + * @var string + */ + private $defaultToken = ''; + + /** + * Add token + * + * @access public + * @param string $regex + * @param string $token + * @return $this + */ + public function addToken($regex, $token) + { + $this->tokenMap = array($regex => $token) + $this->tokenMap; + return $this; + } + + /** + * Set default token + * + * @access public + * @param string $token + * @return $this + */ + public function setDefaultToken($token) + { + $this->defaultToken = $token; + return $this; + } + + /** + * Tokenize input string + * + * @access public + * @param string $input + * @return array + */ + public function tokenize($input) + { + $tokens = array(); + $this->offset = 0; + $input_length = mb_strlen($input, 'UTF-8'); + + while ($this->offset < $input_length) { + $result = $this->match(mb_substr($input, $this->offset, $input_length, 'UTF-8')); + + if ($result === false) { + return array(); + } + + $tokens[] = $result; + } + + return $this->map($tokens); + } + + /** + * Find a token that match and move the offset + * + * @access protected + * @param string $string + * @return array|boolean + */ + protected function match($string) + { + foreach ($this->tokenMap as $pattern => $name) { + if (preg_match($pattern, $string, $matches)) { + $this->offset += mb_strlen($matches[1], 'UTF-8'); + + return array( + 'match' => str_replace('"', '', $matches[1]), + 'token' => $name, + ); + } + } + + return false; + } + + /** + * Build map of tokens and matches + * + * @access protected + * @param array $tokens + * @return array + */ + protected function map(array $tokens) + { + $map = array(); + $leftOver = ''; + + while (false !== ($token = current($tokens))) { + if ($token['token'] === 'T_STRING' || $token['token'] === 'T_WHITESPACE') { + $leftOver .= $token['match']; + } else { + $next = next($tokens); + + if ($next !== false && $next['token'] === 'T_STRING') { + $map[$token['token']][] = $next['match']; + } + } + + next($tokens); + } + + $leftOver = trim($leftOver); + + if ($this->defaultToken !== '' && $leftOver !== '') { + $map[$this->defaultToken] = array($leftOver); + } + + return $map; + } +} diff --git a/sources/app/Core/Filter/LexerBuilder.php b/sources/app/Core/Filter/LexerBuilder.php new file mode 100644 index 0000000..7a9a714 --- /dev/null +++ b/sources/app/Core/Filter/LexerBuilder.php @@ -0,0 +1,151 @@ +lexer = new Lexer; + $this->queryBuilder = new QueryBuilder(); + } + + /** + * Add a filter + * + * @access public + * @param FilterInterface $filter + * @param bool $default + * @return LexerBuilder + */ + public function withFilter(FilterInterface $filter, $default = false) + { + $attributes = $filter->getAttributes(); + + foreach ($attributes as $attribute) { + $this->filters[$attribute] = $filter; + $this->lexer->addToken(sprintf("/^(%s:)/", $attribute), $attribute); + + if ($default) { + $this->lexer->setDefaultToken($attribute); + } + } + + return $this; + } + + /** + * Set the query + * + * @access public + * @param Table $query + * @return LexerBuilder + */ + public function withQuery(Table $query) + { + $this->query = $query; + $this->queryBuilder->withQuery($this->query); + return $this; + } + + /** + * Parse the input and build the query + * + * @access public + * @param string $input + * @return QueryBuilder + */ + public function build($input) + { + $tokens = $this->lexer->tokenize($input); + + foreach ($tokens as $token => $values) { + if (isset($this->filters[$token])) { + $this->applyFilters($this->filters[$token], $values); + } + } + + return $this->queryBuilder; + } + + /** + * Apply filters to the query + * + * @access protected + * @param FilterInterface $filter + * @param array $values + */ + protected function applyFilters(FilterInterface $filter, array $values) + { + $len = count($values); + + if ($len > 1) { + $criteria = new OrCriteria(); + $criteria->withQuery($this->query); + + foreach ($values as $value) { + $currentFilter = clone($filter); + $criteria->withFilter($currentFilter->withValue($value)); + } + + $this->queryBuilder->withCriteria($criteria); + } elseif ($len === 1) { + $this->queryBuilder->withFilter($filter->withValue($values[0])); + } + } + + /** + * Clone object with deep copy + */ + public function __clone() + { + $this->lexer = clone $this->lexer; + $this->query = clone $this->query; + $this->queryBuilder = clone $this->queryBuilder; + } +} diff --git a/sources/app/Core/Filter/OrCriteria.php b/sources/app/Core/Filter/OrCriteria.php new file mode 100644 index 0000000..174b845 --- /dev/null +++ b/sources/app/Core/Filter/OrCriteria.php @@ -0,0 +1,68 @@ +query = $query; + return $this; + } + + /** + * Set filter + * + * @access public + * @param FilterInterface $filter + * @return CriteriaInterface + */ + public function withFilter(FilterInterface $filter) + { + $this->filters[] = $filter; + return $this; + } + + /** + * Apply condition + * + * @access public + * @return CriteriaInterface + */ + public function apply() + { + $this->query->beginOr(); + + foreach ($this->filters as $filter) { + $filter->withQuery($this->query)->apply(); + } + + $this->query->closeOr(); + return $this; + } +} diff --git a/sources/app/Core/Filter/QueryBuilder.php b/sources/app/Core/Filter/QueryBuilder.php new file mode 100644 index 0000000..3de82b6 --- /dev/null +++ b/sources/app/Core/Filter/QueryBuilder.php @@ -0,0 +1,103 @@ +query = $query; + return $this; + } + + /** + * Set a filter + * + * @access public + * @param FilterInterface $filter + * @return QueryBuilder + */ + public function withFilter(FilterInterface $filter) + { + $filter->withQuery($this->query)->apply(); + return $this; + } + + /** + * Set a criteria + * + * @access public + * @param CriteriaInterface $criteria + * @return QueryBuilder + */ + public function withCriteria(CriteriaInterface $criteria) + { + $criteria->withQuery($this->query)->apply(); + return $this; + } + + /** + * Set a formatter + * + * @access public + * @param FormatterInterface $formatter + * @return string|array + */ + public function format(FormatterInterface $formatter) + { + return $formatter->withQuery($this->query)->format(); + } + + /** + * Get the query result as array + * + * @access public + * @return array + */ + public function toArray() + { + return $this->query->findAll(); + } + + /** + * Get Query object + * + * @access public + * @return Table + */ + public function getQuery() + { + return $this->query; + } + + /** + * Clone object with deep copy + */ + public function __clone() + { + $this->query = clone $this->query; + } +} diff --git a/sources/app/Core/Helper.php b/sources/app/Core/Helper.php index 3a66fbd..43151be 100644 --- a/sources/app/Core/Helper.php +++ b/sources/app/Core/Helper.php @@ -12,10 +12,12 @@ use Pimple\Container; * * @property \Kanboard\Helper\AppHelper $app * @property \Kanboard\Helper\AssetHelper $asset + * @property \Kanboard\Helper\CalendarHelper $calendar * @property \Kanboard\Helper\DateHelper $dt * @property \Kanboard\Helper\FileHelper $file * @property \Kanboard\Helper\FormHelper $form * @property \Kanboard\Helper\HookHelper $hook + * @property \Kanboard\Helper\ICalHelper $ical * @property \Kanboard\Helper\ModelHelper $model * @property \Kanboard\Helper\SubtaskHelper $subtask * @property \Kanboard\Helper\TaskHelper $task @@ -24,6 +26,8 @@ use Pimple\Container; * @property \Kanboard\Helper\UserHelper $user * @property \Kanboard\Helper\LayoutHelper $layout * @property \Kanboard\Helper\ProjectHeaderHelper $projectHeader + * @property \Kanboard\Helper\ProjectActivityHelper $projectActivity + * @property \Kanboard\Helper\MailHelper $mail */ class Helper { @@ -91,7 +95,7 @@ class Helper { $container = $this->container; - $this->helpers[$property] = function() use($className, $container) { + $this->helpers[$property] = function() use ($className, $container) { return new $className($container); }; diff --git a/sources/app/Core/Http/Client.php b/sources/app/Core/Http/Client.php index 12b0a1c..3c4397e 100644 --- a/sources/app/Core/Http/Client.php +++ b/sources/app/Core/Http/Client.php @@ -3,6 +3,7 @@ namespace Kanboard\Core\Http; use Kanboard\Core\Base; +use Kanboard\Job\HttpAsyncJob; /** * HTTP client @@ -79,6 +80,24 @@ class Client extends Base ); } + /** + * Send a POST HTTP request encoded in JSON (Fire and forget) + * + * @access public + * @param string $url + * @param array $data + * @param string[] $headers + */ + public function postJsonAsync($url, array $data, array $headers = array()) + { + $this->queueManager->push(HttpAsyncJob::getInstance($this->container)->withParams( + 'POST', + $url, + json_encode($data), + array_merge(array('Content-type: application/json'), $headers) + )); + } + /** * Send a POST HTTP request encoded in www-form-urlencoded * @@ -98,22 +117,41 @@ class Client extends Base ); } + /** + * Send a POST HTTP request encoded in www-form-urlencoded (fire and forget) + * + * @access public + * @param string $url + * @param array $data + * @param string[] $headers + */ + public function postFormAsync($url, array $data, array $headers = array()) + { + $this->queueManager->push(HttpAsyncJob::getInstance($this->container)->withParams( + 'POST', + $url, + http_build_query($data), + array_merge(array('Content-type: application/x-www-form-urlencoded'), $headers) + )); + } + /** * Make the HTTP request * - * @access private + * @access public * @param string $method * @param string $url * @param string $content * @param string[] $headers * @return string */ - private function doRequest($method, $url, $content, array $headers) + public function doRequest($method, $url, $content, array $headers) { if (empty($url)) { return ''; } + $startTime = microtime(true); $stream = @fopen(trim($url), 'r', false, stream_context_create($this->getContext($method, $content, $headers))); $response = ''; @@ -125,9 +163,11 @@ class Client extends Base if (DEBUG) { $this->logger->debug('HttpClient: url='.$url); + $this->logger->debug('HttpClient: headers='.var_export($headers, true)); $this->logger->debug('HttpClient: payload='.$content); $this->logger->debug('HttpClient: metadata='.var_export(@stream_get_meta_data($stream), true)); $this->logger->debug('HttpClient: response='.$response); + $this->logger->debug('HttpClient: executionTime='.(microtime(true) - $startTime)); } return $response; @@ -162,7 +202,7 @@ class Client extends Base 'timeout' => self::HTTP_TIMEOUT, 'max_redirects' => self::HTTP_MAX_REDIRECTS, 'header' => implode("\r\n", $headers), - 'content' => $content + 'content' => $content, ) ); @@ -171,6 +211,14 @@ class Client extends Base $context['http']['request_fulluri'] = true; } + if (HTTP_VERIFY_SSL_CERTIFICATE === false) { + $context['ssl'] = array( + 'verify_peer' => false, + 'verify_peer_name' => false, + 'allow_self_signed' => true, + ); + } + return $context; } } diff --git a/sources/app/Core/Http/Response.php b/sources/app/Core/Http/Response.php index 37349ca..0f16fb6 100644 --- a/sources/app/Core/Http/Response.php +++ b/sources/app/Core/Http/Response.php @@ -13,72 +13,218 @@ use Kanboard\Core\Csv; */ class Response extends Base { + private $httpStatusCode = 200; + private $httpHeaders = array(); + private $httpBody = ''; + private $responseSent = false; + + /** + * Return true if the response have been sent to the user agent + * + * @access public + * @return bool + */ + public function isResponseAlreadySent() + { + return $this->responseSent; + } + + /** + * Set HTTP status code + * + * @access public + * @param integer $statusCode + * @return $this + */ + public function withStatusCode($statusCode) + { + $this->httpStatusCode = $statusCode; + return $this; + } + + /** + * Set HTTP header + * + * @access public + * @param string $header + * @param string $value + * @return $this + */ + public function withHeader($header, $value) + { + $this->httpHeaders[$header] = $value; + return $this; + } + + /** + * Set content type header + * + * @access public + * @param string $value + * @return $this + */ + public function withContentType($value) + { + $this->httpHeaders['Content-Type'] = $value; + return $this; + } + + /** + * Set default security headers + * + * @access public + * @return $this + */ + public function withSecurityHeaders() + { + $this->httpHeaders['X-Content-Type-Options'] = 'nosniff'; + $this->httpHeaders['X-XSS-Protection'] = '1; mode=block'; + return $this; + } + + /** + * Set header Content-Security-Policy + * + * @access public + * @param array $policies + * @return $this + */ + public function withContentSecurityPolicy(array $policies = array()) + { + $values = ''; + + foreach ($policies as $policy => $acl) { + $values .= $policy.' '.trim($acl).'; '; + } + + $this->withHeader('Content-Security-Policy', $values); + return $this; + } + + /** + * Set header X-Frame-Options + * + * @access public + * @return $this + */ + public function withXframe() + { + $this->withHeader('X-Frame-Options', 'DENY'); + return $this; + } + + /** + * Set header Strict-Transport-Security (only if we use HTTPS) + * + * @access public + * @return $this + */ + public function withStrictTransportSecurity() + { + if ($this->request->isHTTPS()) { + $this->withHeader('Strict-Transport-Security', 'max-age=31536000'); + } + + return $this; + } + + /** + * Set HTTP response body + * + * @access public + * @param string $body + * @return $this + */ + public function withBody($body) + { + $this->httpBody = $body; + return $this; + } + /** * Send headers to cache a resource * * @access public * @param integer $duration * @param string $etag + * @return $this */ - public function cache($duration, $etag = '') + public function withCache($duration, $etag = '') { - header('Pragma: cache'); - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $duration) . ' GMT'); - header('Cache-Control: public, max-age=' . $duration); + $this + ->withHeader('Pragma', 'cache') + ->withHeader('Expires', gmdate('D, d M Y H:i:s', time() + $duration) . ' GMT') + ->withHeader('Cache-Control', 'public, max-age=' . $duration) + ; if ($etag) { - header('ETag: "' . $etag . '"'); + $this->withHeader('ETag', '"' . $etag . '"'); } + + return $this; } /** * Send no cache headers * * @access public + * @return $this */ - public function nocache() + public function withoutCache() { - header('Pragma: no-cache'); - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); - - // Use no-store due to a Chrome bug: https://code.google.com/p/chromium/issues/detail?id=28035 - header('Cache-Control: no-store, must-revalidate'); - } - - /** - * Send a custom Content-Type header - * - * @access public - * @param string $mimetype Mime-type - */ - public function contentType($mimetype) - { - header('Content-Type: '.$mimetype); + $this->withHeader('Pragma', 'no-cache'); + $this->withHeader('Expires', 'Sat, 26 Jul 1997 05:00:00 GMT'); + return $this; } /** * Force the browser to download an attachment * * @access public - * @param string $filename File name + * @param string $filename + * @return $this */ - public function forceDownload($filename) + public function withFileDownload($filename) { - header('Content-Disposition: attachment; filename="'.$filename.'"'); - header('Content-Transfer-Encoding: binary'); - header('Content-Type: application/octet-stream'); + $this->withHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); + $this->withHeader('Content-Transfer-Encoding', 'binary'); + $this->withHeader('Content-Type', 'application/octet-stream'); + return $this; + } + + /** + * Send headers and body + * + * @access public + */ + public function send() + { + $this->responseSent = true; + + if ($this->httpStatusCode !== 200) { + header('Status: '.$this->httpStatusCode); + header($this->request->getServerVariable('SERVER_PROTOCOL').' '.$this->httpStatusCode); + } + + foreach ($this->httpHeaders as $header => $value) { + header($header.': '.$value); + } + + if (! empty($this->httpBody)) { + echo $this->httpBody; + } } /** * Send a custom HTTP status code * * @access public - * @param integer $status_code HTTP status code + * @param integer $statusCode */ - public function status($status_code) + public function status($statusCode) { - header('Status: '.$status_code); - header($this->request->getServerVariable('SERVER_PROTOCOL').' '.$status_code); + $this->withStatusCode($statusCode); + $this->send(); } /** @@ -91,204 +237,149 @@ class Response extends Base public function redirect($url, $self = false) { if ($this->request->isAjax()) { - header('X-Ajax-Redirect: '.($self ? 'self' : $url)); + $this->withHeader('X-Ajax-Redirect', $self ? 'self' : $url); } else { - header('Location: '.$url); + $this->withHeader('Location', $url); } - exit; - } - - /** - * Send a CSV response - * - * @access public - * @param array $data Data to serialize in csv - * @param integer $status_code HTTP status code - */ - public function csv(array $data, $status_code = 200) - { - $this->status($status_code); - $this->nocache(); - - header('Content-Type: text/csv'); - Csv::output($data); - exit; - } - - /** - * Send a Json response - * - * @access public - * @param array $data Data to serialize in json - * @param integer $status_code HTTP status code - */ - public function json(array $data, $status_code = 200) - { - $this->status($status_code); - $this->nocache(); - header('Content-Type: application/json'); - echo json_encode($data); - exit; - } - - /** - * Send a text response - * - * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code - */ - public function text($data, $status_code = 200) - { - $this->status($status_code); - $this->nocache(); - header('Content-Type: text/plain; charset=utf-8'); - echo $data; - exit; + $this->send(); } /** * Send a HTML response * * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code + * @param string $data + * @param integer $statusCode */ - public function html($data, $status_code = 200) + public function html($data, $statusCode = 200) { - $this->status($status_code); - $this->nocache(); - header('Content-Type: text/html; charset=utf-8'); - echo $data; - exit; + $this->withStatusCode($statusCode); + $this->withContentType('text/html; charset=utf-8'); + $this->withBody($data); + $this->send(); + } + + /** + * Send a text response + * + * @access public + * @param string $data + * @param integer $statusCode + */ + public function text($data, $statusCode = 200) + { + $this->withStatusCode($statusCode); + $this->withContentType('text/plain; charset=utf-8'); + $this->withBody($data); + $this->send(); + } + + /** + * Send a CSV response + * + * @access public + * @param array $data Data to serialize in csv + */ + public function csv(array $data) + { + $this->withoutCache(); + $this->withContentType('text/csv; charset=utf-8'); + $this->send(); + Csv::output($data); + } + + /** + * Send a Json response + * + * @access public + * @param array $data Data to serialize in json + * @param integer $statusCode HTTP status code + */ + public function json(array $data, $statusCode = 200) + { + $this->withStatusCode($statusCode); + $this->withContentType('application/json'); + $this->withoutCache(); + $this->withBody(json_encode($data)); + $this->send(); } /** * Send a XML response * * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code + * @param string $data + * @param integer $statusCode */ - public function xml($data, $status_code = 200) + public function xml($data, $statusCode = 200) { - $this->status($status_code); - $this->nocache(); - header('Content-Type: text/xml; charset=utf-8'); - echo $data; - exit; + $this->withStatusCode($statusCode); + $this->withContentType('text/xml; charset=utf-8'); + $this->withoutCache(); + $this->withBody($data); + $this->send(); } /** * Send a javascript response * * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code + * @param string $data + * @param integer $statusCode */ - public function js($data, $status_code = 200) + public function js($data, $statusCode = 200) { - $this->status($status_code); - - header('Content-Type: text/javascript; charset=utf-8'); - echo $data; - - exit; + $this->withStatusCode($statusCode); + $this->withContentType('text/javascript; charset=utf-8'); + $this->withBody($data); + $this->send(); } /** * Send a css response * * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code + * @param string $data + * @param integer $statusCode */ - public function css($data, $status_code = 200) + public function css($data, $statusCode = 200) { - $this->status($status_code); - - header('Content-Type: text/css; charset=utf-8'); - echo $data; - - exit; + $this->withStatusCode($statusCode); + $this->withContentType('text/css; charset=utf-8'); + $this->withBody($data); + $this->send(); } /** * Send a binary response * * @access public - * @param string $data Raw data - * @param integer $status_code HTTP status code + * @param string $data + * @param integer $statusCode */ - public function binary($data, $status_code = 200) + public function binary($data, $statusCode = 200) { - $this->status($status_code); - $this->nocache(); - header('Content-Transfer-Encoding: binary'); - header('Content-Type: application/octet-stream'); - echo $data; - exit; + $this->withStatusCode($statusCode); + $this->withoutCache(); + $this->withHeader('Content-Transfer-Encoding', 'binary'); + $this->withContentType('application/octet-stream'); + $this->withBody($data); + $this->send(); } /** - * Send the security header: Content-Security-Policy + * Send a iCal response * * @access public - * @param array $policies CSP rules + * @param string $data + * @param integer $statusCode */ - public function csp(array $policies = array()) + public function ical($data, $statusCode = 200) { - $values = ''; - - foreach ($policies as $policy => $acl) { - $values .= $policy.' '.trim($acl).'; '; - } - - header('Content-Security-Policy: '.$values); - } - - /** - * Send the security header: X-Content-Type-Options - * - * @access public - */ - public function nosniff() - { - header('X-Content-Type-Options: nosniff'); - } - - /** - * Send the security header: X-XSS-Protection - * - * @access public - */ - public function xss() - { - header('X-XSS-Protection: 1; mode=block'); - } - - /** - * Send the security header: Strict-Transport-Security (only if we use HTTPS) - * - * @access public - */ - public function hsts() - { - if ($this->request->isHTTPS()) { - header('Strict-Transport-Security: max-age=31536000'); - } - } - - /** - * Send the security header: X-Frame-Options (deny by default) - * - * @access public - * @param string $mode Frame option mode - * @param array $urls Allowed urls for the given mode - */ - public function xframe($mode = 'DENY', array $urls = array()) - { - header('X-Frame-Options: '.$mode.' '.implode(' ', $urls)); + $this->withStatusCode($statusCode); + $this->withContentType('text/calendar; charset=utf-8'); + $this->withBody($data); + $this->send(); } } diff --git a/sources/app/Core/Http/Route.php b/sources/app/Core/Http/Route.php index 7836146..9b45b72 100644 --- a/sources/app/Core/Http/Route.php +++ b/sources/app/Core/Http/Route.php @@ -119,8 +119,8 @@ class Route extends Base } return array( - 'controller' => 'app', - 'action' => 'index', + 'controller' => 'DashboardController', + 'action' => 'show', 'plugin' => '', ); } diff --git a/sources/app/Core/Http/Router.php b/sources/app/Core/Http/Router.php index 0fe80ec..4de276a 100644 --- a/sources/app/Core/Http/Router.php +++ b/sources/app/Core/Http/Router.php @@ -2,7 +2,6 @@ namespace Kanboard\Core\Http; -use RuntimeException; use Kanboard\Core\Base; /** @@ -13,13 +12,16 @@ use Kanboard\Core\Base; */ class Router extends Base { + const DEFAULT_CONTROLLER = 'DashboardController'; + const DEFAULT_METHOD = 'show'; + /** * Plugin name * * @access private * @var string */ - private $plugin = ''; + private $currentPluginName = ''; /** * Controller @@ -27,7 +29,7 @@ class Router extends Base * @access private * @var string */ - private $controller = ''; + private $currentControllerName = ''; /** * Action @@ -35,7 +37,7 @@ class Router extends Base * @access private * @var string */ - private $action = ''; + private $currentActionName = ''; /** * Get plugin name @@ -45,7 +47,7 @@ class Router extends Base */ public function getPlugin() { - return $this->plugin; + return $this->currentPluginName; } /** @@ -56,7 +58,7 @@ class Router extends Base */ public function getController() { - return $this->controller; + return $this->currentControllerName; } /** @@ -67,7 +69,7 @@ class Router extends Base */ public function getAction() { - return $this->action; + return $this->currentActionName; } /** @@ -109,11 +111,9 @@ class Router extends Base $plugin = $route['plugin']; } - $this->controller = ucfirst($this->sanitize($controller, 'app')); - $this->action = $this->sanitize($action, 'index'); - $this->plugin = ucfirst($this->sanitize($plugin)); - - return $this->executeAction(); + $this->currentControllerName = ucfirst($this->sanitize($controller, self::DEFAULT_CONTROLLER)); + $this->currentActionName = $this->sanitize($action, self::DEFAULT_METHOD); + $this->currentPluginName = ucfirst($this->sanitize($plugin)); } /** @@ -128,42 +128,4 @@ class Router extends Base { return preg_match('/^[a-zA-Z_0-9]+$/', $value) ? $value : $default; } - - /** - * Execute controller action - * - * @access private - */ - private function executeAction() - { - $class = $this->getControllerClassName(); - - if (! class_exists($class)) { - throw new RuntimeException('Controller not found'); - } - - if (! method_exists($class, $this->action)) { - throw new RuntimeException('Action not implemented'); - } - - $instance = new $class($this->container); - $instance->beforeAction(); - $instance->{$this->action}(); - return $instance; - } - - /** - * Get controller class name - * - * @access private - * @return string - */ - private function getControllerClassName() - { - if ($this->plugin !== '') { - return '\Kanboard\Plugin\\'.$this->plugin.'\Controller\\'.$this->controller; - } - - return '\Kanboard\Controller\\'.$this->controller; - } } diff --git a/sources/app/Core/Ldap/Group.php b/sources/app/Core/Ldap/Group.php index 634d47e..e1f60ab 100644 --- a/sources/app/Core/Ldap/Group.php +++ b/sources/app/Core/Ldap/Group.php @@ -39,12 +39,11 @@ class Group * @access public * @param Client $client * @param string $query - * @return array + * @return LdapGroupProvider[] */ public static function getGroups(Client $client, $query) { - $className = get_called_class(); - $self = new $className(new Query($client)); + $self = new static(new Query($client)); return $self->find($query); } @@ -111,7 +110,7 @@ class Group throw new LogicException('LDAP full name attribute empty, check the parameter LDAP_GROUP_ATTRIBUTE_NAME'); } - return LDAP_GROUP_ATTRIBUTE_NAME; + return strtolower(LDAP_GROUP_ATTRIBUTE_NAME); } /** diff --git a/sources/app/Core/Ldap/Query.php b/sources/app/Core/Ldap/Query.php index 7c1524c..0f9abb5 100644 --- a/sources/app/Core/Ldap/Query.php +++ b/sources/app/Core/Ldap/Query.php @@ -66,6 +66,10 @@ class Query $this->entries = $entries; + if (DEBUG && $this->client->hasLogger()) { + $this->client->getLogger()->debug('NbEntries='.$entries['count']); + } + return $this; } diff --git a/sources/app/Core/Ldap/User.php b/sources/app/Core/Ldap/User.php index d23ec07..4bc1f5f 100644 --- a/sources/app/Core/Ldap/User.php +++ b/sources/app/Core/Ldap/User.php @@ -22,15 +22,25 @@ class User */ protected $query; + /** + * LDAP Group object + * + * @access protected + * @var Group + */ + protected $group; + /** * Constructor * * @access public - * @param Query $query + * @param Query $query + * @param Group $group */ - public function __construct(Query $query) + public function __construct(Query $query, Group $group = null) { $this->query = $query; + $this->group = $group; } /** @@ -44,7 +54,7 @@ class User */ public static function getUser(Client $client, $username) { - $self = new static(new Query($client)); + $self = new static(new Query($client), new Group(new Query($client))); return $self->find($self->getLdapUserPattern($username)); } @@ -53,7 +63,7 @@ class User * * @access public * @param string $query - * @return null|LdapUserProvider + * @return LdapUserProvider */ public function find($query) { @@ -67,6 +77,62 @@ class User return $user; } + /** + * Get user groupIds (DN) + * + * 1) If configured, use memberUid and posixGroup + * 2) Otherwise, use memberOf + * + * @access protected + * @param Entry $entry + * @param string $username + * @return string[] + */ + protected function getGroups(Entry $entry, $username) + { + $groupIds = array(); + + if (! empty($username) && $this->group !== null && $this->hasGroupUserFilter()) { + $groups = $this->group->find(sprintf($this->getGroupUserFilter(), $username)); + + foreach ($groups as $group) { + $groupIds[] = $group->getExternalId(); + } + } else { + $groupIds = $entry->getAll($this->getAttributeGroup()); + } + + return $groupIds; + } + + /** + * Get role from LDAP groups + * + * Note: Do not touch the current role if groups are not configured + * + * @access protected + * @param string[] $groupIds + * @return string + */ + protected function getRole(array $groupIds) + { + if (! $this->hasGroupsConfigured()) { + return null; + } + + foreach ($groupIds as $groupId) { + $groupId = strtolower($groupId); + + if ($groupId === strtolower($this->getGroupAdminDn())) { + return Role::APP_ADMIN; + } elseif ($groupId === strtolower($this->getGroupManagerDn())) { + return Role::APP_MANAGER; + } + } + + return Role::APP_USER; + } + /** * Build user profile * @@ -76,21 +142,18 @@ class User protected function build() { $entry = $this->query->getEntries()->getFirstEntry(); - $role = Role::APP_USER; - - if ($entry->hasValue($this->getAttributeGroup(), $this->getGroupAdminDn())) { - $role = Role::APP_ADMIN; - } elseif ($entry->hasValue($this->getAttributeGroup(), $this->getGroupManagerDn())) { - $role = Role::APP_MANAGER; - } + $username = $entry->getFirstValue($this->getAttributeUsername()); + $groupIds = $this->getGroups($entry, $username); return new LdapUserProvider( $entry->getDn(), - $entry->getFirstValue($this->getAttributeUsername()), + $username, $entry->getFirstValue($this->getAttributeName()), $entry->getFirstValue($this->getAttributeEmail()), - $role, - $entry->getAll($this->getAttributeGroup()) + $this->getRole($groupIds), + $groupIds, + $entry->getFirstValue($this->getAttributePhoto()), + $entry->getFirstValue($this->getAttributeLanguage()) ); } @@ -109,6 +172,8 @@ class User $this->getAttributeName(), $this->getAttributeEmail(), $this->getAttributeGroup(), + $this->getAttributePhoto(), + $this->getAttributeLanguage(), ))); } @@ -124,7 +189,7 @@ class User throw new LogicException('LDAP username attribute empty, check the parameter LDAP_USER_ATTRIBUTE_USERNAME'); } - return LDAP_USER_ATTRIBUTE_USERNAME; + return strtolower(LDAP_USER_ATTRIBUTE_USERNAME); } /** @@ -139,7 +204,7 @@ class User throw new LogicException('LDAP full name attribute empty, check the parameter LDAP_USER_ATTRIBUTE_FULLNAME'); } - return LDAP_USER_ATTRIBUTE_FULLNAME; + return strtolower(LDAP_USER_ATTRIBUTE_FULLNAME); } /** @@ -154,18 +219,73 @@ class User throw new LogicException('LDAP email attribute empty, check the parameter LDAP_USER_ATTRIBUTE_EMAIL'); } - return LDAP_USER_ATTRIBUTE_EMAIL; + return strtolower(LDAP_USER_ATTRIBUTE_EMAIL); } /** - * Get LDAP account memberof attribute + * Get LDAP account memberOf attribute * * @access public * @return string */ public function getAttributeGroup() { - return LDAP_USER_ATTRIBUTE_GROUPS; + return strtolower(LDAP_USER_ATTRIBUTE_GROUPS); + } + + /** + * Get LDAP profile photo attribute + * + * @access public + * @return string + */ + public function getAttributePhoto() + { + return strtolower(LDAP_USER_ATTRIBUTE_PHOTO); + } + + /** + * Get LDAP language attribute + * + * @access public + * @return string + */ + public function getAttributeLanguage() + { + return strtolower(LDAP_USER_ATTRIBUTE_LANGUAGE); + } + + /** + * Get LDAP Group User filter + * + * @access public + * @return string + */ + public function getGroupUserFilter() + { + return LDAP_GROUP_USER_FILTER; + } + + /** + * Return true if LDAP Group User filter is defined + * + * @access public + * @return string + */ + public function hasGroupUserFilter() + { + return $this->getGroupUserFilter() !== '' && $this->getGroupUserFilter() !== null; + } + + /** + * Return true if LDAP Group mapping are configured + * + * @access public + * @return boolean + */ + public function hasGroupsConfigured() + { + return $this->getGroupAdminDn() || $this->getGroupManagerDn(); } /** @@ -176,7 +296,7 @@ class User */ public function getGroupAdminDn() { - return LDAP_GROUP_ADMIN_DN; + return strtolower(LDAP_GROUP_ADMIN_DN); } /** diff --git a/sources/app/Core/Lexer.php b/sources/app/Core/Lexer.php deleted file mode 100644 index df2d90a..0000000 --- a/sources/app/Core/Lexer.php +++ /dev/null @@ -1,161 +0,0 @@ - 'T_ASSIGNEE', - "/^(color:)/" => 'T_COLOR', - "/^(due:)/" => 'T_DUE', - "/^(updated:)/" => 'T_UPDATED', - "/^(modified:)/" => 'T_UPDATED', - "/^(created:)/" => 'T_CREATED', - "/^(status:)/" => 'T_STATUS', - "/^(description:)/" => 'T_DESCRIPTION', - "/^(category:)/" => 'T_CATEGORY', - "/^(column:)/" => 'T_COLUMN', - "/^(project:)/" => 'T_PROJECT', - "/^(swimlane:)/" => 'T_SWIMLANE', - "/^(ref:)/" => 'T_REFERENCE', - "/^(reference:)/" => 'T_REFERENCE', - "/^(link:)/" => 'T_LINK', - "/^(\s+)/" => 'T_WHITESPACE', - '/^([<=>]{0,2}[0-9]{4}-[0-9]{2}-[0-9]{2})/' => 'T_DATE', - '/^(yesterday|tomorrow|today)/' => 'T_DATE', - '/^("(.*?)")/' => 'T_STRING', - "/^(\w+)/" => 'T_STRING', - "/^(#\d+)/" => 'T_STRING', - ); - - /** - * Tokenize input string - * - * @access public - * @param string $input - * @return array - */ - public function tokenize($input) - { - $tokens = array(); - $this->offset = 0; - - while (isset($input[$this->offset])) { - $result = $this->match(substr($input, $this->offset)); - - if ($result === false) { - return array(); - } - - $tokens[] = $result; - } - - return $tokens; - } - - /** - * Find a token that match and move the offset - * - * @access public - * @param string $string - * @return array|boolean - */ - public function match($string) - { - foreach ($this->tokenMap as $pattern => $name) { - if (preg_match($pattern, $string, $matches)) { - $this->offset += strlen($matches[1]); - - return array( - 'match' => trim($matches[1], '"'), - 'token' => $name, - ); - } - } - - return false; - } - - /** - * Change the output of tokenizer to be easily parsed by the database filter - * - * Example: ['T_ASSIGNEE' => ['user1', 'user2'], 'T_TITLE' => 'task title'] - * - * @access public - * @param array $tokens - * @return array - */ - public function map(array $tokens) - { - $map = array( - 'T_TITLE' => '', - ); - - while (false !== ($token = current($tokens))) { - switch ($token['token']) { - case 'T_ASSIGNEE': - case 'T_COLOR': - case 'T_CATEGORY': - case 'T_COLUMN': - case 'T_PROJECT': - case 'T_SWIMLANE': - case 'T_LINK': - $next = next($tokens); - - if ($next !== false && $next['token'] === 'T_STRING') { - $map[$token['token']][] = $next['match']; - } - - break; - - case 'T_STATUS': - case 'T_DUE': - case 'T_UPDATED': - case 'T_CREATED': - case 'T_DESCRIPTION': - case 'T_REFERENCE': - $next = next($tokens); - - if ($next !== false && ($next['token'] === 'T_DATE' || $next['token'] === 'T_STRING')) { - $map[$token['token']] = $next['match']; - } - - break; - - default: - $map['T_TITLE'] .= $token['match']; - break; - } - - next($tokens); - } - - $map['T_TITLE'] = trim($map['T_TITLE']); - - if (empty($map['T_TITLE'])) { - unset($map['T_TITLE']); - } - - return $map; - } -} diff --git a/sources/app/Core/Mail/Client.php b/sources/app/Core/Mail/Client.php index 641b6ab..ee3bdea 100644 --- a/sources/app/Core/Mail/Client.php +++ b/sources/app/Core/Mail/Client.php @@ -2,6 +2,7 @@ namespace Kanboard\Core\Mail; +use Kanboard\Job\EmailJob; use Pimple\Container; use Kanboard\Core\Base; @@ -46,25 +47,31 @@ class Client extends Base public function send($email, $name, $subject, $html) { if (! empty($email)) { - $this->logger->debug('Sending email to '.$email.' ('.MAIL_TRANSPORT.')'); - - $start_time = microtime(true); - $author = 'Kanboard'; - - if ($this->userSession->isLogged()) { - $author = e('%s via Kanboard', $this->helper->user->getFullname()); - } - - $this->getTransport(MAIL_TRANSPORT)->sendEmail($email, $name, $subject, $html, $author); - - if (DEBUG) { - $this->logger->debug('Email sent in '.round(microtime(true) - $start_time, 6).' seconds'); - } + $this->queueManager->push(EmailJob::getInstance($this->container) + ->withParams($email, $name, $subject, $html, $this->getAuthor()) + ); } return $this; } + /** + * Get email author + * + * @access public + * @return string + */ + public function getAuthor() + { + $author = 'Kanboard'; + + if ($this->userSession->isLogged()) { + $author = e('%s via Kanboard', $this->helper->user->getFullname()); + } + + return $author; + } + /** * Get mail transport instance * @@ -95,4 +102,16 @@ class Client extends Base return $this; } + + /** + * Return the list of registered transports + * + * @access public + * @return array + */ + public function getAvailableTransports() + { + $availableTransports = $this->transports->keys(); + return array_combine($availableTransports, $availableTransports); + } } diff --git a/sources/app/Core/Mail/Transport/Mail.php b/sources/app/Core/Mail/Transport/Mail.php index aff3ee2..d27925f 100644 --- a/sources/app/Core/Mail/Transport/Mail.php +++ b/sources/app/Core/Mail/Transport/Mail.php @@ -32,7 +32,7 @@ class Mail extends Base implements ClientInterface try { $message = Swift_Message::newInstance() ->setSubject($subject) - ->setFrom(array(MAIL_FROM => $author)) + ->setFrom(array($this->helper->mail->getMailSenderAddress() => $author)) ->setBody($html, 'text/html') ->setTo(array($email => $name)); diff --git a/sources/app/Core/Markdown.php b/sources/app/Core/Markdown.php index 827fd0d..b5abe5e 100644 --- a/sources/app/Core/Markdown.php +++ b/sources/app/Core/Markdown.php @@ -15,12 +15,12 @@ use Pimple\Container; class Markdown extends Parsedown { /** - * Link params for tasks + * Task links generated will use the project token instead * * @access private - * @var array + * @var boolean */ - private $link = array(); + private $isPublicLink = false; /** * Container @@ -35,11 +35,11 @@ class Markdown extends Parsedown * * @access public * @param Container $container - * @param array $link + * @param boolean $isPublicLink */ - public function __construct(Container $container, array $link) + public function __construct(Container $container, $isPublicLink) { - $this->link = $link; + $this->isPublicLink = $isPublicLink; $this->container = $container; $this->InlineTypes['#'][] = 'TaskLink'; $this->InlineTypes['@'][] = 'UserLink'; @@ -53,26 +53,26 @@ class Markdown extends Parsedown * * @access public * @param array $Excerpt - * @return array + * @return array|null */ protected function inlineTaskLink(array $Excerpt) { - if (! empty($this->link) && preg_match('!#(\d+)!i', $Excerpt['text'], $matches)) { - $url = $this->container['helper']->url->href( - $this->link['controller'], - $this->link['action'], - $this->link['params'] + array('task_id' => $matches[1]) - ); + if (preg_match('!#(\d+)!i', $Excerpt['text'], $matches)) { + $link = $this->buildTaskLink($matches[1]); - return array( - 'extent' => strlen($matches[0]), - 'element' => array( - 'name' => 'a', - 'text' => $matches[0], - 'attributes' => array('href' => $url) - ), - ); + if (! empty($link)) { + return array( + 'extent' => strlen($matches[0]), + 'element' => array( + 'name' => 'a', + 'text' => $matches[0], + 'attributes' => array('href' => $link), + ), + ); + } } + + return null; } /** @@ -82,15 +82,15 @@ class Markdown extends Parsedown * * @access public * @param array $Excerpt - * @return array + * @return array|null */ protected function inlineUserLink(array $Excerpt) { - if (preg_match('/^@([^\s]+)/', $Excerpt['text'], $matches)) { - $user_id = $this->container['user']->getIdByUsername($matches[1]); + if (! $this->isPublicLink && preg_match('/^@([^\s]+)/', $Excerpt['text'], $matches)) { + $user_id = $this->container['userModel']->getIdByUsername($matches[1]); if (! empty($user_id)) { - $url = $this->container['helper']->url->href('user', 'profile', array('user_id' => $user_id)); + $url = $this->container['helper']->url->href('UserViewController', 'profile', array('user_id' => $user_id)); return array( 'extent' => strlen($matches[0]), @@ -102,5 +102,40 @@ class Markdown extends Parsedown ); } } + + return null; + } + + /** + * Build task link + * + * @access private + * @param integer $task_id + * @return string + */ + private function buildTaskLink($task_id) + { + if ($this->isPublicLink) { + $token = $this->container['memoryCache']->proxy($this->container['taskFinderModel'], 'getProjectToken', $task_id); + + if (! empty($token)) { + return $this->container['helper']->url->href( + 'TaskViewController', + 'readonly', + array( + 'token' => $token, + 'task_id' => $task_id, + ) + ); + } + + return ''; + } + + return $this->container['helper']->url->href( + 'TaskViewController', + 'show', + array('task_id' => $task_id) + ); } } diff --git a/sources/app/Notification/NotificationInterface.php b/sources/app/Core/Notification/NotificationInterface.php similarity index 89% rename from sources/app/Notification/NotificationInterface.php rename to sources/app/Core/Notification/NotificationInterface.php index 8431a77..d336983 100644 --- a/sources/app/Notification/NotificationInterface.php +++ b/sources/app/Core/Notification/NotificationInterface.php @@ -1,11 +1,11 @@ container; - $this->container['dispatcher']->addListener($event, function () use ($container, $callback) { + $this->dispatcher->addListener($event, function () use ($container, $callback) { call_user_func($callback, $container); }); } @@ -70,7 +70,7 @@ abstract class Base extends \Kanboard\Core\Base /** * Get plugin name * - * This method should be overrided by your Plugin class + * This method should be overridden by your Plugin class * * @access public * @return string @@ -83,7 +83,7 @@ abstract class Base extends \Kanboard\Core\Base /** * Get plugin description * - * This method should be overrided by your Plugin class + * This method should be overridden by your Plugin class * * @access public * @return string @@ -96,7 +96,7 @@ abstract class Base extends \Kanboard\Core\Base /** * Get plugin author * - * This method should be overrided by your Plugin class + * This method should be overridden by your Plugin class * * @access public * @return string @@ -109,7 +109,7 @@ abstract class Base extends \Kanboard\Core\Base /** * Get plugin version * - * This method should be overrided by your Plugin class + * This method should be overridden by your Plugin class * * @access public * @return string @@ -122,7 +122,7 @@ abstract class Base extends \Kanboard\Core\Base /** * Get plugin homepage * - * This method should be overrided by your Plugin class + * This method should be overridden by your Plugin class * * @access public * @return string diff --git a/sources/app/Core/Plugin/Directory.php b/sources/app/Core/Plugin/Directory.php new file mode 100644 index 0000000..21f11ca --- /dev/null +++ b/sources/app/Core/Plugin/Directory.php @@ -0,0 +1,56 @@ +httpClient->getJson($url); + $plugins = array_filter($plugins, array($this, 'isCompatible')); + $plugins = array_filter($plugins, array($this, 'isInstallable')); + return $plugins; + } + + /** + * Filter plugins + * + * @param array $plugin + * @param string $appVersion + * @return bool + */ + public function isCompatible(array $plugin, $appVersion = APP_VERSION) + { + if (strpos($appVersion, 'master') !== false) { + return true; + } + + return $plugin['compatible_version'] === $appVersion; + } + + /** + * Filter plugins + * + * @param array $plugin + * @return bool + */ + public function isInstallable(array $plugin) + { + return $plugin['remote_install']; + } +} diff --git a/sources/app/Core/Plugin/Hook.php b/sources/app/Core/Plugin/Hook.php index a3bcd91..ade6915 100644 --- a/sources/app/Core/Plugin/Hook.php +++ b/sources/app/Core/Plugin/Hook.php @@ -5,8 +5,8 @@ namespace Kanboard\Core\Plugin; /** * Plugin Hooks Handler * - * @package plugin - * @author Frederic Guillot + * @package Kanboard\Core\Plugin + * @author Frederic Guillot */ class Hook { diff --git a/sources/app/Core/Plugin/Installer.php b/sources/app/Core/Plugin/Installer.php new file mode 100644 index 0000000..48c4d97 --- /dev/null +++ b/sources/app/Core/Plugin/Installer.php @@ -0,0 +1,162 @@ +downloadPluginArchive($archiveUrl); + + if (! $zip->extractTo(PLUGINS_DIR)) { + $this->cleanupArchive($zip); + throw new PluginInstallerException(t('Unable to extract plugin archive.')); + } + + $this->cleanupArchive($zip); + } + + /** + * Uninstall a plugin + * + * @access public + * @param string $pluginId + * @throws PluginInstallerException + */ + public function uninstall($pluginId) + { + $pluginFolder = PLUGINS_DIR.DIRECTORY_SEPARATOR.basename($pluginId); + + if (! file_exists($pluginFolder)) { + throw new PluginInstallerException(t('Plugin not found.')); + } + + if (! is_writable($pluginFolder)) { + throw new PluginInstallerException(e('You don\'t have the permission to remove this plugin.')); + } + + $this->removeAllDirectories($pluginFolder); + } + + /** + * Update a plugin + * + * @access public + * @param string $archiveUrl + * @throws PluginInstallerException + */ + public function update($archiveUrl) + { + $zip = $this->downloadPluginArchive($archiveUrl); + + $firstEntry = $zip->statIndex(0); + $this->uninstall($firstEntry['name']); + + if (! $zip->extractTo(PLUGINS_DIR)) { + $this->cleanupArchive($zip); + throw new PluginInstallerException(t('Unable to extract plugin archive.')); + } + + $this->cleanupArchive($zip); + } + + /** + * Download archive from URL + * + * @access protected + * @param string $archiveUrl + * @return ZipArchive + * @throws PluginInstallerException + */ + protected function downloadPluginArchive($archiveUrl) + { + $zip = new ZipArchive(); + $archiveData = $this->httpClient->get($archiveUrl); + $archiveFile = tempnam(sys_get_temp_dir(), 'kb_plugin'); + + if (empty($archiveData)) { + unlink($archiveFile); + throw new PluginInstallerException(t('Unable to download plugin archive.')); + } + + if (file_put_contents($archiveFile, $archiveData) === false) { + unlink($archiveFile); + throw new PluginInstallerException(t('Unable to write temporary file for plugin.')); + } + + if ($zip->open($archiveFile) !== true) { + unlink($archiveFile); + throw new PluginInstallerException(t('Unable to open plugin archive.')); + } + + if ($zip->numFiles === 0) { + unlink($archiveFile); + throw new PluginInstallerException(t('There is no file in the plugin archive.')); + } + + return $zip; + } + + /** + * Remove archive file + * + * @access protected + * @param ZipArchive $zip + */ + protected function cleanupArchive(ZipArchive $zip) + { + unlink($zip->filename); + $zip->close(); + } + + /** + * Remove recursively a directory + * + * @access protected + * @param string $directory + */ + protected function removeAllDirectories($directory) + { + $it = new RecursiveDirectoryIterator($directory, RecursiveDirectoryIterator::SKIP_DOTS); + $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST); + + foreach ($files as $file) { + if ($file->isDir()) { + rmdir($file->getRealPath()); + } else { + unlink($file->getRealPath()); + } + } + + rmdir($directory); + } +} diff --git a/sources/app/Core/Plugin/Loader.php b/sources/app/Core/Plugin/Loader.php index 775673d..f2f6add 100644 --- a/sources/app/Core/Plugin/Loader.php +++ b/sources/app/Core/Plugin/Loader.php @@ -2,34 +2,37 @@ namespace Kanboard\Core\Plugin; +use Composer\Autoload\ClassLoader; use DirectoryIterator; -use PDOException; use LogicException; -use RuntimeException; use Kanboard\Core\Tool; /** * Plugin Loader * - * @package plugin - * @author Frederic Guillot + * @package Kanboard\Core\Plugin + * @author Frederic Guillot */ class Loader extends \Kanboard\Core\Base { - /** - * Schema version table for plugins - * - * @var string - */ - const TABLE_SCHEMA = 'plugin_schema_versions'; - /** * Plugin instances * - * @access public + * @access protected * @var array */ - public $plugins = array(); + protected $plugins = array(); + + /** + * Get list of loaded plugins + * + * @access public + * @return Base[] + */ + public function getPlugins() + { + return $this->plugins; + } /** * Scan plugin folder and load plugins @@ -39,118 +42,72 @@ class Loader extends \Kanboard\Core\Base public function scan() { if (file_exists(PLUGINS_DIR)) { + $loader = new ClassLoader(); + $loader->addPsr4('Kanboard\Plugin\\', PLUGINS_DIR); + $loader->register(); + $dir = new DirectoryIterator(PLUGINS_DIR); - foreach ($dir as $fileinfo) { - if (! $fileinfo->isDot() && $fileinfo->isDir()) { - $plugin = $fileinfo->getFilename(); - $this->loadSchema($plugin); - $this->load($plugin); + foreach ($dir as $fileInfo) { + if ($fileInfo->isDir() && substr($fileInfo->getFilename(), 0, 1) !== '.') { + $pluginName = $fileInfo->getFilename(); + $this->loadSchema($pluginName); + $this->initializePlugin($pluginName, $this->loadPlugin($pluginName)); } } } } + /** + * Load plugin schema + * + * @access public + * @param string $pluginName + */ + public function loadSchema($pluginName) + { + if (SchemaHandler::hasSchema($pluginName)) { + $schemaHandler = new SchemaHandler($this->container); + $schemaHandler->loadSchema($pluginName); + } + } + /** * Load plugin * * @access public * @throws LogicException - * @param string $plugin + * @param string $pluginName + * @return Base */ - public function load($plugin) + public function loadPlugin($pluginName) { - $class = '\Kanboard\Plugin\\'.$plugin.'\\Plugin'; + $className = '\Kanboard\Plugin\\'.$pluginName.'\\Plugin'; - if (! class_exists($class)) { - throw new LogicException('Unable to load this plugin class '.$class); + if (! class_exists($className)) { + throw new LogicException('Unable to load this plugin class '.$className); } - $instance = new $class($this->container); - - Tool::buildDic($this->container, $instance->getClasses()); - - Tool::buildDICHelpers($this->container, $instance->getHelpers()); - - $instance->initialize(); - $this->plugins[] = $instance; + return new $className($this->container); } /** - * Load plugin schema + * Initialize plugin * * @access public - * @param string $plugin + * @param string $pluginName + * @param Base $plugin */ - public function loadSchema($plugin) + public function initializePlugin($pluginName, Base $plugin) { - $filename = PLUGINS_DIR.'/'.$plugin.'/Schema/'.ucfirst(DB_DRIVER).'.php'; - - if (file_exists($filename)) { - require_once($filename); - $this->migrateSchema($plugin); + if (method_exists($plugin, 'onStartup')) { + $this->dispatcher->addListener('app.bootstrap', array($plugin, 'onStartup')); } - } - /** - * Execute plugin schema migrations - * - * @access public - * @param string $plugin - */ - public function migrateSchema($plugin) - { - $last_version = constant('\Kanboard\Plugin\\'.$plugin.'\Schema\VERSION'); - $current_version = $this->getSchemaVersion($plugin); + Tool::buildDIC($this->container, $plugin->getClasses()); + Tool::buildDICHelpers($this->container, $plugin->getHelpers()); - try { - $this->db->startTransaction(); - $this->db->getDriver()->disableForeignKeys(); - - for ($i = $current_version + 1; $i <= $last_version; $i++) { - $function_name = '\Kanboard\Plugin\\'.$plugin.'\Schema\version_'.$i; - - if (function_exists($function_name)) { - call_user_func($function_name, $this->db->getConnection()); - } - } - - $this->db->getDriver()->enableForeignKeys(); - $this->db->closeTransaction(); - $this->setSchemaVersion($plugin, $i - 1); - } catch (PDOException $e) { - $this->db->cancelTransaction(); - $this->db->getDriver()->enableForeignKeys(); - throw new RuntimeException('Unable to migrate schema for the plugin: '.$plugin.' => '.$e->getMessage()); - } - } - - /** - * Get current plugin schema version - * - * @access public - * @param string $plugin - * @return integer - */ - public function getSchemaVersion($plugin) - { - return (int) $this->db->table(self::TABLE_SCHEMA)->eq('plugin', strtolower($plugin))->findOneColumn('version'); - } - - /** - * Save last plugin schema version - * - * @access public - * @param string $plugin - * @param integer $version - * @return boolean - */ - public function setSchemaVersion($plugin, $version) - { - $dictionary = array( - strtolower($plugin) => $version - ); - - return $this->db->getDriver()->upsert(self::TABLE_SCHEMA, 'plugin', 'version', $dictionary); + $plugin->initialize(); + $this->plugins[$pluginName] = $plugin; } } diff --git a/sources/app/Core/Plugin/PluginInstallerException.php b/sources/app/Core/Plugin/PluginInstallerException.php new file mode 100644 index 0000000..7d356c9 --- /dev/null +++ b/sources/app/Core/Plugin/PluginInstallerException.php @@ -0,0 +1,15 @@ +migrateSchema($pluginName); + } + + /** + * Execute plugin schema migrations + * + * @access public + * @param string $pluginName + */ + public function migrateSchema($pluginName) + { + $lastVersion = constant('\Kanboard\Plugin\\'.$pluginName.'\Schema\VERSION'); + $currentVersion = $this->getSchemaVersion($pluginName); + + try { + $this->db->startTransaction(); + $this->db->getDriver()->disableForeignKeys(); + + for ($i = $currentVersion + 1; $i <= $lastVersion; $i++) { + $functionName = '\Kanboard\Plugin\\'.$pluginName.'\Schema\version_'.$i; + + if (function_exists($functionName)) { + call_user_func($functionName, $this->db->getConnection()); + } + } + + $this->db->getDriver()->enableForeignKeys(); + $this->db->closeTransaction(); + $this->setSchemaVersion($pluginName, $i - 1); + } catch (PDOException $e) { + $this->db->cancelTransaction(); + $this->db->getDriver()->enableForeignKeys(); + throw new RuntimeException('Unable to migrate schema for the plugin: '.$pluginName.' => '.$e->getMessage()); + } + } + + /** + * Get current plugin schema version + * + * @access public + * @param string $plugin + * @return integer + */ + public function getSchemaVersion($plugin) + { + return (int) $this->db->table(self::TABLE_SCHEMA)->eq('plugin', strtolower($plugin))->findOneColumn('version'); + } + + /** + * Save last plugin schema version + * + * @access public + * @param string $plugin + * @param integer $version + * @return boolean + */ + public function setSchemaVersion($plugin, $version) + { + $dictionary = array( + strtolower($plugin) => $version + ); + + return $this->db->getDriver()->upsert(self::TABLE_SCHEMA, 'plugin', 'version', $dictionary); + } +} diff --git a/sources/app/Core/Queue/JobHandler.php b/sources/app/Core/Queue/JobHandler.php new file mode 100644 index 0000000..7ca3632 --- /dev/null +++ b/sources/app/Core/Queue/JobHandler.php @@ -0,0 +1,70 @@ + get_class($job), + 'params' => $job->getJobParams(), + 'user_id' => $this->userSession->getId(), + )); + } + + /** + * Execute a job + * + * @access public + * @param Job $job + */ + public function executeJob(Job $job) + { + $payload = $job->getBody(); + $className = $payload['class']; + $this->memoryCache->flush(); + $this->prepareJobSession($payload['user_id']); + + if (DEBUG) { + $this->logger->debug(__METHOD__.' Received job => '.$className.' ('.getmypid().')'); + } + + $worker = new $className($this->container); + call_user_func_array(array($worker, 'execute'), $payload['params']); + } + + /** + * Create the session for the job + * + * @access protected + * @param integer $user_id + */ + protected function prepareJobSession($user_id) + { + $session = array(); + $this->sessionStorage->setStorage($session); + + if ($user_id > 0) { + $user = $this->userModel->getById($user_id); + $this->userSession->initialize($user); + } + } +} diff --git a/sources/app/Core/Queue/QueueManager.php b/sources/app/Core/Queue/QueueManager.php new file mode 100644 index 0000000..f34cb22 --- /dev/null +++ b/sources/app/Core/Queue/QueueManager.php @@ -0,0 +1,71 @@ +queue = $queue; + return $this; + } + + /** + * Send a new job to the queue + * + * @access public + * @param BaseJob $job + * @return $this + */ + public function push(BaseJob $job) + { + if ($this->queue !== null) { + $this->queue->push(JobHandler::getInstance($this->container)->serializeJob($job)); + } else { + call_user_func_array(array($job, 'execute'), $job->getJobParams()); + } + + return $this; + } + + /** + * Wait for new jobs + * + * @access public + * @throws LogicException + */ + public function listen() + { + if ($this->queue === null) { + throw new LogicException('No Queue Driver defined!'); + } + + while ($job = $this->queue->pull()) { + JobHandler::getInstance($this->container)->executeJob($job); + $this->queue->completed($job); + } + } +} diff --git a/sources/app/Core/Session/SessionStorage.php b/sources/app/Core/Session/SessionStorage.php index 6e2f966..9e93602 100644 --- a/sources/app/Core/Session/SessionStorage.php +++ b/sources/app/Core/Session/SessionStorage.php @@ -22,6 +22,7 @@ namespace Kanboard\Core\Session; * @property bool $twoFactorBeforeCodeCalled * @property string $twoFactorSecret * @property string $oauthState + * @property int $smsTwoFactorSecret */ class SessionStorage { diff --git a/sources/app/Core/Template.php b/sources/app/Core/Template.php index 1874d44..d3ec26d 100644 --- a/sources/app/Core/Template.php +++ b/sources/app/Core/Template.php @@ -116,7 +116,7 @@ class Template } if ($plugin !== 'kanboard' && $plugin !== '') { - return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', '..', 'plugins', ucfirst($plugin), 'Template', $template.'.php')); + return implode(DIRECTORY_SEPARATOR, array(PLUGINS_DIR, ucfirst($plugin), 'Template', $template.'.php')); } return implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'Template', $template.'.php')); diff --git a/sources/app/Core/Tool.php b/sources/app/Core/Tool.php index 3423998..bfa6c95 100644 --- a/sources/app/Core/Tool.php +++ b/sources/app/Core/Tool.php @@ -12,26 +12,6 @@ use Pimple\Container; */ class Tool { - /** - * Get the mailbox hash from an email address - * - * @static - * @access public - * @param string $email - * @return string - */ - public static function getMailboxHash($email) - { - if (! strpos($email, '@') || ! strpos($email, '+')) { - return ''; - } - - list($local_part, ) = explode('@', $email); - list(, $identifier) = explode('+', $local_part); - - return $identifier; - } - /** * Build dependency injection container from an array * diff --git a/sources/app/Core/User/GroupSync.php b/sources/app/Core/User/GroupSync.php index 573acd4..d0bb647 100644 --- a/sources/app/Core/User/GroupSync.php +++ b/sources/app/Core/User/GroupSync.php @@ -16,16 +16,52 @@ class GroupSync extends Base * Synchronize group membership * * @access public - * @param integer $userId - * @param array $groupIds + * @param integer $userId + * @param array $externalGroupIds */ - public function synchronize($userId, array $groupIds) + public function synchronize($userId, array $externalGroupIds) { - foreach ($groupIds as $groupId) { - $group = $this->group->getByExternalId($groupId); + $userGroups = $this->groupMemberModel->getGroups($userId); + $this->addGroups($userId, $userGroups, $externalGroupIds); + $this->removeGroups($userId, $userGroups, $externalGroupIds); + } - if (! empty($group) && ! $this->groupMember->isMember($group['id'], $userId)) { - $this->groupMember->addUser($group['id'], $userId); + /** + * Add missing groups to the user + * + * @access protected + * @param integer $userId + * @param array $userGroups + * @param array $externalGroupIds + */ + protected function addGroups($userId, array $userGroups, array $externalGroupIds) + { + $userGroupIds = array_column($userGroups, 'external_id', 'external_id'); + + foreach ($externalGroupIds as $externalGroupId) { + if (! isset($userGroupIds[$externalGroupId])) { + $group = $this->groupModel->getByExternalId($externalGroupId); + + if (! empty($group)) { + $this->groupMemberModel->addUser($group['id'], $userId); + } + } + } + } + + /** + * Remove groups from the user + * + * @access protected + * @param integer $userId + * @param array $userGroups + * @param array $externalGroupIds + */ + protected function removeGroups($userId, array $userGroups, array $externalGroupIds) + { + foreach ($userGroups as $userGroup) { + if (! empty($userGroup['external_id']) && ! in_array($userGroup['external_id'], $externalGroupIds)) { + $this->groupMemberModel->removeUser($userGroup['id'], $userId); } } } diff --git a/sources/app/Core/User/UserProfile.php b/sources/app/Core/User/UserProfile.php index ef32580..8b9ebb7 100644 --- a/sources/app/Core/User/UserProfile.php +++ b/sources/app/Core/User/UserProfile.php @@ -3,6 +3,7 @@ namespace Kanboard\Core\User; use Kanboard\Core\Base; +use Kanboard\Event\UserProfileSyncEvent; /** * User Profile @@ -12,6 +13,8 @@ use Kanboard\Core\Base; */ class UserProfile extends Base { + const EVENT_USER_PROFILE_AFTER_SYNC = 'user_profile.after.sync'; + /** * Assign provider data to the local user * @@ -22,12 +25,12 @@ class UserProfile extends Base */ public function assign($userId, UserProviderInterface $user) { - $profile = $this->user->getById($userId); + $profile = $this->userModel->getById($userId); $values = UserProperty::filterProperties($profile, UserProperty::getProperties($user)); $values['id'] = $userId; - if ($this->user->update($values)) { + if ($this->userModel->update($values)) { $profile = array_merge($profile, $values); $this->userSession->initialize($profile); return true; @@ -46,7 +49,7 @@ class UserProfile extends Base public function initialize(UserProviderInterface $user) { if ($user->getInternalId()) { - $profile = $this->user->getById($user->getInternalId()); + $profile = $this->userModel->getById($user->getInternalId()); } elseif ($user->getExternalIdColumn() && $user->getExternalId()) { $profile = $this->userSync->synchronize($user); $this->groupSync->synchronize($profile['id'], $user->getExternalGroupIds()); @@ -54,6 +57,7 @@ class UserProfile extends Base if (! empty($profile) && $profile['is_active'] == 1) { $this->userSession->initialize($profile); + $this->dispatcher->dispatch(self::EVENT_USER_PROFILE_AFTER_SYNC, new UserProfileSyncEvent($profile, $user)); return true; } diff --git a/sources/app/Core/User/UserProperty.php b/sources/app/Core/User/UserProperty.php index f8b08a3..348bd7f 100644 --- a/sources/app/Core/User/UserProperty.php +++ b/sources/app/Core/User/UserProperty.php @@ -44,10 +44,14 @@ class UserProperty */ public static function filterProperties(array $profile, array $properties) { + $excludedProperties = array('username'); $values = array(); foreach ($properties as $property => $value) { - if (array_key_exists($property, $profile) && ! self::isNotEmptyValue($profile[$property])) { + if (self::isNotEmptyValue($value) && + ! in_array($property, $excludedProperties) && + array_key_exists($property, $profile) && + $value !== $profile[$property]) { $values[$property] = $value; } } diff --git a/sources/app/Core/User/UserSession.php b/sources/app/Core/User/UserSession.php index 0034c47..9c63f07 100644 --- a/sources/app/Core/User/UserSession.php +++ b/sources/app/Core/User/UserSession.php @@ -22,7 +22,7 @@ class UserSession extends Base public function refresh($user_id) { if ($this->getId() == $user_id) { - $this->initialize($this->user->getById($user_id)); + $this->initialize($this->userModel->getById($user_id)); } } diff --git a/sources/app/Core/User/UserSync.php b/sources/app/Core/User/UserSync.php index d450a0b..c2f8549 100644 --- a/sources/app/Core/User/UserSync.php +++ b/sources/app/Core/User/UserSync.php @@ -21,7 +21,7 @@ class UserSync extends Base */ public function synchronize(UserProviderInterface $user) { - $profile = $this->user->getByExternalId($user->getExternalIdColumn(), $user->getExternalId()); + $profile = $this->userModel->getByExternalId($user->getExternalIdColumn(), $user->getExternalId()); $properties = UserProperty::getProperties($user); if (! empty($profile)) { @@ -47,7 +47,7 @@ class UserSync extends Base if (! empty($values)) { $values['id'] = $profile['id']; - $result = $this->user->update($values); + $result = $this->userModel->update($values); return $result ? array_merge($profile, $properties) : $profile; } @@ -64,13 +64,13 @@ class UserSync extends Base */ private function createUser(UserProviderInterface $user, array $properties) { - $id = $this->user->create($properties); + $userId = $this->userModel->create($properties); - if ($id === false) { + if ($userId === false) { $this->logger->error('Unable to create user profile: '.$user->getExternalId()); return array(); } - return $this->user->getById($id); + return $this->userModel->getById($userId); } } diff --git a/sources/app/Event/UserProfileSyncEvent.php b/sources/app/Event/UserProfileSyncEvent.php new file mode 100644 index 0000000..c02e1d8 --- /dev/null +++ b/sources/app/Event/UserProfileSyncEvent.php @@ -0,0 +1,64 @@ +profile = $profile; + $this->user = $user; + } + + /** + * Get user profile + * + * @access public + * @return array + */ + public function getProfile() + { + return $this->profile; + } + + /** + * Get user provider object + * + * @access public + * @return UserProviderInterface|LdapUserProvider + */ + public function getUser() + { + return $this->user; + } +} diff --git a/sources/app/Export/SubtaskExport.php b/sources/app/Export/SubtaskExport.php index 386c566..0939838 100644 --- a/sources/app/Export/SubtaskExport.php +++ b/sources/app/Export/SubtaskExport.php @@ -3,9 +3,9 @@ namespace Kanboard\Export; use Kanboard\Core\Base; -use Kanboard\Model\Task; -use Kanboard\Model\Subtask; -use Kanboard\Model\User; +use Kanboard\Model\TaskModel; +use Kanboard\Model\SubtaskModel; +use Kanboard\Model\UserModel; /** * Subtask Export @@ -34,7 +34,7 @@ class SubtaskExport extends Base */ public function export($project_id, $from, $to) { - $this->subtask_status = $this->subtask->getStatusList(); + $this->subtask_status = $this->subtaskModel->getStatusList(); $subtasks = $this->getSubtasks($project_id, $from, $to); $results = array($this->getColumns()); @@ -106,19 +106,19 @@ class SubtaskExport extends Base $to = $this->dateParser->removeTimeFromTimestamp(strtotime('+1 day', $this->dateParser->getTimestamp($to))); } - return $this->db->table(Subtask::TABLE) + return $this->db->table(SubtaskModel::TABLE) ->eq('project_id', $project_id) ->columns( - Subtask::TABLE.'.*', - User::TABLE.'.username AS assignee_username', - User::TABLE.'.name AS assignee_name', - Task::TABLE.'.title AS task_title' + SubtaskModel::TABLE.'.*', + UserModel::TABLE.'.username AS assignee_username', + UserModel::TABLE.'.name AS assignee_name', + TaskModel::TABLE.'.title AS task_title' ) ->gte('date_creation', $from) ->lte('date_creation', $to) - ->join(Task::TABLE, 'id', 'task_id') - ->join(User::TABLE, 'id', 'user_id') - ->asc(Subtask::TABLE.'.id') + ->join(TaskModel::TABLE, 'id', 'task_id') + ->join(UserModel::TABLE, 'id', 'user_id') + ->asc(SubtaskModel::TABLE.'.id') ->findAll(); } } diff --git a/sources/app/Export/TaskExport.php b/sources/app/Export/TaskExport.php index b98582a..0e576d3 100644 --- a/sources/app/Export/TaskExport.php +++ b/sources/app/Export/TaskExport.php @@ -4,7 +4,7 @@ namespace Kanboard\Export; use Kanboard\Core\Base; use Kanboard\Core\DateParser; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; use PDO; /** @@ -27,7 +27,7 @@ class TaskExport extends Base public function export($project_id, $from, $to) { $tasks = $this->getTasks($project_id, $from, $to); - $swimlanes = $this->swimlane->getList($project_id); + $swimlanes = $this->swimlaneModel->getList($project_id); $results = array($this->getColumns()); foreach ($tasks as &$task) { @@ -102,9 +102,9 @@ class TaskExport extends Base */ public function format(array &$task, array &$swimlanes) { - $colors = $this->color->getList(); + $colors = $this->colorModel->getList(); - $task['is_active'] = $task['is_active'] == Task::STATUS_OPEN ? e('Open') : e('Closed'); + $task['is_active'] = $task['is_active'] == TaskModel::STATUS_OPEN ? e('Open') : e('Closed'); $task['color_id'] = $colors[$task['color_id']]; $task['score'] = $task['score'] ?: 0; $task['swimlane_id'] = isset($swimlanes[$task['swimlane_id']]) ? $swimlanes[$task['swimlane_id']] : '?'; diff --git a/sources/app/Export/TransitionExport.php b/sources/app/Export/TransitionExport.php index 97dc28a..35f9fe4 100644 --- a/sources/app/Export/TransitionExport.php +++ b/sources/app/Export/TransitionExport.php @@ -3,7 +3,6 @@ namespace Kanboard\Export; use Kanboard\Core\Base; -use Kanboard\Core\DateParser; /** * Transition Export @@ -25,7 +24,7 @@ class TransitionExport extends Base public function export($project_id, $from, $to) { $results = array($this->getColumns()); - $transitions = $this->transition->getAllByProjectAndDate($project_id, $from, $to); + $transitions = $this->transitionModel->getAllByProjectAndDate($project_id, $from, $to); foreach ($transitions as $transition) { $results[] = $this->format($transition); @@ -68,7 +67,7 @@ class TransitionExport extends Base $transition['src_column'], $transition['dst_column'], $transition['name'] ?: $transition['username'], - date($this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT), $transition['date']), + date($this->dateParser->getUserDateTimeFormat(), $transition['date']), round($transition['time_spent'] / 3600, 2) ); diff --git a/sources/app/Filter/BaseDateFilter.php b/sources/app/Filter/BaseDateFilter.php new file mode 100644 index 0000000..56fb2d7 --- /dev/null +++ b/sources/app/Filter/BaseDateFilter.php @@ -0,0 +1,103 @@ +dateParser = $dateParser; + return $this; + } + + /** + * Parse operator in the input string + * + * @access protected + * @return string + */ + protected function parseOperator() + { + $operators = array( + '<=' => 'lte', + '>=' => 'gte', + '<' => 'lt', + '>' => 'gt', + ); + + foreach ($operators as $operator => $method) { + if (strpos($this->value, $operator) === 0) { + $this->value = substr($this->value, strlen($operator)); + return $method; + } + } + + return ''; + } + + /** + * Apply a date filter + * + * @access protected + * @param string $field + */ + protected function applyDateFilter($field) + { + $method = $this->parseOperator(); + $timestamp = $this->dateParser->getTimestampFromIsoFormat($this->value); + + if ($method !== '') { + $this->query->$method($field, $this->getTimestampFromOperator($method, $timestamp)); + } else { + $this->query->gte($field, $timestamp); + $this->query->lte($field, $timestamp + 86399); + } + } + + /** + * Get timestamp from the operator + * + * @access public + * @param string $method + * @param integer $timestamp + * @return integer + */ + protected function getTimestampFromOperator($method, $timestamp) + { + switch ($method) { + case 'lte': + return $timestamp + 86399; + case 'lt': + return $timestamp; + case 'gte': + return $timestamp; + case 'gt': + return $timestamp + 86400; + } + + return $timestamp; + } +} diff --git a/sources/app/Filter/BaseFilter.php b/sources/app/Filter/BaseFilter.php new file mode 100644 index 0000000..e029f4e --- /dev/null +++ b/sources/app/Filter/BaseFilter.php @@ -0,0 +1,74 @@ +value = $value; + } + + /** + * Get object instance + * + * @static + * @access public + * @param mixed $value + * @return static + */ + public static function getInstance($value = null) + { + return new static($value); + } + + /** + * Set query + * + * @access public + * @param Table $query + * @return \Kanboard\Core\Filter\FilterInterface + */ + public function withQuery(Table $query) + { + $this->query = $query; + return $this; + } + + /** + * Set the value + * + * @access public + * @param string $value + * @return \Kanboard\Core\Filter\FilterInterface + */ + public function withValue($value) + { + $this->value = $value; + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityCreationDateFilter.php b/sources/app/Filter/ProjectActivityCreationDateFilter.php new file mode 100644 index 0000000..451f654 --- /dev/null +++ b/sources/app/Filter/ProjectActivityCreationDateFilter.php @@ -0,0 +1,38 @@ +applyDateFilter(ProjectActivityModel::TABLE.'.date_creation'); + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityCreatorFilter.php b/sources/app/Filter/ProjectActivityCreatorFilter.php new file mode 100644 index 0000000..573238d --- /dev/null +++ b/sources/app/Filter/ProjectActivityCreatorFilter.php @@ -0,0 +1,65 @@ +currentUserId = $userId; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('creator'); + } + + /** + * Apply filter + * + * @access public + * @return string + */ + public function apply() + { + if ($this->value === 'me') { + $this->query->eq(ProjectActivityModel::TABLE . '.creator_id', $this->currentUserId); + } else { + $this->query->beginOr(); + $this->query->ilike('uc.username', '%'.$this->value.'%'); + $this->query->ilike('uc.name', '%'.$this->value.'%'); + $this->query->closeOr(); + } + } +} diff --git a/sources/app/Filter/ProjectActivityProjectIdFilter.php b/sources/app/Filter/ProjectActivityProjectIdFilter.php new file mode 100644 index 0000000..7146a05 --- /dev/null +++ b/sources/app/Filter/ProjectActivityProjectIdFilter.php @@ -0,0 +1,38 @@ +query->eq(ProjectActivityModel::TABLE.'.project_id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityProjectIdsFilter.php b/sources/app/Filter/ProjectActivityProjectIdsFilter.php new file mode 100644 index 0000000..70968f7 --- /dev/null +++ b/sources/app/Filter/ProjectActivityProjectIdsFilter.php @@ -0,0 +1,43 @@ +value)) { + $this->query->eq(ProjectActivityModel::TABLE.'.project_id', 0); + } else { + $this->query->in(ProjectActivityModel::TABLE.'.project_id', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityProjectNameFilter.php b/sources/app/Filter/ProjectActivityProjectNameFilter.php new file mode 100644 index 0000000..b487218 --- /dev/null +++ b/sources/app/Filter/ProjectActivityProjectNameFilter.php @@ -0,0 +1,38 @@ +query->ilike(ProjectModel::TABLE.'.name', '%'.$this->value.'%'); + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityTaskIdFilter.php b/sources/app/Filter/ProjectActivityTaskIdFilter.php new file mode 100644 index 0000000..b8e074d --- /dev/null +++ b/sources/app/Filter/ProjectActivityTaskIdFilter.php @@ -0,0 +1,38 @@ +query->eq(ProjectActivityModel::TABLE.'.task_id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityTaskStatusFilter.php b/sources/app/Filter/ProjectActivityTaskStatusFilter.php new file mode 100644 index 0000000..2c98cab --- /dev/null +++ b/sources/app/Filter/ProjectActivityTaskStatusFilter.php @@ -0,0 +1,43 @@ +value === 'open') { + $this->query->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_OPEN); + } elseif ($this->value === 'closed') { + $this->query->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_CLOSED); + } + + return $this; + } +} diff --git a/sources/app/Filter/ProjectActivityTaskTitleFilter.php b/sources/app/Filter/ProjectActivityTaskTitleFilter.php new file mode 100644 index 0000000..bf2afa3 --- /dev/null +++ b/sources/app/Filter/ProjectActivityTaskTitleFilter.php @@ -0,0 +1,25 @@ +query->eq(ProjectGroupRoleModel::TABLE.'.project_id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/ProjectGroupRoleUsernameFilter.php b/sources/app/Filter/ProjectGroupRoleUsernameFilter.php new file mode 100644 index 0000000..9feac33 --- /dev/null +++ b/sources/app/Filter/ProjectGroupRoleUsernameFilter.php @@ -0,0 +1,44 @@ +query + ->join(GroupMemberModel::TABLE, 'group_id', 'group_id', ProjectGroupRoleModel::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id', GroupMemberModel::TABLE) + ->ilike(UserModel::TABLE.'.username', $this->value.'%'); + + return $this; + } +} diff --git a/sources/app/Filter/ProjectIdsFilter.php b/sources/app/Filter/ProjectIdsFilter.php new file mode 100644 index 0000000..9af9db5 --- /dev/null +++ b/sources/app/Filter/ProjectIdsFilter.php @@ -0,0 +1,43 @@ +value)) { + $this->query->eq(ProjectModel::TABLE.'.id', 0); + } else { + $this->query->in(ProjectModel::TABLE.'.id', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/ProjectStatusFilter.php b/sources/app/Filter/ProjectStatusFilter.php new file mode 100644 index 0000000..c1a06ef --- /dev/null +++ b/sources/app/Filter/ProjectStatusFilter.php @@ -0,0 +1,45 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(ProjectModel::TABLE.'.is_active', $this->value); + } elseif ($this->value === 'inactive' || $this->value === 'closed' || $this->value === 'disabled') { + $this->query->eq(ProjectModel::TABLE.'.is_active', 0); + } else { + $this->query->eq(ProjectModel::TABLE.'.is_active', 1); + } + + return $this; + } +} diff --git a/sources/app/Filter/ProjectTypeFilter.php b/sources/app/Filter/ProjectTypeFilter.php new file mode 100644 index 0000000..6afcd29 --- /dev/null +++ b/sources/app/Filter/ProjectTypeFilter.php @@ -0,0 +1,45 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(ProjectModel::TABLE.'.is_private', $this->value); + } elseif ($this->value === 'private') { + $this->query->eq(ProjectModel::TABLE.'.is_private', ProjectModel::TYPE_PRIVATE); + } else { + $this->query->eq(ProjectModel::TABLE.'.is_private', ProjectModel::TYPE_TEAM); + } + + return $this; + } +} diff --git a/sources/app/Filter/ProjectUserRoleProjectFilter.php b/sources/app/Filter/ProjectUserRoleProjectFilter.php new file mode 100644 index 0000000..6952364 --- /dev/null +++ b/sources/app/Filter/ProjectUserRoleProjectFilter.php @@ -0,0 +1,38 @@ +query->eq(ProjectUserRoleModel::TABLE.'.project_id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/ProjectUserRoleUsernameFilter.php b/sources/app/Filter/ProjectUserRoleUsernameFilter.php new file mode 100644 index 0000000..327d3d5 --- /dev/null +++ b/sources/app/Filter/ProjectUserRoleUsernameFilter.php @@ -0,0 +1,41 @@ +query + ->join(UserModel::TABLE, 'id', 'user_id') + ->ilike(UserModel::TABLE.'.username', $this->value.'%'); + + return $this; + } +} diff --git a/sources/app/Filter/TaskAssigneeFilter.php b/sources/app/Filter/TaskAssigneeFilter.php new file mode 100644 index 0000000..d6962a9 --- /dev/null +++ b/sources/app/Filter/TaskAssigneeFilter.php @@ -0,0 +1,75 @@ +currentUserId = $userId; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('assignee'); + } + + /** + * Apply filter + * + * @access public + * @return string + */ + public function apply() + { + if (is_int($this->value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.owner_id', $this->value); + } else { + switch ($this->value) { + case 'me': + $this->query->eq(TaskModel::TABLE.'.owner_id', $this->currentUserId); + break; + case 'nobody': + $this->query->eq(TaskModel::TABLE.'.owner_id', 0); + break; + default: + $this->query->beginOr(); + $this->query->ilike(UserModel::TABLE.'.username', '%'.$this->value.'%'); + $this->query->ilike(UserModel::TABLE.'.name', '%'.$this->value.'%'); + $this->query->closeOr(); + } + } + } +} diff --git a/sources/app/Filter/TaskCategoryFilter.php b/sources/app/Filter/TaskCategoryFilter.php new file mode 100644 index 0000000..35c52f6 --- /dev/null +++ b/sources/app/Filter/TaskCategoryFilter.php @@ -0,0 +1,46 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.category_id', $this->value); + } elseif ($this->value === 'none') { + $this->query->eq(TaskModel::TABLE.'.category_id', 0); + } else { + $this->query->eq(CategoryModel::TABLE.'.name', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskColorFilter.php b/sources/app/Filter/TaskColorFilter.php new file mode 100644 index 0000000..2ddb47c --- /dev/null +++ b/sources/app/Filter/TaskColorFilter.php @@ -0,0 +1,60 @@ +colorModel = $colorModel; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('color', 'colour'); + } + + /** + * Apply filter + * + * @access public + * @return FilterInterface + */ + public function apply() + { + $this->query->eq(TaskModel::TABLE.'.color_id', $this->colorModel->find($this->value)); + return $this; + } +} diff --git a/sources/app/Filter/TaskColumnFilter.php b/sources/app/Filter/TaskColumnFilter.php new file mode 100644 index 0000000..fa925b7 --- /dev/null +++ b/sources/app/Filter/TaskColumnFilter.php @@ -0,0 +1,44 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.column_id', $this->value); + } else { + $this->query->eq(ColumnModel::TABLE.'.title', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskCommentFilter.php b/sources/app/Filter/TaskCommentFilter.php new file mode 100644 index 0000000..52db558 --- /dev/null +++ b/sources/app/Filter/TaskCommentFilter.php @@ -0,0 +1,41 @@ +query->ilike(CommentModel::TABLE.'.comment', '%'.$this->value.'%'); + $this->query->join(CommentModel::TABLE, 'task_id', 'id', TaskModel::TABLE); + + return $this; + } +} diff --git a/sources/app/Filter/TaskCompletionDateFilter.php b/sources/app/Filter/TaskCompletionDateFilter.php new file mode 100644 index 0000000..79b5e7d --- /dev/null +++ b/sources/app/Filter/TaskCompletionDateFilter.php @@ -0,0 +1,38 @@ +applyDateFilter(TaskModel::TABLE.'.date_completed'); + return $this; + } +} diff --git a/sources/app/Filter/TaskCreationDateFilter.php b/sources/app/Filter/TaskCreationDateFilter.php new file mode 100644 index 0000000..db28ac8 --- /dev/null +++ b/sources/app/Filter/TaskCreationDateFilter.php @@ -0,0 +1,38 @@ +applyDateFilter(TaskModel::TABLE.'.date_creation'); + return $this; + } +} diff --git a/sources/app/Filter/TaskCreatorFilter.php b/sources/app/Filter/TaskCreatorFilter.php new file mode 100644 index 0000000..611db18 --- /dev/null +++ b/sources/app/Filter/TaskCreatorFilter.php @@ -0,0 +1,74 @@ +currentUserId = $userId; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('creator'); + } + + /** + * Apply filter + * + * @access public + * @return string + */ + public function apply() + { + if (is_int($this->value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.creator_id', $this->value); + } else { + switch ($this->value) { + case 'me': + $this->query->eq(TaskModel::TABLE.'.creator_id', $this->currentUserId); + break; + case 'nobody': + $this->query->eq(TaskModel::TABLE.'.creator_id', 0); + break; + default: + $this->query->beginOr(); + $this->query->ilike('uc.username', '%'.$this->value.'%'); + $this->query->ilike('uc.name', '%'.$this->value.'%'); + $this->query->closeOr(); + } + } + } +} diff --git a/sources/app/Filter/TaskDescriptionFilter.php b/sources/app/Filter/TaskDescriptionFilter.php new file mode 100644 index 0000000..c73c2f5 --- /dev/null +++ b/sources/app/Filter/TaskDescriptionFilter.php @@ -0,0 +1,38 @@ +query->ilike(TaskModel::TABLE.'.description', '%'.$this->value.'%'); + return $this; + } +} diff --git a/sources/app/Filter/TaskDueDateFilter.php b/sources/app/Filter/TaskDueDateFilter.php new file mode 100644 index 0000000..0de055b --- /dev/null +++ b/sources/app/Filter/TaskDueDateFilter.php @@ -0,0 +1,41 @@ +query->neq(TaskModel::TABLE.'.date_due', 0); + $this->query->notNull(TaskModel::TABLE.'.date_due'); + $this->applyDateFilter(TaskModel::TABLE.'.date_due'); + + return $this; + } +} diff --git a/sources/app/Filter/TaskDueDateRangeFilter.php b/sources/app/Filter/TaskDueDateRangeFilter.php new file mode 100644 index 0000000..a6aefbe --- /dev/null +++ b/sources/app/Filter/TaskDueDateRangeFilter.php @@ -0,0 +1,39 @@ +query->gte(TaskModel::TABLE.'.date_due', is_numeric($this->value[0]) ? $this->value[0] : strtotime($this->value[0])); + $this->query->lte(TaskModel::TABLE.'.date_due', is_numeric($this->value[1]) ? $this->value[1] : strtotime($this->value[1])); + return $this; + } +} diff --git a/sources/app/Filter/TaskIdExclusionFilter.php b/sources/app/Filter/TaskIdExclusionFilter.php new file mode 100644 index 0000000..20177b2 --- /dev/null +++ b/sources/app/Filter/TaskIdExclusionFilter.php @@ -0,0 +1,38 @@ +query->notin(TaskModel::TABLE.'.id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/TaskIdFilter.php b/sources/app/Filter/TaskIdFilter.php new file mode 100644 index 0000000..fdf668b --- /dev/null +++ b/sources/app/Filter/TaskIdFilter.php @@ -0,0 +1,38 @@ +query->eq(TaskModel::TABLE.'.id', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/TaskLinkFilter.php b/sources/app/Filter/TaskLinkFilter.php new file mode 100644 index 0000000..98cd597 --- /dev/null +++ b/sources/app/Filter/TaskLinkFilter.php @@ -0,0 +1,85 @@ +db = $db; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('link'); + } + + /** + * Apply filter + * + * @access public + * @return string + */ + public function apply() + { + $task_ids = $this->getSubQuery()->findAllByColumn('task_id'); + + if (! empty($task_ids)) { + $this->query->in(TaskModel::TABLE.'.id', $task_ids); + } else { + $this->query->eq(TaskModel::TABLE.'.id', 0); // No match + } + } + + /** + * Get subquery + * + * @access protected + * @return Table + */ + protected function getSubQuery() + { + return $this->db->table(TaskLinkModel::TABLE) + ->columns( + TaskLinkModel::TABLE.'.task_id', + LinkModel::TABLE.'.label' + ) + ->join(LinkModel::TABLE, 'id', 'link_id', TaskLinkModel::TABLE) + ->ilike(LinkModel::TABLE.'.label', $this->value); + } +} diff --git a/sources/app/Filter/TaskModificationDateFilter.php b/sources/app/Filter/TaskModificationDateFilter.php new file mode 100644 index 0000000..316f183 --- /dev/null +++ b/sources/app/Filter/TaskModificationDateFilter.php @@ -0,0 +1,38 @@ +applyDateFilter(TaskModel::TABLE.'.date_modification'); + return $this; + } +} diff --git a/sources/app/Filter/TaskProjectFilter.php b/sources/app/Filter/TaskProjectFilter.php new file mode 100644 index 0000000..0b5a336 --- /dev/null +++ b/sources/app/Filter/TaskProjectFilter.php @@ -0,0 +1,44 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.project_id', $this->value); + } else { + $this->query->ilike(ProjectModel::TABLE.'.name', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskProjectsFilter.php b/sources/app/Filter/TaskProjectsFilter.php new file mode 100644 index 0000000..2b6b16c --- /dev/null +++ b/sources/app/Filter/TaskProjectsFilter.php @@ -0,0 +1,43 @@ +value)) { + $this->query->eq(TaskModel::TABLE.'.project_id', 0); + } else { + $this->query->in(TaskModel::TABLE.'.project_id', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskReferenceFilter.php b/sources/app/Filter/TaskReferenceFilter.php new file mode 100644 index 0000000..27c838f --- /dev/null +++ b/sources/app/Filter/TaskReferenceFilter.php @@ -0,0 +1,38 @@ +query->eq(TaskModel::TABLE.'.reference', $this->value); + return $this; + } +} diff --git a/sources/app/Filter/TaskStartDateFilter.php b/sources/app/Filter/TaskStartDateFilter.php new file mode 100644 index 0000000..d5abedb --- /dev/null +++ b/sources/app/Filter/TaskStartDateFilter.php @@ -0,0 +1,38 @@ +applyDateFilter(TaskModel::TABLE.'.date_started'); + return $this; + } +} diff --git a/sources/app/Filter/TaskStatusFilter.php b/sources/app/Filter/TaskStatusFilter.php new file mode 100644 index 0000000..a55532c --- /dev/null +++ b/sources/app/Filter/TaskStatusFilter.php @@ -0,0 +1,43 @@ +value === 'open' || $this->value === 'closed') { + $this->query->eq(TaskModel::TABLE.'.is_active', $this->value === 'open' ? TaskModel::STATUS_OPEN : TaskModel::STATUS_CLOSED); + } else { + $this->query->eq(TaskModel::TABLE.'.is_active', $this->value); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskSubtaskAssigneeFilter.php b/sources/app/Filter/TaskSubtaskAssigneeFilter.php new file mode 100644 index 0000000..46553a3 --- /dev/null +++ b/sources/app/Filter/TaskSubtaskAssigneeFilter.php @@ -0,0 +1,140 @@ +currentUserId = $userId; + return $this; + } + + /** + * Set database object + * + * @access public + * @param Database $db + * @return TaskSubtaskAssigneeFilter + */ + public function setDatabase(Database $db) + { + $this->db = $db; + return $this; + } + + /** + * Get search attribute + * + * @access public + * @return string[] + */ + public function getAttributes() + { + return array('subtask:assignee'); + } + + /** + * Apply filter + * + * @access public + * @return string + */ + public function apply() + { + $task_ids = $this->getSubQuery()->findAllByColumn('task_id'); + + if (! empty($task_ids)) { + $this->query->in(TaskModel::TABLE.'.id', $task_ids); + } else { + $this->query->eq(TaskModel::TABLE.'.id', 0); // No match + } + } + + /** + * Get subquery + * + * @access protected + * @return Table + */ + protected function getSubQuery() + { + $subquery = $this->db->table(SubtaskModel::TABLE) + ->columns( + SubtaskModel::TABLE.'.user_id', + SubtaskModel::TABLE.'.task_id', + UserModel::TABLE.'.name', + UserModel::TABLE.'.username' + ) + ->join(UserModel::TABLE, 'id', 'user_id', SubtaskModel::TABLE) + ->neq(SubtaskModel::TABLE.'.status', SubtaskModel::STATUS_DONE); + + return $this->applySubQueryFilter($subquery); + } + + /** + * Apply subquery filter + * + * @access protected + * @param Table $subquery + * @return Table + */ + protected function applySubQueryFilter(Table $subquery) + { + if (is_int($this->value) || ctype_digit($this->value)) { + $subquery->eq(SubtaskModel::TABLE.'.user_id', $this->value); + } else { + switch ($this->value) { + case 'me': + $subquery->eq(SubtaskModel::TABLE.'.user_id', $this->currentUserId); + break; + case 'nobody': + $subquery->eq(SubtaskModel::TABLE.'.user_id', 0); + break; + default: + $subquery->beginOr(); + $subquery->ilike(UserModel::TABLE.'.username', $this->value.'%'); + $subquery->ilike(UserModel::TABLE.'.name', '%'.$this->value.'%'); + $subquery->closeOr(); + } + } + + return $subquery; + } +} diff --git a/sources/app/Filter/TaskSwimlaneFilter.php b/sources/app/Filter/TaskSwimlaneFilter.php new file mode 100644 index 0000000..0724396 --- /dev/null +++ b/sources/app/Filter/TaskSwimlaneFilter.php @@ -0,0 +1,50 @@ +value) || ctype_digit($this->value)) { + $this->query->eq(TaskModel::TABLE.'.swimlane_id', $this->value); + } elseif ($this->value === 'default') { + $this->query->eq(TaskModel::TABLE.'.swimlane_id', 0); + } else { + $this->query->beginOr(); + $this->query->ilike(SwimlaneModel::TABLE.'.name', $this->value); + $this->query->ilike(ProjectModel::TABLE.'.default_swimlane', $this->value); + $this->query->closeOr(); + } + + return $this; + } +} diff --git a/sources/app/Filter/TaskTagFilter.php b/sources/app/Filter/TaskTagFilter.php new file mode 100644 index 0000000..01b6f62 --- /dev/null +++ b/sources/app/Filter/TaskTagFilter.php @@ -0,0 +1,74 @@ +db = $db; + return $this; + } + + /** + * Apply filter + * + * @access public + * @return FilterInterface + */ + public function apply() + { + $task_ids = $this->db + ->table(TagModel::TABLE) + ->ilike(TagModel::TABLE.'.name', $this->value) + ->asc(TagModel::TABLE.'.project_id') + ->join(TaskTagModel::TABLE, 'tag_id', 'id') + ->findAllByColumn(TaskTagModel::TABLE.'.task_id'); + + if (empty($task_ids)) { + $task_ids = array(-1); + } + + $this->query->in(TaskModel::TABLE.'.id', $task_ids); + + return $this; + } +} diff --git a/sources/app/Filter/TaskTitleFilter.php b/sources/app/Filter/TaskTitleFilter.php new file mode 100644 index 0000000..4e3a2df --- /dev/null +++ b/sources/app/Filter/TaskTitleFilter.php @@ -0,0 +1,46 @@ +value) || (strlen($this->value) > 1 && $this->value{0} === '#' && ctype_digit(substr($this->value, 1)))) { + $this->query->beginOr(); + $this->query->eq(TaskModel::TABLE.'.id', str_replace('#', '', $this->value)); + $this->query->ilike(TaskModel::TABLE.'.title', '%'.$this->value.'%'); + $this->query->closeOr(); + } else { + $this->query->ilike(TaskModel::TABLE.'.title', '%'.$this->value.'%'); + } + + return $this; + } +} diff --git a/sources/app/Filter/UserNameFilter.php b/sources/app/Filter/UserNameFilter.php new file mode 100644 index 0000000..dfb07fd --- /dev/null +++ b/sources/app/Filter/UserNameFilter.php @@ -0,0 +1,35 @@ +query->beginOr() + ->ilike('username', '%'.$this->value.'%') + ->ilike('name', '%'.$this->value.'%') + ->closeOr(); + + return $this; + } +} diff --git a/sources/app/Formatter/BaseFormatter.php b/sources/app/Formatter/BaseFormatter.php new file mode 100644 index 0000000..89c4843 --- /dev/null +++ b/sources/app/Formatter/BaseFormatter.php @@ -0,0 +1,50 @@ +query = $query; + return $this; + } +} diff --git a/sources/app/Formatter/TaskFilterCalendarEvent.php b/sources/app/Formatter/BaseTaskCalendarFormatter.php similarity index 56% rename from sources/app/Formatter/TaskFilterCalendarEvent.php rename to sources/app/Formatter/BaseTaskCalendarFormatter.php index 12ea868..8fab3e9 100644 --- a/sources/app/Formatter/TaskFilterCalendarEvent.php +++ b/sources/app/Formatter/BaseTaskCalendarFormatter.php @@ -2,7 +2,7 @@ namespace Kanboard\Formatter; -use Kanboard\Model\TaskFilter; +use Kanboard\Core\Filter\FormatterInterface; /** * Common class to handle calendar events @@ -10,7 +10,7 @@ use Kanboard\Model\TaskFilter; * @package formatter * @author Frederic Guillot */ -abstract class TaskFilterCalendarEvent extends TaskFilter +abstract class BaseTaskCalendarFormatter extends BaseFormatter { /** * Column used for event start date @@ -28,21 +28,13 @@ abstract class TaskFilterCalendarEvent extends TaskFilter */ protected $endColumn = 'date_completed'; - /** - * Full day event flag - * - * @access private - * @var boolean - */ - private $fullDay = false; - /** * Transform results to calendar events * * @access public * @param string $start_column Column name for the start date * @param string $end_column Column name for the end date - * @return TaskFilterCalendarEvent + * @return FormatterInterface */ public function setColumns($start_column, $end_column = '') { @@ -50,27 +42,4 @@ abstract class TaskFilterCalendarEvent extends TaskFilter $this->endColumn = $end_column ?: $start_column; return $this; } - - /** - * When called calendar events will be full day - * - * @access public - * @return TaskFilterCalendarEvent - */ - public function setFullDay() - { - $this->fullDay = true; - return $this; - } - - /** - * Return true if the events are full day - * - * @access public - * @return boolean - */ - public function isFullDay() - { - return $this->fullDay; - } } diff --git a/sources/app/Formatter/BoardColumnFormatter.php b/sources/app/Formatter/BoardColumnFormatter.php new file mode 100644 index 0000000..d49a577 --- /dev/null +++ b/sources/app/Formatter/BoardColumnFormatter.php @@ -0,0 +1,94 @@ +swimlaneId = $swimlaneId; + return $this; + } + + /** + * Set columns + * + * @access public + * @param array $columns + * @return $this + */ + public function withColumns(array $columns) + { + $this->columns = $columns; + return $this; + } + + /** + * Set tasks + * + * @access public + * @param array $tasks + * @return $this + */ + public function withTasks(array $tasks) + { + $this->tasks = $tasks; + return $this; + } + + /** + * Set tags + * + * @access public + * @param array $tags + * @return $this + */ + public function withTags(array $tags) + { + $this->tags = $tags; + return $this; + } + + /** + * Apply formatter + * + * @access public + * @return array + */ + public function format() + { + foreach ($this->columns as &$column) { + $column['tasks'] = BoardTaskFormatter::getInstance($this->container) + ->withTasks($this->tasks) + ->withTags($this->tags) + ->withSwimlaneId($this->swimlaneId) + ->withColumnId($column['id']) + ->format(); + + $column['nb_tasks'] = count($column['tasks']); + $column['score'] = (int) array_column_sum($column['tasks'], 'score'); + } + + return $this->columns; + } +} diff --git a/sources/app/Formatter/BoardFormatter.php b/sources/app/Formatter/BoardFormatter.php new file mode 100644 index 0000000..350dde6 --- /dev/null +++ b/sources/app/Formatter/BoardFormatter.php @@ -0,0 +1,66 @@ +projectId = $projectId; + return $this; + } + + /** + * Apply formatter + * + * @access public + * @return array + */ + public function format() + { + $swimlanes = $this->swimlaneModel->getSwimlanes($this->projectId); + $columns = $this->columnModel->getAll($this->projectId); + $tasks = $this->query + ->eq(TaskModel::TABLE.'.project_id', $this->projectId) + ->asc(TaskModel::TABLE.'.position') + ->findAll(); + + $task_ids = array_column($tasks, 'id'); + $tags = $this->taskTagModel->getTagsByTasks($task_ids); + + if (empty($swimlanes) || empty($columns)) { + return array(); + } + + return BoardSwimlaneFormatter::getInstance($this->container) + ->withSwimlanes($swimlanes) + ->withColumns($columns) + ->withTasks($tasks) + ->withTags($tags) + ->format(); + } +} diff --git a/sources/app/Formatter/BoardSwimlaneFormatter.php b/sources/app/Formatter/BoardSwimlaneFormatter.php new file mode 100644 index 0000000..c2abb44 --- /dev/null +++ b/sources/app/Formatter/BoardSwimlaneFormatter.php @@ -0,0 +1,120 @@ +swimlanes = $swimlanes; + return $this; + } + + /** + * Set columns + * + * @access public + * @param array $columns + * @return $this + */ + public function withColumns($columns) + { + $this->columns = $columns; + return $this; + } + + /** + * Set tasks + * + * @access public + * @param array $tasks + * @return $this + */ + public function withTasks(array $tasks) + { + $this->tasks = $tasks; + return $this; + } + + /** + * Set tags + * + * @access public + * @param array $tags + * @return $this + */ + public function withTags(array $tags) + { + $this->tags = $tags; + return $this; + } + + /** + * Apply formatter + * + * @access public + * @return array + */ + public function format() + { + $nb_swimlanes = count($this->swimlanes); + $nb_columns = count($this->columns); + + foreach ($this->swimlanes as &$swimlane) { + $swimlane['columns'] = BoardColumnFormatter::getInstance($this->container) + ->withSwimlaneId($swimlane['id']) + ->withColumns($this->columns) + ->withTasks($this->tasks) + ->withTags($this->tags) + ->format(); + + $swimlane['nb_swimlanes'] = $nb_swimlanes; + $swimlane['nb_columns'] = $nb_columns; + $swimlane['nb_tasks'] = array_column_sum($swimlane['columns'], 'nb_tasks'); + $swimlane['score'] = array_column_sum($swimlane['columns'], 'score'); + + $this->calculateStatsByColumnAcrossSwimlanes($swimlane['columns']); + } + + return $this->swimlanes; + } + + /** + * Calculate stats for each column acrosss all swimlanes + * + * @access protected + * @param array $columns + */ + protected function calculateStatsByColumnAcrossSwimlanes(array $columns) + { + foreach ($columns as $columnIndex => $column) { + if (! isset($this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'])) { + $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'] = 0; + $this->swimlanes[0]['columns'][$columnIndex]['column_score'] = 0; + } + + $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'] += $column['nb_tasks']; + $this->swimlanes[0]['columns'][$columnIndex]['column_score'] += $column['score']; + } + } +} diff --git a/sources/app/Formatter/BoardTaskFormatter.php b/sources/app/Formatter/BoardTaskFormatter.php new file mode 100644 index 0000000..3bf171b --- /dev/null +++ b/sources/app/Formatter/BoardTaskFormatter.php @@ -0,0 +1,96 @@ +tags = $tags; + return $this; + } + + /** + * Set tasks + * + * @access public + * @param array $tasks + * @return $this + */ + public function withTasks(array $tasks) + { + $this->tasks = $tasks; + return $this; + } + + /** + * Set columnId + * + * @access public + * @param integer $columnId + * @return $this + */ + public function withColumnId($columnId) + { + $this->columnId = $columnId; + return $this; + } + + /** + * Set swimlaneId + * + * @access public + * @param integer $swimlaneId + * @return $this + */ + public function withSwimlaneId($swimlaneId) + { + $this->swimlaneId = $swimlaneId; + return $this; + } + + /** + * Apply formatter + * + * @access public + * @return array + */ + public function format() + { + $tasks = array_values(array_filter($this->tasks, array($this, 'filterTasks'))); + array_merge_relation($tasks, $this->tags, 'tags', 'id'); + return $tasks; + } + + /** + * Keep only tasks of the given column and swimlane + * + * @access protected + * @param array $task + * @return bool + */ + protected function filterTasks(array $task) + { + return $task['column_id'] == $this->columnId && $task['swimlane_id'] == $this->swimlaneId; + } +} diff --git a/sources/app/Formatter/FormatterInterface.php b/sources/app/Formatter/FormatterInterface.php deleted file mode 100644 index 0bb6129..0000000 --- a/sources/app/Formatter/FormatterInterface.php +++ /dev/null @@ -1,14 +0,0 @@ -groups = $groups; + } + + /** + * Set query + * + * @access public + * @param Table $query + * @return FormatterInterface + */ + public function withQuery(Table $query) + { return $this; } /** - * Format groups for the ajax autocompletion + * Format groups for the ajax auto-completion * * @access public * @return array diff --git a/sources/app/Formatter/ProjectActivityEventFormatter.php b/sources/app/Formatter/ProjectActivityEventFormatter.php new file mode 100644 index 0000000..aa0ea7c --- /dev/null +++ b/sources/app/Formatter/ProjectActivityEventFormatter.php @@ -0,0 +1,61 @@ +query->findAll(); + + foreach ($events as &$event) { + $event += $this->unserializeEvent($event['data']); + unset($event['data']); + + $event['author'] = $event['author_name'] ?: $event['author_username']; + $event['event_title'] = $this->notificationModel->getTitleWithAuthor($event['author'], $event['event_name'], $event); + $event['event_content'] = $this->renderEvent($event); + } + + return $events; + } + + /** + * Decode event data, supports unserialize() and json_decode() + * + * @access protected + * @param string $data Serialized data + * @return array + */ + protected function unserializeEvent($data) + { + if ($data{0} === 'a') { + return unserialize($data); + } + + return json_decode($data, true) ?: array(); + } + + /** + * Get the event html content + * + * @access protected + * @param array $params Event properties + * @return string + */ + protected function renderEvent(array $params) + { + return $this->template->render( + 'event/'.str_replace('.', '_', $params['event_name']), + $params + ); + } +} diff --git a/sources/app/Formatter/ProjectGanttFormatter.php b/sources/app/Formatter/ProjectGanttFormatter.php index 4f73e21..af04f49 100644 --- a/sources/app/Formatter/ProjectGanttFormatter.php +++ b/sources/app/Formatter/ProjectGanttFormatter.php @@ -2,7 +2,7 @@ namespace Kanboard\Formatter; -use Kanboard\Model\Project; +use Kanboard\Core\Filter\FormatterInterface; /** * Gantt chart formatter for projects @@ -10,40 +10,8 @@ use Kanboard\Model\Project; * @package formatter * @author Frederic Guillot */ -class ProjectGanttFormatter extends Project implements FormatterInterface +class ProjectGanttFormatter extends BaseFormatter implements FormatterInterface { - /** - * List of projects - * - * @access private - * @var array - */ - private $projects = array(); - - /** - * Filter projects to generate the Gantt chart - * - * @access public - * @param int[] $project_ids - * @return ProjectGanttFormatter - */ - public function filter(array $project_ids) - { - if (empty($project_ids)) { - $this->projects = array(); - } else { - $this->projects = $this->db - ->table(self::TABLE) - ->asc('start_date') - ->in('id', $project_ids) - ->eq('is_active', self::ACTIVE) - ->eq('is_private', 0) - ->findAll(); - } - - return $this; - } - /** * Format projects to be displayed in the Gantt chart * @@ -52,10 +20,11 @@ class ProjectGanttFormatter extends Project implements FormatterInterface */ public function format() { - $colors = $this->color->getDefaultColors(); + $projects = $this->query->findAll(); + $colors = $this->colorModel->getDefaultColors(); $bars = array(); - foreach ($this->projects as $project) { + foreach ($projects as $project) { $start = empty($project['start_date']) ? time() : strtotime($project['start_date']); $end = empty($project['end_date']) ? $start : strtotime($project['end_date']); $color = next($colors) ?: reset($colors); @@ -74,12 +43,12 @@ class ProjectGanttFormatter extends Project implements FormatterInterface (int) date('n', $end), (int) date('j', $end), ), - 'link' => $this->helper->url->href('project', 'show', array('project_id' => $project['id'])), - 'board_link' => $this->helper->url->href('board', 'show', array('project_id' => $project['id'])), - 'gantt_link' => $this->helper->url->href('gantt', 'project', array('project_id' => $project['id'])), + 'link' => $this->helper->url->href('ProjectViewController', 'show', array('project_id' => $project['id'])), + 'board_link' => $this->helper->url->href('BoardViewController', 'show', array('project_id' => $project['id'])), + 'gantt_link' => $this->helper->url->href('TaskGanttController', 'show', array('project_id' => $project['id'])), 'color' => $color, 'not_defined' => empty($project['start_date']) || empty($project['end_date']), - 'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']), + 'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']), ); } diff --git a/sources/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php b/sources/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php new file mode 100644 index 0000000..b7b81d8 --- /dev/null +++ b/sources/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php @@ -0,0 +1,38 @@ +query->findAll() as $row) { + $user = isset($row['username']) ? ' ('.($row['user_fullname'] ?: $row['username']).')' : ''; + + $events[] = array( + 'id' => $row['id'], + 'subtask_id' => $row['subtask_id'], + 'title' => t('#%d', $row['task_id']).' '.$row['subtask_title'].$user, + 'start' => date('Y-m-d\TH:i:s', $row['start']), + 'end' => date('Y-m-d\TH:i:s', $row['end'] ?: time()), + 'backgroundColor' => $this->colorModel->getBackgroundColor($row['color_id']), + 'borderColor' => $this->colorModel->getBorderColor($row['color_id']), + 'textColor' => 'black', + 'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])), + 'editable' => false, + ); + } + + return $events; + } +} diff --git a/sources/app/Formatter/TaskAutoCompleteFormatter.php b/sources/app/Formatter/TaskAutoCompleteFormatter.php new file mode 100644 index 0000000..4f1c4c6 --- /dev/null +++ b/sources/app/Formatter/TaskAutoCompleteFormatter.php @@ -0,0 +1,33 @@ +query->columns(TaskModel::TABLE.'.id', TaskModel::TABLE.'.title')->findAll(); + + foreach ($tasks as &$task) { + $task['value'] = $task['title']; + $task['label'] = '#'.$task['id'].' - '.$task['title']; + } + + return $tasks; + } +} diff --git a/sources/app/Formatter/TaskCalendarFormatter.php b/sources/app/Formatter/TaskCalendarFormatter.php new file mode 100644 index 0000000..75d2a83 --- /dev/null +++ b/sources/app/Formatter/TaskCalendarFormatter.php @@ -0,0 +1,74 @@ +fullDay = true; + return $this; + } + + /** + * Transform tasks to calendar events + * + * @access public + * @return array + */ + public function format() + { + $events = array(); + + foreach ($this->query->findAll() as $task) { + $events[] = array( + 'timezoneParam' => $this->timezoneModel->getCurrentTimezone(), + 'id' => $task['id'], + 'title' => t('#%d', $task['id']).' '.$task['title'], + 'backgroundColor' => $this->colorModel->getBackgroundColor($task['color_id']), + 'borderColor' => $this->colorModel->getBorderColor($task['color_id']), + 'textColor' => 'black', + 'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + 'start' => date($this->getDateTimeFormat(), $task[$this->startColumn]), + 'end' => date($this->getDateTimeFormat(), $task[$this->endColumn] ?: time()), + 'editable' => $this->fullDay, + 'allday' => $this->fullDay, + ); + } + + return $events; + } + + /** + * Get DateTime format for event + * + * @access private + * @return string + */ + private function getDateTimeFormat() + { + return $this->fullDay ? 'Y-m-d' : 'Y-m-d\TH:i:s'; + } +} diff --git a/sources/app/Formatter/TaskFilterAutoCompleteFormatter.php b/sources/app/Formatter/TaskFilterAutoCompleteFormatter.php deleted file mode 100644 index c9af465..0000000 --- a/sources/app/Formatter/TaskFilterAutoCompleteFormatter.php +++ /dev/null @@ -1,33 +0,0 @@ -query->columns(Task::TABLE.'.id', Task::TABLE.'.title')->findAll(); - - foreach ($tasks as &$task) { - $task['value'] = $task['title']; - $task['label'] = '#'.$task['id'].' - '.$task['title']; - } - - return $tasks; - } -} diff --git a/sources/app/Formatter/TaskFilterCalendarFormatter.php b/sources/app/Formatter/TaskFilterCalendarFormatter.php deleted file mode 100644 index 1b5d6ca..0000000 --- a/sources/app/Formatter/TaskFilterCalendarFormatter.php +++ /dev/null @@ -1,52 +0,0 @@ -query->findAll() as $task) { - $events[] = array( - 'timezoneParam' => $this->config->getCurrentTimezone(), - 'id' => $task['id'], - 'title' => t('#%d', $task['id']).' '.$task['title'], - 'backgroundColor' => $this->color->getBackgroundColor($task['color_id']), - 'borderColor' => $this->color->getBorderColor($task['color_id']), - 'textColor' => 'black', - 'url' => $this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), - 'start' => date($this->getDateTimeFormat(), $task[$this->startColumn]), - 'end' => date($this->getDateTimeFormat(), $task[$this->endColumn] ?: time()), - 'editable' => $this->isFullDay(), - 'allday' => $this->isFullDay(), - ); - } - - return $events; - } - - /** - * Get DateTime format for event - * - * @access private - * @return string - */ - private function getDateTimeFormat() - { - return $this->isFullDay() ? 'Y-m-d' : 'Y-m-d\TH:i:s'; - } -} diff --git a/sources/app/Formatter/TaskFilterGanttFormatter.php b/sources/app/Formatter/TaskGanttFormatter.php similarity index 69% rename from sources/app/Formatter/TaskFilterGanttFormatter.php rename to sources/app/Formatter/TaskGanttFormatter.php index a4eef1e..ddb3f93 100644 --- a/sources/app/Formatter/TaskFilterGanttFormatter.php +++ b/sources/app/Formatter/TaskGanttFormatter.php @@ -2,15 +2,15 @@ namespace Kanboard\Formatter; -use Kanboard\Model\TaskFilter; +use Kanboard\Core\Filter\FormatterInterface; /** - * Gantt chart formatter for task filter + * Task Gantt Formatter * - * @package formatter - * @author Frederic Guillot + * @package formatter + * @author Frederic Guillot */ -class TaskFilterGanttFormatter extends TaskFilter implements FormatterInterface +class TaskGanttFormatter extends BaseFormatter implements FormatterInterface { /** * Local cache for project columns @@ -19,9 +19,9 @@ class TaskFilterGanttFormatter extends TaskFilter implements FormatterInterface * @var array */ private $columns = array(); - + /** - * Format tasks to be displayed in the Gantt chart + * Apply formatter * * @access public * @return array @@ -47,7 +47,7 @@ class TaskFilterGanttFormatter extends TaskFilter implements FormatterInterface private function formatTask(array $task) { if (! isset($this->columns[$task['project_id']])) { - $this->columns[$task['project_id']] = $this->column->getList($task['project_id']); + $this->columns[$task['project_id']] = $this->columnModel->getList($task['project_id']); } $start = $task['date_started'] ?: time(); @@ -69,9 +69,9 @@ class TaskFilterGanttFormatter extends TaskFilter implements FormatterInterface ), 'column_title' => $task['column_name'], 'assignee' => $task['assignee_name'] ?: $task['assignee_username'], - 'progress' => $this->task->getProgress($task, $this->columns[$task['project_id']]).'%', - 'link' => $this->helper->url->href('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), - 'color' => $this->color->getColorProperties($task['color_id']), + 'progress' => $this->taskModel->getProgress($task, $this->columns[$task['project_id']]).'%', + 'link' => $this->helper->url->href('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), + 'color' => $this->colorModel->getColorProperties($task['color_id']), 'not_defined' => empty($task['date_due']) || empty($task['date_started']), ); } diff --git a/sources/app/Formatter/TaskFilterICalendarFormatter.php b/sources/app/Formatter/TaskICalFormatter.php similarity index 71% rename from sources/app/Formatter/TaskFilterICalendarFormatter.php rename to sources/app/Formatter/TaskICalFormatter.php index 25b3aea..ad2a444 100644 --- a/sources/app/Formatter/TaskFilterICalendarFormatter.php +++ b/sources/app/Formatter/TaskICalFormatter.php @@ -6,14 +6,16 @@ use DateTime; use Eluceo\iCal\Component\Calendar; use Eluceo\iCal\Component\Event; use Eluceo\iCal\Property\Event\Attendees; +use Eluceo\iCal\Property\Event\Organizer; +use Kanboard\Core\Filter\FormatterInterface; /** - * iCal event formatter for task filter + * iCal event formatter for tasks * * @package formatter * @author Frederic Guillot */ -class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements FormatterInterface +class TaskICalFormatter extends BaseTaskCalendarFormatter implements FormatterInterface { /** * Calendar object @@ -39,7 +41,7 @@ class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements Fo * * @access public * @param \Eluceo\iCal\Component\Calendar $vCalendar - * @return TaskFilterICalendarFormatter + * @return FormatterInterface */ public function setCalendar(Calendar $vCalendar) { @@ -48,10 +50,10 @@ class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements Fo } /** - * Transform results to ical events + * Transform results to iCal events * * @access public - * @return TaskFilterICalendarFormatter + * @return FormatterInterface */ public function addDateTimeEvents() { @@ -73,10 +75,10 @@ class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements Fo } /** - * Transform results to all day ical events + * Transform results to all day iCal events * * @access public - * @return TaskFilterICalendarFormatter + * @return FormatterInterface */ public function addFullDayEvents() { @@ -96,7 +98,7 @@ class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements Fo } /** - * Get common events for task ical events + * Get common events for task iCal events * * @access protected * @param array $task @@ -116,16 +118,24 @@ class TaskFilterICalendarFormatter extends TaskFilterCalendarEvent implements Fo $vEvent->setModified($dateModif); $vEvent->setUseTimezone(true); $vEvent->setSummary(t('#%d', $task['id']).' '.$task['title']); - $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $vEvent->setDescription($task['description']); + $vEvent->setDescriptionHTML($this->helper->text->markdown($task['description'])); + $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); if (! empty($task['owner_id'])) { - $vEvent->setOrganizer($task['assignee_name'] ?: $task['assignee_username'], $task['assignee_email']); + $attendees = new Attendees; + $attendees->add( + 'MAILTO:'.($task['assignee_email'] ?: $task['assignee_username'].'@kanboard.local'), + array('CN' => $task['assignee_name'] ?: $task['assignee_username']) + ); + $vEvent->setAttendees($attendees); } if (! empty($task['creator_id'])) { - $attendees = new Attendees; - $attendees->add('MAILTO:'.($task['creator_email'] ?: $task['creator_username'].'@kanboard.local')); - $vEvent->setAttendees($attendees); + $vEvent->setOrganizer(new Organizer( + 'MAILTO:' . $task['creator_email'] ?: $task['creator_username'].'@kanboard.local', + array('CN' => $task['creator_name'] ?: $task['creator_username']) + )); } return $vEvent; diff --git a/sources/app/Formatter/UserFilterAutoCompleteFormatter.php b/sources/app/Formatter/UserAutoCompleteFormatter.php similarity index 64% rename from sources/app/Formatter/UserFilterAutoCompleteFormatter.php rename to sources/app/Formatter/UserAutoCompleteFormatter.php index b98e0d6..cd23a2a 100644 --- a/sources/app/Formatter/UserFilterAutoCompleteFormatter.php +++ b/sources/app/Formatter/UserAutoCompleteFormatter.php @@ -2,16 +2,16 @@ namespace Kanboard\Formatter; -use Kanboard\Model\User; -use Kanboard\Model\UserFilter; +use Kanboard\Model\UserModel; +use Kanboard\Core\Filter\FormatterInterface; /** - * Autocomplete formatter for user filter + * Auto-complete formatter for user filter * * @package formatter * @author Frederic Guillot */ -class UserFilterAutoCompleteFormatter extends UserFilter implements FormatterInterface +class UserAutoCompleteFormatter extends BaseFormatter implements FormatterInterface { /** * Format the tasks for the ajax autocompletion @@ -21,7 +21,7 @@ class UserFilterAutoCompleteFormatter extends UserFilter implements FormatterInt */ public function format() { - $users = $this->query->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name')->findAll(); + $users = $this->query->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name')->findAll(); foreach ($users as &$user) { $user['value'] = $user['username'].' (#'.$user['id'].')'; diff --git a/sources/app/Group/DatabaseBackendGroupProvider.php b/sources/app/Group/DatabaseBackendGroupProvider.php index 6dbaa43..29d04d5 100644 --- a/sources/app/Group/DatabaseBackendGroupProvider.php +++ b/sources/app/Group/DatabaseBackendGroupProvider.php @@ -23,7 +23,7 @@ class DatabaseBackendGroupProvider extends Base implements GroupBackendProviderI public function find($input) { $result = array(); - $groups = $this->group->search($input); + $groups = $this->groupModel->search($input); foreach ($groups as $group) { $result[] = new DatabaseGroupProvider($group); diff --git a/sources/app/Helper/AppHelper.php b/sources/app/Helper/AppHelper.php index e6f6412..09f280c 100644 --- a/sources/app/Helper/AppHelper.php +++ b/sources/app/Helper/AppHelper.php @@ -22,7 +22,7 @@ class AppHelper extends Base */ public function config($param, $default_value = '') { - return $this->config->get($param, $default_value); + return $this->configModel->get($param, $default_value); } /** @@ -90,7 +90,40 @@ class AppHelper extends Base */ public function jsLang() { - return $this->config->getJsLanguageCode(); + return $this->languageModel->getJsLanguageCode(); + } + + /** + * Get date format for Jquery DatePicker + * + * @access public + * @return string + */ + public function getJsDateFormat() + { + $format = $this->dateParser->getUserDateFormat(); + $format = str_replace('m', 'mm', $format); + $format = str_replace('Y', 'yy', $format); + $format = str_replace('d', 'dd', $format); + + return $format; + } + + /** + * Get time format for Jquery Plugin DateTimePicker + * + * @access public + * @return string + */ + public function getJsTimeFormat() + { + $format = $this->dateParser->getUserTimeFormat(); + $format = str_replace('H', 'HH', $format); + $format = str_replace('i', 'mm', $format); + $format = str_replace('g', 'h', $format); + $format = str_replace('a', 'tt', $format); + + return $format; } /** @@ -101,7 +134,7 @@ class AppHelper extends Base */ public function getTimezone() { - return $this->config->getCurrentTimezone(); + return $this->timezoneModel->getCurrentTimezone(); } /** diff --git a/sources/app/Helper/AssetHelper.php b/sources/app/Helper/AssetHelper.php index b3dc711..dad1448 100644 --- a/sources/app/Helper/AssetHelper.php +++ b/sources/app/Helper/AssetHelper.php @@ -45,8 +45,8 @@ class AssetHelper extends Base */ public function customCss() { - if ($this->config->get('application_stylesheet')) { - return ''; + if ($this->configModel->get('application_stylesheet')) { + return ''; } return ''; @@ -60,6 +60,6 @@ class AssetHelper extends Base */ public function colorCss() { - return ''; + return ''; } } diff --git a/sources/app/Helper/CalendarHelper.php b/sources/app/Helper/CalendarHelper.php new file mode 100644 index 0000000..b35c40f --- /dev/null +++ b/sources/app/Helper/CalendarHelper.php @@ -0,0 +1,112 @@ +container); + $formatter->setFullDay(); + $formatter->setColumns('date_due'); + + return $queryBuilder + ->withFilter(new TaskDueDateRangeFilter(array($start, $end))) + ->format($formatter); + } + + /** + * Get formatted calendar task events + * + * @access public + * @param QueryBuilder $queryBuilder + * @param string $start + * @param string $end + * @return array + */ + public function getTaskEvents(QueryBuilder $queryBuilder, $start, $end) + { + $startColumn = $this->configModel->get('calendar_project_tasks', 'date_started'); + + $queryBuilder->getQuery()->addCondition($this->getCalendarCondition( + $this->dateParser->getTimestampFromIsoFormat($start), + $this->dateParser->getTimestampFromIsoFormat($end), + $startColumn, + 'date_due' + )); + + $formatter = new TaskCalendarFormatter($this->container); + $formatter->setColumns($startColumn, 'date_due'); + + return $queryBuilder->format($formatter); + } + + /** + * Get formatted calendar subtask time tracking events + * + * @access public + * @param integer $user_id + * @param string $start + * @param string $end + * @return array + */ + public function getSubtaskTimeTrackingEvents($user_id, $start, $end) + { + $formatter = new SubtaskTimeTrackingCalendarFormatter($this->container); + return $formatter + ->withQuery($this->subtaskTimeTrackingModel->getUserQuery($user_id) + ->addCondition($this->getCalendarCondition( + $this->dateParser->getTimestampFromIsoFormat($start), + $this->dateParser->getTimestampFromIsoFormat($end), + 'start', + 'end' + )) + ) + ->format(); + } + + /** + * Build SQL condition for a given time range + * + * @access public + * @param string $start_time Start timestamp + * @param string $end_time End timestamp + * @param string $start_column Start column name + * @param string $end_column End column name + * @return string + */ + public function getCalendarCondition($start_time, $end_time, $start_column, $end_column) + { + $start_column = $this->db->escapeIdentifier($start_column); + $end_column = $this->db->escapeIdentifier($end_column); + + $conditions = array( + "($start_column >= '$start_time' AND $start_column <= '$end_time')", + "($start_column <= '$start_time' AND $end_column >= '$start_time')", + "($start_column <= '$start_time' AND ($end_column = '0' OR $end_column IS NULL))", + ); + + return $start_column.' IS NOT NULL AND '.$start_column.' > 0 AND ('.implode(' OR ', $conditions).')'; + } +} diff --git a/sources/app/Helper/DateHelper.php b/sources/app/Helper/DateHelper.php index 3844ce6..7e2ec79 100644 --- a/sources/app/Helper/DateHelper.php +++ b/sources/app/Helper/DateHelper.php @@ -22,7 +22,7 @@ class DateHelper extends Base */ public function time($value) { - return date($this->config->get('application_time_format', 'H:i'), $value); + return date($this->configModel->get('application_time_format', 'H:i'), $value); } /** @@ -42,7 +42,7 @@ class DateHelper extends Base $value = strtotime($value); } - return date($this->config->get('application_date_format', 'm/d/Y'), $value); + return date($this->configModel->get('application_date_format', 'm/d/Y'), $value); } /** @@ -54,7 +54,7 @@ class DateHelper extends Base */ public function datetime($value) { - return date($this->config->get('application_datetime_format', 'm/d/Y H:i'), $value); + return date($this->configModel->get('application_datetime_format', 'm/d/Y H:i'), $value); } /** diff --git a/sources/app/Helper/ICalHelper.php b/sources/app/Helper/ICalHelper.php new file mode 100644 index 0000000..dc399bf --- /dev/null +++ b/sources/app/Helper/ICalHelper.php @@ -0,0 +1,38 @@ +withFilter(new TaskDueDateRangeFilter(array($start, $end))); + + $formatter = new TaskICalFormatter($this->container); + $formatter->setColumns('date_due'); + $formatter->setCalendar($calendar); + $formatter->withQuery($queryBuilder->getQuery()); + $formatter->addFullDayEvents(); + } +} diff --git a/sources/app/Helper/LayoutHelper.php b/sources/app/Helper/LayoutHelper.php index 9384da1..8ebb05d 100644 --- a/sources/app/Helper/LayoutHelper.php +++ b/sources/app/Helper/LayoutHelper.php @@ -27,7 +27,7 @@ class LayoutHelper extends Base } if (! isset($params['no_layout']) && ! isset($params['board_selector'])) { - $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); + $params['board_selector'] = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId()); } return $this->pageLayout($template, $params); @@ -47,7 +47,7 @@ class LayoutHelper extends Base $params['title'] = '#'.$params['user']['id'].' '.($params['user']['name'] ?: $params['user']['username']); } - return $this->subLayout('user/layout', 'user/sidebar', $template, $params); + return $this->subLayout('user_view/layout', 'user_view/sidebar', $template, $params); } /** @@ -60,6 +60,7 @@ class LayoutHelper extends Base */ public function task($template, array $params) { + $params['page_title'] = $params['task']['project_name'].', #'.$params['task']['id'].' - '.$params['task']['title']; $params['title'] = $params['task']['project_name']; return $this->subLayout('task/layout', 'task/sidebar', $template, $params); } @@ -95,7 +96,7 @@ class LayoutHelper extends Base public function projectUser($template, array $params) { $params['filter'] = array('user_id' => $params['user_id']); - return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params); + return $this->subLayout('project_user_overview/layout', 'project_user_overview/sidebar', $template, $params); } /** @@ -109,7 +110,7 @@ class LayoutHelper extends Base public function config($template, array $params) { if (! isset($params['values'])) { - $params['values'] = $this->config->getAll(); + $params['values'] = $this->configModel->getAll(); } if (! isset($params['errors'])) { @@ -119,6 +120,19 @@ class LayoutHelper extends Base return $this->subLayout('config/layout', 'config/sidebar', $template, $params); } + /** + * Common layout for plugin views + * + * @access public + * @param string $template + * @param array $params + * @return string + */ + public function plugin($template, array $params) + { + return $this->subLayout('plugin/layout', 'plugin/sidebar', $template, $params); + } + /** * Common layout for dashboard views * @@ -129,7 +143,7 @@ class LayoutHelper extends Base */ public function dashboard($template, array $params) { - return $this->subLayout('app/layout', 'app/sidebar', $template, $params); + return $this->subLayout('dashboard/layout', 'dashboard/sidebar', $template, $params); } /** diff --git a/sources/app/Helper/MailHelper.php b/sources/app/Helper/MailHelper.php new file mode 100644 index 0000000..3b1c9e4 --- /dev/null +++ b/sources/app/Helper/MailHelper.php @@ -0,0 +1,82 @@ +configModel->get('mail_sender_address'); + + if (!empty($email)) { + return $email; + } + + return MAIL_FROM; + } + + /** + * Get mail sender address + * + * @access public + * @return string + */ + public function getMailTransport() + { + $transport = $this->configModel->get('mail_transport'); + + if (!empty($transport)) { + return $transport; + } + + return MAIL_TRANSPORT; + } +} diff --git a/sources/app/Helper/ProjectActivityHelper.php b/sources/app/Helper/ProjectActivityHelper.php new file mode 100644 index 0000000..40f386d --- /dev/null +++ b/sources/app/Helper/ProjectActivityHelper.php @@ -0,0 +1,105 @@ +projectUserRoleModel->getProjectsByUser($this->userSession->getId()); + $events = array(); + + if ($search !== '') { + $queryBuilder = $this->projectActivityLexer->build($search); + $queryBuilder + ->withFilter(new ProjectActivityProjectIdsFilter(array_keys($projects))) + ->getQuery() + ->desc(ProjectActivityModel::TABLE.'.id') + ->limit(500) + ; + + $events = $queryBuilder->format(new ProjectActivityEventFormatter($this->container)); + } + + return $events; + } + + /** + * Get project activity events + * + * @access public + * @param integer $project_id + * @param int $limit + * @return array + */ + public function getProjectEvents($project_id, $limit = 50) + { + $queryBuilder = $this->projectActivityQuery + ->withFilter(new ProjectActivityProjectIdFilter($project_id)); + + $queryBuilder->getQuery() + ->desc(ProjectActivityModel::TABLE.'.id') + ->limit($limit) + ; + + return $queryBuilder->format(new ProjectActivityEventFormatter($this->container)); + } + + /** + * Get projects activity events + * + * @access public + * @param int[] $project_ids + * @param int $limit + * @return array + */ + public function getProjectsEvents(array $project_ids, $limit = 50) + { + $queryBuilder = $this->projectActivityQuery + ->withFilter(new ProjectActivityProjectIdsFilter($project_ids)); + + $queryBuilder->getQuery() + ->desc(ProjectActivityModel::TABLE.'.id') + ->limit($limit) + ; + + return $queryBuilder->format(new ProjectActivityEventFormatter($this->container)); + } + + /** + * Get task activity events + * + * @access public + * @param integer $task_id + * @return array + */ + public function getTaskEvents($task_id) + { + $queryBuilder = $this->projectActivityQuery + ->withFilter(new ProjectActivityTaskIdFilter($task_id)); + + $queryBuilder->getQuery()->desc(ProjectActivityModel::TABLE.'.id'); + + return $queryBuilder->format(new ProjectActivityEventFormatter($this->container)); + } +} diff --git a/sources/app/Helper/ProjectHeaderHelper.php b/sources/app/Helper/ProjectHeaderHelper.php index 1957005..9514f4f 100644 --- a/sources/app/Helper/ProjectHeaderHelper.php +++ b/sources/app/Helper/ProjectHeaderHelper.php @@ -48,9 +48,9 @@ class ProjectHeaderHelper extends Base return $this->template->render('project_header/header', array( 'project' => $project, 'filters' => $filters, - 'categories_list' => $this->category->getList($project['id'], false), - 'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], false), - 'custom_filters_list' => $this->customFilter->getAll($project['id'], $this->userSession->getId()), + 'categories_list' => $this->categoryModel->getList($project['id'], false), + 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], false), + 'custom_filters_list' => $this->customFilterModel->getAll($project['id'], $this->userSession->getId()), 'board_view' => $boardView, )); } diff --git a/sources/app/Helper/SubtaskHelper.php b/sources/app/Helper/SubtaskHelper.php index afa3c14..dac7120 100644 --- a/sources/app/Helper/SubtaskHelper.php +++ b/sources/app/Helper/SubtaskHelper.php @@ -36,18 +36,18 @@ class SubtaskHelper extends Base */ public function toggleStatus(array $subtask, $project_id, $refresh_table = false) { - if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) { + if (! $this->helper->user->hasProjectAccess('SubtaskController', 'edit', $project_id)) { return $this->getTitle($subtask); } $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table); if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) { - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover'); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestrictionController', 'show', $params, false, 'popover'); } $class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : ''); - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, $class); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatusController', 'change', $params, false, $class); } public function selectTitle(array $values, array $errors = array(), array $attributes = array()) diff --git a/sources/app/Helper/TaskHelper.php b/sources/app/Helper/TaskHelper.php index 4857d0e..e1d65cc 100644 --- a/sources/app/Helper/TaskHelper.php +++ b/sources/app/Helper/TaskHelper.php @@ -22,27 +22,77 @@ class TaskHelper extends Base public function getColors() { - return $this->color->getList(); + return $this->colorModel->getList(); } public function recurrenceTriggers() { - return $this->task->getRecurrenceTriggerList(); + return $this->taskRecurrenceModel->getRecurrenceTriggerList(); } public function recurrenceTimeframes() { - return $this->task->getRecurrenceTimeframeList(); + return $this->taskRecurrenceModel->getRecurrenceTimeframeList(); } public function recurrenceBasedates() { - return $this->task->getRecurrenceBasedateList(); + return $this->taskRecurrenceModel->getRecurrenceBasedateList(); } - public function canRemove(array $task) + public function selectTitle(array $values, array $errors) { - return $this->taskPermission->canRemoveTask($task); + $html = $this->helper->form->label(t('Title'), 'title'); + $html .= $this->helper->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large'); + return $html; + } + + public function selectDescription(array $values, array $errors) + { + $html = $this->helper->form->label(t('Description'), 'description'); + $html .= $this->helper->form->textarea( + 'description', + $values, + $errors, + array( + 'placeholder="'.t('Leave a description').'"', + 'tabindex="2"', + 'data-mention-search-url="'.$this->helper->url->href('UserAjaxController', 'mention', array('project_id' => $values['project_id'])).'"' + ), + 'markdown-editor' + ); + + return $html; + } + + public function selectTags(array $project, array $tags = array()) + { + $options = $this->tagModel->getAssignableList($project['id']); + + $html = $this->helper->form->label(t('Tags'), 'tags[]'); + $html .= ''; + $html .= ''; + + return $html; + } + + public function selectColor(array $values) + { + $colors = $this->colorModel->getList(); + $html = $this->helper->form->label(t('Color'), 'color_id'); + $html .= $this->helper->form->select('color_id', $colors, $values, array(), array(), 'color-picker'); + return $html; } public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) @@ -118,10 +168,20 @@ class TaskHelper extends Base return $html; } - public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) + public function selectReference(array $values, array $errors = array(), array $attributes = array()) { $attributes = array_merge(array('tabindex="9"'), $attributes); + $html = $this->helper->form->label(t('Reference'), 'reference'); + $html .= $this->helper->form->text('reference', $values, $errors, $attributes, 'form-input-small'); + + return $html; + } + + public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="10"'), $attributes); + $html = $this->helper->form->label(t('Original estimate'), 'time_estimated'); $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes); $html .= ' '.t('hours'); @@ -131,7 +191,7 @@ class TaskHelper extends Base public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array()) { - $attributes = array_merge(array('tabindex="10"'), $attributes); + $attributes = array_merge(array('tabindex="11"'), $attributes); $html = $this->helper->form->label(t('Time spent'), 'time_spent'); $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes); @@ -142,8 +202,8 @@ class TaskHelper extends Base public function selectStartDate(array $values, array $errors = array(), array $attributes = array()) { - $placeholder = date($this->config->get('application_date_format', 'm/d/Y H:i')); - $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes); + $placeholder = date($this->configModel->get('application_date_format', 'm/d/Y H:i')); + $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes); $html = $this->helper->form->label(t('Start Date'), 'date_started'); $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-datetime'); @@ -153,8 +213,8 @@ class TaskHelper extends Base public function selectDueDate(array $values, array $errors = array(), array $attributes = array()) { - $placeholder = date($this->config->get('application_date_format', 'm/d/Y')); - $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes); + $placeholder = date($this->configModel->get('application_date_format', 'm/d/Y')); + $attributes = array_merge(array('tabindex="13"', 'placeholder="'.$placeholder.'"'), $attributes); $html = $this->helper->form->label(t('Due Date'), 'date_due'); $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date'); @@ -178,9 +238,9 @@ class TaskHelper extends Base public function getProgress($task) { if (! isset($this->columns[$task['project_id']])) { - $this->columns[$task['project_id']] = $this->column->getList($task['project_id']); + $this->columns[$task['project_id']] = $this->columnModel->getList($task['project_id']); } - return $this->task->getProgress($task, $this->columns[$task['project_id']]); + return $this->taskModel->getProgress($task, $this->columns[$task['project_id']]); } } diff --git a/sources/app/Helper/TextHelper.php b/sources/app/Helper/TextHelper.php index e5aefdc..654eb17 100644 --- a/sources/app/Helper/TextHelper.php +++ b/sources/app/Helper/TextHelper.php @@ -27,17 +27,29 @@ class TextHelper extends Base /** * Markdown transformation * - * @param string $text Markdown content - * @param array $link Link parameters for replacement + * @param string $text + * @param boolean $isPublicLink * @return string */ - public function markdown($text, array $link = array()) + public function markdown($text, $isPublicLink = false) { - $parser = new Markdown($this->container, $link); + $parser = new Markdown($this->container, $isPublicLink); $parser->setMarkupEscaped(MARKDOWN_ESCAPE_HTML); return $parser->text($text); } + /** + * Escape Markdown text that need to be stored in HTML attribute + * + * @access public + * @param string $text + * @return mixed + */ + public function markdownAttribute($text) + { + return htmlentities($this->markdown($text), ENT_QUOTES, 'UTF-8'); + } + /** * Format a file size * diff --git a/sources/app/Helper/UrlHelper.php b/sources/app/Helper/UrlHelper.php index 095c4af..2127c69 100644 --- a/sources/app/Helper/UrlHelper.php +++ b/sources/app/Helper/UrlHelper.php @@ -25,7 +25,7 @@ class UrlHelper extends Base */ public function doc($label, $file) { - return $this->link($label, 'doc', 'show', array('file' => $file), false, '', '', true); + return $this->link($label, 'DocumentationController', 'show', array('file' => $file), false, '', '', true); } /** @@ -109,7 +109,7 @@ class UrlHelper extends Base public function base() { if (empty($this->base)) { - $this->base = $this->config->get('application_url') ?: $this->server(); + $this->base = $this->configModel->get('application_url') ?: $this->server(); } return $this->base; diff --git a/sources/app/Helper/UserHelper.php b/sources/app/Helper/UserHelper.php index c3369df..ab259a6 100644 --- a/sources/app/Helper/UserHelper.php +++ b/sources/app/Helper/UserHelper.php @@ -3,6 +3,7 @@ namespace Kanboard\Helper; use Kanboard\Core\Base; +use Kanboard\Core\Security\Role; /** * User helpers @@ -20,7 +21,7 @@ class UserHelper extends Base */ public function hasNotifications() { - return $this->userUnreadNotification->hasNotifications($this->userSession->getId()); + return $this->userUnreadNotificationModel->hasNotifications($this->userSession->getId()); } /** @@ -35,10 +36,21 @@ class UserHelper extends Base $initials = ''; foreach (explode(' ', $name, 2) as $string) { - $initials .= mb_substr($string, 0, 1); + $initials .= mb_substr($string, 0, 1, 'UTF-8'); } - return mb_strtoupper($initials); + return mb_strtoupper($initials, 'UTF-8'); + } + + /** + * Return the user full name + * + * @param array $user User properties + * @return string + */ + public function getFullname(array $user = array()) + { + return $this->userModel->getFullname(empty($user) ? $this->userSession->getAll() : $user); } /** @@ -95,6 +107,10 @@ class UserHelper extends Base */ public function hasAccess($controller, $action) { + if (! $this->userSession->isLogged()) { + return false; + } + $key = 'app_access:'.$controller.$action; $result = $this->memoryCache->get($key); @@ -116,6 +132,10 @@ class UserHelper extends Base */ public function hasProjectAccess($controller, $action, $project_id) { + if (! $this->userSession->isLogged()) { + return false; + } + if ($this->userSession->isAdmin()) { return true; } @@ -145,17 +165,28 @@ class UserHelper extends Base */ public function getProjectUserRole($project_id) { - return $this->memoryCache->proxy($this->projectUserRole, 'getUserRole', $project_id, $this->userSession->getId()); + return $this->memoryCache->proxy($this->projectUserRoleModel, 'getUserRole', $project_id, $this->userSession->getId()); } /** - * Return the user full name + * Return true if the user can remove a task * - * @param array $user User properties - * @return string + * Regular users can't remove tasks from other people + * + * @public + * @param array $task + * @return bool */ - public function getFullname(array $user = array()) + public function canRemoveTask(array $task) { - return $this->user->getFullname(empty($user) ? $this->userSession->getAll() : $user); + if (isset($task['creator_id']) && $task['creator_id'] == $this->userSession->getId()) { + return true; + } + + if ($this->userSession->isAdmin() || $this->getProjectUserRole($task['project_id']) === Role::PROJECT_MANAGER) { + return true; + } + + return false; } } diff --git a/sources/app/Import/TaskImport.php b/sources/app/Import/TaskImport.php index 2abafe1..f5ca9b0 100644 --- a/sources/app/Import/TaskImport.php +++ b/sources/app/Import/TaskImport.php @@ -69,7 +69,7 @@ class TaskImport extends Base $row = $this->prepare($row); if ($this->validateCreation($row)) { - if ($this->taskCreation->create($row) > 0) { + if ($this->taskCreationModel->create($row) > 0) { $this->logger->debug('TaskImport: imported successfully line '.$line_number); $this->counter++; } else { @@ -100,27 +100,27 @@ class TaskImport extends Base $values['time_spent'] = (float) $row['time_spent']; if (! empty($row['assignee'])) { - $values['owner_id'] = $this->user->getIdByUsername($row['assignee']); + $values['owner_id'] = $this->userModel->getIdByUsername($row['assignee']); } if (! empty($row['creator'])) { - $values['creator_id'] = $this->user->getIdByUsername($row['creator']); + $values['creator_id'] = $this->userModel->getIdByUsername($row['creator']); } if (! empty($row['color'])) { - $values['color_id'] = $this->color->find($row['color']); + $values['color_id'] = $this->colorModel->find($row['color']); } if (! empty($row['column'])) { - $values['column_id'] = $this->column->getColumnIdByTitle($this->projectId, $row['column']); + $values['column_id'] = $this->columnModel->getColumnIdByTitle($this->projectId, $row['column']); } if (! empty($row['category'])) { - $values['category_id'] = $this->category->getIdByName($this->projectId, $row['category']); + $values['category_id'] = $this->categoryModel->getIdByName($this->projectId, $row['category']); } if (! empty($row['swimlane'])) { - $values['swimlane_id'] = $this->swimlane->getIdByName($this->projectId, $row['swimlane']); + $values['swimlane_id'] = $this->swimlaneModel->getIdByName($this->projectId, $row['swimlane']); } if (! empty($row['date_due'])) { diff --git a/sources/app/Import/UserImport.php b/sources/app/Import/UserImport.php index 64300d7..304a325 100644 --- a/sources/app/Import/UserImport.php +++ b/sources/app/Import/UserImport.php @@ -2,7 +2,7 @@ namespace Kanboard\Import; -use Kanboard\Model\User; +use Kanboard\Model\UserModel; use SimpleValidator\Validator; use SimpleValidator\Validators; use Kanboard\Core\Security\Role; @@ -56,7 +56,7 @@ class UserImport extends Base $row = $this->prepare($row); if ($this->validateCreation($row)) { - if ($this->user->create($row)) { + if ($this->userModel->create($row) !== false) { $this->logger->debug('UserImport: imported successfully line '.$line_number); $this->counter++; } else { @@ -109,7 +109,7 @@ class UserImport extends Base { $v = new Validator($values, array( new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50), - new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), User::TABLE, 'id'), + new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), UserModel::TABLE, 'id'), new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6), new Validators\Email('email', t('Email address invalid')), new Validators\Integer('is_ldap_user', t('This value must be an integer')), diff --git a/sources/app/Job/BaseJob.php b/sources/app/Job/BaseJob.php new file mode 100644 index 0000000..60522ac --- /dev/null +++ b/sources/app/Job/BaseJob.php @@ -0,0 +1,33 @@ +jobParams; + } +} diff --git a/sources/app/Job/EmailJob.php b/sources/app/Job/EmailJob.php new file mode 100644 index 0000000..2da3ca2 --- /dev/null +++ b/sources/app/Job/EmailJob.php @@ -0,0 +1,55 @@ +jobParams = array($email, $name, $subject, $html, $author); + return $this; + } + + /** + * Execute job + * + * @access public + * @param string $email + * @param string $name + * @param string $subject + * @param string $html + * @param string $author + */ + public function execute($email, $name, $subject, $html, $author) + { + $transport = $this->helper->mail->getMailTransport(); + $this->logger->debug(__METHOD__.' Sending email to: '.$email.' using transport: '.$transport); + $startTime = microtime(true); + + $this->emailClient + ->getTransport($transport) + ->sendEmail($email, $name, $subject, $html, $author) + ; + + if (DEBUG) { + $this->logger->debug('Email sent in '.round(microtime(true) - $startTime, 6).' seconds'); + } + } +} diff --git a/sources/app/Job/HttpAsyncJob.php b/sources/app/Job/HttpAsyncJob.php new file mode 100644 index 0000000..9e5cf10 --- /dev/null +++ b/sources/app/Job/HttpAsyncJob.php @@ -0,0 +1,43 @@ +jobParams = array($method, $url, $content, $headers); + return $this; + } + + /** + * Set job parameters + * + * @access public + * @param string $method + * @param string $url + * @param string $content + * @param array $headers + * @return $this + */ + public function execute($method, $url, $content, array $headers) + { + $this->httpClient->doRequest($method, $url, $content, $headers); + } +} diff --git a/sources/app/Job/NotificationJob.php b/sources/app/Job/NotificationJob.php new file mode 100644 index 0000000..904a927 --- /dev/null +++ b/sources/app/Job/NotificationJob.php @@ -0,0 +1,85 @@ +jobParams = array($event->getAll(), $eventName, $eventObjectName); + return $this; + } + + /** + * Execute job + * + * @param array $event + * @param string $eventName + * @param string $eventObjectName + */ + public function execute(array $event, $eventName, $eventObjectName) + { + $eventData = $this->getEventData($event, $eventObjectName); + + if (! empty($eventData)) { + if (! empty($event['mention'])) { + $this->userNotificationModel->sendUserNotification($event['mention'], $eventName, $eventData); + } else { + $this->userNotificationModel->sendNotifications($eventName, $eventData); + $this->projectNotificationModel->sendNotifications($eventData['task']['project_id'], $eventName, $eventData); + } + } + } + + /** + * Get event data + * + * @param array $event + * @param string $eventObjectName + * @return array + */ + public function getEventData(array $event, $eventObjectName) + { + $values = array(); + + if (! empty($event['changes'])) { + $values['changes'] = $event['changes']; + } + + switch ($eventObjectName) { + case 'Kanboard\Event\TaskEvent': + $values['task'] = $this->taskFinderModel->getDetails($event['task_id']); + break; + case 'Kanboard\Event\SubtaskEvent': + $values['subtask'] = $this->subtaskModel->getById($event['id'], true); + $values['task'] = $this->taskFinderModel->getDetails($values['subtask']['task_id']); + break; + case 'Kanboard\Event\FileEvent': + $values['file'] = $event; + $values['task'] = $this->taskFinderModel->getDetails($values['file']['task_id']); + break; + case 'Kanboard\Event\CommentEvent': + $values['comment'] = $this->commentModel->getById($event['id']); + $values['task'] = $this->taskFinderModel->getDetails($values['comment']['task_id']); + break; + } + + return $values; + } +} diff --git a/sources/app/Job/ProjectMetricJob.php b/sources/app/Job/ProjectMetricJob.php new file mode 100644 index 0000000..6330bd4 --- /dev/null +++ b/sources/app/Job/ProjectMetricJob.php @@ -0,0 +1,40 @@ +jobParams = array($projectId); + return $this; + } + + /** + * Execute job + * + * @access public + * @param integer $projectId + */ + public function execute($projectId) + { + $this->logger->debug(__METHOD__.' Run project metrics calculation'); + $now = date('Y-m-d'); + + $this->projectDailyColumnStatsModel->updateTotals($projectId, $now); + $this->projectDailyStatsModel->updateTotals($projectId, $now); + } +} diff --git a/sources/app/Locale/bs_BA/translations.php b/sources/app/Locale/bs_BA/translations.php index 7ca864f..4213d10 100644 --- a/sources/app/Locale/bs_BA/translations.php +++ b/sources/app/Locale/bs_BA/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Pregledaj zadatak', 'Remove user' => 'Ukloni korisnika', 'Do you really want to remove this user: "%s"?' => 'Da li zaista želiš da ukloniš korisnika: "%s"?', - 'New user' => 'Novi korisnik', 'All users' => 'Svi korisnici', 'Username' => 'Korisničko ime', 'Password' => 'Šifra', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d zatvorenih zadataka', 'No task for this project' => 'Nema dodijeljenih zadataka ovom projektu', 'Public link' => 'Javni link', - 'Change assignee' => 'Promjena izvršioca', - 'Change assignee for the task "%s"' => 'Promjena izvršioca za zadatak "%s"', 'Timezone' => 'Vremenska zona', 'Sorry, I didn\'t find this information in my database!' => 'Na žalost, nije pronađena informacija u bazi', 'Page not found' => 'Strana nije pronađena', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Dodaj opis', 'Comment added successfully.' => 'Komentar uspješno dodan', 'Unable to create your comment.' => 'Nemoguće kreiranje komentara', - 'Edit this task' => 'Uredi ovaj zadatak', 'Due Date' => 'Treba biti gotovo do dana', 'Invalid date' => 'Pogrešan datum', 'Automatic actions' => 'Automatske akcije', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategorija', 'Category:' => 'Kategorija:', 'Categories' => 'Kategorije', - 'Category not found.' => 'Kategorija nije pronađena', 'Your category have been created successfully.' => 'Uspješno kreirana kategorija.', 'Unable to create your category.' => 'Nije moguće kreirati kategoriju.', 'Your category have been updated successfully.' => 'Kategorija je uspješno ažurirana', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Da li da uklonim fajl: "%s"?', 'Attachments' => 'Prilozi', 'Edit the task' => 'Uredi zadatak', - 'Edit the description' => 'Uredi opis zadatka', 'Add a comment' => 'Dodaj komentar', 'Edit a comment' => 'Izmijeni komentar', 'Summary' => 'Pregled', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Bez omogućenih vanjskih autentikacija.', 'Password modified successfully.' => 'Uspješna izmjena šifre.', 'Unable to change the password.' => 'Nije moguće izmijeniti šifru.', - 'Change category for the task "%s"' => 'Izijmeni kategoriju zadatka "%s"', 'Change category' => 'Izmijeni kategoriju', '%s updated the task %s' => '%s izmijenio zadatak %s', '%s opened the task %s' => '%s otvorio zadatak %s', @@ -413,9 +406,7 @@ return array( 'About' => 'O Kanboardu', 'Database driver:' => 'Database driver:', 'Board settings' => 'Postavke table', - 'URL and token' => 'URL i token', 'Webhook settings' => 'Postavke za webhook', - 'URL for task creation:' => 'URL za kreiranje zadataka', 'Reset token' => 'Resetuj token', 'API endpoint:' => 'API endpoint', 'Refresh interval for private board' => 'Interval osvježavanja privatnih ploča', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Ukloni swimline traku', 'Show default swimlane' => 'Prikaži podrazumijevanu swimline traku', 'Swimlane modification for the project "%s"' => 'Izmjene swimline trake za projekat "%s"', - 'Swimlane not found.' => 'Swimline traka nije pronađena.', 'Swimlane removed successfully.' => 'Swimline traka uspješno uklonjena.', 'Swimlanes' => 'Swimline trake', 'Swimlane updated successfully.' => 'Swimline traka uspjeno ažurirana.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Sve swimline trake', 'All colors' => 'Sve boje', 'Moved to column %s' => 'Premješten u kolonu %s', - 'Change description' => 'Promijeni opis', 'User dashboard' => 'Korisnički panel', 'Allow only one subtask in progress at the same time for a user' => 'Dozvoli samo jedan pod-zadatak "u radu" po korisniku', 'Edit column "%s"' => 'Uredi kolonu "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'pregled ploče na Kanboard-u', 'The task have been moved to the first swimlane' => 'Zadatak je premješten u prvu swimline traku', 'The task have been moved to another swimlane:' => 'Zadatak je premješten u drugu swimline traku', - 'Overdue tasks for the project "%s"' => 'Zadaci u kašnjenju za projekat "%s"', 'New title: %s' => 'Novi naslov: %s', 'The task is not assigned anymore' => 'Zadatak nema više izvršioca', 'New assignee: %s' => 'Novi izvršilac: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Zaustavi tajmer', 'Start timer' => 'Pokreni tajmer', 'Add project member' => 'Dodaj člana projekta', - 'Enable notifications' => 'Omogući obavještenja', 'My activity stream' => 'Tok mojih aktivnosti', 'My calendar' => 'Moj kalendar', 'Search tasks' => 'Pretraga zadataka', @@ -763,14 +750,14 @@ return array( 'List' => 'Lista', 'Filter' => 'Filter', 'Advanced search' => 'Napredna pretraga', - 'Example of query: ' => 'Primjer za upit', - 'Search by project: ' => 'Pretraga po projektu', - 'Search by column: ' => 'Pretraga po koloni', - 'Search by assignee: ' => 'Pretraga po izvršiocu', - 'Search by color: ' => 'Pretraga po boji', - 'Search by category: ' => 'Pretraga po kategoriji', - 'Search by description: ' => 'Pretraga po opisu', - 'Search by due date: ' => 'Pretraga po datumu završetka', + 'Example of query: ' => 'Primjer za upit: ', + 'Search by project: ' => 'Pretraga po projektu: ', + 'Search by column: ' => 'Pretraga po koloni: ', + 'Search by assignee: ' => 'Pretraga po izvršiocu: ', + 'Search by color: ' => 'Pretraga po boji: ', + 'Search by category: ' => 'Pretraga po kategoriji: ', + 'Search by description: ' => 'Pretraga po opisu: ', + 'Search by due date: ' => 'Pretraga po datumu završetka: ', 'Lead and Cycle time for "%s"' => 'Vrijeme upravljanje i vremenski ciklus za "%s"', 'Average time spent into each column for "%s"' => 'Prosjek utrošenog vremena u svakoj koloni za "%s"', 'Average time spent into each column' => 'Prosjek utrošenog vrmena u svakoj koloni', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Kolona uspješno napravljena.', 'Another column with the same name exists in the project' => 'Već postoji kolona s istim imenom u ovom projektu.', 'Default filters' => 'Podrazumijevani filteri', - 'Your board doesn\'t have any column!' => 'Vaš panel nema ni jednu kolonu!', + 'Your board doesn\'t have any columns!' => 'Vaš panel nema ni jednu kolonu!', 'Change column position' => 'Promijeni poziciju kolone', 'Switch to the project overview' => 'Promijeni u pregled projekta', 'User filters' => 'Korisnički filteri', @@ -1135,22 +1122,98 @@ return array( 'There is no action at the moment.' => 'Trenutno nema akcija.', 'Import actions from another project' => 'Uvezi akcije iz drugog projekta', 'There is no available project.' => 'Trenutno nema dostupnih projekata.', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Local File' => 'Lokalni fajl', + 'Configuration' => 'Konfiguracija', + 'PHP version:' => 'Verzija PHP-a:', + 'PHP SAPI:' => 'Verzija SAPI-a:', + 'OS version:' => 'Verzija OS-a:', + 'Database version:' => 'Verzija baze podataka:', + 'Browser:' => 'Pretraživač:', + 'Task view' => 'Pregled zadatka', + 'Edit task' => 'Uredi zadatak', + 'Edit description' => 'Uredi opis', + 'New internal link' => 'Nova unutrašnja veza', + 'Display list of keyboard shortcuts' => 'Prikaži listu prečica na tastaturi', + 'Menu' => 'Meni', + 'Set start date' => 'Postavi početni datum', + 'Avatar' => 'Avatar', + 'Upload my avatar image' => 'Dodaj sliku za moj avatar', + 'Remove my image' => 'Ukloni moju sliku', + 'The OAuth2 state parameter is invalid' => 'OAuth2 status parametar nije validan', + 'User not found.' => 'Korisnik nije pronađen.', + 'Search in activity stream' => 'Pretraži aktivnosti', + 'My activities' => 'Moje aktivnosti', + 'Activity until yesterday' => 'Aktivnosti do jučer', + 'Activity until today' => 'Aktivnosti do danas', + 'Search by creator: ' => 'Pretraga po kreatoru: ', + 'Search by creation date: ' => 'Pretraga po datumu kreiranja: ', + 'Search by task status: ' => 'Pretraga po statusu zadatka: ', + 'Search by task title: ' => 'Pretraga po naslovu zadatka: ', + 'Activity stream search' => 'Pretraga aktivnosti', + 'Projects where "%s" is manager' => 'Projekti gdje je "%s" menadžer', + 'Projects where "%s" is member' => 'Projekti gdje je "%s" član', + 'Open tasks assigned to "%s"' => 'Otvoreni zadaci dodijeljeni "%s"', + 'Closed tasks assigned to "%s"' => 'Zatvoreni zadaci dodijeljeni "%s"', + // 'Assign automatically a color based on a priority' => '', + 'Overdue tasks for the project(s) "%s"' => 'Zadaci u kašnjenju za projekat(te) "%s"', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/cs_CZ/translations.php b/sources/app/Locale/cs_CZ/translations.php index b2921de..78df7ec 100644 --- a/sources/app/Locale/cs_CZ/translations.php +++ b/sources/app/Locale/cs_CZ/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Zobrazit úkol', 'Remove user' => 'Odebrat uživatele', 'Do you really want to remove this user: "%s"?' => 'Opravdu chcete odebrat uživatele: "%s"?', - 'New user' => 'Nový uživatel', 'All users' => 'Všichni uživatelé', 'Username' => 'Uživatelské jméno', 'Password' => 'Heslo', @@ -101,7 +100,7 @@ return array( 'There is nobody assigned' => 'Není přiřazeno žádnému uživateli', 'Column on the board:' => 'Sloupec:', 'Close this task' => 'Uzavřít úkol', - 'Open this task' => 'Aufgabe wieder öffnen', + 'Open this task' => 'Otevřít tento úkol', 'There is no description.' => 'Bez popisu', 'Add a new task' => 'Přidat nový úkol', 'The username is required' => 'Uživatelské jméno je vyžadováno', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d dokončených úkolů', 'No task for this project' => 'Tento projekt nemá žádné úkoly', 'Public link' => 'Veřejný odkaz', - 'Change assignee' => 'Změna přiřazení k uživatelům', - 'Change assignee for the task "%s"' => 'Změna přiřazení uživatele pro úkol "%s"', 'Timezone' => 'Časová zóna', 'Sorry, I didn\'t find this information in my database!' => 'Omlouváme se, tuto informaci nelze nalézt!', 'Page not found' => 'Stránka nenalezena', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Vložte popis', 'Comment added successfully.' => 'Komentář byl úspěšně přidán.', 'Unable to create your comment.' => 'Komentář nelze vytvořit.', - 'Edit this task' => 'Editace úkolu', 'Due Date' => 'Datum splnění', 'Invalid date' => 'Neplatné datum', 'Automatic actions' => 'Automaticky vykonávané akce', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategorie', 'Category:' => 'Kategorie:', 'Categories' => 'Kategorie', - 'Category not found.' => 'Kategorie není nalezena.', 'Your category have been created successfully.' => 'Kategorie byla úspěšně vytvořena.', 'Unable to create your category.' => 'Kategorii nelze vytvořit.', 'Your category have been updated successfully.' => 'Kategorie byla úspěšně aktualizována.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Skutečně chcete odebrat soubor: "%s"?', 'Attachments' => 'Přílohy', 'Edit the task' => 'Upravit úkol', - 'Edit the description' => 'Upravit popis', 'Add a comment' => 'Přidat komentář', 'Edit a comment' => 'Upravit komentář', 'Summary' => 'Souhrn', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Není povolena žádná vzdálená autorizace.', 'Password modified successfully.' => 'Heslo bylo úspěšně změněno.', 'Unable to change the password.' => 'Nelze změnit heslo.', - 'Change category for the task "%s"' => 'Změna kategorie pro úkol "%s" ', 'Change category' => 'Změna kategorie', '%s updated the task %s' => '%s aktualizoval úkol %s ', '%s opened the task %s' => '%s znovu otevřel úkol %s ', @@ -400,8 +393,8 @@ return array( 'Default values are "%s"' => 'Standardní hodnoty jsou: "%s"', 'Default columns for new projects (Comma-separated)' => 'Výchozí sloupce pro nové projekty (odděleny čárkou)', 'Task assignee change' => 'Změna přiřazení uživatelů', - '%s change the assignee of the task #%d to %s' => '%s hat die Zusständigkeit der Aufgabe #%d geändert um %s', - '%s changed the assignee of the task %s to %s' => '%s změnil řešitele úkolu %s na uživatele %s', + '%s change the assignee of the task #%d to %s' => '%s změnil přidělení úkolu #%d na uživatele %s', + '%s changed the assignee of the task %s to %s' => '%s změnil přidělení úkolu %s na uživatele %s', 'New password for the user "%s"' => 'Nové heslo pro uživatele "%s"', 'Choose an event' => 'Vybrat událost', 'Create a task from an external provider' => 'Vytvořit úkol externím poskytovatelem', @@ -413,9 +406,7 @@ return array( 'About' => 'O projektu', 'Database driver:' => 'Databáze', 'Board settings' => 'Nastavení nástěnky', - 'URL and token' => 'URL a Token', 'Webhook settings' => 'Webhook nastavení', - 'URL for task creation:' => 'URL pro vytvoření úkolu', 'Reset token' => 'Token reset', 'API endpoint:' => 'API endpoint', 'Refresh interval for private board' => 'Interval automatického obnovování pro soukromé nástěnky', @@ -466,13 +457,13 @@ return array( 'The project id must be an integer' => 'ID projektu musí být celé číslo', 'The status must be an integer' => 'Status musí být celé číslo', 'The subtask id is required' => 'Je požadováno id dílčího úkolu', - 'The subtask id must be an integer' => 'Die Teilaufgabenid muss eine ganze Zahl sein', - 'The task id is required' => 'Die Aufgabenid ist benötigt', - 'The task id must be an integer' => 'Die Aufgabenid muss eine ganze Zahl sein', - 'The user id must be an integer' => 'Die Userid muss eine ganze Zahl sein', - 'This value is required' => 'Dieser Wert ist erforderlich', - 'This value must be numeric' => 'Dieser Wert muss numerisch sein', - 'Unable to create this task.' => 'Diese Aufgabe kann nicht erstellt werden', + 'The subtask id must be an integer' => 'ID dílčího úkolu musí být číslo', + 'The task id is required' => 'ID úkolu je povinné', + 'The task id must be an integer' => 'ID úkolu musí být číslo', + 'The user id must be an integer' => 'ID uživatele musí být číslo', + 'This value is required' => 'Hodnota je povinná', + 'This value must be numeric' => 'Hodnota musí být číselná', + 'Unable to create this task.' => 'Nelze vytvořit tento úkol', 'Cumulative flow diagram' => 'Kumulativní diagram', 'Cumulative flow diagram for "%s"' => 'Kumulativní diagram pro "%s"', 'Daily project summary' => 'Denní přehledy', @@ -480,27 +471,26 @@ return array( 'Daily project summary export for "%s"' => 'Export denních přehledů pro "%s"', 'Exports' => 'Exporty', 'This export contains the number of tasks per column grouped per day.' => 'Tento export obsahuje počet úkolů pro jednotlivé sloupce seskupených podle dní.', - 'Active swimlanes' => 'Aktive Swimlane', - 'Add a new swimlane' => 'Přidat nový řádek', - 'Change default swimlane' => 'Standard Swimlane ändern', - 'Default swimlane' => 'Výchozí Swimlane', - 'Do you really want to remove this swimlane: "%s"?' => 'Diese Swimlane wirklich ändern: "%s"?', - 'Inactive swimlanes' => 'Inaktive Swimlane', - 'Remove a swimlane' => 'Odstranit swimlane', - 'Show default swimlane' => 'Standard Swimlane anzeigen', - 'Swimlane modification for the project "%s"' => 'Swimlane Änderung für das Projekt "%s"', - 'Swimlane not found.' => 'Swimlane nicht gefunden', - 'Swimlane removed successfully.' => 'Swimlane erfolgreich entfernt.', - 'Swimlanes' => 'Swimlanes', - 'Swimlane updated successfully.' => 'Swimlane erfolgreich geändert.', - 'The default swimlane have been updated successfully.' => 'Die standard Swimlane wurden erfolgreich aktualisiert. Die standard Swimlane wurden erfolgreich aktualisiert.', - 'Unable to remove this swimlane.' => 'Es ist nicht möglich die Swimlane zu entfernen.', - 'Unable to update this swimlane.' => 'Es ist nicht möglich die Swimöane zu ändern.', - 'Your swimlane have been created successfully.' => 'Die Swimlane wurde erfolgreich angelegt.', - 'Example: "Bug, Feature Request, Improvement"' => 'Beispiel: "Bug, Funktionswünsche, Verbesserung"', + 'Active swimlanes' => 'Aktivní dráhy', + 'Add a new swimlane' => 'Přidat novou dráhu', + 'Change default swimlane' => 'Změnit výchozí dráhu', + 'Default swimlane' => 'Výchozí dráha', + 'Do you really want to remove this swimlane: "%s"?' => 'Opravdu si přejete odstranit tuto dráhu: "%s"?', + 'Inactive swimlanes' => 'Neaktivní dráha', + 'Remove a swimlane' => 'Odstranit dráhu', + 'Show default swimlane' => 'Zobrazit výchozí dráhu', + 'Swimlane modification for the project "%s"' => 'Změny dráhy pro projekt "%s"', + 'Swimlane removed successfully.' => 'Dráha byla odstraněna.', + 'Swimlanes' => 'Dráhy', + 'Swimlane updated successfully.' => 'Dráha byla upravena.', + 'The default swimlane have been updated successfully.' => 'Výchozí dráha byla upravena', + 'Unable to remove this swimlane.' => 'Tuto dráhu nelze odstranit.', + 'Unable to update this swimlane.' => 'Tuto dráhu nelze upravit.', + 'Your swimlane have been created successfully.' => 'Dráha byla vytvořena.', + 'Example: "Bug, Feature Request, Improvement"' => 'Například: "Chyba", "Nápad", "Požadavek"...', 'Default categories for new projects (Comma-separated)' => 'Výchozí kategorie pro nové projekty (oddělené čárkou)', 'Integrations' => 'Integrace', - 'Integration with third-party services' => 'Integration von Fremdleistungen', + 'Integration with third-party services' => 'Integrace se službami třetích stran', 'Subtask Id' => 'Dílčí úkol Id', 'Subtasks' => 'Dílčí úkoly', 'Subtasks Export' => 'Export dílčích úkolů', @@ -517,11 +507,10 @@ return array( 'All swimlanes' => 'Alle Swimlanes', 'All colors' => 'Všechny barvy', 'Moved to column %s' => 'Přesunuto do sloupce %s ', - 'Change description' => 'Změna podrobného popisu', 'User dashboard' => 'Nástěnka uživatele', 'Allow only one subtask in progress at the same time for a user' => 'Umožnit uživateli práci pouze na jednom dílčím úkolu ve stejném čase', 'Edit column "%s"' => 'Upravit sloupec "%s" ', - 'Select the new status of the subtask: "%s"' => 'Wähle einen neuen Status für Teilaufgabe: "%s"', + 'Select the new status of the subtask: "%s"' => 'Vyberte nový stav pro podúkol: "%s"', 'Subtask timesheet' => 'Časový rozvrh dílčích úkolů', 'There is nothing to show.' => 'Žádná položka k zobrazení', 'Time Tracking' => 'Sledování času', @@ -534,9 +523,9 @@ return array( 'Days in this column' => 'Dní v tomto sloupci', '%dd' => '%d d', 'Add a new link' => 'Přidat nový odkaz', - 'Do you really want to remove this link: "%s"?' => 'Die Verbindung "%s" wirklich löschen?', - 'Do you really want to remove this link with task #%d?' => 'Die Verbindung mit der Aufgabe #%d wirklich löschen?', - 'Field required' => 'Feld erforderlich', + 'Do you really want to remove this link: "%s"?' => 'Opravdu chcete odstranit odkaz "%s"?', + 'Do you really want to remove this link with task #%d?' => 'Opravdu chcete odstranit odkaz na úkol #%d ?', + 'Field required' => 'Povinné pole', 'Link added successfully.' => 'Propojení bylo úspěšně přidáno.', 'Link updated successfully.' => 'Propojení bylo úspěšně aktualizováno.', 'Link removed successfully.' => 'Propojení bylo úspěšně odebráno.', @@ -560,8 +549,8 @@ return array( 'is duplicated by' => 'je duplikován', 'is a child of' => 'je podřízený', 'is a parent of' => 'je nadřízený', - 'targets milestone' => 'targets milestone', - 'is a milestone of' => 'is a milestone of', + 'targets milestone' => 'patří k milníku', + 'is a milestone of' => 'je milníkem', 'fixes' => 'nahrazuje', 'is fixed by' => 'je nahrazen', 'This task' => 'Tento úkol', @@ -603,7 +592,7 @@ return array( 'Time spent in the column' => 'Trvání jednotlivých etap', 'Task transitions' => 'Přesuny úkolů', 'Task transitions export' => 'Export přesunů mezi sloupci', - 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => 'Diese Auswertung enthält alle Spaltenbewegungen für jede Aufgabe mit Datum, Benutzer und Zeit vor jedem Wechsel.', + 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => 'Tento seznam obsahuje všechny pohyby úkolů s daty, uživateli a časy strávenými na úkolu.', 'Currency rates' => 'Aktuální kurzy', 'Rate' => 'Kurz', 'Change reference currency' => 'Změnit referenční měnu', @@ -615,28 +604,28 @@ return array( '%s remove the assignee of the task %s' => '%s odstranil přiřazení úkolu %s ', 'Enable Gravatar images' => 'Aktiviere Gravatar Bilder', 'Information' => 'Informace', - 'Check two factor authentication code' => 'Prüfe Zwei-Faktor-Authentifizierungscode', - 'The two factor authentication code is not valid.' => 'Der Zwei-Faktor-Authentifizierungscode ist ungültig.', - 'The two factor authentication code is valid.' => 'Der Zwei-Faktor-Authentifizierungscode ist gültig.', - 'Code' => 'Code', + 'Check two factor authentication code' => 'Zkontrolujte dvouúrovňový autentifikační klíč', + 'The two factor authentication code is not valid.' => 'Dvouúrovňový autentifikační klíč není platný.', + 'The two factor authentication code is valid.' => 'Dvouúrovňový autentifikační klíč je platný.', + 'Code' => 'Klíč', 'Two factor authentication' => 'Dvouúrovňová autorizace', - 'This QR code contains the key URI: ' => 'Dieser QR-Code beinhaltet die Schlüssel-URI', + 'This QR code contains the key URI: ' => 'Tento QR kód obsahuje adresu s klíčem', 'Check my code' => 'Kontrola mého kódu', 'Secret key: ' => 'Tajný klíč', 'Test your device' => 'Test Vašeho zařízení', 'Assign a color when the task is moved to a specific column' => 'Přiřadit barvu, když je úkol přesunut do konkrétního sloupce', '%s via Kanboard' => '%s via Kanboard', - 'Burndown chart for "%s"' => 'Burndown-Chart für "%s"', + 'Burndown chart for "%s"' => 'Burndown-Chart pro "%s"', 'Burndown chart' => 'Burndown-Chart', 'This chart show the task complexity over the time (Work Remaining).' => 'Graf zobrazuje složitost úkolů v čase (Zbývající práce).', 'Screenshot taken %s' => 'Screenshot aufgenommen %s ', 'Add a screenshot' => 'Přidat snímek obrazovky', - 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Nimm einen Screenshot auf und drücke STRG+V oder ⌘+V um ihn hier einzufügen.', - 'Screenshot uploaded successfully.' => 'Screenshot erfolgreich hochgeladen.', + 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Pořiďte snímek obrazovky a v tomto poli stiskněte Ctrl+V nebo ⌘+V ', + 'Screenshot uploaded successfully.' => 'Snímek obrazovky byl úspěšně nahrán.', 'SEK - Swedish Krona' => 'SEK - Schwedische Kronen', - 'Identifier' => 'Identifikator', - 'Disable two factor authentication' => 'Zrušit dvou stupňovou autorizaci', - 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Willst du wirklich für folgenden Nutzer die Zwei-Faktor-Authentifizierung deaktivieren: "%s"?', + 'Identifier' => 'Identifikátor', + 'Disable two factor authentication' => 'Zrušit dvouúrovňovou autorizaci', + 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Opravdu chcete vypnout dvouúrovňovou autentifikaci pro uživatele: "%s"?', // 'Edit link' => '', // 'Start to type task title...' => '', // 'A task cannot be linked to itself' => '', @@ -691,28 +680,27 @@ return array( 'Move the task to another column when the category is changed' => 'Přesun úkolu do jiného sloupce když je změněna kategorie', 'Send a task by email to someone' => 'Poslat někomu úkol poštou', 'Reopen a task' => 'Znovu otevřít úkol', - 'Column change' => 'Spalte geändert', - 'Position change' => 'Position geändert', - 'Swimlane change' => 'Swimlane geändert', - 'Assignee change' => 'Zuordnung geändert', - '[%s] Overdue tasks' => '[%s] überfallige Aufgaben', - 'Notification' => 'Benachrichtigungen', - '%s moved the task #%d to the first swimlane' => '%s hat die Aufgabe #%d in die erste Swimlane verschoben', - '%s moved the task #%d to the swimlane "%s"' => '%s hat die Aufgabe #%d in die Swimlane "%s" verschoben', + 'Column change' => 'Změna sloupce', + 'Position change' => 'Změna pozice', + 'Swimlane change' => 'Změna dráhy', + 'Assignee change' => 'Změna přidělení', + '[%s] Overdue tasks' => '[%s] přetažených úkolů', + 'Notification' => 'Upozornění', + '%s moved the task #%d to the first swimlane' => '%s přesunul úkol #%d do první dráhy', + '%s moved the task #%d to the swimlane "%s"' => '%s přesunul úkol #%d do dráhy "%s"', // 'Swimlane' => '', // 'Gravatar' => '', - '%s moved the task %s to the first swimlane' => '%s hat die Aufgabe %s in die erste Swimlane verschoben', - '%s moved the task %s to the swimlane "%s"' => '%s hat die Aufgaben %s in die Swimlane "%s" verschoben', + '%s moved the task %s to the first swimlane' => '%s přesunul úkol %s do první dráhy', + '%s moved the task %s to the swimlane "%s"' => '%s přesunul úkol %s do dráhy "%s"', 'This report contains all subtasks information for the given date range.' => 'Report obsahuje všechny informace o dílčích úkolech pro daný časový úsek', 'This report contains all tasks information for the given date range.' => 'Report obsahuje informace o všech úkolech pro daný časový úsek.', 'Project activities for %s' => 'Aktivity projektu %s', - 'view the board on Kanboard' => 'Pinnwand in Kanboard anzeigen', - 'The task have been moved to the first swimlane' => 'Die Aufgabe wurde in die erste Swimlane verschoben', - 'The task have been moved to another swimlane:' => 'Die Aufgaben wurde in ene andere Swimlane verschoben', - 'Overdue tasks for the project "%s"' => 'Überfällige Aufgaben für das Projekt "%s"', - 'New title: %s' => 'Neuer Titel: %s', - 'The task is not assigned anymore' => 'Die Aufgabe ist nicht mehr zugewiesen', - 'New assignee: %s' => 'Neue Zuordnung: %s', + 'view the board on Kanboard' => 'Zobrazit nástěnku', + 'The task have been moved to the first swimlane' => 'Úkol byl přesunut do první dráhy', + 'The task have been moved to another swimlane:' => 'Úkol byl přesunut do další dráhy', + 'New title: %s' => 'Nový název: %s', + 'The task is not assigned anymore' => 'Úkol již není přidělen', + 'New assignee: %s' => 'přidělení: %s', 'There is no category now' => 'Nyní neexistuje žádná kategorie', 'New category: %s' => 'Nová kategorie: %s', 'New color: %s' => 'Nová barva: %s', @@ -720,11 +708,11 @@ return array( 'The due date have been removed' => 'Datum dokončení byl odstraněn', 'There is no description anymore' => 'Ještě neexistuje žádný popis', 'Recurrence settings have been modified' => 'Nastavení opakování bylo změněno', - 'Time spent changed: %sh' => 'Verbrauchte Zeit geändert: %sh', - 'Time estimated changed: %sh' => 'Geschätzte Zeit geändert: %sh', - 'The field "%s" have been updated' => 'Das Feld "%s" wurde verändert', - 'The description has been modified:' => 'Die Beschreibung wurde geändert:', - 'Do you really want to close the task "%s" as well as all subtasks?' => 'Soll die Aufgabe "%s" wirklich geschlossen werden? (einschließlich Teilaufgaben)', + 'Time spent changed: %sh' => 'Strávený čas se změnil: %sh', + 'Time estimated changed: %sh' => 'Odhadovaný čas se změnil: %sh', + 'The field "%s" have been updated' => 'Sloupec "%s" byl upraven', + 'The description has been modified:' => 'Popis byl upraven:', + 'Do you really want to close the task "%s" as well as all subtasks?' => 'Opravdu si přejete úkol "%s" uzavřít? (včetně podúkolů)', 'I want to receive notifications for:' => 'Chci dostávat upozornění na:', 'All tasks' => 'Všechny úkoly', 'Only for tasks assigned to me' => 'pouze pro moje úkoly', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Zastavit časovač', 'Start timer' => 'Spustit časovač', 'Add project member' => 'Přidat člena projektu', - 'Enable notifications' => 'Povolit notifikace', 'My activity stream' => 'Přehled mých aktivit', 'My calendar' => 'Můj kalendář', 'Search tasks' => 'Hledání úkolů', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/da_DK/translations.php b/sources/app/Locale/da_DK/translations.php index c474392..bf595a0 100644 --- a/sources/app/Locale/da_DK/translations.php +++ b/sources/app/Locale/da_DK/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Se denne opgave', 'Remove user' => 'Fjern bruger', 'Do you really want to remove this user: "%s"?' => 'Ønsker du virkelig at fjerne denne bruger: "%s"?', - 'New user' => 'Ny bruger', 'All users' => 'Alle brugere', 'Username' => 'Brugernavn', 'Password' => 'Password', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d lukket opgavet', 'No task for this project' => 'Ingen opgaver i dette projekt', 'Public link' => 'Offentligt link', - 'Change assignee' => 'Ændre ansvarlig', - 'Change assignee for the task "%s"' => 'Ændre ansvarlig for opgaven: "%s"', 'Timezone' => 'Tidszone', 'Sorry, I didn\'t find this information in my database!' => 'Denne information kunne ikke findes i databasen!', 'Page not found' => 'Siden er ikke fundet', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Efterlad en beskrivelse...', 'Comment added successfully.' => 'Kommentaren er tilføjet.', 'Unable to create your comment.' => 'Din kommentar kunne ikke oprettes.', - 'Edit this task' => 'Rediger denne opgave', 'Due Date' => 'Forfaldsdato', 'Invalid date' => 'Ugyldig dato', 'Automatic actions' => 'Automatiske handlinger', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori:', 'Categories' => 'Kategorier', - 'Category not found.' => 'Kategori ikke fundet.', 'Your category have been created successfully.' => 'Kategorien er oprettet.', 'Unable to create your category.' => 'Kategorien kunne ikke oprettes.', 'Your category have been updated successfully.' => 'Kategorien er opdateret.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Vil du virkelig fjerne denne fil: "%s"?', 'Attachments' => 'Vedhæftninger', 'Edit the task' => 'Rediger opgaven', - 'Edit the description' => 'Rediger beskrivelsen', 'Add a comment' => 'Tilføj en kommentar', 'Edit a comment' => 'Rediger en kommentar', 'Summary' => 'Resumé', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Ingen eksterne autentificering aktiveret.', 'Password modified successfully.' => 'Adgangskode ændret.', 'Unable to change the password.' => 'Adgangskoden kunne ikke ændres.', - 'Change category for the task "%s"' => 'Skift kategori for opgaven "%s"', 'Change category' => 'Skift kategori', '%s updated the task %s' => '%s opdatert opgaven %s', '%s opened the task %s' => '%s åben opgaven %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Om', 'Database driver:' => 'Database driver:', 'Board settings' => 'Baord indstillinger', - 'URL and token' => 'URL og token', 'Webhook settings' => 'Webhook indstillinger', - 'URL for task creation:' => 'URL for opgave oprettelse:', 'Reset token' => 'Reset endpoint', 'API endpoint:' => 'API endpoint:', 'Refresh interval for private board' => 'Refresh interval for privat board', @@ -489,7 +480,6 @@ return array( // 'Remove a swimlane' => '', // 'Show default swimlane' => '', // 'Swimlane modification for the project "%s"' => '', - // 'Swimlane not found.' => '', // 'Swimlane removed successfully.' => '', // 'Swimlanes' => '', // 'Swimlane updated successfully.' => '', @@ -517,7 +507,6 @@ return array( // 'All swimlanes' => '', // 'All colors' => '', // 'Moved to column %s' => '', - // 'Change description' => '', // 'User dashboard' => '', // 'Allow only one subtask in progress at the same time for a user' => '', // 'Edit column "%s"' => '', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', // 'New title: %s' => '', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( // 'Stop timer' => '', // 'Start timer' => '', // 'Add project member' => '', - // 'Enable notifications' => '', // 'My activity stream' => '', // 'My calendar' => '', // 'Search tasks' => '', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/de_DE/translations.php b/sources/app/Locale/de_DE/translations.php index af88b37..81df4e5 100644 --- a/sources/app/Locale/de_DE/translations.php +++ b/sources/app/Locale/de_DE/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Aufgabe ansehen', 'Remove user' => 'Benutzer löschen', 'Do you really want to remove this user: "%s"?' => 'Soll dieser Benutzer wirklich gelöscht werden: "%s"?', - 'New user' => 'Neuer Benutzer', 'All users' => 'Alle Benutzer', 'Username' => 'Benutzername', 'Password' => 'Passwort', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d abgeschlossene Aufgaben', 'No task for this project' => 'Keine Aufgaben in diesem Projekt', 'Public link' => 'Öffentlicher Link', - 'Change assignee' => 'Zuständigkeit ändern', - 'Change assignee for the task "%s"' => 'Zuständigkeit für diese Aufgabe ändern: "%s"', 'Timezone' => 'Zeitzone', 'Sorry, I didn\'t find this information in my database!' => 'Diese Information wurde in der Datenbank nicht gefunden!', 'Page not found' => 'Seite nicht gefunden', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Beschreibung eingeben', 'Comment added successfully.' => 'Kommentar erfolgreich hinzugefügt.', 'Unable to create your comment.' => 'Hinzufügen eines Kommentars nicht möglich.', - 'Edit this task' => 'Aufgabe bearbeiten', 'Due Date' => 'Fällig am', 'Invalid date' => 'Ungültiges Datum', 'Automatic actions' => 'Automatische Aktionen', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategorie', 'Category:' => 'Kategorie:', 'Categories' => 'Kategorien', - 'Category not found.' => 'Kategorie nicht gefunden.', 'Your category have been created successfully.' => 'Kategorie erfolgreich erstellt.', 'Unable to create your category.' => 'Erstellung der Kategorie nicht möglich.', 'Your category have been updated successfully.' => 'Kategorie erfolgreich aktualisiert.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Soll diese Datei wirklich gelöscht werden: "%s"?', 'Attachments' => 'Anhänge', 'Edit the task' => 'Aufgabe bearbeiten', - 'Edit the description' => 'Beschreibung bearbeiten', 'Add a comment' => 'Kommentar hinzufügen', 'Edit a comment' => 'Kommentar bearbeiten', 'Summary' => 'Zusammenfassung', @@ -317,14 +311,14 @@ return array( 'Project cloned successfully.' => 'Projekt wurde dupliziert.', 'Unable to clone this project.' => 'Duplizieren dieses Projekts schlug fehl.', 'Enable email notifications' => 'E-Mail-Benachrichtigungen einschalten', - 'Task position:' => 'Position der Aufgabe', + 'Task position:' => 'Position der Aufgabe:', 'The task #%d have been opened.' => 'Die Aufgabe #%d wurde geöffnet.', 'The task #%d have been closed.' => 'Die Aufgabe #%d wurde geschlossen.', 'Sub-task updated' => 'Teilaufgabe aktualisiert', - 'Title:' => 'Titel', - 'Status:' => 'Status', + 'Title:' => 'Titel:', + 'Status:' => 'Status:', 'Assignee:' => 'Zuständigkeit:', - 'Time tracking:' => 'Zeittracking', + 'Time tracking:' => 'Zeittracking:', 'New sub-task' => 'Neue Teilaufgabe', 'New attachment added "%s"' => 'Neuer Anhang "%s" wurde hinzugefügt.', 'New comment posted by %s' => 'Neuer Kommentar verfasst durch %s', @@ -356,9 +350,9 @@ return array( 'Remote' => 'Remote', 'Enabled' => 'angeschaltet', 'Disabled' => 'abgeschaltet', - 'Username:' => 'Benutzername', - 'Name:' => 'Name', - 'Email:' => 'E-Mail', + 'Username:' => 'Benutzername:', + 'Name:' => 'Name:', + 'Email:' => 'E-Mail:', 'Notifications:' => 'Benachrichtigungen:', 'Notifications' => 'Benachrichtigungen', 'Account type:' => 'Accounttyp:', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Es sind keine externen Authentisierungsmethoden aktiv.', 'Password modified successfully.' => 'Passwort wurde erfolgreich geändert.', 'Unable to change the password.' => 'Passwort konnte nicht geändert werden.', - 'Change category for the task "%s"' => 'Kategorie der Aufgabe "%s" ändern', 'Change category' => 'Kategorie ändern', '%s updated the task %s' => '%s hat die Aufgabe %s aktualisiert', '%s opened the task %s' => '%s hat die Aufgabe %s geöffnet', @@ -411,13 +404,11 @@ return array( 'Label' => 'Kennzeichnung', 'Database' => 'Datenbank', 'About' => 'Über', - 'Database driver:' => 'Datenbanktreiber', + 'Database driver:' => 'Datenbanktreiber:', 'Board settings' => 'Pinnwandeinstellungen', - 'URL and token' => 'URL und Token', 'Webhook settings' => 'Webhook-Einstellungen', - 'URL for task creation:' => 'URL zur Aufgabenerstellung', 'Reset token' => 'Token zurücksetzen', - 'API endpoint:' => 'API-Endpunkt', + 'API endpoint:' => 'API-Endpunkt:', 'Refresh interval for private board' => 'Aktualisierungsintervall für private Pinnwände', 'Refresh interval for public board' => 'Aktualisierungsintervall für öffentliche Pinnwände', 'Task highlight period' => 'Aufgaben-Hervorhebungsdauer', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Swimlane entfernen', 'Show default swimlane' => 'Standard-Swimlane anzeigen', 'Swimlane modification for the project "%s"' => 'Swimlane-Änderung für das Projekt "%s"', - 'Swimlane not found.' => 'Swimlane nicht gefunden', 'Swimlane removed successfully.' => 'Swimlane erfolgreich entfernt.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane erfolgreich geändert.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Alle Swimlanes', 'All colors' => 'Alle Farben', 'Moved to column %s' => 'In Spalte %s verschoben', - 'Change description' => 'Beschreibung ändern', 'User dashboard' => 'Benutzer-Dashboard', 'Allow only one subtask in progress at the same time for a user' => 'Erlaube nur eine Teilaufgabe pro Benutzer zu bearbeiten', 'Edit column "%s"' => 'Spalte "%s" bearbeiten', @@ -558,8 +547,8 @@ return array( 'is blocked by' => 'ist blockiert von', 'duplicates' => 'doppelt', 'is duplicated by' => 'ist gedoppelt von', - 'is a child of' => 'ist untergeordnet', - 'is a parent of' => 'ist übergeordnet', + 'is a child of' => 'ist ein untergeordnetes Element von', + 'is a parent of' => 'ist ein übergeordnetes Element von', 'targets milestone' => 'betrifft Meilenstein', 'is a milestone of' => 'ist ein Meilenstein von', 'fixes' => 'behebt', @@ -620,9 +609,9 @@ return array( 'The two factor authentication code is valid.' => 'Der Zwei-Faktor-Authentifizierungscode ist gültig.', 'Code' => 'Code', 'Two factor authentication' => 'Zwei-Faktor-Authentifizierung', - 'This QR code contains the key URI: ' => 'Dieser QR-Code beinhaltet die Schlüssel-URI', + 'This QR code contains the key URI: ' => 'Dieser QR-Code beinhaltet die Schlüssel-URI: ', 'Check my code' => 'Überprüfe meinen Code', - 'Secret key: ' => 'Geheimer Schlüssel', + 'Secret key: ' => 'Geheimer Schlüssel: ', 'Test your device' => 'Teste dein Gerät', 'Assign a color when the task is moved to a specific column' => 'Weise eine Farbe zu, wenn die Aufgabe zu einer bestimmten Spalte bewegt wird', '%s via Kanboard' => '%s via Kanboard', @@ -653,15 +642,15 @@ return array( 'Timeframe to calculate new due date' => 'Zeitfenster zur Berechnung für neues Ablaufdatum', 'Base date to calculate new due date' => 'Basisdatum zur Berechnung für neues Ablaufdatum', 'Action date' => 'Aktionsdatum', - 'Base date to calculate new due date: ' => 'Basisdatum zur Berechnung für neues Ablaufdatum:', - 'This task has created this child task: ' => 'Diese Aufgabe hat diese Teilaufgabe erstellt:', + 'Base date to calculate new due date: ' => 'Basisdatum zur Berechnung für neues Ablaufdatum: ', + 'This task has created this child task: ' => 'Diese Aufgabe hat diese Teilaufgabe erstellt: ', 'Day(s)' => 'Tag(e)', 'Existing due date' => 'Existierendes Ablaufdatum', - 'Factor to calculate new due date: ' => 'Faktor zur Berechnung für neues Ablaufdatum', + 'Factor to calculate new due date: ' => 'Faktor zur Berechnung für neues Ablaufdatum: ', 'Month(s)' => 'Monat(e)', 'Recurrence' => 'Wiederholung', - 'This task has been created by: ' => 'DIese Aufgabe wurde erstellt von:', - 'Recurrent task has been generated:' => 'Wiederkehrende Aufgabe wurde erstellt', + 'This task has been created by: ' => 'DIese Aufgabe wurde erstellt von: ', + 'Recurrent task has been generated:' => 'Wiederkehrende Aufgabe wurde erstellt:', 'Timeframe to calculate new due date: ' => 'Zeitfenster zur Berechnung für neues Ablaufdatum: ', 'Trigger to generate recurrent task: ' => 'Auslöser für wiederkehrende Aufgabe: ', 'When task is closed' => 'Wenn Aufgabe geshlossen wird', @@ -708,8 +697,7 @@ return array( 'Project activities for %s' => 'Projektaktivitäten für %s', 'view the board on Kanboard' => 'Pinnwand in Kanboard anzeigen', 'The task have been moved to the first swimlane' => 'Die Aufgabe wurde in die erste Swimlane verschoben', - 'The task have been moved to another swimlane:' => 'Die Aufgaben wurde in ene andere Swimlane verschoben', - 'Overdue tasks for the project "%s"' => 'Überfällige Aufgaben für das Projekt "%s"', + 'The task have been moved to another swimlane:' => 'Die Aufgaben wurde in eine andere Swimlane verschoben:', 'New title: %s' => 'Neuer Titel: %s', 'The task is not assigned anymore' => 'Die Aufgabe ist nicht mehr zugewiesen', 'New assignee: %s' => 'Neue Zuordnung: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Stoppe Timer', 'Start timer' => 'Starte Timer', 'Add project member' => 'Projektmitglied hinzufügen', - 'Enable notifications' => 'Benachrichtigung aktivieren', 'My activity stream' => 'Aktivitätsstream', 'My calendar' => 'Mein Kalender', 'Search tasks' => 'Suche nach Aufgaben', @@ -777,15 +764,15 @@ return array( 'Average time spent' => 'Durchschnittlicher Zeitverbrauch', 'This chart show the average time spent into each column for the last %d tasks.' => 'Dieses Diagramm zeigt die durchschnittliche Zeit in jeder Spalte der letzten %d Aufgaben.', 'Average Lead and Cycle time' => 'Durchschnittliche Zyklus- und Durchlaufzeit', - 'Average lead time: ' => 'Durchschnittliche Durchlaufzeit:', - 'Average cycle time: ' => 'Durchschnittliche Zykluszeit:', + 'Average lead time: ' => 'Durchschnittliche Durchlaufzeit: ', + 'Average cycle time: ' => 'Durchschnittliche Zykluszeit: ', 'Cycle Time' => 'Zykluszeit', 'Lead Time' => 'Durchlaufzeit', 'This chart show the average lead and cycle time for the last %d tasks over the time.' => 'Das Diagramm zeigt die durchschnittliche Durchlauf- und Zykluszeit der letzten %d Aufgaben über die Zeit an.', 'Average time into each column' => 'Durchschnittzeit in jeder Spalte', 'Lead and cycle time' => 'Durchlauf- und Zykluszeit', - 'Lead time: ' => 'Durchlaufzeit:', - 'Cycle time: ' => 'Zykluszeit:', + 'Lead time: ' => 'Durchlaufzeit: ', + 'Cycle time: ' => 'Zykluszeit: ', 'Time spent into each column' => 'zeit verbracht in jeder Spalte', 'The lead time is the duration between the task creation and the completion.' => 'Die Durchlaufzeit ist die Dauer zwischen Erstellung und Fertigstellung.', 'The cycle time is the duration between the start date and the completion.' => 'Die Zykluszeit ist die Dauer zwischen Start und Fertigstellung.', @@ -793,7 +780,7 @@ return array( 'Set automatically the start date' => 'Setze Startdatum automatisch', 'Edit Authentication' => 'Authentifizierung bearbeiten', 'Remote user' => 'Remote-Benutzer', - 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Remote-Benutzer haben kein Passwort in der Kanboard Datenbank, Beispiel LDAP, Google und Github Accounts', + 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Remote-Benutzer haben kein Passwort in der Kanboard Datenbank, Beispiel: LDAP, Google und Github Accounts', 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Wenn die Box "Verbiete Login-Formular" angeschaltet ist, werden Eingaben in das Login Formular ignoriert.', 'New remote user' => 'Neuer Remote-Benutzer', 'New local user' => 'Neuer lokaler Benutzer', @@ -808,7 +795,7 @@ return array( 'no category' => 'keine Kategorie', 'Current assignee: %s' => 'Aktuelle Zuordnung: %s', 'not assigned' => 'nicht zugeordnet', - 'Author:' => 'Autor', + 'Author:' => 'Autor:', 'contributors' => 'Mitwirkende', 'License:' => 'Lizenz:', 'License' => 'Lizenz', @@ -968,7 +955,7 @@ return array( 'Add group member' => 'Gruppenmitglied hinzufügen', 'Do you really want to remove this group: "%s"?' => 'Wollen Sie die Gruppe "%s" wirklich löschen?', 'There is no user in this group.' => 'Es gibt keinen Benutzer in dieser Gruppe.', - 'Remove this user' => 'Diesen Benutzer löschen', + 'Remove this user' => 'Diesen Benutzer entfernen', 'Permissions' => 'Berechtigungen', 'Allowed Users' => 'Berechtigte Benutzer', 'No user have been allowed specifically.' => 'Keine Benutzer mit ausdrücklicher Berechtigung.', @@ -1022,7 +1009,7 @@ return array( 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => 'Kein Plugin hat eine Projekt-Benachrichtigungsmethode registriert. Sie können individuelle Meldungen in Ihrem Benutzerprofil konfigurieren', 'My dashboard' => 'Mein Dashboard', 'My profile' => 'Mein Profil', - 'Project owner: ' => 'Projekt-Besitzer:', + 'Project owner: ' => 'Projekt-Besitzer: ', 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => 'Die Projekt-Kennung ist optional und muss alphanumerisch sein, beispielsweise: MYPROJECT.', 'Project owner' => 'Projekt-Besitzer', 'Those dates are useful for the project Gantt chart.' => 'Diese Daten sind nützlich für das Gantt-Diagramm.', @@ -1084,10 +1071,10 @@ return array( 'Task #%d' => 'Aufgabe #%d', 'Date and time format' => 'Datums- und Zeitformat', 'Time format' => 'Zeitformat', - 'Start date: ' => 'Anfangsdatum:', - 'End date: ' => 'Enddatum:', - 'New due date: ' => 'Neues Fälligkeitsdatum', - 'Start date changed: ' => 'Anfangsdatum geändert:', + 'Start date: ' => 'Anfangsdatum: ', + 'End date: ' => 'Enddatum: ', + 'New due date: ' => 'Neues Fälligkeitsdatum: ', + 'Start date changed: ' => 'Anfangsdatum geändert: ', 'Disable private projects' => 'Private Projekte deaktivieren', 'Do you really want to remove this custom filter: "%s"?' => 'Wollen Sie diesen benutzerdefinierten Filter wirklich entfernen: "%s"?', 'Remove a custom filter' => 'Benutzerdefinierten Filter entfernen', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Spalte erfolgreich erstellt.', 'Another column with the same name exists in the project' => 'Es gibt bereits eine Spalte mit demselben Namen im Projekt', 'Default filters' => 'Standard-Filter', - 'Your board doesn\'t have any column!' => 'Es gibt keine Spalten in diesem Projekt!', + 'Your board doesn\'t have any columns!' => 'Es gibt keine Spalten in diesem Projekt!', 'Change column position' => 'Position der Spalte ändern', 'Switch to the project overview' => 'Zur Projektübersicht wechseln', 'User filters' => 'Benutzer-Filter', @@ -1135,22 +1122,98 @@ return array( 'There is no action at the moment.' => 'Es gibt zur Zeit keine Aktionen.', 'Import actions from another project' => 'Aktionen von einem anderen Projekt importieren', 'There is no available project.' => 'Es ist kein Projekt verfügbar.', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Local File' => 'Lokale Datei', + 'Configuration' => 'Konfiguration', + 'PHP version:' => 'PHP Version:', + 'PHP SAPI:' => 'PHP SAPI:', + 'OS version:' => 'OS Version:', + 'Database version:' => 'Datenbank Version:', + 'Browser:' => 'Browser:', + 'Task view' => 'Aufgaben Ansicht', + 'Edit task' => 'Aufgabe bearbeiten', + 'Edit description' => 'Beschreibung bearbeiten', + 'New internal link' => 'Neue interne Verbindung', + 'Display list of keyboard shortcuts' => 'Liste der Tastaturkürzel anzeigen', + 'Menu' => 'Menü', + 'Set start date' => 'Anfangsdatum setzen', + 'Avatar' => 'Avatar', + 'Upload my avatar image' => 'Mein Avatar Bild hochladen', + 'Remove my image' => 'Mein Bild entfernen', + 'The OAuth2 state parameter is invalid' => 'Der OAuth2 Statusparameter ist ungültig', + 'User not found.' => 'Benutzer nicht gefunden', + 'Search in activity stream' => 'Im Aktivitätenstrom suchen', + 'My activities' => 'Meine Aktivitäten', + 'Activity until yesterday' => 'Aktivitäten bis gestern', + 'Activity until today' => 'Aktivitäten bis heute', + 'Search by creator: ' => 'nach Ersteller suchen:', + 'Search by creation date: ' => 'nach Datum suchen:', + 'Search by task status: ' => 'nach Aufgabenstatus suchen:', + 'Search by task title: ' => 'nach Titel suchen:', + 'Activity stream search' => 'Im Aktivitätenstrom suchen', + 'Projects where "%s" is manager' => 'Projekte in denen "%s" Manager ist', + 'Projects where "%s" is member' => 'Projekte in denen "%s" Mitglied ist', + 'Open tasks assigned to "%s"' => 'Offene Aufgaben, die "%s" zugeteilt sind', + 'Closed tasks assigned to "%s"' => 'Geschlossene Aufgaben, die "%s" zugeteilt sind', + 'Assign automatically a color based on a priority' => 'Eine Farbe basierend auf einer Priorität automatisch zuordnen', + 'Overdue tasks for the project(s) "%s"' => 'Überfällige Aufgaben des/der Projekt/e "%s"', + 'Upload files' => 'Dateien hochladen', + 'Installed Plugins' => 'Installierte Plugins', + 'Plugin Directory' => 'Plugin Verzeichnis', + 'Plugin installed successfully.' => 'Plugin erfolgreich installiert.', + 'Plugin updated successfully.' => 'Plugin erfolgreich aktualisiert.', + 'Plugin removed successfully.' => 'Plugin erfolgreich entfernt.', + 'Subtask converted to task successfully.' => 'Teilaufgabe erfolgreich in Aufgabe umgewandelt.', + 'Unable to convert the subtask.' => 'Teilaufgabe kann nicht umgewandelt werden.', + 'Unable to extract plugin archive.' => 'Plugin Archiv kann nicht entpackt werden.', + 'Plugin not found.' => 'Plugin nicht gefunden.', + 'You don\'t have the permission to remove this plugin.' => 'Sie dürfen dieses Plugin nicht entfernen.', + 'Unable to download plugin archive.' => 'Plugin Archiv kann nicht herunter geladen werden.', + 'Unable to write temporary file for plugin.' => 'Temporäre Dateien für das Plugin können nicht geschrieben werden.', + 'Unable to open plugin archive.' => 'Kann das Plugin Archiv nicht öffenen.', + 'There is no file in the plugin archive.' => 'Es gibt keine Datei im Plugin Archiv.', + 'Create tasks in bulk' => 'Viele Aufgaben auf einmal erstellen', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'Ihre Kanboard Installation ist nicht dafür konfiguriert, Plugins mit dem Benutzerinterface zu installieren.', + 'There is no plugin available.' => 'Es gibt kein Plugin.', + 'Install' => 'Installieren', + 'Update' => 'Aktualisieren', + 'Up to date' => 'Aktuell', + 'Not available' => 'Nicht verfügbar', + 'Remove plugin' => 'Plugin entfernen', + 'Do you really want to remove this plugin: "%s"?' => 'Wollen Sie das Plugin "%s" wirklich entfernen?', + 'Uninstall' => 'Deinstallieren', + 'Listing' => 'Auflistung', + 'Metadata' => 'Metadaten', + 'Manage projects' => 'Projekte verwalten', + 'Convert to task' => 'In Aufgabe umwandeln', + 'Convert sub-task to task' => 'Teilaufgabe in Aufgabe umwandeln', + 'Do you really want to convert this sub-task to a task?' => 'Wollen Sie diese Teilaufgabe wirklich in eine Aufgabe umwandeln?', + 'My task title' => 'Mein Aufgabentitel', + 'Enter one task by line.' => 'Geben Sie eine Aufgabe pro Zeile ein.', + 'Number of failed login:' => 'Anzahl fehlgeschlagener Anmeldungen:', + 'Account locked until:' => 'Konto gesperrt bis:', + 'Email settings' => 'E-Mail Einstellungen', + 'Email sender address' => 'E-Mail Absender Adresse', + 'Email transport' => 'E-Mail Verkehr', + 'Webhook token' => 'Webhook Token', + 'Imports' => 'Importe', + 'Project tags management' => 'Projektbezogenes Schlagwort-Management', + 'Tag created successfully.' => 'Schlagwort erfolgreich erstellt.', + 'Unable to create this tag.' => 'Das Schlagwort kann nicht erstellt werden.', + 'Tag updated successfully.' => 'Schlagwort erfolgreich aktualisiert.', + 'Unable to update this tag.' => 'Das Schlagwort kann nicht aktualisiert werden.', + 'Tag removed successfully.' => 'Schlagwort erfolgreich entfernt.', + 'Unable to remove this tag.' => 'Das Schlagwort kann nicht entfernt werden.', + 'Global tags management' => 'Globales Schlagwort-Management', + 'Tags' => 'Schlagworte', + 'Tags management' => 'Schlagwort-Management', + 'Add new tag' => 'Neues Schlagwort hinzufügen', + 'Edit a tag' => 'Schlagwort bearbeiten', + 'Project tags' => 'Projektbezogene Schlagwörter', + 'There is no specific tag for this project at the moment.' => 'Es gibt zur Zeit kein spezifisches Schlagwort.', + 'Tag' => 'Schlagwort', + 'Remove a tag' => 'Schlagwort entfernen', + 'Do you really want to remove this tag: "%s"?' => 'Soll dieses Schlagwort wirklich entfernt werden: "%s"?', + 'Global tags' => 'Globale Schlagwörter', + 'There is no global tag at the moment.' => 'Es gibt zur Zeit kein globales Schlagwort', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/el_GR/translations.php b/sources/app/Locale/el_GR/translations.php index 9a31e48..d4c5504 100644 --- a/sources/app/Locale/el_GR/translations.php +++ b/sources/app/Locale/el_GR/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Προβολή της εργασίας', 'Remove user' => 'Αφαίρεση χρήστη', 'Do you really want to remove this user: "%s"?' => 'Θέλετε σίγουρα να αφαιρέσετε αυτό τον χρήστη: « %s » ?', - 'New user' => 'Νέος Χρήστης', 'All users' => 'Όλοι οι χρήστες', 'Username' => 'Όνομα χρήστη', 'Password' => 'Κωδικός', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d κλειστές εργασίες', 'No task for this project' => 'Αριθμός εργασιών για το έργο', 'Public link' => 'Δημόσιος σύνδεσμος', - 'Change assignee' => 'Αλλαγή ανάθεσης', - 'Change assignee for the task "%s"' => 'Αλλαγή ανάθεσης για την εργασία « %s »', 'Timezone' => 'Timezone', 'Sorry, I didn\'t find this information in my database!' => 'Δυστυχώς δεν βρέθηκε αυτή η πληροφορία στη βάση δεδομένων', 'Page not found' => 'Η σελίδα δεν βρέθηκε', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Αφήστε μια περιγραφή', 'Comment added successfully.' => 'Το σχόλιο σας προστέθηκε με επιτυχία.', 'Unable to create your comment.' => 'Δεν είναι δυνατή η προσθήκη του σχολίου σας.', - 'Edit this task' => 'Διόρθωση εργασίας', 'Due Date' => 'Μέχρι την ημερομηνία', 'Invalid date' => 'Μη ορθή ημερομηνία', 'Automatic actions' => 'Αυτόματες ενέργειες', @@ -250,7 +246,6 @@ return array( 'Category' => 'Κατηγορία', 'Category:' => 'Κατηγορία:', 'Categories' => 'Κατηγορίες', - 'Category not found.' => 'Η κατηγορία δεν βρέθηκε', 'Your category have been created successfully.' => 'Η κατηγορία δημιουργήθηκε.', 'Unable to create your category.' => 'Δεν είναι δυνατή η δημιουργία της κατηγορίας.', 'Your category have been updated successfully.' => 'Η ενημέρωση της κατηγορίας καταχωρήθηκε με επιτυχία.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Αφαίρεση του αρχείου: « %s » ?', 'Attachments' => 'Συνημμένα', 'Edit the task' => 'Διόρθωση εργασίας', - 'Edit the description' => 'Διόρθωση περιγραφής', 'Add a comment' => 'Προσθήκη σχολίου', 'Edit a comment' => 'Διόρθωση σχολίου', 'Summary' => 'Περίληψη', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Καμία εξωτερική πιστοποιήση ενεργοποιημένη.', 'Password modified successfully.' => 'Το password τροποποιήθηκε με επιτυχία.', 'Unable to change the password.' => 'Αδύνατο να αλλάξει το password.', - 'Change category for the task "%s"' => 'Αλλαγή κατηγορίας της εργασίας « %s »', 'Change category' => 'Αλλαγή κατηγορίας', '%s updated the task %s' => '%s ενημέρωσε την εργασία %s', '%s opened the task %s' => '%s άνοιξε την εργασία %s', @@ -413,9 +406,7 @@ return array( 'About' => 'About', 'Database driver:' => 'Database driver:', 'Board settings' => 'Board settings', - 'URL and token' => 'URL / token', 'Webhook settings' => 'Webhook settings', - 'URL for task creation:' => 'URL για δημιουργία εργασίας:', 'Reset token' => 'Reset token', 'API endpoint:' => 'URL API:', 'Refresh interval for private board' => 'Ανανέωση interval στο private board', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Αφαίρεση λωρίδας', 'Show default swimlane' => 'Εμφάνιση προεπιλεγμένων λωρίδων', 'Swimlane modification for the project "%s"' => 'Τροποποίηση λωρίδας για το έργο « %s »', - 'Swimlane not found.' => 'Η λωρίδα δεν βρέθηκε.', 'Swimlane removed successfully.' => 'Η λωρίδα αφαιρέθηκε με επιτυχία.', 'Swimlanes' => 'Λωρίδες', 'Swimlane updated successfully.' => 'Η λωρίδα ενημερώθηκε με επιτυχία.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Όλες οι λωρίδες', 'All colors' => 'Όλα τα χρώματα', 'Moved to column %s' => 'Μεταφορά στη στήλη %s', - 'Change description' => 'Επεξεργασία περιγραφής', 'User dashboard' => 'Κεντρικό ταμπλό χρήστη', 'Allow only one subtask in progress at the same time for a user' => 'Αφήστε μόνο μία υπο-εργασία σε εξέλιξη ταυτόχρονα για έναν χρήστη', 'Edit column "%s"' => 'Επεξεργασία στήλης « %s »', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'δείτε τον πίνακα στο Kanboard', 'The task have been moved to the first swimlane' => 'Η εργασία αυτή έχει μετακινηθεί στην πρώτη λωρίδα', 'The task have been moved to another swimlane:' => 'Η εργασία αυτή έχει μετακινηθεί σε άλλη λωρίδα:', - 'Overdue tasks for the project "%s"' => 'Εκπρόθεσμες εργασίες για το έργο « %s »', 'New title: %s' => 'Νέος τίτλος: %s', 'The task is not assigned anymore' => 'Η εργασία δεν έχει ανατεθεί πλέον', 'New assignee: %s' => 'Καινούργια ανάθεση: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Διακοπή ρολογιού', 'Start timer' => 'Έναρξη ρολογιού', 'Add project member' => 'Προσθήκη νέου μέλους έργου', - 'Enable notifications' => 'Ενεργοποίηση ειδοποιήσεων', 'My activity stream' => 'Η ροή δραστηριοτήτων μου', 'My calendar' => 'Το ημερολόγιο μου', 'Search tasks' => 'Αναζήτηση εργασιών', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Η στήλη δημιουργήθηκε με επιτυχία.', 'Another column with the same name exists in the project' => 'Μια άλλη στήλη με το ίδιο όνομα υπάρχει στο έργο', 'Default filters' => 'Εξ\' ορισμού φίλτρα', - 'Your board doesn\'t have any column!' => 'Το ταμπλό δεν έχει καμία στήλη!!=', + 'Your board doesn\'t have any columns!' => 'Το ταμπλό δεν έχει καμία στήλη!!=', 'Change column position' => 'Αλλαγή θέσης στήλης', 'Switch to the project overview' => 'Αλλαγή προβολής σε επισκόπηση έργου', 'User filters' => 'Φίλτρα οριζόμενα από τον χρήστη', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/es_ES/translations.php b/sources/app/Locale/es_ES/translations.php index c362336..40c9a8c 100644 --- a/sources/app/Locale/es_ES/translations.php +++ b/sources/app/Locale/es_ES/translations.php @@ -6,8 +6,8 @@ return array( 'None' => 'Ninguno', 'edit' => 'modificar', 'Edit' => 'Modificar', - 'remove' => 'suprimir', - 'Remove' => 'Suprimir', + 'remove' => 'eliminar', + 'Remove' => 'Eliminar', 'Yes' => 'Sí', 'No' => 'No', 'cancel' => 'cancelar', @@ -15,27 +15,26 @@ return array( 'Yellow' => 'Amarillo', 'Blue' => 'Azul', 'Green' => 'Verde', - 'Purple' => 'Púrpura', + 'Purple' => 'Morado', 'Red' => 'Rojo', 'Orange' => 'Naranja', 'Grey' => 'Gris', 'Brown' => 'Marrón', - 'Deep Orange' => 'Naranja Oscuro', - 'Dark Grey' => 'Gris Oscuro', + 'Deep Orange' => 'Naranja oscuro', + 'Dark Grey' => 'Gris oscuro', 'Pink' => 'Rosa', - 'Teal' => 'Verde Azulado', - 'Cyan' => 'Cián', + 'Teal' => 'Verde azulado', + 'Cyan' => 'Cian', 'Lime' => 'Lima', - 'Light Green' => 'Verde Claro', + 'Light Green' => 'Verde claro', 'Amber' => 'Ámbar', 'Save' => 'Guardar', - 'Login' => 'Iniciar sesión (Ingresar)', - 'Official website:' => 'Página web oficial :', + 'Login' => 'Iniciar sesión (ingresar)', + 'Official website:' => 'Página web oficial:', 'Unassigned' => 'No asignado', 'View this task' => 'Ver esta tarea', 'Remove user' => 'Eliminar un usuario', - 'Do you really want to remove this user: "%s"?' => '¿De verdad que desea suprimir a este usuario: « %s » ?', - 'New user' => 'Añadir un usuario', + 'Do you really want to remove this user: "%s"?' => '¿Realmente desea eliminar este usuario: «%s»?', 'All users' => 'Todos los usuarios', 'Username' => 'Nombre de usuario', 'Password' => 'Contraseña', @@ -45,10 +44,10 @@ return array( 'No user' => 'Ningún usuario', 'Forbidden' => 'Acceso denegado', 'Access Forbidden' => 'Acceso denegado', - 'Edit user' => 'Editar un usuario', + 'Edit user' => 'Modificar el usuario', 'Logout' => 'Salir', 'Bad username or password' => 'Usuario o contraseña incorrecto', - 'Edit project' => 'Editar el proyecto', + 'Edit project' => 'Modificar el proyecto', 'Name' => 'Nombre', 'Projects' => 'Proyectos', 'No project' => 'Ningún proyecto', @@ -62,44 +61,44 @@ return array( '%d tasks on the board' => '%d tareas en el tablero', '%d tasks in total' => '%d tareas en total', 'Unable to update this board.' => 'No se puede actualizar este tablero.', - 'Edit board' => 'Editar este tablero', + 'Edit board' => 'Modificar este tablero', 'Disable' => 'Desactivar', 'Enable' => 'Activar', 'New project' => 'Nuevo proyecto', - 'Do you really want to remove this project: "%s"?' => '¿De verdad que desea eliminar este proyecto: « %s » ?', - 'Remove project' => 'Suprimir el proyecto', - 'Edit the board for "%s"' => 'Modificar el tablero para « %s »', + 'Do you really want to remove this project: "%s"?' => '¿Realmente desea eliminar este proyecto: «%s»?', + 'Remove project' => 'Eliminar el proyecto', + 'Edit the board for "%s"' => 'Modificar el tablero para «%s»', 'All projects' => 'Todos los proyectos', 'Add a new column' => 'Añadir una nueva columna', 'Title' => 'Título', 'Assigned to %s' => 'Asignada a %s', - 'Remove a column' => 'Suprimir esta columna', - 'Remove a column from a board' => 'Suprimir una columna de un tablero', - 'Unable to remove this column.' => 'No se puede suprimir esta columna.', - 'Do you really want to remove this column: "%s"?' => '¿De vedad que desea eliminar esta columna : « %s » ?', - 'This action will REMOVE ALL TASKS associated to this column!' => '¡Esta acción SUPRIMIRÁ TODAS LAS TAREAS asociadas a esta columna!', + 'Remove a column' => 'Eliminar esta columna', + 'Remove a column from a board' => 'Eliminar una columna de un tablero', + 'Unable to remove this column.' => 'No se puede eliminar esta columna.', + 'Do you really want to remove this column: "%s"?' => '¿De vedad que desea eliminar esta columna: «%s»?', + 'This action will REMOVE ALL TASKS associated to this column!' => '¡Esta acción ELIMINARÁ TODAS LAS TAREAS asociadas a esta columna!', 'Settings' => 'Preferencias', - 'Application settings' => 'Parámetros de la aplicación', + 'Application settings' => 'Preferencias de la aplicación', 'Language' => 'Idioma', - 'Webhook token:' => 'Ficha de seguridad (token) para los disparadores Web (webhooks):', - 'API token:' => 'Ficha de seguridad (token) para API:', + 'Webhook token:' => 'Token de los disparadores web (webhooks):', + 'API token:' => 'Token de la API:', 'Database size:' => 'Tamaño de la base de datos:', 'Download the database' => 'Descargar la base de datos', 'Optimize the database' => 'Optimizar la base de datos', - '(VACUUM command)' => '(Comando VACUUM)', - '(Gzip compressed Sqlite file)' => '(Archivo Sqlite comprimido en Gzip)', + '(VACUUM command)' => '(comando VACUUM)', + '(Gzip compressed Sqlite file)' => '(archivo Sqlite comprimido en Gzip)', 'Close a task' => 'Cerrar una tarea', - 'Edit a task' => 'Editar una tarea', + 'Edit a task' => 'Modificar una tarea', 'Column' => 'Columna', 'Color' => 'Color', - 'Assignee' => 'Concesionario', - 'Create another task' => 'Crear una nueva tarea', + 'Assignee' => 'Responsable', + 'Create another task' => 'Crear otra tarea', 'New task' => 'Nueva tarea', 'Open a task' => 'Abrir una tarea', - 'Do you really want to open this task: "%s"?' => '¿Realmente desea abrir esta tarea: « %s » ?', + 'Do you really want to open this task: "%s"?' => '¿Realmente desea abrir esta tarea: «%s»?', 'Back to the board' => 'Volver al tablero', 'There is nobody assigned' => 'No hay nadie asignado a esta tarea', - 'Column on the board:' => 'Columna en el tablero: ', + 'Column on the board:' => 'Columna en el tablero:', 'Close this task' => 'Cerrar esta tarea', 'Open this task' => 'Abrir esta tarea', 'There is no description.' => 'No hay descripción.', @@ -118,15 +117,15 @@ return array( 'The project id is required' => 'El identificador del proyecto es obligatorio', 'The project name is required' => 'El nombre del proyecto es obligatorio', 'The title is required' => 'El título es obligatorio', - 'Settings saved successfully.' => 'Parámetros guardados correctamente.', - 'Unable to save your settings.' => 'No se pueden guardar sus parámetros.', + 'Settings saved successfully.' => 'Preferencias guardadas correctamente.', + 'Unable to save your settings.' => 'No se pueden guardar sus preferencias.', 'Database optimization done.' => 'Optimización de la base de datos terminada.', 'Your project have been created successfully.' => 'El proyecto ha sido creado correctamente.', 'Unable to create your project.' => 'No se puede crear el proyecto.', 'Project updated successfully.' => 'El proyecto ha sido actualizado correctamente.', 'Unable to update this project.' => 'No se puede actualizar el proyecto.', - 'Unable to remove this project.' => 'No se puede suprimir este proyecto.', - 'Project removed successfully.' => 'El proyecto ha sido borrado correctamente.', + 'Unable to remove this project.' => 'No se puede eliminar este proyecto.', + 'Project removed successfully.' => 'El proyecto ha sido eliminado correctamente.', 'Project activated successfully.' => 'El proyecto ha sido activado correctamente.', 'Unable to activate this project.' => 'No se puede activar el proyecto.', 'Project disabled successfully.' => 'El proyecto ha sido desactivado correctamente.', @@ -135,7 +134,7 @@ return array( 'Task opened successfully.' => 'La tarea ha sido abierta correctamente.', 'Unable to close this task.' => 'No se puede cerrar esta tarea.', 'Task closed successfully.' => 'La tarea ha sido cerrada correctamente.', - 'Unable to update your task.' => 'No se puede modificar esta tarea.', + 'Unable to update your task.' => 'No se puede actualizar esta tarea.', 'Task updated successfully.' => 'La tarea ha sido actualizada correctamente.', 'Unable to create your task.' => 'No se puede crear esta tarea.', 'Task created successfully.' => 'La tarea ha sido creada correctamente.', @@ -146,7 +145,7 @@ return array( 'User removed successfully.' => 'El usuario ha sido creado correctamente.', 'Unable to remove this user.' => 'No se puede crear este usuario.', 'Board updated successfully.' => 'El tablero ha sido actualizado correctamente.', - 'Ready' => 'Listo', + 'Ready' => 'Preparado', 'Backlog' => 'En espera', 'Work in progress' => 'En curso', 'Done' => 'Hecho', @@ -154,11 +153,9 @@ return array( 'Id' => 'Identificador', '%d closed tasks' => '%d tareas completadas', 'No task for this project' => 'Ninguna tarea para este proyecto', - 'Public link' => 'Vinculación pública', - 'Change assignee' => 'Cambiar concesionario', - 'Change assignee for the task "%s"' => 'Cambiar el concesionario para la tarea « %s »', + 'Public link' => 'Enlace público', 'Timezone' => 'Zona horaria', - 'Sorry, I didn\'t find this information in my database!' => '¡Lo siento no he encontrado esta información en mi base de datos!', + 'Sorry, I didn\'t find this information in my database!' => '¡Lo siento, no he encontrado esta información en mi base de datos!', 'Page not found' => 'Página no encontrada', 'Complexity' => 'Complejidad', 'Task limit' => 'Número máximo de tareas', @@ -170,17 +167,16 @@ return array( 'Leave a description' => 'Dejar una descripción', 'Comment added successfully.' => 'El comentario ha sido añadido correctamente.', 'Unable to create your comment.' => 'No se puede crear este comentario.', - 'Edit this task' => 'Editar esta tarea', 'Due Date' => 'Fecha límite', 'Invalid date' => 'Fecha no válida', 'Automatic actions' => 'Acciones automatizadas', 'Your automatic action have been created successfully.' => 'La acción automatizada ha sido creada correctamente.', 'Unable to create your automatic action.' => 'No se puede crear esta acción automatizada.', - 'Remove an action' => 'Suprimir una acción', - 'Unable to remove this action.' => 'No se puede suprimir esta accción.', - 'Action removed successfully.' => 'La acción ha sido borrada correctamente.', - 'Automatic actions for the project "%s"' => 'Acciones automatizadas para este proyecto « %s »', - 'Add an action' => 'Agregar una acción', + 'Remove an action' => 'Eliminar una acción', + 'Unable to remove this action.' => 'No se puede eliminar esta acción.', + 'Action removed successfully.' => 'La acción ha sido eliminada correctamente.', + 'Automatic actions for the project "%s"' => 'Acciones automatizadas para el proyecto «%s»', + 'Add an action' => 'Añadir una acción', 'Event name' => 'Nombre del evento', 'Action name' => 'Nombre de la acción', 'Action parameters' => 'Parámetros de la acción', @@ -188,9 +184,9 @@ return array( 'Event' => 'Evento', 'When the selected event occurs execute the corresponding action.' => 'Cuando tiene lugar el evento seleccionado, ejecutar la acción correspondiente.', 'Next step' => 'Etapa siguiente', - 'Define action parameters' => 'Definición de los parametros de la acción', - 'Do you really want to remove this action: "%s"?' => '¿Realmente desea suprimir esta acción « %s » ?', - 'Remove an automatic action' => 'Suprimir una acción automatizada', + 'Define action parameters' => 'Define los parámetros de la acción', + 'Do you really want to remove this action: "%s"?' => '¿Realmente desea eliminar esta acción «%s»?', + 'Remove an automatic action' => 'Eliminar una acción automatizada', 'Assign the task to a specific user' => 'Asignar una tarea a un usuario especifico', 'Assign the task to the person who does the action' => 'Asignar la tarea al usuario que hace la acción', 'Duplicate the task to another project' => 'Duplicar la tarea a otro proyecto', @@ -203,22 +199,22 @@ return array( 'Position' => 'Posición', 'Duplicate to another project' => 'Duplicar a otro proyecto', 'Duplicate' => 'Duplicar', - 'link' => 'vinculación', + 'link' => 'enlace', 'Comment updated successfully.' => 'El comentario ha sido actualizado correctamente.', 'Unable to update your comment.' => 'No se puede actualizar este comentario.', - 'Remove a comment' => 'Suprimir un comentario', - 'Comment removed successfully.' => 'El comentario ha sido suprimido correctamente.', - 'Unable to remove this comment.' => 'No se puede suprimir este comentario.', - 'Do you really want to remove this comment?' => '¿Desea suprimir este comentario?', - 'Current password for the user "%s"' => 'Contraseña actual para el usuario: « %s »', + 'Remove a comment' => 'Eliminar un comentario', + 'Comment removed successfully.' => 'El comentario ha sido eliminado correctamente.', + 'Unable to remove this comment.' => 'No se puede eliminar este comentario.', + 'Do you really want to remove this comment?' => '¿Realmente desea eliminar este comentario?', + 'Current password for the user "%s"' => 'Contraseña actual para el usuario: «%s»', 'The current password is required' => 'La contraseña es obligatoria', - 'Wrong password' => 'contraseña incorrecta', + 'Wrong password' => 'Contraseña incorrecta', 'Unknown' => 'Desconocido', 'Last logins' => 'Últimos ingresos', 'Login date' => 'Fecha de ingreso', 'Authentication method' => 'Método de autenticación', 'IP address' => 'Dirección IP', - 'User agent' => 'Agente de usuario', + 'User agent' => 'Agente de usuario (User agent)', 'Persistent connections' => 'Conexión persistente', 'No session.' => 'No existe sesión.', 'Expiration date' => 'Fecha de expiración', @@ -228,7 +224,7 @@ return array( 'Open' => 'Abierto', 'Closed' => 'Cerrado', 'Search' => 'Buscar', - 'Nothing found.' => 'Nada hallado.', + 'Nothing found.' => 'No se ha encontrado nada.', 'Due date' => 'Fecha límite', 'Others formats accepted: %s and %s' => 'Otros formatos aceptados: %s y %s', 'Description' => 'Descripción', @@ -236,98 +232,96 @@ return array( '%d comment' => '%d comentario', 'Email address invalid' => 'Dirección de correo inválida', 'Your external account is not linked anymore to your profile.' => 'Su cuenta externa se ha desvinculado de su perfil.', - 'Unable to unlink your external account.' => 'Imposible desvincular su cuenta externa.', + 'Unable to unlink your external account.' => 'No se puede desvincular su cuenta externa.', 'External authentication failed' => 'Falló la autenticación externa', - 'Your external account is linked to your profile successfully.' => 'Su cuenta externa se ha vinculado exitosamente con su perfil.', - 'Email' => 'Correo', - 'Task removed successfully.' => 'Tarea suprimida correctamente.', - 'Unable to remove this task.' => 'No pude suprimir esta tarea.', - 'Remove a task' => 'Borrar una tarea', - 'Do you really want to remove this task: "%s"?' => '¿De verdad que quieres suprimir esta tarea: "%s"?', + 'Your external account is linked to your profile successfully.' => 'Su cuenta externa se ha vinculado correctamente con su perfil.', + 'Email' => 'Correo electrónico', + 'Task removed successfully.' => 'Tarea eliminada correctamente.', + 'Unable to remove this task.' => 'No se puede eliminar esta tarea.', + 'Remove a task' => 'Eliminar una tarea', + 'Do you really want to remove this task: "%s"?' => '¿Realmente desea eliminar esta tarea: «%s»?', 'Assign automatically a color based on a category' => 'Asignar un color de forma automática basándose en la categoría', 'Assign automatically a category based on a color' => 'Asignar una categoría de forma automática basándose en el color', 'Task creation or modification' => 'Creación o Edición de Tarea', 'Category' => 'Categoría', 'Category:' => 'Categoría:', 'Categories' => 'Categorías', - 'Category not found.' => 'Categoría no hallada.', 'Your category have been created successfully.' => 'Se ha creado su categoría correctamente.', - 'Unable to create your category.' => 'No pude crear su categoría.', + 'Unable to create your category.' => 'No se puede crear su categoría.', 'Your category have been updated successfully.' => 'Se ha actualizado su categoría correctamente.', - 'Unable to update your category.' => 'No pude actualizar su categoría.', - 'Remove a category' => 'Suprimir una categoría', - 'Category removed successfully.' => 'Categoría suprimida correctamente.', - 'Unable to remove this category.' => 'No pude suprimir esta categoría.', - 'Category modification for the project "%s"' => 'Modificación de categoría pra el proyecto "%s"', - 'Category Name' => 'Nombre de Categoría', + 'Unable to update your category.' => 'No se puede actualizar su categoría.', + 'Remove a category' => 'Eliminar una categoría', + 'Category removed successfully.' => 'Categoría eliminada correctamente.', + 'Unable to remove this category.' => 'No se puede eliminar esta categoría.', + 'Category modification for the project "%s"' => 'Modificación de la categoría para el proyecto «%s»', + 'Category Name' => 'Nombre de la categoría', 'Add a new category' => 'Añadir una nueva categoría', - 'Do you really want to remove this category: "%s"?' => '¿De verdad que quieres suprimir esta categoría: "%s"?', + 'Do you really want to remove this category: "%s"?' => '¿Realmente desea eliminar esta categoría: «%s»?', 'All categories' => 'Todas las categorías', 'No category' => 'Sin categoría', 'The name is required' => 'El nombre es obligatorio', - 'Remove a file' => 'Borrar un fichero', - 'Unable to remove this file.' => 'No pude borrar este fichero.', - 'File removed successfully.' => 'Fichero borrado correctamente.', + 'Remove a file' => 'Eliminar un fichero', + 'Unable to remove this file.' => 'No se puede eliminar este fichero.', + 'File removed successfully.' => 'Fichero eliminado correctamente.', 'Attach a document' => 'Adjuntar un documento', - 'Do you really want to remove this file: "%s"?' => '¿De verdad que quiere borrar este fichero: "%s"?', + 'Do you really want to remove this file: "%s"?' => '¿Realmente desea eliminar este fichero: «%s»?', 'Attachments' => 'Adjuntos', - 'Edit the task' => 'Editar la tarea', - 'Edit the description' => 'Editar la descripción', + 'Edit the task' => 'Modificar la tarea', 'Add a comment' => 'Añadir un comentario', - 'Edit a comment' => 'Editar un comentario', + 'Edit a comment' => 'Modificar un comentario', 'Summary' => 'Resumen', 'Time tracking' => 'Seguimiento temporal', 'Estimate:' => 'Estimado:', 'Spent:' => 'Transcurrido:', - 'Do you really want to remove this sub-task?' => '¿De verdad que quiere suprimir esta sub-tarea?', + 'Do you really want to remove this sub-task?' => '¿Realmente desea eliminar esta subtarea?', 'Remaining:' => 'Restante:', 'hours' => 'horas', 'spent' => 'transcurrido', 'estimated' => 'estimado', - 'Sub-Tasks' => 'Sub-Tareas', - 'Add a sub-task' => 'Añadir una sub-tarea', - 'Original estimate' => 'Estimado Original', - 'Create another sub-task' => 'Crear otra sub-tarea', - 'Time spent' => 'Tiempo Transcurrido', - 'Edit a sub-task' => 'Editar una sub-tarea', - 'Remove a sub-task' => 'Suprimir una sub-tarea', + 'Sub-Tasks' => 'Subtareas', + 'Add a sub-task' => 'Añadir una subtarea', + 'Original estimate' => 'Estimación original', + 'Create another sub-task' => 'Crear otra subtarea', + 'Time spent' => 'Tiempo transcurrido', + 'Edit a sub-task' => 'Modificar una subtarea', + 'Remove a sub-task' => 'Eliminar una subtarea', 'The time must be a numeric value' => 'El tiempo debe de ser un valor numérico', 'Todo' => 'Por hacer', 'In progress' => 'En progreso', - 'Sub-task removed successfully.' => 'Sub-tarea suprimida correctamente.', - 'Unable to remove this sub-task.' => 'No pude suprimir esta sub-tarea.', - 'Sub-task updated successfully.' => 'Sub-tarea actualizada correctamente.', - 'Unable to update your sub-task.' => 'No pude actualizar su sub-tarea.', - 'Unable to create your sub-task.' => 'No pude crear su sub-tarea.', - 'Sub-task added successfully.' => 'Sub-tarea añadida correctamente.', - 'Maximum size: ' => 'Tamaño máximo', - 'Unable to upload the file.' => 'No pude cargar el fichero.', + 'Sub-task removed successfully.' => 'Subtarea eliminada correctamente.', + 'Unable to remove this sub-task.' => 'No se puede eliminar esta subtarea.', + 'Sub-task updated successfully.' => 'Subtarea actualizada correctamente.', + 'Unable to update your sub-task.' => 'No se puede actualizar esta subtarea.', + 'Unable to create your sub-task.' => 'No se puede crear la subtarea.', + 'Sub-task added successfully.' => 'Subtarea añadida correctamente.', + 'Maximum size: ' => 'Tamaño máximo: ', + 'Unable to upload the file.' => 'No se puede cargar el fichero.', 'Display another project' => 'Mostrar otro proyecto', 'Created by %s' => 'Creado por %s', 'Tasks Export' => 'Exportar tareas', - 'Tasks exportation for "%s"' => 'Exportación de tareas para "%s"', + 'Tasks exportation for "%s"' => 'Exportación de tareas para «%s»', 'Start Date' => 'Fecha de inicio', 'End Date' => 'Fecha final', 'Execute' => 'Ejecutar', - 'Task Id' => 'ID de tarea', + 'Task Id' => 'Identificador de tarea', 'Creator' => 'Creador', 'Modification date' => 'Fecha de modificación', - 'Completion date' => 'Fecha de terminación', + 'Completion date' => 'Fecha de finalización', 'Clone' => 'Clonar', - 'Project cloned successfully.' => 'Proyecto clonado correctamente', - 'Unable to clone this project.' => 'Impsible clonar proyecto', + 'Project cloned successfully.' => 'Proyecto clonado correctamente.', + 'Unable to clone this project.' => 'No se puede clonar este proyecto.', 'Enable email notifications' => 'Habilitar notificaciones por correo electrónico', - 'Task position:' => 'Posición de la tarea', - 'The task #%d have been opened.' => 'La tarea #%d ha sido abierta', - 'The task #%d have been closed.' => 'La tarea #%d ha sido cerrada', + 'Task position:' => 'Posición de la tarea:', + 'The task #%d have been opened.' => 'La tarea #%d ha sido abierta.', + 'The task #%d have been closed.' => 'La tarea #%d ha sido cerrada.', 'Sub-task updated' => 'Subtarea actualizada', 'Title:' => 'Título:', 'Status:' => 'Estado:', - 'Assignee:' => 'Concesionario:', + 'Assignee:' => 'Responsable:', 'Time tracking:' => 'Control de tiempo:', 'New sub-task' => 'Nueva subtarea', - 'New attachment added "%s"' => 'Nuevo adjunto agregado "%s"', - 'New comment posted by %s' => 'Nuevo comentario agregado por %s', + 'New attachment added "%s"' => 'Nuevo adjunto añadido «%s»', + 'New comment posted by %s' => 'Nuevo comentario añadido por %s', 'New attachment' => 'Nuevo adjunto', 'New comment' => 'Nuevo comentario', 'Comment updated' => 'Comentario actualizado', @@ -343,39 +337,38 @@ return array( 'Disable public access' => 'Desactivar acceso público', 'Enable public access' => 'Activar acceso público', 'Public access disabled' => 'Acceso público desactivado', - 'Do you really want to disable this project: "%s"?' => '¿Realmente desea desactivar este proyecto: "%s"?', - 'Do you really want to enable this project: "%s"?' => '¿Realmente desea activar este proyecto: "%s"?', - 'Project activation' => 'Activación de Proyecto', + 'Do you really want to disable this project: "%s"?' => '¿Realmente desea desactivar este proyecto: «%s»?', + 'Do you really want to enable this project: "%s"?' => '¿Realmente desea activar este proyecto: «%s»?', + 'Project activation' => 'Activación de proyecto', 'Move the task to another project' => 'Mover la tarea a otro proyecto', 'Move to another project' => 'Mover a otro proyecto', 'Do you really want to duplicate this task?' => '¿Realmente desea duplicar esta tarea?', 'Duplicate a task' => 'Duplicar una tarea', 'External accounts' => 'Cuentas externas', - 'Account type' => 'Tipo de Cuenta', + 'Account type' => 'Tipo de cuenta', 'Local' => 'Local', 'Remote' => 'Remota', 'Enabled' => 'Activada', 'Disabled' => 'Desactivada', - 'Username:' => 'Nombre de Usuario:', + 'Username:' => 'Nombre de usuario:', 'Name:' => 'Nombre:', 'Email:' => 'Correo electrónico:', 'Notifications:' => 'Notificaciones:', 'Notifications' => 'Notificaciones', - 'Account type:' => 'Tipo de Cuenta:', - 'Edit profile' => 'Editar perfil', + 'Account type:' => 'Tipo de cuenta:', + 'Edit profile' => 'Modificar perfil', 'Change password' => 'Cambiar contraseña', - 'Password modification' => 'Modificacion de contraseña', + 'Password modification' => 'Modificación de contraseña', 'External authentications' => 'Autenticación externa', 'Never connected.' => 'Nunca se ha conectado.', 'No external authentication enabled.' => 'Sin autenticación externa activa.', 'Password modified successfully.' => 'Contraseña cambiada correctamente.', - 'Unable to change the password.' => 'No pude cambiar la contraseña.', - 'Change category for the task "%s"' => 'Cambiar la categoría de la tarea "%s"', + 'Unable to change the password.' => 'No se puede cambiar la contraseña.', 'Change category' => 'Cambiar categoría', '%s updated the task %s' => '%s actualizó la tarea %s', '%s opened the task %s' => '%s abrió la tarea %s', - '%s moved the task %s to the position #%d in the column "%s"' => '%s movió la tarea %s a la posición #%d de la columna "%s"', - '%s moved the task %s to the column "%s"' => '%s movió la tarea %s a la columna "%s"', + '%s moved the task %s to the position #%d in the column "%s"' => '%s movió la tarea %s a la posición #%d de la columna «%s»', + '%s moved the task %s to the column "%s"' => '%s movió la tarea %s a la columna «%s»', '%s created the task %s' => '%s creó la tarea %s', '%s closed the task %s' => '%s cerró la tarea %s', '%s created a subtask for the task %s' => '%s creó una subtarea para la tarea %s', @@ -394,40 +387,38 @@ return array( '%s created the task #%d' => '%s creó la tarea #%d', '%s closed the task #%d' => '%s cerró la tarea #%d', '%s open the task #%d' => '%s abrió la tarea #%d', - '%s moved the task #%d to the column "%s"' => '%s movió la tarea #%d a la columna "%s"', - '%s moved the task #%d to the position %d in the column "%s"' => '%s movió la tarea #%d a la posición %d de la columna "%s"', + '%s moved the task #%d to the column "%s"' => '%s movió la tarea #%d a la columna «%s»', + '%s moved the task #%d to the position %d in the column "%s"' => '%s movió la tarea #%d a la posición %d de la columna «%s»', 'Activity' => 'Actividad', - 'Default values are "%s"' => 'Los valores por defecto son "%s"', - 'Default columns for new projects (Comma-separated)' => 'Columnas por defecto de los nuevos proyectos (Separadas mediante comas)', - 'Task assignee change' => 'Cambiar concesionario de la tarea', - '%s change the assignee of the task #%d to %s' => '%s cambió el concesionario de la tarea #%d por %s', - '%s changed the assignee of the task %s to %s' => '%s cambió el concesionario de la tarea %s por %s', - 'New password for the user "%s"' => 'Nueva contraseña para el usuario "%s"', + 'Default values are "%s"' => 'Los valores por defecto son «%s»', + 'Default columns for new projects (Comma-separated)' => 'Columnas por defecto para los nuevos proyectos (separadas mediante comas)', + 'Task assignee change' => 'Cambiar responsable de la tarea', + '%s change the assignee of the task #%d to %s' => '%s cambió el responsable de la tarea #%d por %s', + '%s changed the assignee of the task %s to %s' => '%s cambió el responsable de la tarea %s por %s', + 'New password for the user "%s"' => 'Nueva contraseña para el usuario «%s»', 'Choose an event' => 'Seleccione un evento', 'Create a task from an external provider' => 'Crear una tarea a partir de un proveedor externo', - 'Change the assignee based on an external username' => 'Cambiar el concesionario basado en un nombre de usuario externo', + 'Change the assignee based on an external username' => 'Cambiar el responsable basado en un nombre de usuario externo', 'Change the category based on an external label' => 'Cambiar la categoría basado en una etiqueta externa', 'Reference' => 'Referencia', 'Label' => 'Etiqueta', - 'Database' => 'Base de Datos', + 'Database' => 'Base de datos', 'About' => 'Acerca de', - 'Database driver:' => 'Controlador (Driver) de la base de datos', - 'Board settings' => 'Configuraciones del Tablero', - 'URL and token' => 'URL y ficha', - 'Webhook settings' => 'Configuraciones del Disparador Web (Webhook)', - 'URL for task creation:' => 'URL para la creación de tareas', - 'Reset token' => 'Limpiar ficha', - 'API endpoint:' => 'Punto final del API', + 'Database driver:' => 'Controlador de la base de datos (driver):', + 'Board settings' => 'Preferencias del tablero', + 'Webhook settings' => 'Preferencias del disparador web (webhook)', + 'Reset token' => 'Limpiar token', + 'API endpoint:' => 'Endpoint del API:', 'Refresh interval for private board' => 'Intervalo de refresco del tablero privado', 'Refresh interval for public board' => 'Intervalo de refresco del tablero público', 'Task highlight period' => 'Periodo de realce de la tarea', - 'Period (in second) to consider a task was modified recently (0 to disable, 2 days by default)' => 'Periodo (en segundos) para considerar que una tarea fué modificada recientemente (0 para deshabilitar, 2 días por defecto)', + 'Period (in second) to consider a task was modified recently (0 to disable, 2 days by default)' => 'Periodo (en segundos) para considerar que una tarea fue modificada recientemente (0 para deshabilitar, 2 días por defecto)', 'Frequency in second (60 seconds by default)' => 'Frecuencia en segundos (60 segundos por defecto)', 'Frequency in second (0 to disable this feature, 10 seconds by default)' => 'Frecuencia en segundos (0 para deshabilitar esta característica, 10 segundos por defecto)', 'Application URL' => 'URL de la aplicación', - 'Token regenerated.' => 'Ficha regenerada.', + 'Token regenerated.' => 'Token regenerado.', 'Date format' => 'Formato de la fecha', - 'ISO format is always accepted, example: "%s" and "%s"' => 'El formato ISO siempre es aceptado, ejemplo: "%s" y "%s"', + 'ISO format is always accepted, example: "%s" and "%s"' => 'El formato ISO siempre es aceptado, ejemplo: «%s» y «%s»', 'New private project' => 'Nuevo proyecto privado', 'This project is private' => 'Este proyecto es privado', 'Add' => 'Añadir', @@ -439,93 +430,91 @@ return array( 'Dashboard' => 'Tablero', 'Confirmation' => 'Confirmación', 'Allow everybody to access to this project' => 'Permitir a cualquiera acceder a este proyecto', - 'Everybody have access to this project.' => 'Cualquiera tiene acceso a este proyecto', - 'Webhooks' => 'Disparadores Web (Webhooks)', + 'Everybody have access to this project.' => 'Cualquiera tiene acceso a este proyecto.', + 'Webhooks' => 'Disparadores web (webhooks)', 'API' => 'API', 'Create a comment from an external provider' => 'Crear un comentario a partir de un proveedor externo', 'Project management' => 'Administración del proyecto', 'My projects' => 'Mis proyectos', 'Columns' => 'Columnas', 'Task' => 'Tarea', - 'Your are not member of any project.' => 'No es miembro de ningún proyecto', + 'Your are not member of any project.' => 'No eres miembro de ningún proyecto.', 'Percentage' => 'Porcentaje', 'Number of tasks' => 'Número de tareas', 'Task distribution' => 'Distribución de tareas', 'Reportings' => 'Informes', - 'Task repartition for "%s"' => 'Repartición de tareas para "%s"', + 'Task repartition for "%s"' => 'Repartición de tareas para «%s»', 'Analytics' => 'Analítica', 'Subtask' => 'Subtarea', 'My subtasks' => 'Mis subtareas', 'User repartition' => 'Repartición de usuarios', - 'User repartition for "%s"' => 'Repartición para "%s"', + 'User repartition for "%s"' => 'Repartición de usuarios para «%s»', 'Clone this project' => 'Clonar este proyecto', - 'Column removed successfully.' => 'Columna eliminada correctamente', + 'Column removed successfully.' => 'Columna eliminada correctamente.', 'Not enough data to show the graph.' => 'No hay suficiente información para mostrar el gráfico.', 'Previous' => 'Anterior', 'The id must be an integer' => 'El id debe ser un entero', 'The project id must be an integer' => 'El id del proyecto debe ser un entero', 'The status must be an integer' => 'El estado debe ser un entero', - 'The subtask id is required' => 'El id de la subtarea es requerido', + 'The subtask id is required' => 'El id de la subtarea es obligatorio', 'The subtask id must be an integer' => 'El id de la subtarea debe ser un entero', - 'The task id is required' => 'El id de la tarea es requerido', + 'The task id is required' => 'El id de la tarea es obligatorio', 'The task id must be an integer' => 'El id de la tarea debe ser un entero', 'The user id must be an integer' => 'El id del usuario debe ser un entero', - 'This value is required' => 'Este valor es requerido', + 'This value is required' => 'Este valor es obligatorio', 'This value must be numeric' => 'Este valor debe ser numérico', - 'Unable to create this task.' => 'Imposible crear esta tarea', + 'Unable to create this task.' => 'No se puede crear esta tarea.', 'Cumulative flow diagram' => 'Diagrama de flujo acumulativo', - 'Cumulative flow diagram for "%s"' => 'Diagrama de flujo acumulativo para "%s"', - 'Daily project summary' => 'Sumario diario del proyecto', - 'Daily project summary export' => 'Exportar sumario diario del proyecto', - 'Daily project summary export for "%s"' => 'Exportar sumario diario del proyecto para "%s"', + 'Cumulative flow diagram for "%s"' => 'Diagrama de flujo acumulativo para «%s»', + 'Daily project summary' => 'Resumen diario del proyecto', + 'Daily project summary export' => 'Exportar resumen diario del proyecto', + 'Daily project summary export for "%s"' => 'Exportar resumen diario del proyecto para «%s»', 'Exports' => 'Exportaciones', - 'This export contains the number of tasks per column grouped per day.' => 'Esta exportación contiene el número de tereas por columna agrupada por día.', + 'This export contains the number of tasks per column grouped per day.' => 'Esta exportación contiene el número de tareas por columna agrupadas por día.', 'Active swimlanes' => 'Calles activas', 'Add a new swimlane' => 'Añadir nueva calle', 'Change default swimlane' => 'Cambiar la calle por defecto', 'Default swimlane' => 'Calle por defecto', - 'Do you really want to remove this swimlane: "%s"?' => '¿Realmente quiere quitar esta calle: "%s"?', + 'Do you really want to remove this swimlane: "%s"?' => '¿Realmente desea eliminar esta calle: «%s»?', 'Inactive swimlanes' => 'Calles inactivas', - 'Remove a swimlane' => 'Quitar un calle', + 'Remove a swimlane' => 'Eliminar una calle', 'Show default swimlane' => 'Mostrar calle por defecto', - 'Swimlane modification for the project "%s"' => 'Modificación de la calle para el proyecto "%s"', - 'Swimlane not found.' => 'Calle no encontrada', - 'Swimlane removed successfully.' => 'Caalle eliminada correctamente', + 'Swimlane modification for the project "%s"' => 'Modificación de la calle para el proyecto «%s»', + 'Swimlane removed successfully.' => 'Calle eliminada correctamente.', 'Swimlanes' => 'Calles', - 'Swimlane updated successfully.' => 'Calle actualizada correctamente', - 'The default swimlane have been updated successfully.' => 'La calle por defecto ha sido actualizada correctamente', - 'Unable to remove this swimlane.' => 'Imposible de quitar esta calle', - 'Unable to update this swimlane.' => 'Imposible de actualizar esta calle', - 'Your swimlane have been created successfully.' => 'Su calle ha sido creada correctamente', + 'Swimlane updated successfully.' => 'Calle actualizada correctamente.', + 'The default swimlane have been updated successfully.' => 'La calle por defecto ha sido actualizada correctamente.', + 'Unable to remove this swimlane.' => 'No es posible eliminar esta calle.', + 'Unable to update this swimlane.' => 'No es posible actualizar esta calle.', + 'Your swimlane have been created successfully.' => 'Su calle ha sido creada correctamente.', 'Example: "Bug, Feature Request, Improvement"' => 'Ejemplo: "Error, Solicitud de característica, Mejora', 'Default categories for new projects (Comma-separated)' => 'Categorías por defecto para nuevos proyectos (separadas por comas)', 'Integrations' => 'Integraciones', 'Integration with third-party services' => 'Integración con servicios de terceros', - 'Subtask Id' => 'Id de Subtarea', + 'Subtask Id' => 'Identificador de subtarea', 'Subtasks' => 'Subtareas', - 'Subtasks Export' => 'Exportación de Subtareas', - 'Subtasks exportation for "%s"' => 'Exportación de subtareas para "%s"', + 'Subtasks Export' => 'Exportación de subtareas', + 'Subtasks exportation for "%s"' => 'Exportación de subtareas para «%s»', 'Task Title' => 'Título de la tarea', 'Untitled' => 'Sin título', - 'Application default' => 'Predefinido de la aplicación', - 'Language:' => 'Idioma', - 'Timezone:' => 'Zona horaria', + 'Application default' => 'Predefinido por la aplicación', + 'Language:' => 'Idioma:', + 'Timezone:' => 'Zona horaria:', 'All columns' => 'Todas las columnas', 'Calendar' => 'Calendario', 'Next' => 'Siguiente', '#%d' => '#%d', 'All swimlanes' => 'Todas las calles', 'All colors' => 'Todos los colores', - 'Moved to column %s' => 'Movido a columna %s', - 'Change description' => 'Cambiar descripción', + 'Moved to column %s' => 'Movida a la columna %s', 'User dashboard' => 'Tablero de usuario', 'Allow only one subtask in progress at the same time for a user' => 'Permitir sólo una subtarea en progreso a la vez para cada usuario', - 'Edit column "%s"' => 'Editar columna %s', - 'Select the new status of the subtask: "%s"' => 'Seleccionar el nuevo estado de la subtarea: "%s"', - 'Subtask timesheet' => 'Hoja temporal de subtarea', - 'There is nothing to show.' => 'Nada que mostrar', - 'Time Tracking' => 'Seguimiento Temporal', - 'You already have one subtask in progress' => 'Ya dispones de una subtarea en progreso', + 'Edit column "%s"' => 'Modificar la columna %s', + 'Select the new status of the subtask: "%s"' => 'Seleccionar el nuevo estado de la subtarea: «%s»', + 'Subtask timesheet' => 'Hoja temporal de la subtarea', + 'There is nothing to show.' => 'No hay nada que mostrar.', + 'Time Tracking' => 'Seguimiento temporal', + 'You already have one subtask in progress' => 'Ya tiene una subtarea en progreso', 'Which parts of the project do you want to duplicate?' => '¿Qué partes del proyecto desea duplicar?', 'Disallow login form' => 'Deshabilitar formulario de ingreso', 'Start' => 'Inicio', @@ -534,42 +523,42 @@ return array( 'Days in this column' => 'Días en esta columna', '%dd' => '%dd', 'Add a new link' => 'Añadir nuevo enlace', - 'Do you really want to remove this link: "%s"?' => '¿Realmente quiere quitar este enlace: "%s"?', - 'Do you really want to remove this link with task #%d?' => '¿Realmente quiere quitar este enlace con esta tarea: #%d?', - 'Field required' => 'Es necesario el campo', - 'Link added successfully.' => 'Enlace añadido con éxito.', - 'Link updated successfully.' => 'Enlace actualizado con éxito', - 'Link removed successfully.' => 'Enlace quitado con éxito', - 'Link labels' => 'etiquetas de enlace', - 'Link modification' => 'Modificación de enlace', + 'Do you really want to remove this link: "%s"?' => '¿Realmente desea eliminar este enlace: «%s»?', + 'Do you really want to remove this link with task #%d?' => '¿Realmente desea eliminar este enlace con la tarea #%d?', + 'Field required' => 'Campo requerido', + 'Link added successfully.' => 'Enlace añadido correctamente.', + 'Link updated successfully.' => 'Enlace actualizado correctamente.', + 'Link removed successfully.' => 'Enlace eliminado correctamente.', + 'Link labels' => 'Etiquetas de enlace', + 'Link modification' => 'Modificación del enlace', 'Links' => 'Enlaces', 'Link settings' => 'Preferencias de enlace', 'Opposite label' => 'Etiqueta opuesta', - 'Remove a link' => 'Quitar un enlace', + 'Remove a link' => 'Eliminar un enlace', 'Task\'s links' => 'Enlaces de tareas', 'The labels must be different' => 'Las etiquetas han de ser diferentes', - 'There is no link.' => 'No hay enlace', - 'This label must be unique' => 'Esta etiqueta ha de ser única', - 'Unable to create your link.' => 'No puedo crea su enlace.', - 'Unable to update your link.' => 'No puedo actualizar su enlace.', - 'Unable to remove this link.' => 'No puedo quitar este enlace.', + 'There is no link.' => 'No hay enlace.', + 'This label must be unique' => 'Esta etiqueta debe ser única', + 'Unable to create your link.' => 'No se puede crear el enlace.', + 'Unable to update your link.' => 'No se puede actualizar el enlace.', + 'Unable to remove this link.' => 'No se puede eliminar este enlace.', 'relates to' => 'se refiere a', - 'blocks' => 'bloques', - 'is blocked by' => 'bloqueado por', + 'blocks' => 'bloquea', + 'is blocked by' => 'está bloqueada por', 'duplicates' => 'duplica', - 'is duplicated by' => 'está duplicado por', + 'is duplicated by' => 'está duplicada por', 'is a child of' => 'es un hijo de', 'is a parent of' => 'es un padre de', 'targets milestone' => 'hito de objetivos', 'is a milestone of' => 'es un hito de', 'fixes' => 'arregla', - 'is fixed by' => 'arreglado por', + 'is fixed by' => 'es arreglada por', 'This task' => 'Esta tarea', '<1h' => '<1h', '%dh' => '%dh', - 'Expand tasks' => 'Espande tareas', - 'Collapse tasks' => 'Colapsa tareas', - 'Expand/collapse tasks' => 'Expande/colapasa tareas', + 'Expand tasks' => 'Expandir tareas', + 'Collapse tasks' => 'Colapsar tareas', + 'Expand/collapse tasks' => 'Expande/colapsa tareas', 'Close dialog box' => 'Cerrar caja de diálogo', 'Submit a form' => 'Enviar formulario', 'Board view' => 'Vista de tablero', @@ -589,130 +578,129 @@ return array( 'download' => 'descargar', 'EUR - Euro' => 'EUR - Euro', 'GBP - British Pound' => 'GBP - Libra británica', - 'INR - Indian Rupee' => 'INR - Rupias indúes', + 'INR - Indian Rupee' => 'INR - Rupia india', 'JPY - Japanese Yen' => 'JPY - Yen japonés', 'NZD - New Zealand Dollar' => 'NZD - Dóloar neocelandés', 'RSD - Serbian dinar' => 'RSD - Dinar serbio', - 'USD - US Dollar' => 'USD - Dólar Estadounidense', + 'USD - US Dollar' => 'USD - Dólar estadounidense', 'Destination column' => 'Columna destino', - 'Move the task to another column when assigned to a user' => 'Mover la tarea a otra columna al asignarse al usuario', - 'Move the task to another column when assignee is cleared' => 'Mover la tarea a otra columna al quitar el concesionario', + 'Move the task to another column when assigned to a user' => 'Mover la tarea a otra columna al asignarse a un usuario', + 'Move the task to another column when assignee is cleared' => 'Mover la tarea a otra columna al quitar el responsable', 'Source column' => 'Columna fuente', 'Transitions' => 'Transiciones', 'Executer' => 'Ejecutor', 'Time spent in the column' => 'Tiempo transcurrido en la columna', 'Task transitions' => 'Transiciones de tarea', - 'Task transitions export' => 'Eportar transiciones de tarea', - 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => 'Este informe contiene todos los movimientos de columna para cada tarea con la fecha, el usuario y el tiempo transcurrido en cada trasición.', + 'Task transitions export' => 'Exportar transiciones de tarea', + 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => 'Este informe contiene todos los movimientos de columna para cada tarea con la fecha, el usuario y el tiempo transcurrido en cada transición.', 'Currency rates' => 'Cambio de monedas', 'Rate' => 'Cambio', 'Change reference currency' => 'Cambiar moneda de referencia', 'Add a new currency rate' => 'Añadir nuevo cambio de moneda', 'Reference currency' => 'Moneda de referencia', - 'The currency rate have been added successfully.' => 'Se ha añadido el cambio de moneda con éxito', - 'Unable to add this currency rate.' => 'No pude añadir este cambio de moneda.', - 'Webhook URL' => 'URL de Disparador Web (webhook)', - '%s remove the assignee of the task %s' => '%s quita el concesionario de la tarea %s', + 'The currency rate have been added successfully.' => 'El cambio de moneda se ha añadido correctamente.', + 'Unable to add this currency rate.' => 'No se puede añadir este cambio de moneda.', + 'Webhook URL' => 'URL del disparador web (webhook)', + '%s remove the assignee of the task %s' => '%s quita el responsable de la tarea %s', 'Enable Gravatar images' => 'Activar imágenes Gravatar', 'Information' => 'Información', - 'Check two factor authentication code' => 'Revisar código de autenticación de dos factores', - 'The two factor authentication code is not valid.' => 'El código de autenticación de dos factores no es válido', - 'The two factor authentication code is valid.' => 'El código de autenticación de dos factores es válido', + 'Check two factor authentication code' => 'Revisar código de autenticación en dos pasos', + 'The two factor authentication code is not valid.' => 'El código de autenticación en dos pasos no es válido.', + 'The two factor authentication code is valid.' => 'El código de autenticación en dos pasos es válido.', 'Code' => 'Código', - 'Two factor authentication' => 'Autenticación de dos factores', + 'Two factor authentication' => 'Autenticación en dos pasos', 'This QR code contains the key URI: ' => 'Este código QR contiene la clave URI: ', 'Check my code' => 'Revisar mi código', 'Secret key: ' => 'Clave secreta: ', 'Test your device' => 'Probar su dispositivo', 'Assign a color when the task is moved to a specific column' => 'Asignar un color al mover la tarea a una columna específica', '%s via Kanboard' => '%s vía Kanboard', - 'Burndown chart for "%s"' => 'Trabajo pendiente para "%s"', + 'Burndown chart for "%s"' => 'Trabajo pendiente para «%s»', 'Burndown chart' => 'Trabajo pendiente', - 'This chart show the task complexity over the time (Work Remaining).' => 'Este diagrama mestra la complejidad de las tareas a lo largo del tiempo (Trabajo restante)', + 'This chart show the task complexity over the time (Work Remaining).' => 'Este diagrama muestra la complejidad de la tarea a lo largo del tiempo (trabajo restante).', 'Screenshot taken %s' => 'Pantallazo tomado el %s', 'Add a screenshot' => 'Añadir un pantallazo', 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Capture un patallazo y pulse CTRL+V o ⌘+V para pegar aquí.', - 'Screenshot uploaded successfully.' => 'Pantallazo cargado con éxito', + 'Screenshot uploaded successfully.' => 'Pantallazo cargado correctamente.', 'SEK - Swedish Krona' => 'SEK - Corona sueca', 'Identifier' => 'Identificador', - 'Disable two factor authentication' => 'Desactivar la autenticación de dos factores', - 'Do you really want to disable the two factor authentication for this user: "%s"?' => '¿Realmentes quiere desactuvar la autenticación de dos factores para este usuario: "%s?"', - 'Edit link' => 'Editar enlace', + 'Disable two factor authentication' => 'Desactivar la autenticación en dos pasos', + 'Do you really want to disable the two factor authentication for this user: "%s"?' => '¿Realmente desea desactivar la autenticación en dos pasos para este usuario: «%s»?', + 'Edit link' => 'Modificar enlace', 'Start to type task title...' => 'Empiece a escribir el título de la tarea...', - 'A task cannot be linked to itself' => 'Una tarea no puede se enlazada con sigo misma', + 'A task cannot be linked to itself' => 'Una tarea no se puede enlazar con sigo misma', 'The exact same link already exists' => 'El mismo enlace ya existe', 'Recurrent task is scheduled to be generated' => 'Tarea recurrente programada para ser generada', 'Score' => 'Puntuación', 'The identifier must be unique' => 'El identificador debe ser único', - 'This linked task id doesn\'t exists' => 'El id de tarea no existe', + 'This linked task id doesn\'t exists' => 'El identificador de tarea no existe', 'This value must be alphanumeric' => 'Este valor debe ser alfanumérico', - 'Edit recurrence' => 'Editar repetición', - 'Generate recurrent task' => 'Generar tarea recurrente', - 'Trigger to generate recurrent task' => 'Disparador para generar tarea recurrente', + 'Edit recurrence' => 'Modificar repetición', + 'Generate recurrent task' => 'Generar una tarea recurrente', + 'Trigger to generate recurrent task' => 'Disparador para generar una tarea recurrente', 'Factor to calculate new due date' => 'Factor para calcular la nueva fecha de entrega', 'Timeframe to calculate new due date' => 'Calendario para calcular la nueva fecha de entrega', 'Base date to calculate new due date' => 'Fecha base para calcular la nueva fecha de entrega', 'Action date' => 'Fecha de la acción', - 'Base date to calculate new due date: ' => 'Fecha base para calcular la nueva fecha de entrega:', - 'This task has created this child task: ' => 'Esta tarea ha cerado esta tarea hija:', + 'Base date to calculate new due date: ' => 'Fecha base para calcular la nueva fecha de entrega: ', + 'This task has created this child task: ' => 'Esta tarea ha creado esta tarea hija: ', 'Day(s)' => 'Día(s)', 'Existing due date' => 'Fecha de entrega existente', - 'Factor to calculate new due date: ' => 'Factor para calcular la nueva fecha de entrega:', + 'Factor to calculate new due date: ' => 'Factor para calcular la nueva fecha de entrega: ', 'Month(s)' => 'Mes(es)', 'Recurrence' => 'Repetición', 'This task has been created by: ' => 'Esta tarea ha sido creada por: ', 'Recurrent task has been generated:' => 'Tarea recurrente generada:', - 'Timeframe to calculate new due date: ' => 'Calendario para calcular la nueva fecha de entrega:', - 'Trigger to generate recurrent task: ' => 'Disparador para generar tarea recurrente', + 'Timeframe to calculate new due date: ' => 'Calendario para calcular la nueva fecha de entrega: ', + 'Trigger to generate recurrent task: ' => 'Disparador para generar una tarea recurrente: ', 'When task is closed' => 'Cuando la tarea es cerrada', 'When task is moved from first column' => 'Cuando la tarea es movida desde la primera columna', 'When task is moved to last column' => 'Cuando la tarea es movida a la última columna', 'Year(s)' => 'Año(s)', - 'Calendar settings' => 'Parámetros del Calendario', - 'Project calendar view' => 'Vista de Calendario para el Proyecto', - 'Project settings' => 'Parámetros del Proyecto', - 'Show subtasks based on the time tracking' => 'Mostrar subtareas en base al seguimiento de tiempo', + 'Calendar settings' => 'Preferencias del calendario', + 'Project calendar view' => 'Vista de calendario del proyecto', + 'Project settings' => 'Preferencias del proyecto', + 'Show subtasks based on the time tracking' => 'Mostrar subtareas en base al seguimiento temporal', 'Show tasks based on the creation date' => 'Mostrar tareas en base a la fecha de creación', - 'Show tasks based on the start date' => 'Mostrar tareas en base a la fecha de comienzo', + 'Show tasks based on the start date' => 'Mostrar tareas en base a la fecha de inicio', 'Subtasks time tracking' => 'Seguimiento de tiempo en subtareas', - 'User calendar view' => 'Vista de Calendario para el Usuario', - 'Automatically update the start date' => 'Actualizar automáticamente la fecha de comienzo', + 'User calendar view' => 'Vista de calendario del usuario', + 'Automatically update the start date' => 'Actualizar automáticamente la fecha de inicio', 'iCal feed' => 'Fuente iCal', 'Preferences' => 'Preferencias', 'Security' => 'Seguridad', - 'Two factor authentication disabled' => 'Autenticación de dos factores deshabilitada', - 'Two factor authentication enabled' => 'Autenticación de dos factores habilitada', - 'Unable to update this user.' => 'Imposible actualizar este usuario.', + 'Two factor authentication disabled' => 'Autenticación en dos pasos deshabilitada', + 'Two factor authentication enabled' => 'Autenticación en dos pasos habilitada', + 'Unable to update this user.' => 'No se puede actualizar este usuario.', 'There is no user management for private projects.' => 'No hay gestión de usuarios para proyectos privados.', 'User that will receive the email' => 'Usuario que recibirá el correo', 'Email subject' => 'Asunto del correo', 'Date' => 'Fecha', 'Add a comment log when moving the task between columns' => 'Añadir un comentario al mover la tarea entre columnas', - 'Move the task to another column when the category is changed' => 'Mover la tarea a otra columna cuando cambia la categoría', + 'Move the task to another column when the category is changed' => 'Mover la tarea a otra columna cuando cambie la categoría', 'Send a task by email to someone' => 'Enviar una tarea a alguien por correo', 'Reopen a task' => 'Reabrir tarea', 'Column change' => 'Cambio de columna', 'Position change' => 'Cambio de posición', 'Swimlane change' => 'Cambio de calle', - 'Assignee change' => 'Cambio de concesionario', + 'Assignee change' => 'Cambio de responsable', '[%s] Overdue tasks' => '[%s] Tareas vencidas', 'Notification' => 'Notificación', '%s moved the task #%d to the first swimlane' => '%s movió la tarea #%d a la primera calle', - '%s moved the task #%d to the swimlane "%s"' => '%s movió la tarea #%d a la calle "%s"', + '%s moved the task #%d to the swimlane "%s"' => '%s movió la tarea #%d a la calle «%s»', 'Swimlane' => 'Calle', 'Gravatar' => 'Gravatar', '%s moved the task %s to the first swimlane' => '%s movió la tarea %s a la primera calle', - '%s moved the task %s to the swimlane "%s"' => '%s movió la tarea %s a la calle "%s"', - 'This report contains all subtasks information for the given date range.' => 'Este informe contiene todas la información de las subtareas para el rango proporcionado de fechas.', - 'This report contains all tasks information for the given date range.' => 'Este informe contiene todas la información de las tareas para el rango proporcionado de fechas.', + '%s moved the task %s to the swimlane "%s"' => '%s movió la tarea %s a la calle «%s»', + 'This report contains all subtasks information for the given date range.' => 'Este informe contiene toda la información de las subtareas para el rango de fechas proporcionado.', + 'This report contains all tasks information for the given date range.' => 'Este informe contiene toda la información de las tareas para el rango de fechas proporcionado.', 'Project activities for %s' => 'Actividades del proyecto para %s', 'view the board on Kanboard' => 'ver el tablero en Kanboard', 'The task have been moved to the first swimlane' => 'Se ha movido la tarea a la primera calle', - 'The task have been moved to another swimlane:' => 'Se ha movido la tarea a otra calle', - 'Overdue tasks for the project "%s"' => 'Tareas atrasadas para el proyecto "%s"', + 'The task have been moved to another swimlane:' => 'Se ha movido la tarea a otra calle:', 'New title: %s' => 'Nuevo título: %s', 'The task is not assigned anymore' => 'La tarea ya no está asignada', - 'New assignee: %s' => 'Nuevo concesionario: %s', + 'New assignee: %s' => 'Nuevo responsable: %s', 'There is no category now' => 'En este momento no hay categorías', 'New category: %s' => 'Nueva categoría: %s', 'New color: %s' => 'Nuevo color: %s', @@ -722,110 +710,109 @@ return array( 'Recurrence settings have been modified' => 'Se han modificado los valores recurrentes', 'Time spent changed: %sh' => 'Se ha cambiado el tiempo empleado: %sh', 'Time estimated changed: %sh' => 'Se ha cambiado el tiempo estimado: %sh', - 'The field "%s" have been updated' => 'Se ha actualizado el campo "%s"', - 'The description has been modified:' => 'Se ha modificado la descripción', - 'Do you really want to close the task "%s" as well as all subtasks?' => '¿De verdad que quiere cerra la tarea "%s" así como todas las subtareas?', + 'The field "%s" have been updated' => 'Se ha actualizado el campo «%s»', + 'The description has been modified:' => 'Se ha modificado la descripción:', + 'Do you really want to close the task "%s" as well as all subtasks?' => '¿Realmente desea cerrar la tarea «%s» así como todas las subtareas?', 'I want to receive notifications for:' => 'Deseo recibir notificaciones para:', 'All tasks' => 'Todas las tareas', 'Only for tasks assigned to me' => 'Sólo para las tareas que me han sido asignadas', - 'Only for tasks created by me' => 'Sólo para las taread creadas por mí', - 'Only for tasks created by me and assigned to me' => 'Sólo para las tareas credas por mí y que me han sido asignadas', + 'Only for tasks created by me' => 'Sólo para las tareas creadas por mí', + 'Only for tasks created by me and assigned to me' => 'Sólo para las tareas creadas por mí y que me han sido asignadas', '%%Y-%%m-%%d' => '%%d/%%M/%%Y', 'Total for all columns' => 'Total para todas las columnas', 'You need at least 2 days of data to show the chart.' => 'Necesitas al menos 2 días de datos para mostrar el gráfico.', '<15m' => '<15m', '<30m' => '<30m', 'Stop timer' => 'Parar temporizador', - 'Start timer' => 'Arrancar temporizador', + 'Start timer' => 'Iniciar temporizador', 'Add project member' => 'Añadir miembro al proyecto', - 'Enable notifications' => 'Activar notificaciones', 'My activity stream' => 'Mi flujo de actividad', 'My calendar' => 'Mi calendario', 'Search tasks' => 'Buscar tareas', 'Reset filters' => 'Limpiar filtros', 'My tasks due tomorrow' => 'Mis tareas a entregar mañana', - 'Tasks due today' => 'Tareas a antregar hoy', - 'Tasks due tomorrow' => 'Taraes a entregar mañana', + 'Tasks due today' => 'Tareas a entregar hoy', + 'Tasks due tomorrow' => 'Tareas a entregar mañana', 'Tasks due yesterday' => 'Tareas a entregar ayer', 'Closed tasks' => 'Tareas cerradas', 'Open tasks' => 'Tareas abiertas', 'Not assigned' => 'No asignada', - 'View advanced search syntax' => 'Ver sintáxis avanzada de búsqueda', + 'View advanced search syntax' => 'Ver sintaxis de búsqueda avanzada', 'Overview' => 'Resumen', - 'Board/Calendar/List view' => 'Vista de Tablero/Calendario/Lista', + 'Board/Calendar/List view' => 'Vista de tablero/calendario/lista', 'Switch to the board view' => 'Cambiar a vista de tablero', 'Switch to the calendar view' => 'Cambiar a vista de calendario', 'Switch to the list view' => 'Cambiar a vista de lista', 'Go to the search/filter box' => 'Ir a caja de buscar/filtrar', 'There is no activity yet.' => 'Aún no hay actividades.', - 'No tasks found.' => 'No se ha hallado tarea alguna.', + 'No tasks found.' => 'No se ha encontrado ninguna tarea.', 'Keyboard shortcut: "%s"' => 'Atajo de teclado: %s', 'List' => 'Lista', 'Filter' => 'Filtro', 'Advanced search' => 'Búsqueda avanzada', - 'Example of query: ' => 'Ejemplo de query: ', + 'Example of query: ' => 'Ejemplo de consulta: ', 'Search by project: ' => 'Buscar por proyecto: ', 'Search by column: ' => 'Buscar por columna: ', - 'Search by assignee: ' => 'Buscar por concesionario: ', + 'Search by assignee: ' => 'Buscar por responsable: ', 'Search by color: ' => 'Buscar por color: ', 'Search by category: ' => 'Buscar por categoría: ', 'Search by description: ' => 'Buscar por descripción: ', 'Search by due date: ' => 'Buscar por fecha de entrega: ', - 'Lead and Cycle time for "%s"' => 'Plazo de Entrega y Ciclo para "%s"', - 'Average time spent into each column for "%s"' => 'Tiempo medio empleado en cada columna para "%s"', + 'Lead and Cycle time for "%s"' => 'Plazo de entrega y ciclo para «%s»', + 'Average time spent into each column for "%s"' => 'Tiempo medio empleado en cada columna para «%s»', 'Average time spent into each column' => 'Tiempo medio empleado en cada columna', 'Average time spent' => 'Tiempo medio empleado', 'This chart show the average time spent into each column for the last %d tasks.' => 'Esta gráfica muestra el tiempo medio empleado en cada columna para las últimas %d tareas.', - 'Average Lead and Cycle time' => 'Plazo Medio de Entrega y de Ciclo', - 'Average lead time: ' => 'Plazo Medio de entrega: ', - 'Average cycle time: ' => 'Tiempo Medio de Ciclo: ', - 'Cycle Time' => 'Tiempo de Ciclo', - 'Lead Time' => 'Plazo de Entrega', - 'This chart show the average lead and cycle time for the last %d tasks over the time.' => 'Esta gráfica muestra el plazo medio de entrega y de ciclo para las %d últimas tareas transcurridas.', + 'Average Lead and Cycle time' => 'Plazo medio de entrega y de ciclo', + 'Average lead time: ' => 'Plazo medio de entrega: ', + 'Average cycle time: ' => 'Tiempo medio de ciclo: ', + 'Cycle Time' => 'Tiempo de ciclo', + 'Lead Time' => 'Plazo de entrega', + 'This chart show the average lead and cycle time for the last %d tasks over the time.' => 'Esta gráfica muestra el plazo medio de entrega y de ciclo para las %d últimas tareas.', 'Average time into each column' => 'Tiempo medio en cada columna', 'Lead and cycle time' => 'Plazo de entrega y de ciclo', 'Lead time: ' => 'Plazo de entrega: ', - 'Cycle time: ' => 'Tiempo de Ciclo: ', + 'Cycle time: ' => 'Tiempo de ciclo: ', 'Time spent into each column' => 'Tiempo empleado en cada columna', - 'The lead time is the duration between the task creation and the completion.' => 'El plazo de entrega es la duración entre la creación de la tarea su terminación.', - 'The cycle time is the duration between the start date and the completion.' => 'El tiempo de ciclo es la duración entre la fecha de inicio y su terminación.', - 'If the task is not closed the current time is used instead of the completion date.' => 'Si la tarea no se cierra, se usa la fecha actual en lugar de la de terminación.', + 'The lead time is the duration between the task creation and the completion.' => 'El plazo de entrega es la duración entre la creación de la tarea su finalización.', + 'The cycle time is the duration between the start date and the completion.' => 'El tiempo de ciclo es la duración entre la fecha de inicio y su finalización.', + 'If the task is not closed the current time is used instead of the completion date.' => 'Si la tarea no se cierra, se usa la fecha actual en lugar de la de finalización.', 'Set automatically the start date' => 'Poner la fecha de inicio de forma automática', - 'Edit Authentication' => 'Editar autenticación', + 'Edit Authentication' => 'Modificar autenticación', 'Remote user' => 'Usuario remoto', - 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Los usuarios remotos no almacenan sus contraseñas en la base de datos Kanboard, por ejemplo: cuentas de LDAP, Google y Github', - 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Si marcas la caja de edición "Desactivar formulario de ingreso", se ignoran las credenciales entradas en el formulario de ingreso.', + 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Los usuarios remotos no almacenan sus contraseñas en la base de datos Kanboard, por ejemplo: cuentas de LDAP, Google y Github.', + 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Si marcas la opción "Desactivar formulario de ingreso", se ignoran las credenciales introducidas en el formulario de ingreso.', 'New remote user' => 'Nuevo usuario remoto', 'New local user' => 'Nuevo usuario local', - 'Default task color' => 'Color por defecto de tarea', - 'This feature does not work with all browsers.' => 'Esta característica no funciona con todos los navegadores', - 'There is no destination project available.' => 'No está disponible proyecto destino', - 'Trigger automatically subtask time tracking' => 'Disparar de forma automática seguimiento temporal de subtarea', + 'Default task color' => 'Color de la tarea por defecto', + 'This feature does not work with all browsers.' => 'Esta característica no funciona en todos los navegadores.', + 'There is no destination project available.' => 'No está disponible proyecto de destino.', + 'Trigger automatically subtask time tracking' => 'Disparar de forma automática el seguimiento temporal de subtarea', 'Include closed tasks in the cumulative flow diagram' => 'Incluir tareas cerradas en el diagrama de flujo acumulado', 'Current swimlane: %s' => 'Calle en curso: %s', 'Current column: %s' => 'Columna en curso: %s', 'Current category: %s' => 'Categoría en curso: %s', 'no category' => 'no hay categoría', - 'Current assignee: %s' => 'Concesionario en curso: %s', + 'Current assignee: %s' => 'Responsable en curso: %s', 'not assigned' => 'sin asignar', 'Author:' => 'Autor:', 'contributors' => 'contribuyentes', 'License:' => 'Licencia:', 'License' => 'Licencia', - 'Enter the text below' => 'Digita el texto de abajo', + 'Enter the text below' => 'Introduzca el texto a continuación', 'Gantt chart for %s' => 'Diagrama de Gantt para %s', - 'Sort by position' => 'Clasificado mediante posición', - 'Sort by date' => 'Clasificado mediante fecha', + 'Sort by position' => 'Ordenar por posición', + 'Sort by date' => 'Ordenar por fecha', 'Add task' => 'Añadir tarea', 'Start date:' => 'Fecha de inicio:', 'Due date:' => 'Fecha de entrega:', 'There is no start date or due date for this task.' => 'No hay fecha de inicio o de entrega para esta tarea.', - 'Moving or resizing a task will change the start and due date of the task.' => 'El mover o redimensionar una tarea cambiará la fecha inicio y de entrega de la misma.', + 'Moving or resizing a task will change the start and due date of the task.' => 'Mover o redimensionar una tarea cambiará la fecha inicio y de entrega de la misma.', 'There is no task in your project.' => 'No hay tareas en su proyecto.', - 'Gantt chart' => 'Digrama de Gantt', - 'People who are project managers' => 'Usuarios que son administradores de proyecto', - 'People who are project members' => 'Usuarios que son miembros de proyecto', - 'NOK - Norwegian Krone' => 'NOK - Coronoa Noruega', + 'Gantt chart' => 'Diagrama de Gantt', + 'People who are project managers' => 'Usuarios que son administradores del proyecto', + 'People who are project members' => 'Usuarios que son miembros del proyecto', + 'NOK - Norwegian Krone' => 'NOK - Corona Noruega', 'Show this column' => 'Mostrar esta columna', 'Hide this column' => 'Ocultar esta columna', 'open file' => 'abrir fichero', @@ -833,80 +820,80 @@ return array( 'Users overview' => 'Resumen de usuarios', 'Members' => 'Miembros', 'Shared project' => 'Proyecto compartido', - 'Project managers' => 'Administradores de proyecto', + 'Project managers' => 'Administradores del proyecto', 'Gantt chart for all projects' => 'Diagrama de Gantt para todos los proyectos', 'Projects list' => 'Lista de proyectos', 'Gantt chart for this project' => 'Diagrama de Gantt para este proyecto', 'Project board' => 'Tablero del proyecto', - 'End date:' => 'Fecha final', + 'End date:' => 'Fecha de fin:', 'There is no start date or end date for this project.' => 'No existe fecha de inicio o de fin para este proyecto.', - 'Projects Gantt chart' => 'Diagramas de Gantt de los proyectos', - 'Change task color when using a specific task link' => 'Cambiar colo de la tarea al usar un enlace específico a tarea', - 'Task link creation or modification' => 'Creación o modificación de enlace a tarea', + 'Projects Gantt chart' => 'Diagrama de Gantt de los proyectos', + 'Change task color when using a specific task link' => 'Cambiar el color de la tarea al usar un enlace específico a tarea', + 'Task link creation or modification' => 'Creación o modificación del enlace a tarea', 'Milestone' => 'Hito', 'Documentation: %s' => 'Documentación: %s', - 'Switch to the Gantt chart view' => 'Conmutar a vista de diagrama de Gantt', - 'Reset the search/filter box' => 'Limpiar la caja del filtro de búsqueda', + 'Switch to the Gantt chart view' => 'Cambiar a vista de diagrama de Gantt', + 'Reset the search/filter box' => 'Limpiar el filtro de búsqueda', 'Documentation' => 'Documentación', 'Table of contents' => 'Tabla de contenido', 'Gantt' => 'Gantt', 'Author' => 'Autor', 'Version' => 'Versión', 'Plugins' => 'Plugins', - 'There is no plugin loaded.' => 'No hay ningún plugin cargado', + 'There is no plugin loaded.' => 'No hay ningún plugin cargado.', 'Set maximum column height' => 'Establecer altura máxima de la columna', 'Remove maximum column height' => 'Eliminar altura máxima de la columna', 'My notifications' => 'Mis notificaciones', 'Custom filters' => 'Filtros personalizados', - 'Your custom filter have been created successfully.' => 'Tus filtros personalizados han sido creados exitosamente', - 'Unable to create your custom filter.' => 'No se ha podido crear tu filtro personalizado', - 'Custom filter removed successfully.' => 'Filtro personalizado ha sido eliminado exitosamente', - 'Unable to remove this custom filter.' => 'No se ha podido eliminar tu filtro personalizado', + 'Your custom filter have been created successfully.' => 'Tus filtros personalizados han sido creados correctamente.', + 'Unable to create your custom filter.' => 'No se ha podido crear tu filtro personalizado.', + 'Custom filter removed successfully.' => 'El filtro personalizado ha sido eliminado correctamente.', + 'Unable to remove this custom filter.' => 'No se ha podido eliminar tu filtro personalizado.', 'Edit custom filter' => 'Modificar filtro personalizado', - 'Your custom filter have been updated successfully.' => 'Tu filtro personalizado ha sido actualizado exitosamente', - 'Unable to update custom filter.' => 'No se ha podido actualizar tu filtro personalizado', + 'Your custom filter have been updated successfully.' => 'Tu filtro personalizado ha sido actualizado correctamente.', + 'Unable to update custom filter.' => 'No se ha podido actualizar tu filtro personalizado.', 'Web' => 'Web', 'New attachment on task #%d: %s' => 'Nuevo adjunto en la tarea #%d: %s', 'New comment on task #%d' => 'Nuevo comentario en la tarea #%d', 'Comment updated on task #%d' => 'Comentario actualizado en la tarea #%d', 'New subtask on task #%d' => 'Nueva subtarea en la tarea #%d', - 'Subtask updated on task #%d' => 'La subtarea en la tarea #%d ha sido actualizada', + 'Subtask updated on task #%d' => 'Subtarea actualizada en la tarea #%d', 'New task #%d: %s' => 'Nueva tarea #%d: %s', 'Task updated #%d' => 'Tarea actualizada #%d', - 'Task #%d closed' => 'Tarea #%d ha sido cerrada', - 'Task #%d opened' => 'Tarea #%d ha sido abierta', - 'Column changed for task #%d' => 'Columna para tarea #%d ha sido cambiada', + 'Task #%d closed' => 'Tarea #%d cerrada', + 'Task #%d opened' => 'Tarea #%d abierta', + 'Column changed for task #%d' => 'Columna cambiada para la tarea #%d', 'New position for task #%d' => 'Nueva posición para tarea #%d', - 'Swimlane changed for task #%d' => 'Se cambió el swimlane de la tarea #%d', - 'Assignee changed on task #%d' => 'Se cambió el asignado de la tarea #%d', + 'Swimlane changed for task #%d' => 'Se cambió la calle de la tarea #%d', + 'Assignee changed on task #%d' => 'Se cambió el responsable de la tarea #%d', '%d overdue tasks' => '%d tareas atrasadas', 'Task #%d is overdue' => 'La tarea #%d está atrasada', - 'No new notifications.' => 'No hay nuevas notificaciones', + 'No new notifications.' => 'No hay nuevas notificaciones.', 'Mark all as read' => 'Marcar todo como leído', 'Mark as read' => 'Marcar como leído', - 'Total number of tasks in this column across all swimlanes' => 'Número total de tareas en esta columna por todas las swimlanes', - 'Collapse swimlane' => 'Contraer swimlane', - 'Expand swimlane' => 'Ampliar swimlane', + 'Total number of tasks in this column across all swimlanes' => 'Número total de tareas en esta columna a través de todas las calles', + 'Collapse swimlane' => 'Contraer calle', + 'Expand swimlane' => 'Ampliar calle', 'Add a new filter' => 'Añadir nuevo filtro', 'Share with all project members' => 'Compartir con todos los miembros del proyecto', 'Shared' => 'Compartido', - 'Owner' => 'Dueño', + 'Owner' => 'Propietario', 'Unread notifications' => 'Notificaciones sin leer', - 'Notification methods:' => 'Métodos de notificación', + 'Notification methods:' => 'Métodos de notificación:', 'Import tasks from CSV file' => 'Importar tareas desde archivo CSV', 'Unable to read your file' => 'No es posible leer el archivo', - '%d task(s) have been imported successfully.' => '%d tarea(s) han sido importadas exitosamente', - 'Nothing have been imported!' => 'No se ha importado nada!', + '%d task(s) have been imported successfully.' => '%d tarea(s) han sido importadas correctamente.', + 'Nothing have been imported!' => '¡No se ha importado nada!', 'Import users from CSV file' => 'Importar usuarios desde archivo CSV', - '%d user(s) have been imported successfully.' => '%d usuario(s) se han importado exitosamente', + '%d user(s) have been imported successfully.' => '%d usuario(s) se han importado correctamente.', 'Comma' => 'Coma', 'Semi-colon' => 'Punto y coma', 'Tab' => 'Tabulación', - 'Vertical bar' => 'Pleca', + 'Vertical bar' => 'Barra vertical', 'Double Quote' => 'Comilla doble', - 'Single Quote' => 'Comilla sencilla', - '%s attached a file to the task #%d' => '%s adjuntó un archivo a la tarea #%d', - 'There is no column or swimlane activated in your project!' => 'No hay ninguna columna o swimlane activada en su proyecto!', + 'Single Quote' => 'Comilla simple', + '%s attached a file to the task #%d' => '%s adjuntó un archivo en la tarea #%d', + 'There is no column or swimlane activated in your project!' => '¡No hay ninguna columna o calle activada en su proyecto!', 'Append filter (instead of replacement)' => 'Añadir filtro (en vez de reemplazar)', 'Append/Replace' => 'Añadir/Reemplazar', 'Append' => 'Añadir', @@ -919,92 +906,92 @@ return array( 'CSV File' => 'Archivo CSV', 'Instructions' => 'Indicaciones', 'Your file must use the predefined CSV format' => 'Su archivo debe utilizar el formato CSV predeterminado', - 'Your file must be encoded in UTF-8' => 'Su archivo debe ser codificado en UTF-8', + 'Your file must be encoded in UTF-8' => 'Su archivo debe estar codificado en UTF-8', 'The first row must be the header' => 'La primera fila debe ser el encabezado', 'Duplicates are not verified for you' => 'Los duplicados no serán verificados', 'The due date must use the ISO format: YYYY-MM-DD' => 'La fecha de entrega debe utilizar el formato ISO: AAAA-MM-DD', 'Download CSV template' => 'Descargar plantilla CSV', - 'No external integration registered.' => 'No se ha registrado integración externa', + 'No external integration registered.' => 'No se ha registrado integración externa.', 'Duplicates are not imported' => 'Los duplicados no son importados', - 'Usernames must be lowercase and unique' => 'Los nombres de usuario deben ser únicos y contener sólo minúsculas', + 'Usernames must be lowercase and unique' => 'Los nombres de usuario deben ser únicos y en minúsculas', 'Passwords will be encrypted if present' => 'Las contraseñas serán cifradas si es que existen', - '%s attached a new file to the task %s' => '%s adjuntó un nuevo archivo a la tarea %s', + '%s attached a new file to the task %s' => '%s adjuntó un nuevo archivo en la tarea %s', 'Link type' => 'Tipo de enlace', 'Assign automatically a category based on a link' => 'Asignar una categoría automáticamente basado en un enlace', - 'BAM - Konvertible Mark' => 'BAM - marco convertible', - 'Assignee Username' => 'Nombre de usuario del concesionario', - 'Assignee Name' => 'Nombre del concesionario', + 'BAM - Konvertible Mark' => 'BAM - Marco convertible', + 'Assignee Username' => 'Nombre de usuario del responsable', + 'Assignee Name' => 'Nombre del responsable', 'Groups' => 'Grupos', 'Members of %s' => 'Miembros de %s', 'New group' => 'Nuevo grupo', - 'Group created successfully.' => 'Grupo creado exitosamente', - 'Unable to create your group.' => 'No es posible crear el grupo', - 'Edit group' => 'Editar grupo', - 'Group updated successfully.' => 'Grupo actualizado exitosamente', - 'Unable to update your group.' => 'No es posible actualizar el grupo', - 'Add group member to "%s"' => 'Agregar miembro del grupo a "%s"', - 'Group member added successfully.' => 'Miembro del grupo agregado exitosamente', - 'Unable to add group member.' => 'No es posible agregar miembro del grupo', - 'Remove user from group "%s"' => 'Eliminar usuario del grupo "%s"', - 'User removed successfully from this group.' => 'Usuario eliminado exitosamente del grupo', - 'Unable to remove this user from the group.' => 'No es posible eliminar este usuario del grupo', + 'Group created successfully.' => 'Grupo creado correctamente.', + 'Unable to create your group.' => 'No es posible crear el grupo.', + 'Edit group' => 'Modificar grupo', + 'Group updated successfully.' => 'Grupo actualizado correctamente.', + 'Unable to update your group.' => 'No es posible actualizar el grupo.', + 'Add group member to "%s"' => 'Añadir un miembro del grupo a «%s»', + 'Group member added successfully.' => 'Miembro del grupo añadido correctamente.', + 'Unable to add group member.' => 'No es posible añadir el miembro del grupo.', + 'Remove user from group "%s"' => 'Eliminar usuario del grupo «%s»', + 'User removed successfully from this group.' => 'Usuario eliminado correctamente del grupo.', + 'Unable to remove this user from the group.' => 'No es posible eliminar este usuario del grupo.', 'Remove group' => 'Eliminar grupo', - 'Group removed successfully.' => 'Grupo eliminado exitosamente', - 'Unable to remove this group.' => 'No es posible eliminar este grupo', + 'Group removed successfully.' => 'Grupo eliminado correctamente.', + 'Unable to remove this group.' => 'No es posible eliminar este grupo.', 'Project Permissions' => 'Permisos del proyecto', 'Manager' => 'Administrador', - 'Project Manager' => 'Administrador de proyecto', + 'Project Manager' => 'Administrador del proyecto', 'Project Member' => 'Miembro del proyecto', - 'Project Viewer' => 'Visor de proyectos', - 'Your account is locked for %d minutes' => 'Tu cuenta ha sido bloqueada por %d minuto(s)', + 'Project Viewer' => 'Observador del proyecto', + 'Your account is locked for %d minutes' => 'Tu cuenta ha sido bloqueada durante %d minutos', 'Invalid captcha' => 'CAPTCHA inválido', 'The name must be unique' => 'El nombre debe ser único', 'View all groups' => 'Ver todos los grupos', 'View group members' => 'Ver miembros del grupo', - 'There is no user available.' => 'No hay usuario disponible', - 'Do you really want to remove the user "%s" from the group "%s"?' => '¿Realmente desea eliminar el usuario "%s" del grupo "%s"?', - 'There is no group.' => 'No hay grupo', - 'External Id' => 'ID externo', - 'Add group member' => 'Agregar miembro de grupo', - 'Do you really want to remove this group: "%s"?' => '¿Realmente desea eliminar este grupo: "%s"?', - 'There is no user in this group.' => 'No hay usuario en este grupo', + 'There is no user available.' => 'No hay usuario disponible.', + 'Do you really want to remove the user "%s" from the group "%s"?' => '¿Realmente desea eliminar el usuario «%s» del grupo «%s»?', + 'There is no group.' => 'No hay grupo.', + 'External Id' => 'Identificador externo', + 'Add group member' => 'Añadir un miembro al grupo', + 'Do you really want to remove this group: "%s"?' => '¿Realmente desea eliminar este grupo: «%s»?', + 'There is no user in this group.' => 'No hay usuario en este grupo.', 'Remove this user' => 'Eliminar este usuario', 'Permissions' => 'Permisos', 'Allowed Users' => 'Usuarios permitidos', - 'No user have been allowed specifically.' => 'Ningun usuario ha sido explícitamente permitido', + 'No user have been allowed specifically.' => 'Ningún usuario ha sido explícitamente permitido.', 'Role' => 'Rol', 'Enter user name...' => 'Ingresa nombre de usuario...', 'Allowed Groups' => 'Grupos permitidos', - 'No group have been allowed specifically.' => 'Ningun grupo ha sido explícitamente permitido', + 'No group have been allowed specifically.' => 'Ningún grupo ha sido explícitamente permitido.', 'Group' => 'Grupo', 'Group Name' => 'Nombre del grupo', 'Enter group name...' => 'Ingresa el nombre del grupo...', 'Role:' => 'Rol:', 'Project members' => 'Miembros del proyecto', - 'Compare hours for "%s"' => 'Compara horas con "%s"', + 'Compare hours for "%s"' => 'Compara horas con «%s»', '%s mentioned you in the task #%d' => '%s te mencionó en la tarea #%d', '%s mentioned you in a comment on the task #%d' => '%s te mencionó en un comentario en la tarea #%d', - 'You were mentioned in the task #%d' => 'Te mencionaron en la tarea #%d', - 'You were mentioned in a comment on the task #%d' => 'Te mencionaron en un comentario en la tarea #%d', + 'You were mentioned in the task #%d' => 'Fuiste mencionado en la tarea #%d', + 'You were mentioned in a comment on the task #%d' => 'Fuiste mencionado en un comentario de la tarea #%d', 'Mentioned' => 'Mencionado', - 'Compare Estimated Time vs Actual Time' => 'Comparar Tiempo Estimado vs Tiempo Actual', + 'Compare Estimated Time vs Actual Time' => 'Comparar tiempo estimado vs tiempo actual', 'Estimated hours: ' => 'Horas estimadas: ', 'Actual hours: ' => 'Horas actuales: ', 'Hours Spent' => 'Horas gastadas', - 'Hours Estimated' => 'Hora Estimada', - 'Estimated Time' => 'Tiempo Estimado', - 'Actual Time' => 'Tiempo Actual', + 'Hours Estimated' => 'Horas estimadas', + 'Estimated Time' => 'Tiempo estimado', + 'Actual Time' => 'Tiempo actual', 'Estimated vs actual time' => 'Tiempo estimado vs real', - 'RUB - Russian Ruble' => 'RUB - rublo ruso', - 'Assign the task to the person who does the action when the column is changed' => 'Asignar la tarea a la persona que haga la acción al cambiar de columna', + 'RUB - Russian Ruble' => 'RUB - Rublo ruso', + 'Assign the task to the person who does the action when the column is changed' => 'Asignar la tarea a la persona que hace la acción al cambiar de columna', 'Close a task in a specific column' => 'Cerrar tarea en una columna especifica', 'Time-based One-time Password Algorithm' => 'Algoritmo basado en tiempo de un solo uso', - 'Two-Factor Provider: ' => 'Proveedor de autenticación de dos factores', - 'Disable two-factor authentication' => 'Deshabilitar autenticación de dos factores', - 'Enable two-factor authentication' => 'Habilitar autenticación de dos factorse', - 'There is no integration registered at the moment.' => 'No hay ninguna integración registrada por el momento', + 'Two-Factor Provider: ' => 'Proveedor de autenticación en dos pasos: ', + 'Disable two-factor authentication' => 'Deshabilitar autenticación en dos pasos', + 'Enable two-factor authentication' => 'Habilitar autenticación en dos pasos', + 'There is no integration registered at the moment.' => 'No hay ninguna integración registrada por el momento.', 'Password Reset for Kanboard' => 'Restablecimiento de contraseña para Kanboard', - 'Forgot password?' => '¿Olvidó contraseña?', + 'Forgot password?' => '¿Olvidó la contraseña?', 'Enable "Forget Password"' => 'Habilitar "olvidar contraseña"', 'Password Reset' => 'Restablecer contraseña', 'New password' => 'Nueva contraseña', @@ -1015,19 +1002,19 @@ return array( 'Creation' => 'Creación', 'Expiration' => 'Vencimiento', 'Password reset history' => 'Historial de restablecimiento de contraseña', - 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => 'Todas las tareas de la columna "%s" y el swimlane "%s" se han cerrado exitosamente', + 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => 'Todas las tareas de la columna "%s" y la calle «%s» se han cerrado correctamente.', 'Do you really want to close all tasks of this column?' => '¿Realmente desea cerrar todas las tareas de esta columna?', - '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '%d tarea(s) en la columna "%s" y el swimlane "%s" será(n) cerrada(s)', + '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '%d tarea(s) en la columna "%s" y en la calle «%s» será(n) cerrada(s).', 'Close all tasks of this column' => 'Cerrar todas las tareas de esta columna', - 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => 'Ningún plugin ha registrado un método de notificación para el proyecto. Aún puedes configurar notificaciones individuales en tu perfil de usuario', + 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => 'Ningún plugin ha registrado un método de notificación para el proyecto. Aún puedes configurar notificaciones individuales en tu perfil de usuario.', 'My dashboard' => 'Mi tablero', 'My profile' => 'Mi perfil', - 'Project owner: ' => 'Dueño del proyecto', - 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => 'El identificador de proyecto es opcional y debe ser alfanumérico. Ejemplo: MIPROYECTO', - 'Project owner' => 'Dueño del proyecto', - 'Those dates are useful for the project Gantt chart.' => 'Esas fechas son útiles para el diagrama de Gantt', - 'Private projects do not have users and groups management.' => 'Proyectos privados no cuentan con gestión de usuarios y grupos', - 'There is no project member.' => 'No existe miembro del proyecto', + 'Project owner: ' => 'Propietario del proyecto: ', + 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => 'El identificador del proyecto es opcional y debe ser alfanumérico. Ejemplo: MIPROYECTO', + 'Project owner' => 'Propietario del proyecto', + 'Those dates are useful for the project Gantt chart.' => 'Esas fechas son útiles para el diagrama de Gantt.', + 'Private projects do not have users and groups management.' => 'Los proyectos privados no cuentan con gestión de usuarios y grupos.', + 'There is no project member.' => 'No existe miembro del proyecto.', 'Priority' => 'Prioridad', 'Task priority' => 'Prioridad de la tarea', 'General' => 'General', @@ -1035,16 +1022,16 @@ return array( 'Default priority' => 'Prioridad predeterminada', 'Lowest priority' => 'Prioridad más baja', 'Highest priority' => 'Prioridad más alta', - 'If you put zero to the low and high priority, this feature will be disabled.' => 'Si estableces la prioridad más baja y alta como cero esta función será deshabilitada', + 'If you put zero to the low and high priority, this feature will be disabled.' => 'Si estableces la prioridad más baja y más alta a cero esta función será deshabilitada.', 'Close a task when there is no activity' => 'Cerrar tarea cuando no haya actividad', 'Duration in days' => 'Duración en días', 'Send email when there is no activity on a task' => 'Enviar correo cuando no haya actividad en una tarea', - 'Unable to fetch link information.' => 'No es posible obtener información sobre el enlace', - 'Daily background job for tasks' => 'Tarea de fondo diaria para las tareas', + 'Unable to fetch link information.' => 'No es posible obtener información del enlace.', + 'Daily background job for tasks' => 'Trabajo en segundo plano diario para las tareas', 'Auto' => 'Automático', 'Related' => 'Relacionado', 'Attachment' => 'Adjunto', - 'Title not found' => 'Título no ha sido encontrado', + 'Title not found' => 'No se ha encontrado el título', 'Web Link' => 'Enlace web', 'External links' => 'Enlaces externos', 'Add external link' => 'Añadir enlace externo', @@ -1057,100 +1044,176 @@ return array( 'Copy and paste your link here...' => 'Copia y pega tu enlace aquí...', 'URL' => 'URL', 'Internal links' => 'Enlaces internos', - 'Assign to me' => 'Asignar a mí', + 'Assign to me' => 'Asignarme a mí', 'Me' => 'Yo', 'Do not duplicate anything' => 'No duplicar nada', 'Projects management' => 'Administración de proyectos', 'Users management' => 'Administración de usuarios', 'Groups management' => 'Administración de grupos', - 'Create from another project' => 'Crear de otro proyecto', + 'Create from another project' => 'Crear a partir de otro proyecto', 'open' => 'abierto', 'closed' => 'cerrado', - 'Priority:' => 'Prioridad', - 'Reference:' => 'Referencia', + 'Priority:' => 'Prioridad:', + 'Reference:' => 'Referencia:', 'Complexity:' => 'Complejidad:', - 'Swimlane:' => 'Swimlane:', + 'Swimlane:' => 'Calle:', 'Column:' => 'Columna:', 'Position:' => 'Posición:', 'Creator:' => 'Creador:', 'Time estimated:' => 'Tiempo estimado:', '%s hours' => '%s horas', 'Time spent:' => 'Tiempo gastado:', - 'Created:' => 'Creado', - 'Modified:' => 'Modificado', - 'Completed:' => 'Terminado', - 'Started:' => 'Iniciado', - 'Moved:' => 'Movido', + 'Created:' => 'Creado:', + 'Modified:' => 'Modificado:', + 'Completed:' => 'Finalizado:', + 'Started:' => 'Iniciado:', + 'Moved:' => 'Movido:', 'Task #%d' => 'Tarea #%d', - 'Date and time format' => 'Formato de hora y fecha', + 'Date and time format' => 'Formato de fecha y hora', 'Time format' => 'Formato de hora', - 'Start date: ' => 'Fecha de inicio', - 'End date: ' => 'Fecha de terminación', - 'New due date: ' => 'Nueva fecha de entrega', - 'Start date changed: ' => 'Fecha de inicio cambiada', + 'Start date: ' => 'Fecha de inicio: ', + 'End date: ' => 'Fecha de finalización: ', + 'New due date: ' => 'Nueva fecha de entrega: ', + 'Start date changed: ' => 'Fecha de inicio cambiada: ', 'Disable private projects' => 'Deshabilitar proyectos privados', - 'Do you really want to remove this custom filter: "%s"?' => '¿Realmente desea eliminar este filtro personalizado: "%s"?', - 'Remove a custom filter' => 'Eliminar filtro personalizado', - 'User activated successfully.' => 'Usuario activado exitosamente', - 'Unable to enable this user.' => 'No es posible habilitar este usuario', - 'User disabled successfully.' => 'Usuario deshabilitado exitosamente', - 'Unable to disable this user.' => 'No es posible deshabilitar este usuario', - 'All files have been uploaded successfully.' => 'Todos los archivos han sido subidos exitosamente', - 'View uploaded files' => 'Ver archivos subidos', - 'The maximum allowed file size is %sB.' => 'El límite de tamaño de archivo permitido para subir es %sB.', - 'Choose files again' => 'Eligir archivos de nuevo', + 'Do you really want to remove this custom filter: "%s"?' => '¿Realmente desea eliminar este filtro personalizado: «%s»?', + 'Remove a custom filter' => 'Eliminar el filtro personalizado', + 'User activated successfully.' => 'Usuario activado correctamente.', + 'Unable to enable this user.' => 'No es posible habilitar este usuario.', + 'User disabled successfully.' => 'Usuario deshabilitado correctamente.', + 'Unable to disable this user.' => 'No es posible deshabilitar este usuario.', + 'All files have been uploaded successfully.' => 'Todos los archivos han sido cargados correctamente.', + 'View uploaded files' => 'Ver archivos cargados', + 'The maximum allowed file size is %sB.' => 'El tamaño máximo de archivo es %sB.', + 'Choose files again' => 'Elegir archivos de nuevo', 'Drag and drop your files here' => 'Arrastra y suelta tus archivos aquí', - 'choose files' => 'Elegir archivos', + 'choose files' => 'elegir archivos', 'View profile' => 'Ver perfil', 'Two Factor' => 'Dos factores', 'Disable user' => 'Deshabilitar usuario', - 'Do you really want to disable this user: "%s"?' => '¿Realmente desea deshabilitar este usuario: "%s"?', + 'Do you really want to disable this user: "%s"?' => '¿Realmente desea deshabilitar este usuario: «%s»?', 'Enable user' => 'Habilitar usuario', - 'Do you really want to enable this user: "%s"?' => '¿Realmente desea habilitar este usuario: "%s"?', + 'Do you really want to enable this user: "%s"?' => '¿Realmente desea habilitar este usuario: «%s»?', 'Download' => 'Descargar', 'Uploaded: %s' => 'Subido: %s', 'Size: %s' => 'Tamaño: %s', 'Uploaded by %s' => 'Subido por %s', 'Filename' => 'Nombre de archivo', 'Size' => 'Tamaño', - 'Column created successfully.' => 'Columna creada exitosamente', + 'Column created successfully.' => 'Columna creada correctamente.', 'Another column with the same name exists in the project' => 'Ya existe una columna con el mismo nombre en el proyecto', 'Default filters' => 'Filtros predeterminados', - 'Your board doesn\'t have any column!' => '¡Tu tablero no tiene ninguna columna!', + 'Your board doesn\'t have any columns!' => '¡Tu tablero no tiene ninguna columna!', 'Change column position' => 'Cambiar posición de la columna', 'Switch to the project overview' => 'Cambiar a vista general del proyecto', 'User filters' => 'Usar filtros', - 'Category filters' => 'Categoría y filtros', - 'Upload a file' => 'Subir archivo', + 'Category filters' => 'Filtros de categoría', + 'Upload a file' => 'Cargar archivo', 'View file' => 'Ver archivo', 'Last activity' => 'Última actividad', 'Change subtask position' => 'Cambiar posición de la subtarea', - 'This value must be greater than %d' => 'Este valor debe ser mayor a %d', - 'Another swimlane with the same name exists in the project' => 'Ya existe otro swimlane con el mismo nombre en el proyecto', - 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Ejemplo: http://ejemplo.kanboard.net/ (Usado para generar URLs absolutas)', - 'Actions duplicated successfully.' => 'Acción duplicada con exito.', - 'Unable to duplicate actions.' => 'No se ha podido duplicar la acción.', + 'This value must be greater than %d' => 'Este valor debe ser mayor que %d', + 'Another swimlane with the same name exists in the project' => 'Ya existe otra calle con el mismo nombre en el proyecto', + 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Ejemplo: http://ejemplo.kanboard.net/ (usado para generar URLs absolutas)', + 'Actions duplicated successfully.' => 'Acciones duplicadas con éxito.', + 'Unable to duplicate actions.' => 'No se han podido duplicar las acciones.', 'Add a new action' => 'Añadir una nueva acción', 'Import from another project' => 'Importar de otro proyecto', 'There is no action at the moment.' => 'No hay ninguna acción en este momento.', 'Import actions from another project' => 'Importar acciones de otro proyecto', 'There is no available project.' => 'No hay proyectos disponibles.', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Local File' => 'Archivo local', + 'Configuration' => 'Configuración', + 'PHP version:' => 'Versión de PHP:', + 'PHP SAPI:' => 'PHP SAPI:', + 'OS version:' => 'Sistema operativo:', + 'Database version:' => 'Versión de la base de datos:', + 'Browser:' => 'Navegador web:', + 'Task view' => 'Ver tarea', + 'Edit task' => 'Modificar tarea', + 'Edit description' => 'Modificar descripción', + 'New internal link' => 'Nuevo enlace interno', + 'Display list of keyboard shortcuts' => 'Mostrar la lista de atajos de teclado', + 'Menu' => 'Menú', + 'Set start date' => 'Establecer fecha de inicio', + 'Avatar' => 'Avatar', + 'Upload my avatar image' => 'Cargar imagen de avatar', + 'Remove my image' => 'Eliminar imagen', + 'The OAuth2 state parameter is invalid' => 'El parámetro estado de OAuth2 es inválido', + 'User not found.' => 'Usuario no encontrado.', + 'Search in activity stream' => 'Buscar en el río de actividad', + 'My activities' => 'Mis actividades', + 'Activity until yesterday' => 'Actividad hasta ayer', + 'Activity until today' => 'Actividad hasta hoy', + 'Search by creator: ' => 'Buscar por creador: ', + 'Search by creation date: ' => 'Buscar por fecha de creación: ', + 'Search by task status: ' => 'Buscar por estado de la tarea: ', + 'Search by task title: ' => 'Buscar por título de la tarea: ', + 'Activity stream search' => 'Búsqueda en el río de actividad', + 'Projects where "%s" is manager' => 'Proyectos donde «%s» es administrador', + 'Projects where "%s" is member' => 'Proyectos donde «%s» es miembro', + 'Open tasks assigned to "%s"' => 'Tareas abiertas asignadas a «%s»', + 'Closed tasks assigned to "%s"' => 'Tareas cerradas asignadas a «%s»', + 'Assign automatically a color based on a priority' => 'Asignar automáticamente un color basado en la prioridad', + 'Overdue tasks for the project(s) "%s"' => 'Tareas atrasadas para el proyecto(s) «%s»', + 'Upload files' => 'Cargar archivos', + 'Installed Plugins' => 'Plugins instalados', + 'Plugin Directory' => 'Directorio de plugins', + 'Plugin installed successfully.' => 'Plugin instalado correctamente.', + 'Plugin updated successfully.' => 'Plugin actualizado correctamente.', + 'Plugin removed successfully.' => 'Plugin eliminado correctamente.', + 'Subtask converted to task successfully.' => 'Subtarea convertida en tarea correctamente.', + 'Unable to convert the subtask.' => 'No se puede convertir la subtarea.', + 'Unable to extract plugin archive.' => 'No se puede extraer el plugin.', + 'Plugin not found.' => 'Plugin no encontrado.', + 'You don\'t have the permission to remove this plugin.' => 'No tiene permiso para eliminar este plugin.', + 'Unable to download plugin archive.' => 'No se puede descargar el plugin.', + 'Unable to write temporary file for plugin.' => 'No se puede escribir el fichero temporal del plugin.', + 'Unable to open plugin archive.' => 'No se puede abrir el plugin.', + 'There is no file in the plugin archive.' => 'No hay ficheros dentro del plugin.', + 'Create tasks in bulk' => 'Crear tareas en bloque', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'Kanboard no está configurado para instalar plugins desde la interfaz de usuario.', + 'There is no plugin available.' => 'No hay plugins disponibles.', + 'Install' => 'Instalar', + 'Update' => 'Actualizar', + 'Up to date' => 'Actualizado', + 'Not available' => 'No disponible', + 'Remove plugin' => 'Eliminar plugin', + 'Do you really want to remove this plugin: "%s"?' => '¿Realmente desea eliminar este plugin: «%s»?', + 'Uninstall' => 'Desinstalar', + 'Listing' => 'Listado', + 'Metadata' => 'Metadatos', + 'Manage projects' => 'Administrar proyectos', + 'Convert to task' => 'Convertir en tarea', + 'Convert sub-task to task' => 'Convertir subtarea en tarea', + 'Do you really want to convert this sub-task to a task?' => '¿Realmente desea convertir esta subtarea en tarea?', + 'My task title' => 'Título de la tarea', + 'Enter one task by line.' => 'Introduce una tarea por línea.', + 'Number of failed login:' => 'Número de ingresos fallidos:', + 'Account locked until:' => 'Cuenta bloqueada hasta:', + 'Email settings' => 'Preferencias de correo electrónico', + 'Email sender address' => 'Dirección del remitente del correo electrónico', + 'Email transport' => 'Transporte de correo electrónico', + 'Webhook token' => 'Token del disparador web (webhook)', + 'Imports' => 'Importaciones', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/fi_FI/translations.php b/sources/app/Locale/fi_FI/translations.php index 8e5dd81..58360ab 100644 --- a/sources/app/Locale/fi_FI/translations.php +++ b/sources/app/Locale/fi_FI/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Näytä tämä tehtävä', 'Remove user' => 'Poista käyttäjä', 'Do you really want to remove this user: "%s"?' => 'Oletko varma että haluat poistaa käyttäjän "%s"?', - 'New user' => 'Uusi käyttäjä', 'All users' => 'Kaikki käyttäjät', 'Username' => 'Käyttäjänimi', 'Password' => 'Salasana', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d suljettua tehtävää', 'No task for this project' => 'Ei tehtävää tälle projektille', 'Public link' => 'Julkinen linkki', - 'Change assignee' => 'Vaihda suorittajaa', - 'Change assignee for the task "%s"' => 'Vaihda suorittajaa tehtävälle %s', 'Timezone' => 'Aikavyöhyke', 'Sorry, I didn\'t find this information in my database!' => 'Anteeksi, en löytänyt tätä tietoa tietokannastani', 'Page not found' => 'Sivua ei löydy', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Lisää kuvaus', 'Comment added successfully.' => 'Kommentti lisättiin onnistuneesti.', 'Unable to create your comment.' => 'Kommentin lisäys epäonnistui.', - 'Edit this task' => 'Muokkaa tehtävää', 'Due Date' => 'Deadline', 'Invalid date' => 'Virheellinen päiväys', 'Automatic actions' => 'Automaattiset toiminnot', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategoria', 'Category:' => 'Kategoria:', 'Categories' => 'Kategoriat', - 'Category not found.' => 'Kategoriaa ei löytynyt.', 'Your category have been created successfully.' => 'Kategoria luotiin onnistuneesti.', 'Unable to create your category.' => 'Kategorian luonti epäonnistui.', 'Your category have been updated successfully.' => 'Kategoriaa muokattiin onnistuneesti.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Haluatko varmasti poistaa tiedoston: "%s"?', 'Attachments' => 'Liitteet', 'Edit the task' => 'Muokkaa tehtävää', - 'Edit the description' => 'Muokkaa kuvausta', 'Add a comment' => 'Lisää kommentti', 'Edit a comment' => 'Muokkaa kommenttia', 'Summary' => 'Yhteenveto', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Muita tunnistautumistapoja ei ole otettu käyttöön.', 'Password modified successfully.' => 'Salasana vaihdettu onnistuneesti.', 'Unable to change the password.' => 'Salasanan vaihto epäonnistui.', - 'Change category for the task "%s"' => 'Vaihda tehtävän "%s" kategoria', 'Change category' => 'Vaihda kategoria', '%s updated the task %s' => '%s päivitti tehtävän %s', '%s opened the task %s' => '%s avasi tehtävän %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Tietoja', 'Database driver:' => 'Tietokantaohjelmisto:', 'Board settings' => 'Taulun asetukset', - 'URL and token' => 'URL ja token', 'Webhook settings' => 'Webhookin asetukset', - 'URL for task creation:' => 'URL tehtävän luomiseksi:', 'Reset token' => 'Vaihda token', 'API endpoint:' => 'API päätepiste:', 'Refresh interval for private board' => 'Päivitystiheys yksityisille tauluille', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Poista kaista', 'Show default swimlane' => 'Näytä oletuskaista', 'Swimlane modification for the project "%s"' => 'Kaistamuutos projektille "%s"', - 'Swimlane not found.' => 'Kaistaa ei löydy', 'Swimlane removed successfully.' => 'Kaista poistettu onnistuneesti.', 'Swimlanes' => 'Kaistat', 'Swimlane updated successfully.' => 'Kaista päivitetty onnistuneesti.', @@ -517,7 +507,6 @@ return array( // 'All swimlanes' => '', // 'All colors' => '', // 'Moved to column %s' => '', - // 'Change description' => '', // 'User dashboard' => '', // 'Allow only one subtask in progress at the same time for a user' => '', // 'Edit column "%s"' => '', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', // 'New title: %s' => '', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( // 'Stop timer' => '', // 'Start timer' => '', // 'Add project member' => '', - // 'Enable notifications' => '', // 'My activity stream' => '', // 'My calendar' => '', // 'Search tasks' => '', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/fr_FR/translations.php b/sources/app/Locale/fr_FR/translations.php index cedd603..8684d1e 100644 --- a/sources/app/Locale/fr_FR/translations.php +++ b/sources/app/Locale/fr_FR/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Voir cette tâche', 'Remove user' => 'Supprimer un utilisateur', 'Do you really want to remove this user: "%s"?' => 'Voulez-vous vraiment supprimer cet utilisateur : « %s » ?', - 'New user' => 'Ajouter un utilisateur', 'All users' => 'Tous les utilisateurs', 'Username' => 'Nom d\'utilisateur', 'Password' => 'Mot de passe', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d tâches terminées', 'No task for this project' => 'Aucune tâche pour ce projet', 'Public link' => 'Lien public', - 'Change assignee' => 'Changer la personne assignée', - 'Change assignee for the task "%s"' => 'Changer la personne assignée pour la tâche « %s »', 'Timezone' => 'Fuseau horaire', 'Sorry, I didn\'t find this information in my database!' => 'Désolé, je n\'ai pas trouvé cette information dans ma base de données !', 'Page not found' => 'Page introuvable', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Laissez une description', 'Comment added successfully.' => 'Commentaire ajouté avec succès.', 'Unable to create your comment.' => 'Impossible de sauvegarder votre commentaire.', - 'Edit this task' => 'Modifier cette tâche', 'Due Date' => 'Date d\'échéance', 'Invalid date' => 'Date invalide', 'Automatic actions' => 'Actions automatisées', @@ -250,7 +246,6 @@ return array( 'Category' => 'Catégorie', 'Category:' => 'Catégorie :', 'Categories' => 'Catégories', - 'Category not found.' => 'Catégorie introuvable', 'Your category have been created successfully.' => 'Votre catégorie a été créée avec succès.', 'Unable to create your category.' => 'Impossible de créer votre catégorie.', 'Your category have been updated successfully.' => 'Votre catégorie a été mise à jour avec succès.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Voulez-vous vraiment supprimer ce fichier « %s » ?', 'Attachments' => 'Pièces-jointes', 'Edit the task' => 'Modifier la tâche', - 'Edit the description' => 'Modifier la description', 'Add a comment' => 'Ajouter un commentaire', 'Edit a comment' => 'Modifier un commentaire', 'Summary' => 'Résumé', @@ -367,10 +361,9 @@ return array( 'Password modification' => 'Changement de mot de passe', 'External authentications' => 'Authentifications externes', 'Never connected.' => 'Jamais connecté.', - 'No external authentication enabled.' => 'Aucune authentication externe activée.', + 'No external authentication enabled.' => 'Aucune authentification externe activée.', 'Password modified successfully.' => 'Mot de passe changé avec succès.', 'Unable to change the password.' => 'Impossible de changer le mot de passe.', - 'Change category for the task "%s"' => 'Changer la catégorie pour la tâche « %s »', 'Change category' => 'Changer de catégorie', '%s updated the task %s' => '%s a mis à jour la tâche %s', '%s opened the task %s' => '%s a ouvert la tâche %s', @@ -413,9 +406,7 @@ return array( 'About' => 'À propos', 'Database driver:' => 'Type de base de données :', 'Board settings' => 'Paramètres du tableau', - 'URL and token' => 'URL et jeton de sécurité', 'Webhook settings' => 'Paramètres pour les webhooks', - 'URL for task creation:' => 'URL pour la création de tâche :', 'Reset token' => 'Regénérer le jeton de sécurité', 'API endpoint:' => 'URL de l\'API :', 'Refresh interval for private board' => 'Intervalle pour rafraîchir un tableau privé', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Supprimer une swimlane', 'Show default swimlane' => 'Afficher la swimlane par défaut', 'Swimlane modification for the project "%s"' => 'Modification d\'une swimlane pour le projet « %s »', - 'Swimlane not found.' => 'Cette swimlane est introuvable.', 'Swimlane removed successfully.' => 'Swimlane supprimée avec succès.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane mise à jour avec succès.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Toutes les swimlanes', 'All colors' => 'Toutes les couleurs', 'Moved to column %s' => 'Tâche déplacée à la colonne %s', - 'Change description' => 'Changer la description', 'User dashboard' => 'Tableau de bord de l\'utilisateur', 'Allow only one subtask in progress at the same time for a user' => 'Autoriser une seule sous-tâche en progrès en même temps pour un utilisateur', 'Edit column "%s"' => 'Modifier la colonne « %s »', @@ -709,7 +698,7 @@ return array( 'view the board on Kanboard' => 'voir le tableau sur Kanboard', 'The task have been moved to the first swimlane' => 'La tâche a été déplacée dans la première swimlane', 'The task have been moved to another swimlane:' => 'La tâche a été déplacée dans une autre swimlane :', - 'Overdue tasks for the project "%s"' => 'Tâches en retard pour le projet « %s »', + // 'Overdue tasks for the project(s) "%s"' => 'Tâches en retard pour le projet « %s »', 'New title: %s' => 'Nouveau titre : %s', 'The task is not assigned anymore' => 'La tâche n\'est plus assignée maintenant', 'New assignee: %s' => 'Nouvel assigné : %s', @@ -738,7 +727,6 @@ return array( 'Stop timer' => 'Stopper le chrono', 'Start timer' => 'Démarrer le chrono', 'Add project member' => 'Ajouter un membre au projet', - 'Enable notifications' => 'Activer les notifications', 'My activity stream' => 'Mon flux d\'activité', 'My calendar' => 'Mon agenda', 'Search tasks' => 'Rechercher des tâches', @@ -1116,7 +1104,7 @@ return array( 'Column created successfully.' => 'La colonne a été créée avec succès.', 'Another column with the same name exists in the project' => 'Une autre colonne existe avec le même nom dans le projet', 'Default filters' => 'Filtres par défaut', - 'Your board doesn\'t have any column!' => 'Votre tableau n\'a aucune colonne', + 'Your board doesn\'t have any columns!' => 'Votre tableau n\'a aucune colonne', 'Change column position' => 'Changer la position de la colonne', 'Switch to the project overview' => 'Aller à l\'aperçu du projet', 'User filters' => 'Filtres des utilisateurs', @@ -1153,4 +1141,80 @@ return array( 'Upload my avatar image' => 'Uploader mon image d\'avatar', 'Remove my image' => 'Supprimer mon image', 'The OAuth2 state parameter is invalid' => 'Le paramètre "state" de OAuth2 est invalide', + 'User not found.' => 'Utilisateur introuvable.', + 'Search in activity stream' => 'Chercher dans le flux d\'activité', + 'My activities' => 'Mes activités', + 'Activity until yesterday' => 'Activités jusqu\'à hier', + 'Activity until today' => 'Activités jusqu\'à aujourd\'hui', + 'Search by creator: ' => 'Rechercher par créateur : ', + 'Search by creation date: ' => 'Rechercher par date de création : ', + 'Search by task status: ' => 'Rechercher par le statut des tâches : ', + 'Search by task title: ' => 'Rechercher par le titre des tâches : ', + 'Activity stream search' => 'Recherche dans le flux d\'activité', + 'Projects where "%s" is manager' => 'Projets où « %s » est gestionnaire', + 'Projects where "%s" is member' => 'Projets où « %s » est membre du projet', + 'Open tasks assigned to "%s"' => 'Tâches ouvertes assignées à « %s »', + 'Closed tasks assigned to "%s"' => 'Tâches fermées assignées à « %s »', + 'Assign automatically a color based on a priority' => 'Assigner automatiquement une couleur par rapport à une priorité', + 'Overdue tasks for the project(s) "%s"' => 'Tâches en retard pour le projet(s) « %s »', + 'Upload files' => 'Uploader les fichiers', + 'Installed Plugins' => 'Extensions installées', + 'Plugin Directory' => 'Liste des extensions', + 'Plugin installed successfully.' => 'Extension installée avec succès.', + 'Plugin updated successfully.' => 'Extension mise à jour avec succès.', + 'Plugin removed successfully.' => 'Extension supprimée avec succès.', + 'Subtask converted to task successfully.' => 'Sous-tâche convertie en tâche avec succès.', + 'Unable to convert the subtask.' => 'Impossible de convertir cette sous-tâche.', + 'Unable to extract plugin archive.' => 'Impossible d\'extraire l\'archive de l\'extension.', + 'Plugin not found.' => 'Extension introuvable.', + 'You don\'t have the permission to remove this plugin.' => 'Vous n\'avez pas la permission de supprimer ce plugin.', + 'Unable to download plugin archive.' => 'Impossible de télécharger l\'achive du plugin.', + 'Unable to write temporary file for plugin.' => 'Impossible d\'écrire le fichier temporaire pour l\'extension.', + 'Unable to open plugin archive.' => 'Impossible d\'ouvrir l\'archive du plugin.', + 'There is no file in the plugin archive.' => 'Il n\'y a aucun fichier dans l\'archive du plugin.', + 'Create tasks in bulk' => 'Créer plusieurs tâches en même temps', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'Votre instance de Kanboard n\'est pas configurée pour installer des extension depuis l\'interface utilisateur.', + 'There is no plugin available.' => 'Il n\'a aucune extension disponible.', + 'Install' => 'Installer', + 'Update' => 'Mettre à jour', + 'Up to date' => 'À jour', + 'Not available' => 'Non disponible', + 'Remove plugin' => 'Supprimer l\'extension', + 'Do you really want to remove this plugin: "%s"?' => 'Voulez-vous vraiment supprimer cette extension : « %s » ?', + 'Uninstall' => 'Désinstaller', + 'Listing' => 'Listing', + 'Metadata' => 'Metadonnées', + 'Manage projects' => 'Gérer les projets', + 'Convert to task' => 'Convertir en tâche', + 'Convert sub-task to task' => 'Convertir une sous-tâche en tâche', + 'Do you really want to convert this sub-task to a task?' => 'Voulez-vous vraiment convertir cette sous-tâche en tâche ?', + 'My task title' => 'Mon titre pour la tâche', + 'Enter one task by line.' => 'Entrez une tâche par ligne.', + 'Number of failed login:' => 'Nombre de connexion échouées :', + 'Account locked until:' => 'Compte bloqué jusqu\'au :', + 'Email settings' => 'Paramètres des emails', + 'Email sender address' => 'Adresse email de l\'expéditeur', + 'Email transport' => 'Transport des emails', + 'Webhook token' => 'Jeton de sécurité des webhooks', + 'Imports' => 'Importations', + 'Project tags management' => 'Gestion des libellés pour le projet', + 'Tag created successfully.' => 'Libellé créé avec succès.', + 'Unable to create this tag.' => 'Imposssible de créer ce libellé.', + 'Tag updated successfully.' => 'Libellé mis à jour avec succès.', + 'Unable to update this tag.' => 'Impossible de mettre à jour ce libellé.', + 'Tag removed successfully.' => 'Libellé supprimé avec succès.', + 'Unable to remove this tag.' => 'Impossible de supprimer ce libellé.', + 'Global tags management' => 'Gestion des libellés globaux', + 'Tags' => 'Libellés', + 'Tags management' => 'Gestion des libellés', + 'Add new tag' => 'Ajouter un nouveau libellé', + 'Edit a tag' => 'Mettre à jour un libellé', + 'Project tags' => 'Libellés du projet', + 'There is no specific tag for this project at the moment.' => 'Il n\'y a aucun libellé spécifique pour ce projet pour le moment.', + 'Tag' => 'Libellé', + 'Remove a tag' => 'Supprimer un libellé', + 'Do you really want to remove this tag: "%s"?' => 'Voulez-vous vraiment supprimer ce libellé : « %s » ?', + 'Global tags' => 'Libellés globaux', + 'There is no global tag at the moment.' => 'Il n\'y a aucun libellé global pour le moment.', + 'This field cannot be empty' => 'Ce champ ne peut être vide', ); diff --git a/sources/app/Locale/hu_HU/translations.php b/sources/app/Locale/hu_HU/translations.php index f642a6c..c80c0a2 100644 --- a/sources/app/Locale/hu_HU/translations.php +++ b/sources/app/Locale/hu_HU/translations.php @@ -19,23 +19,22 @@ return array( 'Red' => 'Piros', 'Orange' => 'Narancs', 'Grey' => 'Szürke', - // 'Brown' => '', - // 'Deep Orange' => '', - // 'Dark Grey' => '', - // 'Pink' => '', - // 'Teal' => '', - // 'Cyan' => '', - // 'Lime' => '', - // 'Light Green' => '', - // 'Amber' => '', + 'Brown' => 'Barna', + 'Deep Orange' => 'Sötét narancs', + 'Dark Grey' => 'Sötét szürke', + 'Pink' => 'Rózsaszín', + 'Teal' => 'Pávakék', + 'Cyan' => 'Ciánkék', + 'Lime' => 'Lime', + 'Light Green' => 'Világos zöld', + 'Amber' => 'Borostyán', 'Save' => 'Mentés', 'Login' => 'Bejelentkezés', 'Official website:' => 'Hivatalos honlap:', 'Unassigned' => 'Nincs felelős', 'View this task' => 'Feladat megtekintése', 'Remove user' => 'Felhasználó törlése', - 'Do you really want to remove this user: "%s"?' => 'Tényleg törli ezt a felhasználót: "%s"?', - 'New user' => 'Új felhasználó', + 'Do you really want to remove this user: "%s"?' => 'Valóban törölni akarja ezt a felhasználót: "%s"?', 'All users' => 'Minden felhasználó', 'Username' => 'Felhasználónév', 'Password' => 'Jelszó', @@ -96,7 +95,7 @@ return array( 'Create another task' => 'Új feladat létrehozása', 'New task' => 'Új feladat', 'Open a task' => 'Feladat felnyitás', - 'Do you really want to open this task: "%s"?' => 'Tényleg meg akarja nyitni ezt a feladatot: "%s"?', + 'Do you really want to open this task: "%s"?' => 'Valóban meg akarja nyitni ezt a feladatot: "%s"?', 'Back to the board' => 'Vissza a táblához', 'There is nobody assigned' => 'Nincs felelős', 'Column on the board:' => 'Tábla oszlopa: ', @@ -154,9 +153,7 @@ return array( 'Id' => 'ID', '%d closed tasks' => '%d lezárt feladat', 'No task for this project' => 'Nincs feladat ebben a projektben', - 'Public link' => 'Nyilvános link', - 'Change assignee' => 'Felelős módosítása', - 'Change assignee for the task "%s"' => 'Feladat felelősének módosítása: "%s"', + 'Public link' => 'Nyilvános hivatkozás', 'Timezone' => 'Időzóna', 'Sorry, I didn\'t find this information in my database!' => 'Ez az információ nem található az adatbázisban!', 'Page not found' => 'Az oldal nem található', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Írjon leírást ...', 'Comment added successfully.' => 'Hozzászólás sikeresen elküldve.', 'Unable to create your comment.' => 'Hozzászólás létrehozása nem lehetséges.', - 'Edit this task' => 'Feladat módosítása', 'Due Date' => 'Határidő', 'Invalid date' => 'Érvénytelen dátum', 'Automatic actions' => 'Automatikus intézkedések', @@ -203,7 +199,7 @@ return array( 'Position' => 'Pozíció', 'Duplicate to another project' => 'Másolás másik projektbe', 'Duplicate' => 'Másolás', - 'link' => 'link', + 'link' => 'hivatkozás', 'Comment updated successfully.' => 'Megjegyzés sikeresen frissítve.', 'Unable to update your comment.' => 'Megjegyzés frissítése sikertelen.', 'Remove a comment' => 'Megjegyzés törlése', @@ -235,10 +231,10 @@ return array( '%d comments' => '%d megjegyzés', '%d comment' => '%d megjegyzés', 'Email address invalid' => 'Érvénytelen e-mail cím', - // 'Your external account is not linked anymore to your profile.' => '', - // 'Unable to unlink your external account.' => '', - // 'External authentication failed' => '', - // 'Your external account is linked to your profile successfully.' => '', + 'Your external account is not linked anymore to your profile.' => 'Az ön külső számlája és az ön profilja közötti kapcsolat megszűnt.', + 'Unable to unlink your external account.' => 'Nem sikerült megszüntetni a kapcsolatot az ön külső számlájával.', + 'External authentication failed' => 'A külső jelszó ellenőrzés nem sikerült', + 'Your external account is linked to your profile successfully.' => 'Az ön külső számlája sikeresen össze lett kapcsolva az ön profiljával.', 'Email' => 'E-mail', 'Task removed successfully.' => 'Feladat sikeresen törölve.', 'Unable to remove this task.' => 'A feladatot nem lehet törölni.', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategória', 'Category:' => 'Kategória:', 'Categories' => 'Kategóriák', - 'Category not found.' => 'Kategória nem található.', 'Your category have been created successfully.' => 'Kategória sikeresen létrehozva.', 'Unable to create your category.' => 'A kategória létrehozása nem lehetséges.', 'Your category have been updated successfully.' => 'Kategória sikeresen frissítve.', @@ -269,10 +264,9 @@ return array( 'Unable to remove this file.' => 'Fájl törlése nem lehetséges.', 'File removed successfully.' => 'Fájl sikeresen törölve.', 'Attach a document' => 'Fájl csatolása', - 'Do you really want to remove this file: "%s"?' => 'Valóban törölni akarja a fájlt: "%s"?', + 'Do you really want to remove this file: "%s"?' => 'Valóban törölni akarja ezt a fájlt: "%s"?', 'Attachments' => 'Mellékletek', 'Edit the task' => 'Feladat módosítása', - 'Edit the description' => 'Leírás szerkesztése', 'Add a comment' => 'Új megjegyzés', 'Edit a comment' => 'Megjegyzés szerkesztése', 'Summary' => 'Összegzés', @@ -343,8 +337,8 @@ return array( 'Disable public access' => 'Nyilvános hozzáférés letiltása', 'Enable public access' => 'Nyilvános hozzáférés engedélyezése', 'Public access disabled' => 'Nyilvános hozzáférés letiltva', - 'Do you really want to disable this project: "%s"?' => 'Tényleg szeretné letiltani ezt a projektet: "%s"', - 'Do you really want to enable this project: "%s"?' => 'Tényleg szeretné engedélyezni ezt a projektet: "%s"', + 'Do you really want to disable this project: "%s"?' => 'Tényleg szeretné letiltani ezt a projektet: "%s"?', + 'Do you really want to enable this project: "%s"?' => 'Tényleg szeretné engedélyezni ezt a projektet: "%s"?', 'Project activation' => 'Projekt aktiválás', 'Move the task to another project' => 'Feladat áthelyezése másik projektbe', 'Move to another project' => 'Áthelyezés másik projektbe', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'A külső azonosítás nincs engedélyezve.', 'Password modified successfully.' => 'A jelszó sikeresen módosítva.', 'Unable to change the password.' => 'A jelszó módosítása sikertelen.', - 'Change category for the task "%s"' => 'Feladat kategória módosítása "%s"', 'Change category' => 'Kategória módosítása', '%s updated the task %s' => '%s frissítette a feladatot %s', '%s opened the task %s' => '%s megnyitott a feladatot %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Kanboard információ', 'Database driver:' => 'Adatbázis motor:', 'Board settings' => 'Tábla beállítások', - 'URL and token' => 'URL és tokenek', 'Webhook settings' => 'Webhook beállítások', - 'URL for task creation:' => 'Feladat létrehozás URL:', 'Reset token' => 'Token újragenerálása', 'API endpoint:' => 'API végpont:', 'Refresh interval for private board' => 'Privát táblák frissítési intervalluma', @@ -473,30 +464,29 @@ return array( 'This value is required' => 'Ez a mező kötelező', 'This value must be numeric' => 'Ez a mező csak szám lehet', 'Unable to create this task.' => 'A feladat nem hozható létre,', - 'Cumulative flow diagram' => 'Kumulatív Flow Diagram', - 'Cumulative flow diagram for "%s"' => 'Kumulatív Flow Diagram: %s', + 'Cumulative flow diagram' => 'Kumulatív folyamatábra', + 'Cumulative flow diagram for "%s"' => 'Kumulatív folyamatábra: %s', 'Daily project summary' => 'Napi projektösszefoglaló', 'Daily project summary export' => 'Napi projektösszefoglaló exportálása', 'Daily project summary export for "%s"' => 'Napi projektösszefoglaló exportálása: %s', 'Exports' => 'Exportálások', 'This export contains the number of tasks per column grouped per day.' => 'Ez az export tartalmazza a feladatok számát oszloponként összesítve, napokra lebontva.', - 'Active swimlanes' => 'Aktív folyamatok', - 'Add a new swimlane' => 'Új folyamat', - 'Change default swimlane' => 'Alapértelmezett folyamat változtatás', + 'Active swimlanes' => 'Aktív sávok', + 'Add a new swimlane' => 'Új sáv', + 'Change default swimlane' => 'Alapértelmezett sáv megváltoztatása', 'Default swimlane' => 'Alapértelmezett folyamat', - 'Do you really want to remove this swimlane: "%s"?' => 'Valóban törli a folyamatot:%s ?', - 'Inactive swimlanes' => 'Inaktív folyamatok', - 'Remove a swimlane' => 'Folyamat törlés', - 'Show default swimlane' => 'Alapértelmezett folyamat megjelenítése', - 'Swimlane modification for the project "%s"' => '%s projekt folyamatainak módosítása', - 'Swimlane not found.' => 'Folyamat nem található', - 'Swimlane removed successfully.' => 'Folyamat sikeresen törölve.', - 'Swimlanes' => 'Folyamatok', - 'Swimlane updated successfully.' => 'Folyamat sikeresn frissítve', - 'The default swimlane have been updated successfully.' => 'Az alapértelmezett folyamat sikeresen frissítve.', - 'Unable to remove this swimlane.' => 'A folyamat törlése sikertelen.', - 'Unable to update this swimlane.' => 'A folyamat frissítése sikertelen.', - 'Your swimlane have been created successfully.' => 'A folyamat sikeresen létrehozva.', + 'Do you really want to remove this swimlane: "%s"?' => 'Valóban törölni akarja ezt a sávot: %s ?', + 'Inactive swimlanes' => 'Inaktív sávok', + 'Remove a swimlane' => 'Sáv törlés', + 'Show default swimlane' => 'Alapértelmezett sáv megjelenítése', + 'Swimlane modification for the project "%s"' => '%s projekt sávjainak módosítása', + 'Swimlane removed successfully.' => 'Sáv sikeresen törölve.', + 'Swimlanes' => 'Sávok', + 'Swimlane updated successfully.' => 'Sáv sikeresen frissítve', + 'The default swimlane have been updated successfully.' => 'Az alapértelmezett sáv sikeresen frissítve.', + 'Unable to remove this swimlane.' => 'A sáv törlése sikertelen.', + 'Unable to update this swimlane.' => 'A sáv frissítése sikertelen.', + 'Your swimlane have been created successfully.' => 'A sáv sikeresen létrehozva.', 'Example: "Bug, Feature Request, Improvement"' => 'Például: Hiba, Új funkció, Fejlesztés', 'Default categories for new projects (Comma-separated)' => 'Alapértelmezett kategóriák az új projektekben (Vesszővel elválasztva)', 'Integrations' => 'Integráció', @@ -514,10 +504,9 @@ return array( 'Calendar' => 'Naptár', 'Next' => 'Következő', '#%d' => '#%d', - 'All swimlanes' => 'Minden folyamat', + 'All swimlanes' => 'Minden sáv', 'All colors' => 'Minden szín', 'Moved to column %s' => '%s oszlopba áthelyezve', - 'Change description' => 'Leírás szerkesztés', 'User dashboard' => 'Felhasználói vezérlőpult', 'Allow only one subtask in progress at the same time for a user' => 'Egyszerre csak egy folyamatban levő részfeladat engedélyezése a felhasználóknak', 'Edit column "%s"' => 'Oszlop szerkesztés: %s', @@ -527,7 +516,7 @@ return array( 'Time Tracking' => 'Idő követés', 'You already have one subtask in progress' => 'Már van egy folyamatban levő részfeladata', 'Which parts of the project do you want to duplicate?' => 'A projekt mely részeit szeretné másolni?', - // 'Disallow login form' => '', + 'Disallow login form' => 'A login ablak letiltása', 'Start' => 'Kezdet', 'End' => 'Vég', 'Task age in days' => 'Feladat életkora napokban', @@ -544,7 +533,7 @@ return array( 'Link modification' => 'Hivatkozás módosítás', 'Links' => 'Hivatkozások', 'Link settings' => 'Hivatkozás beállítasok', - 'Opposite label' => 'Ellenekező címke', + 'Opposite label' => 'Ellenkező címke', 'Remove a link' => 'Hivatkozás törlése', 'Task\'s links' => 'Feladat hivatkozások', 'The labels must be different' => 'A címkék nem lehetnek azonosak', @@ -585,7 +574,7 @@ return array( 'AUD - Australian Dollar' => 'AUD - Ausztrál dollár', 'CAD - Canadian Dollar' => 'CAD - Kanadai dollár', 'CHF - Swiss Francs' => 'CHF - Svájci frank', - 'Custom Stylesheet' => 'Egyéni sítluslap', + 'Custom Stylesheet' => 'Egyéni stíluslap', 'download' => 'letöltés', 'EUR - Euro' => 'EUR - Euro', 'GBP - British Pound' => 'GBP - Angol font', @@ -593,564 +582,638 @@ return array( 'JPY - Japanese Yen' => 'JPY - Japán Yen', 'NZD - New Zealand Dollar' => 'NZD - Új-Zélandi dollár', 'RSD - Serbian dinar' => 'RSD - Szerb dínár', - 'USD - US Dollar' => 'USD - Amerikai ollár', + 'USD - US Dollar' => 'USD - Amerikai dollár', 'Destination column' => 'Cél oszlop', 'Move the task to another column when assigned to a user' => 'Feladat másik oszlopba helyezése felhasználóhoz rendélés után', 'Move the task to another column when assignee is cleared' => 'Feladat másik oszlopba helyezése felhasználóhoz rendélés törlésekor', 'Source column' => 'Forrás oszlop', - // 'Transitions' => '', - // 'Executer' => '', - // 'Time spent in the column' => '', - // 'Task transitions' => '', - // 'Task transitions export' => '', - // 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => '', - // 'Currency rates' => '', - // 'Rate' => '', - // 'Change reference currency' => '', - // 'Add a new currency rate' => '', - // 'Reference currency' => '', - // 'The currency rate have been added successfully.' => '', - // 'Unable to add this currency rate.' => '', - // 'Webhook URL' => '', - // '%s remove the assignee of the task %s' => '', - // 'Enable Gravatar images' => '', - // 'Information' => '', - // 'Check two factor authentication code' => '', - // 'The two factor authentication code is not valid.' => '', - // 'The two factor authentication code is valid.' => '', - // 'Code' => '', - // 'Two factor authentication' => '', - // 'This QR code contains the key URI: ' => '', - // 'Check my code' => '', - // 'Secret key: ' => '', - // 'Test your device' => '', - // 'Assign a color when the task is moved to a specific column' => '', - // '%s via Kanboard' => '', + 'Transitions' => 'Állapot-átmenetek', + 'Executer' => 'Végrehajtó', + 'Time spent in the column' => 'Az oszlopban töltött idő', + 'Task transitions' => 'Feladat állapot-átmenetek', + 'Task transitions export' => 'Feladat állapot-átmenetek exportálása', + 'This report contains all column moves for each task with the date, the user and the time spent for each transition.' => 'Ez a riport az összes feladatra vonatkozóan tartalmazza az oszlop mozgatásokat. Szerepel benne a dátum, a felhasználó neve, és az egyes állapot-átemenetekkel eltöltött idő.', + 'Currency rates' => 'Árfolyamok', + 'Rate' => 'Árfolyam', + 'Change reference currency' => 'A bázis pénznem megváltoztatása', + 'Add a new currency rate' => 'Új átváltási árfolyam megadása', + 'Reference currency' => 'Bázis pénznem', + 'The currency rate have been added successfully.' => 'Az átváltási árfolyammal történő bővítés sikerült', + 'Unable to add this currency rate.' => 'Nem sikerült az átváltási árfolyam felvétele', + 'Webhook URL' => 'Webhook URL', + '%s remove the assignee of the task %s' => '%s eltávolította a %s feladathoz rendelt személyt', + 'Enable Gravatar images' => 'Gravatár képek engedélyezése', + 'Information' => 'Információ', + 'Check two factor authentication code' => 'Két fázisú beléptető kód ellenőrzése', + 'The two factor authentication code is not valid.' => 'A két fázisú beléptető kód érvénytelen', + 'The two factor authentication code is valid.' => 'A két fázisú beléptető kód érvényes', + 'Code' => 'Kód', + 'Two factor authentication' => 'Két fázisú beléptetés', + 'This QR code contains the key URI: ' => 'Ez a QR kód a következő kulcs URI-t tartalmazza: ', + 'Check my code' => 'A kódom ellenőrzése', + 'Secret key: ' => 'Titkos kulcs', + 'Test your device' => 'Az eszköz ellenőrzése', + 'Assign a color when the task is moved to a specific column' => 'Szín hozzárendelése, ha a feladatot egy adott oszlopba mozgatták', + '%s via Kanboard' => '%s a Kanboard-on keresztül', // 'Burndown chart for "%s"' => '', // 'Burndown chart' => '', - // 'This chart show the task complexity over the time (Work Remaining).' => '', - // 'Screenshot taken %s' => '', - // 'Add a screenshot' => '', - // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '', - // 'Screenshot uploaded successfully.' => '', - // 'SEK - Swedish Krona' => '', - // 'Identifier' => '', - // 'Disable two factor authentication' => '', - // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', - // 'Edit link' => '', - // 'Start to type task title...' => '', - // 'A task cannot be linked to itself' => '', - // 'The exact same link already exists' => '', - // 'Recurrent task is scheduled to be generated' => '', - // 'Score' => '', - // 'The identifier must be unique' => '', - // 'This linked task id doesn\'t exists' => '', - // 'This value must be alphanumeric' => '', - // 'Edit recurrence' => '', - // 'Generate recurrent task' => '', - // 'Trigger to generate recurrent task' => '', - // 'Factor to calculate new due date' => '', - // 'Timeframe to calculate new due date' => '', - // 'Base date to calculate new due date' => '', - // 'Action date' => '', - // 'Base date to calculate new due date: ' => '', - // 'This task has created this child task: ' => '', - // 'Day(s)' => '', - // 'Existing due date' => '', - // 'Factor to calculate new due date: ' => '', - // 'Month(s)' => '', - // 'Recurrence' => '', - // 'This task has been created by: ' => '', - // 'Recurrent task has been generated:' => '', - // 'Timeframe to calculate new due date: ' => '', - // 'Trigger to generate recurrent task: ' => '', - // 'When task is closed' => '', - // 'When task is moved from first column' => '', - // 'When task is moved to last column' => '', - // 'Year(s)' => '', - // 'Calendar settings' => '', - // 'Project calendar view' => '', - // 'Project settings' => '', - // 'Show subtasks based on the time tracking' => '', - // 'Show tasks based on the creation date' => '', - // 'Show tasks based on the start date' => '', - // 'Subtasks time tracking' => '', - // 'User calendar view' => '', - // 'Automatically update the start date' => '', + 'This chart show the task complexity over the time (Work Remaining).' => 'Ez a diagram a feladat időbeli bonyolultságát ábrázolja (mennyi munka van hátra)', + 'Screenshot taken %s' => 'A képernyőmentés megtörtént, %s', + 'Add a screenshot' => 'Képernyőmentés hozzáadása', + 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Végezzen képernyőmentést, majd a CTRL+V vagy ⌘+V megnyomásával másolja be ide.', + 'Screenshot uploaded successfully.' => 'A képernyőmentés feltöltése sikeresen megtörtént.', + 'SEK - Swedish Krona' => 'SEK - Svéd korona', + 'Identifier' => 'Azonosító', + 'Disable two factor authentication' => 'A kétfázisú beléptetés letiltása', + 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Valóban le akarja tiltani a kétfázisú beléptetést ennél a felhasználónál: "%s"?', + 'Edit link' => 'Hivatkozás szerkesztése', + 'Start to type task title...' => 'Kezdje el begépelni a feladat címét... ', + 'A task cannot be linked to itself' => 'Egy feladatot nem lehet önmagához kapcsolni', + 'The exact same link already exists' => 'Már létezik pontosan ugyanez a hivatkozás', + 'Recurrent task is scheduled to be generated' => 'Az ismétlődő feladat előállítása ütemezve lett', + 'Score' => 'Pontszám', + 'The identifier must be unique' => 'Egyedi azonosító szükséges', + 'This linked task id doesn\'t exists' => 'Ez a hivatkozott feladat nem létezik', + 'This value must be alphanumeric' => 'Alfanumerikus érték szükséges', + 'Edit recurrence' => 'Ismétlődés szerkesztése', + 'Generate recurrent task' => 'Ismétlődő feladat előállítása', + 'Trigger to generate recurrent task' => 'Az ismétlődő feladatot előállító trigger', + 'Factor to calculate new due date' => 'Az új határidő kiszámításához használt tényező', + 'Timeframe to calculate new due date' => 'Az új határidő kiszámításához használt időablak', + 'Base date to calculate new due date' => 'A határidő kiszámításához használt kezdő dátum', + 'Action date' => 'Intézkedés dátuma', + 'Base date to calculate new due date: ' => 'Az új határidő kiszámításához használt kezdő dátum: ', + 'This task has created this child task: ' => 'Ez a feladat a következő leszármazott feladatot hozta létre: ', + 'Day(s)' => 'Nap(ok)', + 'Existing due date' => 'A jelenlegi határidő', + 'Factor to calculate new due date: ' => 'Az új határidő kiszámításához használt tényező: ', + 'Month(s)' => 'Hónap(ok)', + 'Recurrence' => 'Ismétlődés', + 'This task has been created by: ' => 'Ezt a feladatot a következő személy hozta létre: ', + 'Recurrent task has been generated:' => 'Ismétlődő feladat lett létrehozva: ', + 'Timeframe to calculate new due date: ' => 'Az új határidő kiszámításához használt időablak: ', + 'Trigger to generate recurrent task: ' => 'Az ismétlődő feladatot előállító trigger: ', + 'When task is closed' => 'Mikor a feladat be lett zárva', + 'When task is moved from first column' => 'Mikor a feladat az első oszlopból el lett mozgatva', + 'When task is moved to last column' => 'Mikor a feladat az utolsó oszlopba lett elmozgatva', + 'Year(s)' => 'Év(ek)', + 'Calendar settings' => 'Naptár beállítások', + 'Project calendar view' => 'A projekt megjelenítése naptári formában', + 'Project settings' => 'Projekt beállítások', + 'Show subtasks based on the time tracking' => 'A részfeladatok megjelenítése az idő nyomkövetés alapján', + 'Show tasks based on the creation date' => 'A feladatok megjelenítése a létrehozás dátuma alapján', + 'Show tasks based on the start date' => 'A feladatok megjelenítése a kezdő dátum alapján', + 'Subtasks time tracking' => 'A részfeladatok idejének megjelenítése', + 'User calendar view' => 'A felhasználó naptárának megjelenítése', + 'Automatically update the start date' => 'A kezdő dátum automatikus módosítása', // 'iCal feed' => '', - // 'Preferences' => '', - // 'Security' => '', - // 'Two factor authentication disabled' => '', - // 'Two factor authentication enabled' => '', - // 'Unable to update this user.' => '', - // 'There is no user management for private projects.' => '', - // 'User that will receive the email' => '', - // 'Email subject' => '', - // 'Date' => '', - // 'Add a comment log when moving the task between columns' => '', - // 'Move the task to another column when the category is changed' => '', - // 'Send a task by email to someone' => '', - // 'Reopen a task' => '', - // 'Column change' => '', - // 'Position change' => '', - // 'Swimlane change' => '', - // 'Assignee change' => '', - // '[%s] Overdue tasks' => '', - // 'Notification' => '', - // '%s moved the task #%d to the first swimlane' => '', - // '%s moved the task #%d to the swimlane "%s"' => '', - // 'Swimlane' => '', - // 'Gravatar' => '', - // '%s moved the task %s to the first swimlane' => '', - // '%s moved the task %s to the swimlane "%s"' => '', - // 'This report contains all subtasks information for the given date range.' => '', - // 'This report contains all tasks information for the given date range.' => '', - // 'Project activities for %s' => '', - // 'view the board on Kanboard' => '', - // 'The task have been moved to the first swimlane' => '', - // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', - // 'New title: %s' => '', - // 'The task is not assigned anymore' => '', - // 'New assignee: %s' => '', - // 'There is no category now' => '', - // 'New category: %s' => '', - // 'New color: %s' => '', - // 'New complexity: %d' => '', - // 'The due date have been removed' => '', - // 'There is no description anymore' => '', - // 'Recurrence settings have been modified' => '', - // 'Time spent changed: %sh' => '', - // 'Time estimated changed: %sh' => '', - // 'The field "%s" have been updated' => '', - // 'The description has been modified:' => '', - // 'Do you really want to close the task "%s" as well as all subtasks?' => '', - // 'I want to receive notifications for:' => '', - // 'All tasks' => '', - // 'Only for tasks assigned to me' => '', - // 'Only for tasks created by me' => '', - // 'Only for tasks created by me and assigned to me' => '', - // '%%Y-%%m-%%d' => '', - // 'Total for all columns' => '', - // 'You need at least 2 days of data to show the chart.' => '', - // '<15m' => '', - // '<30m' => '', - // 'Stop timer' => '', - // 'Start timer' => '', - // 'Add project member' => '', - // 'Enable notifications' => '', - // 'My activity stream' => '', - // 'My calendar' => '', - // 'Search tasks' => '', - // 'Reset filters' => '', - // 'My tasks due tomorrow' => '', - // 'Tasks due today' => '', - // 'Tasks due tomorrow' => '', - // 'Tasks due yesterday' => '', - // 'Closed tasks' => '', - // 'Open tasks' => '', - // 'Not assigned' => '', - // 'View advanced search syntax' => '', - // 'Overview' => '', - // 'Board/Calendar/List view' => '', - // 'Switch to the board view' => '', - // 'Switch to the calendar view' => '', - // 'Switch to the list view' => '', - // 'Go to the search/filter box' => '', - // 'There is no activity yet.' => '', - // 'No tasks found.' => '', - // 'Keyboard shortcut: "%s"' => '', - // 'List' => '', - // 'Filter' => '', - // 'Advanced search' => '', - // 'Example of query: ' => '', - // 'Search by project: ' => '', - // 'Search by column: ' => '', - // 'Search by assignee: ' => '', - // 'Search by color: ' => '', - // 'Search by category: ' => '', - // 'Search by description: ' => '', - // 'Search by due date: ' => '', - // 'Lead and Cycle time for "%s"' => '', - // 'Average time spent into each column for "%s"' => '', - // 'Average time spent into each column' => '', - // 'Average time spent' => '', - // 'This chart show the average time spent into each column for the last %d tasks.' => '', - // 'Average Lead and Cycle time' => '', - // 'Average lead time: ' => '', - // 'Average cycle time: ' => '', - // 'Cycle Time' => '', - // 'Lead Time' => '', - // 'This chart show the average lead and cycle time for the last %d tasks over the time.' => '', - // 'Average time into each column' => '', - // 'Lead and cycle time' => '', - // 'Lead time: ' => '', - // 'Cycle time: ' => '', - // 'Time spent into each column' => '', - // 'The lead time is the duration between the task creation and the completion.' => '', - // 'The cycle time is the duration between the start date and the completion.' => '', - // 'If the task is not closed the current time is used instead of the completion date.' => '', - // 'Set automatically the start date' => '', - // 'Edit Authentication' => '', - // 'Remote user' => '', - // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '', - // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '', - // 'New remote user' => '', - // 'New local user' => '', - // 'Default task color' => '', - // 'This feature does not work with all browsers.' => '', - // 'There is no destination project available.' => '', - // 'Trigger automatically subtask time tracking' => '', - // 'Include closed tasks in the cumulative flow diagram' => '', - // 'Current swimlane: %s' => '', - // 'Current column: %s' => '', - // 'Current category: %s' => '', - // 'no category' => '', - // 'Current assignee: %s' => '', - // 'not assigned' => '', - // 'Author:' => '', - // 'contributors' => '', - // 'License:' => '', - // 'License' => '', - // 'Enter the text below' => '', - // 'Gantt chart for %s' => '', - // 'Sort by position' => '', - // 'Sort by date' => '', - // 'Add task' => '', - // 'Start date:' => '', - // 'Due date:' => '', - // 'There is no start date or due date for this task.' => '', - // 'Moving or resizing a task will change the start and due date of the task.' => '', - // 'There is no task in your project.' => '', - // 'Gantt chart' => '', - // 'People who are project managers' => '', - // 'People who are project members' => '', - // 'NOK - Norwegian Krone' => '', - // 'Show this column' => '', - // 'Hide this column' => '', - // 'open file' => '', - // 'End date' => '', - // 'Users overview' => '', - // 'Members' => '', - // 'Shared project' => '', - // 'Project managers' => '', - // 'Gantt chart for all projects' => '', - // 'Projects list' => '', - // 'Gantt chart for this project' => '', - // 'Project board' => '', - // 'End date:' => '', - // 'There is no start date or end date for this project.' => '', - // 'Projects Gantt chart' => '', - // 'Change task color when using a specific task link' => '', - // 'Task link creation or modification' => '', - // 'Milestone' => '', - // 'Documentation: %s' => '', - // 'Switch to the Gantt chart view' => '', - // 'Reset the search/filter box' => '', - // 'Documentation' => '', - // 'Table of contents' => '', - // 'Gantt' => '', - // 'Author' => '', - // 'Version' => '', - // 'Plugins' => '', - // 'There is no plugin loaded.' => '', - // 'Set maximum column height' => '', - // 'Remove maximum column height' => '', - // 'My notifications' => '', - // 'Custom filters' => '', - // 'Your custom filter have been created successfully.' => '', - // 'Unable to create your custom filter.' => '', - // 'Custom filter removed successfully.' => '', - // 'Unable to remove this custom filter.' => '', - // 'Edit custom filter' => '', - // 'Your custom filter have been updated successfully.' => '', - // 'Unable to update custom filter.' => '', - // 'Web' => '', - // 'New attachment on task #%d: %s' => '', - // 'New comment on task #%d' => '', - // 'Comment updated on task #%d' => '', - // 'New subtask on task #%d' => '', - // 'Subtask updated on task #%d' => '', - // 'New task #%d: %s' => '', - // 'Task updated #%d' => '', - // 'Task #%d closed' => '', - // 'Task #%d opened' => '', - // 'Column changed for task #%d' => '', - // 'New position for task #%d' => '', - // 'Swimlane changed for task #%d' => '', - // 'Assignee changed on task #%d' => '', - // '%d overdue tasks' => '', - // 'Task #%d is overdue' => '', - // 'No new notifications.' => '', - // 'Mark all as read' => '', - // 'Mark as read' => '', - // 'Total number of tasks in this column across all swimlanes' => '', - // 'Collapse swimlane' => '', - // 'Expand swimlane' => '', - // 'Add a new filter' => '', - // 'Share with all project members' => '', - // 'Shared' => '', - // 'Owner' => '', - // 'Unread notifications' => '', - // 'Notification methods:' => '', - // 'Import tasks from CSV file' => '', - // 'Unable to read your file' => '', - // '%d task(s) have been imported successfully.' => '', - // 'Nothing have been imported!' => '', - // 'Import users from CSV file' => '', - // '%d user(s) have been imported successfully.' => '', + 'Preferences' => 'Preferenciák', + 'Security' => 'Biztonság', + 'Two factor authentication disabled' => 'A két fázisú beléptetés tiltva van', + 'Two factor authentication enabled' => 'A két fázisú beléptetés engedélyezve van', + 'Unable to update this user.' => 'A felhasználó {adatainak} módosítása nem sikerült.', + 'There is no user management for private projects.' => 'A privát projektek esetén nincs felhasználó kezelés', + 'User that will receive the email' => 'Az email-t a következő felhaszáló fogja megkapni', + 'Email subject' => 'Email tárgy', + 'Date' => 'Dátum', + 'Add a comment log when moving the task between columns' => 'Egy napló megjegyzés létrehozása a feladat oszlopok közötti mozgatásakor', + 'Move the task to another column when the category is changed' => 'A feladat átmozgatása egy másik oszlopba, ha megváltozik a kategória', + 'Send a task by email to someone' => 'Email-en egy feladat küldése valakinek', + 'Reopen a task' => 'Egy feladat újbóli megnyitása', + 'Column change' => 'Oszlop módosítás', + 'Position change' => 'Helyzet módosítás', + 'Swimlane change' => 'Sáv módosítás', + 'Assignee change' => 'Felelős módosítása', + '[%s] Overdue tasks' => '[%s] késésben lévő feladat', + 'Notification' => 'Értesítés', + '%s moved the task #%d to the first swimlane' => '%s a #%d feladatot az első sávba mozgatta', + '%s moved the task #%d to the swimlane "%s"' => '%s a #%d feladatot a "%s" sávba mozgatta', + 'Swimlane' => 'Sáv', + 'Gravatar' => 'Gravatár', + '%s moved the task %s to the first swimlane' => '%s a %s feladatot az első sávba mozgatta', + '%s moved the task %s to the swimlane "%s"' => '%s a %s feladatot a "%s" sávba mozgatta', + 'This report contains all subtasks information for the given date range.' => 'Ez a riport az adott dátumtartományra vonatkozón az összes részfeladatot tartalmazza', + 'This report contains all tasks information for the given date range.' => 'Ez a riport az adott dátumtartományra vonatkozóan az összes feladatot tartalmazza', + 'Project activities for %s' => '%s projekt tevékenységei', + 'view the board on Kanboard' => 'a tábla megjelenítése a Kanboard-on', + 'The task have been moved to the first swimlane' => 'A feladat ez első sávba lett elmozgatva', + 'The task have been moved to another swimlane:' => 'A feladat egy másik sávba lett elmozgatva', + 'New title: %s' => 'Új cím: %s', + 'The task is not assigned anymore' => 'A feladatnak már nincs felelőse', + 'New assignee: %s' => 'Az új felelős: %s', + 'There is no category now' => 'Jelenleg nincs kategória', + 'New category: %s' => 'Az új kategória: %s', + 'New color: %s' => 'Az új szín: %s', + 'New complexity: %d' => 'Az új bonyolultság: %d', + 'The due date have been removed' => 'A határidő törölve lett', + 'There is no description anymore' => 'Többé már nincs leírás', + 'Recurrence settings have been modified' => 'Az ismétlődés beállításai módosultak', + 'Time spent changed: %sh' => 'Módosult a ráfordított idő: %s óra', + 'Time estimated changed: %sh' => 'Módosult az időbecslés: %s óra', + 'The field "%s" have been updated' => 'A "%s" mező módosítva lett', + 'The description has been modified:' => 'A leírás módosítva lett:', + 'Do you really want to close the task "%s" as well as all subtasks?' => 'Valóban be akarja zárni a "%s" feladatot, valamint a hozzá tartozó részfeladatokat?', + 'I want to receive notifications for:' => 'Értesítéseket szeretnék kapni a következőkről:', + 'All tasks' => 'Az összes feladat', + 'Only for tasks assigned to me' => 'Csak a hozzám rendelt feladatok', + 'Only for tasks created by me' => 'Csak az általam létrehozott feladatok', + 'Only for tasks created by me and assigned to me' => 'Csak az általam lérehozott és a hozzám rendelt feladatok', + '%%Y-%%m-%%d' => '%%Y-%%m-%%d', + 'Total for all columns' => 'Az összes oszlop összege', + 'You need at least 2 days of data to show the chart.' => 'Legalább 2 nap adatára van szükség az ábra megjelenítéséshez', + '<15m' => '15p', + '<30m' => '30p', + 'Stop timer' => 'Időmérő leállítása', + 'Start timer' => 'Időmérő elindítása', + 'Add project member' => 'Projekt tag hozzáadása', + 'My activity stream' => 'Tevékenységem', + 'My calendar' => 'Naptáram', + 'Search tasks' => 'Feladatok közötti keresés', + 'Reset filters' => 'Szűrő alaphelyzetbe állítás', + 'My tasks due tomorrow' => 'Holnapi határidejű feladataim', + 'Tasks due today' => 'Mai határidejű feladatok', + 'Tasks due tomorrow' => 'Holnapi határidejű feladatok', + 'Tasks due yesterday' => 'Tegnapi határidejű feladatok', + 'Closed tasks' => 'Lezárt feladatok', + 'Open tasks' => 'Nyitott feladatok', + 'Not assigned' => 'Nincs felelős', + 'View advanced search syntax' => 'Részletes keresés megjelenítése', + 'Overview' => 'Áttekintés', + 'Board/Calendar/List view' => 'Tábla/Naptár/Lista nézet', + 'Switch to the board view' => 'Átkapcsolás tábla nézetbe', + 'Switch to the calendar view' => 'Átkapcsolás naptár nézetbe', + 'Switch to the list view' => 'Átkapcsolás lista nézetbe', + 'Go to the search/filter box' => 'Ugrás a keresés/szűrés dobozhoz', + 'There is no activity yet.' => 'Még nincs tevékenység', + 'No tasks found.' => 'Nincs feladat.', + 'Keyboard shortcut: "%s"' => 'Billentyű parancsok: "%s"', + 'List' => 'Lista', + 'Filter' => 'Szűrő', + 'Advanced search' => 'Keresés haladóknak', + 'Example of query: ' => 'Lekérdezési példa: ', + 'Search by project: ' => 'Keresés projekt alapján: ', + 'Search by column: ' => 'Keresés oszlop alapján: ', + 'Search by assignee: ' => 'Keresés felelős alapján: ', + 'Search by color: ' => 'Keresés szín alapján: ', + 'Search by category: ' => 'Keresés kategória alapján: ', + 'Search by description: ' => 'Keresés leírás alapján: ', + 'Search by due date: ' => 'Keresés határidő alapján: ', + 'Lead and Cycle time for "%s"' => 'A "%s" átfutási ideje és ciklusideje', + 'Average time spent into each column for "%s"' => 'A "%s" során az egyes oszlopokban töltött átlagos idő', + 'Average time spent into each column' => 'Az egyes oszlopokban töltött átlagos idő', + 'Average time spent' => 'Az eltöltött átlagos idő', + 'This chart show the average time spent into each column for the last %d tasks.' => 'Ez az ábra az utolsó %d feladatra vonatkozóan mutatja az egyes oszlopkban eltöltött átlagos időt.', + 'Average Lead and Cycle time' => 'Átlagos átfutási idő és ciklusidő', + 'Average lead time: ' => 'Átlagos átfutási idő: ', + 'Average cycle time: ' => 'Átlagos ciklusidő: ', + 'Cycle Time' => 'Ciklusidő', + 'Lead Time' => 'Átfutási idő', + 'This chart show the average lead and cycle time for the last %d tasks over the time.' => 'Ez az ábra az utolsó %d feladatra vonatkozóan mutatja az átlagos átfutási időt és ciklusidőt az idő függvényében.', + 'Average time into each column' => 'Az egyes oszlopokban töltött átlagos idő', + 'Lead and cycle time' => 'Átfutási és ciklusidő', + 'Lead time: ' => 'Átfutási idő: ', + 'Cycle time: ' => 'Ciklusidő: ', + 'Time spent into each column' => 'Az egyes oszlopokban töltött idő', + 'The lead time is the duration between the task creation and the completion.' => 'Az átfutási idő a feladat létrehozása és befejezése között eltelt idő.', + 'The cycle time is the duration between the start date and the completion.' => 'A ciklusidő a feladat elkezdése és befejezése közötti eltelt idő.', + 'If the task is not closed the current time is used instead of the completion date.' => 'Ha a feladat még nincs lezárva, akkor befejezés ideje helyett az aktuális idő lesz használva.', + 'Set automatically the start date' => 'A kezdési idő automatikus beállítása', + 'Edit Authentication' => 'A beléptetés szerkesztése', + 'Remote user' => 'Távoli felhasználó', + 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'A távoli felhasználók jelszava nem a Kanboard adatbázisban van tárolva. Példák: LDAP, Google és GitHub számlák.', + 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Ha bekattintja a "Bejelentkezési ablak tiltása" jelölőnégyzetet, akkor a login ablakban megadott jelszó nem lesz figyelembe véve.', + 'New remote user' => 'Új távoli felhasználó', + 'New local user' => 'Új helyi felhasználó', + 'Default task color' => 'A feladathoz rendelt alapszín', + 'This feature does not work with all browsers.' => 'Ez a jellemző nem minden böngészőben működik.', + 'There is no destination project available.' => 'Nincs ilyen cél projekt.', + 'Trigger automatically subtask time tracking' => 'A részfeladatok időfelhasználas-követésének automatikus indítása', + 'Include closed tasks in the cumulative flow diagram' => 'A lezárt feladatok szerepeltetáse az összesített folyamatábrán', + 'Current swimlane: %s' => 'Aktuális sáv: %s', + 'Current column: %s' => 'Aktuális oszlop: %s', + 'Current category: %s' => 'Aktuális kategória: %s', + 'no category' => 'nincs kategória', + 'Current assignee: %s' => 'Aktuális felelős: %s', + 'not assigned' => 'nincs kijelölt felelős', + 'Author:' => 'Szerző:', + 'contributors' => 'bedolgozók', + 'License:' => 'Engedély:', + 'License' => 'Engedély', + 'Enter the text below' => 'Adja be a lenti szöveget', + 'Gantt chart for %s' => 'Gantt diagram a %s számára', + 'Sort by position' => 'Rendezés hely szerint', + 'Sort by date' => 'Rendezés idő szerint', + 'Add task' => 'Feladat hozzáadása', + 'Start date:' => 'Kezdés ideje: ', + 'Due date:' => 'Határidő: ', + 'There is no start date or due date for this task.' => 'Ehhez a feladathoz nem adtak meg kezdési időt vagy határidőt.', + 'Moving or resizing a task will change the start and due date of the task.' => 'A feladat elmozgatása vagy méretének megváltoztatása meg fogja változtatni a feladat kezdési idejét és határidejét.', + 'There is no task in your project.' => 'Az ön projektjében nincsenek feladatok.', + 'Gantt chart' => 'Gantt diagram', + 'People who are project managers' => 'Projekt vezetők', + 'People who are project members' => 'Projekt tagok', + 'NOK - Norwegian Krone' => 'NOK - Norvég korona', + 'Show this column' => 'Oszlop mutatása', + 'Hide this column' => 'Oszlop elrejtése', + 'open file' => 'fájl megnyitás', + 'End date' => 'Végdátum', + 'Users overview' => 'Felhasználók áttekintése', + 'Members' => 'Tagok', + 'Shared project' => 'Közös projekt', + 'Project managers' => 'Projektvezetők', + 'Gantt chart for all projects' => 'Gantt diagram az összes projektre vonatkozóan', + 'Projects list' => 'Projekt lista', + 'Gantt chart for this project' => 'Gantt diagram erre a projektre vonatkozóan', + 'Project board' => 'Projekt tábla', + 'End date:' => 'Befejezés dátuma: ', + 'There is no start date or end date for this project.' => 'Ennél a projektnél nem adták meg a kezdés és a befejezés dátumát.', + 'Projects Gantt chart' => 'A projektek Gantt diagramja', + 'Change task color when using a specific task link' => 'Az egyes specifikus feladat hivatkozások használatakor a feladat színének megváltoztatása', + 'Task link creation or modification' => 'Feladat hivatkozás létrehozása vagy módosítása', + 'Milestone' => 'Mérföldkő', + 'Documentation: %s' => 'Dokumentáció: %s', + 'Switch to the Gantt chart view' => 'Átkapcsolás a Gantt diagram nézetre', + 'Reset the search/filter box' => 'A keresés/szűrés doboz alaphelyzetbe állítása', + 'Documentation' => 'Dokumentáció', + 'Table of contents' => 'Tartalomjegyzék', + 'Gantt' => 'Gantt', + 'Author' => 'Szerző', + 'Version' => 'Verzió', + 'Plugins' => 'Plugin-ek', + 'There is no plugin loaded.' => 'Nincs betöltött plugin.', + 'Set maximum column height' => 'Max. oszlopmagasság beállítása', + 'Remove maximum column height' => 'Max. oszlopmagasság törlése', + 'My notifications' => 'Emlékeztetőim', + 'Custom filters' => 'Egyedi szűrők', + 'Your custom filter have been created successfully.' => 'Az ön egyedi szűrője sikeresen létrejött.', + 'Unable to create your custom filter.' => 'Nem sikerült létrehozni az ön egyedi szűrőjét.', + 'Custom filter removed successfully.' => 'Az egyedi szűrő sikeresen törölve lett.', + 'Unable to remove this custom filter.' => 'Nem sikerült egy egyedi szűrő törlése.', + 'Edit custom filter' => 'Egyedi szűrő szerkesztése', + 'Your custom filter have been updated successfully.' => 'Az ön egyedi szűrője sikeresen módosult.', + 'Unable to update custom filter.' => 'Nem sikerült az egyedi szűrő módosítása', + 'Web' => 'Web (háló)', + 'New attachment on task #%d: %s' => 'A #%d számú feladatnak új melléklete van: %s', + 'New comment on task #%d' => 'A #%d számú feladatnak új megjegyzése van', + 'Comment updated on task #%d' => 'A #%d szűmú feladathoz tartozó megjegyzés módosult', + 'New subtask on task #%d' => 'A #%d számú feladatnak új részfeladata van', + 'Subtask updated on task #%d' => 'A #%d számú feladat részfeladata módosult', + 'New task #%d: %s' => 'Új #%d számú feladat: %s', + 'Task updated #%d' => 'A #%d számú feladat módosult', + 'Task #%d closed' => 'A #%d számú feladat le lett zárva', + 'Task #%d opened' => 'A #%d számú feladat meg lett nyitva', + 'Column changed for task #%d' => 'A #%d számú feladat oszlopa módosult', + 'New position for task #%d' => 'A #%d számú feladat új helyre került', + 'Swimlane changed for task #%d' => 'A #%d számú feladat új sávba került', + 'Assignee changed on task #%d' => 'A #%d számú feladat felelőse megváltozott', + '%d overdue tasks' => '%d db feladatnál van határidő túllépés', + 'Task #%d is overdue' => 'A #%d számú feladat határideje lejárt', + 'No new notifications.' => 'Nincs új emlékeztető.', + 'Mark all as read' => 'Az összes megjelölése olvasottként', + 'Mark as read' => 'Megjelölés olvasottként', + 'Total number of tasks in this column across all swimlanes' => 'Az ebben az oszlopban, az összes sávban lévő feladatok száma', + 'Collapse swimlane' => 'Sáv összecsukása', + 'Expand swimlane' => 'Sáv lenyitása', + 'Add a new filter' => 'Új szűrő hozzáadása', + 'Share with all project members' => 'Megosztás minden projekt taggal', + 'Shared' => 'Megosztva', + 'Owner' => 'Tulajdonos', + 'Unread notifications' => 'Olvasatlan értesítések', + 'Notification methods:' => 'Értesítési módszerek:', + 'Import tasks from CSV file' => 'Feladatok beolvasása CSV fájlból', + 'Unable to read your file' => 'A fájl nem olvasható', + '%d task(s) have been imported successfully.' => '%d feladat sikeresen feldolgozva.', + 'Nothing have been imported!' => 'Nem történt beolvasás!', + 'Import users from CSV file' => 'Felhasználók importálása CSV fájlból', + '%d user(s) have been imported successfully.' => '%d felhasználó sikeresen importálva.', // 'Comma' => '', // 'Semi-colon' => '', // 'Tab' => '', // 'Vertical bar' => '', // 'Double Quote' => '', // 'Single Quote' => '', - // '%s attached a file to the task #%d' => '', - // 'There is no column or swimlane activated in your project!' => '', - // 'Append filter (instead of replacement)' => '', - // 'Append/Replace' => '', - // 'Append' => '', - // 'Replace' => '', - // 'Import' => '', - // 'change sorting' => '', - // 'Tasks Importation' => '', + '%s attached a file to the task #%d' => '%s hozzákapcsolt a #%d feladathoz egy fájlt', + 'There is no column or swimlane activated in your project!' => 'Az ön projektjében nincs aktív oszlop vagy sáv!', + 'Append filter (instead of replacement)' => 'Szűrő hozzáfűzése (a helyettesítés helyett)', + 'Append/Replace' => 'Hozzáfűzés/Helyettesítés', + 'Append' => 'Hozzáfűz', + 'Replace' => 'Helyettesít', + 'Import' => 'Importál', + 'change sorting' => 'rendezési sorrend megváltoztatása', + 'Tasks Importation' => 'Feladat importálás', // 'Delimiter' => '', // 'Enclosure' => '', - // 'CSV File' => '', - // 'Instructions' => '', - // 'Your file must use the predefined CSV format' => '', - // 'Your file must be encoded in UTF-8' => '', - // 'The first row must be the header' => '', - // 'Duplicates are not verified for you' => '', - // 'The due date must use the ISO format: YYYY-MM-DD' => '', - // 'Download CSV template' => '', - // 'No external integration registered.' => '', - // 'Duplicates are not imported' => '', - // 'Usernames must be lowercase and unique' => '', - // 'Passwords will be encrypted if present' => '', - // '%s attached a new file to the task %s' => '', - // 'Link type' => '', - // 'Assign automatically a category based on a link' => '', - // 'BAM - Konvertible Mark' => '', - // 'Assignee Username' => '', - // 'Assignee Name' => '', - // 'Groups' => '', - // 'Members of %s' => '', - // 'New group' => '', - // 'Group created successfully.' => '', - // 'Unable to create your group.' => '', - // 'Edit group' => '', - // 'Group updated successfully.' => '', - // 'Unable to update your group.' => '', - // 'Add group member to "%s"' => '', - // 'Group member added successfully.' => '', - // 'Unable to add group member.' => '', - // 'Remove user from group "%s"' => '', - // 'User removed successfully from this group.' => '', - // 'Unable to remove this user from the group.' => '', - // 'Remove group' => '', - // 'Group removed successfully.' => '', - // 'Unable to remove this group.' => '', - // 'Project Permissions' => '', - // 'Manager' => '', - // 'Project Manager' => '', - // 'Project Member' => '', - // 'Project Viewer' => '', - // 'Your account is locked for %d minutes' => '', - // 'Invalid captcha' => '', - // 'The name must be unique' => '', - // 'View all groups' => '', - // 'View group members' => '', - // 'There is no user available.' => '', - // 'Do you really want to remove the user "%s" from the group "%s"?' => '', - // 'There is no group.' => '', - // 'External Id' => '', - // 'Add group member' => '', - // 'Do you really want to remove this group: "%s"?' => '', - // 'There is no user in this group.' => '', - // 'Remove this user' => '', - // 'Permissions' => '', - // 'Allowed Users' => '', - // 'No user have been allowed specifically.' => '', - // 'Role' => '', - // 'Enter user name...' => '', - // 'Allowed Groups' => '', - // 'No group have been allowed specifically.' => '', - // 'Group' => '', - // 'Group Name' => '', - // 'Enter group name...' => '', - // 'Role:' => '', - // 'Project members' => '', - // 'Compare hours for "%s"' => '', - // '%s mentioned you in the task #%d' => '', - // '%s mentioned you in a comment on the task #%d' => '', - // 'You were mentioned in the task #%d' => '', - // 'You were mentioned in a comment on the task #%d' => '', - // 'Mentioned' => '', - // 'Compare Estimated Time vs Actual Time' => '', - // 'Estimated hours: ' => '', - // 'Actual hours: ' => '', - // 'Hours Spent' => '', - // 'Hours Estimated' => '', - // 'Estimated Time' => '', - // 'Actual Time' => '', - // 'Estimated vs actual time' => '', - // 'RUB - Russian Ruble' => '', - // 'Assign the task to the person who does the action when the column is changed' => '', - // 'Close a task in a specific column' => '', - // 'Time-based One-time Password Algorithm' => '', - // 'Two-Factor Provider: ' => '', - // 'Disable two-factor authentication' => '', - // 'Enable two-factor authentication' => '', - // 'There is no integration registered at the moment.' => '', - // 'Password Reset for Kanboard' => '', - // 'Forgot password?' => '', - // 'Enable "Forget Password"' => '', - // 'Password Reset' => '', - // 'New password' => '', - // 'Change Password' => '', - // 'To reset your password click on this link:' => '', - // 'Last Password Reset' => '', - // 'The password has never been reinitialized.' => '', - // 'Creation' => '', - // 'Expiration' => '', - // 'Password reset history' => '', - // 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => '', - // 'Do you really want to close all tasks of this column?' => '', - // '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '', - // 'Close all tasks of this column' => '', - // 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => '', - // 'My dashboard' => '', - // 'My profile' => '', - // 'Project owner: ' => '', - // 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => '', - // 'Project owner' => '', - // 'Those dates are useful for the project Gantt chart.' => '', - // 'Private projects do not have users and groups management.' => '', - // 'There is no project member.' => '', - // 'Priority' => '', - // 'Task priority' => '', - // 'General' => '', - // 'Dates' => '', - // 'Default priority' => '', - // 'Lowest priority' => '', - // 'Highest priority' => '', - // 'If you put zero to the low and high priority, this feature will be disabled.' => '', - // 'Close a task when there is no activity' => '', - // 'Duration in days' => '', - // 'Send email when there is no activity on a task' => '', - // 'Unable to fetch link information.' => '', - // 'Daily background job for tasks' => '', - // 'Auto' => '', - // 'Related' => '', - // 'Attachment' => '', - // 'Title not found' => '', - // 'Web Link' => '', - // 'External links' => '', - // 'Add external link' => '', - // 'Type' => '', - // 'Dependency' => '', - // 'Add internal link' => '', - // 'Add a new external link' => '', - // 'Edit external link' => '', - // 'External link' => '', - // 'Copy and paste your link here...' => '', - // 'URL' => '', - // 'Internal links' => '', - // 'Assign to me' => '', - // 'Me' => '', - // 'Do not duplicate anything' => '', - // 'Projects management' => '', - // 'Users management' => '', - // 'Groups management' => '', - // 'Create from another project' => '', - // 'open' => '', - // 'closed' => '', - // 'Priority:' => '', - // 'Reference:' => '', - // 'Complexity:' => '', - // 'Swimlane:' => '', - // 'Column:' => '', - // 'Position:' => '', - // 'Creator:' => '', - // 'Time estimated:' => '', - // '%s hours' => '', - // 'Time spent:' => '', - // 'Created:' => '', - // 'Modified:' => '', - // 'Completed:' => '', - // 'Started:' => '', - // 'Moved:' => '', - // 'Task #%d' => '', - // 'Date and time format' => '', - // 'Time format' => '', - // 'Start date: ' => '', - // 'End date: ' => '', - // 'New due date: ' => '', - // 'Start date changed: ' => '', - // 'Disable private projects' => '', - // 'Do you really want to remove this custom filter: "%s"?' => '', - // 'Remove a custom filter' => '', - // 'User activated successfully.' => '', - // 'Unable to enable this user.' => '', - // 'User disabled successfully.' => '', - // 'Unable to disable this user.' => '', - // 'All files have been uploaded successfully.' => '', - // 'View uploaded files' => '', - // 'The maximum allowed file size is %sB.' => '', - // 'Choose files again' => '', - // 'Drag and drop your files here' => '', - // 'choose files' => '', - // 'View profile' => '', - // 'Two Factor' => '', - // 'Disable user' => '', - // 'Do you really want to disable this user: "%s"?' => '', - // 'Enable user' => '', - // 'Do you really want to enable this user: "%s"?' => '', - // 'Download' => '', - // 'Uploaded: %s' => '', - // 'Size: %s' => '', - // 'Uploaded by %s' => '', - // 'Filename' => '', - // 'Size' => '', - // 'Column created successfully.' => '', - // 'Another column with the same name exists in the project' => '', - // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', - // 'Change column position' => '', - // 'Switch to the project overview' => '', - // 'User filters' => '', - // 'Category filters' => '', - // 'Upload a file' => '', - // 'View file' => '', - // 'Last activity' => '', - // 'Change subtask position' => '', - // 'This value must be greater than %d' => '', - // 'Another swimlane with the same name exists in the project' => '', - // 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => '', - // 'Actions duplicated successfully.' => '', - // 'Unable to duplicate actions.' => '', - // 'Add a new action' => '', - // 'Import from another project' => '', - // 'There is no action at the moment.' => '', - // 'Import actions from another project' => '', - // 'There is no available project.' => '', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'CSV File' => 'CSV fájl', + 'Instructions' => 'Utasítások', + 'Your file must use the predefined CSV format' => 'A fájlnak az előre definiált CSV formátumot kell használnia', + 'Your file must be encoded in UTF-8' => 'A fájlnak UTF-8 karakterkódolást kell használnia', + 'The first row must be the header' => 'Az első sor kötelezően a fejléc', + 'Duplicates are not verified for you' => 'Az ismétlődések nincsenek ellenőrizve.', + 'The due date must use the ISO format: YYYY-MM-DD' => 'A határidőt ISO formátumban kell megadni: YYYY-MM-DD', + 'Download CSV template' => 'A CSV minta (template) letöltése', + 'No external integration registered.' => 'Nincs külső integráció regisztrálva.', + 'Duplicates are not imported' => 'Az ismétlődő értékek nem lesznek beimportálva', + 'Usernames must be lowercase and unique' => 'A felhasználói nevekre kötelező, hogy kisbetűsek és egyediek legyenek', + 'Passwords will be encrypted if present' => 'A jelszavak titkosítva lesznek', + '%s attached a new file to the task %s' => '%s a %s feladathoz egy új fájlt kapcsolt hozzá', + 'Link type' => 'Hivatkozás típus', + 'Assign automatically a category based on a link' => 'A hivatkozás alapján kategória automatikus hozzárendelése', + 'BAM - Konvertible Mark' => 'BAM - Konvertibilis márka', + 'Assignee Username' => 'A felelős felhasználói neve', + 'Assignee Name' => 'A felelős neve', + 'Groups' => 'Csoportok', + 'Members of %s' => 'A %s tagjai', + 'New group' => 'Új csoport', + 'Group created successfully.' => 'A csoport sikeresen létrejött.', + 'Unable to create your group.' => 'Nem sikerült a csoport létrehozása.', + 'Edit group' => 'Csoport szerkesztése', + 'Group updated successfully.' => 'A csoport módosítása sikeresen megtörtént', + 'Unable to update your group.' => 'Nem sikerült a csoport módosítása', + 'Add group member to "%s"' => 'Csoport tag hozzáadáasa "%s"-hez', + 'Group member added successfully.' => 'Tag hozzáadás sikeresen megtörtént', + 'Unable to add group member.' => 'Nem sikerült a tagot hozzáadni a csoporthoz.', + 'Remove user from group "%s"' => 'Felhasználó eltávolítása a "%s" csoportból', + 'User removed successfully from this group.' => 'A felhasználó sikeresen el lett távolítva a csoportból.', + 'Unable to remove this user from the group.' => 'Nem sikerült a felhasználó eltávolítása a csoportból', + 'Remove group' => 'Csoport törlése', + 'Group removed successfully.' => 'A csoport törlése sikeresen megtörtént.', + 'Unable to remove this group.' => 'Nem sikerült a csoport törlése.', + 'Project Permissions' => 'Projekt engedélyek', + 'Manager' => 'Vezető', + 'Project Manager' => 'Projekt vezető', + 'Project Member' => 'Projekt tag', + 'Project Viewer' => 'Projekt megtekintés', + 'Your account is locked for %d minutes' => 'Az ön számlája %d percre zárolva lett.', + 'Invalid captcha' => 'Érvénytelen captcha', + 'The name must be unique' => 'A névnek egyedinek kell lennie', + 'View all groups' => 'Az összes csoport megtekintése', + 'View group members' => 'A csoporttagok megtekintése', + 'There is no user available.' => 'Nincs ilyen felhasználó.', + 'Do you really want to remove the user "%s" from the group "%s"?' => 'Valóban el kívánja távolítani a "%s" felhasználót a "%s" csoportból?', + 'There is no group.' => 'Nincs ilyen csoport.', + 'External Id' => 'Külső azonosító', + 'Add group member' => 'Csoporttag hozzáadása', + 'Do you really want to remove this group: "%s"?' => 'Valóban törölni kívánja ezt a csoportot: "%s"?', + 'There is no user in this group.' => 'Nincs egy felhasználó sem ebben a csoportban.', + 'Remove this user' => 'A felhasználó eltávolítása', + 'Permissions' => 'Engedélyek', + 'Allowed Users' => 'Megengedett felhasználók', + 'No user have been allowed specifically.' => 'Egyedileg semelyik felhasználó sem lett engedélyezve.', + 'Role' => 'Szerepkör', + 'Enter user name...' => 'Adja be a felhasználó nevét...', + 'Allowed Groups' => 'Megengedett csoportok', + 'No group have been allowed specifically.' => 'Egyedileg semelyik csoport sem lett engedélyezve.', + 'Group' => 'Csoport', + 'Group Name' => 'Csoport név', + 'Enter group name...' => 'Adja meg a csoport nevét...', + 'Role:' => 'Szerepkör:', + 'Project members' => 'Projekt tagok', + 'Compare hours for "%s"' => 'Az órák összehasonlítása "%s" számára', + '%s mentioned you in the task #%d' => '%s megemlítette önt a #%d feladatban', + '%s mentioned you in a comment on the task #%d' => '%s megemlítette önt a #%d feladathoz fűzött megjegyzésben', + 'You were mentioned in the task #%d' => 'Ön meg lett említve a #%d feladatban', + 'You were mentioned in a comment on the task #%d' => 'Ön meg lett említve a #%d feladathoz fűzött megjegyzésben', + 'Mentioned' => 'Meg lett említve', + 'Compare Estimated Time vs Actual Time' => 'A becsült és a tényleges idő összehasonlítása', + 'Estimated hours: ' => 'Becsült órák: ', + 'Actual hours: ' => 'Tényleges órák: ', + 'Hours Spent' => 'Ráfordítás órákban', + 'Hours Estimated' => 'Becsült idő órákban', + 'Estimated Time' => 'Becsült idő', + 'Actual Time' => 'Tényleges idő', + 'Estimated vs actual time' => 'Becsült idő ill. tényleges idő', + 'RUB - Russian Ruble' => 'RUB - Orosz rubel', + 'Assign the task to the person who does the action when the column is changed' => 'A feladat hozzárendelése ahhoz a személyhez, aki az oszlop megváltoztatásakor intézkedik', + 'Close a task in a specific column' => 'A megadott oszlopban lévő feladat lezárása', + 'Time-based One-time Password Algorithm' => 'Idő alapú, egyszer használható jelszó algoritmus', + 'Two-Factor Provider: ' => 'Két tényezős bejelentkezés szolgáltatója', + 'Disable two-factor authentication' => 'Két tényezős bejelentkezés tiltása', + 'Enable two-factor authentication' => 'Két tényezős bejelentkezés engedélyezése', + 'There is no integration registered at the moment.' => 'Jelenleg nincs regisztrált integráció.', + 'Password Reset for Kanboard' => 'Jelszó alaphelyzetbe állítása', + 'Forgot password?' => 'Elfelejtett jelszó?', + 'Enable "Forget Password"' => '"Elfelejtett jelszó" engedélyezése', + 'Password Reset' => 'Jelszó alaphelyzetbe állíása', + 'New password' => 'Új jelszó', + 'Change Password' => 'Jelszó megváltoztatása', + 'To reset your password click on this link:' => 'A jelszó megváltoztatásáshoz kattintson erre a hivatkozásra', + 'Last Password Reset' => 'Jelszó alaphelyzetbe állítás utoljára ekkor', + 'The password has never been reinitialized.' => 'A jelszó soha sem lett alaphelyzetbe állítva.', + 'Creation' => 'Létrehozás', + 'Expiration' => 'Lejárat', + 'Password reset history' => 'A jelszó alaphelyzetbe állítás története', + 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => 'A "%s" oszlophoz és a "%s" sávhoz tartozó összes feladat sikeresen le lett zárva.', + 'Do you really want to close all tasks of this column?' => 'Valóban le kívánja zárni az oszlophoz tartozó összes feladatot?', + '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '%d feladat lesz lezárva, ezek a "%s" oszlopban és a "%s" sávban vannak.', + 'Close all tasks of this column' => 'Az oszlophoz tartozó összes feladat lezárása', + 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => 'Egy plugin sem regisztrált projekt értesítési módszert. Egyedi értesítések még mindig beállíthatók a felhasználói profilban.', + 'My dashboard' => 'Az én dashboard-om', + 'My profile' => 'Az én profilom', + 'Project owner: ' => 'A projekt tulajdonosa: ', + 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => 'A projekt azonosító opcionális, és kötelezően alfanumerikus karakterekből áll, pl: MYPROJECT.', + 'Project owner' => 'Projekt tulajdonos', + 'Those dates are useful for the project Gantt chart.' => 'Ezek a dátumok a projekt Gantt diagramjához hasznosak.', + 'Private projects do not have users and groups management.' => 'A privát projektekhez nem tartozik felhasználó kezelés és csoport kezelés.', + 'There is no project member.' => 'A projektnek nincs tagja.', + 'Priority' => 'Prioritás', + 'Task priority' => 'Feladat prioritás', + 'General' => 'Általános', + 'Dates' => 'Dátumok', + 'Default priority' => 'Alap prioritás', + 'Lowest priority' => 'Legalacsonyabb prioritás', + 'Highest priority' => 'Legmagasabb prioritás', + 'If you put zero to the low and high priority, this feature will be disabled.' => 'Ha nullát ad meg a legalacsonyabb és legmagasabb prioritásként, akkor ez a jellemző letiltásra kerül.', + 'Close a task when there is no activity' => 'A feladat lezárása, ha nincs tevékenység', + 'Duration in days' => 'Hossz napokban', + 'Send email when there is no activity on a task' => 'email küldése, ha egy feladathoz nincs tevékenység', + 'Unable to fetch link information.' => 'A hivatkozás adatainak sikertelen beolvasása', + 'Daily background job for tasks' => 'A feladatokhoz tartozó napi háttér munkák', + 'Auto' => 'Automatikus', + 'Related' => 'Kapcsolódó', + 'Attachment' => 'Csatolmány', + 'Title not found' => 'Nincs ilyen cím', + 'Web Link' => 'Web hivatkozás', + 'External links' => 'Külső hivatkozások', + 'Add external link' => 'Külső hivatkozás hozzáadása', + 'Type' => 'Típus', + 'Dependency' => 'Függőség', + 'Add internal link' => 'Belső hivatkozás hozzáadása', + 'Add a new external link' => 'Új külső hivatkozás hozzáadása', + 'Edit external link' => 'Külső hivatkozás szerkesztése', + 'External link' => 'Külső hivatkozás', + 'Copy and paste your link here...' => 'Másold be a hivatkozást ide...', + 'URL' => 'URL', + 'Internal links' => 'Belső hivatkozások', + 'Assign to me' => 'Rendeld hozzám', + 'Me' => 'Hozzám', + 'Do not duplicate anything' => 'Semmit se duplázz meg', + 'Projects management' => 'Projekt kezelés', + 'Users management' => 'Felhasználók kezelése', + 'Groups management' => 'Csoportok kezelése', + 'Create from another project' => 'Létrehozás egy másik projektből', + 'open' => 'nyitva', + 'closed' => 'zárva', + 'Priority:' => 'Prioritás:', + 'Reference:' => 'Hivatkozás:', + 'Complexity:' => 'Komplexitás:', + 'Swimlane:' => 'Sáv:', + 'Column:' => 'Oszlop:', + 'Position:' => 'Pozíció:', + 'Creator:' => 'Létrehozó:', + 'Time estimated:' => 'Becsült idő:', + '%s hours' => '%s óra', + 'Time spent:' => 'Eltelt idő:', + 'Created:' => 'Létrehozva:', + 'Modified:' => 'Módosítva:', + 'Completed:' => 'Elkészült:', + 'Started:' => 'Elindult:', + 'Moved:' => 'Elmozgatva:', + 'Task #%d' => '#%d. feladat', + 'Date and time format' => 'Dátum és idő formátum', + 'Time format' => 'Idő formátum', + 'Start date: ' => 'Kezdő datum: ', + 'End date: ' => 'Vég dátum: ', + 'New due date: ' => 'Új határidő: ', + 'Start date changed: ' => 'Kezdő dátum megváltozott: ', + 'Disable private projects' => 'Privát projektek tiltása', + 'Do you really want to remove this custom filter: "%s"?' => 'Valóban el kívánja távolítani ezt az egyedi szűrőt: "%s"?', + 'Remove a custom filter' => 'Egyedi szűrő eltávolítása', + 'User activated successfully.' => 'A felhasználó sikeresen aktiválva lett.', + 'Unable to enable this user.' => 'Nem sikerült a felhasználó engedélyezése.', + 'User disabled successfully.' => 'A felhaszáló sikeresen le lett tiltva.', + 'Unable to disable this user.' => 'Nem sikerült a felhasználó letiltása.', + 'All files have been uploaded successfully.' => 'Az összes fájl sikeresen feltöltődött.', + 'View uploaded files' => 'A feltöltött fájlok megtekintése', + 'The maximum allowed file size is %sB.' => 'A fájl max. megengedett mérete %s bájt', + 'Choose files again' => 'Válasszon újból fájlt', + 'Drag and drop your files here' => 'Fogdd-és-vidd módszerrel dobja ide a fájlt', + 'choose files' => 'válasszon fájlt', + 'View profile' => 'Profil megtekintés', + 'Two Factor' => 'Két tényezős', + 'Disable user' => 'Felhasználó tiltása', + 'Do you really want to disable this user: "%s"?' => 'Valóban le akarja tiltani ezt a felhasználót: "%s"?', + 'Enable user' => 'Felhasználó engedélyezése', + 'Do you really want to enable this user: "%s"?' => 'Valóban engedélyezni akarja ezt a felhasználót: "%s"?', + 'Download' => 'Letöltés', + 'Uploaded: %s' => 'Feltöltve: %s', + 'Size: %s' => 'méret %s', + 'Uploaded by %s' => 'Feltöltve %s által', + 'Filename' => 'Fájlnév', + 'Size' => 'Méret', + 'Column created successfully.' => 'Az oszlop sikeresen létrejött', + 'Another column with the same name exists in the project' => 'A projektben már létezik egy ugyanilyen nevű oszlop', + 'Default filters' => 'Alap szűrők', + 'Your board doesn\'t have any columns!' => 'A táblának nincsenek oszlopai!', + 'Change column position' => 'Oszlop helyzetének megváltoztatása', + 'Switch to the project overview' => 'Projektek áttekintése', + 'User filters' => 'Felhasználók szűrése', + 'Category filters' => 'Kategóriák szűrése', + 'Upload a file' => 'Fájl feltöltése', + 'View file' => 'Fájl megtekintése', + 'Last activity' => 'Utolsó aktivitás', + 'Change subtask position' => 'Részfeladat helyzetének megváltoztatása', + 'This value must be greater than %d' => 'Ennek az értéknek nagyobbnak kell lennie, mint %d', + 'Another swimlane with the same name exists in the project' => 'A projektben létezik egy ugyanilyen nevű másik sáv', + 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Példa: http://example.kanboard.net/ (ez abszolút URL-ek előállítására használható)', + 'Actions duplicated successfully.' => 'A tevékenység sikeresen meg lett duplázva.', + 'Unable to duplicate actions.' => 'A tevékenység megduplázása nem sikerült.', + 'Add a new action' => 'Új tevékenység létrehozása', + 'Import from another project' => 'Importálás egy másik projektből', + 'There is no action at the moment.' => 'Jelenleg nincs egy tevkenység sem.', + 'Import actions from another project' => 'Tevékenységek importálása egy másik projektből', + 'There is no available project.' => 'Nincs rendelkezésre álló projekt.', + 'Local File' => 'Helyi fájl', + 'Configuration' => 'Konfiguráció', + 'PHP version:' => 'PHP verzió:', + 'PHP SAPI:' => 'PHP SAPI:', + 'OS version:' => 'Operációs rendszer verzió:', + 'Database version:' => 'Adatbázis verzió:', + 'Browser:' => 'Böngésző:', + 'Task view' => 'Feladat nézet', + 'Edit task' => 'Feladat szerkesztése', + 'Edit description' => 'Leírás szerkesztése', + 'New internal link' => 'Új belső hivatkozás', + 'Display list of keyboard shortcuts' => 'Billentyű parancsok megjelenítése', + 'Menu' => 'Menü', + 'Set start date' => 'Kezdő időpont beállítása', + 'Avatar' => 'Avatár', + 'Upload my avatar image' => 'Kép feltöltése', + 'Remove my image' => 'Kép törése', + 'The OAuth2 state parameter is invalid' => 'Az OAuth2 állapot paraméter érvénytelen', + 'User not found.' => 'Nincs ilyen felhasználó.', + 'Search in activity stream' => 'Keresés a tevékenységek között', + 'My activities' => 'Tevékenységeim', + 'Activity until yesterday' => 'Tevékenységek tegnapig', + 'Activity until today' => 'Tevékenységek a mai napig', + 'Search by creator: ' => 'Keresés a létrehozó szerint: ', + 'Search by creation date: ' => 'Keresés a létrehozás ideje szerint: ', + 'Search by task status: ' => 'Keresés a feladat állapota szerint: ', + 'Search by task title: ' => 'Keresés a feladat címe szerint: ', + 'Activity stream search' => 'Tevékenységi láncban történő keresés', + 'Projects where "%s" is manager' => 'Azok a projektek, amelyekben "%s" vezető', + 'Projects where "%s" is member' => 'Azok a projektek, amelyekben "%s" tag', + 'Open tasks assigned to "%s"' => '"%s" -hez rendelt nyitott feladatok', + 'Closed tasks assigned to "%s"' => '"%s" -hez rendelt lezárt feladatok', + 'Assign automatically a color based on a priority' => 'A prioritás alapján szín automatikus hozzárendelése', + 'Overdue tasks for the project(s) "%s"' => 'A "%s" projekt(ek)hez tartozó, határidőt túllépő feladatok', + 'Upload files' => 'Fájlok feltöltése', + 'Installed Plugins' => 'Installált plugin-ek', + 'Plugin Directory' => 'Plugin könyvtár', + 'Plugin installed successfully.' => 'A plugin installálása sikerült.', + 'Plugin updated successfully.' => 'A plugin módosítása sikerült.', + 'Plugin removed successfully.' => 'A plugin törlése sikerült.', + 'Subtask converted to task successfully.' => 'Az alfeladat feladattá történő átalakítása sikerült.', + 'Unable to convert the subtask.' => 'Az alfeladat átalakítása nem sikerült.', + 'Unable to extract plugin archive.' => 'A plugin archívum kibontása nem sikerült.', + 'Plugin not found.' => 'A plugin nem található.', + 'You don\'t have the permission to remove this plugin.' => 'Nincs joga ennek a plugin-nek az eltávolításához.', + 'Unable to download plugin archive.' => 'A plugin archívum letöltése nem sikerült.', + 'Unable to write temporary file for plugin.' => 'A plugin-hez nem sikerült egy átmeneti fájl létrehozása.', + 'Unable to open plugin archive.' => 'Nem sikerült a plugin archívum megnyitása.', + 'There is no file in the plugin archive.' => 'A plugin archívumban nincs egyetelen egy fájl sem.', + 'Create tasks in bulk' => 'Feladatok tömeges létrehozása', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'Az Ön Kanboard példánya úgy lett konfigurálva, hogy ne lehessen plugin-eket installálni a felhasználói felületről.', + 'There is no plugin available.' => 'Nem áll plugin rendelkezésre.', + 'Install' => 'Installálás', + 'Update' => 'Módosítás', + 'Up to date' => 'Naprakész', + 'Not available' => 'Nem áll rendelkezésre', + 'Remove plugin' => 'Plugin eltávolítása', + 'Do you really want to remove this plugin: "%s"?' => 'Valóban el kívánja távolítani ezt a plugin-t: "%s"?', + // 'Uninstall' => '', + 'Listing' => 'Listázás', + 'Metadata' => 'Metaadat', + 'Manage projects' => 'Projektek kezelése', + 'Convert to task' => 'Feladattá történő átalakítás', + 'Convert sub-task to task' => 'Alfeladat feladattá történő átalakítása', + 'Do you really want to convert this sub-task to a task?' => 'Valóban feladattá akarja átalakítani ezt az alfeladatot?', + 'My task title' => 'A feladat címe', + 'Enter one task by line.' => 'Minden sorban egy feladatot adjon meg.', + 'Number of failed login:' => 'A sikertelen bejelentkezések száma:', + 'Account locked until:' => 'A számla zárolva a következő időpontig:', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/id_ID/translations.php b/sources/app/Locale/id_ID/translations.php index 3f10505..d377651 100644 --- a/sources/app/Locale/id_ID/translations.php +++ b/sources/app/Locale/id_ID/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Lihat tugas ini', 'Remove user' => 'Hapus pengguna', 'Do you really want to remove this user: "%s"?' => 'Anda yakin akan menghapus pengguna ini : « %s » ?', - 'New user' => 'Pengguna baru', 'All users' => 'Semua pengguna', 'Username' => 'Nama pengguna', 'Password' => 'Kata sandi', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d tugas yang ditutup', 'No task for this project' => 'Tidak ada tugas dalam proyek ini', 'Public link' => 'Tautan publik', - 'Change assignee' => 'Mengubah orang yand ditugaskan', - 'Change assignee for the task "%s"' => 'Mengubah orang yang ditugaskan untuk tugas « %s »', 'Timezone' => 'Zona waktu', 'Sorry, I didn\'t find this information in my database!' => 'Maaf, saya tidak menemukan informasi ini dalam basis data saya !', 'Page not found' => 'Halaman tidak ditemukan', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Tinggalkan deskripsi', 'Comment added successfully.' => 'Komentar berhasil ditambahkan.', 'Unable to create your comment.' => 'Tidak dapat menambahkan komentar anda.', - 'Edit this task' => 'Modifikasi tugas ini', 'Due Date' => 'Batas Tanggal Terakhir', 'Invalid date' => 'Tanggal tidak valid', 'Automatic actions' => 'Tindakan otomatis', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori :', 'Categories' => 'Kategori', - 'Category not found.' => 'Kategori tidak ditemukan', 'Your category have been created successfully.' => 'Kategori anda berhasil dibuat.', 'Unable to create your category.' => 'Tidak dapat membuat kategori anda.', 'Your category have been updated successfully.' => 'Kategori anda berhasil diperbaharui.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Apakah anda yakin akan menghapus berkas ini « %s » ?', 'Attachments' => 'Lampiran', 'Edit the task' => 'Modifikasi tugas', - 'Edit the description' => 'Modifikasi deskripsi', 'Add a comment' => 'Tambahkan komentar', 'Edit a comment' => 'Modifikasi komentar', 'Summary' => 'Ringkasan', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Tidak ada otentifikasi eksternal yang aktif.', 'Password modified successfully.' => 'Kata sandi berhasil dimodifikasi.', 'Unable to change the password.' => 'Tidak dapat merubah kata sandir.', - 'Change category for the task "%s"' => 'Rubah kategori untuk tugas « %s »', 'Change category' => 'Rubah kategori', '%s updated the task %s' => '%s memperbaharui tugas %s', '%s opened the task %s' => '%s membuka tugas %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Tentang', 'Database driver:' => 'Driver basis data :', 'Board settings' => 'Pengaturan papan', - 'URL and token' => 'URL dan token', 'Webhook settings' => 'Pengaturan webhook', - 'URL for task creation:' => 'URL untuk pembuatan tugas :', 'Reset token' => 'Mereset token', 'API endpoint:' => 'API endpoint :', 'Refresh interval for private board' => 'Interval pembaruan untuk papan pribadi', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Supprimer une swimlane', 'Show default swimlane' => 'Perlihatkan standar swimlane', 'Swimlane modification for the project "%s"' => 'Modifikasi swimlane untuk proyek « %s »', - 'Swimlane not found.' => 'Swimlane tidak ditemukan.', 'Swimlane removed successfully.' => 'Swimlane berhasil dihapus.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane berhasil diperbaharui.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Semua swimlane', 'All colors' => 'Semua warna', 'Moved to column %s' => 'Pindah ke kolom %s', - 'Change description' => 'Rubah deskripsi', 'User dashboard' => 'Dasbor pengguna', 'Allow only one subtask in progress at the same time for a user' => 'Izinkan hanya satu subtugas dalam proses secara bersamaan untuk satu pengguna', 'Edit column "%s"' => 'Modifikasi kolom « %s »', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'lihat papan di Kanboard', 'The task have been moved to the first swimlane' => 'Tugas telah dipindahkan ke swimlane pertama', 'The task have been moved to another swimlane:' => 'Tugas telah dipindahkan ke swimlane lain:', - 'Overdue tasks for the project "%s"' => 'Tugas terlambat untuk proyek « %s »', 'New title: %s' => 'Judul baru : %s', 'The task is not assigned anymore' => 'Tugas tidak ditugaskan lagi', 'New assignee: %s' => 'Penerima baru : %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Hentikan timer', 'Start timer' => 'Mulai timer', 'Add project member' => 'Tambahkan anggota proyek', - 'Enable notifications' => 'Aktifkan pemberitahuan', 'My activity stream' => 'Aliran kegiatan saya', 'My calendar' => 'Kalender saya', 'Search tasks' => 'Cari tugas', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/it_IT/translations.php b/sources/app/Locale/it_IT/translations.php index 93ceb03..4ae1419 100644 --- a/sources/app/Locale/it_IT/translations.php +++ b/sources/app/Locale/it_IT/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Visualizza questo task', 'Remove user' => 'Cancella un utente', 'Do you really want to remove this user: "%s"?' => 'Veramente vuoi cancellare questo utente: "%s" ?', - 'New user' => 'Aggiungi un utente', 'All users' => 'Tutti gli utenti', 'Username' => 'Nome utente', 'Password' => 'Password', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d task chiusi', 'No task for this project' => 'Nessun task per questo progetto', 'Public link' => 'Link pubblico', - 'Change assignee' => 'Cambia l\'assegnatario', - 'Change assignee for the task "%s"' => 'Cambia l\'assegnatario per il task "%s"', 'Timezone' => 'Fuso orario', 'Sorry, I didn\'t find this information in my database!' => 'Spiacente, non ho trovato questa informazione sul database!', 'Page not found' => 'Pagina non trovata', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Lascia una descrizione', 'Comment added successfully.' => 'Commenti aggiunti con successo.', 'Unable to create your comment.' => 'Impossibile creare questo commento.', - 'Edit this task' => 'Modifica questo task', 'Due Date' => 'Data di scadenza', 'Invalid date' => 'Data non valida', 'Automatic actions' => 'Azioni automatiche', @@ -250,7 +246,6 @@ return array( 'Category' => 'Categoria', 'Category:' => 'Categoria:', 'Categories' => 'Categorie', - 'Category not found.' => 'Categoria non trovata.', 'Your category have been created successfully.' => 'La tua categoria è stata creata con successo.', 'Unable to create your category.' => 'Impossibile creare la tua categoria.', 'Your category have been updated successfully.' => 'La tua categoria è stata aggiornata con successo.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Vuoi davvero cancellare questo file: "%s"?', 'Attachments' => 'Allegati', 'Edit the task' => 'Modifica il task', - 'Edit the description' => 'Modifica la descrizione', 'Add a comment' => 'Aggiungi un commento', 'Edit a comment' => 'Modifica un commento', 'Summary' => 'Sommario', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Nessuna autenticazione esterna abilitata.', 'Password modified successfully.' => 'Password modificata con successo.', 'Unable to change the password.' => 'Impossibile cambiare la password.', - 'Change category for the task "%s"' => 'Cambia categoria per il task "%s"', 'Change category' => 'Cambia categoria', '%s updated the task %s' => '%s ha aggiornato il task %s', '%s opened the task %s' => '%s ha aperto il task %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Informazioni', 'Database driver:' => 'Driver per Database', 'Board settings' => 'Impostazioni bacheca', - 'URL and token' => 'URL e token', 'Webhook settings' => 'Impostazione Webhook', - 'URL for task creation:' => 'URL per la creazione dei task:', 'Reset token' => 'Rigenera il token', 'API endpoint:' => 'Endpoint dell\'API:', 'Refresh interval for private board' => 'Intervallo di refresh per le bacheche private', @@ -435,7 +426,7 @@ return array( 'Time estimated' => 'Tempo stimato', 'There is nothing assigned to you.' => 'Non c\'è nulla assegnato a te.', 'My tasks' => 'I miei task', - 'Activity stream' => 'Flusso di attività', + 'Activity stream' => 'Flusso attività', 'Dashboard' => 'Bacheca', 'Confirmation' => 'Conferma', 'Allow everybody to access to this project' => 'Abilita tutti ad accedere a questo progetto', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Rimuovi una corsia', 'Show default swimlane' => 'Mostra la corsia predefinita', 'Swimlane modification for the project "%s"' => 'Modifica corsia per il progetto "%s"', - 'Swimlane not found.' => 'Corsia non trovata.', 'Swimlane removed successfully.' => 'Corsia rimossa con successo.', 'Swimlanes' => 'Corsie', 'Swimlane updated successfully.' => 'Corsia aggiornata con successo.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Tutte le corsie', 'All colors' => 'Tutti i colori', 'Moved to column %s' => 'Spostato sulla colonna "%s"', - 'Change description' => 'Cambia descrizione', 'User dashboard' => 'Bacheca utente', 'Allow only one subtask in progress at the same time for a user' => 'Permetti un solo sotto-task in corso per utente alla volta', 'Edit column "%s"' => 'Modifica la colonna "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'guarda la bacheca su Kanboard', 'The task have been moved to the first swimlane' => 'Il task è stato spostato nella prima corsia', 'The task have been moved to another swimlane:' => 'Il task è stato spostato in un\'altra corsia:', - 'Overdue tasks for the project "%s"' => 'Task scaduti per il progetto "%s"', 'New title: %s' => 'Nuovo titolo: %s', 'The task is not assigned anymore' => 'Il task non è più assegnato a nessuno', 'New assignee: %s' => 'Nuovo assegnatario: %s', @@ -738,8 +726,7 @@ return array( 'Stop timer' => 'Ferma il timer', 'Start timer' => 'Avvia il timer', 'Add project member' => 'Aggiungi un membro di progetto', - 'Enable notifications' => 'Abilita notifiche', - 'My activity stream' => 'Il mio flusso di attività', + 'My activity stream' => 'Il mio flusso attività', 'My calendar' => 'Il mio calendario', 'Search tasks' => 'Ricerca task', 'Reset filters' => 'Annulla filtri', @@ -762,7 +749,7 @@ return array( 'Keyboard shortcut: "%s"' => 'Scorciatoia da tastiera: "%s"', 'List' => 'Lista', 'Filter' => 'Filtro', - 'Advanced search' => 'Riceca avanzata', + 'Advanced search' => 'Ricerca avanzata', 'Example of query: ' => 'Esempio di query: ', 'Search by project: ' => 'Ricerca per progetto: ', 'Search by column: ' => 'Ricerca per colonna: ', @@ -833,7 +820,7 @@ return array( 'Users overview' => 'Panoramica utenti', 'Members' => 'Membri', 'Shared project' => 'Progetto condiviso', - 'Project managers' => 'Manager del progetto', + 'Project managers' => 'Manager di progetto', 'Gantt chart for all projects' => 'Grafico Gantt per tutti i progetti', 'Projects list' => 'Elenco progetti', 'Gantt chart for this project' => 'Grafico Gantt per questo progetto', @@ -980,7 +967,7 @@ return array( 'Group Name' => 'Nome del gruppo', 'Enter group name...' => 'Inserisci il nome del gruppo...', 'Role:' => 'Ruolo:', - 'Project members' => 'Membri del progetto', + 'Project members' => 'Membri di progetto', 'Compare hours for "%s"' => 'Confronta le ore per "%s"', '%s mentioned you in the task #%d' => '%s ti ha menzionato nel task #%d', '%s mentioned you in a comment on the task #%d' => '%s ti ha menzionato in un commento del task #%d', @@ -1058,7 +1045,7 @@ return array( // 'URL' => '', 'Internal links' => 'Link interni', 'Assign to me' => 'Assegna a me', - // 'Me' => '', + 'Me' => 'Me stesso', 'Do not duplicate anything' => 'Non duplicare nulla', 'Projects management' => 'Gestione progetti', 'Users management' => 'Gestione utenti', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Colonna creata con successo.', 'Another column with the same name exists in the project' => 'Un\'altra colonna con lo stesso nome è già esistente in questo progetto', 'Default filters' => 'Filtri predefiniti', - 'Your board doesn\'t have any column!' => 'La tua bacheca non ha nessuna colonna!', + 'Your board doesn\'t have any columns!' => 'La tua bacheca non ha nessuna colonna!', 'Change column position' => 'Modifica la posizione della colonna', 'Switch to the project overview' => 'Passa alla panoramica di progetto', 'User filters' => 'Filtri utente', @@ -1128,29 +1115,105 @@ return array( 'This value must be greater than %d' => 'Questo valore deve essere magiore di %d', 'Another swimlane with the same name exists in the project' => 'Un\'altra corsia con lo stesso nome è già esistente in questo progetto', 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Esempio: http://example.kanboard.net/ (usato per generare URL assolute)', - // 'Actions duplicated successfully.' => '', - // 'Unable to duplicate actions.' => '', - // 'Add a new action' => '', - // 'Import from another project' => '', - // 'There is no action at the moment.' => '', - // 'Import actions from another project' => '', - // 'There is no available project.' => '', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', + 'Actions duplicated successfully.' => 'Azioni duplicate con successo.', + 'Unable to duplicate actions.' => 'Impossibile duplicare le azioni.', + 'Add a new action' => 'Aggiungi una nuova azione', + 'Import from another project' => 'Importa da un altro progetto', + 'There is no action at the moment.' => 'Nessuna azione disponibile al momento.', + 'Import actions from another project' => 'Importa azioni da un altro progetto', + 'There is no available project.' => 'Nessun progetto disponibile.', + 'Local File' => 'File locale', + 'Configuration' => 'Configurazione', + 'PHP version:' => 'Versione PHP:', // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', + 'OS version:' => 'Versione OS:', + 'Database version:' => 'Versione database:', // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', + 'Task view' => 'Vista dei task', + 'Edit task' => 'Modifica task', + 'Edit description' => 'Modifica descrizione', + 'New internal link' => 'Nuovo link interno', + 'Display list of keyboard shortcuts' => 'Mostra una lista di scorciatoie da tastiera', // 'Menu' => '', - // 'Set start date' => '', + 'Set start date' => 'Imposta la data di inzio', // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Upload my avatar image' => 'Carica l\'immagine del mio avatar', + 'Remove my image' => 'Rimuovi la mia immagine', + 'The OAuth2 state parameter is invalid' => 'Il parametro di stato OAuth2 non è valido.', + 'User not found.' => 'Utente non trovato.', + 'Search in activity stream' => 'Ricerca nel mio flusso attività', + 'My activities' => 'Le mie attività', + 'Activity until yesterday' => 'Attività ad oggi', + 'Activity until today' => 'Attività fino a ieri', + 'Search by creator: ' => 'Ricerca per creatore: ', + 'Search by creation date: ' => 'Ricerca per data di creazione: ', + 'Search by task status: ' => 'Ricerca per stato del task: ', + 'Search by task title: ' => 'Ricerca per titolo del task: ', + 'Activity stream search' => 'Ricerca nel flusso attività', + 'Projects where "%s" is manager' => 'Progetti all\'interno dei quali "%s" è manager', + 'Projects where "%s" is member' => 'Progetti all\'interno dei quali "%s" è membro', + 'Open tasks assigned to "%s"' => 'Task aperti assegnati a "%s"', + 'Closed tasks assigned to "%s"' => 'Task chiusi assegnati a "%s"', + 'Assign automatically a color based on a priority' => 'Assegna automaticamente un colore in base alla priorità', + 'Overdue tasks for the project(s) "%s"' => 'Task scaduti per il progetto "%s"', + 'Upload files' => 'Carica file', + 'Installed Plugins' => 'Plugin installati', + 'Plugin Directory' => 'Directory dei plugin', + 'Plugin installed successfully.' => 'Plugin installato con successo.', + 'Plugin updated successfully.' => 'Plugin aggiornato con successo.', + 'Plugin removed successfully.' => 'Plugin rimosso con successo.', + 'Subtask converted to task successfully.' => 'Sotto-task converito in task con successo.', + 'Unable to convert the subtask.' => 'Impossibile convertire il sotto-task.', + 'Unable to extract plugin archive.' => 'Impossibile estrarre l\' archivio del plugin.', + 'Plugin not found.' => 'Plugin non trovato.', + 'You don\'t have the permission to remove this plugin.' => 'Non hai i permessi per rimuovere questo plugin.', + 'Unable to download plugin archive.' => 'Impossibile scaricare l\'archivo del plugin', + 'Unable to write temporary file for plugin.' => 'Impossibile scrivere il file temporaneo per il plugin.', + 'Unable to open plugin archive.' => 'Impossibile aprire l\'archivio del plugin.', + 'There is no file in the plugin archive.' => 'Non ci sono file nell\' archivio del plugin.', + 'Create tasks in bulk' => 'Creazione massiva di task', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'La tua installazione Kanboard non è configurata per installare plugin tramite l\'interfaccia utente.', + 'There is no plugin available.' => 'Non ci sono plugin disponibili.', + 'Install' => 'Installa', + 'Update' => 'Aggiorna', + 'Up to date' => 'Aggiornato', + 'Not available' => 'Non disponibile', + 'Remove plugin' => 'Disinstalla plugin', + 'Do you really want to remove this plugin: "%s"?' => 'Vuoi davvero rimuovere questo plugin: "%s"?', + 'Uninstall' => 'Disinstalla', + 'Listing' => 'Elenco', + 'Metadata' => 'Metadati', + 'Manage projects' => 'Gestione progetti', + 'Convert to task' => 'Converti in task', + 'Convert sub-task to task' => 'Converti il sotto-task in task', + 'Do you really want to convert this sub-task to a task?' => 'Vuoi davvero convertire questo sotto-task in un task?', + 'My task title' => 'Titolo del mio task', + 'Enter one task by line.' => 'Inserisci un task per ogni riga.', + 'Number of failed login:' => 'Numero di login falliti:', + 'Account locked until:' => 'Account bloccato fino al:', + 'Email settings' => 'Impostazioni Email', + 'Email sender address' => 'Indirizzo Email mittente', + 'Email transport' => 'Trasporto Email', + // 'Webhook token' => '', + 'Imports' => 'Importa', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/ja_JP/translations.php b/sources/app/Locale/ja_JP/translations.php index b48eabd..692afb7 100644 --- a/sources/app/Locale/ja_JP/translations.php +++ b/sources/app/Locale/ja_JP/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'このタクスを見る', 'Remove user' => 'ユーザの削除', 'Do you really want to remove this user: "%s"?' => 'ユーザ「%s」を本当に削除しますか？', - 'New user' => 'ユーザを追加する', 'All users' => 'すべてのユーザ', 'Username' => 'ユーザ名', 'Password' => 'パスワード', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d 個のクローズしたタスク', 'No task for this project' => 'このプロジェクトにタスクがありません', 'Public link' => '公開アクセス用リンク', - 'Change assignee' => '担当を変更する', - 'Change assignee for the task "%s"' => 'タスク「%s」の担当を変更する', 'Timezone' => 'タイムゾーン', 'Sorry, I didn\'t find this information in my database!' => 'データベース上で情報が見つかりませんでした！', 'Page not found' => 'ページが見つかりません', @@ -170,7 +167,6 @@ return array( 'Leave a description' => '説明を書く', 'Comment added successfully.' => 'コメントを追加しました。', 'Unable to create your comment.' => 'コメントの追加に失敗しました。', - 'Edit this task' => 'タスクを変更する', 'Due Date' => '期限', 'Invalid date' => '日付が無効です', 'Automatic actions' => '自動アクションを管理する', @@ -250,7 +246,6 @@ return array( 'Category' => 'カテゴリ', 'Category:' => 'カテゴリ:', 'Categories' => 'カテゴリ', - 'Category not found.' => 'カテゴリが見つかりません', 'Your category have been created successfully.' => 'カテゴリを作成しました。', 'Unable to create your category.' => 'カテゴリの作成に失敗しました。', 'Your category have been updated successfully.' => 'カテゴリを更新しました。', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'ファイル「%s」を削除しますか？', 'Attachments' => '添付', 'Edit the task' => 'タスクを変更する', - 'Edit the description' => '説明を変更する', 'Add a comment' => 'コメントの追加', 'Edit a comment' => 'コメントを変更する', 'Summary' => '概要', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => '外部認証が設定されていません。', 'Password modified successfully.' => 'パスワードを変更しました。', 'Unable to change the password.' => 'パスワードが変更できませんでした。', - 'Change category for the task "%s"' => 'タスク「%s」のカテゴリの変更', 'Change category' => 'カテゴリの変更', '%s updated the task %s' => '%s がタスク %s をアップデートしました', '%s opened the task %s' => '%s がタスク %s をオープンしました', @@ -413,9 +406,7 @@ return array( 'About' => '情報', 'Database driver:' => 'データベースドライバ:', 'Board settings' => '基本設定', - 'URL and token' => 'URL とトークン', 'Webhook settings' => 'Webhook の設定', - 'URL for task creation:' => 'Task 作成の URL:', 'Reset token' => 'トークンのリセット', 'API endpoint:' => 'API エンドポイント:', 'Refresh interval for private board' => '非公開ボードの更新頻度', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'スイムレーンの削除', 'Show default swimlane' => 'デフォルトスイムレーンの表示', 'Swimlane modification for the project "%s"' => '「%s」に対するスイムレーン変更', - 'Swimlane not found.' => 'スイムレーンが見つかりません。', 'Swimlane removed successfully.' => 'スイムレーンを削除しました。', 'Swimlanes' => 'スイムレーン', 'Swimlane updated successfully.' => 'スイムレーンを更新しました。', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => '全てのスイムレーン', 'All colors' => '全ての色', 'Moved to column %s' => 'カラム %s へ移動しました', - 'Change description' => '説明を変更', 'User dashboard' => 'ユーザダッシュボード', 'Allow only one subtask in progress at the same time for a user' => '一人のユーザにつき一つのタスクのみ進行中にできます', 'Edit column "%s"' => 'カラム「%s」の編集', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', // 'New title: %s' => '', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( // 'Stop timer' => '', // 'Start timer' => '', // 'Add project member' => '', - // 'Enable notifications' => '', // 'My activity stream' => '', // 'My calendar' => '', // 'Search tasks' => '', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/ko_KR/translations.php b/sources/app/Locale/ko_KR/translations.php index 8379761..75d6be4 100644 --- a/sources/app/Locale/ko_KR/translations.php +++ b/sources/app/Locale/ko_KR/translations.php @@ -20,14 +20,14 @@ return array( 'Orange' => '주황', 'Grey' => '회색', 'Brown' => '브라운', - // 'Deep Orange' => '', - // 'Dark Grey' => '', - // 'Pink' => '', - // 'Teal' => '', - // 'Cyan' => '', - // 'Lime' => '', - // 'Light Green' => '', - // 'Amber' => '', + 'Deep Orange' => '진홍', + 'Dark Grey' => '암회', + 'Pink' => '핑크', + 'Teal' => '암녹', + 'Cyan' => '청녹', + 'Lime' => '라임', + 'Light Green' => '연회', + 'Amber' => '호박', 'Save' => '저장', 'Login' => '로그인', 'Official website:' => '공식 웹사이트:', @@ -35,7 +35,6 @@ return array( 'View this task' => '이 할일 보기', 'Remove user' => '사용자 삭제', 'Do you really want to remove this user: "%s"?' => '사용자 "%s"를 정말로 삭제하시겠습니까?', - 'New user' => '사용자를 추가하는 ', 'All users' => '모든 사용자', 'Username' => '사용자 이름', 'Password' => '패스워드', @@ -66,9 +65,9 @@ return array( 'Disable' => '비활성화', 'Enable' => '유효하게 한다', 'New project' => '새 프로젝트', - // 'Do you really want to remove this project: "%s"?' => '', + 'Do you really want to remove this project: "%s"?' => '프로젝트를 삭제하시겠습니까: "%s"?', 'Remove project' => '프로젝트의 삭제', - // 'Edit the board for "%s"' => '', + 'Edit the board for "%s"' => '"%s"를 위한 보드 수정', 'All projects' => '모든 프로젝트', 'Add a new column' => '칼럼의 추가', 'Title' => '제목', @@ -76,7 +75,7 @@ return array( 'Remove a column' => '칼럼 삭제', 'Remove a column from a board' => '보드에서 칼럼 삭제', 'Unable to remove this column.' => '(※)컬럼을 삭제할 수 없었습니다.', - // 'Do you really want to remove this column: "%s"?' => '', + 'Do you really want to remove this column: "%s"?' => '칼럼을 삭제하시겠습니까: "%s"?', 'This action will REMOVE ALL TASKS associated to this column!' => '이 조작은 이 컬럼에 할당된 『 모든 할일을 삭제 』합니다!', 'Settings' => '설정', 'Application settings' => '애플리케이션의 설정', @@ -96,17 +95,17 @@ return array( 'Create another task' => '다른 할일 추가', 'New task' => '새로운 할일', 'Open a task' => '할일 열기', - // 'Do you really want to open this task: "%s"?' => '', + 'Do you really want to open this task: "%s"?' => '할일은 시작 하시겠습니까: "%s"?', 'Back to the board' => '보드로 돌아가기', 'There is nobody assigned' => '담당자가 없습니다', 'Column on the board:' => '칼럼:', 'Close this task' => '할일 마치기', - 'Open this task' => '할일을 열다', - 'There is no description.' => '설명이 없다', - 'Add a new task' => '할일을 추가하는 ', + 'Open this task' => '할일 열기', + 'There is no description.' => '설명이 없습니다', + 'Add a new task' => '할일 추가 ', 'The username is required' => '사용자 이름이 필요합니다', - // 'The maximum length is %d characters' => '', - // 'The minimum length is %d characters' => '', + 'The maximum length is %d characters' => '최대 길이는 "%d" 글자 입니다', + 'The minimum length is %d characters' => '최소 길이는 "%d" 글자 입니다', 'The password is required' => '패스워드가 필요합니다', 'This value must be an integer' => '정수로 입력하세요', 'The username must be unique' => '사용자 이름이 이미 사용되고 있습니다', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d개의 마친 할일', 'No task for this project' => '이 프로젝트에 할일이 없습니다', 'Public link' => '공개 접속 링크', - 'Change assignee' => '담당자 변경', - 'Change assignee for the task "%s"' => '할일 "%s"의 담당자를 변경', 'Timezone' => '시간대', 'Sorry, I didn\'t find this information in my database!' => '데이터베이스에서 정보가 발견되지 않았습니다!', 'Page not found' => '페이지가 발견되지 않는다', @@ -170,7 +167,6 @@ return array( 'Leave a description' => '설명을 입력하세요', 'Comment added successfully.' => '의견을 추가했습니다.', 'Unable to create your comment.' => '댓글의 추가에 실패했습니다.', - 'Edit this task' => '할일 수정', 'Due Date' => '마감일', 'Invalid date' => '날짜가 무효입니다', 'Automatic actions' => '자동액션 관리', @@ -179,7 +175,7 @@ return array( 'Remove an action' => '자동 액션의 삭제', 'Unable to remove this action.' => '자동 액션의 삭제에 실패했습니다.', 'Action removed successfully.' => '자동 액션의 삭제에 성공했어요.', - // 'Automatic actions for the project "%s"' => '', + 'Automatic actions for the project "%s"' => '"%s" 프로젝트를 위한 자동 액션', 'Add an action' => '자동 액션 추가', 'Event name' => '이벤트 이름', 'Action name' => '액션 이름', @@ -189,19 +185,19 @@ return array( 'When the selected event occurs execute the corresponding action.' => '선택된 이벤트가 발생했을 때 대응하는 액션을 실행한다.', 'Next step' => '다음 단계', 'Define action parameters' => '액션의 바로미터', - // 'Do you really want to remove this action: "%s"?' => '', + 'Do you really want to remove this action: "%s"?' => '액션을 삭제하시겠습니까: "%s"?', 'Remove an automatic action' => '자동 액션의 삭제', 'Assign the task to a specific user' => '할일 담당자를 할당', 'Assign the task to the person who does the action' => '액션을 일으킨 사용자를 담당자이자', - 'Duplicate the task to another project' => ' 다른 프로젝트에 할일을 복제하는 ', - 'Move a task to another column' => '할일을 다른 칼럼에 이동하는 ', + 'Duplicate the task to another project' => '할일을 다른 프로젝트로 복사', + 'Move a task to another column' => '할일을 다른 칼럼으로 이동', 'Task modification' => '할일 변경', - 'Task creation' => '할일을 만들', - 'Closing a task' => '할일을 닫혔다', - 'Assign a color to a specific user' => '색을 사용자에 할당', + 'Task creation' => '할일 만들기', + 'Closing a task' => '할일 종료', + 'Assign a color to a specific user' => '사용자 색 할당', 'Column title' => '칼럼의 제목', 'Position' => '위치', - 'Duplicate to another project' => '다른 프로젝트에 복사', + 'Duplicate to another project' => '다른 프로젝트로 복사', 'Duplicate' => '복사', 'link' => '링크', 'Comment updated successfully.' => '댓글을 갱신했습니다.', @@ -235,22 +231,21 @@ return array( '%d comments' => '%d개의 댓글', '%d comment' => '%d개의 댓글', 'Email address invalid' => '메일 주소가 올바르지 않습니다.', - // 'Your external account is not linked anymore to your profile.' => '', - // 'Unable to unlink your external account.' => '', - // 'External authentication failed' => '', - // 'Your external account is linked to your profile successfully.' => '', + 'Your external account is not linked anymore to your profile.' => '외부 계정과 프로필이 더이상 연결되지 않습니다', + 'Unable to unlink your external account.' => '외부 계정과 연결 해제에 실패하였습니다', + 'External authentication failed' => '외부 인증 실패', + 'Your external account is linked to your profile successfully.' => '외부 계정과 프로필이 성공적으로 연결되었습니다', 'Email' => '이메일', 'Task removed successfully.' => '할일을 삭제했습니다.', - 'Unable to remove this task.' => '할일 삭제에 실패했습니다.', + 'Unable to remove this task.' => '할일 삭제에 실패하였습니다', 'Remove a task' => '할일 삭제', - // 'Do you really want to remove this task: "%s"?' => '', + 'Do you really want to remove this task: "%s"?' => '할일을 삭제하시겠습니까: "%s"?', 'Assign automatically a color based on a category' => '카테고리에 바탕을 두고 색을 바꾸고', 'Assign automatically a category based on a color' => '색에 바탕을 두고 카테고리를 바꾸었다', 'Task creation or modification' => '할일의 작성 또는 변경', 'Category' => '카테고리', 'Category:' => '카테고리:', 'Categories' => '카테고리', - 'Category not found.' => '카테고리가 발견되지 않습니다', 'Your category have been created successfully.' => '카테고리를 작성했습니다.', 'Unable to create your category.' => '카테고리의 작성에 실패했습니다.', 'Your category have been updated successfully.' => '카테고리를 갱신했습니다.', @@ -258,10 +253,10 @@ return array( 'Remove a category' => '카테고리의 삭제', 'Category removed successfully.' => '카테고리를 삭제했습니다.', 'Unable to remove this category.' => '카테고리를 삭제할 수 없었습니다.', - // 'Category modification for the project "%s"' => '', + 'Category modification for the project "%s"' => '"%s" 프로젝트 카테고리 수정', 'Category Name' => '카테고리 이름', 'Add a new category' => '카테고리의 추가', - // 'Do you really want to remove this category: "%s"?' => '', + 'Do you really want to remove this category: "%s"?' => '카테고리를 삭제하시겠습니까: "%s"?', 'All categories' => '모든 카테고리', 'No category' => '카테고리 없음', 'The name is required' => '이름을 입력하십시오', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => '파일 "%s" 을 삭제할까요?', 'Attachments' => '첨부', 'Edit the task' => '할일 수정', - 'Edit the description' => '설명 수정', 'Add a comment' => '댓글 추가', 'Edit a comment' => '댓글 수정', 'Summary' => '개요', @@ -305,7 +299,7 @@ return array( 'Display another project' => '프로젝트 보기', 'Created by %s' => '작성자 %s', 'Tasks Export' => '할일 내보내기', - // 'Tasks exportation for "%s"' => '', + 'Tasks exportation for "%s"' => '"%s" 할일 내보내기', 'Start Date' => '시작일', 'End Date' => '종료일', 'Execute' => '실행', @@ -318,15 +312,15 @@ return array( 'Unable to clone this project.' => '프로젝트의 복제에 실패했습니다.', 'Enable email notifications' => '이메일 알림 설정', 'Task position:' => '할일 위치:', - // 'The task #%d have been opened.' => '', - // 'The task #%d have been closed.' => '', + 'The task #%d have been opened.' => '할일 #%d가 시작되었습니다', + 'The task #%d have been closed.' => '할일 #%d가 종료되었습니다', 'Sub-task updated' => '서브 할일 갱신', 'Title:' => '제목:', 'Status:' => '상태:', 'Assignee:' => '담당:', 'Time tracking:' => '시간 계측:', 'New sub-task' => '새로운 서브 할일', - // 'New attachment added "%s"' => '', + 'New attachment added "%s"' => '"%s"의 새로운 첨부 파일', 'New comment posted by %s' => '"%s"님이 댓글을 추가하였습니다', 'New attachment' => ' 새로운 첨부 파일', 'New comment' => ' 새로운 댓글', @@ -343,8 +337,8 @@ return array( 'Disable public access' => '공개 접속 비활성화', 'Enable public access' => '공개 접속 활성화', 'Public access disabled' => '공개 접속 불가', - // 'Do you really want to disable this project: "%s"?' => '', - // 'Do you really want to enable this project: "%s"?' => '', + 'Do you really want to disable this project: "%s"?' => '프로젝트를 비활성화하시겠습니까: "%s"?', + 'Do you really want to enable this project: "%s"?' => '프로젝트를 활성화하시겠습니까: "%s"?', 'Project activation' => '프로젝트의 액티베ー션', 'Move the task to another project' => '할일별 프로젝트에 옮기', 'Move to another project' => '다른 프로젝트로 이동', @@ -370,37 +364,36 @@ return array( 'No external authentication enabled.' => '외부 인증이 설정되어 있지 않습니다.', 'Password modified successfully.' => '패스워드를 변경했습니다.', 'Unable to change the password.' => '비밀 번호가 변경할 수 없었습니다.', - 'Change category for the task "%s"' => '할일 "%s"의 카테고리의 변경', 'Change category' => '카테고리 수정', '%s updated the task %s' => '%s이 할일 %s을 업데이트했습니다', - // '%s opened the task %s' => '', + '%s opened the task %s' => '%s이 할일 %s을 시작시켰습니다', '%s moved the task %s to the position #%d in the column "%s"' => '%s이 할일%s을 위치#%d컬럼%s로 옮겼습니다', '%s moved the task %s to the column "%s"' => '%s이 할일 %s을 칼럼 "%s" 로 옮겼습니다', '%s created the task %s' => '%s이 할일%s을 추가했습니다', '%s closed the task %s' => '%s이 할일%s을 마쳤습니다', '%s created a subtask for the task %s' => '%s이 할일%s의 서브 할일을 추가했습니다', '%s updated a subtask for the task %s' => '%s이 할일%s의 서브 할일을 갱신했습니다', - 'Assigned to %s with an estimate of %s/%sh' => '담당자 %s에게 예상 %s/%sh로 할당되었습니다', - // 'Not assigned, estimate of %sh' => '', + 'Assigned to %s with an estimate of %s/%sh' => '담당자 %s에게 예상 %s/%sh을 할당했습니다', + 'Not assigned, estimate of %sh' => '예상 %sh가 할당되지 않았습니다', '%s updated a comment on the task %s' => '%s이 할일%s의 댓글을 수정했습니다', '%s commented the task %s' => '%s이 할일%s에 댓글을 남겼습니다', '%s\'s activity' => '%s의 활동', 'RSS feed' => 'RSS피드', - // '%s updated a comment on the task #%d' => '', - // '%s commented on the task #%d' => '', - // '%s updated a subtask for the task #%d' => '', - // '%s created a subtask for the task #%d' => '', + '%s updated a comment on the task #%d' => '%s이 할일#%d의 댓글을 수정했습니다', + '%s commented on the task #%d' => '%s이 할일#%d을 언급하였습니다', + '%s updated a subtask for the task #%d' => '%s이 할일#%d의 서브 할일을 수정했습니다', + '%s created a subtask for the task #%d' => '%s이 할일#%d의 서브 할일을 수정했습니다', '%s updated the task #%d' => '%s이 할일#%d을 갱신했습니다', '%s created the task #%d' => '%s이 할일#%d을 추가했습니다', '%s closed the task #%d' => '%s이 할일#%d을 닫혔습니다', '%s open the task #%d' => '%s이 할일#%d를 오픈했습니다', '%s moved the task #%d to the column "%s"' => '%s이 할일#%d을 칼럼"%s"로 옮겼습니다', - // '%s moved the task #%d to the position %d in the column "%s"' => '', + '%s moved the task #%d to the position %d in the column "%s"' => '%s이 할일#%d을 칼럼 "%s"의 %d 위치로 이동시켰습니다', 'Activity' => '활동', - // 'Default values are "%s"' => '', - // 'Default columns for new projects (Comma-separated)' => '', + 'Default values are "%s"' => '기본 값은 "%s" 입니다', + 'Default columns for new projects (Comma-separated)' => '새로운 프로젝트의 기본 칼럼 (콤마(,)로 분리됨)', 'Task assignee change' => '담당자의 변경', - // '%s change the assignee of the task #%d to %s' => '', + '%s change the assignee of the task #%d to %s' => '%s이 할일 #%d의 담당을 %s로 변경합니다', '%s changed the assignee of the task %s to %s' => '%s이 할일 %s의 담당을 %s로 변경했습니다', 'New password for the user "%s"' => '사용자 "%s"의 새로운 패스워드', 'Choose an event' => '행사의 선택', @@ -413,9 +406,7 @@ return array( 'About' => '정보', 'Database driver:' => '데이터베이스 드라이버:', 'Board settings' => '기본 설정', - 'URL and token' => 'URL와 토큰', 'Webhook settings' => 'Webhook의 설정', - 'URL for task creation:' => 'Task작성의 URL:', 'Reset token' => '토큰 리셋', 'API endpoint:' => 'API엔드 포인트:', 'Refresh interval for private board' => '비공개 보드의 갱신 빈도', @@ -426,8 +417,8 @@ return array( // 'Frequency in second (0 to disable this feature, 10 seconds by default)' => '', 'Application URL' => '애플리케이션의 URL', 'Token regenerated.' => '토큰이 다시 생성되었습니다.', - 'Date format' => '데이터 포맷', - // 'ISO format is always accepted, example: "%s" and "%s"' => '', + 'Date format' => '데이터 포멧', + 'ISO format is always accepted, example: "%s" and "%s"' => 'ISO 포멧은 항상 가능합니다. 예를 들어: "%s" 와 "%s"', 'New private project' => '새 비공개 프로젝트', 'This project is private' => '이 프로젝트는 비공개입니다', 'Add' => '추가', @@ -452,12 +443,12 @@ return array( 'Number of tasks' => '할일 수', 'Task distribution' => '할일 분포', 'Reportings' => '리포트', - // 'Task repartition for "%s"' => '', + 'Task repartition for "%s"' => '"%s"의 할일 분포', 'Analytics' => '분석', 'Subtask' => '서브 할일', 'My subtasks' => '내 서브 할일', 'User repartition' => '담당자 분포', - // 'User repartition for "%s"' => '', + 'User repartition for "%s"' => '"%s"의 담당자 분포', 'Clone this project' => '이 프로젝트를 복제하는 ', 'Column removed successfully.' => '(※)컬럼을 삭제했습니다', 'Not enough data to show the graph.' => '그래프를 선묘화하려면 나왔지만 부족합니다', @@ -473,23 +464,22 @@ return array( 'This value is required' => '이 값이 필요합니다', 'This value must be numeric' => '이 값은 숫자가 아니면 안 됩니다', 'Unable to create this task.' => '이 할일을 작성할 수 없었습니다', - 'Cumulative flow diagram' => '축적 플로', - // 'Cumulative flow diagram for "%s"' => '', - 'Daily project summary' => '일시 프로젝트 개요', - 'Daily project summary export' => '일시 프로젝트 개요의 출력', - // 'Daily project summary export for "%s"' => '', + 'Cumulative flow diagram' => '축적 흐름', + 'Cumulative flow diagram for "%s"' => '"%s"의 축적 흐름', + 'Daily project summary' => '하루 프로젝트 개요', + 'Daily project summary export' => '하루 프로젝트 개요의 출력', + 'Daily project summary export for "%s"' => '"%s" 하루 프로젝트 개요의 출력', 'Exports' => '출력', 'This export contains the number of tasks per column grouped per day.' => '이 출력은 날짜의 칼람별 할일 수를 집계한 것입니다', 'Active swimlanes' => '액티브한 스윔레인', 'Add a new swimlane' => ' 새로운 스윔레인', 'Change default swimlane' => '기본 스윔레인의 변경', 'Default swimlane' => '기본 스윔레인', - // 'Do you really want to remove this swimlane: "%s"?' => '', + 'Do you really want to remove this swimlane: "%s"?' => '스웜레인을 삭제하시겠습니까: "%s"?', 'Inactive swimlanes' => '인터랙티브한 스윔레인', 'Remove a swimlane' => '스윔레인의 삭제', 'Show default swimlane' => '기본 스윔레인의 표시', - // 'Swimlane modification for the project "%s"' => '', - 'Swimlane not found.' => '스윔레인이 발견되지 않습니다.', + 'Swimlane modification for the project "%s"' => '"%s" 프로젝트의 스웜레인 수정', 'Swimlane removed successfully.' => '스윔레인을 삭제했습니다.', 'Swimlanes' => '스윔레인', 'Swimlane updated successfully.' => '스윔레인을 갱신했습니다.', @@ -497,14 +487,14 @@ return array( 'Unable to remove this swimlane.' => '스윔레인을 삭제할 수 없었습니다.', 'Unable to update this swimlane.' => '스윔레인을 갱신할 수 없었습니다.', 'Your swimlane have been created successfully.' => '스윔레인이 작성되었습니다.', - // 'Example: "Bug, Feature Request, Improvement"' => '', - // 'Default categories for new projects (Comma-separated)' => '', + 'Example: "Bug, Feature Request, Improvement"' => '예: "버그, 특성 요청, 향상"', + 'Default categories for new projects (Comma-separated)' => '새로운 프로젝트의 기본 카테고리 (콤마(,)로 구분)', 'Integrations' => '연계', 'Integration with third-party services' => '외부 서비스 연계', 'Subtask Id' => '서브 할일 Id', 'Subtasks' => '서브 할일', 'Subtasks Export' => '서브 할일 출력', - // 'Subtasks exportation for "%s"' => '', + 'Subtasks exportation for "%s"' => '"%s"의 서브 할일 출력', 'Task Title' => '할일 제목', 'Untitled' => '제목 없음', 'Application default' => '애플리케이션 기본', @@ -516,26 +506,25 @@ return array( '#%d' => '#%d', 'All swimlanes' => '모든 스윔레인', 'All colors' => '모든 색', - // 'Moved to column %s' => '', - 'Change description' => '설명 수정', + 'Moved to column %s' => '"%s" 칼럼으로 이동', 'User dashboard' => '대시보드', 'Allow only one subtask in progress at the same time for a user' => '한 사용자에 대한 하나의 할일만 진행 중에 가능합니다', - // 'Edit column "%s"' => '', - // 'Select the new status of the subtask: "%s"' => '', + 'Edit column "%s"' => '"%s" 칼럼 수정', + 'Select the new status of the subtask: "%s"' => '서브 할일의 새로운 상태 선택: "%s"', 'Subtask timesheet' => '서브 할일 타임시트', 'There is nothing to show.' => '기록이 없습니다', - 'Time Tracking' => '타임 트레킹', + 'Time Tracking' => '시간 트레킹', 'You already have one subtask in progress' => '이미 진행 중인 서브 할일가 있습니다.', 'Which parts of the project do you want to duplicate?' => '프로젝트의 무엇을 복제합니까?', - // 'Disallow login form' => '', + 'Disallow login form' => '허가되지 않은 로그인 양식', 'Start' => '시작', 'End' => '종료', 'Task age in days' => '할일이 생긴 시간', 'Days in this column' => '이 칼럼에 있는 시간', '%dd' => '%d일', 'Add a new link' => ' 새로운 링크 추가', - // 'Do you really want to remove this link: "%s"?' => '', - // 'Do you really want to remove this link with task #%d?' => '', + 'Do you really want to remove this link: "%s"?' => '링크를 삭제하시겠습니까: "%s"?', + 'Do you really want to remove this link with task #%d?' => '#%d 할일의 링크를 삭제하시겠습니까?', 'Field required' => '필드가 필요합니다', 'Link added successfully.' => '링크를 추가했습니다.', 'Link updated successfully.' => '링크를 갱신했습니다.', @@ -609,7 +598,7 @@ return array( 'Change reference currency' => '현재의 기축 통화', 'Add a new currency rate' => ' 새로운 통화 환율을 추가', 'Reference currency' => '기축 통화', - // 'The currency rate have been added successfully.' => '', + 'The currency rate have been added successfully.' => '통화가 성공적으로 추가되었습니다', 'Unable to add this currency rate.' => '이 통화 환율을 추가할 수 없습니다.', 'Webhook URL' => 'Webhook URL', '%s remove the assignee of the task %s' => '%s이 할일 %s의 담당을 삭제했습니다', @@ -620,35 +609,35 @@ return array( 'The two factor authentication code is valid.' => '2단 인증 코드는 유효합니다.', 'Code' => '코드', 'Two factor authentication' => '2단 인증', - // 'This QR code contains the key URI: ' => '', + 'This QR code contains the key URI: ' => 'QR 코드는 키 URI를 포함합니다: ', 'Check my code' => '코드 체크', - // 'Secret key: ' => '', + 'Secret key: ' => '비밀키: ', 'Test your device' => '디바이스 테스트', - // 'Assign a color when the task is moved to a specific column' => '', + 'Assign a color when the task is moved to a specific column' => '상세 칼럼으로 이동할 할일의 색깔을 지정하세요', '%s via Kanboard' => '%s via E-board', - // 'Burndown chart for "%s"' => '', - // 'Burndown chart' => '', + 'Burndown chart for "%s"' => '"%s" 번다운 차트', + 'Burndown chart' => '번다운 차트', // 'This chart show the task complexity over the time (Work Remaining).' => '', 'Screenshot taken %s' => '스크린샷_%s', 'Add a screenshot' => '스크린샷 추가', 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '스크린샷을 CTRL+V 혹은 ⌘+V를 눌러 붙여넣기', 'Screenshot uploaded successfully.' => '스크린샷을 업로드하였습니다', // 'SEK - Swedish Krona' => '', - // 'Identifier' => '', - // 'Disable two factor authentication' => '', - // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', - // 'Edit link' => '', - 'Start to type task title...' => '할일 제목을 처음부터 입력해주세요', - // 'A task cannot be linked to itself' => '', - // 'The exact same link already exists' => '', + 'Identifier' => '식별자', + 'Disable two factor authentication' => '이중 인증 비활성화', + 'Do you really want to disable the two factor authentication for this user: "%s"?' => '"%s" 담당자의 이중 인증을 비활성화 하시겠습니까?', + 'Edit link' => '링크 수정', + 'Start to type task title...' => '할일 제목을 입력하세요', + 'A task cannot be linked to itself' => '할일을 자기자신에게 연결할 수 없습니다', + 'The exact same link already exists' => '동일한 링크가 이미 존재합니다', // 'Recurrent task is scheduled to be generated' => '', - // 'Score' => '', - // 'The identifier must be unique' => '', - // 'This linked task id doesn\'t exists' => '', - // 'This value must be alphanumeric' => '', + 'Score' => '점수', + 'The identifier must be unique' => '식별자는 유일해야 합니다', + 'This linked task id doesn\'t exists' => '연결된 할일 ID가 존재하지 않습니다', + 'This value must be alphanumeric' => '글자와 숫자만 가능합니다', 'Edit recurrence' => '반복 수정', - 'Generate recurrent task' => '반복 할일 만들기', - 'Trigger to generate recurrent task' => '반복 할일 트리거 만들기', + 'Generate recurrent task' => '반복 할일 생성', + 'Trigger to generate recurrent task' => '반복 할일 생성 트리거', 'Factor to calculate new due date' => '새로운 종료날짜 계산', 'Timeframe to calculate new due date' => '종료날짜 계산 단위', 'Base date to calculate new due date' => '새로운 기본 종료날짜 계산', @@ -659,36 +648,36 @@ return array( 'Existing due date' => '기존 종료날짜', 'Factor to calculate new due date: ' => '새로운 종료날짜 계산: ', 'Month(s)' => '월', - // 'Recurrence' => '', - // 'This task has been created by: ' => '', - // 'Recurrent task has been generated:' => '', + 'Recurrence' => '반복', + 'This task has been created by: ' => '할일을 만들었습니다: ', + 'Recurrent task has been generated:' => '반복 할일이 생성되었습니다', 'Timeframe to calculate new due date: ' => '종료날짜 계산 단위', // 'Trigger to generate recurrent task: ' => '', 'When task is closed' => '할일을 마쳤을때', 'When task is moved from first column' => '할일이 첫번째 칼럼으로 옮겨졌을때', 'When task is moved to last column' => '할일이 마지막 칼럼으로 옮겨졌을때', 'Year(s)' => '년', - // 'Calendar settings' => '', - // 'Project calendar view' => '', + 'Calendar settings' => '달력 설정', + 'Project calendar view' => '프로젝트 달력 보기', 'Project settings' => '프로젝트 설정', - // 'Show subtasks based on the time tracking' => '', - // 'Show tasks based on the creation date' => '', - // 'Show tasks based on the start date' => '', - // 'Subtasks time tracking' => '', - // 'User calendar view' => '', - // 'Automatically update the start date' => '', + 'Show subtasks based on the time tracking' => '시간 트래킹의 서브 할일 보기', + 'Show tasks based on the creation date' => '생성 날짜로 할일 보기', + 'Show tasks based on the start date' => '시작 날짜로 할일 보기', + 'Subtasks time tracking' => '서브 할일 시간 트래킹', + 'User calendar view' => '담당자 달력 보기', + 'Automatically update the start date' => '시작일에 자동 업데이트', // 'iCal feed' => '', - // 'Preferences' => '', - // 'Security' => '', - 'Two factor authentication disabled' => '2단 인증 비활성화', - // 'Two factor authentication enabled' => '', - // 'Unable to update this user.' => '', - // 'There is no user management for private projects.' => '', - // 'User that will receive the email' => '', + 'Preferences' => '우선권', + 'Security' => '보안', + 'Two factor authentication disabled' => '이중 인증이 비활성화 되었습니다', + 'Two factor authentication enabled' => '이중 인증이 활성화 되었습니다', + 'Unable to update this user.' => '담당자의 업데이트가 가능합니다', + 'There is no user management for private projects.' => '비밀 프로젝트의 관리 담당자가 없습니다', + 'User that will receive the email' => '그 담당자가 이메일을 수신할 것입니다', 'Email subject' => '이메일 제목', 'Date' => '날짜', - // 'Add a comment log when moving the task between columns' => '', - // 'Move the task to another column when the category is changed' => '', + 'Add a comment log when moving the task between columns' => '칼럼 중간의 할일이 이동할 때 의견 달기', + 'Move the task to another column when the category is changed' => '카테고리 변경시 할일을 다른 칼럼으로 이동', 'Send a task by email to someone' => '할일을 이메일로 보내기', 'Reopen a task' => '할일 다시 시작', 'Column change' => '칼럼 이동', @@ -697,19 +686,18 @@ return array( 'Assignee change' => '담당자 변경', '[%s] Overdue tasks' => '[%s] 마감시간 지남', 'Notification' => '알림', - // '%s moved the task #%d to the first swimlane' => '', - // '%s moved the task #%d to the swimlane "%s"' => '', + '%s moved the task #%d to the first swimlane' => '%s가 할일 #%d를 첫번째 스웜레인으로 이동시켰습니다', + '%s moved the task #%d to the swimlane "%s"' => '%s가 할일 #%d를 "%s" 스웜레인으로 이동시켰습니다', 'Swimlane' => '스윔레인', // 'Gravatar' => '', - // '%s moved the task %s to the first swimlane' => '', - // '%s moved the task %s to the swimlane "%s"' => '', - // 'This report contains all subtasks information for the given date range.' => '', - // 'This report contains all tasks information for the given date range.' => '', - // 'Project activities for %s' => '', - // 'view the board on Kanboard' => '', - // 'The task have been moved to the first swimlane' => '', - // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', + '%s moved the task %s to the first swimlane' => '%s가 할일 %s를 첫번째 스웜레인으로 이동시켰습니다', + '%s moved the task %s to the swimlane "%s"' => '%s가 할일 %s를 %s 스웜레인으로 이동시켰습니다', + 'This report contains all subtasks information for the given date range.' => '해당 기간의 모든 서브 할일 정보가 보고서에 포함됩니다', + 'This report contains all tasks information for the given date range.' => '해당 기간의 모든 할일 정보가 보고서에 포함됩니다', + 'Project activities for %s' => '%s의 프로젝트 활성화', + 'view the board on Kanboard' => 'kanboard로 보드 보기', + 'The task have been moved to the first swimlane' => '할일이 첫번째 스웜라인으로 이동되어 있습니다', + 'The task have been moved to another swimlane:' => '할일이 다른 스웜라인으로 이동되어 있습니다', 'New title: %s' => '제목 변경: %s', 'The task is not assigned anymore' => '담당자 없음', 'New assignee: %s' => '담당자 변경: %s', @@ -722,8 +710,8 @@ return array( 'Recurrence settings have been modified' => '반복할일 설정 수정', 'Time spent changed: %sh' => '경과시간 변경: %s시간', 'Time estimated changed: %sh' => '%s시간으로 예상시간 변경', - // 'The field "%s" have been updated' => '', - // 'The description has been modified:' => '', + 'The field "%s" have been updated' => '%s 필드가 업데이트 되어있습니다', + 'The description has been modified:' => '설명이 수정되어 있습니다: ', 'Do you really want to close the task "%s" as well as all subtasks?' => '할일 "%s"과 서브 할일을 모두 마치시겠습니까?', 'I want to receive notifications for:' => '다음의 알림을 받기를 원합니다:', 'All tasks' => '모든 할일', @@ -731,17 +719,16 @@ return array( 'Only for tasks created by me' => '내가 만든 일', 'Only for tasks created by me and assigned to me' => '내가 만들었거나 내가 담당자인 일', // '%%Y-%%m-%%d' => '', - // 'Total for all columns' => '', - // 'You need at least 2 days of data to show the chart.' => '', + 'Total for all columns' => '모든 칼럼', + 'You need at least 2 days of data to show the chart.' => '차트를 보기 위하여 최소 2일의 데이터가 필요합니다', '<15m' => '<15분', '<30m' => '<30분', - // 'Stop timer' => '', + 'Stop timer' => '타이머 정지', 'Start timer' => '타이머 시작', - // 'Add project member' => '', - 'Enable notifications' => '알림 켜기', + 'Add project member' => '프로젝트 맴버 추가', 'My activity stream' => '내 활동기록', 'My calendar' => '내 캘린더', - // 'Search tasks' => '', + 'Search tasks' => '할일 찾기', 'Reset filters' => '필터 리셋', 'My tasks due tomorrow' => '내일까지 내 할일', 'Tasks due today' => '오늘까지 할일', @@ -752,16 +739,16 @@ return array( 'Not assigned' => '담당자가 없는 일', 'View advanced search syntax' => '추가 검색 문법보기', 'Overview' => '개요', - // 'Board/Calendar/List view' => '', - // 'Switch to the board view' => '', - // 'Switch to the calendar view' => '', - // 'Switch to the list view' => '', - // 'Go to the search/filter box' => '', + 'Board/Calendar/List view' => '보드/달력/리스트 보기', + 'Switch to the board view' => '보드 보기로 전환', + 'Switch to the calendar view' => '달력 보기로 전환', + 'Switch to the list view' => '리스트 보기로 전환', + 'Go to the search/filter box' => '검색/필터 박스로 이동', 'There is no activity yet.' => '활동이 없습니다', - // 'No tasks found.' => '', - // 'Keyboard shortcut: "%s"' => '', + 'No tasks found.' => '할일을 찾을 수 없습니다', + 'Keyboard shortcut: "%s"' => '쉬운 키보드: "%s"', 'List' => '목록', - // 'Filter' => '', + 'Filter' => '필터', 'Advanced search' => '검색 문법', 'Example of query: ' => '문법 예제 ', 'Search by project: ' => '프로젝트로 찾기 ', @@ -771,58 +758,58 @@ return array( 'Search by category: ' => '카테고리로 찾기 ', 'Search by description: ' => '설명으로 찾기 ', 'Search by due date: ' => '마감날짜로 찾기 ', - // 'Lead and Cycle time for "%s"' => '', - // 'Average time spent into each column for "%s"' => '', - // 'Average time spent into each column' => '', - // 'Average time spent' => '', - // 'This chart show the average time spent into each column for the last %d tasks.' => '', - // 'Average Lead and Cycle time' => '', - // 'Average lead time: ' => '', - // 'Average cycle time: ' => '', - 'Cycle Time' => '사이클 타임', - 'Lead Time' => '리드 타임', - // 'This chart show the average lead and cycle time for the last %d tasks over the time.' => '', - // 'Average time into each column' => '', - // 'Lead and cycle time' => '', - 'Lead time: ' => '리드 타임: ', - 'Cycle time: ' => '사이클 타임: ', + 'Lead and Cycle time for "%s"' => '"%s"의 리드와 사이클 시간', + 'Average time spent into each column for "%s"' => '"%s"의 각 칼럼 평균 소요시간', + 'Average time spent into each column' => '각 칼럼의 평균 소요시간', + 'Average time spent' => '평균 소요시간', + 'This chart show the average time spent into each column for the last %d tasks.' => '마지막 %d 할일의 칼럼 평균 소요시간을 차트에 표시합니다', + 'Average Lead and Cycle time' => '평균 Lead and Cycle 시간', + 'Average lead time: ' => '평균 lead 시간', + 'Average cycle time: ' => '평균 cycle 시간', + 'Cycle Time' => '사이클 시간', + 'Lead Time' => '리드 시간', + 'This chart show the average lead and cycle time for the last %d tasks over the time.' => '마지막 %d 할일의 평균 리드와 사이클 시간을 차트에 표시합니다', + 'Average time into each column' => '각 칼럼의 평균 시간', + 'Lead and cycle time' => '리드와 사이클 시간', + 'Lead time: ' => '리드 시간: ', + 'Cycle time: ' => '사이클 시간: ', 'Time spent into each column' => '각 칼럼에서 걸린 시간', - // 'The lead time is the duration between the task creation and the completion.' => '', - // 'The cycle time is the duration between the start date and the completion.' => '', - // 'If the task is not closed the current time is used instead of the completion date.' => '', - // 'Set automatically the start date' => '', + 'The lead time is the duration between the task creation and the completion.' => '리드 시간은 할일의 생성부터 완료까지의 기간입니다', + 'The cycle time is the duration between the start date and the completion.' => '사이클 시간은 할일의 시작일부터 완료까지의 기간입니다', + 'If the task is not closed the current time is used instead of the completion date.' => '할일이 종료되지 않았다면, 완료 시간 대신 현재 시간이 사용됩니다', + 'Set automatically the start date' => '자동으로 시작 날짜를 설정합니다', 'Edit Authentication' => '계정 수정', - // 'Remote user' => '', - // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '', - // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '', + 'Remote user' => '원격 담당자', + 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '예를 들어 LDAP, Google, Github 계정같은 원격 담당자의 비밀번호는 칸반보드 데이터베이스에 저장하지 않습니다', + 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '만약 "로그인 폼 거절"에 체크한다면, 로그인 폼에 접근할 자격이 무시됩니다', 'New remote user' => '새로운 원격유저', 'New local user' => '새로운 유저', - // 'Default task color' => '', + 'Default task color' => '기본 할일 색', 'This feature does not work with all browsers.' => '이 기능은 일부 브라우저에서 작동하지 않습니다', - // 'There is no destination project available.' => '', - // 'Trigger automatically subtask time tracking' => '', - // 'Include closed tasks in the cumulative flow diagram' => '', - // 'Current swimlane: %s' => '', - // 'Current column: %s' => '', - // 'Current category: %s' => '', - // 'no category' => '', - // 'Current assignee: %s' => '', - // 'not assigned' => '', - // 'Author:' => '', - // 'contributors' => '', - // 'License:' => '', - // 'License' => '', - // 'Enter the text below' => '', - // 'Gantt chart for %s' => '', - // 'Sort by position' => '', - // 'Sort by date' => '', - // 'Add task' => '', - // 'Start date:' => '', - // 'Due date:' => '', - // 'There is no start date or due date for this task.' => '', + 'There is no destination project available.' => '가능한 목적 프로젝트가 없습니다', + 'Trigger automatically subtask time tracking' => '자동 서브 할일 시간 트래킹 트리거', + 'Include closed tasks in the cumulative flow diagram' => '누적 플로우 다이어그램에 종료된 할일을 포함합니다', + 'Current swimlane: %s' => '현재 스웜라인: %s', + 'Current column: %s' => '현재 칼럼: %s', + 'Current category: %s' => '현재 카테고리: %s', + 'no category' => '카테고리 아님', + 'Current assignee: %s' => '현재 할당자: %s', + 'not assigned' => '할당되지 않음', + 'Author:' => '글쓴이:', + 'contributors' => '기여자', + 'License:' => '라이센스:', + 'License' => '라이센스', + 'Enter the text below' => '아랫글로 들어가기', + 'Gantt chart for %s' => '%s의 간트 차트', + 'Sort by position' => '위치별 정렬', + 'Sort by date' => '날짜별 정렬', + 'Add task' => '할일 추가', + 'Start date:' => '시작일:', + 'Due date:' => '만기일:', + 'There is no start date or due date for this task.' => '할일의 시작일 또는 만기일이 없습니다', // 'Moving or resizing a task will change the start and due date of the task.' => '', // 'There is no task in your project.' => '', - 'Gantt chart' => '간트차트', + 'Gantt chart' => '간트 차트', 'People who are project managers' => '프로젝트 매니저', 'People who are project members' => '프로젝트 멤버', // 'NOK - Norwegian Krone' => '', @@ -832,39 +819,39 @@ return array( 'End date' => '종료 날짜', 'Users overview' => '유저 전체보기', 'Members' => '멤버', - // 'Shared project' => '', + 'Shared project' => '프로젝트 공유', 'Project managers' => '프로젝트 매니저', - // 'Gantt chart for all projects' => '', + 'Gantt chart for all projects' => '모든 프로젝트의 간트 차트', 'Projects list' => '프로젝트 리스트', 'Gantt chart for this project' => '이 프로젝트 간트차트', 'Project board' => '프로젝트 보드', - // 'End date:' => '', + 'End date:' => '날짜 수정', 'There is no start date or end date for this project.' => '이 프로젝트에는 시작날짜와 종료날짜가 없습니다', 'Projects Gantt chart' => '프로젝트 간트차트', // 'Change task color when using a specific task link' => '', // 'Task link creation or modification' => '', - // 'Milestone' => '', - // 'Documentation: %s' => '', - // 'Switch to the Gantt chart view' => '', + 'Milestone' => '마일스톤', + 'Documentation: %s' => '문서: %s', + 'Switch to the Gantt chart view' => '간트 차트 보기로 변경', // 'Reset the search/filter box' => '', - // 'Documentation' => '', + 'Documentation' => '문서', // 'Table of contents' => '', 'Gantt' => '간트', - // 'Author' => '', - // 'Version' => '', - // 'Plugins' => '', - // 'There is no plugin loaded.' => '', + 'Author' => '글쓴이', + 'Version' => '버전', + 'Plugins' => '플러그인', + 'There is no plugin loaded.' => '플러그인이 로드되지 않았습니다', 'Set maximum column height' => '최대 칼럼 높이 제한하기', 'Remove maximum column height' => '최대 칼럼 높이 없애기', 'My notifications' => '내 알림', 'Custom filters' => '사용자 정의 필터', - // 'Your custom filter have been created successfully.' => '', - // 'Unable to create your custom filter.' => '', - // 'Custom filter removed successfully.' => '', - // 'Unable to remove this custom filter.' => '', - // 'Edit custom filter' => '', - // 'Your custom filter have been updated successfully.' => '', - // 'Unable to update custom filter.' => '', + 'Your custom filter have been created successfully.' => '사용자 정의 필터가 성공적으로 생성되었습니다', + 'Unable to create your custom filter.' => '사용자 정의 필터 생성 비활성화', + 'Custom filter removed successfully.' => '사용자 정의 필터가 성공적으로 삭제되었습니다', + 'Unable to remove this custom filter.' => '정의 필터 삭제 비활성화', + 'Edit custom filter' => '정의 필터 수정', + 'Your custom filter have been updated successfully.' => '사용자 정의 필터가 성공적으로 수정되었습니다', + 'Unable to update custom filter.' => '정의 필터 수정 비활성화', 'Web' => '웹', // 'New attachment on task #%d: %s' => '', 'New comment on task #%d' => '할일 #%d에 새로운 댓글이 달렸습니다', @@ -874,283 +861,359 @@ return array( 'New task #%d: %s' => '할일 #%d: %s이 추가되었습니다', 'Task updated #%d' => '할일 #%d이 업데이트되었습니다', 'Task #%d closed' => '할일 #%d를 마쳤습니다', - // 'Task #%d opened' => '', + 'Task #%d opened' => '할일 #%d가 시작되었습니다', 'Column changed for task #%d' => '할일 #%d의 칼럼이 변경되었습니다', 'New position for task #%d' => '할일 #%d이 새로운 위치에 등록되었습니다', - // 'Swimlane changed for task #%d' => '', - // 'Assignee changed on task #%d' => '', - // '%d overdue tasks' => '', - // 'Task #%d is overdue' => '', + 'Swimlane changed for task #%d' => '#%d 할일의 스웜라인이 변경됩니다', + 'Assignee changed on task #%d' => '#%d 할일의 담당자가 변경됩니다', + '%d overdue tasks' => '할일의 기한이 %d일 지났습니다', + 'Task #%d is overdue' => '#%d 할일의 기한이 지났습니다', 'No new notifications.' => '알림이 없습니다', 'Mark all as read' => '모두 읽음', 'Mark as read' => '읽음', // 'Total number of tasks in this column across all swimlanes' => '', - // 'Collapse swimlane' => '', - // 'Expand swimlane' => '', - // 'Add a new filter' => '', - // 'Share with all project members' => '', - // 'Shared' => '', - // 'Owner' => '', + 'Collapse swimlane' => '스웜라인 붕괴', + 'Expand swimlane' => '스웜라인 확장', + 'Add a new filter' => '새로운 필터 추가', + 'Share with all project members' => '모든 프로젝트 맴버 공유', + 'Shared' => '공유', + 'Owner' => '소유자', 'Unread notifications' => '읽지않은 알림', 'Notification methods:' => '알림 방법', - // 'Import tasks from CSV file' => '', - // 'Unable to read your file' => '', - // '%d task(s) have been imported successfully.' => '', - // 'Nothing have been imported!' => '', - // 'Import users from CSV file' => '', - // '%d user(s) have been imported successfully.' => '', - // 'Comma' => '', - // 'Semi-colon' => '', - // 'Tab' => '', - // 'Vertical bar' => '', - // 'Double Quote' => '', - // 'Single Quote' => '', - // '%s attached a file to the task #%d' => '', - // 'There is no column or swimlane activated in your project!' => '', + 'Import tasks from CSV file' => 'CSV 파일에서 할일 가져오기', + 'Unable to read your file' => '파일을 읽을 수 없습니다', + '%d task(s) have been imported successfully.' => '%d 할일이 성공적으로 추가되었습니다', + 'Nothing have been imported!' => '추가가 되지 않았습니다!', + 'Import users from CSV file' => 'CSV 파일에서 사용자 가져오기', + '%d user(s) have been imported successfully.' => '%d 사용자가 성공적으로 추가되었습니다', + 'Comma' => '콤마', + 'Semi-colon' => '세미콜론', + 'Tab' => '탭', + 'Vertical bar' => '세로줄', + 'Double Quote' => '이중 따옴표', + 'Single Quote' => '따옴표', + '%s attached a file to the task #%d' => '%s가 할일 #%d에 파일을 추가하였습니다', + 'There is no column or swimlane activated in your project!' => '프로젝트에 활성화된 칼럼이나 스웜라인이 없습니다', // 'Append filter (instead of replacement)' => '', - // 'Append/Replace' => '', - // 'Append' => '', - // 'Replace' => '', + 'Append/Replace' => '추가/변경', + 'Append' => '추가', + 'Replace' => '변경', 'Import' => '가져오기', - // 'change sorting' => '', - // 'Tasks Importation' => '', - // 'Delimiter' => '', - // 'Enclosure' => '', - // 'CSV File' => '', - // 'Instructions' => '', - // 'Your file must use the predefined CSV format' => '', - // 'Your file must be encoded in UTF-8' => '', - // 'The first row must be the header' => '', - // 'Duplicates are not verified for you' => '', - // 'The due date must use the ISO format: YYYY-MM-DD' => '', - // 'Download CSV template' => '', + 'change sorting' => '정렬 변경', + 'Tasks Importation' => '할일 가져오기', + 'Delimiter' => '구분자', + 'Enclosure' => '동봉', + 'CSV File' => 'CSV 파일', + 'Instructions' => '명령', + 'Your file must use the predefined CSV format' => '파일은 미리 정의된 CVS 형식이어야 합니다', + 'Your file must be encoded in UTF-8' => '파일은 UTF-8로 인코딩되어야 합니다', + 'The first row must be the header' => '첫 줄은 헤더이어야 합니다', + 'Duplicates are not verified for you' => '사본이 허락되지 않습니다', + 'The due date must use the ISO format: YYYY-MM-DD' => '만기일은 ISO 형식이어야 합니다: YYYY-MM-DD', + 'Download CSV template' => 'CVS 탬플릿 내려받기', 'No external integration registered.' => '설정이 되어있지 않습니다', - // 'Duplicates are not imported' => '', - // 'Usernames must be lowercase and unique' => '', - // 'Passwords will be encrypted if present' => '', + 'Duplicates are not imported' => '사본을 가져올 수 없습니다', + 'Usernames must be lowercase and unique' => '사용자 이름은 소문자이며 유일해야 합니다', + 'Passwords will be encrypted if present' => '비밀번호는 암호화됩니다', '%s attached a new file to the task %s' => '%s이 새로운 파일을 할일 %s에 추가했습니다', - // 'Link type' => '', - // 'Assign automatically a category based on a link' => '', + 'Link type' => '링크 형식', + 'Assign automatically a category based on a link' => '링크 기반 자동 카테고리 할당', // 'BAM - Konvertible Mark' => '', - // 'Assignee Username' => '', - // 'Assignee Name' => '', - // 'Groups' => '', - // 'Members of %s' => '', - // 'New group' => '', - // 'Group created successfully.' => '', - // 'Unable to create your group.' => '', - // 'Edit group' => '', - // 'Group updated successfully.' => '', - // 'Unable to update your group.' => '', - // 'Add group member to "%s"' => '', - // 'Group member added successfully.' => '', - // 'Unable to add group member.' => '', - // 'Remove user from group "%s"' => '', - // 'User removed successfully from this group.' => '', - // 'Unable to remove this user from the group.' => '', - // 'Remove group' => '', - // 'Group removed successfully.' => '', - // 'Unable to remove this group.' => '', - // 'Project Permissions' => '', + 'Assignee Username' => '담당자의 사용자이름', + 'Assignee Name' => '당장자 이름', + 'Groups' => '그룹', + 'Members of %s' => '%s의 맴버', + 'New group' => '새로운 그룹', + 'Group created successfully.' => '그룹이 성공적으로 생성되었습니다', + 'Unable to create your group.' => '그룹 생성 비활성화', + 'Edit group' => '그룹 편집', + 'Group updated successfully.' => '그룹이 성공적으로 수정되었습니다', + 'Unable to update your group.' => '그룹 수정 비활성화', + 'Add group member to "%s"' => '%s 그룹 맴버 추가', + 'Group member added successfully.' => '그룹 맴버가 성공적으로 추가되었습니다', + 'Unable to add group member.' => '그룹 맴버 추가 비활성화', + 'Remove user from group "%s"' => '%s 그룹 사용자 삭제', + 'User removed successfully from this group.' => '그룹 사용자가 성공적으로 삭제되었습니다', + 'Unable to remove this user from the group.' => '그룹 사용자 삭제 비활성화', + 'Remove group' => '그룹 삭제', + 'Group removed successfully.' => '그룹이 성공적으로 삭제되었습니다', + 'Unable to remove this group.' => '그룹 삭제 비활성화', + 'Project Permissions' => '프로젝트 권한', 'Manager' => '매니저', 'Project Manager' => '프로젝트 매니저', 'Project Member' => '프로젝트 멤버', - // 'Project Viewer' => '', - // 'Your account is locked for %d minutes' => '', + 'Project Viewer' => '프로젝트 뷰어', + 'Your account is locked for %d minutes' => '%d분 동안 계정이 잠깁니다', // 'Invalid captcha' => '', - // 'The name must be unique' => '', + 'The name must be unique' => '이름은 유일해야 합니다', 'View all groups' => '모든그룹보기', - // 'View group members' => '', - // 'There is no user available.' => '', - // 'Do you really want to remove the user "%s" from the group "%s"?' => '', - // 'There is no group.' => '', - // 'External Id' => '', + 'View group members' => '그룹맴버 보기', + 'There is no user available.' => '가능한 사용자가 없습니다', + 'Do you really want to remove the user "%s" from the group "%s"?' => '"%s" 사용자를 "%s" 에서 삭제하시겠습니까?', + 'There is no group.' => '그룹이 없습니다', + 'External Id' => '외부 아이디', 'Add group member' => '멤버추가', - // 'Do you really want to remove this group: "%s"?' => '', - // 'There is no user in this group.' => '', - // 'Remove this user' => '', + 'Do you really want to remove this group: "%s"?' => '그룹을 삭제하시겠습니까: "%s"?', + 'There is no user in this group.' => '이 그룹에는 사용자가 없습니다', + 'Remove this user' => '사용자 삭제', 'Permissions' => '권한', - // 'Allowed Users' => '', - // 'No user have been allowed specifically.' => '', + 'Allowed Users' => '사용자 승인', + 'No user have been allowed specifically.' => '구체적으로 승인된 사용자가 없습니다', 'Role' => '역할', - // 'Enter user name...' => '', - // 'Allowed Groups' => '', - // 'No group have been allowed specifically.' => '', - // 'Group' => '', - // 'Group Name' => '', - // 'Enter group name...' => '', + 'Enter user name...' => '사용자 이름을 입력합니다...', + 'Allowed Groups' => '승인된 그룹', + 'No group have been allowed specifically.' => '구체적으로 승인된 그룹이 없습니다', + 'Group' => '그룹', + 'Group Name' => '그룹명', + 'Enter group name...' => '그룹명을 입력합니다...', 'Role:' => '역할: ', 'Project members' => '프로젝트 멤버', - // 'Compare hours for "%s"' => '', - // '%s mentioned you in the task #%d' => '', - // '%s mentioned you in a comment on the task #%d' => '', - // 'You were mentioned in the task #%d' => '', + 'Compare hours for "%s"' => '"%s" 시간동안 비교', + '%s mentioned you in the task #%d' => '#%d 할일에서 %s가 당신을 언급하였습니다', + '%s mentioned you in a comment on the task #%d' => '#%d 할일에서 %s가 당신의 댓글을 언급하였습니다', + 'You were mentioned in the task #%d' => '#%d 할일에서 당신이 언급되었습니다', 'You were mentioned in a comment on the task #%d' => '할일 #%d의 댓글에서 언급되었습니다', - // 'Mentioned' => '', - // 'Compare Estimated Time vs Actual Time' => '', - // 'Estimated hours: ' => '', - // 'Actual hours: ' => '', - // 'Hours Spent' => '', - // 'Hours Estimated' => '', - // 'Estimated Time' => '', - // 'Actual Time' => '', - // 'Estimated vs actual time' => '', + 'Mentioned' => '언급된', + 'Compare Estimated Time vs Actual Time' => '예상 시간과 실제 시간 비교', + 'Estimated hours: ' => '예상 시간: ', + 'Actual hours: ' => '실제 시간: ', + 'Hours Spent' => '소요 시간', + 'Hours Estimated' => '예상 시간', + 'Estimated Time' => '예상 시간', + 'Actual Time' => '실제 시간', + 'Estimated vs actual time' => '예상 vs 실제 시간', // 'RUB - Russian Ruble' => '', - // 'Assign the task to the person who does the action when the column is changed' => '', - // 'Close a task in a specific column' => '', + 'Assign the task to the person who does the action when the column is changed' => '칼럼이 변경되면 액션하지 않는 사람에게 할일을 할당합니다', + 'Close a task in a specific column' => '상세 칼럼의 할일을 종료합니다', 'Time-based One-time Password Algorithm' => '시간에 기반한 1회용 패스워드 알고리즘', - 'Two-Factor Provider: ' => '2단 인증: ', - // 'Disable two-factor authentication' => '', - 'Enable two-factor authentication' => '2단 인증 활성화', + 'Two-Factor Provider: ' => '이중 인증: ', + 'Disable two-factor authentication' => '이중 인증 비활성화', + 'Enable two-factor authentication' => '이중 인증 활성화', // 'There is no integration registered at the moment.' => '', - // 'Password Reset for Kanboard' => '', + 'Password Reset for Kanboard' => 'Kanboard의 비밀번호 초기화', 'Forgot password?' => '비밀번호 찾기', - // 'Enable "Forget Password"' => '', - // 'Password Reset' => '', - // 'New password' => '', - // 'Change Password' => '', - // 'To reset your password click on this link:' => '', - 'Last Password Reset' => '비밀번호 초기화', + 'Enable "Forget Password"' => '"비밀번호 분실" 활성화', + 'Password Reset' => '비밀번호 초기화', + 'New password' => '새로운 비밀번호', + 'Change Password' => '비밀번호 변경', + 'To reset your password click on this link:' => '비밀번호를 초기화 하시려면 링크를 눌러주세요:', + 'Last Password Reset' => '마지막 비밀번호 초기화', 'The password has never been reinitialized.' => '비밀번호가 초기화되지 않았습니다', - // 'Creation' => '', - // 'Expiration' => '', + 'Creation' => '생성', + 'Expiration' => '만료', 'Password reset history' => '비밀번호 초기화 기록', - // 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => '', - // 'Do you really want to close all tasks of this column?' => '', - // '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '', + 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => '칼럼 "%s"와 스웜라인 "%s"의 모든 할일이 성공적으로 종료되었습니다', + 'Do you really want to close all tasks of this column?' => '이 칼럼의 모든 할일을 종료 하시겠습니까?', + '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '칼럼 "%s"와 스웜라인 "%s"의 할일 %d가 종료될 것입니다', 'Close all tasks of this column' => '칼럼의 모든 할일 마치기', - // 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => '', + 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => '프로젝트 알림 방법으로 플러그인이 등록되지 않았습니다. 각각의 알림을 프로파일에서 설정하실 수 있습니다', 'My dashboard' => '대시보드', 'My profile' => '프로필', - // 'Project owner: ' => '', - // 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => '', + 'Project owner: ' => '프로젝트 소유자', + 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => '프로젝트 구분자는 선택사항이며, 숫자와 문자만 가능합니다. 예: MYPROJECT.', // 'Project owner' => '', - // 'Those dates are useful for the project Gantt chart.' => '', - // 'Private projects do not have users and groups management.' => '', - // 'There is no project member.' => '', - // 'Priority' => '', - // 'Task priority' => '', - // 'General' => '', - // 'Dates' => '', - // 'Default priority' => '', - // 'Lowest priority' => '', - // 'Highest priority' => '', - // 'If you put zero to the low and high priority, this feature will be disabled.' => '', - // 'Close a task when there is no activity' => '', - // 'Duration in days' => '', - // 'Send email when there is no activity on a task' => '', - // 'Unable to fetch link information.' => '', + 'Those dates are useful for the project Gantt chart.' => '이 날짜는 프로젝트 간트 차트에 사용됩니다', + 'Private projects do not have users and groups management.' => '비밀 프로젝트는 사용자나 관리 그룹이 소유하지 않습니다', + 'There is no project member.' => '프로젝트 맴버가 없습니다', + 'Priority' => '우선순위', + 'Task priority' => '할일의 우선순위', + 'General' => '일반적인', + 'Dates' => '날짜', + 'Default priority' => '기본 우선순위', + 'Lowest priority' => '낮은 우선순위', + 'Highest priority' => '높은 우선순위', + 'If you put zero to the low and high priority, this feature will be disabled.' => '만약 낮은/높은 우선순위에 0을 입력하면 이 특성은 비활성화됩니다', + 'Close a task when there is no activity' => '활동이 없는 할일을 종료합니다', + 'Duration in days' => '기간', + 'Send email when there is no activity on a task' => '활동이 없는 할일을 이메일로 보냅니다', + 'Unable to fetch link information.' => '링크 정보 가져오기 비활성화', // 'Daily background job for tasks' => '', - // 'Auto' => '', - // 'Related' => '', - // 'Attachment' => '', - // 'Title not found' => '', - // 'Web Link' => '', - // 'External links' => '', - // 'Add external link' => '', - // 'Type' => '', - // 'Dependency' => '', - // 'Add internal link' => '', - // 'Add a new external link' => '', - // 'Edit external link' => '', - // 'External link' => '', - // 'Copy and paste your link here...' => '', + 'Auto' => '자동', + 'Related' => '연관된', + 'Attachment' => '첨부', + 'Title not found' => '제목이 없습니다', + 'Web Link' => '웹 링크', + 'External links' => '외부 링크', + 'Add external link' => '외부 링크 추가', + 'Type' => '타입', + 'Dependency' => '의존', + 'Add internal link' => '내부 링크 추가', + 'Add a new external link' => '새로운 외부 링크 추가', + 'Edit external link' => '외부 링크 수정', + 'External link' => '외부 링크', + 'Copy and paste your link here...' => '여기에 링크를 복사/붙여넣기', // 'URL' => '', - // 'Internal links' => '', - // 'Assign to me' => '', - // 'Me' => '', - // 'Do not duplicate anything' => '', - // 'Projects management' => '', - // 'Users management' => '', - // 'Groups management' => '', - // 'Create from another project' => '', - // 'open' => '', - // 'closed' => '', - // 'Priority:' => '', - // 'Reference:' => '', - // 'Complexity:' => '', - // 'Swimlane:' => '', - // 'Column:' => '', - // 'Position:' => '', - // 'Creator:' => '', - // 'Time estimated:' => '', - // '%s hours' => '', - // 'Time spent:' => '', - // 'Created:' => '', - // 'Modified:' => '', - // 'Completed:' => '', - // 'Started:' => '', - // 'Moved:' => '', - // 'Task #%d' => '', - // 'Date and time format' => '', - // 'Time format' => '', - // 'Start date: ' => '', - // 'End date: ' => '', - // 'New due date: ' => '', - // 'Start date changed: ' => '', - // 'Disable private projects' => '', - // 'Do you really want to remove this custom filter: "%s"?' => '', - // 'Remove a custom filter' => '', - // 'User activated successfully.' => '', + 'Internal links' => '내부 링크', + 'Assign to me' => '나에게 할당', + 'Me' => '나', + 'Do not duplicate anything' => '복사할까요?', + 'Projects management' => '프로젝트 관리', + 'Users management' => '사용자 관리', + 'Groups management' => '그룹 관리', + 'Create from another project' => '다른 프로젝트 생성', + 'open' => '시작', + 'closed' => '종료', + 'Priority:' => '우선순위:', + 'Reference:' => '참고:', + 'Complexity:' => '복합:', + 'Swimlane:' => '스웜라인:', + 'Column:' => '칼럼:', + 'Position:' => '위치:', + 'Creator:' => '생성자:', + 'Time estimated:' => '예상 시간:', + '%s hours' => '%s 시간', + 'Time spent:' => '소요 시간:', + 'Created:' => '생성:', + 'Modified:' => '수정;', + 'Completed:' => '완료:', + 'Started:' => '시작:', + 'Moved:' => '이동:', + 'Task #%d' => '할일 #%d', + 'Date and time format' => '날짜와 시간 형식', + 'Time format' => '시간 형식', + 'Start date: ' => '시작일: ', + 'End date: ' => '종료일: ', + 'New due date: ' => '새로운 만기일: ', + 'Start date changed: ' => '변경된 시작일: ', + 'Disable private projects' => '비밀 프로젝트 비활성화', + 'Do you really want to remove this custom filter: "%s"?' => '정의 필터를 삭제하시겠습니까: "%s"?', + 'Remove a custom filter' => '정의 필터 삭제', + 'User activated successfully.' => '사용자가 성공적으로 활성화되었습니다', // 'Unable to enable this user.' => '', - // 'User disabled successfully.' => '', + 'User disabled successfully.' => '사용자가 성공적으로 비활성화되었습니다', // 'Unable to disable this user.' => '', - // 'All files have been uploaded successfully.' => '', - // 'View uploaded files' => '', - // 'The maximum allowed file size is %sB.' => '', - // 'Choose files again' => '', - // 'Drag and drop your files here' => '', - // 'choose files' => '', - // 'View profile' => '', - // 'Two Factor' => '', - // 'Disable user' => '', - // 'Do you really want to disable this user: "%s"?' => '', - // 'Enable user' => '', - // 'Do you really want to enable this user: "%s"?' => '', - // 'Download' => '', - // 'Uploaded: %s' => '', - // 'Size: %s' => '', - // 'Uploaded by %s' => '', - // 'Filename' => '', - // 'Size' => '', - // 'Column created successfully.' => '', - // 'Another column with the same name exists in the project' => '', - // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', - // 'Change column position' => '', - // 'Switch to the project overview' => '', - // 'User filters' => '', - // 'Category filters' => '', - // 'Upload a file' => '', - // 'View file' => '', - // 'Last activity' => '', - // 'Change subtask position' => '', - // 'This value must be greater than %d' => '', - // 'Another swimlane with the same name exists in the project' => '', - // 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => '', - // 'Actions duplicated successfully.' => '', - // 'Unable to duplicate actions.' => '', - // 'Add a new action' => '', - // 'Import from another project' => '', - // 'There is no action at the moment.' => '', - // 'Import actions from another project' => '', - // 'There is no available project.' => '', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', + 'All files have been uploaded successfully.' => '모든 파일이 성공적으로 업로드되었습니다', + 'View uploaded files' => '업로드 파일 보기', + 'The maximum allowed file size is %sB.' => '업로드 파일의 최대 크기는 %sB 입니다', + 'Choose files again' => '파일 다시 선택', + 'Drag and drop your files here' => '파일을 이곳으로 끌고오기', + 'choose files' => '파일 선택', + 'View profile' => '프로파일 보기', + 'Two Factor' => '이중', + 'Disable user' => '사용자 비활성화', + 'Do you really want to disable this user: "%s"?' => '사용자를 비활성화 시키겠습니까: "%s"?', + 'Enable user' => '사용자 활성화', + 'Do you really want to enable this user: "%s"?' => '사용자를 활성화 시키겠습니까: "%s"?', + 'Download' => '내려받기', + 'Uploaded: %s' => '올리기: %s', + 'Size: %s' => '크기: %s', + 'Uploaded by %s' => '%s로 올리기', + 'Filename' => '파일 이름', + 'Size' => '크기', + 'Column created successfully.' => '칼럼이 성공적으로 생성되었습니다', + 'Another column with the same name exists in the project' => '프로젝트에 동일한 이름의 칼럼이 있습니다', + 'Default filters' => '기본 필터', + 'Your board doesn\'t have any columns!' => '보드에 칼럼이 존재하지 않습니다', + 'Change column position' => '칼럼 위치 변경', + 'Switch to the project overview' => '프로젝트 개요로 변경', + 'User filters' => '사용자 필터', + 'Category filters' => '카테고리 필터', + 'Upload a file' => '파일 업로드', + 'View file' => '파일 보기', + 'Last activity' => '마지막 행동', + 'Change subtask position' => '서브 할일 위치 변경', + 'This value must be greater than %d' => '이 값은 %d보다 커야 합니다', + 'Another swimlane with the same name exists in the project' => '프로젝트에 같은 이름의 스웜라인이 존재합니다', + 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => '예: http://example.kanboard.net/ (절대적 URLs을 생성하는데 사용됨)', + 'Actions duplicated successfully.' => '행동이 성공적으로 복제되었습니다', + 'Unable to duplicate actions.' => '행동 복제 비활성화', + 'Add a new action' => '새로운 행동 추가', + 'Import from another project' => '다른 프로젝트에서 가져오기', + 'There is no action at the moment.' => '현재 행동이 없습니다', + 'Import actions from another project' => '다른 프로젝트에서 행동 가져오기', + 'There is no available project.' => '사용 가능한 프로젝트가 없습니다', + 'Local File' => '로컬 파일', + 'Configuration' => '구성', + 'PHP version:' => 'PHP 버전:', // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'OS version:' => '운영체제 버전:', + 'Database version:' => '데이터베이스 버전:', + 'Browser:' => '브라우저:', + 'Task view' => '할일 보기', + 'Edit task' => '할일 수정', + 'Edit description' => '설명 수정', + 'New internal link' => '새로운 내부 링크', + 'Display list of keyboard shortcuts' => '키보드 숏컷 리스트 보여주기', + 'Menu' => '메뉴', + 'Set start date' => '시작일 설정', + 'Avatar' => '아바타', + 'Upload my avatar image' => '아바타 이미지 올리기', + 'Remove my image' => '이미지 삭제', + 'The OAuth2 state parameter is invalid' => 'OAuth2 상태값이 올바르지 않습니다', + 'User not found.' => '사용자를 찾을 수 없습니다', + 'Search in activity stream' => '활성 스트림 찾기', + 'My activities' => '나의 활동', + 'Activity until yesterday' => '어제까지의 활동', + 'Activity until today' => '오늘까지의 활동', + 'Search by creator: ' => '생성자로 검색: ', + 'Search by creation date: ' => '생성 날짜로 검색: ', + 'Search by task status: ' => '할일 상태로 검색: ', + 'Search by task title: ' => '할일 제목으로 검색: ', + 'Activity stream search' => '활동 스트림 검색', + 'Projects where "%s" is manager' => '"%s" 관리자의 프로젝트', + 'Projects where "%s" is member' => '"%s" 맴버의 프로젝트', + 'Open tasks assigned to "%s"' => '"%s"에게 할당된 할일 시작하기', + 'Closed tasks assigned to "%s"' => '"%s"에게 할당된 할일 종료하기', + 'Assign automatically a color based on a priority' => '우선순위로 색깔 자동 지정', + 'Overdue tasks for the project(s) "%s"' => '"%s" 프로젝트의 기한이 지난 할일', + 'Upload files' => '파일 올리기', + 'Installed Plugins' => '설치된 플러그인', + 'Plugin Directory' => '플러그인 폴더', + 'Plugin installed successfully.' => '플러그인이 성공적으로 설치 되었습니다', + 'Plugin updated successfully.' => '플러그인이 성공적으로 업데이트 되었습니다', + 'Plugin removed successfully.' => '플러그인이 성공적으로 삭제 되었습니다', + 'Subtask converted to task successfully.' => '서브 할일이 성공적으로 할일로 변경 되었습니다', + 'Unable to convert the subtask.' => '서브할일 변경 비활성화', + 'Unable to extract plugin archive.' => '플러그인 보관소 비활성화', + 'Plugin not found.' => '플러그인을 찾을 수 없습니다', + 'You don\'t have the permission to remove this plugin.' => '플러그인 삭제 권한이 없습니다', + 'Unable to download plugin archive.' => '플러그인 보관소 다운로드 비활성화', + 'Unable to write temporary file for plugin.' => '플러그인의 임시 파일 기록 비활성화', + 'Unable to open plugin archive.' => '플러그인 보관소 열기 비활성화', + 'There is no file in the plugin archive.' => '플러그인 보관소에 파일이 없습니다', + 'Create tasks in bulk' => '벌크에 할일 생성', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + 'There is no plugin available.' => '사용할 수 있는 플러그인이 없습니다', + 'Install' => '설치', + 'Update' => '업데이트', + 'Up to date' => '최신의', + 'Not available' => '사용 불가능', + 'Remove plugin' => '플러그인 삭제', + 'Do you really want to remove this plugin: "%s"?' => '플러그인을 삭제 하시겠습니까: "%s"?', + 'Uninstall' => '제거', + 'Listing' => '목록', + 'Metadata' => '메타 데이터', + 'Manage projects' => '프로젝트 관리', + 'Convert to task' => '할일로 변경', + 'Convert sub-task to task' => '서브 할일을 할일로 변경', + 'Do you really want to convert this sub-task to a task?' => '서브 할일을 일로 변경하시겠습니까?', + 'My task title' => '할일 제목', + // 'Enter one task by line.' => '', + 'Number of failed login:' => '로그인 실패 횟수', + 'Account locked until:' => '계정이 잠겼습니다:', + 'Email settings' => '이메일 설정', + 'Email sender address' => '이메일 송신자 주소', + 'Email transport' => '이메일 전송', + // 'Webhook token' => '', + 'Imports' => '가져오기', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/my_MY/translations.php b/sources/app/Locale/my_MY/translations.php index 36b3db0..94e9478 100644 --- a/sources/app/Locale/my_MY/translations.php +++ b/sources/app/Locale/my_MY/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Lihat tugas ini', 'Remove user' => 'Hapus pengguna', 'Do you really want to remove this user: "%s"?' => 'Anda yakin mahu menghapus pengguna ini : « %s » ?', - 'New user' => 'Pengguna baru', 'All users' => 'Semua pengguna', 'Username' => 'Nama pengguna', 'Password' => 'Kata laluan', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d tugas yang ditutup', 'No task for this project' => 'Tidak ada tugas dalam projek ini', 'Public link' => 'Pautan publik', - 'Change assignee' => 'Mengubah orang yand ditugaskan', - 'Change assignee for the task "%s"' => 'Mengubah orang yang ditugaskan untuk tugas « %s »', 'Timezone' => 'Zona waktu', 'Sorry, I didn\'t find this information in my database!' => 'Maaf, saya tidak menemukan informasi ini dalam basis data saya !', 'Page not found' => 'Halaman tidak ditemukan', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Tinggalkan deskripsi', 'Comment added successfully.' => 'Komentar berhasil ditambahkan.', 'Unable to create your comment.' => 'Tidak dapat menambahkan komentar anda.', - 'Edit this task' => 'Modifikasi tugas ini', 'Due Date' => 'Batas Tanggal Terakhir', 'Invalid date' => 'Tanggal tidak valid', 'Automatic actions' => 'Tindakan otomatis', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori :', 'Categories' => 'Kategori', - 'Category not found.' => 'Kategori tidak ditemukan', 'Your category have been created successfully.' => 'Kategori anda berhasil dibuat.', 'Unable to create your category.' => 'Tidak dapat membuat kategori anda.', 'Your category have been updated successfully.' => 'Kategori anda berhasil diperbaharui.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Apakah anda yakin akan menghapus berkas ini « %s » ?', 'Attachments' => 'Lampiran', 'Edit the task' => 'Modifikasi tugas', - 'Edit the description' => 'Modifikasi deskripsi', 'Add a comment' => 'Tambahkan komentar', 'Edit a comment' => 'Modifikasi komentar', 'Summary' => 'Ringkasan', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Tidak ada otentifikasi eksternal yang aktif.', 'Password modified successfully.' => 'Kata laluan telah berjaya ditukar.', 'Unable to change the password.' => 'Tidak dapat merubah kata laluanr.', - 'Change category for the task "%s"' => 'Rubah kategori untuk tugas « %s »', 'Change category' => 'Tukar kategori', '%s updated the task %s' => '%s memperbaharui tugas %s', '%s opened the task %s' => '%s membuka tugas %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Tentang', 'Database driver:' => 'Driver pengkalan data:', 'Board settings' => 'Pengaturan papan', - 'URL and token' => 'URL dan token', 'Webhook settings' => 'Penetapan webhook', - 'URL for task creation:' => 'URL untuk cipta tugas:', 'Reset token' => 'Menetap semula token', 'API endpoint:' => 'API endpoint :', 'Refresh interval for private board' => 'Interval pembaruan untuk papan pribadi', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Padam swimlane', 'Show default swimlane' => 'Tampilkan piawai swimlane', 'Swimlane modification for the project "%s"' => 'Modifikasi swimlane untuk projek « %s »', - 'Swimlane not found.' => 'Swimlane tidak ditemui.', 'Swimlane removed successfully.' => 'Swimlane telah dipadamkan.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane telah dikemaskini.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Semua swimlane', 'All colors' => 'Semua warna', 'Moved to column %s' => 'Pindah ke kolom %s', - 'Change description' => 'Ubah keterangan', 'User dashboard' => 'Papan Kenyataan pengguna', 'Allow only one subtask in progress at the same time for a user' => 'Izinkan hanya satu subtugas dalam proses secara bersamaan untuk satu pengguna', 'Edit column "%s"' => 'Modifikasi kolom « %s »', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'lihat papan di Kanboard', 'The task have been moved to the first swimlane' => 'Tugas telah dipindahkan ke swimlane pertama', 'The task have been moved to another swimlane:' => 'Tugas telah dipindahkan ke swimlane lain:', - 'Overdue tasks for the project "%s"' => 'Tugas terlambat untuk projek « %s »', 'New title: %s' => 'Judul baru : %s', 'The task is not assigned anymore' => 'Tugas tidak ditugaskan lagi', 'New assignee: %s' => 'Penerima baru : %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Hentikan timer', 'Start timer' => 'Mulai timer', 'Add project member' => 'Tambahkan anggota projek', - 'Enable notifications' => 'Aktifkan pemberitahuan', 'My activity stream' => 'Aliran kegiatan saya', 'My calendar' => 'Kalender saya', 'Search tasks' => 'Cari tugas', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + 'Overdue tasks for the project(s) "%s"' => 'Tugas terlambat untuk projek « %s »', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/nb_NO/translations.php b/sources/app/Locale/nb_NO/translations.php index 465efb5..cfd7ba1 100644 --- a/sources/app/Locale/nb_NO/translations.php +++ b/sources/app/Locale/nb_NO/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Se denne oppgaven', 'Remove user' => 'Fjern bruker', 'Do you really want to remove this user: "%s"?' => 'Vil du fjerne denne brukeren: "%s"?', - 'New user' => 'Ny bruker', 'All users' => 'Alle brukere', 'Username' => 'Brukernavn', 'Password' => 'Passord', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d lukkede oppgaver', 'No task for this project' => 'Ingen oppgaver i dette prosjektet', 'Public link' => 'Offentligt lenke', - 'Change assignee' => 'Tildel oppgaven til andre', - 'Change assignee for the task "%s"' => 'Endre tildeling av oppgaven: "%s"', 'Timezone' => 'Tidssone', 'Sorry, I didn\'t find this information in my database!' => 'Denne informasjonen kunne ikke finnes i databasen!', 'Page not found' => 'Siden er ikke funnet', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Legg inn en beskrivelse...', 'Comment added successfully.' => 'Kommentaren er lagt til.', 'Unable to create your comment.' => 'Din kommentar kunne ikke opprettes.', - 'Edit this task' => 'Rediger oppgaven', 'Due Date' => 'Forfallsdato', 'Invalid date' => 'Ugyldig dato', 'Automatic actions' => 'Automatiske handlinger', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori:', 'Categories' => 'Kategorier', - 'Category not found.' => 'Kategori ikke funnet.', 'Your category have been created successfully.' => 'Kategorien er opprettet.', 'Unable to create your category.' => 'Kategorien kunne ikke opprettes.', 'Your category have been updated successfully.' => 'Kategorien er oppdatert.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Vil du fjerne filen: "%s"?', 'Attachments' => 'Vedlegg', 'Edit the task' => 'Rediger oppgaven', - 'Edit the description' => 'Rediger beskrivelsen', 'Add a comment' => 'Legg til en kommentar', 'Edit a comment' => 'Rediger en kommentar', 'Summary' => 'Sammendrag', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Ingen eksterne godkjenninger aktiveret.', 'Password modified successfully.' => 'Passord er endret.', 'Unable to change the password.' => 'Passordet kuenne ikke endres.', - 'Change category for the task "%s"' => 'Endre kategori for oppgaven "%s"', 'Change category' => 'Endre kategori', '%s updated the task %s' => '%s oppdaterte oppgaven %s', '%s opened the task %s' => '%s åpnet oppgaven %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Om', 'Database driver:' => 'Database driver:', 'Board settings' => 'Innstillinger for prosjektside', - 'URL and token' => 'URL og token', 'Webhook settings' => 'Webhook innstillinger', - 'URL for task creation:' => 'URL for oppgaveopprettelse:', 'Reset token' => 'Resette token', 'API endpoint:' => 'API endpoint:', 'Refresh interval for private board' => 'Oppdateringsintervall for privat hovedside', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Fjern en svømmebane', 'Show default swimlane' => 'Vis standard svømmebane', // 'Swimlane modification for the project "%s"' => '', - 'Swimlane not found.' => 'Svømmebane ikke funnet', 'Swimlane removed successfully.' => 'Svømmebane fjernet', 'Swimlanes' => 'Svømmebaner', 'Swimlane updated successfully.' => 'Svømmebane oppdatert', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Alle svømmebaner', 'All colors' => 'Alle farger', // 'Moved to column %s' => '', - 'Change description' => 'Endre beskrivelse', 'User dashboard' => 'Brukerens hovedside', // 'Allow only one subtask in progress at the same time for a user' => '', // 'Edit column "%s"' => '', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', // 'New title: %s' => '', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Stopp timer', 'Start timer' => 'Start timer', 'Add project member' => 'Legg til prosjektmedlem', - 'Enable notifications' => 'Aktiver varslinger', 'My activity stream' => 'Aktivitetslogg', 'My calendar' => 'Min kalender', 'Search tasks' => 'Søk oppgave', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/nl_NL/translations.php b/sources/app/Locale/nl_NL/translations.php index 3c3fa1e..69f2b86 100644 --- a/sources/app/Locale/nl_NL/translations.php +++ b/sources/app/Locale/nl_NL/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Deze taak bekijken', 'Remove user' => 'Gebruiker verwijderen', 'Do you really want to remove this user: "%s"?' => 'Weet u zeker dat u deze gebruiker wil verwijderen : « %s » ?', - 'New user' => 'Nieuwe gebruiker', 'All users' => 'Alle gebruikers', 'Username' => 'Gebruikersnaam', 'Password' => 'Wachtwoord', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d gesloten taken', 'No task for this project' => 'Geen taken voor dit project', 'Public link' => 'Publieke link', - 'Change assignee' => 'Toegewezene aanpassen', - 'Change assignee for the task "%s"' => 'Toegewezene aanpassen voor taak « %s »', 'Timezone' => 'Tijdzone', 'Sorry, I didn\'t find this information in my database!' => 'Sorry deze informatie kon niet worden gevonden in de database !', 'Page not found' => 'Pagina niet gevonden', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Schrijf een omschrijving', 'Comment added successfully.' => 'Commentaar succesvol toegevoegd.', 'Unable to create your comment.' => 'Commentaar toevoegen niet gelukt.', - 'Edit this task' => 'Deze taak aanpassen', 'Due Date' => 'Vervaldag', 'Invalid date' => 'Ongeldige datum', 'Automatic actions' => 'Geautomatiseerd acties', @@ -250,7 +246,6 @@ return array( 'Category' => 'Categorie', 'Category:' => 'Categorie :', 'Categories' => 'Categorieën', - 'Category not found.' => 'Categorie niet gevonden', 'Your category have been created successfully.' => 'Categorie succesvol aangemaakt.', 'Unable to create your category.' => 'Categorie aanmaken niet gelukt.', 'Your category have been updated successfully.' => 'Categorie succesvol aangepast.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Weet u zeker dat u dit bestand wil verwijderen: « %s » ?', 'Attachments' => 'Bijlages', 'Edit the task' => 'Taak aanpassen', - 'Edit the description' => 'Omschrijving aanpassen', 'Add a comment' => 'Commentaar toevoegen', 'Edit a comment' => 'Commentaar aanpassen', 'Summary' => 'Samenvatting', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Geen externe authenticatie aangezet.', 'Password modified successfully.' => 'Wachtwoord succesvol aangepast.', 'Unable to change the password.' => 'Aanpassen van wachtwoord niet gelukt.', - 'Change category for the task "%s"' => 'Pas categorie aan voor taak « %s »', 'Change category' => 'Categorie aanpassen', '%s updated the task %s' => '%s heeft taak %s aangepast', '%s opened the task %s' => '%s heeft taak %s geopend', @@ -413,9 +406,7 @@ return array( 'About' => 'Over', 'Database driver:' => 'Database driver :', 'Board settings' => 'Bord instellingen', - 'URL and token' => 'URL en token', 'Webhook settings' => 'Webhook instellingen', - 'URL for task creation:' => 'URL voor aanmaken taken :', 'Reset token' => 'Token resetten', 'API endpoint:' => 'API endpoint :', 'Refresh interval for private board' => 'Verversingsinterval voor private borden', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Verwijder swinlane', 'Show default swimlane' => 'Standaard swimlane tonen', 'Swimlane modification for the project "%s"' => 'Swinlane aanpassing voor project « %s »', - 'Swimlane not found.' => 'Swimlane niet gevonden.', 'Swimlane removed successfully.' => 'Swimlane succesvol verwijderd.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane succesvol aangepast.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Alle swimlanes', 'All colors' => 'Alle kleuren', 'Moved to column %s' => 'Verplaatst naar kolom %s', - 'Change description' => 'Verandering omschrijving', 'User dashboard' => 'Gebruiker dashboard', 'Allow only one subtask in progress at the same time for a user' => 'Sta maximaal één subtaak in behandeling toe per gebruiker', 'Edit column "%s"' => 'Kolom « %s » aanpassen', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', 'New title: %s' => 'Nieuw titel: %s', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Stop timer', 'Start timer' => 'Start timer', 'Add project member' => 'Voeg projectlid toe', - 'Enable notifications' => 'Schakel notificaties in', 'My activity stream' => 'Mijn activiteiten', 'My calendar' => 'Mijn kalender', 'Search tasks' => 'Zoek taken', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/pl_PL/translations.php b/sources/app/Locale/pl_PL/translations.php index d06e347..7c132bb 100644 --- a/sources/app/Locale/pl_PL/translations.php +++ b/sources/app/Locale/pl_PL/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Zobacz zadanie', 'Remove user' => 'Usuń użytkownika', 'Do you really want to remove this user: "%s"?' => 'Na pewno chcesz usunąć użytkownika: "%s"?', - 'New user' => 'Nowy użytkownik', 'All users' => 'Wszyscy użytkownicy', 'Username' => 'Nazwa użytkownika', 'Password' => 'Hasło', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d zamkniętych zadań', 'No task for this project' => 'Brak zadań dla tego projektu', 'Public link' => 'Link publiczny', - 'Change assignee' => 'Zmień odpowiedzialną osobę', - 'Change assignee for the task "%s"' => 'Zmień odpowiedzialną osobę dla zadania "%s"', 'Timezone' => 'Strefa czasowa', 'Sorry, I didn\'t find this information in my database!' => 'Niestety nie znaleziono tej informacji w bazie danych', 'Page not found' => 'Strona nie istnieje', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Dodaj opis', 'Comment added successfully.' => 'Komentarz dodany', 'Unable to create your comment.' => 'Nie udało się dodać komentarza', - 'Edit this task' => 'Edytuj zadanie', 'Due Date' => 'Termin', 'Invalid date' => 'Błędna data', 'Automatic actions' => 'Akcje automatyczne', @@ -192,7 +188,7 @@ return array( 'Do you really want to remove this action: "%s"?' => 'Na pewno chcesz usunąć akcję "%s"?', 'Remove an automatic action' => 'Usuń akcję automatyczną', 'Assign the task to a specific user' => 'Przypisz zadanie do wybranego użytkownika', - 'Assign the task to the person who does the action' => 'Przypisz zadanie to osoby wykonującej akcję', + 'Assign the task to the person who does the action' => 'Przypisz zadanie do osoby wykonującej akcję', 'Duplicate the task to another project' => 'Kopiuj zadanie do innego projektu', 'Move a task to another column' => 'Przeniesienie zadania do innej kolumny', 'Task modification' => 'Modyfikacja zadania', @@ -216,7 +212,7 @@ return array( 'Unknown' => 'Nieznany', 'Last logins' => 'Ostatnie logowania', 'Login date' => 'Data logowania', - 'Authentication method' => 'Sposób autentykacji', + 'Authentication method' => 'Sposób uwierzytelnienia', 'IP address' => 'Adres IP', 'User agent' => 'Przeglądarka', 'Persistent connections' => 'Stałe połączenia', @@ -235,10 +231,10 @@ return array( '%d comments' => '%d Komentarzy', '%d comment' => '%d Komentarz', 'Email address invalid' => 'Błędny adres email', - // 'Your external account is not linked anymore to your profile.' => '', - // 'Unable to unlink your external account.' => '', - // 'External authentication failed' => '', - // 'Your external account is linked to your profile successfully.' => '', + 'Your external account is not linked anymore to your profile.' => 'Twoje zewnętrzne konto nie jest już połączone z profilem', + 'Unable to unlink your external account.' => 'Nie można odłączyć zewnętrznego konta', + 'External authentication failed' => 'Uwierzytelnianie zewnętrzne zakończyło się niepowodzeniem', + 'Your external account is linked to your profile successfully.' => 'Twoje zewnętrzne konto zostało pomyślnie połączone z profilem', 'Email' => 'Email', 'Task removed successfully.' => 'Zadanie usunięto pomyślnie.', 'Unable to remove this task.' => 'Nie można usunąć tego zadania.', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategoria', 'Category:' => 'Kategoria:', 'Categories' => 'Kategorie', - 'Category not found.' => 'Kategoria nie istnieje', 'Your category have been created successfully.' => 'Pomyślnie utworzono kategorię.', 'Unable to create your category.' => 'Nie można tworzyć kategorii.', 'Your category have been updated successfully.' => 'Pomyślnie zaktualizowano kategorię', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Czy na pewno chcesz usunąć plik: "%s"?', 'Attachments' => 'Załączniki', 'Edit the task' => 'Edytuj zadanie', - 'Edit the description' => 'Edytuj opis', 'Add a comment' => 'Dodaj komentarz', 'Edit a comment' => 'Edytuj komentarz', 'Summary' => 'Podsumowanie', @@ -284,21 +278,21 @@ return array( 'hours' => 'godzin(y)', 'spent' => 'przeznaczono', 'estimated' => 'szacowany', - 'Sub-Tasks' => 'Podzadania', - 'Add a sub-task' => 'Dodaj podzadanie', + 'Sub-Tasks' => 'Pod-zadania', + 'Add a sub-task' => 'Dodaj pod-zadanie', 'Original estimate' => 'Szacowanie początkowe', 'Create another sub-task' => 'Dodaj kolejne pod-zadanie', - 'Time spent' => 'Przeznaczony czas', + 'Time spent' => 'Spędzony czas', 'Edit a sub-task' => 'Edytuj pod-zadanie', 'Remove a sub-task' => 'Usuń pod-zadanie', 'The time must be a numeric value' => 'Czas musi być wartością liczbową', 'Todo' => 'Do zrobienia', 'In progress' => 'W trakcie', 'Sub-task removed successfully.' => 'Pod-zadanie usunięte pomyślnie.', - 'Unable to remove this sub-task.' => 'Nie można usunąć tego podzadania.', + 'Unable to remove this sub-task.' => 'Nie można usunąć tego pod-zadania.', 'Sub-task updated successfully.' => 'Pod-zadanie zaktualizowane pomyślnie.', - 'Unable to update your sub-task.' => 'Nie można zaktualizować tego podzadania.', - 'Unable to create your sub-task.' => 'Nie można utworzyć tego podzadania.', + 'Unable to update your sub-task.' => 'Nie można zaktualizować tego pod-zadania.', + 'Unable to create your sub-task.' => 'Nie można utworzyć tego pod-zadania.', 'Sub-task added successfully.' => 'Pod-zadanie utworzone pomyślnie', 'Maximum size: ' => 'Maksymalny rozmiar: ', 'Unable to upload the file.' => 'Nie można wczytać pliku.', @@ -343,9 +337,9 @@ return array( 'Disable public access' => 'Zablokuj dostęp publiczny', 'Enable public access' => 'Odblokuj dostęp publiczny', 'Public access disabled' => 'Dostęp publiczny zablokowany', - 'Do you really want to disable this project: "%s"?' => 'Czy na pewno chcesz zablokować projekt: "%s"?', - 'Do you really want to enable this project: "%s"?' => 'Czy na pewno chcesz odblokować projekt: "%s"?', - 'Project activation' => 'Aktywacja projekt', + 'Do you really want to disable this project: "%s"?' => 'Czy na pewno chcesz wyłączyć projekt: "%s"?', + 'Do you really want to enable this project: "%s"?' => 'Czy na pewno chcesz włączyć projekt: "%s"?', + 'Project activation' => 'Aktywacja projektu', 'Move the task to another project' => 'Przenieś zadanie do innego projektu', 'Move to another project' => 'Przenieś do innego projektu', 'Do you really want to duplicate this task?' => 'Czy na pewno chcesz zduplikować to zadanie?', @@ -365,12 +359,11 @@ return array( 'Edit profile' => 'Edytuj profil', 'Change password' => 'Zmień hasło', 'Password modification' => 'Zmiana hasła', - 'External authentications' => 'Autentykacja zewnętrzna', + 'External authentications' => 'Uwierzytelnienia zewnętrzne', 'Never connected.' => 'Nigdy nie połączone.', - 'No external authentication enabled.' => 'Brak autentykacji zewnętrznych.', + 'No external authentication enabled.' => 'Brak włączonych uwierzytelnień zewnętrznych.', 'Password modified successfully.' => 'Hasło zmienione pomyślne.', 'Unable to change the password.' => 'Nie można zmienić hasła.', - 'Change category for the task "%s"' => 'Zmień kategorię dla zadania "%s"', 'Change category' => 'Zmień kategorię', '%s updated the task %s' => '%s zaktualizował zadanie %s', '%s opened the task %s' => '%s otworzył zadanie %s', @@ -378,8 +371,8 @@ return array( '%s moved the task %s to the column "%s"' => '%s przeniósł zadanie %s do kolumny "%s"', '%s created the task %s' => '%s utworzył zadanie %s', '%s closed the task %s' => '%s zamknął zadanie %s', - '%s created a subtask for the task %s' => '%s utworzył podzadanie dla zadania %s', - '%s updated a subtask for the task %s' => '%s zaktualizował podzadanie dla zadania %s', + '%s created a subtask for the task %s' => '%s utworzył pod-zadanie dla zadania %s', + '%s updated a subtask for the task %s' => '%s zaktualizował pod-zadanie dla zadania %s', 'Assigned to %s with an estimate of %s/%sh' => 'Przypisano do %s z szacowanym czasem wykonania %s/%sh', 'Not assigned, estimate of %sh' => 'Nie przypisane, szacowany czas wykonania %sh', '%s updated a comment on the task %s' => '%s zaktualizował komentarz do zadania %s', @@ -388,8 +381,8 @@ return array( 'RSS feed' => 'Kanał RSS', '%s updated a comment on the task #%d' => '%s zaktualizował komentarz do zadania #%d', '%s commented on the task #%d' => '%s skomentował zadanie #%d', - '%s updated a subtask for the task #%d' => '%s zaktualizował podzadanie dla zadania #%d', - '%s created a subtask for the task #%d' => '%s utworzył podzadanie dla zadania #%d', + '%s updated a subtask for the task #%d' => '%s zaktualizował pod-zadanie dla zadania #%d', + '%s created a subtask for the task #%d' => '%s utworzył pod-zadanie dla zadania #%d', '%s updated the task #%d' => '%s zaktualizował zadanie #%d', '%s created the task #%d' => '%s utworzył zadanie #%d', '%s closed the task #%d' => '%s zamknął zadanie #%d', @@ -413,11 +406,9 @@ return array( 'About' => 'Informacje', 'Database driver:' => 'Silnik bazy danych:', 'Board settings' => 'Ustawienia tablicy', - 'URL and token' => 'URL i token', - // 'Webhook settings' => '', - 'URL for task creation:' => 'URL do tworzenia zadań', + 'Webhook settings' => 'Ustawienia webhook', 'Reset token' => 'Resetuj token', - // 'API endpoint:' => '', + 'API endpoint:' => 'Endpoint API', 'Refresh interval for private board' => 'Częstotliwość odświeżania dla tablicy prywatnej', 'Refresh interval for public board' => 'Częstotliwość odświeżania dla tablicy publicznej', 'Task highlight period' => 'Okres wyróżniania zadań', @@ -440,7 +431,7 @@ return array( 'Confirmation' => 'Potwierdzenie', 'Allow everybody to access to this project' => 'Udostępnij ten projekt wszystkim', 'Everybody have access to this project.' => 'Wszyscy mają dostęp do tego projektu.', - // 'Webhooks' => '', + 'Webhooks' => 'Webhooki', // 'API' => '', 'Create a comment from an external provider' => 'Utwórz komentarz od zewnętrznego dostawcy', 'Project management' => 'Menadżer projektu', @@ -454,8 +445,8 @@ return array( 'Reportings' => 'Raporty', 'Task repartition for "%s"' => 'Przydział zadań dla "%s"', 'Analytics' => 'Analizy', - 'Subtask' => 'Podzadanie', - 'My subtasks' => 'Moje podzadania', + 'Subtask' => 'Pod-zadanie', + 'My subtasks' => 'Moje pod-zadania', 'User repartition' => 'Przydział użytkownika', 'User repartition for "%s"' => 'Przydział użytkownika dla "%s"', 'Clone this project' => 'Sklonuj ten projekt', @@ -466,7 +457,7 @@ return array( 'The project id must be an integer' => 'ID projektu musi być liczbą całkowitą', 'The status must be an integer' => 'Status musi być liczbą całkowitą', 'The subtask id is required' => 'ID pod-zadanie jest wymagane', - 'The subtask id must be an integer' => 'ID podzadania musi być liczbą całkowitą', + 'The subtask id must be an integer' => 'ID pod-zadania musi być liczbą całkowitą', 'The task id is required' => 'ID zadania jest wymagane', 'The task id must be an integer' => 'ID zadania musi być liczbą całkowitą', 'The user id must be an integer' => 'ID użytkownika musi być liczbą całkowitą', @@ -480,31 +471,30 @@ return array( 'Daily project summary export for "%s"' => 'Wygeneruj dzienny raport dla projektu: "%s"', 'Exports' => 'Eksporty', 'This export contains the number of tasks per column grouped per day.' => 'Ten eksport zawiera ilość zadań zgrupowanych w kolumnach na dzień', - 'Active swimlanes' => 'Aktywne procesy', - 'Add a new swimlane' => 'Dodaj proces', - 'Change default swimlane' => 'Zmień domyślny proces', - 'Default swimlane' => 'Domyślny proces', - 'Do you really want to remove this swimlane: "%s"?' => 'Czy na pewno chcesz usunąć proces: "%s"?', - 'Inactive swimlanes' => 'Nieaktywne procesy', - 'Remove a swimlane' => 'Usuń proces', - 'Show default swimlane' => 'Pokaż domyślny proces', - 'Swimlane modification for the project "%s"' => 'Edycja procesów dla projektu "%s"', - 'Swimlane not found.' => 'Nie znaleziono procesu.', - 'Swimlane removed successfully.' => 'Proces usunięty pomyślnie.', - 'Swimlanes' => 'Procesy', - 'Swimlane updated successfully.' => 'Proces zaktualizowany pomyślnie.', - 'The default swimlane have been updated successfully.' => 'Domyślny proces zaktualizowany pomyślnie.', - 'Unable to remove this swimlane.' => 'Nie można usunąć procesu.', - 'Unable to update this swimlane.' => 'Nie można zaktualizować procesu.', - 'Your swimlane have been created successfully.' => 'Proces tworzony pomyślnie.', + 'Active swimlanes' => 'Aktywne tory', + 'Add a new swimlane' => 'Dodaj tor', + 'Change default swimlane' => 'Zmień domyślny tor', + 'Default swimlane' => 'Domyślny tor', + 'Do you really want to remove this swimlane: "%s"?' => 'Czy na pewno chcesz usunąć tor: "%s"?', + 'Inactive swimlanes' => 'Nieaktywne tory', + 'Remove a swimlane' => 'Usuń tor', + 'Show default swimlane' => 'Pokaż domyślny tor', + 'Swimlane modification for the project "%s"' => 'Edycja torów dla projektu "%s"', + 'Swimlane removed successfully.' => 'Tor usunięty pomyślnie.', + 'Swimlanes' => 'Tory', + 'Swimlane updated successfully.' => 'Zaktualizowano tor.', + 'The default swimlane have been updated successfully.' => 'Domyślny tor zaktualizowany pomyślnie.', + 'Unable to remove this swimlane.' => 'Nie można usunąć toru.', + 'Unable to update this swimlane.' => 'Nie można zaktualizować toru.', + 'Your swimlane have been created successfully.' => 'Tor utworzony pomyślnie.', 'Example: "Bug, Feature Request, Improvement"' => 'Przykład: "Błąd, Żądanie Funkcjonalności, Udoskonalenia"', 'Default categories for new projects (Comma-separated)' => 'Domyślne kategorie dla nowych projektów (oddzielone przecinkiem)', 'Integrations' => 'Integracje', 'Integration with third-party services' => 'Integracja z usługami firm trzecich', 'Subtask Id' => 'ID pod-zadania', - 'Subtasks' => 'Podzadania', - 'Subtasks Export' => 'Eksport podzadań', - 'Subtasks exportation for "%s"' => 'Wygeneruj raport podzadań dla projektu "%s"', + 'Subtasks' => 'Pod-zadania', + 'Subtasks Export' => 'Eksport pod-zadań', + 'Subtasks exportation for "%s"' => 'Wygeneruj raport pod-zadań dla projektu "%s"', 'Task Title' => 'Nazwa zadania', 'Untitled' => 'Bez nazwy', 'Application default' => 'Domyślne dla aplikacji', @@ -514,10 +504,9 @@ return array( 'Calendar' => 'Kalendarz', 'Next' => 'Następny', '#%d' => 'nr %d', - 'All swimlanes' => 'Wszystkie procesy', + 'All swimlanes' => 'Wszystkie tory', 'All colors' => 'Wszystkie kolory', 'Moved to column %s' => 'Przeniosiono do kolumny %s', - 'Change description' => 'Zmień opis', 'User dashboard' => 'Panel użytkownika', 'Allow only one subtask in progress at the same time for a user' => 'Zezwalaj na tylko jedno pod-zadanie o statusie "w trakcie" jednocześnie', 'Edit column "%s"' => 'Zmień kolumnę "%s"', @@ -611,15 +600,15 @@ return array( 'Reference currency' => 'Waluta referencyjna', 'The currency rate have been added successfully.' => 'Dodano kurs waluty', 'Unable to add this currency rate.' => 'Nie można dodać kursu waluty', - // 'Webhook URL' => '', + 'Webhook URL' => 'Adres webhooka', '%s remove the assignee of the task %s' => '%s usunął osobę przypisaną do zadania %s', - // 'Enable Gravatar images' => '', + 'Enable Gravatar images' => 'Włącz Gravatar', 'Information' => 'Informacje', 'Check two factor authentication code' => 'Sprawdź kod weryfikujący', 'The two factor authentication code is not valid.' => 'Kod weryfikujący niepoprawny', 'The two factor authentication code is valid.' => 'Kod weryfikujący poprawny', 'Code' => 'Kod', - 'Two factor authentication' => 'Uwierzytelnianie dwustopniowe', + 'Two factor authentication' => 'Dwustopniowe uwierzytelnianie', 'This QR code contains the key URI: ' => 'Ten kod QR zawiera URI klucza: ', 'Check my code' => 'Sprawdź kod', 'Secret key: ' => 'Tajny kod: ', @@ -628,15 +617,15 @@ return array( '%s via Kanboard' => '%s poprzez Kanboard', 'Burndown chart for "%s"' => 'Wykres Burndown dla "%s"', 'Burndown chart' => 'Wykres Burndown', - // 'This chart show the task complexity over the time (Work Remaining).' => '', + 'This chart show the task complexity over the time (Work Remaining).' => 'Ten wykres pokazuje złożoność zadania na przestrzeni czasu (pozostała praca).', 'Screenshot taken %s' => 'Zrzut ekranu zapisany %s', 'Add a screenshot' => 'Dołącz zrzut ekranu', 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => 'Zrób zrzut ekranu i wciśnij CTRL+V by dodać go tutaj.', 'Screenshot uploaded successfully.' => 'Zrzut ekranu dodany.', 'SEK - Swedish Krona' => 'SEK - Korona szwedzka', 'Identifier' => 'Identyfikator', - 'Disable two factor authentication' => 'Wyłącz uwierzytelnianie dwuetapowe', - 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Czy na pewno chcesz wyłączyć uwierzytelnianie dwuetapowe dla tego użytkownika: "%s"?', + 'Disable two factor authentication' => 'Wyłącz dwustopniowe uwierzytelnianie', + 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Czy na pewno chcesz wyłączyć dwustopniowe uwierzytelnianie dla tego użytkownika: "%s"?', 'Edit link' => 'Edytuj link', 'Start to type task title...' => 'Rozpocznij wpisywanie tytułu zadania...', 'A task cannot be linked to itself' => 'Link do zadania nie może wskazywać na samego siebie', @@ -646,7 +635,7 @@ return array( 'The identifier must be unique' => 'Identyfikator musi być unikatowy', 'This linked task id doesn\'t exists' => 'Id zadania nie istnieje', 'This value must be alphanumeric' => 'Ta wartość musi być alfanumeryczna', - 'Edit recurrence' => 'Rekurencja', + 'Edit recurrence' => 'Edytuj rekurencje', 'Generate recurrent task' => 'Włącz rekurencje', 'Trigger to generate recurrent task' => 'Wyzwalacz tworzący zadanie cykliczne', 'Factor to calculate new due date' => 'Czynnik wyliczający nowy termin', @@ -671,7 +660,7 @@ return array( 'Calendar settings' => 'Ustawienia kalendarza', 'Project calendar view' => 'Widok kalendarza projektu', 'Project settings' => 'Ustawienia Projektu', - 'Show subtasks based on the time tracking' => 'Pokaż podzadania w śledzeniu czasu', + 'Show subtasks based on the time tracking' => 'Pokaż pod-zadania w śledzeniu czasu', 'Show tasks based on the creation date' => 'Pokaż zadania względem daty utworzenia', 'Show tasks based on the start date' => 'Pokaż zadania względem daty rozpoczęcia', 'Subtasks time tracking' => 'Śledzenie czasu pod-zadań', @@ -680,65 +669,63 @@ return array( // 'iCal feed' => '', 'Preferences' => 'Ustawienia', 'Security' => 'Zabezpieczenia', - 'Two factor authentication disabled' => 'Uwierzytelnianie dwuetapowe wyłączone', - 'Two factor authentication enabled' => 'Uwierzytelnianie dwuetapowe włączone', + 'Two factor authentication disabled' => 'Dwustopniowe uwierzytelnianie wyłączone', + 'Two factor authentication enabled' => 'Dwustopniowe uwierzytelnianie włączone', 'Unable to update this user.' => 'Nie można zaktualizować tego użytkownika', 'There is no user management for private projects.' => 'Projekty prywatne nie wspierają zarządzania użytkownikami. Projekt prywatny ma tylko jednego użytkownika.', - // 'User that will receive the email' => '', - // 'Email subject' => '', + 'User that will receive the email' => 'Adresat', + 'Email subject' => 'Temat', 'Date' => 'Data', - // 'Add a comment log when moving the task between columns' => '', - // 'Move the task to another column when the category is changed' => '', - 'Send a task by email to someone' => 'Wyślij zadanie mailem do kogokolwiek', + 'Add a comment log when moving the task between columns' => 'Wygeneruj komentarz pod zadaniem podczas przenoszenia między kolumnami', + 'Move the task to another column when the category is changed' => 'Przenieś zadanie do innej kolumny gdy kategoria ulegnie zmianie', + 'Send a task by email to someone' => 'Wyślij zadanie emailem do kogoś', 'Reopen a task' => 'Otwórz ponownie zadanie', 'Column change' => 'Zmiana kolumny', 'Position change' => 'Zmiana pozycji', - 'Swimlane change' => 'Zmiana Swimlane', + 'Swimlane change' => 'Zmiana toru', 'Assignee change' => 'Zmiana przypisanego użytkownika', - // '[%s] Overdue tasks' => '', + '[%s] Overdue tasks' => '[%s] zaległych zadań', 'Notification' => 'Powiadomienie', - // '%s moved the task #%d to the first swimlane' => '', - // '%s moved the task #%d to the swimlane "%s"' => '', - 'Swimlane' => 'Proces', + '%s moved the task #%d to the first swimlane' => '%s przeniosł zadanie #%d na pierwszy tor', + '%s moved the task #%d to the swimlane "%s"' => '%s przeniosł zadanie #%d na tor "%s"', + 'Swimlane' => 'Tor', // 'Gravatar' => '', - // '%s moved the task %s to the first swimlane' => '', - // '%s moved the task %s to the swimlane "%s"' => '', - // 'This report contains all subtasks information for the given date range.' => '', - // 'This report contains all tasks information for the given date range.' => '', - // 'Project activities for %s' => '', - // 'view the board on Kanboard' => '', - // 'The task have been moved to the first swimlane' => '', - // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', + '%s moved the task %s to the first swimlane' => '%s przeniosł zadanie %s na pierwszy tor', + '%s moved the task %s to the swimlane "%s"' => '%s przeniosł zadanie %s na tor "%s"', + 'This report contains all subtasks information for the given date range.' => 'Niniejszy raport zawiera wszystkie informacje o pod-zadaniach dla podanego zakresu dat.', + 'This report contains all tasks information for the given date range.' => 'Niniejszy raport zawiera wszystkie informacje o zadaniach dla podanego zakresu dat.', + 'Project activities for %s' => 'Aktywności w ramach projektu dla %s', + 'view the board on Kanboard' => 'Zobacz tablice', + 'The task have been moved to the first swimlane' => 'Zadanie zostało przeniesione do piewszego toru', + 'The task have been moved to another swimlane:' => 'Zadanie zostało przeniesione do innego toru:', 'New title: %s' => 'Nowy tytuł: %s', 'The task is not assigned anymore' => 'Brak osoby odpowiedzialnej za zadanie', 'New assignee: %s' => 'Nowy odpowiedzialny: %s', 'There is no category now' => 'Aktualnie zadanie nie posiada kategorii', 'New category: %s' => 'Nowa kategoria: %s', 'New color: %s' => 'Nowy kolor: %s', - // 'New complexity: %d' => '', - // 'The due date have been removed' => '', - // 'There is no description anymore' => '', - // 'Recurrence settings have been modified' => '', - // 'Time spent changed: %sh' => '', - // 'Time estimated changed: %sh' => '', - // 'The field "%s" have been updated' => '', - // 'The description has been modified:' => '', - // 'Do you really want to close the task "%s" as well as all subtasks?' => '', + 'New complexity: %d' => 'Nowa złożoność: %d', + 'The due date have been removed' => 'Termin został usunięty', + 'There is no description anymore' => 'Nie ma już opisu', + 'Recurrence settings have been modified' => 'Ustawienia cyklu zostały zmienione', + 'Time spent changed: %sh' => 'Spędzony czas uległ zmianie: %sh', + 'Time estimated changed: %sh' => 'Szacowany czas uległ zmianie: %sh', + 'The field "%s" have been updated' => 'Pole "%s" zostało zaktualizowane', + 'The description has been modified:' => 'Opis został zmodyfikowany:', + 'Do you really want to close the task "%s" as well as all subtasks?' => 'Naprawdę chcesz zamknąć zadanie "%s" wraz z wszystkimi pod-zadaniami?', 'I want to receive notifications for:' => 'Wysyłaj powiadomienia dla:', 'All tasks' => 'Wszystkich zadań', 'Only for tasks assigned to me' => 'Tylko zadań przypisanych do mnie', 'Only for tasks created by me' => 'Tylko zadań utworzonych przeze mnie', 'Only for tasks created by me and assigned to me' => 'Tylko zadań przypisanych lub utworzonych przeze mnie', // '%%Y-%%m-%%d' => '', - // 'Total for all columns' => '', - // 'You need at least 2 days of data to show the chart.' => '', + 'Total for all columns' => 'Ogółem dla wszystkich kolumn', + 'You need at least 2 days of data to show the chart.' => 'Potrzebujesz przynajmniej 2 dni by wyświetlić wykres', // '<15m' => '', // '<30m' => '', 'Stop timer' => 'Zatrzymaj pomiar czasu', 'Start timer' => 'Uruchom pomiar czasu', - 'Add project member' => 'Dodaj członka projektu', - 'Enable notifications' => 'Włącz powiadomienia', + 'Add project member' => 'Dodaj uczestnika projektu', 'My activity stream' => 'Moja aktywność', 'My calendar' => 'Mój kalendarz', 'Search tasks' => 'Szukaj zadań', @@ -771,42 +758,42 @@ return array( 'Search by category: ' => 'Szukaj wg kategorii:', 'Search by description: ' => 'Szukaj wg opisu:', 'Search by due date: ' => 'Szukaj wg terminu:', - // 'Lead and Cycle time for "%s"' => '', - // 'Average time spent into each column for "%s"' => '', - // 'Average time spent into each column' => '', - // 'Average time spent' => '', - // 'This chart show the average time spent into each column for the last %d tasks.' => '', - // 'Average Lead and Cycle time' => '', - // 'Average lead time: ' => '', - // 'Average cycle time: ' => '', - // 'Cycle Time' => '', - // 'Lead Time' => '', - // 'This chart show the average lead and cycle time for the last %d tasks over the time.' => '', - // 'Average time into each column' => '', - // 'Lead and cycle time' => '', - // 'Lead time: ' => '', - // 'Cycle time: ' => '', + 'Lead and Cycle time for "%s"' => 'Czas cyklu i realizacji dla "%s"', + 'Average time spent into each column for "%s"' => 'Średni czas spędzony w każdej z kolumn dla "%s"', + 'Average time spent into each column' => 'Średni czas spędzony w każdej z kolumn', + 'Average time spent' => 'Średni spędzony czas', + 'This chart show the average time spent into each column for the last %d tasks.' => 'Niniejszy wykres pokazuje średni czas spędzony w każdej z kolumn dla ostatnich %d zadań.', + 'Average Lead and Cycle time' => 'Średni czas cyklu i realizacji', + 'Average lead time: ' => 'Średni czas realizacji:', + 'Average cycle time: ' => 'Średni czas cyklu:', + 'Cycle Time' => 'Czas cyklu', + 'Lead Time' => 'Czas realizacji', + 'This chart show the average lead and cycle time for the last %d tasks over the time.' => 'Niniejszy wykres pokazuje średni czas cyklu i realizacji dla ostatnich %d zadań na przestrzeni czasu.', + 'Average time into each column' => 'Średni czas dla każdej kolumny', + 'Lead and cycle time' => 'Czas cyklu i realizacji', + 'Lead time: ' => 'Czas realizacji:', + 'Cycle time: ' => 'Czas cyklu:', 'Time spent into each column' => 'Czas spędzony przez zadanie w każdej z kolumn', - // 'The lead time is the duration between the task creation and the completion.' => '', - // 'The cycle time is the duration between the start date and the completion.' => '', - // 'If the task is not closed the current time is used instead of the completion date.' => '', - // 'Set automatically the start date' => '', - 'Edit Authentication' => 'Edycja autoryzacji', - // 'Remote user' => '', - // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '', - // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '', + 'The lead time is the duration between the task creation and the completion.' => 'Czas realizacji pomiędzy utworzeniem a ukończeniem zadania.', + 'The cycle time is the duration between the start date and the completion.' => 'Czas cyklu pomiędzy datą rozpoczęcia a ukończeniem zadania.', + 'If the task is not closed the current time is used instead of the completion date.' => 'Jeśli zadanie nie jest zamknięte, bieżący czas zostaje użyty zamiast daty ukończenia.', + 'Set automatically the start date' => 'Ustaw automatycznie datę rozpoczęcia', + 'Edit Authentication' => 'Edycja uwierzytelnienia', + 'Remote user' => 'Zdalny użytkownik', + 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => 'Zdalni użykownicy nie przechowują swojego hasła w bazie danych Kanboard, przykłady: konta LDAP, Google and Github.', + 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => 'Jeśli zaznaczysz "Zablokuj możliwość logowania", dane podane przy logowaniu zostaną zignorowane.', 'New remote user' => 'Nowy użytkownik zdalny', 'New local user' => 'Nowy użytkownik lokalny', 'Default task color' => 'Domyślny kolor zadań', - 'This feature does not work with all browsers.' => 'Ta funkcja może nie działać z każdą przeglądarką', - // 'There is no destination project available.' => '', - // 'Trigger automatically subtask time tracking' => '', - // 'Include closed tasks in the cumulative flow diagram' => '', - 'Current swimlane: %s' => 'Bieżący swimlane: %s', + 'This feature does not work with all browsers.' => 'Ta funkcja może nie działać z każdą przeglądarką.', + 'There is no destination project available.' => 'Żaden docelowy projekt nie jest aktualnie dostępny.', + 'Trigger automatically subtask time tracking' => 'Ustaw automatyczne śledzenie czasu dla pod-zadań', + 'Include closed tasks in the cumulative flow diagram' => 'Obejmuj zamknięte zadania w zbiorczym diagramie przepływu', + 'Current swimlane: %s' => 'Bieżący tor: %s', 'Current column: %s' => 'Bieżąca kolumna: %s', 'Current category: %s' => 'Bieżąca kategoria: %s', 'no category' => 'brak kategorii', - // 'Current assignee: %s' => '', + 'Current assignee: %s' => 'Aktualnie odpowiedzialna osoba: %s', 'not assigned' => 'Brak osoby odpowiedzialnej', 'Author:' => 'Autor', 'contributors' => 'współautorzy', @@ -820,18 +807,18 @@ return array( 'Start date:' => 'Data rozpoczęcia:', 'Due date:' => 'Termin', 'There is no start date or due date for this task.' => 'Brak daty rozpoczęcia lub terminu zadania', - // 'Moving or resizing a task will change the start and due date of the task.' => '', - // 'There is no task in your project.' => '', + 'Moving or resizing a task will change the start and due date of the task.' => 'Przeniesienie bądź edycja zmieni datę rozpoczęcia oraz termin ukończenia zadania.', + 'There is no task in your project.' => 'Brak zadań w projekcie.', 'Gantt chart' => 'Wykres Gantta', 'People who are project managers' => 'Użytkownicy będący menedżerami projektu', 'People who are project members' => 'Użytkownicy będący uczestnikami projektu', - // 'NOK - Norwegian Krone' => '', + 'NOK - Norwegian Krone' => 'NOK - Korona norweska', 'Show this column' => 'Pokaż tą kolumnę', 'Hide this column' => 'Ukryj tą kolumnę', 'open file' => 'otwórz plik', 'End date' => 'Data zakończenia', 'Users overview' => 'Przegląd użytkowników', - 'Members' => 'Uczestnicy', + 'Members' => 'Członkowie', 'Shared project' => 'Projekt udostępniony', 'Project managers' => 'Menedżerowie projektu', 'Gantt chart for all projects' => 'Wykres Gantta dla wszystkich projektów', @@ -844,11 +831,11 @@ return array( 'Change task color when using a specific task link' => 'Zmień kolor zadania używając specjalnego adresu URL', 'Task link creation or modification' => 'Adres URL do utworzenia zadania lub modyfikacji', 'Milestone' => 'Kamień milowy', - // 'Documentation: %s' => '', - // 'Switch to the Gantt chart view' => '', - // 'Reset the search/filter box' => '', + 'Documentation: %s' => 'Dokumentacja: %s', + 'Switch to the Gantt chart view' => 'Przełącz na wykres Gantta', + 'Reset the search/filter box' => 'Zresetuj pole wyszukiwania/filtrowania', 'Documentation' => 'Dokumentacja', - // 'Table of contents' => '', + 'Table of contents' => 'Tablica zawartości', // 'Gantt' => '', 'Author' => 'Autor', 'Version' => 'Wersja', @@ -858,60 +845,60 @@ return array( 'Remove maximum column height' => 'Zwiń kolumny', 'My notifications' => 'Powiadomienia', 'Custom filters' => 'Dostosuj filtry', - // 'Your custom filter have been created successfully.' => '', - // 'Unable to create your custom filter.' => '', - // 'Custom filter removed successfully.' => '', - // 'Unable to remove this custom filter.' => '', - // 'Edit custom filter' => '', - // 'Your custom filter have been updated successfully.' => '', - // 'Unable to update custom filter.' => '', + 'Your custom filter have been created successfully.' => 'Niestandardowy filtr został utworzony.', + 'Unable to create your custom filter.' => 'Nie można utworzyć niestandardowego filtra.', + 'Custom filter removed successfully.' => 'Niestandardowy filtr został usunięty.', + 'Unable to remove this custom filter.' => 'Nie można usunąć niestandardowego filtra.', + 'Edit custom filter' => 'Edytuj niestandardowy filtr', + 'Your custom filter have been updated successfully.' => 'Niestandardowy filtr został zaktualizowany', + 'Unable to update custom filter.' => 'Nie można zaktualizować niestandardowego filtra.', // 'Web' => '', 'New attachment on task #%d: %s' => 'Nowy załącznik do zadania #%d: %s', 'New comment on task #%d' => 'Nowy komentarz do zadania #%d', 'Comment updated on task #%d' => 'Aktualizacja komentarza do zadania #%d', - 'New subtask on task #%d' => 'Nowe podzadanie dla zadania #%d', - 'Subtask updated on task #%d' => 'Aktualizacja podzadania w zadaniu #%d', + 'New subtask on task #%d' => 'Nowe pod-zadanie dla zadania #%d', + 'Subtask updated on task #%d' => 'Aktualizacja pod-zadania w zadaniu #%d', 'New task #%d: %s' => 'Nowe zadanie #%d: %s', 'Task updated #%d' => 'Aktualizacja zadania #%d', 'Task #%d closed' => 'Zamknięto zadanie #%d', 'Task #%d opened' => 'Otwarto zadanie #%d', 'Column changed for task #%d' => 'Zmieniono kolumnę zadania #%d', 'New position for task #%d' => 'Ustalono nową pozycję zadania #%d', - 'Swimlane changed for task #%d' => 'Zmieniono swimlane dla zadania #%d', + 'Swimlane changed for task #%d' => 'Zmieniono tor dla zadania #%d', 'Assignee changed on task #%d' => 'Zmieniono osobę odpowiedzialną dla zadania #%d', - // '%d overdue tasks' => '', - // 'Task #%d is overdue' => '', + '%d overdue tasks' => '%d zaległych zadań', + 'Task #%d is overdue' => 'Zadanie #%d jest zaległe', 'No new notifications.' => 'Brak nowych powiadomień.', 'Mark all as read' => 'Oznacz wszystkie jako przeczytane', 'Mark as read' => 'Oznacz jako przeczytane', - // 'Total number of tasks in this column across all swimlanes' => '', - 'Collapse swimlane' => 'Zwiń swimlane', - 'Expand swimlane' => 'Rozwiń swimlane', + 'Total number of tasks in this column across all swimlanes' => 'Całkowita liczba zadań z tej kolumny z wszystkich torów', + 'Collapse swimlane' => 'Zwiń tor', + 'Expand swimlane' => 'Rozwiń tor', 'Add a new filter' => 'Dodaj nowy filtr', 'Share with all project members' => 'Udostępnij wszystkim uczestnikom projektu', - // 'Shared' => '', + 'Shared' => 'Udostępnione', 'Owner' => 'Właściciel', 'Unread notifications' => 'Nieprzeczytane powiadomienia', 'Notification methods:' => 'Metody powiadomień:', - // 'Import tasks from CSV file' => '', - // 'Unable to read your file' => '', - // '%d task(s) have been imported successfully.' => '', - // 'Nothing have been imported!' => '', - // 'Import users from CSV file' => '', - // '%d user(s) have been imported successfully.' => '', + 'Import tasks from CSV file' => 'Importuj zadania z pliku CSV', + 'Unable to read your file' => 'Nie można odczytać pliku', + '%d task(s) have been imported successfully.' => '%d zadań zostało zaimportowanych.', + 'Nothing have been imported!' => 'Nic nie zostało zaimportowane!', + 'Import users from CSV file' => 'Importuj użytkowników z pliku CSV', + '%d user(s) have been imported successfully.' => '%d użytkowników zostało zaimportowanych.', 'Comma' => 'Przecinek', 'Semi-colon' => 'Średnik', 'Tab' => 'Tabulacja', 'Vertical bar' => 'Kreska pionowa', 'Double Quote' => 'Cudzysłów', 'Single Quote' => 'Apostrof', - // '%s attached a file to the task #%d' => '', - // 'There is no column or swimlane activated in your project!' => '', + '%s attached a file to the task #%d' => '%s dołączył(a) plik do zadania #%d', + 'There is no column or swimlane activated in your project!' => 'Żaden tor badź kolumna nie została aktywowana!', 'Append filter (instead of replacement)' => 'Dołączaj filtr do zastosowanego filtru(zamiast przełączać)', - // 'Append/Replace' => '', - // 'Append' => '', - // 'Replace' => '', - // 'Import' => '', + 'Append/Replace' => 'Dołącz/Zastąp', + 'Append' => 'Dołącz', + 'Replace' => 'Zastąp', + 'Import' => 'Importuj', 'change sorting' => 'odwróć sortowanie', 'Tasks Importation' => 'Import zadań', 'Delimiter' => 'Separator pola', @@ -924,16 +911,16 @@ return array( 'Duplicates are not verified for you' => 'Duplikaty nie będą weryfikowane', 'The due date must use the ISO format: YYYY-MM-DD' => 'Data musi być w formacie ISO: YYYY-MM-DD', 'Download CSV template' => 'Pobierz szablon pliku CSV', - // 'No external integration registered.' => '', + 'No external integration registered.' => 'Żadna zewnętrzna integracja nie została zarejestrowana.', 'Duplicates are not imported' => 'Duplikaty nie zostaną zaimportowane', - // 'Usernames must be lowercase and unique' => '', - // 'Passwords will be encrypted if present' => '', - // '%s attached a new file to the task %s' => '', + 'Usernames must be lowercase and unique' => 'Nazwy użytkowników muszą być unikalne i składać się z małych liter', + 'Passwords will be encrypted if present' => 'Hasła zostaną zaszyfrowane jeśli występują', + '%s attached a new file to the task %s' => '%s załączył nowy plik do zadania %s', 'Link type' => 'Rodzaj link\'u', - // 'Assign automatically a category based on a link' => '', - // 'BAM - Konvertible Mark' => '', - // 'Assignee Username' => '', - // 'Assignee Name' => '', + 'Assign automatically a category based on a link' => 'Przypisz kategorię automatycznie na podstawie linku', + 'BAM - Konvertible Mark' => 'BAM - Bośnia i Hercegowina Cabrio Marka', + 'Assignee Username' => 'Przypisz nazwę użytkownika', + 'Assignee Name' => 'Przypisz imię', 'Groups' => 'Grupy', 'Members of %s' => 'Członkowie %s', 'New group' => 'Nowa grupa', @@ -962,11 +949,11 @@ return array( 'View all groups' => 'Wyświetl wszystkie grupy', 'View group members' => 'Wyświetl wszystkich członków grupy', 'There is no user available.' => 'Żaden użytkownik nie jest dostępny.', - 'Do you really want to remove the user "%s" from the group "%s"?' => 'Czy napewno chcesz usunąć użytkownika "%s" z grupy "%s"?', + 'Do you really want to remove the user "%s" from the group "%s"?' => 'Czy na pewno chcesz usunąć użytkownika "%s" z grupy "%s"?', 'There is no group.' => 'Nie utworzono jeszcze żadnej grupy.', 'External Id' => 'Zewnętrzny Id', 'Add group member' => 'Dodaj członka grupy', - 'Do you really want to remove this group: "%s"?' => 'Czy napewno chcesz usunąć grupę "%s"?', + 'Do you really want to remove this group: "%s"?' => 'Czy na pewno chcesz usunąć grupę "%s"?', 'There is no user in this group.' => 'Wybrana grupa nie posiada członków.', 'Remove this user' => 'Usuń użytkownika', 'Permissions' => 'Prawa dostępu', @@ -981,53 +968,53 @@ return array( 'Enter group name...' => 'Wprowadź nazwę grupy...', 'Role:' => 'Rola:', 'Project members' => 'Uczestnicy projektu', - // 'Compare hours for "%s"' => '', + 'Compare hours for "%s"' => 'Porównaj godziny dla "%s"', '%s mentioned you in the task #%d' => '%s wspomiał o Tobie w zadaniu #%d', '%s mentioned you in a comment on the task #%d' => '%s wspomiał o Tobie w komentarzu do zadania #%d', 'You were mentioned in the task #%d' => 'Wspomiano o Tobie w zadaniu #%d', 'You were mentioned in a comment on the task #%d' => 'Wspomiano o Tobie w komentarzu do zadania #%d', 'Mentioned' => 'Wspomiano', - // 'Compare Estimated Time vs Actual Time' => '', - // 'Estimated hours: ' => '', - // 'Actual hours: ' => '', - // 'Hours Spent' => '', - // 'Hours Estimated' => '', - // 'Estimated Time' => '', - // 'Actual Time' => '', - // 'Estimated vs actual time' => '', - // 'RUB - Russian Ruble' => '', - // 'Assign the task to the person who does the action when the column is changed' => '', - // 'Close a task in a specific column' => '', + 'Compare Estimated Time vs Actual Time' => 'Porównaj szacowany czas z rzeczywistym', + 'Estimated hours: ' => 'Szacowane godziny: ', + 'Actual hours: ' => 'Rzeczywiste godziny: ', + 'Hours Spent' => 'Spędzone godziny', + 'Hours Estimated' => 'Szacowane godziny', + 'Estimated Time' => 'Szacowany czas', + 'Actual Time' => 'Rzeczywisty czas', + 'Estimated vs actual time' => 'Szacowany vs rzeczywisty czas', + 'RUB - Russian Ruble' => 'RUB - Rosyjskie Ruble', + 'Assign the task to the person who does the action when the column is changed' => 'Przypisz zadanie do osoby wykonującej akcję gdy kolumna zostanie zmodyfikowana', + 'Close a task in a specific column' => 'Zamknij zadanie w określonej kolumnie', // 'Time-based One-time Password Algorithm' => '', - // 'Two-Factor Provider: ' => '', - // 'Disable two-factor authentication' => '', - // 'Enable two-factor authentication' => '', - 'There is no integration registered at the moment.' => 'W chwili obecnej funkcjonalność ta została wyłączona.', + 'Two-Factor Provider: ' => 'Dostawca: ', + 'Disable two-factor authentication' => 'Wyłącz dwustopniowe uwierzytelnianie', + 'Enable two-factor authentication' => 'Włącz dwustopniowe uwierzytelnianie', + 'There is no integration registered at the moment.' => 'W chwili obecnej nie ma zarejestrowanej żadnej integracji.', 'Password Reset for Kanboard' => 'Resetuj hasło do Kanboarda', 'Forgot password?' => 'Nie pamiętasz hasła?', - 'Enable "Forget Password"' => 'Włącz możliwość odzyskiwania zapomianego hasła przez użytkowników', + 'Enable "Forget Password"' => 'Włącz "Nie pamiętasz hasła?"', 'Password Reset' => 'Resetuj hasło', 'New password' => 'Nowe hasło', 'Change Password' => 'Zmień hasło', 'To reset your password click on this link:' => 'Kliknij w poniższy link, aby zresetować hasło:', 'Last Password Reset' => 'Ostatnie odzyskiwanie hasła', 'The password has never been reinitialized.' => 'Hasło nigdy nie było odzyskiwane.', - // 'Creation' => '', - // 'Expiration' => '', - 'Password reset history' => 'Historia hasła', - // 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => '', - // 'Do you really want to close all tasks of this column?' => '', - // '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '', + 'Creation' => 'Utworzenie', + 'Expiration' => 'Wygaśnięcie', + 'Password reset history' => 'Historia resetowania hasła', + 'All tasks of the column "%s" and the swimlane "%s" have been closed successfully.' => 'Wszystkie zadania z kolumny "%s" i toru "%s" zostały zamknięte.', + 'Do you really want to close all tasks of this column?' => 'Na pewno chcesz zamknąć wszystkie zadania z tej kolumny?', + '%d task(s) in the column "%s" and the swimlane "%s" will be closed.' => '%d zadania z kolumny "%s" i toru "%s" zostaną zamknięte.', 'Close all tasks of this column' => 'Zamknij wszystkie zadania w tej kolumnie', 'No plugin has registered a project notification method. You can still configure individual notifications in your user profile.' => 'Wtyczki obsługujące dodatkowe powiadomienia nie zostały zainstalowane. Dalej jednak możesz korzystać z standardowych powiadomień (sprawdź w ustawieniach Twojego profilu).', 'My dashboard' => 'Mój dashboard', 'My profile' => 'Mój profil', - // 'Project owner: ' => '', + 'Project owner: ' => 'Właściciel projektu: ', 'The project identifier is optional and must be alphanumeric, example: MYPROJECT.' => 'Identyfikator projektu jest opcjonalny i musi być alfanumeryczny, przykład: MYPROJECT.', 'Project owner' => 'Właściciel projektu', 'Those dates are useful for the project Gantt chart.' => 'Daty te są przydatne dla wykresu Gantta.', 'Private projects do not have users and groups management.' => 'Projekty prywatne nie wspierają obsługi użytkowników i grup.', - // 'There is no project member.' => '', + 'There is no project member.' => 'Projekt nie ma uczestników.', 'Priority' => 'Priorytet', 'Task priority' => 'Priorytety zadań', 'General' => 'Ogólne', @@ -1036,15 +1023,15 @@ return array( 'Lowest priority' => 'Najniższy priorytet', 'Highest priority' => 'Najwyższy priorytet', 'If you put zero to the low and high priority, this feature will be disabled.' => 'Jeżeli dla najniższego i najwyższego priorytetu ustawisz 0, to priorytety dla tablicy zostaną wyłączone.', - // 'Close a task when there is no activity' => '', - // 'Duration in days' => '', - // 'Send email when there is no activity on a task' => '', - // 'Unable to fetch link information.' => '', + 'Close a task when there is no activity' => 'Zamknij zadanie gdy nie jest aktywne', + 'Duration in days' => 'Czas trwania w dniach', + 'Send email when there is no activity on a task' => 'Wyślij email gdy zadanie nie jest aktywne', + 'Unable to fetch link information.' => 'Nie można pobrać informacji o połączeniach.', // 'Daily background job for tasks' => '', 'Auto' => 'Automatyczny', 'Related' => 'Powiązanie', 'Attachment' => 'Załącznik', - // 'Title not found' => '', + 'Title not found' => 'Nie odnaleziono tytułu', 'Web Link' => 'Link URL', 'External links' => 'Linki zewnętrzne', 'Add external link' => 'Dodaj link zewnętrzny', @@ -1057,7 +1044,7 @@ return array( 'Copy and paste your link here...' => 'Skopiuj i wklej link tutaj ...', // 'URL' => '', 'Internal links' => 'Linki do innych zadań', - // 'Assign to me' => '', + 'Assign to me' => 'Przypisz do mnie', 'Me' => 'JA', 'Do not duplicate anything' => 'Nie kopiuj żadnego projektu', 'Projects management' => 'Zarządzanie projektami', @@ -1067,7 +1054,7 @@ return array( 'open' => 'otwarty', 'closed' => 'zamknięty', 'Priority:' => 'Priorytet:', - // 'Reference:' => '', + 'Reference:' => 'Odnośnik:', 'Complexity:' => 'Złożoność:', 'Swimlane:' => 'Proces:', 'Column:' => 'Kolumna:', @@ -1075,82 +1062,158 @@ return array( 'Creator:' => 'Utworzył:', 'Time estimated:' => 'Szacowany czas:', '%s hours' => '%s godzin', - 'Time spent:' => 'Wykorzystany czas:', + 'Time spent:' => 'Spędzony czas:', 'Created:' => 'Utworzone:', 'Modified:' => 'Zmodyfikowane:', 'Completed:' => 'Ukończone:', 'Started:' => 'Rozpoczęte:', - 'Moved:' => 'Przesunięcie:', + 'Moved:' => 'Przeniesione:', 'Task #%d' => 'Zadanie #%d', - // 'Date and time format' => '', - // 'Time format' => '', - // 'Start date: ' => '', - // 'End date: ' => '', - // 'New due date: ' => '', - // 'Start date changed: ' => '', - // 'Disable private projects' => '', - // 'Do you really want to remove this custom filter: "%s"?' => '', - // 'Remove a custom filter' => '', - // 'User activated successfully.' => '', - // 'Unable to enable this user.' => '', - // 'User disabled successfully.' => '', - // 'Unable to disable this user.' => '', - // 'All files have been uploaded successfully.' => '', - // 'View uploaded files' => '', - // 'The maximum allowed file size is %sB.' => '', - // 'Choose files again' => '', + 'Date and time format' => 'Format daty oraz czasu', + 'Time format' => 'Format czasu', + 'Start date: ' => 'Data rozpoczęcia: ', + 'End date: ' => 'Data zakończenia: ', + 'New due date: ' => 'Nowy termin: ', + 'Start date changed: ' => 'Data rozpoczęcia została zmieniona: ', + 'Disable private projects' => 'Wyłącz prywatne projekty', + 'Do you really want to remove this custom filter: "%s"?' => 'Na pewno usunąć niestandardowy filtr: "%s"?', + 'Remove a custom filter' => 'Usuń niestandardowy filtr', + 'User activated successfully.' => 'Użytkownik został aktywowany.', + 'Unable to enable this user.' => 'Nie można włączyć użytkownika.', + 'User disabled successfully.' => 'Użytkownik został wyłączony.', + 'Unable to disable this user.' => 'Nie można wyłączyć użytkownika.', + 'All files have been uploaded successfully.' => 'Wszystkie pliki zostały pomyślnie przesłane.', + 'View uploaded files' => 'Zobacz przesłane pliki', + 'The maximum allowed file size is %sB.' => 'Maksymalny rozmiar pliku to %sB.', + 'Choose files again' => 'Wybierz jeszcze raz pliki', 'Drag and drop your files here' => 'Przeciągnij i upuść pliki tutaj', 'choose files' => 'wybierz pliki', - // 'View profile' => '', - // 'Two Factor' => '', - // 'Disable user' => '', - // 'Do you really want to disable this user: "%s"?' => '', - // 'Enable user' => '', - // 'Do you really want to enable this user: "%s"?' => '', + 'View profile' => 'Zobacz profil', + 'Two Factor' => 'Dwustopniowe', + 'Disable user' => 'Wyłącz użytkownika', + 'Do you really want to disable this user: "%s"?' => 'Na pewno wyłączyć użytkownika: "%s"?', + 'Enable user' => 'Włącz użytkownika', + 'Do you really want to enable this user: "%s"?' => 'Na pewno włączyć użytkownika: "%s"?', 'Download' => 'Pobierz', 'Uploaded: %s' => 'Data załączenia: %s', 'Size: %s' => 'Rozmiar: %s', 'Uploaded by %s' => 'Załadowany przez %s', 'Filename' => 'Nazwa pliku', 'Size' => 'Rozmiar', - // 'Column created successfully.' => '', - // 'Another column with the same name exists in the project' => '', - // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', - // 'Change column position' => '', - // 'Switch to the project overview' => '', - // 'User filters' => '', - // 'Category filters' => '', + 'Column created successfully.' => 'Utworzono kolumnę.', + 'Another column with the same name exists in the project' => 'Inna kolumna o tej samej nazwie już istnieje w projekcie', + 'Default filters' => 'Domyślne filtry', + 'Your board doesn\'t have any columns!' => 'Twoja tablica nie ma żadnej kolumny!', + 'Change column position' => 'Zmień pozycję kolumny', + 'Switch to the project overview' => 'Przełącz do podsumowania projektu', + 'User filters' => 'Filtry użytkownika', + 'Category filters' => 'Filtry kategorii', 'Upload a file' => 'Prześlij plik', 'View file' => 'Wyświetl plik', 'Last activity' => 'Ostatnia aktywność', - // 'Change subtask position' => '', - // 'This value must be greater than %d' => '', - // 'Another swimlane with the same name exists in the project' => '', - // 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => '', - // 'Actions duplicated successfully.' => '', - // 'Unable to duplicate actions.' => '', - // 'Add a new action' => '', - // 'Import from another project' => '', - // 'There is no action at the moment.' => '', - // 'Import actions from another project' => '', - // 'There is no available project.' => '', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', + 'Change subtask position' => 'Zmień pozycję pod-zadania', + 'This value must be greater than %d' => 'Wartość musi być większa niż %d', + 'Another swimlane with the same name exists in the project' => 'Inny tor o tej samej nazwie już istnieje w projekcie', + 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Przykład: http://example.kanboard.net/ (użyty do wygenerowania bezwzględnych adresów URL)', + 'Actions duplicated successfully.' => 'Pomyślnie zduplikowano akcje.', + 'Unable to duplicate actions.' => 'Nie można zduplikować akcji.', + 'Add a new action' => 'Dodaj nową akcję', + 'Import from another project' => 'Importuj z innego projektu', + 'There is no action at the moment.' => 'W chwili obecnej nie dodano żadnych akcji.', + 'Import actions from another project' => 'Importuj akcje z innego projektu', + 'There is no available project.' => 'Brak dostępnego projektu.', + 'Local File' => 'Plik lokalny', + 'Configuration' => 'Konfiguracja', + 'PHP version:' => 'Wersja PHP:', // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', + 'OS version:' => 'Wersja OS:', + 'Database version:' => 'Wersja bazy danych:', + 'Browser:' => 'Przeglądarka', + 'Task view' => 'Widok zadań', + 'Edit task' => 'Edytuj zadanie', + 'Edit description' => 'Edytuj opis', + 'New internal link' => 'Nowy wewnętrzny link', + 'Display list of keyboard shortcuts' => 'Wyświetl skróty klawiszowe', // 'Menu' => '', - // 'Set start date' => '', + 'Set start date' => 'Ustaw datę rozpoczęcia', // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Upload my avatar image' => 'Prześlij avatar', + 'Remove my image' => 'Usuń', + 'The OAuth2 state parameter is invalid' => 'Parametr stanu OAuth2 jest niepoprawny', + 'User not found.' => 'Nie znaleziono użytkownika', + 'Search in activity stream' => 'Szukaj w strumieniu aktywności', + 'My activities' => 'Moje aktywności', + 'Activity until yesterday' => 'Aktywności do wczoraj', + 'Activity until today' => 'Aktywności do dzisiaj', + 'Search by creator: ' => 'Wyszukaj według twórcy: ', + 'Search by creation date: ' => 'Wyszukaj według daty utworzenia: ', + 'Search by task status: ' => 'Wyszukaj według statusu zadania: ', + 'Search by task title: ' => 'Wyszukaj po tytule zadania: ', + 'Activity stream search' => 'Wyszukaj w strumieniu aktywności', + 'Projects where "%s" is manager' => 'Projekty gdzie "%s" jest menedżerem', + 'Projects where "%s" is member' => 'Projekty gdzie "%s" jest uczestnikiem', + 'Open tasks assigned to "%s"' => 'Otwarte zadania przypisane do "%s"', + 'Closed tasks assigned to "%s"' => 'Zamknięte zadania przypisane do "%s"', + // 'Assign automatically a color based on a priority' => '', + 'Overdue tasks for the project(s) "%s"' => 'Zaległe zadania dla projektu/projektów "%s"', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/pt_BR/translations.php b/sources/app/Locale/pt_BR/translations.php index 050d1a9..343915b 100644 --- a/sources/app/Locale/pt_BR/translations.php +++ b/sources/app/Locale/pt_BR/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Ver esta tarefa', 'Remove user' => 'Remover usuário', 'Do you really want to remove this user: "%s"?' => 'Você realmente deseja remover este usuário: "%s"?', - 'New user' => 'Novo usuário', 'All users' => 'Todos os usuários', 'Username' => 'Nome de usuário', 'Password' => 'Senha', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d tarefas finalizadas', 'No task for this project' => 'Não há tarefa para este projeto', 'Public link' => 'Link público', - 'Change assignee' => 'Alterar designação', - 'Change assignee for the task "%s"' => 'Alterar designação para a tarefa "%s"', 'Timezone' => 'Fuso horário', 'Sorry, I didn\'t find this information in my database!' => 'Desculpe, não encontrei esta informação no meu banco de dados!', 'Page not found' => 'Página não encontrada', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Deixe uma descrição', 'Comment added successfully.' => 'Comentário adicionado com sucesso.', 'Unable to create your comment.' => 'Não é possível criar o seu comentário.', - 'Edit this task' => 'Editar esta tarefa', 'Due Date' => 'Data de vencimento', 'Invalid date' => 'Data inválida', 'Automatic actions' => 'Ações automáticas', @@ -250,7 +246,6 @@ return array( 'Category' => 'Categoria', 'Category:' => 'Categoria:', 'Categories' => 'Categorias', - 'Category not found.' => 'Categoria não encontrada.', 'Your category have been created successfully.' => 'Sua categoria foi criada com sucesso.', 'Unable to create your category.' => 'Não foi possível criar a sua categoria.', 'Your category have been updated successfully.' => 'A sua categoria foi atualizada com sucesso.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Você realmente deseja remover este arquivo: "%s"?', 'Attachments' => 'Anexos', 'Edit the task' => 'Editar a tarefa', - 'Edit the description' => 'Editar a descrição', 'Add a comment' => 'Adicionar um comentário', 'Edit a comment' => 'Editar um comentário', 'Summary' => 'Resumo', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Nenhuma autenticação externa habilitada.', 'Password modified successfully.' => 'Senha alterada com sucesso.', 'Unable to change the password.' => 'Não foi possível alterar a senha.', - 'Change category for the task "%s"' => 'Mudar categoria da tarefa "%s"', 'Change category' => 'Mudar categoria', '%s updated the task %s' => '%s atualizou a tarefa %s', '%s opened the task %s' => '%s abriu a tarefa %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Sobre', 'Database driver:' => 'Driver do banco de dados:', 'Board settings' => 'Configurações do board', - 'URL and token' => 'URL e token', 'Webhook settings' => 'Configurações do Webhook', - 'URL for task creation:' => 'URL para a criação da tarefa:', 'Reset token' => 'Resetar token', 'API endpoint:' => 'API endpoint:', 'Refresh interval for private board' => 'Intervalo de atualização para um board privado', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Remover uma swimlane', 'Show default swimlane' => 'Exibir swimlane padrão', 'Swimlane modification for the project "%s"' => 'Modificação de swimlane para o projeto "%s"', - 'Swimlane not found.' => 'Swimlane não encontrada.', 'Swimlane removed successfully.' => 'Swimlane removida com sucesso.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane atualizada com sucesso.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Todas as swimlanes', 'All colors' => 'Todas as cores', 'Moved to column %s' => 'Mover para a coluna %s', - 'Change description' => 'Modificar a descrição', 'User dashboard' => 'Painel de Controle do usuário', 'Allow only one subtask in progress at the same time for a user' => 'Permitir apenas uma subtarefa em andamento ao mesmo tempo para um usuário', 'Edit column "%s"' => 'Editar a coluna "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'ver o painel no Kanboard', 'The task have been moved to the first swimlane' => 'A tarefa foi movida para a primeira swimlane', 'The task have been moved to another swimlane:' => 'A tarefa foi movida para outra swimlane:', - 'Overdue tasks for the project "%s"' => 'Tarefas atrasadas para o projeto "%s"', 'New title: %s' => 'Novo título: %s', 'The task is not assigned anymore' => 'Agora a tarefa não está mais atribuída', 'New assignee: %s' => 'Novo designado: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Stop timer', 'Start timer' => 'Start timer', 'Add project member' => 'Adicionar membro ao projeto', - 'Enable notifications' => 'Ativar as notificações', 'My activity stream' => 'Meu feed de atividades', 'My calendar' => 'Minha agenda', 'Search tasks' => 'Pesquisar tarefas', @@ -1050,107 +1037,183 @@ return array( 'Add external link' => 'Adicionar um link externo', 'Type' => 'Tipo', 'Dependency' => 'Dependência', - // 'Add internal link' => '', - // 'Add a new external link' => '', - // 'Edit external link' => '', - // 'External link' => '', - // 'Copy and paste your link here...' => '', - // 'URL' => '', - // 'Internal links' => '', - // 'Assign to me' => '', - // 'Me' => '', - // 'Do not duplicate anything' => '', - // 'Projects management' => '', - // 'Users management' => '', - // 'Groups management' => '', - // 'Create from another project' => '', - // 'open' => '', - // 'closed' => '', - // 'Priority:' => '', - // 'Reference:' => '', - // 'Complexity:' => '', - // 'Swimlane:' => '', - // 'Column:' => '', - // 'Position:' => '', - // 'Creator:' => '', - // 'Time estimated:' => '', - // '%s hours' => '', - // 'Time spent:' => '', - // 'Created:' => '', - // 'Modified:' => '', - // 'Completed:' => '', - // 'Started:' => '', - // 'Moved:' => '', - // 'Task #%d' => '', - // 'Date and time format' => '', - // 'Time format' => '', - // 'Start date: ' => '', - // 'End date: ' => '', - // 'New due date: ' => '', - // 'Start date changed: ' => '', - // 'Disable private projects' => '', - // 'Do you really want to remove this custom filter: "%s"?' => '', - // 'Remove a custom filter' => '', - // 'User activated successfully.' => '', - // 'Unable to enable this user.' => '', - // 'User disabled successfully.' => '', - // 'Unable to disable this user.' => '', - // 'All files have been uploaded successfully.' => '', - // 'View uploaded files' => '', - // 'The maximum allowed file size is %sB.' => '', - // 'Choose files again' => '', - // 'Drag and drop your files here' => '', - // 'choose files' => '', - // 'View profile' => '', - // 'Two Factor' => '', - // 'Disable user' => '', - // 'Do you really want to disable this user: "%s"?' => '', - // 'Enable user' => '', - // 'Do you really want to enable this user: "%s"?' => '', - // 'Download' => '', - // 'Uploaded: %s' => '', - // 'Size: %s' => '', - // 'Uploaded by %s' => '', - // 'Filename' => '', - // 'Size' => '', - // 'Column created successfully.' => '', - // 'Another column with the same name exists in the project' => '', - // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', - // 'Change column position' => '', - // 'Switch to the project overview' => '', - // 'User filters' => '', - // 'Category filters' => '', - // 'Upload a file' => '', - // 'View file' => '', - // 'Last activity' => '', - // 'Change subtask position' => '', - // 'This value must be greater than %d' => '', - // 'Another swimlane with the same name exists in the project' => '', - // 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => '', - // 'Actions duplicated successfully.' => '', - // 'Unable to duplicate actions.' => '', - // 'Add a new action' => '', - // 'Import from another project' => '', - // 'There is no action at the moment.' => '', - // 'Import actions from another project' => '', - // 'There is no available project.' => '', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Add internal link' => 'Adicionar um link interno', + 'Add a new external link' => 'Adicionar um novo link externo', + 'Edit external link' => 'Editar um link externo', + 'External link' => 'Link externo', + 'Copy and paste your link here...' => 'Copie e cole o link aqui...', + 'URL' => 'URL', + 'Internal links' => 'Link interno', + 'Assign to me' => 'Atribuir-me', + 'Me' => 'Eu', + 'Do not duplicate anything' => 'Não duplique nada', + 'Projects management' => 'Gestão de projetos', + 'Users management' => 'Gestão dos usuários', + 'Groups management' => 'Gestão dos grupos', + 'Create from another project' => 'Criar a partir de outro projeto', + 'open' => 'aberto', + 'closed' => 'fechado', + 'Priority:' => 'Prioridade:', + 'Reference:' => 'Referência:', + 'Complexity:' => 'Complexidade:', + 'Swimlane:' => 'Swimlane:', + 'Column:' => 'Coluna:', + 'Position:' => 'Posição:', + 'Creator:' => 'Criador:', + 'Time estimated:' => 'Tempo estimado:', + '%s hours' => '%s horas', + 'Time spent:' => 'Tempo gasto:', + 'Created:' => 'Criado:', + 'Modified:' => 'Modificado:', + 'Completed:' => 'Completado:', + 'Started:' => 'Começado:', + 'Moved:' => 'Movido:', + 'Task #%d' => 'Tarefa #%d', + 'Date and time format' => 'Formato da hora e da data', + 'Time format' => 'Formato da hora', + 'Start date: ' => 'Data de início: ', + 'End date: ' => 'Data final: ', + 'New due date: ' => 'Nova data limite: ', + 'Start date changed: ' => 'Data de início alterada: ', + 'Disable private projects' => 'Desativar os projetos privados', + 'Do you really want to remove this custom filter: "%s"?' => 'Você realmente quer remover este filtro personalizado: "%s"?', + 'Remove a custom filter' => 'Remover um filtro personalizado', + 'User activated successfully.' => 'Usuário ativado com sucesso.', + 'Unable to enable this user.' => 'Impossível de ativar esse usuário.', + 'User disabled successfully.' => 'Usuário desactivado com sucesso.', + 'Unable to disable this user.' => 'Impossível de desativar esse usuário.', + 'All files have been uploaded successfully.' => 'Todos os arquivos foram enviados com sucesso.', + 'View uploaded files' => 'Ver os arquivos enviados', + 'The maximum allowed file size is %sB.' => 'O tamanho máximo dos arquivos é %sB.', + 'Choose files again' => 'Selecionar novamente arquivos', + 'Drag and drop your files here' => 'Arraste e solte os arquivos aqui', + 'choose files' => 'selecione os arquivos', + 'View profile' => 'Ver o perfil', + 'Two Factor' => 'Dois fatores', + 'Disable user' => 'Desativar o usuário', + 'Do you really want to disable this user: "%s"?' => 'Você realmente quer desativar este usuário: "%s"?', + 'Enable user' => 'Ativar um usuário', + 'Do you really want to enable this user: "%s"?' => 'Você realmente quer ativar este usuário: "%s"?', + 'Download' => 'Baixar', + 'Uploaded: %s' => 'Enviado: %s', + 'Size: %s' => 'Tamanho: %s', + 'Uploaded by %s' => 'Enviado por %s', + 'Filename' => 'Nome do arquivo', + 'Size' => 'Tamanho', + 'Column created successfully.' => 'A coluna criada com sucesso.', + 'Another column with the same name exists in the project' => 'Uma outra coluna com o mesmo nome já existe no projeto', + 'Default filters' => 'Filtros padrão', + 'Your board doesn\'t have any columns!' => 'O seu painel não tem nenhuma coluna', + 'Change column position' => 'Alterar a posição da coluna', + 'Switch to the project overview' => 'Mudar para a vista geral do projeto', + 'User filters' => 'Filtros dos usuários', + 'Category filters' => 'Filtros das categorias', + 'Upload a file' => 'Enviar um arquivo', + 'View file' => 'Ver um arquivo', + 'Last activity' => 'Últimas atividades', + 'Change subtask position' => 'Alterar a posição da sub-tarefa', + 'This value must be greater than %d' => 'Este valor deve ser maior que %d', + 'Another swimlane with the same name exists in the project' => 'Outra Swimlane existe com o mesmo nome no projeto', + 'Example: http://example.kanboard.net/ (used to generate absolute URLs)' => 'Exemplo: http://exemple.kanboard.net/ (usado para gerar URLs absolutos)', + 'Actions duplicated successfully.' => 'Ações duplicadas com sucesso.', + 'Unable to duplicate actions.' => 'Não foi possível duplicar as ações.', + 'Add a new action' => 'Adicionar uma nova ação', + 'Import from another project' => 'Importar a partir de outro projeto', + 'There is no action at the moment.' => 'Não há nenhuma ação actualmente.', + 'Import actions from another project' => 'Importar ações a partir de outro projeto', + 'There is no available project.' => 'Não há projetos disponíveis.', + 'Local File' => 'Arquivo local', + 'Configuration' => 'Configuração', + 'PHP version:' => 'Versão do PHP:', + 'PHP SAPI:' => 'PHP SAPI:', + 'OS version:' => 'Versão do sistema operacional:', + 'Database version:' => 'Versão do banco de dados:', + 'Browser:' => 'Browser:', + 'Task view' => 'Vista detalhada de uma tarefa', + 'Edit task' => 'Editar a tarefa', + 'Edit description' => 'Editar a descrição', + 'New internal link' => 'Novo link interno', + 'Display list of keyboard shortcuts' => 'Ver a lista dos atalhos de teclado', + 'Menu' => 'Menu', + 'Set start date' => 'Definir a data de início', + 'Avatar' => 'Avatar', + 'Upload my avatar image' => 'Enviar a minha imagem de avatar', + 'Remove my image' => 'Remover a minha imagem', + 'The OAuth2 state parameter is invalid' => 'O parâmetro "state" de OAuth2 não é válido', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/pt_PT/translations.php b/sources/app/Locale/pt_PT/translations.php index 1c32788..d9ea27b 100644 --- a/sources/app/Locale/pt_PT/translations.php +++ b/sources/app/Locale/pt_PT/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Ver esta tarefa', 'Remove user' => 'Remover utilizador', 'Do you really want to remove this user: "%s"?' => 'Pretende mesmo remover este utilizador: "%s"?', - 'New user' => 'Novo utilizador', 'All users' => 'Todos os utilizadores', 'Username' => 'Nome de utilizador', 'Password' => 'Senha', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d tarefas finalizadas', 'No task for this project' => 'Não há tarefa para este projecto', 'Public link' => 'Link público', - 'Change assignee' => 'Mudar a assignação', - 'Change assignee for the task "%s"' => 'Modificar assignação para a tarefa "%s"', 'Timezone' => 'Fuso horário', 'Sorry, I didn\'t find this information in my database!' => 'Desculpe, não encontrei esta informação na minha base de dados!', 'Page not found' => 'Página não encontrada', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Deixe uma descrição', 'Comment added successfully.' => 'Comentário adicionado com sucesso.', 'Unable to create your comment.' => 'Não é possível criar o seu comentário.', - 'Edit this task' => 'Editar esta tarefa', 'Due Date' => 'Data de vencimento', 'Invalid date' => 'Data inválida', 'Automatic actions' => 'Acções automáticas', @@ -250,7 +246,6 @@ return array( 'Category' => 'Categoria', 'Category:' => 'Categoria:', 'Categories' => 'Categorias', - 'Category not found.' => 'Categoria não encontrada.', 'Your category have been created successfully.' => 'A sua categoria foi criada com sucesso.', 'Unable to create your category.' => 'Não foi possível criar a sua categoria.', 'Your category have been updated successfully.' => 'A sua categoria foi actualizada com sucesso.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Tem a certeza que quer remover este arquivo: "%s"', 'Attachments' => 'Anexos', 'Edit the task' => 'Editar a tarefa', - 'Edit the description' => 'Editar a descrição', 'Add a comment' => 'Adicionar um comentário', 'Edit a comment' => 'Editar um comentário', 'Summary' => 'Resumo', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Nenhuma autenticação externa activa.', 'Password modified successfully.' => 'Senha alterada com sucesso.', 'Unable to change the password.' => 'Não foi possível alterar a senha.', - 'Change category for the task "%s"' => 'Mudar categoria da tarefa "%s"', 'Change category' => 'Mudar categoria', '%s updated the task %s' => '%s actualizou a tarefa %s', '%s opened the task %s' => '%s abriu a tarefa %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Sobre', 'Database driver:' => 'Driver da base de dados:', 'Board settings' => 'Configurações do Quadro', - 'URL and token' => 'URL e token', 'Webhook settings' => 'Configurações do Webhook', - 'URL for task creation:' => 'URL para a criação da tarefa:', 'Reset token' => 'Redefinir token', 'API endpoint:' => 'API endpoint:', 'Refresh interval for private board' => 'Intervalo de actualização para um quadro privado', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Remover um swimlane', 'Show default swimlane' => 'Mostrar swimlane padrão', 'Swimlane modification for the project "%s"' => 'Modificação de swimlane para o projecto "%s"', - 'Swimlane not found.' => 'Swimlane não encontrado.', 'Swimlane removed successfully.' => 'Swimlane removido com sucesso.', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane atualizado com sucesso.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Todos os swimlane', 'All colors' => 'Todas as cores', 'Moved to column %s' => 'Mover para a coluna %s', - 'Change description' => 'Modificar a descrição', 'User dashboard' => 'Painel de Controlo do utilizador', 'Allow only one subtask in progress at the same time for a user' => 'Permitir apenas uma subtarefa em andamento ao mesmo tempo para um utilizador', 'Edit column "%s"' => 'Editar a coluna "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'ver o painel no Kanboard', 'The task have been moved to the first swimlane' => 'A tarefa foi movida para o primeiro Swimlane', 'The task have been moved to another swimlane:' => 'A tarefa foi movida para outro Swimlane:', - 'Overdue tasks for the project "%s"' => 'Tarefas atrasadas para o projecto "%s"', 'New title: %s' => 'Novo título: %s', 'The task is not assigned anymore' => 'Tarefa já não está atribuída', 'New assignee: %s' => 'Novo assignado: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Parar temporizador', 'Start timer' => 'Iniciar temporizador', 'Add project member' => 'Adicionar um membro ao projecto', - 'Enable notifications' => 'Activar as notificações', 'My activity stream' => 'O meu feed de actividade', 'My calendar' => 'A minha agenda', 'Search tasks' => 'Pesquisar tarefas', @@ -852,7 +839,7 @@ return array( 'Gantt' => 'Gantt', 'Author' => 'Autor', 'Version' => 'Versão', - 'Plugins' => 'Extras', + 'Plugins' => 'Plugins', 'There is no plugin loaded.' => 'Não existem extras carregados', 'Set maximum column height' => 'Definir altura máxima da coluna', 'Remove maximum column height' => 'Remover altura máxima da coluna', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Coluna criada com sucesso.', 'Another column with the same name exists in the project' => 'Já existe outra coluna com o mesmo nome no projecto', 'Default filters' => 'Filtros padrão', - 'Your board doesn\'t have any column!' => 'O seu quadro não tem nenhuma coluna!', + 'Your board doesn\'t have any columns!' => 'O seu quadro não tem nenhuma coluna!', 'Change column position' => 'Mudar posição da coluna', 'Switch to the project overview' => 'Mudar para vista geral do projecto', 'User filters' => 'Filtros de utilizador', @@ -1135,22 +1122,98 @@ return array( 'There is no action at the moment.' => 'De momento não existe acção.', 'Import actions from another project' => 'Importar acções de outro projecto', 'There is no available project.' => 'Não existe projecto disponivel.', - // 'Local File' => '', - // 'Configuration' => '', - // 'PHP version:' => '', - // 'PHP SAPI:' => '', - // 'OS version:' => '', - // 'Database version:' => '', - // 'Browser:' => '', - // 'Task view' => '', - // 'Edit task' => '', - // 'Edit description' => '', - // 'New internal link' => '', - // 'Display list of keyboard shortcuts' => '', - // 'Menu' => '', - // 'Set start date' => '', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Local File' => 'Ficheiro Local', + 'Configuration' => 'Configuração', + 'PHP version:' => 'Versão PHP:', + 'PHP SAPI:' => 'SAPI PHP:', + 'OS version:' => 'Versão SO:', + 'Database version:' => 'Versão base de dados:', + 'Browser:' => 'Navegador:', + 'Task view' => 'Vista de Tarefas', + 'Edit task' => 'Editar tarefa', + 'Edit description' => 'Editar descrição', + 'New internal link' => 'Nova ligação interna', + 'Display list of keyboard shortcuts' => 'Mostrar lista de atalhos do teclado', + 'Menu' => 'Menu', + 'Set start date' => 'Definir data de inicio', + 'Avatar' => 'Avatar', + 'Upload my avatar image' => 'Enviar a minha imagem de avatar', + 'Remove my image' => 'Remover a minha imagem', + 'The OAuth2 state parameter is invalid' => 'O parametro de estado do OAuth2 é inválido', + 'User not found.' => 'Utilizador não encontrado.', + 'Search in activity stream' => 'Procurar no fluxo de atividade', + 'My activities' => 'Minhas actividades', + 'Activity until yesterday' => 'Actividade até ontem', + 'Activity until today' => 'Actividade até hoje', + 'Search by creator: ' => 'Procurar por criador: ', + 'Search by creation date: ' => 'Procurar por data de criação: ', + 'Search by task status: ' => 'Procurar por estado da tarefa: ', + 'Search by task title: ' => 'Procurar por titulo da tarefa: ', + 'Activity stream search' => 'Procurar fluxo de actividade', + 'Projects where "%s" is manager' => 'Projectos onde "%s" é gestor', + 'Projects where "%s" is member' => 'Projectos onde "%s" é membro', + 'Open tasks assigned to "%s"' => 'Tarefas abertas assignadas a "%s"', + 'Closed tasks assigned to "%s"' => 'Tarefas fechadas assignadas a "%s"', + 'Assign automatically a color based on a priority' => 'Assignar uma cor automáticamente de acordo com a prioridade', + 'Overdue tasks for the project(s) "%s"' => 'Tarefas em atraso para o(s) projecto(s) "%s"', + 'Upload files' => 'Enviar ficheiros', + 'Installed Plugins' => 'Plugins Instalados', + 'Plugin Directory' => 'Directoria de Plugins', + 'Plugin installed successfully.' => 'Plugin instalado com sucesso.', + 'Plugin updated successfully.' => 'Plugin actualizado com sucesso.', + 'Plugin removed successfully.' => 'Plugin removido com sucesso.', + 'Subtask converted to task successfully.' => 'Sub-tarefa convertida para tarefa com sucesso.', + 'Unable to convert the subtask.' => 'Não foi possivel converter a sub-tarefa.', + 'Unable to extract plugin archive.' => 'Não foi possivel extrair arquivo do plugin.', + 'Plugin not found.' => 'Plugin não encontrado.', + 'You don\'t have the permission to remove this plugin.' => 'Não tem acesso para remover este plugin.', + 'Unable to download plugin archive.' => 'Não foi possivel transferir o arquivo do plugin.', + 'Unable to write temporary file for plugin.' => 'Não foi possivel escrever o ficheiro temporário para o plugin.', + 'Unable to open plugin archive.' => 'Não foi possivel abrir o arquivo do plugin.', + 'There is no file in the plugin archive.' => 'Ficheiro não encontrado dentro do arquivo do plugin.', + 'Create tasks in bulk' => 'Criar tarefas em massa', + 'Your Kanboard instance is not configured to install plugins from the user interface.' => 'Este Kanboard não está configurado para instalar plugins através do interface de utilizador.', + 'There is no plugin available.' => 'Não existe nenhum plugin instalado.', + 'Install' => 'Instalar', + 'Update' => 'Actualizar', + 'Up to date' => 'Actualizado', + 'Not available' => 'Não disponivel', + 'Remove plugin' => 'Remover plugin', + 'Do you really want to remove this plugin: "%s"?' => 'Tem a certeza que pretende remover este plugin: "%s%"?', + 'Uninstall' => 'Desinstalar', + 'Listing' => 'A Listar', + 'Metadata' => 'Metadata', + 'Manage projects' => 'Gerir projectos', + 'Convert to task' => 'Converter para tarefa', + 'Convert sub-task to task' => 'Converter sub-tarefa para tarefa', + 'Do you really want to convert this sub-task to a task?' => 'Tem a certeza que pretende converter esta sub-tarefa para tarefa?', + 'My task title' => 'Titulo da minha tarefa', + 'Enter one task by line.' => 'Escreva uma tarefa por linha.', + 'Number of failed login:' => 'Número de logins falhados:', + 'Account locked until:' => 'Conta bloqueada até:', + 'Email settings' => 'Definições de Email', + 'Email sender address' => 'Endereço de envido de Email', + 'Email transport' => 'Transportador de Email', + 'Webhook token' => 'Token do Webhook', + 'Imports' => 'Importados', + 'Project tags management' => 'Gestão de etiquetas do Projecto', + 'Tag created successfully.' => 'Etiqueta criada com sucesso.', + 'Unable to create this tag.' => 'Não foi possivel criar esta etiqueta.', + 'Tag updated successfully.' => 'Etiqueta actualizada com sucesso.', + 'Unable to update this tag.' => 'Não foi possivel actualizar esta etiqueta.', + 'Tag removed successfully.' => 'Etiqueta removida com sucesso.', + 'Unable to remove this tag.' => 'Não foi possivel remover esta etiqueta.', + 'Global tags management' => 'Gestão de etiquetas globais', + 'Tags' => 'Etiquetas', + 'Tags management' => 'Gestão de Etiquetas', + 'Add new tag' => 'Adicionar etiqueta nova', + 'Edit a tag' => 'Editar a etiqueta', + 'Project tags' => 'Etiquetas do Projecto', + 'There is no specific tag for this project at the moment.' => 'De momento não existe nenhuma etiqueta para este projecto.', + 'Tag' => 'Etiqueta', + 'Remove a tag' => 'Remover etiqueta', + 'Do you really want to remove this tag: "%s"?' => 'Tem a certeza que pretende remover esta etiqueta: "%s"?', + 'Global tags' => 'Etiquetas globais', + 'There is no global tag at the moment.' => 'De momento não existe nenhuma etiqueta global.', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/ru_RU/translations.php b/sources/app/Locale/ru_RU/translations.php index 3cb3c6b..3b5e09d 100644 --- a/sources/app/Locale/ru_RU/translations.php +++ b/sources/app/Locale/ru_RU/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Посмотреть задачу', 'Remove user' => 'Удалить пользователя', 'Do you really want to remove this user: "%s"?' => 'Вы точно хотите удалить пользователя: « %s » ?', - 'New user' => 'Новый пользователь', 'All users' => 'Все пользователи', 'Username' => 'Имя пользователя', 'Password' => 'Пароль', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d завершенных задач', 'No task for this project' => 'Нет задач для этого проекта', 'Public link' => 'Ссылка для просмотра', - 'Change assignee' => 'Сменить назначенного', - 'Change assignee for the task "%s"' => 'Сменить назначенного для задачи « %s »', 'Timezone' => 'Часовой пояс', 'Sorry, I didn\'t find this information in my database!' => 'К сожалению, информация в базе данных не найдена !', 'Page not found' => 'Страница не найдена', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Напишите описание', 'Comment added successfully.' => 'Комментарий успешно добавлен.', 'Unable to create your comment.' => 'Невозможно создать комментарий.', - 'Edit this task' => 'Изменить задачу', 'Due Date' => 'Сделать до', 'Invalid date' => 'Неверная дата', 'Automatic actions' => 'Автоматические действия', @@ -250,7 +246,6 @@ return array( 'Category' => 'Категория', 'Category:' => 'Категория:', 'Categories' => 'Категории', - 'Category not found.' => 'Категория не найдена', 'Your category have been created successfully.' => 'Категория создана.', 'Unable to create your category.' => 'Не удалось создать категорию.', 'Your category have been updated successfully.' => 'Категория обновлена.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Вы точно хотите удалить этот файл « %s » ?', 'Attachments' => 'Вложения', 'Edit the task' => 'Изменить задачу', - 'Edit the description' => 'Изменить описание', 'Add a comment' => 'Добавить комментарий', 'Edit a comment' => 'Изменить комментарий', 'Summary' => 'Сводка', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Нет активной внешней аутентификации.', 'Password modified successfully.' => 'Пароль изменен.', 'Unable to change the password.' => 'Не удалось сменить пароль.', - 'Change category for the task "%s"' => 'Сменить категорию для задачи "%s"', 'Change category' => 'Смена категории', '%s updated the task %s' => '%s обновил задачу %s', '%s opened the task %s' => '%s открыл задачу %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Информация', 'Database driver:' => 'Драйвер базы данных', 'Board settings' => 'Настройки доски', - 'URL and token' => 'URL и токен', 'Webhook settings' => 'Параметры Webhook', - 'URL for task creation:' => 'URL для создания задачи:', 'Reset token' => 'Перезагрузить токен', 'API endpoint:' => 'API endpoint:', 'Refresh interval for private board' => 'Период обновления для частных досок', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Удалить дорожку', 'Show default swimlane' => 'Показать стандартную дорожку', 'Swimlane modification for the project "%s"' => 'Редактирование дорожки для проекта "%s"', - 'Swimlane not found.' => 'Дорожка не найдена.', 'Swimlane removed successfully.' => 'Дорожка успешно удалена', 'Swimlanes' => 'Дорожки', 'Swimlane updated successfully.' => 'Дорожка успешно обновлена.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Все дорожки', 'All colors' => 'Все цвета', 'Moved to column %s' => 'Перемещена в колонку %s', - 'Change description' => 'Изменить описание', 'User dashboard' => 'Пользователь панели мониторинга', 'Allow only one subtask in progress at the same time for a user' => 'Разрешена только одна подзадача в разработке одновременно для одного пользователя', 'Edit column "%s"' => 'Редактировать колонку "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'посмотреть доску на Kanboard', 'The task have been moved to the first swimlane' => 'Эта задача была перемещена в первую дорожку', 'The task have been moved to another swimlane:' => 'Эта задача была перемещена в другую дорожку:', - 'Overdue tasks for the project "%s"' => 'Просроченные задачи для проекта "%s"', 'New title: %s' => 'Новый заголовок: %s', 'The task is not assigned anymore' => 'Задача больше не назначена', 'New assignee: %s' => 'Новый назначенный: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Остановить таймер', 'Start timer' => 'Запустить таймер', 'Add project member' => 'Добавить номер проекта', - 'Enable notifications' => 'Включить уведомления', 'My activity stream' => 'Лента моей активности', 'My calendar' => 'Мой календарь', 'Search tasks' => 'Поиск задачи', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => 'Столбец успешно создан', 'Another column with the same name exists in the project' => 'Столбец с таким именем уже существует в этом проекте', 'Default filters' => 'Стандартные фильтры', - 'Your board doesn\'t have any column!' => 'Ваша доска не имеет ни одного столбца!', + 'Your board doesn\'t have any columns!' => 'Ваша доска не имеет ни одного столбца!', 'Change column position' => 'Смена позиции столбца', 'Switch to the project overview' => 'Переключение на обзор проекта', 'User filters' => 'Фильтры по пользователям', @@ -1149,8 +1136,84 @@ return array( 'Display list of keyboard shortcuts' => 'Показать список клавиатурных сокращений', 'Menu' => 'Меню', 'Set start date' => 'Установить дату начала', - // 'Avatar' => '', - // 'Upload my avatar image' => '', - // 'Remove my image' => '', - // 'The OAuth2 state parameter is invalid' => '', + 'Avatar' => 'Аватар', + 'Upload my avatar image' => 'Загрузить моё изображение для аватара', + 'Remove my image' => 'Удалить моё изображение', + 'The OAuth2 state parameter is invalid' => 'Параметр состояние OAuth2 неправильный', + 'User not found.' => 'Пользователь не найден', + 'Search in activity stream' => 'Поиск в потоке активности', + 'My activities' => 'Мои активности', + 'Activity until yesterday' => 'Активности до вчерашнего дня', + 'Activity until today' => 'Активности до сегодня', + 'Search by creator: ' => 'Поиск по создателю: ', + 'Search by creation date: ' => 'Поиск по дате создания: ', + 'Search by task status: ' => 'Поиск по статусу задачи: ', + 'Search by task title: ' => 'Поиск по заголоску задачи: ', + 'Activity stream search' => 'Поиск в потоке активности; ', + 'Projects where "%s" is manager' => 'Проекты, где менеджером является "%s"', + 'Projects where "%s" is member' => 'Проекты, где членом является "%s"', + 'Open tasks assigned to "%s"' => 'Открытые задачи, назначенные на "%s"', + 'Closed tasks assigned to "%s"' => 'Закрытые задачи, назначенные на "%s"', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/sr_Latn_RS/translations.php b/sources/app/Locale/sr_Latn_RS/translations.php index c7070a8..00e607f 100644 --- a/sources/app/Locale/sr_Latn_RS/translations.php +++ b/sources/app/Locale/sr_Latn_RS/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Pregledaj zadatak', 'Remove user' => 'Ukloni korisnika', 'Do you really want to remove this user: "%s"?' => 'Da li zaista želiš da ukloniš korisnika: "%s"?', - 'New user' => 'novi korisnik', 'All users' => 'Svi korisnici', 'Username' => 'Korisnik', 'Password' => 'Lozinka', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d zatvorenih zadataka', 'No task for this project' => 'Nema dodeljenih zadataka ovom projektu', 'Public link' => 'Javni link', - 'Change assignee' => 'Izmeni dodelu', - 'Change assignee for the task "%s"' => 'Izmeni dodelu za ovaj zadatak "%s"', 'Timezone' => 'Vremenska zona', 'Sorry, I didn\'t find this information in my database!' => 'Na žalost, nije pronađena informacija u bazi', 'Page not found' => 'Strana nije pronađena', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Dodaj opis', 'Comment added successfully.' => 'Komentar uspešno ostavljen', 'Unable to create your comment.' => 'Nemoguće kreiranje komentara', - 'Edit this task' => 'Izmeni ovaj zadatak', 'Due Date' => 'Termin', 'Invalid date' => 'Loš datum', 'Automatic actions' => 'Automatske akcije', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategorija', 'Category:' => 'Kategorija:', 'Categories' => 'Kategorije', - 'Category not found.' => 'Kategorija nije pronađena', 'Your category have been created successfully.' => 'Uspešno kreirana kategorija.', 'Unable to create your category.' => 'Nije moguće kreirati kategoriju.', 'Your category have been updated successfully.' => 'Kategorija je uspešno izmenjena', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Da li da uklonim fajl: "%s"?', 'Attachments' => 'Prilozi', 'Edit the task' => 'Izmena Zadatka', - 'Edit the description' => 'Izmena opisa', 'Add a comment' => 'Dodaj komentar', 'Edit a comment' => 'Izmeni komentar', 'Summary' => 'Pregled', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Bez omogućenih spoljnih autentikacija.', 'Password modified successfully.' => 'Uspešna izmena lozinke.', 'Unable to change the password.' => 'Nije moguće izmeniti lozinku.', - 'Change category for the task "%s"' => 'Izmeni kategoriju zadatka "%s"', 'Change category' => 'Izmeni kategoriju', '%s updated the task %s' => '%s izmeni zadatak %s', '%s opened the task %s' => '%s aktivni zadaci %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Informacje', 'Database driver:' => 'Database driver:', 'Board settings' => 'Podešavanje table', - 'URL and token' => 'URL i token', // 'Webhook settings' => '', - 'URL for task creation:' => 'URL za kreiranje zadataka', 'Reset token' => 'Resetuj token', // 'API endpoint:' => '', 'Refresh interval for private board' => 'Interval osvežavanja privatnih tabli', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Ukloni razdelnik', 'Show default swimlane' => 'Prikaži osnovni razdelnik', 'Swimlane modification for the project "%s"' => 'Izmena razdelnika za projekat "%s"', - 'Swimlane not found.' => 'Razdelnik nije pronađen.', 'Swimlane removed successfully.' => 'Razdelnik uspešno uklonjen.', 'Swimlanes' => 'Razdelnici', 'Swimlane updated successfully.' => 'Razdelnik zaktualizowany pomyślnie.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Svi razdelniki', 'All colors' => 'Sve boje', 'Moved to column %s' => 'Premešten u kolonu %s', - // 'Change description' => '', 'User dashboard' => 'Korisnički panel', // 'Allow only one subtask in progress at the same time for a user' => '', // 'Edit column "%s"' => '', @@ -709,7 +698,6 @@ return array( // 'view the board on Kanboard' => '', // 'The task have been moved to the first swimlane' => '', // 'The task have been moved to another swimlane:' => '', - // 'Overdue tasks for the project "%s"' => '', // 'New title: %s' => '', // 'The task is not assigned anymore' => '', // 'New assignee: %s' => '', @@ -738,7 +726,6 @@ return array( // 'Stop timer' => '', // 'Start timer' => '', // 'Add project member' => '', - // 'Enable notifications' => '', // 'My activity stream' => '', // 'My calendar' => '', // 'Search tasks' => '', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/sv_SE/translations.php b/sources/app/Locale/sv_SE/translations.php index e4728d2..88db5d6 100644 --- a/sources/app/Locale/sv_SE/translations.php +++ b/sources/app/Locale/sv_SE/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Se denna uppgift', 'Remove user' => 'Ta bort användare', 'Do you really want to remove this user: "%s"?' => 'Vill du verkligen ta bort användaren: "%s"?', - 'New user' => 'Ny användare', 'All users' => 'Alla användare', 'Username' => 'Användarnamn', 'Password' => 'Lösenord', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d stängda uppgifter', 'No task for this project' => 'Inga uppgifter i detta projekt', 'Public link' => 'Publik länk', - 'Change assignee' => 'Ändra uppdragsinnehavare', - 'Change assignee for the task "%s"' => 'Ändra uppdragsinnehavare för uppgiften "%s"', 'Timezone' => 'Tidszon', 'Sorry, I didn\'t find this information in my database!' => 'Informationen kunde inte hittas i databasen.', 'Page not found' => 'Sidan hittas inte', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Lämna en beskrivning', 'Comment added successfully.' => 'Kommentaren har lagts till.', 'Unable to create your comment.' => 'Kommentaren kunde inte laddas upp.', - 'Edit this task' => 'Ändra denna uppgift', 'Due Date' => 'Måldatum', 'Invalid date' => 'Ej tillåtet datum', 'Automatic actions' => 'Automatiska åtgärder', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori:', 'Categories' => 'Ange kategorier', - 'Category not found.' => 'Kategorin hittades inte', 'Your category have been created successfully.' => 'Din kategori har skapats', 'Unable to create your category.' => 'Kunde inte skapa din kategori', 'Your category have been updated successfully.' => 'Din kategori har uppdaterats', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Vill du verkligen ta bort denna fil:"%s"?', 'Attachments' => 'Bifogade filer', 'Edit the task' => 'Ändra uppgiften', - 'Edit the description' => 'Ändra beskrivningen', 'Add a comment' => 'Lägg till kommentar', 'Edit a comment' => 'Ändra en kommentar', 'Summary' => 'Sammanfattning', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Ingen extern autentisering aktiverad.', 'Password modified successfully.' => 'Lösenordet har ändrats.', 'Unable to change the password.' => 'Kunde inte byta lösenord.', - 'Change category for the task "%s"' => 'Byt kategori för uppgiften "%s"', 'Change category' => 'Byt kategori', '%s updated the task %s' => '%s uppdaterade uppgiften %s', '%s opened the task %s' => '%s öppna uppgiften %s', @@ -413,9 +406,7 @@ return array( 'About' => 'Om', 'Database driver:' => 'Databasdrivrutin:', 'Board settings' => 'Inställningar för tavla', - 'URL and token' => 'URL och token', 'Webhook settings' => 'Webhook inställningar', - 'URL for task creation:' => 'URL för att skapa uppgift:', 'Reset token' => 'Nollställ token', 'API endpoint:' => 'API ändpunkt:', 'Refresh interval for private board' => 'Uppdateringsintervall för privat tavla', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Ta bort en swimlane', 'Show default swimlane' => 'Visa standard swimlane', 'Swimlane modification for the project "%s"' => 'Ändra swimlane för projektet "%s"', - 'Swimlane not found.' => 'Swimlane kunde inte hittas', 'Swimlane removed successfully.' => 'Swimlane togs bort', 'Swimlanes' => 'Swimlanes', 'Swimlane updated successfully.' => 'Swimlane uppdaterad', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Alla swimlanes', 'All colors' => 'Alla färger', 'Moved to column %s' => 'Flyttad till kolumn %s', - 'Change description' => 'Ändra beskrivning', 'User dashboard' => 'Användardashboard', 'Allow only one subtask in progress at the same time for a user' => 'Tillåt endast en deluppgift igång samtidigt för en användare', 'Edit column "%s"' => 'Ändra kolumn "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'visa tavlan på Kanboard', 'The task have been moved to the first swimlane' => 'Uppgiften har flyttats till första swimlane', 'The task have been moved to another swimlane:' => 'Uppgiften har flyttats till en annan swimlane:', - 'Overdue tasks for the project "%s"' => 'Försenade uppgifter för projektet "%s"', 'New title: %s' => 'Ny titel: %s', 'The task is not assigned anymore' => 'Uppgiften är inte länge tilldelad', 'New assignee: %s' => 'Ny tilldelning: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Stoppa timer', 'Start timer' => 'Starta timer', 'Add project member' => 'Lägg till projektmedlem', - 'Enable notifications' => 'Aktivera notiser', 'My activity stream' => 'Min aktivitetsström', 'My calendar' => 'Min kalender', 'Search tasks' => 'Sök uppgifter', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/th_TH/translations.php b/sources/app/Locale/th_TH/translations.php index 1e2fb98..fd35d28 100644 --- a/sources/app/Locale/th_TH/translations.php +++ b/sources/app/Locale/th_TH/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'รายละเอียดงานนี้', 'Remove user' => 'เอาผู้ใช้ออก', 'Do you really want to remove this user: "%s"?' => 'คุณต้องการเอาผู้ใช้ « %s » ออกใช่หรือไม่?', - 'New user' => 'ผู้ใช้ใหม่', 'All users' => 'ผู้ใช้ทั้งหมด', 'Username' => 'ชื่อผู้ใช้', 'Password' => 'รหัสผ่าน', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d งานที่ปิด', 'No task for this project' => 'ไม่มีงานสำหรับโปรเจคนี้', 'Public link' => 'ลิงค์สาธารณะ', - 'Change assignee' => 'เปลี่ยนการกำหนด', - 'Change assignee for the task "%s"' => 'เปลี่ยนการกำหนดสำหรับงาน « %s »', 'Timezone' => 'เขตเวลา', 'Sorry, I didn\'t find this information in my database!' => 'เสียใจด้วย ไม่สามารถหาข้อมูลในฐานข้อมูลได้', 'Page not found' => 'ไม่พบหน้า', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'แสดงคำอธิบาย', 'Comment added successfully.' => 'เพิ่มความคิดเห็นเรียบร้อยแล้ว', 'Unable to create your comment.' => 'ไม่สามารถสร้างความคิดเห็น', - 'Edit this task' => 'แก้ไขงาน', 'Due Date' => 'วันที่ครบกำหนด', 'Invalid date' => 'วันที่ผิด', 'Automatic actions' => 'การกระทำอัตโนมัติ', @@ -250,7 +246,6 @@ return array( 'Category' => 'หมวด', 'Category:' => 'หมวด:', 'Categories' => 'หมวด', - 'Category not found.' => 'ไม่พบหมวด', 'Your category have been created successfully.' => 'สร้างหมวดเรียบร้อยแล้ว', 'Unable to create your category.' => 'ไม่สามารถสร้างหมวดได้', 'Your category have been updated successfully.' => 'ปรับปรุงหมวดเรียบร้อยแล้ว', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'คุณต้องการลบไฟล์ "%s" ใช่หรือไม่?', 'Attachments' => 'แนบ', 'Edit the task' => 'แก้ไขงาน', - 'Edit the description' => 'แก้ไขคำอธิบาย', 'Add a comment' => 'เพิ่มความคิดเห็น', 'Edit a comment' => 'แก้ไขความคิดเห็น', 'Summary' => 'สรุป', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'ไม่เปิดการใช้งานการยืนยันภายนอก', 'Password modified successfully.' => 'แก้ไขรหัสผ่านเรียบร้อยแล้ว', 'Unable to change the password.' => 'ไม่สามารถเปลี่ยนรหัสผ่านได้', - 'Change category for the task "%s"' => 'เปลี่ยนหมวดสำหรับงาน "%s"', 'Change category' => 'เปลี่ยนหมวด', '%s updated the task %s' => '%s ปรับปรุงงานแล้ว %s', '%s opened the task %s' => '%s เปิดงานแล้ว %s', @@ -413,9 +406,7 @@ return array( 'About' => 'เกี่ยวกับ', 'Database driver:' => 'เครื่องมือฐานขข้อมูล', 'Board settings' => 'ตั้งค่าบอร์ด', - // 'URL and token' => '', // 'Webhook settings' => '', - // 'URL for task creation:' => '', // 'Reset token' => '', // 'API endpoint:' => '', 'Refresh interval for private board' => 'ระยะรีเฟรชบอร์ดส่วนตัว', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'ลบสวิมเลน', 'Show default swimlane' => 'แสดงสวิมเลนเริ่มต้น', 'Swimlane modification for the project "%s"' => 'แก้ไขสวิมเลนสำหรับโปรเจค "%s"', - 'Swimlane not found.' => 'หาสวิมเลนไม่พบ', 'Swimlane removed successfully.' => 'ลบสวิมเลนเรียบร้อยแล้ว', 'Swimlanes' => 'สวิมเลน', 'Swimlane updated successfully.' => 'ปรับปรุงสวิมเลนเรียบร้อยแล้ว', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'สวิมเลนทั้งหมด', 'All colors' => 'สีทั้งหมด', 'Moved to column %s' => 'เคลื่อนไปคอลัมน์ %s', - 'Change description' => 'เปลี่ยนคำอธิบาย', 'User dashboard' => 'ผู้ใช้แดชบอร์ด', 'Allow only one subtask in progress at the same time for a user' => 'อนุญาตให้ทำงานย่อยได้เพียงงานเดียวต่อหนึ่งคนในเวลาเดียวกัน', 'Edit column "%s"' => 'แก้ไขคอลัมน์ "%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'แสดงบอร์ดบนคังบอร์ด', 'The task have been moved to the first swimlane' => 'งานถูกย้านไปสวิมเลนแรก', 'The task have been moved to another swimlane:' => 'งานถูกย้านไปสวิมเลนอื่น:', - 'Overdue tasks for the project "%s"' => 'งานที่เกินกำหนดสำหรับโปรเจค "%s"', 'New title: %s' => 'ชื่อเรื่องใหม่: %s', 'The task is not assigned anymore' => 'ไม่กำหนดผู้รับผิดชอบ', 'New assignee: %s' => 'ผู้รับผิดชอบใหม่: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'หยุดจับเวลา', 'Start timer' => 'เริ่มจับเวลา', 'Add project member' => 'เพิ่มสมาชิกโปรเจค', - 'Enable notifications' => 'เปิดการแจ้งเตือน', 'My activity stream' => 'กิจกรรมที่เกิดขึ้นของฉัน', 'My calendar' => 'ปฎิทินของฉัน', 'Search tasks' => 'ค้นหางาน', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/tr_TR/translations.php b/sources/app/Locale/tr_TR/translations.php index 6e8fae2..41e2259 100644 --- a/sources/app/Locale/tr_TR/translations.php +++ b/sources/app/Locale/tr_TR/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => 'Bu görevi görüntüle', 'Remove user' => 'Kullanıcıyı kaldır', 'Do you really want to remove this user: "%s"?' => 'Bu kullanıcıyı gerçekten silmek istiyor musunuz: "%s"?', - 'New user' => 'Yeni kullanıcı', 'All users' => 'Tüm kullanıcılar', 'Username' => 'Kullanıcı adı', 'Password' => 'Şifre', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d kapatılmış görevler', 'No task for this project' => 'Bu proje için görev yok', 'Public link' => 'Dışa açık link', - 'Change assignee' => 'Atanmış Kullanıcıyı değiştir', - 'Change assignee for the task "%s"' => '"%s" görevi için atanmış kullanıcıyı değiştir', 'Timezone' => 'Saat dilimi', 'Sorry, I didn\'t find this information in my database!' => 'Üzgünüm, bu bilgiyi veri tabanımda bulamadım.', 'Page not found' => 'Sayfa bulunamadı', @@ -170,7 +167,6 @@ return array( 'Leave a description' => 'Açıklama ekleyin', 'Comment added successfully.' => 'Yorum eklendi', 'Unable to create your comment.' => 'Yorumunuz oluşturulamadı', - 'Edit this task' => 'Bu görevi değiştir', 'Due Date' => 'Bitiş Tarihi', 'Invalid date' => 'Geçersiz tarihi', 'Automatic actions' => 'Otomatik işlemler', @@ -250,7 +246,6 @@ return array( 'Category' => 'Kategori', 'Category:' => 'Kategori:', 'Categories' => 'Kategoriler', - 'Category not found.' => 'Kategori bulunamadı.', 'Your category have been created successfully.' => 'Kategori başarıyla oluşturuldu.', 'Unable to create your category.' => 'Kategori oluşturulamadı.', 'Your category have been updated successfully.' => 'Kategori başarıyla güncellendi.', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => 'Bu dosyayı silmek istediğinize emin misiniz: "%s"?', 'Attachments' => 'Ekler', 'Edit the task' => 'Görevi değiştir', - 'Edit the description' => 'Açıklamayı değiştir', 'Add a comment' => 'Yorum ekle', 'Edit a comment' => 'Yorum değiştir', 'Summary' => 'Özet', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => 'Dış kimlik doğrulama kapalı.', 'Password modified successfully.' => 'Şifre başarıyla değiştirildi.', 'Unable to change the password.' => 'Şifre değiştirilemiyor.', - 'Change category for the task "%s"' => '"%s" görevi için kategori değiştirme', 'Change category' => 'Kategori değiştirme', '%s updated the task %s' => '%s kullanıcısı %s görevini güncelledi', '%s opened the task %s' => '%s kullanıcısı %s görevini açtı', @@ -413,9 +406,7 @@ return array( 'About' => 'Hakkında', 'Database driver:' => 'Veritabanı sürücüsü:', 'Board settings' => 'Tablo ayarları', - 'URL and token' => 'URL veya Belirteç', 'Webhook settings' => 'Webhook ayarları', - 'URL for task creation:' => 'Görev oluşturma için URL', 'Reset token' => 'Belirteci sıfırla', 'API endpoint:' => 'API bitiş noktası:', 'Refresh interval for private board' => 'Özel tablolar için yenileme sıklığı', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => 'Kulvarı sil', 'Show default swimlane' => 'Varsayılan Kulvarı göster', 'Swimlane modification for the project "%s"' => '"%s" Projesi için Kulvar değişikliği', - 'Swimlane not found.' => 'Kulvar bulunamadı', 'Swimlane removed successfully.' => 'Kulvar başarıyla kaldırıldı.', 'Swimlanes' => 'Kulvarlar', 'Swimlane updated successfully.' => 'Kulvar başarıyla güncellendi.', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => 'Tüm Kulvarlar', 'All colors' => 'Tüm Renkler', 'Moved to column %s' => '%s Sütununa taşındı', - 'Change description' => 'Açıklamayı değiştir', 'User dashboard' => 'Kullanıcı Anasayfası', 'Allow only one subtask in progress at the same time for a user' => 'Bir kullanıcı için aynı anda yalnızca bir alt göreve izin ver', 'Edit column "%s"' => '"%s" sütununu değiştir', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => 'Tabloyu Kanboard\'da görüntüle', 'The task have been moved to the first swimlane' => 'Görev birinci kulvara taşındı', 'The task have been moved to another swimlane:' => 'Görev başka bir kulvara taşındı:', - 'Overdue tasks for the project "%s"' => '"%s" projesi için gecikmiş görevler', 'New title: %s' => 'Yeni başlık: %s', 'The task is not assigned anymore' => 'Görev artık atanmamış', 'New assignee: %s' => 'Yeni atanan: %s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => 'Zamanlayıcıyı durdur', 'Start timer' => 'Zamanlayıcıyı başlat', 'Add project member' => 'Proje üyesi ekle', - 'Enable notifications' => 'Bildirimleri etkinleştir', 'My activity stream' => 'Olay akışım', 'My calendar' => 'Takvimim', 'Search tasks' => 'Görevleri ara', @@ -1116,7 +1103,7 @@ return array( // 'Column created successfully.' => '', // 'Another column with the same name exists in the project' => '', // 'Default filters' => '', - // 'Your board doesn\'t have any column!' => '', + // 'Your board doesn\'t have any columns!' => '', // 'Change column position' => '', // 'Switch to the project overview' => '', // 'User filters' => '', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Locale/zh_CN/translations.php b/sources/app/Locale/zh_CN/translations.php index decd49d..2f456cc 100644 --- a/sources/app/Locale/zh_CN/translations.php +++ b/sources/app/Locale/zh_CN/translations.php @@ -35,7 +35,6 @@ return array( 'View this task' => '查看该任务', 'Remove user' => '移除用户', 'Do you really want to remove this user: "%s"?' => '确定要删除用户"%s"吗？', - 'New user' => '新建用户', 'All users' => '所有用户', 'Username' => '用户名', 'Password' => '密码', @@ -155,8 +154,6 @@ return array( '%d closed tasks' => '%d个已关闭任务', 'No task for this project' => '该项目尚无任务', 'Public link' => '公开链接', - 'Change assignee' => '变更负责人', - 'Change assignee for the task "%s"' => '更改任务"%s"的负责人', 'Timezone' => '时区', 'Sorry, I didn\'t find this information in my database!' => '抱歉，无法在数据库中找到该信息！', 'Page not found' => '页面未找到', @@ -170,7 +167,6 @@ return array( 'Leave a description' => '给一个描述', 'Comment added successfully.' => '评论成功添加。', 'Unable to create your comment.' => '无法创建评论。', - 'Edit this task' => '编辑该任务', 'Due Date' => '到期时间', 'Invalid date' => '无效日期', 'Automatic actions' => '自动动作', @@ -250,7 +246,6 @@ return array( 'Category' => '分类', 'Category:' => '分类：', 'Categories' => '分类', - 'Category not found.' => '未找到分类。', 'Your category have been created successfully.' => '成功为您创建分类。', 'Unable to create your category.' => '无法为您创建分类。', 'Your category have been updated successfully.' => '成功为您更新分类。', @@ -272,7 +267,6 @@ return array( 'Do you really want to remove this file: "%s"?' => '确定要移除文件"%s"吗？', 'Attachments' => '附件', 'Edit the task' => '修改任务', - 'Edit the description' => '修改描述', 'Add a comment' => '添加评论', 'Edit a comment' => '编辑评论', 'Summary' => '概要', @@ -370,7 +364,6 @@ return array( 'No external authentication enabled.' => '未启用外部认证。', 'Password modified successfully.' => '已经成功修改密码。', 'Unable to change the password.' => '无法修改密码。', - 'Change category for the task "%s"' => '变更任务 "%s" 的分类', 'Change category' => '变更分类', '%s updated the task %s' => '%s 更新了任务 %s', '%s opened the task %s' => '%s 开启了任务 %s', @@ -413,9 +406,7 @@ return array( 'About' => '关于', 'Database driver:' => '数据库驱动：', 'Board settings' => '看板设置', - 'URL and token' => 'URL和令牌', 'Webhook settings' => 'Webhook 设置', - 'URL for task creation:' => '创建任务的URL：', 'Reset token' => '重置令牌', 'API endpoint:' => 'API 端点：', 'Refresh interval for private board' => '私人看板的刷新时间', @@ -489,7 +480,6 @@ return array( 'Remove a swimlane' => '删除里程碑', 'Show default swimlane' => '显示默认里程碑', 'Swimlane modification for the project "%s"' => '项目"%s"的里程碑变更', - 'Swimlane not found.' => '未找到里程碑。', 'Swimlane removed successfully.' => '成功删除里程碑', 'Swimlanes' => '里程碑', 'Swimlane updated successfully.' => '成功更新了里程碑。', @@ -517,7 +507,6 @@ return array( 'All swimlanes' => '全部里程碑', 'All colors' => '全部颜色', 'Moved to column %s' => '移动到栏目 %s', - 'Change description' => '修改描述', 'User dashboard' => '用户仪表板', 'Allow only one subtask in progress at the same time for a user' => '每用户同时仅有一个活动子任务', 'Edit column "%s"' => '编辑栏目"%s"', @@ -709,7 +698,6 @@ return array( 'view the board on Kanboard' => '在看板上查看面板', 'The task have been moved to the first swimlane' => '该任务已被移动到首个里程碑', 'The task have been moved to another swimlane:' => '该任务已被移动到别的里程碑：', - 'Overdue tasks for the project "%s"' => '"%s"项目下的超期任务', 'New title: %s' => '新标题：%s', 'The task is not assigned anymore' => '该任务没有指派人', 'New assignee: %s' => '新指派到：%s', @@ -738,7 +726,6 @@ return array( 'Stop timer' => '停止计时器', 'Start timer' => '开启计时器', 'Add project member' => '添加项目成员', - 'Enable notifications' => '打开通知', 'My activity stream' => '我的活动流', 'My calendar' => '我的日程表', 'Search tasks' => '搜索任务', @@ -1116,7 +1103,7 @@ return array( 'Column created successfully.' => '新增任务栏成功。', 'Another column with the same name exists in the project' => '当前项目中重名任务栏已存在', 'Default filters' => '默认过滤器', - 'Your board doesn\'t have any column!' => '你的看板没有任何栏目', + 'Your board doesn\'t have any columns!' => '你的看板没有任何栏目', 'Change column position' => '更改任务栏位置', 'Switch to the project overview' => '切换到项目视图', 'User filters' => '用户过滤器', @@ -1153,4 +1140,80 @@ return array( // 'Upload my avatar image' => '', // 'Remove my image' => '', // 'The OAuth2 state parameter is invalid' => '', + // 'User not found.' => '', + // 'Search in activity stream' => '', + // 'My activities' => '', + // 'Activity until yesterday' => '', + // 'Activity until today' => '', + // 'Search by creator: ' => '', + // 'Search by creation date: ' => '', + // 'Search by task status: ' => '', + // 'Search by task title: ' => '', + // 'Activity stream search' => '', + // 'Projects where "%s" is manager' => '', + // 'Projects where "%s" is member' => '', + // 'Open tasks assigned to "%s"' => '', + // 'Closed tasks assigned to "%s"' => '', + // 'Assign automatically a color based on a priority' => '', + // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', + // 'Installed Plugins' => '', + // 'Plugin Directory' => '', + // 'Plugin installed successfully.' => '', + // 'Plugin updated successfully.' => '', + // 'Plugin removed successfully.' => '', + // 'Subtask converted to task successfully.' => '', + // 'Unable to convert the subtask.' => '', + // 'Unable to extract plugin archive.' => '', + // 'Plugin not found.' => '', + // 'You don\'t have the permission to remove this plugin.' => '', + // 'Unable to download plugin archive.' => '', + // 'Unable to write temporary file for plugin.' => '', + // 'Unable to open plugin archive.' => '', + // 'There is no file in the plugin archive.' => '', + // 'Create tasks in bulk' => '', + // 'Your Kanboard instance is not configured to install plugins from the user interface.' => '', + // 'There is no plugin available.' => '', + // 'Install' => '', + // 'Update' => '', + // 'Up to date' => '', + // 'Not available' => '', + // 'Remove plugin' => '', + // 'Do you really want to remove this plugin: "%s"?' => '', + // 'Uninstall' => '', + // 'Listing' => '', + // 'Metadata' => '', + // 'Manage projects' => '', + // 'Convert to task' => '', + // 'Convert sub-task to task' => '', + // 'Do you really want to convert this sub-task to a task?' => '', + // 'My task title' => '', + // 'Enter one task by line.' => '', + // 'Number of failed login:' => '', + // 'Account locked until:' => '', + // 'Email settings' => '', + // 'Email sender address' => '', + // 'Email transport' => '', + // 'Webhook token' => '', + // 'Imports' => '', + // 'Project tags management' => '', + // 'Tag created successfully.' => '', + // 'Unable to create this tag.' => '', + // 'Tag updated successfully.' => '', + // 'Unable to update this tag.' => '', + // 'Tag removed successfully.' => '', + // 'Unable to remove this tag.' => '', + // 'Global tags management' => '', + // 'Tags' => '', + // 'Tags management' => '', + // 'Add new tag' => '', + // 'Edit a tag' => '', + // 'Project tags' => '', + // 'There is no specific tag for this project at the moment.' => '', + // 'Tag' => '', + // 'Remove a tag' => '', + // 'Do you really want to remove this tag: "%s"?' => '', + // 'Global tags' => '', + // 'There is no global tag at the moment.' => '', + // 'This field cannot be empty' => '', ); diff --git a/sources/app/Middleware/ApplicationAuthorizationMiddleware.php b/sources/app/Middleware/ApplicationAuthorizationMiddleware.php new file mode 100644 index 0000000..faca2d6 --- /dev/null +++ b/sources/app/Middleware/ApplicationAuthorizationMiddleware.php @@ -0,0 +1,27 @@ +helper->user->hasAccess($this->router->getController(), $this->router->getAction())) { + throw new AccessForbiddenException(); + } + + $this->next(); + } +} diff --git a/sources/app/Middleware/AuthenticationMiddleware.php b/sources/app/Middleware/AuthenticationMiddleware.php new file mode 100644 index 0000000..499843f --- /dev/null +++ b/sources/app/Middleware/AuthenticationMiddleware.php @@ -0,0 +1,56 @@ +authenticationManager->checkCurrentSession()) { + throw AccessForbiddenException::getInstance()->withoutLayout(); + } + + if (! $this->isPublicAccess()) { + $this->handleAuthentication(); + } + + $this->next(); + } + + protected function handleAuthentication() + { + if (! $this->userSession->isLogged() && ! $this->authenticationManager->preAuthentication()) { + $this->nextMiddleware = null; + + if ($this->request->isAjax()) { + $this->response->text('Not Authorized', 401); + } else { + $this->sessionStorage->redirectAfterLogin = $this->request->getUri(); + $this->response->redirect($this->helper->url->to('AuthController', 'login')); + } + } + } + + protected function isPublicAccess() + { + if ($this->applicationAuthorization->isAllowed($this->router->getController(), $this->router->getAction(), Role::APP_PUBLIC)) { + $this->nextMiddleware = null; + return true; + } + + return false; + } +} diff --git a/sources/app/Middleware/BootstrapMiddleware.php b/sources/app/Middleware/BootstrapMiddleware.php new file mode 100644 index 0000000..727f600 --- /dev/null +++ b/sources/app/Middleware/BootstrapMiddleware.php @@ -0,0 +1,44 @@ +sessionManager->open(); + $this->dispatcher->dispatch('app.bootstrap'); + $this->sendHeaders(); + $this->next(); + } + + /** + * Send HTTP headers + * + * @access private + */ + private function sendHeaders() + { + $this->response->withContentSecurityPolicy($this->container['cspRules']); + $this->response->withSecurityHeaders(); + + if (ENABLE_XFRAME) { + $this->response->withXframe(); + } + + if (ENABLE_HSTS) { + $this->response->withStrictTransportSecurity(); + } + } +} diff --git a/sources/app/Middleware/PostAuthenticationMiddleware.php b/sources/app/Middleware/PostAuthenticationMiddleware.php new file mode 100644 index 0000000..f7eccbc --- /dev/null +++ b/sources/app/Middleware/PostAuthenticationMiddleware.php @@ -0,0 +1,36 @@ +router->getController()); + $action = strtolower($this->router->getAction()); + $ignore = ($controller === 'twofactorcontroller' && in_array($action, array('code', 'check'))) || ($controller === 'authcontroller' && $action === 'logout'); + + if ($ignore === false && $this->userSession->hasPostAuthentication() && ! $this->userSession->isPostAuthenticationValidated()) { + $this->nextMiddleware = null; + + if ($this->request->isAjax()) { + $this->response->text('Not Authorized', 401); + } + + $this->response->redirect($this->helper->url->to('TwoFactorController', 'code')); + } + + $this->next(); + } +} diff --git a/sources/app/Middleware/ProjectAuthorizationMiddleware.php b/sources/app/Middleware/ProjectAuthorizationMiddleware.php new file mode 100644 index 0000000..704491b --- /dev/null +++ b/sources/app/Middleware/ProjectAuthorizationMiddleware.php @@ -0,0 +1,34 @@ +request->getIntegerParam('project_id'); + $task_id = $this->request->getIntegerParam('task_id'); + + if ($task_id > 0 && $project_id === 0) { + $project_id = $this->taskFinderModel->getProjectId($task_id); + } + + if ($project_id > 0 && ! $this->helper->user->hasProjectAccess($this->router->getController(), $this->router->getAction(), $project_id)) { + throw new AccessForbiddenException(); + } + + $this->next(); + } +} diff --git a/sources/app/Model/Action.php b/sources/app/Model/ActionModel.php similarity index 79% rename from sources/app/Model/Action.php rename to sources/app/Model/ActionModel.php index f055d9d..b5d2bd0 100644 --- a/sources/app/Model/Action.php +++ b/sources/app/Model/ActionModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Action Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Action extends Base +class ActionModel extends Base { /** * SQL table name for actions @@ -26,12 +28,12 @@ class Action extends Base */ public function getAllByUser($user_id) { - $project_ids = $this->projectPermission->getActiveProjectIds($user_id); + $project_ids = $this->projectPermissionModel->getActiveProjectIds($user_id); $actions = array(); if (! empty($project_ids)) { $actions = $this->db->table(self::TABLE)->in('project_id', $project_ids)->findAll(); - $params = $this->actionParameter->getAllByActions(array_column($actions, 'id')); + $params = $this->actionParameterModel->getAllByActions(array_column($actions, 'id')); $this->attachParamsToActions($actions, $params); } @@ -48,7 +50,7 @@ class Action extends Base public function getAllByProject($project_id) { $actions = $this->db->table(self::TABLE)->eq('project_id', $project_id)->findAll(); - $params = $this->actionParameter->getAllByActions(array_column($actions, 'id')); + $params = $this->actionParameterModel->getAllByActions(array_column($actions, 'id')); return $this->attachParamsToActions($actions, $params); } @@ -61,7 +63,7 @@ class Action extends Base public function getAll() { $actions = $this->db->table(self::TABLE)->findAll(); - $params = $this->actionParameter->getAll(); + $params = $this->actionParameterModel->getAll(); return $this->attachParamsToActions($actions, $params); } @@ -77,12 +79,24 @@ class Action extends Base $action = $this->db->table(self::TABLE)->eq('id', $action_id)->findOne(); if (! empty($action)) { - $action['params'] = $this->actionParameter->getAllByAction($action_id); + $action['params'] = $this->actionParameterModel->getAllByAction($action_id); } return $action; } + /** + * Get the projectId by the actionId + * + * @access public + * @param integer $action_id + * @return integer + */ + public function getProjectId($action_id) + { + return $this->db->table(self::TABLE)->eq('id', $action_id)->findOneColumn('project_id') ?: 0; + } + /** * Attach parameters to actions * @@ -136,7 +150,7 @@ class Action extends Base $action_id = $this->db->getLastId(); - if (! $this->actionParameter->create($action_id, $values)) { + if (! $this->actionParameterModel->create($action_id, $values)) { $this->db->cancelTransaction(); return false; } @@ -156,7 +170,7 @@ class Action extends Base */ public function duplicate($src_project_id, $dst_project_id) { - $actions = $this->action->getAllByProject($src_project_id); + $actions = $this->actionModel->getAllByProject($src_project_id); foreach ($actions as $action) { $this->db->startTransaction(); @@ -174,7 +188,7 @@ class Action extends Base $action_id = $this->db->getLastId(); - if (! $this->actionParameter->duplicateParameters($dst_project_id, $action_id, $action['params'])) { + if (! $this->actionParameterModel->duplicateParameters($dst_project_id, $action_id, $action['params'])) { $this->logger->error('Action::duplicate => skip action '.$action['action_name'].' '.$action['id']); $this->db->cancelTransaction(); continue; diff --git a/sources/app/Model/ActionParameter.php b/sources/app/Model/ActionParameterModel.php similarity index 87% rename from sources/app/Model/ActionParameter.php rename to sources/app/Model/ActionParameterModel.php index 53edcbc..9895da0 100644 --- a/sources/app/Model/ActionParameter.php +++ b/sources/app/Model/ActionParameterModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Action Parameter Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ActionParameter extends Base +class ActionParameterModel extends Base { /** * SQL table name @@ -145,16 +147,16 @@ class ActionParameter extends Base case 'project_id': return $value != $project_id ? $value : false; case 'category_id': - return $this->category->getIdByName($project_id, $this->category->getNameById($value)) ?: false; + return $this->categoryModel->getIdByName($project_id, $this->categoryModel->getNameById($value)) ?: false; case 'src_column_id': case 'dest_column_id': case 'dst_column_id': case 'column_id': - $column = $this->column->getById($value); - return empty($column) ? false : $this->column->getColumnIdByTitle($project_id, $column['title']) ?: false; + $column = $this->columnModel->getById($value); + return empty($column) ? false : $this->columnModel->getColumnIdByTitle($project_id, $column['title']) ?: false; case 'user_id': case 'owner_id': - return $this->projectPermission->isAssignable($project_id, $value) ? $value : false; + return $this->projectPermissionModel->isAssignable($project_id, $value) ? $value : false; default: return $value; } diff --git a/sources/app/Model/AvatarFile.php b/sources/app/Model/AvatarFileModel.php similarity index 57% rename from sources/app/Model/AvatarFile.php rename to sources/app/Model/AvatarFileModel.php index 52d0796..6e36d83 100644 --- a/sources/app/Model/AvatarFile.php +++ b/sources/app/Model/AvatarFileModel.php @@ -3,14 +3,15 @@ namespace Kanboard\Model; use Exception; +use Kanboard\Core\Base; /** * Avatar File * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class AvatarFile extends Base +class AvatarFileModel extends Base { /** * Path prefix @@ -28,7 +29,7 @@ class AvatarFile extends Base */ public function getFilename($user_id) { - return $this->db->table(User::TABLE)->eq('id', $user_id)->findOneColumn('avatar_path'); + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->findOneColumn('avatar_path'); } /** @@ -41,7 +42,7 @@ class AvatarFile extends Base */ public function create($user_id, $path) { - $result = $this->db->table(User::TABLE)->eq('id', $user_id)->update(array( + $result = $this->db->table(UserModel::TABLE)->eq('id', $user_id)->update(array( 'avatar_path' => $path, )); @@ -60,30 +61,35 @@ class AvatarFile extends Base public function remove($user_id) { try { - $this->objectStorage->remove($this->getFilename($user_id)); - $result = $this->db->table(User::TABLE)->eq('id', $user_id)->update(array('avatar_path' => '')); - $this->userSession->refresh($user_id); - return $result; + $filename = $this->getFilename($user_id); + + if (! empty($filename)) { + $this->objectStorage->remove($filename); + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->update(array('avatar_path' => '')); + } } catch (Exception $e) { $this->logger->error($e->getMessage()); return false; } + + return true; } /** - * Upload avatar image + * Upload avatar image file * * @access public * @param integer $user_id * @param array $file + * @return boolean */ - public function uploadFile($user_id, array $file) + public function uploadImageFile($user_id, array $file) { try { if ($file['error'] == UPLOAD_ERR_OK && $file['size'] > 0) { - $destination_filename = $this->generatePath($user_id, $file['name']); - $this->objectStorage->moveUploadedFile($file['tmp_name'], $destination_filename); - $this->create($user_id, $destination_filename); + $destinationFilename = $this->generatePath($user_id, $file['name']); + $this->objectStorage->moveUploadedFile($file['tmp_name'], $destinationFilename); + $this->create($user_id, $destinationFilename); } else { throw new Exception('File not uploaded: '.var_export($file['error'], true)); } @@ -96,6 +102,28 @@ class AvatarFile extends Base return true; } + /** + * Upload avatar image content + * + * @access public + * @param integer $user_id + * @param string $blob + * @return boolean + */ + public function uploadImageContent($user_id, &$blob) + { + try { + $destinationFilename = $this->generatePath($user_id, 'imageContent'); + $this->objectStorage->put($destinationFilename, $blob); + $this->create($user_id, $destinationFilename); + } catch (Exception $e) { + $this->logger->error($e->getMessage()); + return false; + } + + return true; + } + /** * Generate the path for a new filename * diff --git a/sources/app/Model/Base.php b/sources/app/Model/Base.php deleted file mode 100644 index 714b430..0000000 --- a/sources/app/Model/Base.php +++ /dev/null @@ -1,58 +0,0 @@ -db->transaction(function (Database $db) use ($table, $values) { - - if (! $db->table($table)->save($values)) { - return false; - } - - return (int) $db->getLastId(); - }); - } - - /** - * Build SQL condition for a given time range - * - * @access protected - * @param string $start_time Start timestamp - * @param string $end_time End timestamp - * @param string $start_column Start column name - * @param string $end_column End column name - * @return string - */ - protected function getCalendarCondition($start_time, $end_time, $start_column, $end_column) - { - $start_column = $this->db->escapeIdentifier($start_column); - $end_column = $this->db->escapeIdentifier($end_column); - - $conditions = array( - "($start_column >= '$start_time' AND $start_column <= '$end_time')", - "($start_column <= '$start_time' AND $end_column >= '$start_time')", - "($start_column <= '$start_time' AND ($end_column = '0' OR $end_column IS NULL))", - ); - - return $start_column.' IS NOT NULL AND '.$start_column.' > 0 AND ('.implode(' OR ', $conditions).')'; - } -} diff --git a/sources/app/Model/Board.php b/sources/app/Model/BoardModel.php similarity index 51% rename from sources/app/Model/Board.php rename to sources/app/Model/BoardModel.php index d41ecaf..4d55993 100644 --- a/sources/app/Model/Board.php +++ b/sources/app/Model/BoardModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Board model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Board extends Base +class BoardModel extends Base { /** * Get Kanboard default columns @@ -29,7 +31,7 @@ class Board extends Base */ public function getUserColumns() { - $column_names = explode(',', $this->config->get('board_columns', implode(',', $this->getDefaultColumns()))); + $column_names = explode(',', $this->configModel->get('board_columns', implode(',', $this->getDefaultColumns()))); $columns = array(); foreach ($column_names as $column_name) { @@ -64,7 +66,7 @@ class Board extends Base 'description' => $column['description'], ); - if (! $this->db->table(Column::TABLE)->save($values)) { + if (! $this->db->table(ColumnModel::TABLE)->save($values)) { return false; } } @@ -82,73 +84,13 @@ class Board extends Base */ public function duplicate($project_from, $project_to) { - $columns = $this->db->table(Column::TABLE) + $columns = $this->db->table(ColumnModel::TABLE) ->columns('title', 'task_limit', 'description') ->eq('project_id', $project_from) ->asc('position') ->findAll(); - return $this->board->create($project_to, $columns); - } - - /** - * Get all tasks sorted by columns and swimlanes - * - * @access public - * @param integer $project_id - * @param callable $callback - * @return array - */ - public function getBoard($project_id, $callback = null) - { - $swimlanes = $this->swimlane->getSwimlanes($project_id); - $columns = $this->column->getAll($project_id); - $nb_columns = count($columns); - - for ($i = 0, $ilen = count($swimlanes); $i < $ilen; $i++) { - $swimlanes[$i]['columns'] = $columns; - $swimlanes[$i]['nb_columns'] = $nb_columns; - $swimlanes[$i]['nb_tasks'] = 0; - $swimlanes[$i]['nb_swimlanes'] = $ilen; - - for ($j = 0; $j < $nb_columns; $j++) { - $column_id = $columns[$j]['id']; - $swimlane_id = $swimlanes[$i]['id']; - - if (! isset($swimlanes[0]['columns'][$j]['nb_column_tasks'])) { - $swimlanes[0]['columns'][$j]['nb_column_tasks'] = 0; - $swimlanes[0]['columns'][$j]['total_score'] = 0; - } - - $swimlanes[$i]['columns'][$j]['tasks'] = $callback === null ? $this->taskFinder->getTasksByColumnAndSwimlane($project_id, $column_id, $swimlane_id) : $callback($project_id, $column_id, $swimlane_id); - $swimlanes[$i]['columns'][$j]['nb_tasks'] = count($swimlanes[$i]['columns'][$j]['tasks']); - $swimlanes[$i]['columns'][$j]['score'] = $this->getColumnSum($swimlanes[$i]['columns'][$j]['tasks'], 'score'); - $swimlanes[$i]['nb_tasks'] += $swimlanes[$i]['columns'][$j]['nb_tasks']; - $swimlanes[0]['columns'][$j]['nb_column_tasks'] += $swimlanes[$i]['columns'][$j]['nb_tasks']; - $swimlanes[0]['columns'][$j]['total_score'] += $swimlanes[$i]['columns'][$j]['score']; - } - } - - return $swimlanes; - } - - /** - * Calculate the sum of the defined field for a list of tasks - * - * @access public - * @param array $tasks - * @param string $field - * @return integer - */ - public function getColumnSum(array &$tasks, $field) - { - $sum = 0; - - foreach ($tasks as $task) { - $sum += $task[$field]; - } - - return $sum; + return $this->boardModel->create($project_to, $columns); } /** @@ -162,7 +104,7 @@ class Board extends Base public function getColumnStats($project_id, $prepend = false) { $listing = $this->db - ->hashtable(Task::TABLE) + ->hashtable(TaskModel::TABLE) ->eq('project_id', $project_id) ->eq('is_active', 1) ->groupBy('column_id') diff --git a/sources/app/Model/Category.php b/sources/app/Model/CategoryModel.php similarity index 88% rename from sources/app/Model/Category.php rename to sources/app/Model/CategoryModel.php index 1d5f654..024d002 100644 --- a/sources/app/Model/Category.php +++ b/sources/app/Model/CategoryModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Category model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Category extends Base +class CategoryModel extends Base { /** * SQL table name @@ -53,6 +55,18 @@ class Category extends Base return $this->db->table(self::TABLE)->eq('id', $category_id)->findOneColumn('name') ?: ''; } + /** + * Get the projectId by the category id + * + * @access public + * @param integer $category_id Category id + * @return integer + */ + public function getProjectId($category_id) + { + return $this->db->table(self::TABLE)->eq('id', $category_id)->findOneColumn('project_id') ?: 0; + } + /** * Get a category id by the category name and project id * @@ -123,7 +137,7 @@ class Category extends Base public function createDefaultCategories($project_id) { $results = array(); - $categories = explode(',', $this->config->get('project_categories')); + $categories = explode(',', $this->configModel->get('project_categories')); foreach ($categories as $category) { $category = trim($category); @@ -148,7 +162,7 @@ class Category extends Base */ public function create(array $values) { - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** @@ -174,7 +188,7 @@ class Category extends Base { $this->db->startTransaction(); - $this->db->table(Task::TABLE)->eq('category_id', $category_id)->update(array('category_id' => 0)); + $this->db->table(TaskModel::TABLE)->eq('category_id', $category_id)->update(array('category_id' => 0)); if (! $this->db->table(self::TABLE)->eq('id', $category_id)->remove()) { $this->db->cancelTransaction(); diff --git a/sources/app/Model/Color.php b/sources/app/Model/ColorModel.php similarity index 97% rename from sources/app/Model/Color.php rename to sources/app/Model/ColorModel.php index dee2864..9e69dda 100644 --- a/sources/app/Model/Color.php +++ b/sources/app/Model/ColorModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Color model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Color extends Base +class ColorModel extends Base { /** * Default colors @@ -163,7 +165,7 @@ class Color extends Base */ public function getDefaultColor() { - return $this->config->get('default_color', 'yellow'); + return $this->configModel->get('default_color', 'yellow'); } /** diff --git a/sources/app/Model/Column.php b/sources/app/Model/ColumnModel.php similarity index 92% rename from sources/app/Model/Column.php rename to sources/app/Model/ColumnModel.php index ccdcb04..795fe69 100644 --- a/sources/app/Model/Column.php +++ b/sources/app/Model/ColumnModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Column Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Column extends Base +class ColumnModel extends Base { /** * SQL table name @@ -29,6 +31,18 @@ class Column extends Base return $this->db->table(self::TABLE)->eq('id', $column_id)->findOne(); } + /** + * Get projectId by the columnId + * + * @access public + * @param integer $column_id Column id + * @return integer + */ + public function getProjectId($column_id) + { + return $this->db->table(self::TABLE)->eq('id', $column_id)->findOneColumn('project_id'); + } + /** * Get the first column id for a given project * @@ -140,7 +154,7 @@ class Column extends Base 'description' => $description, ); - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** diff --git a/sources/app/Model/Comment.php b/sources/app/Model/CommentModel.php similarity index 73% rename from sources/app/Model/Comment.php rename to sources/app/Model/CommentModel.php index f7ac4ea..4231f29 100644 --- a/sources/app/Model/Comment.php +++ b/sources/app/Model/CommentModel.php @@ -3,14 +3,15 @@ namespace Kanboard\Model; use Kanboard\Event\CommentEvent; +use Kanboard\Core\Base; /** * Comment model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Comment extends Base +class CommentModel extends Base { /** * SQL table name @@ -28,6 +29,22 @@ class Comment extends Base const EVENT_CREATE = 'comment.create'; const EVENT_USER_MENTION = 'comment.user.mention'; + /** + * Get projectId from commentId + * + * @access public + * @param integer $comment_id + * @return integer + */ + public function getProjectId($comment_id) + { + return $this->db + ->table(self::TABLE) + ->eq(self::TABLE.'.id', $comment_id) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->findOneColumn(TaskModel::TABLE . '.project_id') ?: 0; + } + /** * Get all comments for a given task * @@ -46,12 +63,12 @@ class Comment extends Base self::TABLE.'.task_id', self::TABLE.'.user_id', self::TABLE.'.comment', - User::TABLE.'.username', - User::TABLE.'.name', - User::TABLE.'.email', - User::TABLE.'.avatar_path' + UserModel::TABLE.'.username', + UserModel::TABLE.'.name', + UserModel::TABLE.'.email', + UserModel::TABLE.'.avatar_path' ) - ->join(User::TABLE, 'id', 'user_id') + ->join(UserModel::TABLE, 'id', 'user_id') ->orderBy(self::TABLE.'.date_creation', $sorting) ->eq(self::TABLE.'.task_id', $task_id) ->findAll(); @@ -75,10 +92,12 @@ class Comment extends Base self::TABLE.'.date_creation', self::TABLE.'.comment', self::TABLE.'.reference', - User::TABLE.'.username', - User::TABLE.'.name' + UserModel::TABLE.'.username', + UserModel::TABLE.'.name', + UserModel::TABLE.'.email', + UserModel::TABLE.'.avatar_path' ) - ->join(User::TABLE, 'id', 'user_id') + ->join(UserModel::TABLE, 'id', 'user_id') ->eq(self::TABLE.'.id', $comment_id) ->findOne(); } @@ -108,12 +127,12 @@ class Comment extends Base public function create(array $values) { $values['date_creation'] = time(); - $comment_id = $this->persist(self::TABLE, $values); + $comment_id = $this->db->table(self::TABLE)->persist($values); - if ($comment_id) { + if ($comment_id !== false) { $event = new CommentEvent(array('id' => $comment_id) + $values); $this->dispatcher->dispatch(self::EVENT_CREATE, $event); - $this->userMention->fireEvents($values['comment'], self::EVENT_USER_MENTION, $event); + $this->userMentionModel->fireEvents($values['comment'], self::EVENT_USER_MENTION, $event); } return $comment_id; diff --git a/sources/app/Model/Config.php b/sources/app/Model/Config.php deleted file mode 100644 index 0c363fb..0000000 --- a/sources/app/Model/Config.php +++ /dev/null @@ -1,255 +0,0 @@ - t('Application default')) + $listing; - } - - return $listing; - } - - /** - * Get current timezone - * - * @access public - * @return string - */ - public function getCurrentTimezone() - { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['timezone'])) { - return $this->sessionStorage->user['timezone']; - } - - return $this->get('application_timezone', 'UTC'); - } - - /** - * Set timezone - * - * @access public - */ - public function setupTimezone() - { - date_default_timezone_set($this->getCurrentTimezone()); - } - - /** - * Get available languages - * - * @access public - * @param boolean $prepend Prepend a default value - * @return array - */ - public function getLanguages($prepend = false) - { - // Sorted by value - $languages = array( - 'id_ID' => 'Bahasa Indonesia', - 'bs_BA' => 'Bosanski', - 'cs_CZ' => 'Čeština', - 'da_DK' => 'Dansk', - 'de_DE' => 'Deutsch', - 'en_US' => 'English', - 'es_ES' => 'Español', - 'fr_FR' => 'Français', - 'el_GR' => 'Grec', - 'it_IT' => 'Italiano', - 'hu_HU' => 'Magyar', - 'my_MY' => 'Melayu', - 'nl_NL' => 'Nederlands', - 'nb_NO' => 'Norsk', - 'pl_PL' => 'Polski', - 'pt_PT' => 'Português', - 'pt_BR' => 'Português (Brasil)', - 'ru_RU' => 'Русский', - 'sr_Latn_RS' => 'Srpski', - 'fi_FI' => 'Suomi', - 'sv_SE' => 'Svenska', - 'tr_TR' => 'Türkçe', - 'ko_KR' => '한국어', - 'zh_CN' => '中文(简体)', - 'ja_JP' => '日本語', - 'th_TH' => 'ไทย', - ); - - if ($prepend) { - return array('' => t('Application default')) + $languages; - } - - return $languages; - } - - /** - * Get javascript language code - * - * @access public - * @return string - */ - public function getJsLanguageCode() - { - $languages = array( - 'cs_CZ' => 'cs', - 'da_DK' => 'da', - 'de_DE' => 'de', - 'en_US' => 'en', - 'es_ES' => 'es', - 'fr_FR' => 'fr', - 'it_IT' => 'it', - 'hu_HU' => 'hu', - 'nl_NL' => 'nl', - 'nb_NO' => 'nb', - 'pl_PL' => 'pl', - 'pt_PT' => 'pt', - 'pt_BR' => 'pt-br', - 'ru_RU' => 'ru', - 'sr_Latn_RS' => 'sr', - 'fi_FI' => 'fi', - 'sv_SE' => 'sv', - 'tr_TR' => 'tr', - 'ko_KR' => 'ko', - 'zh_CN' => 'zh-cn', - 'ja_JP' => 'ja', - 'th_TH' => 'th', - 'id_ID' => 'id', - 'el_GR' => 'el', - ); - - $lang = $this->getCurrentLanguage(); - - return isset($languages[$lang]) ? $languages[$lang] : 'en'; - } - - /** - * Get current language - * - * @access public - * @return string - */ - public function getCurrentLanguage() - { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['language'])) { - return $this->sessionStorage->user['language']; - } - - return $this->get('application_language', 'en_US'); - } - - /** - * Load translations - * - * @access public - */ - public function setupTranslations() - { - Translator::load($this->getCurrentLanguage()); - } - - /** - * Get a config variable from the session or the database - * - * @access public - * @param string $name Parameter name - * @param string $default_value Default value of the parameter - * @return string - */ - public function get($name, $default_value = '') - { - $options = $this->memoryCache->proxy($this, 'getAll'); - return isset($options[$name]) && $options[$name] !== '' ? $options[$name] : $default_value; - } - - /** - * Reload settings in the session and the translations - * - * @access public - */ - public function reload() - { - $this->setupTranslations(); - } - - /** - * Optimize the Sqlite database - * - * @access public - * @return boolean - */ - public function optimizeDatabase() - { - return $this->db->getconnection()->exec('VACUUM'); - } - - /** - * Compress the Sqlite database - * - * @access public - * @return string - */ - public function downloadDatabase() - { - return gzencode(file_get_contents(DB_FILENAME)); - } - - /** - * Get the Sqlite database size in bytes - * - * @access public - * @return integer - */ - public function getDatabaseSize() - { - return DB_DRIVER === 'sqlite' ? filesize(DB_FILENAME) : 0; - } - - /** - * Regenerate a token - * - * @access public - * @param string $option Parameter name - * @return boolean - */ - public function regenerateToken($option) - { - return $this->save(array($option => Token::getToken())); - } - - /** - * Prepare data before save - * - * @access public - * @param array $values - * @return array - */ - public function prepare(array $values) - { - if (! empty($values['application_url']) && substr($values['application_url'], -1) !== '/') { - $values['application_url'] = $values['application_url'].'/'; - } - - return $values; - } -} diff --git a/sources/app/Model/ConfigModel.php b/sources/app/Model/ConfigModel.php new file mode 100644 index 0000000..945c5e6 --- /dev/null +++ b/sources/app/Model/ConfigModel.php @@ -0,0 +1,89 @@ +memoryCache->proxy($this, 'getAll'); + return isset($options[$name]) && $options[$name] !== '' ? $options[$name] : $default_value; + } + + /** + * Optimize the Sqlite database + * + * @access public + * @return boolean + */ + public function optimizeDatabase() + { + return $this->db->getConnection()->exec('VACUUM'); + } + + /** + * Compress the Sqlite database + * + * @access public + * @return string + */ + public function downloadDatabase() + { + return gzencode(file_get_contents(DB_FILENAME)); + } + + /** + * Get the Sqlite database size in bytes + * + * @access public + * @return integer + */ + public function getDatabaseSize() + { + return DB_DRIVER === 'sqlite' ? filesize(DB_FILENAME) : 0; + } + + /** + * Regenerate a token + * + * @access public + * @param string $option Parameter name + * @return boolean + */ + public function regenerateToken($option) + { + return $this->save(array($option => Token::getToken())); + } + + /** + * Prepare data before save + * + * @access public + * @param array $values + * @return array + */ + public function prepare(array $values) + { + if (! empty($values['application_url']) && substr($values['application_url'], -1) !== '/') { + $values['application_url'] = $values['application_url'].'/'; + } + + return $values; + } +} diff --git a/sources/app/Model/Currency.php b/sources/app/Model/CurrencyModel.php similarity index 94% rename from sources/app/Model/Currency.php rename to sources/app/Model/CurrencyModel.php index abcce2f..bfd9697 100644 --- a/sources/app/Model/Currency.php +++ b/sources/app/Model/CurrencyModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Currency * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Currency extends Base +class CurrencyModel extends Base { /** * SQL table name @@ -65,7 +67,7 @@ class Currency extends Base public function getPrice($currency, $price) { static $rates = null; - $reference = $this->config->get('application_currency', 'USD'); + $reference = $this->configModel->get('application_currency', 'USD'); if ($reference !== $currency) { $rates = $rates === null ? $this->db->hashtable(self::TABLE)->getAll('currency', 'rate') : $rates; diff --git a/sources/app/Model/CustomFilter.php b/sources/app/Model/CustomFilterModel.php similarity index 86% rename from sources/app/Model/CustomFilter.php rename to sources/app/Model/CustomFilterModel.php index 3a6a1a3..a4c23b5 100644 --- a/sources/app/Model/CustomFilter.php +++ b/sources/app/Model/CustomFilterModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Custom Filter model * - * @package model + * @package Kanboard\Model * @author Timo Litzbarski */ -class CustomFilter extends Base +class CustomFilterModel extends Base { /** * SQL table name @@ -30,8 +32,8 @@ class CustomFilter extends Base return $this->db ->table(self::TABLE) ->columns( - User::TABLE.'.name as owner_name', - User::TABLE.'.username as owner_username', + UserModel::TABLE.'.name as owner_name', + UserModel::TABLE.'.username as owner_username', self::TABLE.'.id', self::TABLE.'.user_id', self::TABLE.'.project_id', @@ -41,7 +43,7 @@ class CustomFilter extends Base self::TABLE.'.append' ) ->asc(self::TABLE.'.name') - ->join(User::TABLE, 'id', 'user_id') + ->join(UserModel::TABLE, 'id', 'user_id') ->beginOr() ->eq('is_shared', 1) ->eq('user_id', $user_id) @@ -71,7 +73,7 @@ class CustomFilter extends Base */ public function create(array $values) { - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** diff --git a/sources/app/Model/File.php b/sources/app/Model/FileModel.php similarity index 77% rename from sources/app/Model/File.php rename to sources/app/Model/FileModel.php index e383235..8cdea9a 100644 --- a/sources/app/Model/File.php +++ b/sources/app/Model/FileModel.php @@ -3,6 +3,7 @@ namespace Kanboard\Model; use Exception; +use Kanboard\Core\Base; use Kanboard\Core\Thumbnail; use Kanboard\Event\FileEvent; use Kanboard\Core\ObjectStorage\ObjectStorageException; @@ -10,11 +11,47 @@ use Kanboard\Core\ObjectStorage\ObjectStorageException; /** * Base File Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -abstract class File extends Base +abstract class FileModel extends Base { + /** + * Get the table + * + * @abstract + * @access protected + * @return string + */ + abstract protected function getTable(); + + /** + * Define the foreign key + * + * @abstract + * @access protected + * @return string + */ + abstract protected function getForeignKey(); + + /** + * Get the path prefix + * + * @abstract + * @access protected + * @return string + */ + abstract protected function getPathPrefix(); + + /** + * Get event name + * + * @abstract + * @access protected + * @return string + */ + abstract protected function getEventName(); + /** * Get PicoDb query to get all files * @@ -24,21 +61,21 @@ abstract class File extends Base protected function getQuery() { return $this->db - ->table(static::TABLE) + ->table($this->getTable()) ->columns( - static::TABLE.'.id', - static::TABLE.'.name', - static::TABLE.'.path', - static::TABLE.'.is_image', - static::TABLE.'.'.static::FOREIGN_KEY, - static::TABLE.'.date', - static::TABLE.'.user_id', - static::TABLE.'.size', - User::TABLE.'.username', - User::TABLE.'.name as user_name' + $this->getTable().'.id', + $this->getTable().'.name', + $this->getTable().'.path', + $this->getTable().'.is_image', + $this->getTable().'.'.$this->getForeignKey(), + $this->getTable().'.date', + $this->getTable().'.user_id', + $this->getTable().'.size', + UserModel::TABLE.'.username', + UserModel::TABLE.'.name as user_name' ) - ->join(User::TABLE, 'id', 'user_id') - ->asc(static::TABLE.'.name'); + ->join(UserModel::TABLE, 'id', 'user_id') + ->asc($this->getTable().'.name'); } /** @@ -50,7 +87,7 @@ abstract class File extends Base */ public function getById($file_id) { - return $this->db->table(static::TABLE)->eq('id', $file_id)->findOne(); + return $this->db->table($this->getTable())->eq('id', $file_id)->findOne(); } /** @@ -62,7 +99,7 @@ abstract class File extends Base */ public function getAll($id) { - return $this->getQuery()->eq(static::FOREIGN_KEY, $id)->findAll(); + return $this->getQuery()->eq($this->getForeignKey(), $id)->findAll(); } /** @@ -74,7 +111,7 @@ abstract class File extends Base */ public function getAllImages($id) { - return $this->getQuery()->eq(static::FOREIGN_KEY, $id)->eq('is_image', 1)->findAll(); + return $this->getQuery()->eq($this->getForeignKey(), $id)->eq('is_image', 1)->findAll(); } /** @@ -86,7 +123,7 @@ abstract class File extends Base */ public function getAllDocuments($id) { - return $this->getQuery()->eq(static::FOREIGN_KEY, $id)->eq('is_image', 0)->findAll(); + return $this->getQuery()->eq($this->getForeignKey(), $id)->eq('is_image', 0)->findAll(); } /** @@ -102,7 +139,7 @@ abstract class File extends Base public function create($id, $name, $path, $size) { $values = array( - static::FOREIGN_KEY => $id, + $this->getForeignKey() => $id, 'name' => substr($name, 0, 255), 'path' => $path, 'is_image' => $this->isImage($name) ? 1 : 0, @@ -111,12 +148,12 @@ abstract class File extends Base 'date' => time(), ); - $result = $this->db->table(static::TABLE)->insert($values); + $result = $this->db->table($this->getTable())->insert($values); if ($result) { $file_id = (int) $this->db->getLastId(); $event = new FileEvent($values + array('file_id' => $file_id)); - $this->dispatcher->dispatch(static::EVENT_CREATE, $event); + $this->dispatcher->dispatch($this->getEventName(), $event); return $file_id; } @@ -132,7 +169,7 @@ abstract class File extends Base */ public function removeAll($id) { - $file_ids = $this->db->table(static::TABLE)->eq(static::FOREIGN_KEY, $id)->asc('id')->findAllByColumn('id'); + $file_ids = $this->db->table($this->getTable())->eq($this->getForeignKey(), $id)->asc('id')->findAllByColumn('id'); $results = array(); foreach ($file_ids as $file_id) { @@ -159,7 +196,7 @@ abstract class File extends Base $this->objectStorage->remove($this->getThumbnailPath($file['path'])); } - return $this->db->table(static::TABLE)->eq('id', $file['id'])->remove(); + return $this->db->table($this->getTable())->eq('id', $file['id'])->remove(); } catch (ObjectStorageException $e) { $this->logger->error($e->getMessage()); return false; @@ -210,7 +247,7 @@ abstract class File extends Base */ public function generatePath($id, $filename) { - return static::PATH_PREFIX.DIRECTORY_SEPARATOR.$id.DIRECTORY_SEPARATOR.hash('sha1', $filename.time()); + return $this->getPathPrefix().DIRECTORY_SEPARATOR.$id.DIRECTORY_SEPARATOR.hash('sha1', $filename.time()); } /** @@ -252,6 +289,7 @@ abstract class File extends Base * @access public * @param integer $id * @param array $file + * @throws Exception */ public function uploadFile($id, array $file) { diff --git a/sources/app/Model/GroupMember.php b/sources/app/Model/GroupMemberModel.php similarity index 75% rename from sources/app/Model/GroupMember.php rename to sources/app/Model/GroupMemberModel.php index 7ed5f73..a207778 100644 --- a/sources/app/Model/GroupMember.php +++ b/sources/app/Model/GroupMemberModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Group Member Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class GroupMember extends Base +class GroupMemberModel extends Base { /** * SQL table name @@ -27,7 +29,7 @@ class GroupMember extends Base public function getQuery($group_id) { return $this->db->table(self::TABLE) - ->join(User::TABLE, 'id', 'user_id') + ->join(UserModel::TABLE, 'id', 'user_id') ->eq('group_id', $group_id); } @@ -56,7 +58,7 @@ class GroupMember extends Base ->columns('user_id') ->eq('group_id', $group_id); - return $this->db->table(User::TABLE) + return $this->db->table(UserModel::TABLE) ->notInSubquery('id', $subquery) ->findAll(); } @@ -108,4 +110,21 @@ class GroupMember extends Base ->eq('user_id', $user_id) ->exists(); } + + /** + * Get all groups for a given user + * + * @access public + * @param integer $user_id + * @return array + */ + public function getGroups($user_id) + { + return $this->db->table(self::TABLE) + ->columns(GroupModel::TABLE.'.id', GroupModel::TABLE.'.external_id', GroupModel::TABLE.'.name') + ->join(GroupModel::TABLE, 'id', 'group_id') + ->eq(self::TABLE.'.user_id', $user_id) + ->asc(GroupModel::TABLE.'.name') + ->findAll(); + } } diff --git a/sources/app/Model/Group.php b/sources/app/Model/GroupModel.php similarity index 92% rename from sources/app/Model/Group.php rename to sources/app/Model/GroupModel.php index 6789950..0a97557 100644 --- a/sources/app/Model/Group.php +++ b/sources/app/Model/GroupModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Group Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Group extends Base +class GroupModel extends Base { /** * SQL table name @@ -80,7 +82,7 @@ class Group extends Base * * @access public * @param integer $group_id - * @return array + * @return boolean */ public function remove($group_id) { @@ -97,7 +99,7 @@ class Group extends Base */ public function create($name, $external_id = '') { - return $this->persist(self::TABLE, array( + return $this->db->table(self::TABLE)->persist(array( 'name' => $name, 'external_id' => $external_id, )); diff --git a/sources/app/Model/LanguageModel.php b/sources/app/Model/LanguageModel.php new file mode 100644 index 0000000..eb6de00 --- /dev/null +++ b/sources/app/Model/LanguageModel.php @@ -0,0 +1,179 @@ + 'Bahasa Indonesia', + 'bs_BA' => 'Bosanski', + 'cs_CZ' => 'Čeština', + 'da_DK' => 'Dansk', + 'de_DE' => 'Deutsch', + 'en_US' => 'English', + 'es_ES' => 'Español', + 'fr_FR' => 'Français', + 'el_GR' => 'Grec', + 'it_IT' => 'Italiano', + 'hu_HU' => 'Magyar', + 'my_MY' => 'Melayu', + 'nl_NL' => 'Nederlands', + 'nb_NO' => 'Norsk', + 'pl_PL' => 'Polski', + 'pt_PT' => 'Português', + 'pt_BR' => 'Português (Brasil)', + 'ru_RU' => 'Русский', + 'sr_Latn_RS' => 'Srpski', + 'fi_FI' => 'Suomi', + 'sv_SE' => 'Svenska', + 'tr_TR' => 'Türkçe', + 'ko_KR' => '한국어', + 'zh_CN' => '中文(简体)', + 'ja_JP' => '日本語', + 'th_TH' => 'ไทย', + ); + + if ($prepend) { + return array('' => t('Application default')) + $languages; + } + + return $languages; + } + + /** + * Get javascript language code + * + * @access public + * @return string + */ + public function getJsLanguageCode() + { + $languages = array( + 'cs_CZ' => 'cs', + 'da_DK' => 'da', + 'de_DE' => 'de', + 'en_US' => 'en', + 'es_ES' => 'es', + 'fr_FR' => 'fr', + 'it_IT' => 'it', + 'hu_HU' => 'hu', + 'nl_NL' => 'nl', + 'nb_NO' => 'nb', + 'pl_PL' => 'pl', + 'pt_PT' => 'pt', + 'pt_BR' => 'pt-br', + 'ru_RU' => 'ru', + 'sr_Latn_RS' => 'sr', + 'fi_FI' => 'fi', + 'sv_SE' => 'sv', + 'tr_TR' => 'tr', + 'ko_KR' => 'ko', + 'zh_CN' => 'zh-cn', + 'ja_JP' => 'ja', + 'th_TH' => 'th', + 'id_ID' => 'id', + 'el_GR' => 'el', + ); + + $lang = $this->getCurrentLanguage(); + + return isset($languages[$lang]) ? $languages[$lang] : 'en'; + } + + /** + * Get current language + * + * @access public + * @return string + */ + public function getCurrentLanguage() + { + if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['language'])) { + return $this->sessionStorage->user['language']; + } + + return $this->configModel->get('application_language', 'en_US'); + } + + /** + * Load translations for the current language + * + * @access public + */ + public function loadCurrentLanguage() + { + Translator::load($this->getCurrentLanguage()); + } +} diff --git a/sources/app/Model/LastLogin.php b/sources/app/Model/LastLoginModel.php similarity index 93% rename from sources/app/Model/LastLogin.php rename to sources/app/Model/LastLoginModel.php index feb5f5a..caaa4a8 100644 --- a/sources/app/Model/LastLogin.php +++ b/sources/app/Model/LastLoginModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * LastLogin model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class LastLogin extends Base +class LastLoginModel extends Base { /** * SQL table name @@ -66,7 +68,7 @@ class LastLogin extends Base if (count($connections) >= self::NB_LOGINS) { $this->db->table(self::TABLE) ->eq('user_id', $user_id) - ->notin('id', array_slice($connections, 0, self::NB_LOGINS - 1)) + ->notIn('id', array_slice($connections, 0, self::NB_LOGINS - 1)) ->remove(); } } diff --git a/sources/app/Model/Link.php b/sources/app/Model/LinkModel.php similarity index 98% rename from sources/app/Model/Link.php rename to sources/app/Model/LinkModel.php index 903a98d..b72c753 100644 --- a/sources/app/Model/Link.php +++ b/sources/app/Model/LinkModel.php @@ -3,15 +3,16 @@ namespace Kanboard\Model; use PDO; +use Kanboard\Core\Base; /** * Link model * - * @package model + * @package Kanboard\Model * @author Olivier Maridat * @author Frederic Guillot */ -class Link extends Base +class LinkModel extends Base { /** * SQL table name diff --git a/sources/app/Model/Metadata.php b/sources/app/Model/MetadataModel.php similarity index 80% rename from sources/app/Model/Metadata.php rename to sources/app/Model/MetadataModel.php index 01799a4..6177e5f 100644 --- a/sources/app/Model/Metadata.php +++ b/sources/app/Model/MetadataModel.php @@ -2,14 +2,25 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Metadata * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -abstract class Metadata extends Base +abstract class MetadataModel extends Base { + /** + * Get the table + * + * @abstract + * @access protected + * @return string + */ + abstract protected function getTable(); + /** * Define the entity key * @@ -29,7 +40,7 @@ abstract class Metadata extends Base public function getAll($entity_id) { return $this->db - ->hashtable(static::TABLE) + ->hashtable($this->getTable()) ->eq($this->getEntityKey(), $entity_id) ->asc('name') ->getAll('name', 'value'); @@ -47,7 +58,7 @@ abstract class Metadata extends Base public function get($entity_id, $name, $default = '') { return $this->db - ->table(static::TABLE) + ->table($this->getTable()) ->eq($this->getEntityKey(), $entity_id) ->eq('name', $name) ->findOneColumn('value') ?: $default; @@ -64,7 +75,7 @@ abstract class Metadata extends Base public function exists($entity_id, $name) { return $this->db - ->table(static::TABLE) + ->table($this->getTable()) ->eq($this->getEntityKey(), $entity_id) ->eq('name', $name) ->exists(); @@ -88,7 +99,7 @@ abstract class Metadata extends Base foreach ($values as $key => $value) { if ($this->exists($entity_id, $key)) { - $results[] = $this->db->table(static::TABLE) + $results[] = $this->db->table($this->getTable()) ->eq($this->getEntityKey(), $entity_id) ->eq('name', $key)->update(array( 'value' => $value, @@ -96,7 +107,7 @@ abstract class Metadata extends Base 'changed_by' => $user_id, )); } else { - $results[] = $this->db->table(static::TABLE)->insert(array( + $results[] = $this->db->table($this->getTable())->insert(array( 'name' => $key, 'value' => $value, $this->getEntityKey() => $entity_id, @@ -120,6 +131,9 @@ abstract class Metadata extends Base */ public function remove($entity_id, $name) { - return $this->db->table(static::TABLE)->eq($this->getEntityKey(), $entity_id)->eq('name', $name)->remove(); + return $this->db->table($this->getTable()) + ->eq($this->getEntityKey(), $entity_id) + ->eq('name', $name) + ->remove(); } } diff --git a/sources/app/Model/Notification.php b/sources/app/Model/NotificationModel.php similarity index 63% rename from sources/app/Model/Notification.php rename to sources/app/Model/NotificationModel.php index c252aa3..4d697b5 100644 --- a/sources/app/Model/Notification.php +++ b/sources/app/Model/NotificationModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Notification * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Notification extends Base +class NotificationModel extends Base { /** * Get the event title with author @@ -22,7 +24,7 @@ class Notification extends Base public function getTitleWithAuthor($event_author, $event_name, array $event_data) { switch ($event_name) { - case Task::EVENT_ASSIGNEE_CHANGE: + case TaskModel::EVENT_ASSIGNEE_CHANGE: $assignee = $event_data['task']['assignee_name'] ?: $event_data['task']['assignee_username']; if (! empty($assignee)) { @@ -30,22 +32,22 @@ class Notification extends Base } return e('%s remove the assignee of the task %s', $event_author, e('#%d', $event_data['task']['id'])); - case Task::EVENT_UPDATE: + case TaskModel::EVENT_UPDATE: return e('%s updated the task #%d', $event_author, $event_data['task']['id']); - case Task::EVENT_CREATE: + case TaskModel::EVENT_CREATE: return e('%s created the task #%d', $event_author, $event_data['task']['id']); - case Task::EVENT_CLOSE: + case TaskModel::EVENT_CLOSE: return e('%s closed the task #%d', $event_author, $event_data['task']['id']); - case Task::EVENT_OPEN: + case TaskModel::EVENT_OPEN: return e('%s open the task #%d', $event_author, $event_data['task']['id']); - case Task::EVENT_MOVE_COLUMN: + case TaskModel::EVENT_MOVE_COLUMN: return e( '%s moved the task #%d to the column "%s"', $event_author, $event_data['task']['id'], $event_data['task']['column_title'] ); - case Task::EVENT_MOVE_POSITION: + case TaskModel::EVENT_MOVE_POSITION: return e( '%s moved the task #%d to the position %d in the column "%s"', $event_author, @@ -53,7 +55,7 @@ class Notification extends Base $event_data['task']['position'], $event_data['task']['column_title'] ); - case Task::EVENT_MOVE_SWIMLANE: + case TaskModel::EVENT_MOVE_SWIMLANE: if ($event_data['task']['swimlane_id'] == 0) { return e('%s moved the task #%d to the first swimlane', $event_author, $event_data['task']['id']); } @@ -64,19 +66,19 @@ class Notification extends Base $event_data['task']['id'], $event_data['task']['swimlane_name'] ); - case Subtask::EVENT_UPDATE: + case SubtaskModel::EVENT_UPDATE: return e('%s updated a subtask for the task #%d', $event_author, $event_data['task']['id']); - case Subtask::EVENT_CREATE: + case SubtaskModel::EVENT_CREATE: return e('%s created a subtask for the task #%d', $event_author, $event_data['task']['id']); - case Comment::EVENT_UPDATE: + case CommentModel::EVENT_UPDATE: return e('%s updated a comment on the task #%d', $event_author, $event_data['task']['id']); - case Comment::EVENT_CREATE: + case CommentModel::EVENT_CREATE: return e('%s commented on the task #%d', $event_author, $event_data['task']['id']); - case TaskFile::EVENT_CREATE: + case TaskFileModel::EVENT_CREATE: return e('%s attached a file to the task #%d', $event_author, $event_data['task']['id']); - case Task::EVENT_USER_MENTION: + case TaskModel::EVENT_USER_MENTION: return e('%s mentioned you in the task #%d', $event_author, $event_data['task']['id']); - case Comment::EVENT_USER_MENTION: + case CommentModel::EVENT_USER_MENTION: return e('%s mentioned you in a comment on the task #%d', $event_author, $event_data['task']['id']); default: return e('Notification'); @@ -94,41 +96,78 @@ class Notification extends Base public function getTitleWithoutAuthor($event_name, array $event_data) { switch ($event_name) { - case TaskFile::EVENT_CREATE: + case TaskFileModel::EVENT_CREATE: return e('New attachment on task #%d: %s', $event_data['file']['task_id'], $event_data['file']['name']); - case Comment::EVENT_CREATE: + case CommentModel::EVENT_CREATE: return e('New comment on task #%d', $event_data['comment']['task_id']); - case Comment::EVENT_UPDATE: + case CommentModel::EVENT_UPDATE: return e('Comment updated on task #%d', $event_data['comment']['task_id']); - case Subtask::EVENT_CREATE: + case SubtaskModel::EVENT_CREATE: return e('New subtask on task #%d', $event_data['subtask']['task_id']); - case Subtask::EVENT_UPDATE: + case SubtaskModel::EVENT_UPDATE: return e('Subtask updated on task #%d', $event_data['subtask']['task_id']); - case Task::EVENT_CREATE: + case TaskModel::EVENT_CREATE: return e('New task #%d: %s', $event_data['task']['id'], $event_data['task']['title']); - case Task::EVENT_UPDATE: + case TaskModel::EVENT_UPDATE: return e('Task updated #%d', $event_data['task']['id']); - case Task::EVENT_CLOSE: + case TaskModel::EVENT_CLOSE: return e('Task #%d closed', $event_data['task']['id']); - case Task::EVENT_OPEN: + case TaskModel::EVENT_OPEN: return e('Task #%d opened', $event_data['task']['id']); - case Task::EVENT_MOVE_COLUMN: + case TaskModel::EVENT_MOVE_COLUMN: return e('Column changed for task #%d', $event_data['task']['id']); - case Task::EVENT_MOVE_POSITION: + case TaskModel::EVENT_MOVE_POSITION: return e('New position for task #%d', $event_data['task']['id']); - case Task::EVENT_MOVE_SWIMLANE: + case TaskModel::EVENT_MOVE_SWIMLANE: return e('Swimlane changed for task #%d', $event_data['task']['id']); - case Task::EVENT_ASSIGNEE_CHANGE: + case TaskModel::EVENT_ASSIGNEE_CHANGE: return e('Assignee changed on task #%d', $event_data['task']['id']); - case Task::EVENT_OVERDUE: + case TaskModel::EVENT_OVERDUE: $nb = count($event_data['tasks']); return $nb > 1 ? e('%d overdue tasks', $nb) : e('Task #%d is overdue', $event_data['tasks'][0]['id']); - case Task::EVENT_USER_MENTION: + case TaskModel::EVENT_USER_MENTION: return e('You were mentioned in the task #%d', $event_data['task']['id']); - case Comment::EVENT_USER_MENTION: + case CommentModel::EVENT_USER_MENTION: return e('You were mentioned in a comment on the task #%d', $event_data['task']['id']); default: return e('Notification'); } } + + /** + * Get task id from event + * + * @access public + * @param string $event_name + * @param array $event_data + * @return integer + */ + public function getTaskIdFromEvent($event_name, array $event_data) + { + switch ($event_name) { + case TaskFileModel::EVENT_CREATE: + return $event_data['file']['task_id']; + case CommentModel::EVENT_CREATE: + case CommentModel::EVENT_UPDATE: + return $event_data['comment']['task_id']; + case SubtaskModel::EVENT_CREATE: + case SubtaskModel::EVENT_UPDATE: + return $event_data['subtask']['task_id']; + case TaskModel::EVENT_CREATE: + case TaskModel::EVENT_UPDATE: + case TaskModel::EVENT_CLOSE: + case TaskModel::EVENT_OPEN: + case TaskModel::EVENT_MOVE_COLUMN: + case TaskModel::EVENT_MOVE_POSITION: + case TaskModel::EVENT_MOVE_SWIMLANE: + case TaskModel::EVENT_ASSIGNEE_CHANGE: + case CommentModel::EVENT_USER_MENTION: + case TaskModel::EVENT_USER_MENTION: + return $event_data['task']['id']; + case TaskModel::EVENT_OVERDUE: + return $event_data['tasks'][0]['id']; + default: + return 0; + } + } } diff --git a/sources/app/Model/NotificationType.php b/sources/app/Model/NotificationTypeModel.php similarity index 92% rename from sources/app/Model/NotificationType.php rename to sources/app/Model/NotificationTypeModel.php index 289aae9..432832e 100644 --- a/sources/app/Model/NotificationType.php +++ b/sources/app/Model/NotificationTypeModel.php @@ -3,6 +3,7 @@ namespace Kanboard\Model; use Pimple\Container; +use Kanboard\Core\Base; /** * Notification Type @@ -10,7 +11,7 @@ use Pimple\Container; * @package model * @author Frederic Guillot */ -abstract class NotificationType extends Base +abstract class NotificationTypeModel extends Base { /** * Container @@ -56,7 +57,7 @@ abstract class NotificationType extends Base * @param string $label * @param string $class * @param boolean $hidden - * @return NotificationType + * @return NotificationTypeModel */ public function setType($type, $label, $class, $hidden = false) { @@ -80,7 +81,7 @@ abstract class NotificationType extends Base * * @access public * @param string $type - * @return \Kanboard\Notification\NotificationInterface + * @return \Kanboard\Core\Notification\NotificationInterface */ public function getType($type) { diff --git a/sources/app/Model/PasswordReset.php b/sources/app/Model/PasswordResetModel.php similarity index 89% rename from sources/app/Model/PasswordReset.php rename to sources/app/Model/PasswordResetModel.php index 5cfd3c9..d7c7496 100644 --- a/sources/app/Model/PasswordReset.php +++ b/sources/app/Model/PasswordResetModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Password Reset Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class PasswordReset extends Base +class PasswordResetModel extends Base { /** * SQL table name @@ -46,7 +48,7 @@ class PasswordReset extends Base */ public function create($username, $expiration = 0) { - $user_id = $this->db->table(User::TABLE)->eq('username', $username)->neq('email', '')->notNull('email')->findOneColumn('id'); + $user_id = $this->db->table(UserModel::TABLE)->eq('username', $username)->neq('email', '')->notNull('email')->findOneColumn('id'); if (! $user_id) { return false; diff --git a/sources/app/Model/ProjectActivity.php b/sources/app/Model/ProjectActivity.php deleted file mode 100644 index d399d5c..0000000 --- a/sources/app/Model/ProjectActivity.php +++ /dev/null @@ -1,211 +0,0 @@ - $project_id, - 'task_id' => $task_id, - 'creator_id' => $creator_id, - 'event_name' => $event_name, - 'date_creation' => time(), - 'data' => json_encode($data), - ); - - $this->cleanup(self::MAX_EVENTS - 1); - return $this->db->table(self::TABLE)->insert($values); - } - - /** - * Get all events for the given project - * - * @access public - * @param integer $project_id Project id - * @param integer $limit Maximum events number - * @param integer $start Timestamp of earliest activity - * @param integer $end Timestamp of latest activity - * @return array - */ - public function getProject($project_id, $limit = 50, $start = null, $end = null) - { - return $this->getProjects(array($project_id), $limit, $start, $end); - } - - /** - * Get all events for the given projects list - * - * @access public - * @param integer[] $project_ids Projects id - * @param integer $limit Maximum events number - * @param integer $start Timestamp of earliest activity - * @param integer $end Timestamp of latest activity - * @return array - */ - public function getProjects(array $project_ids, $limit = 50, $start = null, $end = null) - { - if (empty($project_ids)) { - return array(); - } - - $query = $this - ->db - ->table(self::TABLE) - ->columns( - self::TABLE.'.*', - User::TABLE.'.username AS author_username', - User::TABLE.'.name AS author_name', - User::TABLE.'.email', - User::TABLE.'.avatar_path' - ) - ->in('project_id', $project_ids) - ->join(User::TABLE, 'id', 'creator_id') - ->desc(self::TABLE.'.id') - ->limit($limit); - - return $this->getEvents($query, $start, $end); - } - - /** - * Get all events for the given task - * - * @access public - * @param integer $task_id Task id - * @param integer $limit Maximum events number - * @param integer $start Timestamp of earliest activity - * @param integer $end Timestamp of latest activity - * @return array - */ - public function getTask($task_id, $limit = 50, $start = null, $end = null) - { - $query = $this - ->db - ->table(self::TABLE) - ->columns( - self::TABLE.'.*', - User::TABLE.'.username AS author_username', - User::TABLE.'.name AS author_name', - User::TABLE.'.email', - User::TABLE.'.avatar_path' - ) - ->eq('task_id', $task_id) - ->join(User::TABLE, 'id', 'creator_id') - ->desc(self::TABLE.'.id') - ->limit($limit); - - return $this->getEvents($query, $start, $end); - } - - /** - * Common function to return events - * - * @access public - * @param \PicoDb\Table $query PicoDb Query - * @param integer $start Timestamp of earliest activity - * @param integer $end Timestamp of latest activity - * @return array - */ - private function getEvents(\PicoDb\Table $query, $start, $end) - { - if (! is_null($start)) { - $query->gte('date_creation', $start); - } - - if (! is_null($end)) { - $query->lte('date_creation', $end); - } - - $events = $query->findAll(); - - foreach ($events as &$event) { - $event += $this->decode($event['data']); - unset($event['data']); - - $event['author'] = $event['author_name'] ?: $event['author_username']; - $event['event_title'] = $this->notification->getTitleWithAuthor($event['author'], $event['event_name'], $event); - $event['event_content'] = $this->getContent($event); - } - - return $events; - } - - /** - * Remove old event entries to avoid large table - * - * @access public - * @param integer $max Maximum number of items to keep in the table - */ - public function cleanup($max) - { - $total = $this->db->table(self::TABLE)->count(); - - if ($total > $max) { - $ids = $this->db->table(self::TABLE)->asc('id')->limit($total - $max)->findAllByColumn('id'); - $this->db->table(self::TABLE)->in('id', $ids)->remove(); - } - } - - /** - * Get the event html content - * - * @access public - * @param array $params Event properties - * @return string - */ - public function getContent(array $params) - { - return $this->template->render( - 'event/'.str_replace('.', '_', $params['event_name']), - $params - ); - } - - /** - * Decode event data, supports unserialize() and json_decode() - * - * @access public - * @param string $data Serialized data - * @return array - */ - public function decode($data) - { - if ($data{0} === 'a') { - return unserialize($data); - } - - return json_decode($data, true) ?: array(); - } -} diff --git a/sources/app/Model/ProjectActivityModel.php b/sources/app/Model/ProjectActivityModel.php new file mode 100644 index 0000000..380ea12 --- /dev/null +++ b/sources/app/Model/ProjectActivityModel.php @@ -0,0 +1,94 @@ + $project_id, + 'task_id' => $task_id, + 'creator_id' => $creator_id, + 'event_name' => $event_name, + 'date_creation' => time(), + 'data' => json_encode($data), + ); + + $this->cleanup(self::MAX_EVENTS - 1); + return $this->db->table(self::TABLE)->insert($values); + } + + /** + * Get query + * + * @access public + * @return Table + */ + public function getQuery() + { + return $this + ->db + ->table(ProjectActivityModel::TABLE) + ->columns( + ProjectActivityModel::TABLE.'.*', + 'uc.username AS author_username', + 'uc.name AS author_name', + 'uc.email', + 'uc.avatar_path' + ) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->left(UserModel::TABLE, 'uc', 'id', ProjectActivityModel::TABLE, 'creator_id'); + } + + /** + * Remove old event entries to avoid large table + * + * @access public + * @param integer $max Maximum number of items to keep in the table + */ + public function cleanup($max) + { + $total = $this->db->table(self::TABLE)->count(); + + if ($total > $max) { + $ids = $this->db->table(self::TABLE)->asc('id')->limit($total - $max)->findAllByColumn('id'); + $this->db->table(self::TABLE)->in('id', $ids)->remove(); + } + } +} diff --git a/sources/app/Model/ProjectDailyColumnStats.php b/sources/app/Model/ProjectDailyColumnStatsModel.php similarity index 92% rename from sources/app/Model/ProjectDailyColumnStats.php rename to sources/app/Model/ProjectDailyColumnStatsModel.php index 0706a11..a0f14cf 100644 --- a/sources/app/Model/ProjectDailyColumnStats.php +++ b/sources/app/Model/ProjectDailyColumnStatsModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Project Daily Column Stats * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectDailyColumnStats extends Base +class ProjectDailyColumnStatsModel extends Base { /** * SQL table name @@ -84,7 +86,7 @@ class ProjectDailyColumnStats extends Base */ public function getAggregatedMetrics($project_id, $from, $to, $field = 'total') { - $columns = $this->column->getList($project_id); + $columns = $this->columnModel->getList($project_id); $metrics = $this->getMetrics($project_id, $from, $to); return $this->buildAggregate($metrics, $columns, $field); } @@ -205,10 +207,10 @@ class ProjectDailyColumnStats extends Base */ private function getScoreByColumns($project_id) { - $stats = $this->db->table(Task::TABLE) + $stats = $this->db->table(TaskModel::TABLE) ->columns('column_id', 'SUM(score) AS score') ->eq('project_id', $project_id) - ->eq('is_active', Task::STATUS_OPEN) + ->eq('is_active', TaskModel::STATUS_OPEN) ->notNull('score') ->groupBy('column_id') ->findAll(); @@ -225,7 +227,7 @@ class ProjectDailyColumnStats extends Base */ private function getTotalByColumns($project_id) { - $stats = $this->db->table(Task::TABLE) + $stats = $this->db->table(TaskModel::TABLE) ->columns('column_id', 'COUNT(*) AS total') ->eq('project_id', $project_id) ->in('is_active', $this->getTaskStatusConfig()) @@ -243,10 +245,10 @@ class ProjectDailyColumnStats extends Base */ private function getTaskStatusConfig() { - if ($this->config->get('cfd_include_closed_tasks') == 1) { - return array(Task::STATUS_OPEN, Task::STATUS_CLOSED); + if ($this->configModel->get('cfd_include_closed_tasks') == 1) { + return array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED); } - return array(Task::STATUS_OPEN); + return array(TaskModel::STATUS_OPEN); } } diff --git a/sources/app/Model/ProjectDailyStats.php b/sources/app/Model/ProjectDailyStatsModel.php similarity index 95% rename from sources/app/Model/ProjectDailyStats.php rename to sources/app/Model/ProjectDailyStatsModel.php index 974f581..0754d26 100644 --- a/sources/app/Model/ProjectDailyStats.php +++ b/sources/app/Model/ProjectDailyStatsModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Project Daily Stats * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectDailyStats extends Base +class ProjectDailyStatsModel extends Base { /** * SQL table name diff --git a/sources/app/Model/ProjectDuplication.php b/sources/app/Model/ProjectDuplicationModel.php similarity index 74% rename from sources/app/Model/ProjectDuplication.php rename to sources/app/Model/ProjectDuplicationModel.php index 9c5f80a..94b83c8 100644 --- a/sources/app/Model/ProjectDuplication.php +++ b/sources/app/Model/ProjectDuplicationModel.php @@ -2,16 +2,17 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Role; /** * Project Duplication * - * @package model + * @package Kanboard\Model * @author Frederic Guillot * @author Antonio Rabelo */ -class ProjectDuplication extends Base +class ProjectDuplicationModel extends Base { /** * Get list of optional models to duplicate @@ -21,7 +22,15 @@ class ProjectDuplication extends Base */ public function getOptionalSelection() { - return array('category', 'projectPermission', 'action', 'swimlane', 'task'); + return array( + 'categoryModel', + 'projectPermissionModel', + 'actionModel', + 'swimlaneModel', + 'tagDuplicationModel', + 'projectMetadataModel', + 'projectTaskDuplicationModel', + ); } /** @@ -32,7 +41,16 @@ class ProjectDuplication extends Base */ public function getPossibleSelection() { - return array('board', 'category', 'projectPermission', 'action', 'swimlane', 'task'); + return array( + 'boardModel', + 'categoryModel', + 'projectPermissionModel', + 'actionModel', + 'swimlaneModel', + 'tagDuplicationModel', + 'projectMetadataModel', + 'projectTaskDuplicationModel', + ); } /** @@ -64,7 +82,7 @@ class ProjectDuplication extends Base * @param boolean $private Force the project to be private * @return integer Cloned Project Id */ - public function duplicate($src_project_id, $selection = array('projectPermission', 'category', 'action'), $owner_id = 0, $name = null, $private = null) + public function duplicate($src_project_id, $selection = array('projectPermissionModel', 'categoryModel', 'actionModel'), $owner_id = 0, $name = null, $private = null) { $this->db->startTransaction(); @@ -85,7 +103,7 @@ class ProjectDuplication extends Base } // Skip permissions for private projects - if ($private && $model === 'projectPermission') { + if ($private && $model === 'projectPermissionModel') { continue; } @@ -117,7 +135,7 @@ class ProjectDuplication extends Base */ private function copy($src_project_id, $owner_id = 0, $name = null, $private = null) { - $project = $this->project->getById($src_project_id); + $project = $this->projectModel->getById($src_project_id); $is_private = empty($project['is_private']) ? 0 : 1; $values = array( @@ -128,9 +146,12 @@ class ProjectDuplication extends Base 'is_public' => 0, 'is_private' => $private ? 1 : $is_private, 'owner_id' => $owner_id, + 'priority_default' => $project['priority_default'], + 'priority_start' => $project['priority_start'], + 'priority_end' => $project['priority_end'], ); - if (! $this->db->table(Project::TABLE)->save($values)) { + if (! $this->db->table(ProjectModel::TABLE)->save($values)) { return false; } @@ -148,9 +169,9 @@ class ProjectDuplication extends Base private function makeOwnerManager($dst_project_id, $owner_id) { if ($owner_id > 0) { - $this->projectUserRole->removeUser($dst_project_id, $owner_id); + $this->projectUserRoleModel->removeUser($dst_project_id, $owner_id); - if (! $this->projectUserRole->addUser($dst_project_id, $owner_id, Role::PROJECT_MANAGER)) { + if (! $this->projectUserRoleModel->addUser($dst_project_id, $owner_id, Role::PROJECT_MANAGER)) { return false; } } diff --git a/sources/app/Model/ProjectFile.php b/sources/app/Model/ProjectFile.php deleted file mode 100644 index aa9bf15..0000000 --- a/sources/app/Model/ProjectFile.php +++ /dev/null @@ -1,40 +0,0 @@ -query = $this->db->table(ProjectGroupRole::TABLE); - return $this; - } - - /** - * Get all results of the filter - * - * @access public - * @param string $column - * @return array - */ - public function findAll($column = '') - { - if ($column !== '') { - return $this->query->asc($column)->findAllByColumn($column); - } - - return $this->query->findAll(); - } - - /** - * Get the PicoDb query - * - * @access public - * @return \PicoDb\Table - */ - public function getQuery() - { - return $this->query; - } - - /** - * Filter by project id - * - * @access public - * @param integer $project_id - * @return ProjectUserRoleFilter - */ - public function filterByProjectId($project_id) - { - $this->query->eq(ProjectGroupRole::TABLE.'.project_id', $project_id); - return $this; - } - - /** - * Filter by username - * - * @access public - * @param string $input - * @return ProjectUserRoleFilter - */ - public function startWithUsername($input) - { - $this->query - ->join(GroupMember::TABLE, 'group_id', 'group_id', ProjectGroupRole::TABLE) - ->join(User::TABLE, 'id', 'user_id', GroupMember::TABLE) - ->ilike(User::TABLE.'.username', $input.'%'); - - return $this; - } -} diff --git a/sources/app/Model/ProjectGroupRole.php b/sources/app/Model/ProjectGroupRoleModel.php similarity index 74% rename from sources/app/Model/ProjectGroupRole.php rename to sources/app/Model/ProjectGroupRoleModel.php index afad4a4..2729d5a 100644 --- a/sources/app/Model/ProjectGroupRole.php +++ b/sources/app/Model/ProjectGroupRoleModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Role; /** * Project Group Role * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectGroupRole extends Base +class ProjectGroupRoleModel extends Base { /** * SQL table name @@ -27,15 +28,15 @@ class ProjectGroupRole extends Base * @param array $status * @return array */ - public function getProjectsByUser($user_id, $status = array(Project::ACTIVE, Project::INACTIVE)) + public function getProjectsByUser($user_id, $status = array(ProjectModel::ACTIVE, ProjectModel::INACTIVE)) { return $this->db - ->hashtable(Project::TABLE) + ->hashtable(ProjectModel::TABLE) ->join(self::TABLE, 'project_id', 'id') - ->join(GroupMember::TABLE, 'group_id', 'group_id', self::TABLE) - ->eq(GroupMember::TABLE.'.user_id', $user_id) - ->in(Project::TABLE.'.is_active', $status) - ->getAll(Project::TABLE.'.id', Project::TABLE.'.name'); + ->join(GroupMemberModel::TABLE, 'group_id', 'group_id', self::TABLE) + ->eq(GroupMemberModel::TABLE.'.user_id', $user_id) + ->in(ProjectModel::TABLE.'.is_active', $status) + ->getAll(ProjectModel::TABLE.'.id', ProjectModel::TABLE.'.name'); } /** @@ -49,8 +50,8 @@ class ProjectGroupRole extends Base public function getUserRole($project_id, $user_id) { $roles = $this->db->table(self::TABLE) - ->join(GroupMember::TABLE, 'group_id', 'group_id', self::TABLE) - ->eq(GroupMember::TABLE.'.user_id', $user_id) + ->join(GroupMemberModel::TABLE, 'group_id', 'group_id', self::TABLE) + ->eq(GroupMemberModel::TABLE.'.user_id', $user_id) ->eq(self::TABLE.'.project_id', $project_id) ->findAllByColumn('role'); @@ -67,8 +68,8 @@ class ProjectGroupRole extends Base public function getGroups($project_id) { return $this->db->table(self::TABLE) - ->columns(Group::TABLE.'.id', Group::TABLE.'.name', self::TABLE.'.role') - ->join(Group::TABLE, 'id', 'group_id') + ->columns(GroupModel::TABLE.'.id', GroupModel::TABLE.'.name', self::TABLE.'.role') + ->join(GroupModel::TABLE, 'id', 'group_id') ->eq('project_id', $project_id) ->asc('name') ->findAll(); @@ -84,11 +85,11 @@ class ProjectGroupRole extends Base public function getUsers($project_id) { return $this->db->table(self::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', self::TABLE.'.role') - ->join(GroupMember::TABLE, 'group_id', 'group_id', self::TABLE) - ->join(User::TABLE, 'id', 'user_id', GroupMember::TABLE) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name', self::TABLE.'.role') + ->join(GroupMemberModel::TABLE, 'group_id', 'group_id', self::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id', GroupMemberModel::TABLE) ->eq(self::TABLE.'.project_id', $project_id) - ->asc(User::TABLE.'.username') + ->asc(UserModel::TABLE.'.username') ->findAll(); } @@ -101,14 +102,14 @@ class ProjectGroupRole extends Base */ public function getAssignableUsers($project_id) { - return $this->db->table(User::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name') - ->join(GroupMember::TABLE, 'user_id', 'id', User::TABLE) - ->join(self::TABLE, 'group_id', 'group_id', GroupMember::TABLE) + return $this->db->table(UserModel::TABLE) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name') + ->join(GroupMemberModel::TABLE, 'user_id', 'id', UserModel::TABLE) + ->join(self::TABLE, 'group_id', 'group_id', GroupMemberModel::TABLE) ->eq(self::TABLE.'.project_id', $project_id) - ->eq(User::TABLE.'.is_active', 1) + ->eq(UserModel::TABLE.'.is_active', 1) ->in(self::TABLE.'.role', array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER)) - ->asc(User::TABLE.'.username') + ->asc(UserModel::TABLE.'.username') ->findAll(); } diff --git a/sources/app/Model/ProjectMetadata.php b/sources/app/Model/ProjectMetadata.php deleted file mode 100644 index 8549805..0000000 --- a/sources/app/Model/ProjectMetadata.php +++ /dev/null @@ -1,30 +0,0 @@ -getAll($src_project_id); + + if (! $this->save($dst_project_id, $metadata)) { + return false; + } + + return true; + } +} diff --git a/sources/app/Model/Project.php b/sources/app/Model/ProjectModel.php similarity index 88% rename from sources/app/Model/Project.php rename to sources/app/Model/ProjectModel.php index d2e5b7c..850531c 100644 --- a/sources/app/Model/Project.php +++ b/sources/app/Model/ProjectModel.php @@ -2,16 +2,17 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; /** * Project model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Project extends Base +class ProjectModel extends Base { /** * SQL table name for projects @@ -34,6 +35,20 @@ class Project extends Base */ const INACTIVE = 0; + /** + * Value for private project + * + * @var integer + */ + const TYPE_PRIVATE = 1; + + /** + * Value for team project + * + * @var integer + */ + const TYPE_TEAM = 0; + /** * Get a project by the id * @@ -56,9 +71,9 @@ class Project extends Base public function getByIdWithOwner($project_id) { return $this->db->table(self::TABLE) - ->columns(self::TABLE.'.*', User::TABLE.'.username AS owner_username', User::TABLE.'.name AS owner_name') + ->columns(self::TABLE.'.*', UserModel::TABLE.'.username AS owner_username', UserModel::TABLE.'.name AS owner_name') ->eq(self::TABLE.'.id', $project_id) - ->join(User::TABLE, 'id', 'owner_id') + ->join(UserModel::TABLE, 'id', 'owner_id') ->findOne(); } @@ -187,7 +202,7 @@ class Project extends Base * Get all projects with all its data for a given status * * @access public - * @param integer $status Proejct status: self::ACTIVE or self:INACTIVE + * @param integer $status Project status: self::ACTIVE or self:INACTIVE * @return array */ public function getAllByStatus($status) @@ -241,8 +256,8 @@ class Project extends Base { $stats = array(); $stats['nb_active_tasks'] = 0; - $columns = $this->column->getAll($project_id); - $column_stats = $this->board->getColumnStats($project_id); + $columns = $this->columnModel->getAll($project_id); + $column_stats = $this->boardModel->getColumnStats($project_id); foreach ($columns as &$column) { $column['nb_active_tasks'] = isset($column_stats[$column['id']]) ? $column_stats[$column['id']] : 0; @@ -250,7 +265,7 @@ class Project extends Base } $stats['columns'] = $columns; - $stats['nb_tasks'] = $this->taskFinder->countByProjectId($project_id); + $stats['nb_tasks'] = $this->taskFinderModel->countByProjectId($project_id); $stats['nb_inactive_tasks'] = $stats['nb_tasks'] - $stats['nb_active_tasks']; return $stats; @@ -265,11 +280,13 @@ class Project extends Base */ public function getColumnStats(array &$project) { - $project['columns'] = $this->column->getAll($project['id']); - $stats = $this->board->getColumnStats($project['id']); + $project['columns'] = $this->columnModel->getAll($project['id']); + $project['nb_active_tasks'] = 0; + $stats = $this->boardModel->getColumnStats($project['id']); foreach ($project['columns'] as &$column) { $column['nb_tasks'] = isset($stats[$column['id']]) ? $stats[$column['id']] : 0; + $project['nb_active_tasks'] += $column['nb_tasks']; } return $project; @@ -301,13 +318,13 @@ class Project extends Base public function getQueryColumnStats(array $project_ids) { if (empty($project_ids)) { - return $this->db->table(Project::TABLE)->limit(0); + return $this->db->table(ProjectModel::TABLE)->limit(0); } return $this->db - ->table(Project::TABLE) - ->columns(self::TABLE.'.*', User::TABLE.'.username AS owner_username', User::TABLE.'.name AS owner_name') - ->join(User::TABLE, 'id', 'owner_id') + ->table(ProjectModel::TABLE) + ->columns(self::TABLE.'.*', UserModel::TABLE.'.username AS owner_username', UserModel::TABLE.'.name AS owner_name') + ->join(UserModel::TABLE, 'id', 'owner_id') ->in(self::TABLE.'.id', $project_ids) ->callback(array($this, 'applyColumnStats')); } @@ -343,16 +360,16 @@ class Project extends Base $project_id = $this->db->getLastId(); - if (! $this->board->create($project_id, $this->board->getUserColumns())) { + if (! $this->boardModel->create($project_id, $this->boardModel->getUserColumns())) { $this->db->cancelTransaction(); return false; } if ($add_user && $user_id) { - $this->projectUserRole->addUser($project_id, $user_id, Role::PROJECT_MANAGER); + $this->projectUserRoleModel->addUser($project_id, $user_id, Role::PROJECT_MANAGER); } - $this->category->createDefaultCategories($project_id); + $this->categoryModel->createDefaultCategories($project_id); $this->db->closeTransaction(); diff --git a/sources/app/Model/ProjectNotification.php b/sources/app/Model/ProjectNotificationModel.php similarity index 68% rename from sources/app/Model/ProjectNotification.php rename to sources/app/Model/ProjectNotificationModel.php index a355902..aeeee4c 100644 --- a/sources/app/Model/ProjectNotification.php +++ b/sources/app/Model/ProjectNotificationModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Project Notification * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectNotification extends Base +class ProjectNotificationModel extends Base { /** * Send notifications @@ -20,15 +22,15 @@ class ProjectNotification extends Base */ public function sendNotifications($project_id, $event_name, array $event_data) { - $project = $this->project->getById($project_id); + $project = $this->projectModel->getById($project_id); $types = array_merge( - $this->projectNotificationType->getHiddenTypes(), - $this->projectNotificationType->getSelectedTypes($project_id) + $this->projectNotificationTypeModel->getHiddenTypes(), + $this->projectNotificationTypeModel->getSelectedTypes($project_id) ); foreach ($types as $type) { - $this->projectNotificationType->getType($type)->notifyProject($project, $event_name, $event_data); + $this->projectNotificationTypeModel->getType($type)->notifyProject($project, $event_name, $event_data); } } @@ -44,7 +46,7 @@ class ProjectNotification extends Base $this->db->startTransaction(); $types = empty($values['notification_types']) ? array() : array_keys($values['notification_types']); - $this->projectNotificationType->saveSelectedTypes($project_id, $types); + $this->projectNotificationTypeModel->saveSelectedTypes($project_id, $types); $this->db->closeTransaction(); } @@ -59,7 +61,7 @@ class ProjectNotification extends Base public function readSettings($project_id) { return array( - 'notification_types' => $this->projectNotificationType->getSelectedTypes($project_id), + 'notification_types' => $this->projectNotificationTypeModel->getSelectedTypes($project_id), ); } } diff --git a/sources/app/Model/ProjectNotificationType.php b/sources/app/Model/ProjectNotificationTypeModel.php similarity index 93% rename from sources/app/Model/ProjectNotificationType.php rename to sources/app/Model/ProjectNotificationTypeModel.php index a471959..aeec77f 100644 --- a/sources/app/Model/ProjectNotificationType.php +++ b/sources/app/Model/ProjectNotificationTypeModel.php @@ -5,10 +5,10 @@ namespace Kanboard\Model; /** * Project Notification Type * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectNotificationType extends NotificationType +class ProjectNotificationTypeModel extends NotificationTypeModel { /** * SQL table name diff --git a/sources/app/Model/ProjectPermission.php b/sources/app/Model/ProjectPermissionModel.php similarity index 56% rename from sources/app/Model/ProjectPermission.php rename to sources/app/Model/ProjectPermissionModel.php index db1573a..a7c1857 100644 --- a/sources/app/Model/ProjectPermission.php +++ b/sources/app/Model/ProjectPermissionModel.php @@ -2,15 +2,20 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Role; +use Kanboard\Filter\ProjectGroupRoleProjectFilter; +use Kanboard\Filter\ProjectGroupRoleUsernameFilter; +use Kanboard\Filter\ProjectUserRoleProjectFilter; +use Kanboard\Filter\ProjectUserRoleUsernameFilter; /** * Project Permission * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectPermission extends Base +class ProjectPermissionModel extends Base { /** * Get query for project users overview @@ -28,18 +33,18 @@ class ProjectPermission extends Base return $this ->db - ->table(ProjectUserRole::TABLE) - ->join(User::TABLE, 'id', 'user_id') - ->join(Project::TABLE, 'id', 'project_id') - ->eq(ProjectUserRole::TABLE.'.role', $role) - ->eq(Project::TABLE.'.is_private', 0) - ->in(Project::TABLE.'.id', $project_ids) + ->table(ProjectUserRoleModel::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id') + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->eq(ProjectUserRoleModel::TABLE.'.role', $role) + ->eq(ProjectModel::TABLE.'.is_private', 0) + ->in(ProjectModel::TABLE.'.id', $project_ids) ->columns( - User::TABLE.'.id', - User::TABLE.'.username', - User::TABLE.'.name', - Project::TABLE.'.name AS project_name', - Project::TABLE.'.id' + UserModel::TABLE.'.id', + UserModel::TABLE.'.username', + UserModel::TABLE.'.name', + ProjectModel::TABLE.'.name AS project_name', + ProjectModel::TABLE.'.id' ); } @@ -53,8 +58,18 @@ class ProjectPermission extends Base */ public function findUsernames($project_id, $input) { - $userMembers = $this->projectUserRoleFilter->create()->filterByProjectId($project_id)->startWithUsername($input)->findAll('username'); - $groupMembers = $this->projectGroupRoleFilter->create()->filterByProjectId($project_id)->startWithUsername($input)->findAll('username'); + $userMembers = $this->projectUserRoleQuery + ->withFilter(new ProjectUserRoleProjectFilter($project_id)) + ->withFilter(new ProjectUserRoleUsernameFilter($input)) + ->getQuery() + ->findAllByColumn('username'); + + $groupMembers = $this->projectGroupRoleQuery + ->withFilter(new ProjectGroupRoleProjectFilter($project_id)) + ->withFilter(new ProjectGroupRoleUsernameFilter($input)) + ->getQuery() + ->findAllByColumn('username'); + $members = array_unique(array_merge($userMembers, $groupMembers)); sort($members); @@ -72,7 +87,7 @@ class ProjectPermission extends Base public function isEverybodyAllowed($project_id) { return $this->db - ->table(Project::TABLE) + ->table(ProjectModel::TABLE) ->eq('id', $project_id) ->eq('is_everybody_allowed', 1) ->exists(); @@ -92,7 +107,7 @@ class ProjectPermission extends Base } return in_array( - $this->projectUserRole->getUserRole($project_id, $user_id), + $this->projectUserRoleModel->getUserRole($project_id, $user_id), array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER, Role::PROJECT_VIEWER) ); } @@ -107,8 +122,8 @@ class ProjectPermission extends Base */ public function isAssignable($project_id, $user_id) { - return $this->user->isActive($user_id) && - in_array($this->projectUserRole->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER)); + return $this->userModel->isActive($user_id) && + in_array($this->projectUserRoleModel->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER)); } /** @@ -121,7 +136,7 @@ class ProjectPermission extends Base */ public function isMember($project_id, $user_id) { - return in_array($this->projectUserRole->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER, Role::PROJECT_VIEWER)); + return in_array($this->projectUserRoleModel->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER, Role::PROJECT_VIEWER)); } /** @@ -133,7 +148,7 @@ class ProjectPermission extends Base */ public function getActiveProjectIds($user_id) { - return array_keys($this->projectUserRole->getActiveProjectsByUser($user_id)); + return array_keys($this->projectUserRoleModel->getActiveProjectsByUser($user_id)); } /** @@ -145,7 +160,7 @@ class ProjectPermission extends Base */ public function duplicate($project_src_id, $project_dst_id) { - return $this->projectUserRole->duplicate($project_src_id, $project_dst_id) && - $this->projectGroupRole->duplicate($project_src_id, $project_dst_id); + return $this->projectUserRoleModel->duplicate($project_src_id, $project_dst_id) && + $this->projectGroupRoleModel->duplicate($project_src_id, $project_dst_id); } } diff --git a/sources/app/Model/ProjectTaskDuplicationModel.php b/sources/app/Model/ProjectTaskDuplicationModel.php new file mode 100644 index 0000000..5d2e132 --- /dev/null +++ b/sources/app/Model/ProjectTaskDuplicationModel.php @@ -0,0 +1,35 @@ +taskFinderModel->getAllIds($src_project_id, array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED)); + + foreach ($task_ids as $task_id) { + if (! $this->taskProjectDuplicationModel->duplicateToProject($task_id, $dst_project_id)) { + return false; + } + } + + return true; + } +} diff --git a/sources/app/Model/ProjectTaskPriorityModel.php b/sources/app/Model/ProjectTaskPriorityModel.php new file mode 100644 index 0000000..c1a0257 --- /dev/null +++ b/sources/app/Model/ProjectTaskPriorityModel.php @@ -0,0 +1,74 @@ +db + ->table(ProjectModel::TABLE) + ->columns('priority_default', 'priority_start', 'priority_end') + ->eq('id', $project_id) + ->findOne(); + } + + /** + * Get default task priority + * + * @access public + * @param int $project_id + * @return int + */ + public function getDefaultPriority($project_id) + { + return $this->db->table(ProjectModel::TABLE)->eq('id', $project_id)->findOneColumn('priority_default') ?: 0; + } + + /** + * Get priority for a destination project + * + * @access public + * @param integer $dst_project_id + * @param integer $priority + * @return integer + */ + public function getPriorityForProject($dst_project_id, $priority) + { + $settings = $this->getPrioritySettings($dst_project_id); + + if ($priority >= $settings['priority_start'] && $priority <= $settings['priority_end']) { + return $priority; + } + + return $settings['priority_default']; + } +} diff --git a/sources/app/Model/ProjectUserRoleFilter.php b/sources/app/Model/ProjectUserRoleFilter.php deleted file mode 100644 index 6440364..0000000 --- a/sources/app/Model/ProjectUserRoleFilter.php +++ /dev/null @@ -1,88 +0,0 @@ -query = $this->db->table(ProjectUserRole::TABLE); - return $this; - } - - /** - * Get all results of the filter - * - * @access public - * @param string $column - * @return array - */ - public function findAll($column = '') - { - if ($column !== '') { - return $this->query->asc($column)->findAllByColumn($column); - } - - return $this->query->findAll(); - } - - /** - * Get the PicoDb query - * - * @access public - * @return \PicoDb\Table - */ - public function getQuery() - { - return $this->query; - } - - /** - * Filter by project id - * - * @access public - * @param integer $project_id - * @return ProjectUserRoleFilter - */ - public function filterByProjectId($project_id) - { - $this->query->eq(ProjectUserRole::TABLE.'.project_id', $project_id); - return $this; - } - - /** - * Filter by username - * - * @access public - * @param string $input - * @return ProjectUserRoleFilter - */ - public function startWithUsername($input) - { - $this->query - ->join(User::TABLE, 'id', 'user_id') - ->ilike(User::TABLE.'.username', $input.'%'); - - return $this; - } -} diff --git a/sources/app/Model/ProjectUserRole.php b/sources/app/Model/ProjectUserRoleModel.php similarity index 74% rename from sources/app/Model/ProjectUserRole.php rename to sources/app/Model/ProjectUserRoleModel.php index 56da679..a0df0cf 100644 --- a/sources/app/Model/ProjectUserRole.php +++ b/sources/app/Model/ProjectUserRoleModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Role; /** * Project User Role * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class ProjectUserRole extends Base +class ProjectUserRoleModel extends Base { /** * SQL table name @@ -28,7 +29,7 @@ class ProjectUserRole extends Base */ public function getActiveProjectsByUser($user_id) { - return $this->getProjectsByUser($user_id, array(Project::ACTIVE)); + return $this->getProjectsByUser($user_id, array(ProjectModel::ACTIVE)); } /** @@ -39,19 +40,19 @@ class ProjectUserRole extends Base * @param array $status * @return array */ - public function getProjectsByUser($user_id, $status = array(Project::ACTIVE, Project::INACTIVE)) + public function getProjectsByUser($user_id, $status = array(ProjectModel::ACTIVE, ProjectModel::INACTIVE)) { $userProjects = $this->db - ->hashtable(Project::TABLE) + ->hashtable(ProjectModel::TABLE) ->beginOr() ->eq(self::TABLE.'.user_id', $user_id) - ->eq(Project::TABLE.'.is_everybody_allowed', 1) + ->eq(ProjectModel::TABLE.'.is_everybody_allowed', 1) ->closeOr() - ->in(Project::TABLE.'.is_active', $status) + ->in(ProjectModel::TABLE.'.is_active', $status) ->join(self::TABLE, 'project_id', 'id') - ->getAll(Project::TABLE.'.id', Project::TABLE.'.name'); + ->getAll(ProjectModel::TABLE.'.id', ProjectModel::TABLE.'.name'); - $groupProjects = $this->projectGroupRole->getProjectsByUser($user_id, $status); + $groupProjects = $this->projectGroupRoleModel->getProjectsByUser($user_id, $status); $projects = $userProjects + $groupProjects; asort($projects); @@ -69,14 +70,19 @@ class ProjectUserRole extends Base */ public function getUserRole($project_id, $user_id) { - if ($this->projectPermission->isEverybodyAllowed($project_id)) { - return Role::PROJECT_MEMBER; + $projectInfo = $this->db->table(ProjectModel::TABLE) + ->eq('id', $project_id) + ->columns('owner_id', 'is_everybody_allowed') + ->findOne(); + + if ($projectInfo['is_everybody_allowed'] == 1) { + return $projectInfo['owner_id'] == $user_id ? Role::PROJECT_MANAGER : Role::PROJECT_MEMBER; } $role = $this->db->table(self::TABLE)->eq('user_id', $user_id)->eq('project_id', $project_id)->findOneColumn('role'); if (empty($role)) { - $role = $this->projectGroupRole->getUserRole($project_id, $user_id); + $role = $this->projectGroupRoleModel->getUserRole($project_id, $user_id); } return $role; @@ -92,11 +98,11 @@ class ProjectUserRole extends Base public function getUsers($project_id) { return $this->db->table(self::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', self::TABLE.'.role') - ->join(User::TABLE, 'id', 'user_id') + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name', self::TABLE.'.role') + ->join(UserModel::TABLE, 'id', 'user_id') ->eq('project_id', $project_id) - ->asc(User::TABLE.'.username') - ->asc(User::TABLE.'.name') + ->asc(UserModel::TABLE.'.username') + ->asc(UserModel::TABLE.'.name') ->findAll(); } @@ -110,10 +116,10 @@ class ProjectUserRole extends Base public function getAllUsers($project_id) { $userMembers = $this->getUsers($project_id); - $groupMembers = $this->projectGroupRole->getUsers($project_id); + $groupMembers = $this->projectGroupRoleModel->getUsers($project_id); $members = array_merge($userMembers, $groupMembers); - return $this->user->prepareList($members); + return $this->userModel->prepareList($members); } /** @@ -128,7 +134,7 @@ class ProjectUserRole extends Base $users = array(); $userMembers = $this->getUsers($project_id); - $groupMembers = $this->projectGroupRole->getUsers($project_id); + $groupMembers = $this->projectGroupRoleModel->getUsers($project_id); $members = array_merge($userMembers, $groupMembers); foreach ($members as $user) { @@ -151,22 +157,22 @@ class ProjectUserRole extends Base */ public function getAssignableUsers($project_id) { - if ($this->projectPermission->isEverybodyAllowed($project_id)) { - return $this->user->getActiveUsersList(); + if ($this->projectPermissionModel->isEverybodyAllowed($project_id)) { + return $this->userModel->getActiveUsersList(); } $userMembers = $this->db->table(self::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name') - ->join(User::TABLE, 'id', 'user_id') - ->eq(User::TABLE.'.is_active', 1) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name') + ->join(UserModel::TABLE, 'id', 'user_id') + ->eq(UserModel::TABLE.'.is_active', 1) ->eq(self::TABLE.'.project_id', $project_id) ->in(self::TABLE.'.role', array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER)) ->findAll(); - $groupMembers = $this->projectGroupRole->getAssignableUsers($project_id); + $groupMembers = $this->projectGroupRoleModel->getAssignableUsers($project_id); $members = array_merge($userMembers, $groupMembers); - return $this->user->prepareList($members); + return $this->userModel->prepareList($members); } /** @@ -192,7 +198,7 @@ class ProjectUserRole extends Base } if ($everybody) { - $users = array(User::EVERYBODY_ID => t('Everybody')) + $users; + $users = array(UserModel::EVERYBODY_ID => t('Everybody')) + $users; } return $users; @@ -251,8 +257,8 @@ class ProjectUserRole extends Base /** * Copy user access from a project to another one * - * @param integer $project_src_id Project Template - * @return integer $project_dst_id Project that receives the copy + * @param integer $project_src_id + * @param integer $project_dst_id * @return boolean */ public function duplicate($project_src_id, $project_dst_id) diff --git a/sources/app/Model/RememberMeSession.php b/sources/app/Model/RememberMeSessionModel.php similarity index 97% rename from sources/app/Model/RememberMeSession.php rename to sources/app/Model/RememberMeSessionModel.php index 8989a6d..f6c8d64 100644 --- a/sources/app/Model/RememberMeSession.php +++ b/sources/app/Model/RememberMeSessionModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Security\Token; /** * Remember Me Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class RememberMeSession extends Base +class RememberMeSessionModel extends Base { /** * SQL table name diff --git a/sources/app/Model/Setting.php b/sources/app/Model/SettingModel.php similarity index 95% rename from sources/app/Model/Setting.php rename to sources/app/Model/SettingModel.php index f98d7ce..5b2ee54 100644 --- a/sources/app/Model/Setting.php +++ b/sources/app/Model/SettingModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Application Settings * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -abstract class Setting extends Base +abstract class SettingModel extends Base { /** * SQL table name @@ -22,6 +24,7 @@ abstract class Setting extends Base * * @abstract * @access public + * @param array $values * @return array */ abstract public function prepare(array $values); diff --git a/sources/app/Model/Subtask.php b/sources/app/Model/SubtaskModel.php similarity index 78% rename from sources/app/Model/Subtask.php rename to sources/app/Model/SubtaskModel.php index 3f5cfe8..a97bddb 100644 --- a/sources/app/Model/Subtask.php +++ b/sources/app/Model/SubtaskModel.php @@ -3,15 +3,16 @@ namespace Kanboard\Model; use PicoDb\Database; +use Kanboard\Core\Base; use Kanboard\Event\SubtaskEvent; /** * Subtask Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Subtask extends Base +class SubtaskModel extends Base { /** * SQL table name @@ -50,6 +51,22 @@ class Subtask extends Base const EVENT_CREATE = 'subtask.create'; const EVENT_DELETE = 'subtask.delete'; + /** + * Get projectId from subtaskId + * + * @access public + * @param integer $subtask_id + * @return integer + */ + public function getProjectId($subtask_id) + { + return $this->db + ->table(self::TABLE) + ->eq(self::TABLE.'.id', $subtask_id) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->findOneColumn(TaskModel::TABLE . '.project_id') ?: 0; + } + /** * Get available status * @@ -95,20 +112,20 @@ class Subtask extends Base */ public function getUserQuery($user_id, array $status) { - return $this->db->table(Subtask::TABLE) + return $this->db->table(SubtaskModel::TABLE) ->columns( - Subtask::TABLE.'.*', - Task::TABLE.'.project_id', - Task::TABLE.'.color_id', - Task::TABLE.'.title AS task_name', - Project::TABLE.'.name AS project_name' + SubtaskModel::TABLE.'.*', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.color_id', + TaskModel::TABLE.'.title AS task_name', + ProjectModel::TABLE.'.name AS project_name' ) - ->subquery($this->subtaskTimeTracking->getTimerQuery($user_id), 'timer_start_date') + ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($user_id), 'timer_start_date') ->eq('user_id', $user_id) - ->eq(Project::TABLE.'.is_active', Project::ACTIVE) - ->in(Subtask::TABLE.'.status', $status) - ->join(Task::TABLE, 'id', 'task_id') - ->join(Project::TABLE, 'id', 'project_id', Task::TABLE) + ->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE) + ->in(SubtaskModel::TABLE.'.status', $status) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE) ->callback(array($this, 'addStatusName')); } @@ -126,11 +143,11 @@ class Subtask extends Base ->eq('task_id', $task_id) ->columns( self::TABLE.'.*', - User::TABLE.'.username', - User::TABLE.'.name' + UserModel::TABLE.'.username', + UserModel::TABLE.'.name' ) - ->subquery($this->subtaskTimeTracking->getTimerQuery($this->userSession->getId()), 'timer_start_date') - ->join(User::TABLE, 'id', 'user_id') + ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($this->userSession->getId()), 'timer_start_date') + ->join(UserModel::TABLE, 'id', 'user_id') ->asc(self::TABLE.'.position') ->callback(array($this, 'addStatusName')) ->findAll(); @@ -150,9 +167,9 @@ class Subtask extends Base return $this->db ->table(self::TABLE) ->eq(self::TABLE.'.id', $subtask_id) - ->columns(self::TABLE.'.*', User::TABLE.'.username', User::TABLE.'.name') - ->subquery($this->subtaskTimeTracking->getTimerQuery($this->userSession->getId()), 'timer_start_date') - ->join(User::TABLE, 'id', 'user_id') + ->columns(self::TABLE.'.*', UserModel::TABLE.'.username', UserModel::TABLE.'.name') + ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($this->userSession->getId()), 'timer_start_date') + ->join(UserModel::TABLE, 'id', 'user_id') ->callback(array($this, 'addStatusName')) ->findOne(); } @@ -215,9 +232,9 @@ class Subtask extends Base public function create(array $values) { $this->prepareCreation($values); - $subtask_id = $this->persist(self::TABLE, $values); + $subtask_id = $this->db->table(self::TABLE)->persist($values); - if ($subtask_id) { + if ($subtask_id !== false) { $this->container['dispatcher']->dispatch( self::EVENT_CREATE, new SubtaskEvent(array('id' => $subtask_id) + $values) @@ -344,7 +361,7 @@ class Subtask extends Base */ public function hasSubtaskInProgress($user_id) { - return $this->config->get('subtask_restriction') == 1 && + return $this->configModel->get('subtask_restriction') == 1 && $this->db->table(self::TABLE) ->eq('status', self::STATUS_INPROGRESS) ->eq('user_id', $user_id) @@ -382,7 +399,7 @@ class Subtask extends Base { return $this->db->transaction(function (Database $db) use ($src_task_id, $dst_task_id) { - $subtasks = $db->table(Subtask::TABLE) + $subtasks = $db->table(SubtaskModel::TABLE) ->columns('title', 'time_estimated', 'position') ->eq('task_id', $src_task_id) ->asc('position') @@ -391,10 +408,37 @@ class Subtask extends Base foreach ($subtasks as &$subtask) { $subtask['task_id'] = $dst_task_id; - if (! $db->table(Subtask::TABLE)->save($subtask)) { + if (! $db->table(SubtaskModel::TABLE)->save($subtask)) { return false; } } }); } + + /** + * Convert a subtask to a task + * + * @access public + * @param integer $project_id + * @param integer $subtask_id + * @return integer + */ + public function convertToTask($project_id, $subtask_id) + { + $subtask = $this->getById($subtask_id); + + $task_id = $this->taskCreationModel->create(array( + 'project_id' => $project_id, + 'title' => $subtask['title'], + 'time_estimated' => $subtask['time_estimated'], + 'time_spent' => $subtask['time_spent'], + 'owner_id' => $subtask['user_id'], + )); + + if ($task_id !== false) { + $this->remove($subtask_id); + } + + return $task_id; + } } diff --git a/sources/app/Model/SubtaskTimeTracking.php b/sources/app/Model/SubtaskTimeTrackingModel.php similarity index 60% rename from sources/app/Model/SubtaskTimeTracking.php rename to sources/app/Model/SubtaskTimeTrackingModel.php index b766b54..062e594 100644 --- a/sources/app/Model/SubtaskTimeTracking.php +++ b/sources/app/Model/SubtaskTimeTrackingModel.php @@ -3,14 +3,15 @@ namespace Kanboard\Model; use DateTime; +use Kanboard\Core\Base; /** - * Subtask timesheet + * Subtask time tracking * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class SubtaskTimeTracking extends Base +class SubtaskTimeTrackingModel extends Base { /** * SQL table name @@ -36,7 +37,7 @@ class SubtaskTimeTracking extends Base $user_id, $this->db->escapeIdentifier('end'), $this->db->escapeIdentifier('subtask_id'), - Subtask::TABLE.'.id' + SubtaskModel::TABLE.'.id' ); } @@ -57,14 +58,14 @@ class SubtaskTimeTracking extends Base self::TABLE.'.end', self::TABLE.'.start', self::TABLE.'.time_spent', - Subtask::TABLE.'.task_id', - Subtask::TABLE.'.title AS subtask_title', - Task::TABLE.'.title AS task_title', - Task::TABLE.'.project_id', - Task::TABLE.'.color_id' + SubtaskModel::TABLE.'.task_id', + SubtaskModel::TABLE.'.title AS subtask_title', + TaskModel::TABLE.'.title AS task_title', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.color_id' ) - ->join(Subtask::TABLE, 'id', 'subtask_id') - ->join(Task::TABLE, 'id', 'task_id', Subtask::TABLE) + ->join(SubtaskModel::TABLE, 'id', 'subtask_id') + ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE) ->eq(self::TABLE.'.user_id', $user_id); } @@ -86,16 +87,16 @@ class SubtaskTimeTracking extends Base self::TABLE.'.start', self::TABLE.'.time_spent', self::TABLE.'.user_id', - Subtask::TABLE.'.task_id', - Subtask::TABLE.'.title AS subtask_title', - Task::TABLE.'.project_id', - User::TABLE.'.username', - User::TABLE.'.name AS user_fullname' + SubtaskModel::TABLE.'.task_id', + SubtaskModel::TABLE.'.title AS subtask_title', + TaskModel::TABLE.'.project_id', + UserModel::TABLE.'.username', + UserModel::TABLE.'.name AS user_fullname' ) - ->join(Subtask::TABLE, 'id', 'subtask_id') - ->join(Task::TABLE, 'id', 'task_id', Subtask::TABLE) - ->join(User::TABLE, 'id', 'user_id', self::TABLE) - ->eq(Task::TABLE.'.id', $task_id); + ->join(SubtaskModel::TABLE, 'id', 'subtask_id') + ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id', self::TABLE) + ->eq(TaskModel::TABLE.'.id', $task_id); } /** @@ -116,17 +117,17 @@ class SubtaskTimeTracking extends Base self::TABLE.'.start', self::TABLE.'.time_spent', self::TABLE.'.user_id', - Subtask::TABLE.'.task_id', - Subtask::TABLE.'.title AS subtask_title', - Task::TABLE.'.project_id', - Task::TABLE.'.color_id', - User::TABLE.'.username', - User::TABLE.'.name AS user_fullname' + SubtaskModel::TABLE.'.task_id', + SubtaskModel::TABLE.'.title AS subtask_title', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.color_id', + UserModel::TABLE.'.username', + UserModel::TABLE.'.name AS user_fullname' ) - ->join(Subtask::TABLE, 'id', 'subtask_id') - ->join(Task::TABLE, 'id', 'task_id', Subtask::TABLE) - ->join(User::TABLE, 'id', 'user_id', self::TABLE) - ->eq(Task::TABLE.'.project_id', $project_id) + ->join(SubtaskModel::TABLE, 'id', 'subtask_id') + ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id', self::TABLE) + ->eq(TaskModel::TABLE.'.project_id', $project_id) ->asc(self::TABLE.'.id'); } @@ -145,94 +146,6 @@ class SubtaskTimeTracking extends Base ->findAll(); } - /** - * Get user calendar events - * - * @access public - * @param integer $user_id - * @param string $start ISO-8601 format - * @param string $end - * @return array - */ - public function getUserCalendarEvents($user_id, $start, $end) - { - $hook = 'model:subtask-time-tracking:calendar:events'; - $events = $this->getUserQuery($user_id) - ->addCondition($this->getCalendarCondition( - $this->dateParser->getTimestampFromIsoFormat($start), - $this->dateParser->getTimestampFromIsoFormat($end), - 'start', - 'end' - )) - ->findAll(); - - if ($this->hook->exists($hook)) { - $events = $this->hook->first($hook, array( - 'user_id' => $user_id, - 'events' => $events, - 'start' => $start, - 'end' => $end, - )); - } - - return $this->toCalendarEvents($events); - } - - /** - * Get project calendar events - * - * @access public - * @param integer $project_id - * @param integer $start - * @param integer $end - * @return array - */ - public function getProjectCalendarEvents($project_id, $start, $end) - { - $result = $this - ->getProjectQuery($project_id) - ->addCondition($this->getCalendarCondition( - $this->dateParser->getTimestampFromIsoFormat($start), - $this->dateParser->getTimestampFromIsoFormat($end), - 'start', - 'end' - )) - ->findAll(); - - return $this->toCalendarEvents($result); - } - - /** - * Convert a record set to calendar events - * - * @access private - * @param array $rows - * @return array - */ - private function toCalendarEvents(array $rows) - { - $events = array(); - - foreach ($rows as $row) { - $user = isset($row['username']) ? ' ('.($row['user_fullname'] ?: $row['username']).')' : ''; - - $events[] = array( - 'id' => $row['id'], - 'subtask_id' => $row['subtask_id'], - 'title' => t('#%d', $row['task_id']).' '.$row['subtask_title'].$user, - 'start' => date('Y-m-d\TH:i:s', $row['start']), - 'end' => date('Y-m-d\TH:i:s', $row['end'] ?: time()), - 'backgroundColor' => $this->color->getBackgroundColor($row['color_id']), - 'borderColor' => $this->color->getBorderColor($row['color_id']), - 'textColor' => 'black', - 'url' => $this->helper->url->to('task', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])), - 'editable' => false, - ); - } - - return $events; - } - /** * Return true if a timer is started for this use and subtask * @@ -337,10 +250,10 @@ class SubtaskTimeTracking extends Base */ public function updateSubtaskTimeSpent($subtask_id, $time_spent) { - $subtask = $this->subtask->getById($subtask_id); + $subtask = $this->subtaskModel->getById($subtask_id); // Fire the event subtask.update - return $this->subtask->update(array( + return $this->subtaskModel->update(array( 'id' => $subtask['id'], 'time_spent' => $subtask['time_spent'] + $time_spent, 'task_id' => $subtask['task_id'], @@ -359,7 +272,7 @@ class SubtaskTimeTracking extends Base $values = $this->calculateSubtaskTime($task_id); return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('id', $task_id) ->update($values); } @@ -374,7 +287,7 @@ class SubtaskTimeTracking extends Base public function calculateSubtaskTime($task_id) { return $this->db - ->table(Subtask::TABLE) + ->table(SubtaskModel::TABLE) ->eq('task_id', $task_id) ->columns( 'SUM(time_spent) AS time_spent', diff --git a/sources/app/Model/Swimlane.php b/sources/app/Model/SwimlaneModel.php similarity index 90% rename from sources/app/Model/Swimlane.php rename to sources/app/Model/SwimlaneModel.php index 721f20d..f20bfa2 100644 --- a/sources/app/Model/Swimlane.php +++ b/sources/app/Model/SwimlaneModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Swimlanes * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Swimlane extends Base +class SwimlaneModel extends Base { /** * SQL table name @@ -87,6 +89,24 @@ class Swimlane extends Base ->findOne(); } + /** + * Get first active swimlane for a project + * + * @access public + * @param integer $project_id + * @return array|null + */ + public function getFirstActiveSwimlane($project_id) + { + $swimlanes = $this->getSwimlanes($project_id); + + if (empty($swimlanes)) { + return null; + } + + return $swimlanes[0]; + } + /** * Get default swimlane properties * @@ -97,7 +117,7 @@ class Swimlane extends Base public function getDefault($project_id) { $result = $this->db - ->table(Project::TABLE) + ->table(ProjectModel::TABLE) ->eq('id', $project_id) ->columns('id', 'default_swimlane', 'show_default_swimlane') ->findOne(); @@ -166,18 +186,18 @@ class Swimlane extends Base ->orderBy('position', 'asc') ->findAll(); - $default_swimlane = $this->db - ->table(Project::TABLE) + $defaultSwimlane = $this->db + ->table(ProjectModel::TABLE) ->eq('id', $project_id) ->eq('show_default_swimlane', 1) ->findOneColumn('default_swimlane'); - if ($default_swimlane) { - if ($default_swimlane === 'Default swimlane') { - $default_swimlane = t($default_swimlane); + if ($defaultSwimlane) { + if ($defaultSwimlane === 'Default swimlane') { + $defaultSwimlane = t($defaultSwimlane); } - array_unshift($swimlanes, array('id' => 0, 'name' => $default_swimlane)); + array_unshift($swimlanes, array('id' => 0, 'name' => $defaultSwimlane)); } return $swimlanes; @@ -195,7 +215,7 @@ class Swimlane extends Base public function getList($project_id, $prepend = false, $only_active = false) { $swimlanes = array(); - $default = $this->db->table(Project::TABLE)->eq('id', $project_id)->eq('show_default_swimlane', 1)->findOneColumn('default_swimlane'); + $default = $this->db->table(ProjectModel::TABLE)->eq('id', $project_id)->eq('show_default_swimlane', 1)->findOneColumn('default_swimlane'); if ($prepend) { $swimlanes[-1] = t('All swimlanes'); @@ -222,11 +242,12 @@ class Swimlane extends Base */ public function create($values) { - if (! $this->project->exists($values['project_id'])) { + if (! $this->projectModel->exists($values['project_id'])) { return 0; } + $values['position'] = $this->getLastPosition($values['project_id']); - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** @@ -254,7 +275,7 @@ class Swimlane extends Base public function updateDefault(array $values) { return $this->db - ->table(Project::TABLE) + ->table(ProjectModel::TABLE) ->eq('id', $values['id']) ->update(array( 'default_swimlane' => $values['default_swimlane'], @@ -272,7 +293,7 @@ class Swimlane extends Base public function enableDefault($project_id) { return $this->db - ->table(Project::TABLE) + ->table(ProjectModel::TABLE) ->eq('id', $project_id) ->update(array( 'show_default_swimlane' => 1, @@ -289,7 +310,7 @@ class Swimlane extends Base public function disableDefault($project_id) { return $this->db - ->table(Project::TABLE) + ->table(ProjectModel::TABLE) ->eq('id', $project_id) ->update(array( 'show_default_swimlane' => 0, @@ -370,7 +391,7 @@ class Swimlane extends Base $this->db->startTransaction(); // Tasks should not be assigned anymore to this swimlane - $this->db->table(Task::TABLE)->eq('swimlane_id', $swimlane_id)->update(array('swimlane_id' => 0)); + $this->db->table(TaskModel::TABLE)->eq('swimlane_id', $swimlane_id)->update(array('swimlane_id' => 0)); if (! $this->db->table(self::TABLE)->eq('id', $swimlane_id)->remove()) { $this->db->cancelTransaction(); diff --git a/sources/app/Model/TagDuplicationModel.php b/sources/app/Model/TagDuplicationModel.php new file mode 100644 index 0000000..fb0d817 --- /dev/null +++ b/sources/app/Model/TagDuplicationModel.php @@ -0,0 +1,87 @@ +tagModel->getAllByProject($src_project_id); + $results = array(); + + foreach ($tags as $tag) { + $results[] = $this->tagModel->create($dst_project_id, $tag['name']); + } + + return ! in_array(false, $results, true); + } + + /** + * Link tags to the new tasks + * + * @access public + * @param integer $src_task_id + * @param integer $dst_task_id + * @param integer $dst_project_id + */ + public function duplicateTaskTagsToAnotherProject($src_task_id, $dst_task_id, $dst_project_id) + { + $tags = $this->taskTagModel->getTagsByTask($src_task_id); + + foreach ($tags as $tag) { + $tag_id = $this->tagModel->getIdByName($dst_project_id, $tag['name']); + + if ($tag_id) { + $this->taskTagModel->associateTag($dst_task_id, $tag_id); + } + } + } + + /** + * Duplicate tags to the new task + * + * @access public + * @param integer $src_task_id + * @param integer $dst_task_id + */ + public function duplicateTaskTags($src_task_id, $dst_task_id) + { + $tags = $this->taskTagModel->getTagsByTask($src_task_id); + + foreach ($tags as $tag) { + $this->taskTagModel->associateTag($dst_task_id, $tag['id']); + } + } + + /** + * Remove tags that are not available in destination project + * + * @access public + * @param integer $task_id + * @param integer $dst_project_id + */ + public function syncTaskTagsToAnotherProject($task_id, $dst_project_id) + { + $tag_ids = $this->taskTagModel->getTagIdsByTaskNotAvailableInProject($task_id, $dst_project_id); + + foreach ($tag_ids as $tag_id) { + $this->taskTagModel->dissociateTag($task_id, $tag_id); + } + } +} diff --git a/sources/app/Model/TagModel.php b/sources/app/Model/TagModel.php new file mode 100644 index 0000000..e85c5a8 --- /dev/null +++ b/sources/app/Model/TagModel.php @@ -0,0 +1,180 @@ +db->table(self::TABLE)->asc('name')->findAll(); + } + + /** + * Get all tags by project + * + * @access public + * @param integer $project_id + * @return array + */ + public function getAllByProject($project_id) + { + return $this->db->table(self::TABLE)->eq('project_id', $project_id)->asc('name')->findAll(); + } + + /** + * Get assignable tags for a project + * + * @access public + * @param integer $project_id + * @return array + */ + public function getAssignableList($project_id) + { + return $this->db->hashtable(self::TABLE) + ->beginOr() + ->eq('project_id', $project_id) + ->eq('project_id', 0) + ->closeOr() + ->asc('name') + ->getAll('id', 'name'); + } + + /** + * Get one tag + * + * @access public + * @param integer $tag_id + * @return array|null + */ + public function getById($tag_id) + { + return $this->db->table(self::TABLE)->eq('id', $tag_id)->findOne(); + } + + /** + * Get tag id from tag name + * + * @access public + * @param int $project_id + * @param string $tag + * @return integer + */ + public function getIdByName($project_id, $tag) + { + return $this->db + ->table(self::TABLE) + ->beginOr() + ->eq('project_id', 0) + ->eq('project_id', $project_id) + ->closeOr() + ->ilike('name', $tag) + ->asc('project_id') + ->findOneColumn('id'); + } + + /** + * Return true if the tag exists + * + * @access public + * @param integer $project_id + * @param string $tag + * @param integer $tag_id + * @return boolean + */ + public function exists($project_id, $tag, $tag_id = 0) + { + return $this->db + ->table(self::TABLE) + ->neq('id', $tag_id) + ->beginOr() + ->eq('project_id', 0) + ->eq('project_id', $project_id) + ->closeOr() + ->ilike('name', $tag) + ->asc('project_id') + ->exists(); + } + + /** + * Return tag id and create a new tag if necessary + * + * @access public + * @param int $project_id + * @param string $tag + * @return bool|int + */ + public function findOrCreateTag($project_id, $tag) + { + $tag_id = $this->getIdByName($project_id, $tag); + + if (empty($tag_id)) { + $tag_id = $this->create($project_id, $tag); + } + + return $tag_id; + } + + /** + * Add a new tag + * + * @access public + * @param int $project_id + * @param string $tag + * @return bool|int + */ + public function create($project_id, $tag) + { + return $this->db->table(self::TABLE)->persist(array( + 'project_id' => $project_id, + 'name' => $tag, + )); + } + + /** + * Update a tag + * + * @access public + * @param integer $tag_id + * @param string $tag + * @return bool + */ + public function update($tag_id, $tag) + { + return $this->db->table(self::TABLE)->eq('id', $tag_id)->update(array( + 'name' => $tag, + )); + } + + /** + * Remove a tag + * + * @access public + * @param integer $tag_id + * @return bool + */ + public function remove($tag_id) + { + return $this->db->table(self::TABLE)->eq('id', $tag_id)->remove(); + } +} diff --git a/sources/app/Model/Task.php b/sources/app/Model/Task.php deleted file mode 100644 index f8b41b9..0000000 --- a/sources/app/Model/Task.php +++ /dev/null @@ -1,223 +0,0 @@ -taskFinder->exists($task_id)) { - return false; - } - - $this->taskFile->removeAll($task_id); - - return $this->db->table(self::TABLE)->eq('id', $task_id)->remove(); - } - - /** - * Get a the task id from a text - * - * Example: "Fix bug #1234" will return 1234 - * - * @access public - * @param string $message Text - * @return integer - */ - public function getTaskIdFromText($message) - { - if (preg_match('!#(\d+)!i', $message, $matches) && isset($matches[1])) { - return $matches[1]; - } - - return 0; - } - - /** - * Return the list user selectable recurrence status - * - * @access public - * @return array - */ - public function getRecurrenceStatusList() - { - return array( - Task::RECURRING_STATUS_NONE => t('No'), - Task::RECURRING_STATUS_PENDING => t('Yes'), - ); - } - - /** - * Return the list recurrence triggers - * - * @access public - * @return array - */ - public function getRecurrenceTriggerList() - { - return array( - Task::RECURRING_TRIGGER_FIRST_COLUMN => t('When task is moved from first column'), - Task::RECURRING_TRIGGER_LAST_COLUMN => t('When task is moved to last column'), - Task::RECURRING_TRIGGER_CLOSE => t('When task is closed'), - ); - } - - /** - * Return the list options to calculate recurrence due date - * - * @access public - * @return array - */ - public function getRecurrenceBasedateList() - { - return array( - Task::RECURRING_BASEDATE_DUEDATE => t('Existing due date'), - Task::RECURRING_BASEDATE_TRIGGERDATE => t('Action date'), - ); - } - - /** - * Return the list recurrence timeframes - * - * @access public - * @return array - */ - public function getRecurrenceTimeframeList() - { - return array( - Task::RECURRING_TIMEFRAME_DAYS => t('Day(s)'), - Task::RECURRING_TIMEFRAME_MONTHS => t('Month(s)'), - Task::RECURRING_TIMEFRAME_YEARS => t('Year(s)'), - ); - } - - /** - * Get task progress based on the column position - * - * @access public - * @param array $task - * @param array $columns - * @return integer - */ - public function getProgress(array $task, array $columns) - { - if ($task['is_active'] == self::STATUS_CLOSED) { - return 100; - } - - $position = 0; - - foreach ($columns as $column_id => $column_title) { - if ($column_id == $task['column_id']) { - break; - } - - $position++; - } - - return round(($position * 100) / count($columns), 1); - } - - /** - * Helper method to duplicate all tasks to another project - * - * @access public - * @param integer $src_project_id - * @param integer $dst_project_id - * @return boolean - */ - public function duplicate($src_project_id, $dst_project_id) - { - $task_ids = $this->taskFinder->getAllIds($src_project_id, array(Task::STATUS_OPEN, Task::STATUS_CLOSED)); - - foreach ($task_ids as $task_id) { - if (! $this->taskDuplication->duplicateToProject($task_id, $dst_project_id)) { - return false; - } - } - - return true; - } -} diff --git a/sources/app/Model/TaskAnalytic.php b/sources/app/Model/TaskAnalyticModel.php similarity index 86% rename from sources/app/Model/TaskAnalytic.php rename to sources/app/Model/TaskAnalyticModel.php index cff5674..3d6fe8a 100644 --- a/sources/app/Model/TaskAnalytic.php +++ b/sources/app/Model/TaskAnalyticModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Task Analytic * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskAnalytic extends Base +class TaskAnalyticModel extends Base { /** * Get the time between date_creation and date_completed or now if empty @@ -48,8 +50,8 @@ class TaskAnalytic extends Base public function getTimeSpentByColumn(array $task) { $result = array(); - $columns = $this->column->getList($task['project_id']); - $sums = $this->transition->getTimeSpentByTask($task['id']); + $columns = $this->columnModel->getList($task['project_id']); + $sums = $this->transitionModel->getTimeSpentByTask($task['id']); foreach ($columns as $column_id => $column_title) { $time_spent = isset($sums[$column_id]) ? $sums[$column_id] : 0; diff --git a/sources/app/Model/TaskCreation.php b/sources/app/Model/TaskCreationModel.php similarity index 57% rename from sources/app/Model/TaskCreation.php rename to sources/app/Model/TaskCreationModel.php index 2d2e550..cd70a02 100644 --- a/sources/app/Model/TaskCreation.php +++ b/sources/app/Model/TaskCreationModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\TaskEvent; /** * Task Creation * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskCreation extends Base +class TaskCreationModel extends Base { /** * Create a task @@ -21,18 +22,24 @@ class TaskCreation extends Base */ public function create(array $values) { - if (! $this->project->exists($values['project_id'])) { - return 0; + $position = empty($values['position']) ? 0 : $values['position']; + $tags = array(); + + if (isset($values['tags'])) { + $tags = $values['tags']; + unset($values['tags']); } - $position = empty($values['position']) ? 0 : $values['position']; - $this->prepare($values); - $task_id = $this->persist(Task::TABLE, $values); + $task_id = $this->db->table(TaskModel::TABLE)->persist($values); if ($task_id !== false) { if ($position > 0 && $values['position'] > 1) { - $this->taskPosition->movePosition($values['project_id'], $task_id, $values['column_id'], $position, $values['swimlane_id'], false); + $this->taskPositionModel->movePosition($values['project_id'], $task_id, $values['column_id'], $position, $values['swimlane_id'], false); + } + + if (! empty($tags)) { + $this->taskTagModel->save($values['project_id'], $task_id, $tags); } $this->fireEvents($task_id, $values); @@ -53,14 +60,14 @@ class TaskCreation extends Base $values = $this->dateParser->convert($values, array('date_started'), true); $this->helper->model->removeFields($values, array('another_task')); - $this->helper->model->resetFields($values, array('date_started', 'creator_id', 'owner_id', 'swimlane_id', 'date_due', 'score', 'category_id', 'time_estimated')); + $this->helper->model->resetFields($values, array('creator_id', 'owner_id', 'swimlane_id', 'date_due', 'date_started', 'score', 'category_id', 'time_estimated', 'time_spent')); if (empty($values['column_id'])) { - $values['column_id'] = $this->column->getFirstColumnId($values['project_id']); + $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']); } if (empty($values['color_id'])) { - $values['color_id'] = $this->color->getDefaultColor(); + $values['color_id'] = $this->colorModel->getDefaultColor(); } if (empty($values['title'])) { @@ -75,7 +82,7 @@ class TaskCreation extends Base $values['date_creation'] = time(); $values['date_modification'] = $values['date_creation']; $values['date_moved'] = $values['date_creation']; - $values['position'] = $this->taskFinder->countByColumnAndSwimlaneId($values['project_id'], $values['column_id'], $values['swimlane_id']) + 1; + $values['position'] = $this->taskFinderModel->countByColumnAndSwimlaneId($values['project_id'], $values['column_id'], $values['swimlane_id']) + 1; } /** @@ -89,14 +96,14 @@ class TaskCreation extends Base { $event = new TaskEvent(array('task_id' => $task_id) + $values); - $this->logger->debug('Event fired: '.Task::EVENT_CREATE_UPDATE); - $this->logger->debug('Event fired: '.Task::EVENT_CREATE); + $this->logger->debug('Event fired: '.TaskModel::EVENT_CREATE_UPDATE); + $this->logger->debug('Event fired: '.TaskModel::EVENT_CREATE); - $this->dispatcher->dispatch(Task::EVENT_CREATE_UPDATE, $event); - $this->dispatcher->dispatch(Task::EVENT_CREATE, $event); + $this->dispatcher->dispatch(TaskModel::EVENT_CREATE_UPDATE, $event); + $this->dispatcher->dispatch(TaskModel::EVENT_CREATE, $event); if (! empty($values['description'])) { - $this->userMention->fireEvents($values['description'], Task::EVENT_USER_MENTION, $event); + $this->userMentionModel->fireEvents($values['description'], TaskModel::EVENT_USER_MENTION, $event); } } } diff --git a/sources/app/Model/TaskDuplication.php b/sources/app/Model/TaskDuplication.php deleted file mode 100644 index ebdd4d2..0000000 --- a/sources/app/Model/TaskDuplication.php +++ /dev/null @@ -1,269 +0,0 @@ -save($task_id, $this->copyFields($task_id)); - } - - /** - * Duplicate recurring task - * - * @access public - * @param integer $task_id Task id - * @return boolean|integer Recurrence task id - */ - public function duplicateRecurringTask($task_id) - { - $values = $this->copyFields($task_id); - - if ($values['recurrence_status'] == Task::RECURRING_STATUS_PENDING) { - $values['recurrence_parent'] = $task_id; - $values['column_id'] = $this->column->getFirstColumnId($values['project_id']); - $this->calculateRecurringTaskDueDate($values); - - $recurring_task_id = $this->save($task_id, $values); - - if ($recurring_task_id > 0) { - $parent_update = $this->db - ->table(Task::TABLE) - ->eq('id', $task_id) - ->update(array( - 'recurrence_status' => Task::RECURRING_STATUS_PROCESSED, - 'recurrence_child' => $recurring_task_id, - )); - - if ($parent_update) { - return $recurring_task_id; - } - } - } - - return false; - } - - /** - * Duplicate a task to another project - * - * @access public - * @param integer $task_id - * @param integer $project_id - * @param integer $swimlane_id - * @param integer $column_id - * @param integer $category_id - * @param integer $owner_id - * @return boolean|integer - */ - public function duplicateToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null) - { - $values = $this->copyFields($task_id); - $values['project_id'] = $project_id; - $values['column_id'] = $column_id !== null ? $column_id : $values['column_id']; - $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id']; - $values['category_id'] = $category_id !== null ? $category_id : $values['category_id']; - $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id']; - - $this->checkDestinationProjectValues($values); - - return $this->save($task_id, $values); - } - - /** - * Move a task to another project - * - * @access public - * @param integer $task_id - * @param integer $project_id - * @param integer $swimlane_id - * @param integer $column_id - * @param integer $category_id - * @param integer $owner_id - * @return boolean - */ - public function moveToProject($task_id, $project_id, $swimlane_id = null, $column_id = null, $category_id = null, $owner_id = null) - { - $task = $this->taskFinder->getById($task_id); - - $values = array(); - $values['is_active'] = 1; - $values['project_id'] = $project_id; - $values['column_id'] = $column_id !== null ? $column_id : $task['column_id']; - $values['position'] = $this->taskFinder->countByColumnId($project_id, $values['column_id']) + 1; - $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id']; - $values['category_id'] = $category_id !== null ? $category_id : $task['category_id']; - $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id']; - - $this->checkDestinationProjectValues($values); - - if ($this->db->table(Task::TABLE)->eq('id', $task['id'])->update($values)) { - $this->container['dispatcher']->dispatch( - Task::EVENT_MOVE_PROJECT, - new TaskEvent(array_merge($task, $values, array('task_id' => $task['id']))) - ); - } - - return true; - } - - /** - * Check if the assignee and the category are available in the destination project - * - * @access public - * @param array $values - * @return array - */ - public function checkDestinationProjectValues(array &$values) - { - // Check if the assigned user is allowed for the destination project - if ($values['owner_id'] > 0 && ! $this->projectPermission->isUserAllowed($values['project_id'], $values['owner_id'])) { - $values['owner_id'] = 0; - } - - // Check if the category exists for the destination project - if ($values['category_id'] > 0) { - $values['category_id'] = $this->category->getIdByName( - $values['project_id'], - $this->category->getNameById($values['category_id']) - ); - } - - // Check if the swimlane exists for the destination project - if ($values['swimlane_id'] > 0) { - $values['swimlane_id'] = $this->swimlane->getIdByName( - $values['project_id'], - $this->swimlane->getNameById($values['swimlane_id']) - ); - } - - // Check if the column exists for the destination project - if ($values['column_id'] > 0) { - $values['column_id'] = $this->column->getColumnIdByTitle( - $values['project_id'], - $this->column->getColumnTitleById($values['column_id']) - ); - - $values['column_id'] = $values['column_id'] ?: $this->column->getFirstColumnId($values['project_id']); - } - - return $values; - } - - /** - * Calculate new due date for new recurrence task - * - * @access public - * @param array $values Task fields - */ - public function calculateRecurringTaskDueDate(array &$values) - { - if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) { - if ($values['recurrence_basedate'] == Task::RECURRING_BASEDATE_TRIGGERDATE) { - $values['date_due'] = time(); - } - - $factor = abs($values['recurrence_factor']); - $subtract = $values['recurrence_factor'] < 0; - - switch ($values['recurrence_timeframe']) { - case Task::RECURRING_TIMEFRAME_MONTHS: - $interval = 'P' . $factor . 'M'; - break; - case Task::RECURRING_TIMEFRAME_YEARS: - $interval = 'P' . $factor . 'Y'; - break; - default: - $interval = 'P' . $factor . 'D'; - } - - $date_due = new DateTime(); - $date_due->setTimestamp($values['date_due']); - - $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval)); - - $values['date_due'] = $date_due->getTimestamp(); - } - } - - /** - * Duplicate fields for the new task - * - * @access private - * @param integer $task_id Task id - * @return array - */ - private function copyFields($task_id) - { - $task = $this->taskFinder->getById($task_id); - $values = array(); - - foreach ($this->fields_to_duplicate as $field) { - $values[$field] = $task[$field]; - } - - return $values; - } - - /** - * Create the new task and duplicate subtasks - * - * @access private - * @param integer $task_id Task id - * @param array $values Form values - * @return boolean|integer - */ - private function save($task_id, array $values) - { - $new_task_id = $this->taskCreation->create($values); - - if ($new_task_id) { - $this->subtask->duplicate($task_id, $new_task_id); - } - - return $new_task_id; - } -} diff --git a/sources/app/Model/TaskDuplicationModel.php b/sources/app/Model/TaskDuplicationModel.php new file mode 100644 index 0000000..c907965 --- /dev/null +++ b/sources/app/Model/TaskDuplicationModel.php @@ -0,0 +1,145 @@ +save($task_id, $this->copyFields($task_id)); + + if ($new_task_id !== false) { + $this->tagDuplicationModel->duplicateTaskTags($task_id, $new_task_id); + } + + return $new_task_id; + } + + /** + * Check if the assignee and the category are available in the destination project + * + * @access public + * @param array $values + * @return array + */ + public function checkDestinationProjectValues(array &$values) + { + // Check if the assigned user is allowed for the destination project + if ($values['owner_id'] > 0 && ! $this->projectPermissionModel->isUserAllowed($values['project_id'], $values['owner_id'])) { + $values['owner_id'] = 0; + } + + // Check if the category exists for the destination project + if ($values['category_id'] > 0) { + $values['category_id'] = $this->categoryModel->getIdByName( + $values['project_id'], + $this->categoryModel->getNameById($values['category_id']) + ); + } + + // Check if the swimlane exists for the destination project + if ($values['swimlane_id'] > 0) { + $values['swimlane_id'] = $this->swimlaneModel->getIdByName( + $values['project_id'], + $this->swimlaneModel->getNameById($values['swimlane_id']) + ); + } + + // Check if the column exists for the destination project + if ($values['column_id'] > 0) { + $values['column_id'] = $this->columnModel->getColumnIdByTitle( + $values['project_id'], + $this->columnModel->getColumnTitleById($values['column_id']) + ); + + $values['column_id'] = $values['column_id'] ?: $this->columnModel->getFirstColumnId($values['project_id']); + } + + // Check if priority exists for destination project + $values['priority'] = $this->projectTaskPriorityModel->getPriorityForProject( + $values['project_id'], + empty($values['priority']) ? 0 : $values['priority'] + ); + + return $values; + } + + /** + * Duplicate fields for the new task + * + * @access protected + * @param integer $task_id Task id + * @return array + */ + protected function copyFields($task_id) + { + $task = $this->taskFinderModel->getById($task_id); + $values = array(); + + foreach ($this->fieldsToDuplicate as $field) { + $values[$field] = $task[$field]; + } + + return $values; + } + + /** + * Create the new task and duplicate subtasks + * + * @access protected + * @param integer $task_id Task id + * @param array $values Form values + * @return boolean|integer + */ + protected function save($task_id, array $values) + { + $new_task_id = $this->taskCreationModel->create($values); + + if ($new_task_id !== false) { + $this->subtaskModel->duplicate($task_id, $new_task_id); + } + + return $new_task_id; + } +} diff --git a/sources/app/Model/TaskExternalLink.php b/sources/app/Model/TaskExternalLinkModel.php similarity index 85% rename from sources/app/Model/TaskExternalLink.php rename to sources/app/Model/TaskExternalLinkModel.php index f2c756b..220b9c6 100644 --- a/sources/app/Model/TaskExternalLink.php +++ b/sources/app/Model/TaskExternalLinkModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Task External Link Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskExternalLink extends Base +class TaskExternalLinkModel extends Base { /** * SQL table name @@ -29,10 +31,10 @@ class TaskExternalLink extends Base $types = $this->externalLinkManager->getTypes(); $links = $this->db->table(self::TABLE) - ->columns(self::TABLE.'.*', User::TABLE.'.name AS creator_name', User::TABLE.'.username AS creator_username') + ->columns(self::TABLE.'.*', UserModel::TABLE.'.name AS creator_name', UserModel::TABLE.'.username AS creator_username') ->eq('task_id', $task_id) ->asc('title') - ->join(User::TABLE, 'id', 'creator_id') + ->join(UserModel::TABLE, 'id', 'creator_id') ->findAll(); foreach ($links as &$link) { @@ -69,7 +71,7 @@ class TaskExternalLink extends Base $values['date_creation'] = time(); $values['date_modification'] = $values['date_creation']; - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** diff --git a/sources/app/Model/TaskFile.php b/sources/app/Model/TaskFile.php deleted file mode 100644 index 45a3b97..0000000 --- a/sources/app/Model/TaskFile.php +++ /dev/null @@ -1,54 +0,0 @@ -helper->dt->datetime(time())).'.png'; - return $this->uploadContent($task_id, $original_filename, $blob); - } -} diff --git a/sources/app/Model/TaskFileModel.php b/sources/app/Model/TaskFileModel.php new file mode 100644 index 0000000..7603019 --- /dev/null +++ b/sources/app/Model/TaskFileModel.php @@ -0,0 +1,104 @@ +db + ->table(self::TABLE) + ->eq(self::TABLE.'.id', $file_id) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->findOneColumn(TaskModel::TABLE . '.project_id') ?: 0; + } + + /** + * Handle screenshot upload + * + * @access public + * @param integer $task_id Task id + * @param string $blob Base64 encoded image + * @return bool|integer + */ + public function uploadScreenshot($task_id, $blob) + { + $original_filename = e('Screenshot taken %s', $this->helper->dt->datetime(time())).'.png'; + return $this->uploadContent($task_id, $original_filename, $blob); + } +} diff --git a/sources/app/Model/TaskFilter.php b/sources/app/Model/TaskFilter.php deleted file mode 100644 index 1883298..0000000 --- a/sources/app/Model/TaskFilter.php +++ /dev/null @@ -1,745 +0,0 @@ - 'filterByAssignee', - 'T_COLOR' => 'filterByColors', - 'T_DUE' => 'filterByDueDate', - 'T_UPDATED' => 'filterByModificationDate', - 'T_CREATED' => 'filterByCreationDate', - 'T_TITLE' => 'filterByTitle', - 'T_STATUS' => 'filterByStatusName', - 'T_DESCRIPTION' => 'filterByDescription', - 'T_CATEGORY' => 'filterByCategoryName', - 'T_PROJECT' => 'filterByProjectName', - 'T_COLUMN' => 'filterByColumnName', - 'T_REFERENCE' => 'filterByReference', - 'T_SWIMLANE' => 'filterBySwimlaneName', - 'T_LINK' => 'filterByLinkName', - ); - - /** - * Query - * - * @access public - * @var \PicoDb\Table - */ - public $query; - - /** - * Apply filters according to the search input - * - * @access public - * @param string $input - * @return TaskFilter - */ - public function search($input) - { - $tree = $this->lexer->map($this->lexer->tokenize($input)); - $this->query = $this->taskFinder->getExtendedQuery(); - - if (empty($tree)) { - $this->filterByTitle($input); - } - - foreach ($tree as $filter => $value) { - $method = $this->filters[$filter]; - $this->$method($value); - } - - return $this; - } - - /** - * Create a new query - * - * @access public - * @return TaskFilter - */ - public function create() - { - $this->query = $this->db->table(Task::TABLE); - $this->query->left(User::TABLE, 'ua', 'id', Task::TABLE, 'owner_id'); - $this->query->left(User::TABLE, 'uc', 'id', Task::TABLE, 'creator_id'); - - $this->query->columns( - Task::TABLE.'.*', - 'ua.email AS assignee_email', - 'ua.name AS assignee_name', - 'ua.username AS assignee_username', - 'uc.email AS creator_email', - 'uc.username AS creator_username' - ); - - return $this; - } - - /** - * Create a new subtask query - * - * @access public - * @return \PicoDb\Table - */ - public function createSubtaskQuery() - { - return $this->db->table(Subtask::TABLE) - ->columns( - Subtask::TABLE.'.user_id', - Subtask::TABLE.'.task_id', - User::TABLE.'.name', - User::TABLE.'.username' - ) - ->join(User::TABLE, 'id', 'user_id', Subtask::TABLE) - ->neq(Subtask::TABLE.'.status', Subtask::STATUS_DONE); - } - - /** - * Create a new link query - * - * @access public - * @return \PicoDb\Table - */ - public function createLinkQuery() - { - return $this->db->table(TaskLink::TABLE) - ->columns( - TaskLink::TABLE.'.task_id', - Link::TABLE.'.label' - ) - ->join(Link::TABLE, 'id', 'link_id', TaskLink::TABLE); - } - - /** - * Clone the filter - * - * @access public - * @return TaskFilter - */ - public function copy() - { - $filter = new static($this->container); - $filter->query = clone($this->query); - $filter->query->condition = clone($this->query->condition); - return $filter; - } - - /** - * Exclude a list of task_id - * - * @access public - * @param integer[] $task_ids - * @return TaskFilter - */ - public function excludeTasks(array $task_ids) - { - $this->query->notin(Task::TABLE.'.id', $task_ids); - return $this; - } - - /** - * Filter by id - * - * @access public - * @param integer $task_id - * @return TaskFilter - */ - public function filterById($task_id) - { - if ($task_id > 0) { - $this->query->eq(Task::TABLE.'.id', $task_id); - } - - return $this; - } - - /** - * Filter by reference - * - * @access public - * @param string $reference - * @return TaskFilter - */ - public function filterByReference($reference) - { - if (! empty($reference)) { - $this->query->eq(Task::TABLE.'.reference', $reference); - } - - return $this; - } - - /** - * Filter by title - * - * @access public - * @param string $title - * @return TaskFilter - */ - public function filterByDescription($title) - { - $this->query->ilike(Task::TABLE.'.description', '%'.$title.'%'); - return $this; - } - - /** - * Filter by title or id if the string is like #123 or an integer - * - * @access public - * @param string $title - * @return TaskFilter - */ - public function filterByTitle($title) - { - if (ctype_digit($title) || (strlen($title) > 1 && $title{0} === '#' && ctype_digit(substr($title, 1)))) { - $this->query->beginOr(); - $this->query->eq(Task::TABLE.'.id', str_replace('#', '', $title)); - $this->query->ilike(Task::TABLE.'.title', '%'.$title.'%'); - $this->query->closeOr(); - } else { - $this->query->ilike(Task::TABLE.'.title', '%'.$title.'%'); - } - - return $this; - } - - /** - * Filter by a list of project id - * - * @access public - * @param array $project_ids - * @return TaskFilter - */ - public function filterByProjects(array $project_ids) - { - $this->query->in(Task::TABLE.'.project_id', $project_ids); - return $this; - } - - /** - * Filter by project id - * - * @access public - * @param integer $project_id - * @return TaskFilter - */ - public function filterByProject($project_id) - { - if ($project_id > 0) { - $this->query->eq(Task::TABLE.'.project_id', $project_id); - } - - return $this; - } - - /** - * Filter by project name - * - * @access public - * @param array $values List of project name - * @return TaskFilter - */ - public function filterByProjectName(array $values) - { - $this->query->beginOr(); - - foreach ($values as $project) { - if (ctype_digit($project)) { - $this->query->eq(Task::TABLE.'.project_id', $project); - } else { - $this->query->ilike(Project::TABLE.'.name', $project); - } - } - - $this->query->closeOr(); - } - - /** - * Filter by swimlane name - * - * @access public - * @param array $values List of swimlane name - * @return TaskFilter - */ - public function filterBySwimlaneName(array $values) - { - $this->query->beginOr(); - - foreach ($values as $swimlane) { - if ($swimlane === 'default') { - $this->query->eq(Task::TABLE.'.swimlane_id', 0); - } else { - $this->query->ilike(Swimlane::TABLE.'.name', $swimlane); - $this->query->addCondition(Task::TABLE.'.swimlane_id=0 AND '.Project::TABLE.'.default_swimlane '.$this->db->getDriver()->getOperator('ILIKE')." '$swimlane'"); - } - } - - $this->query->closeOr(); - } - - /** - * Filter by category id - * - * @access public - * @param integer $category_id - * @return TaskFilter - */ - public function filterByCategory($category_id) - { - if ($category_id >= 0) { - $this->query->eq(Task::TABLE.'.category_id', $category_id); - } - - return $this; - } - - /** - * Filter by category - * - * @access public - * @param array $values List of assignees - * @return TaskFilter - */ - public function filterByCategoryName(array $values) - { - $this->query->beginOr(); - - foreach ($values as $category) { - if ($category === 'none') { - $this->query->eq(Task::TABLE.'.category_id', 0); - } else { - $this->query->eq(Category::TABLE.'.name', $category); - } - } - - $this->query->closeOr(); - } - - /** - * Filter by assignee - * - * @access public - * @param integer $owner_id - * @return TaskFilter - */ - public function filterByOwner($owner_id) - { - if ($owner_id >= 0) { - $this->query->eq(Task::TABLE.'.owner_id', $owner_id); - } - - return $this; - } - - /** - * Filter by assignee names - * - * @access public - * @param array $values List of assignees - * @return TaskFilter - */ - public function filterByAssignee(array $values) - { - $this->query->beginOr(); - - foreach ($values as $assignee) { - switch ($assignee) { - case 'me': - $this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId()); - break; - case 'nobody': - $this->query->eq(Task::TABLE.'.owner_id', 0); - break; - default: - $this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%'); - $this->query->ilike(User::TABLE.'.name', '%'.$assignee.'%'); - } - } - - $this->filterBySubtaskAssignee($values); - - $this->query->closeOr(); - - return $this; - } - - /** - * Filter by subtask assignee names - * - * @access public - * @param array $values List of assignees - * @return TaskFilter - */ - public function filterBySubtaskAssignee(array $values) - { - $subtaskQuery = $this->createSubtaskQuery(); - $subtaskQuery->beginOr(); - - foreach ($values as $assignee) { - if ($assignee === 'me') { - $subtaskQuery->eq(Subtask::TABLE.'.user_id', $this->userSession->getId()); - } else { - $subtaskQuery->ilike(User::TABLE.'.username', '%'.$assignee.'%'); - $subtaskQuery->ilike(User::TABLE.'.name', '%'.$assignee.'%'); - } - } - - $subtaskQuery->closeOr(); - - $this->query->in(Task::TABLE.'.id', $subtaskQuery->findAllByColumn('task_id')); - - return $this; - } - - /** - * Filter by color - * - * @access public - * @param string $color_id - * @return TaskFilter - */ - public function filterByColor($color_id) - { - if ($color_id !== '') { - $this->query->eq(Task::TABLE.'.color_id', $color_id); - } - - return $this; - } - - /** - * Filter by colors - * - * @access public - * @param array $colors - * @return TaskFilter - */ - public function filterByColors(array $colors) - { - $this->query->beginOr(); - - foreach ($colors as $color) { - $this->filterByColor($this->color->find($color)); - } - - $this->query->closeOr(); - - return $this; - } - - /** - * Filter by column - * - * @access public - * @param integer $column_id - * @return TaskFilter - */ - public function filterByColumn($column_id) - { - if ($column_id >= 0) { - $this->query->eq(Task::TABLE.'.column_id', $column_id); - } - - return $this; - } - - /** - * Filter by column name - * - * @access public - * @param array $values List of column name - * @return TaskFilter - */ - public function filterByColumnName(array $values) - { - $this->query->beginOr(); - - foreach ($values as $project) { - $this->query->ilike(Column::TABLE.'.title', $project); - } - - $this->query->closeOr(); - } - - /** - * Filter by swimlane - * - * @access public - * @param integer $swimlane_id - * @return TaskFilter - */ - public function filterBySwimlane($swimlane_id) - { - if ($swimlane_id >= 0) { - $this->query->eq(Task::TABLE.'.swimlane_id', $swimlane_id); - } - - return $this; - } - - /** - * Filter by status name - * - * @access public - * @param string $status - * @return TaskFilter - */ - public function filterByStatusName($status) - { - if ($status === 'open' || $status === 'closed') { - $this->filterByStatus($status === 'open' ? Task::STATUS_OPEN : Task::STATUS_CLOSED); - } - - return $this; - } - - /** - * Filter by status - * - * @access public - * @param integer $is_active - * @return TaskFilter - */ - public function filterByStatus($is_active) - { - if ($is_active >= 0) { - $this->query->eq(Task::TABLE.'.is_active', $is_active); - } - - return $this; - } - - /** - * Filter by link - * - * @access public - * @param array $values List of links - * @return TaskFilter - */ - public function filterByLinkName(array $values) - { - $this->query->beginOr(); - - $link_query = $this->createLinkQuery()->in(Link::TABLE.'.label', $values); - $matching_task_ids = $link_query->findAllByColumn('task_id'); - if (empty($matching_task_ids)) { - $this->query->eq(Task::TABLE.'.id', 0); - } else { - $this->query->in(Task::TABLE.'.id', $matching_task_ids); - } - - $this->query->closeOr(); - - return $this; - } - - /** - * Filter by due date - * - * @access public - * @param string $date ISO8601 date format - * @return TaskFilter - */ - public function filterByDueDate($date) - { - $this->query->neq(Task::TABLE.'.date_due', 0); - $this->query->notNull(Task::TABLE.'.date_due'); - return $this->filterWithOperator(Task::TABLE.'.date_due', $date, true); - } - - /** - * Filter by due date (range) - * - * @access public - * @param string $start - * @param string $end - * @return TaskFilter - */ - public function filterByDueDateRange($start, $end) - { - $this->query->gte('date_due', $this->dateParser->getTimestampFromIsoFormat($start)); - $this->query->lte('date_due', $this->dateParser->getTimestampFromIsoFormat($end)); - - return $this; - } - - /** - * Filter by start date (range) - * - * @access public - * @param string $start - * @param string $end - * @return TaskFilter - */ - public function filterByStartDateRange($start, $end) - { - $this->query->addCondition($this->getCalendarCondition( - $this->dateParser->getTimestampFromIsoFormat($start), - $this->dateParser->getTimestampFromIsoFormat($end), - 'date_started', - 'date_completed' - )); - - return $this; - } - - /** - * Filter by creation date - * - * @access public - * @param string $date ISO8601 date format - * @return TaskFilter - */ - public function filterByCreationDate($date) - { - if ($date === 'recently') { - return $this->filterRecentlyDate(Task::TABLE.'.date_creation'); - } - - return $this->filterWithOperator(Task::TABLE.'.date_creation', $date, true); - } - - /** - * Filter by creation date - * - * @access public - * @param string $start - * @param string $end - * @return TaskFilter - */ - public function filterByCreationDateRange($start, $end) - { - $this->query->addCondition($this->getCalendarCondition( - $this->dateParser->getTimestampFromIsoFormat($start), - $this->dateParser->getTimestampFromIsoFormat($end), - 'date_creation', - 'date_completed' - )); - - return $this; - } - - /** - * Filter by modification date - * - * @access public - * @param string $date ISO8601 date format - * @return TaskFilter - */ - public function filterByModificationDate($date) - { - if ($date === 'recently') { - return $this->filterRecentlyDate(Task::TABLE.'.date_modification'); - } - - return $this->filterWithOperator(Task::TABLE.'.date_modification', $date, true); - } - - /** - * Get all results of the filter - * - * @access public - * @return array - */ - public function findAll() - { - return $this->query->asc(Task::TABLE.'.id')->findAll(); - } - - /** - * Get the PicoDb query - * - * @access public - * @return \PicoDb\Table - */ - public function getQuery() - { - return $this->query; - } - - /** - * Get swimlanes and tasks to display the board - * - * @access public - * @return array - */ - public function getBoard($project_id) - { - $tasks = $this->filterByProject($project_id)->query->asc(Task::TABLE.'.position')->findAll(); - - return $this->board->getBoard($project_id, function ($project_id, $column_id, $swimlane_id) use ($tasks) { - return array_filter($tasks, function (array $task) use ($column_id, $swimlane_id) { - return $task['column_id'] == $column_id && $task['swimlane_id'] == $swimlane_id; - }); - }); - } - - /** - * Filter with an operator - * - * @access public - * @param string $field - * @param string $value - * @param boolean $is_date - * @return TaskFilter - */ - private function filterWithOperator($field, $value, $is_date) - { - $operators = array( - '<=' => 'lte', - '>=' => 'gte', - '<' => 'lt', - '>' => 'gt', - ); - - foreach ($operators as $operator => $method) { - if (strpos($value, $operator) === 0) { - $value = substr($value, strlen($operator)); - $this->query->$method($field, $is_date ? $this->dateParser->getTimestampFromIsoFormat($value) : $value); - return $this; - } - } - - if ($is_date) { - $timestamp = $this->dateParser->getTimestampFromIsoFormat($value); - $this->query->gte($field, $timestamp); - $this->query->lte($field, $timestamp + 86399); - } else { - $this->query->eq($field, $value); - } - - return $this; - } - - /** - * Use the board_highlight_period for the "recently" keyword - * - * @access private - * @param string $field - * @return TaskFilter - */ - private function filterRecentlyDate($field) - { - $duration = $this->config->get('board_highlight_period', 0); - - if ($duration > 0) { - $this->query->gte($field, time() - $duration); - } - - return $this; - } -} diff --git a/sources/app/Model/TaskFinder.php b/sources/app/Model/TaskFinderModel.php similarity index 53% rename from sources/app/Model/TaskFinder.php rename to sources/app/Model/TaskFinderModel.php index 7bca228..0e8585e 100644 --- a/sources/app/Model/TaskFinder.php +++ b/sources/app/Model/TaskFinderModel.php @@ -3,14 +3,15 @@ namespace Kanboard\Model; use PDO; +use Kanboard\Core\Base; /** * Task Finder model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskFinder extends Base +class TaskFinderModel extends Base { /** * Get query for project user overview @@ -27,26 +28,27 @@ class TaskFinder extends Base } return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->columns( - Task::TABLE.'.id', - Task::TABLE.'.title', - Task::TABLE.'.date_due', - Task::TABLE.'.date_started', - Task::TABLE.'.project_id', - Task::TABLE.'.color_id', - Task::TABLE.'.time_spent', - Task::TABLE.'.time_estimated', - Project::TABLE.'.name AS project_name', - Column::TABLE.'.title AS column_name', - User::TABLE.'.username AS assignee_username', - User::TABLE.'.name AS assignee_name' + TaskModel::TABLE.'.id', + TaskModel::TABLE.'.title', + TaskModel::TABLE.'.date_due', + TaskModel::TABLE.'.date_started', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.color_id', + TaskModel::TABLE.'.priority', + TaskModel::TABLE.'.time_spent', + TaskModel::TABLE.'.time_estimated', + ProjectModel::TABLE.'.name AS project_name', + ColumnModel::TABLE.'.title AS column_name', + UserModel::TABLE.'.username AS assignee_username', + UserModel::TABLE.'.name AS assignee_name' ) - ->eq(Task::TABLE.'.is_active', $is_active) - ->in(Project::TABLE.'.id', $project_ids) - ->join(Project::TABLE, 'id', 'project_id') - ->join(Column::TABLE, 'id', 'column_id', Task::TABLE) - ->join(User::TABLE, 'id', 'owner_id', Task::TABLE); + ->eq(TaskModel::TABLE.'.is_active', $is_active) + ->in(ProjectModel::TABLE.'.id', $project_ids) + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE) + ->join(UserModel::TABLE, 'id', 'owner_id', TaskModel::TABLE); } /** @@ -59,7 +61,7 @@ class TaskFinder extends Base public function getUserQuery($user_id) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->columns( 'tasks.id', 'tasks.title', @@ -67,14 +69,19 @@ class TaskFinder extends Base 'tasks.date_creation', 'tasks.project_id', 'tasks.color_id', + 'tasks.priority', 'tasks.time_spent', 'tasks.time_estimated', - 'projects.name AS project_name' + 'tasks.is_active', + 'tasks.creator_id', + 'projects.name AS project_name', + 'columns.title AS column_title' ) - ->join(Project::TABLE, 'id', 'project_id') - ->eq(Task::TABLE.'.owner_id', $user_id) - ->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN) - ->eq(Project::TABLE.'.is_active', Project::ACTIVE); + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->join(ColumnModel::TABLE, 'id', 'column_id') + ->eq(TaskModel::TABLE.'.owner_id', $user_id) + ->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_OPEN) + ->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE); } /** @@ -86,15 +93,15 @@ class TaskFinder extends Base public function getExtendedQuery() { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->columns( - '(SELECT COUNT(*) FROM '.Comment::TABLE.' WHERE task_id=tasks.id) AS nb_comments', - '(SELECT COUNT(*) FROM '.TaskFile::TABLE.' WHERE task_id=tasks.id) AS nb_files', - '(SELECT COUNT(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id) AS nb_subtasks', - '(SELECT COUNT(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id AND status=2) AS nb_completed_subtasks', - '(SELECT COUNT(*) FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id) AS nb_links', - '(SELECT COUNT(*) FROM '.TaskExternalLink::TABLE.' WHERE '.TaskExternalLink::TABLE.'.task_id = tasks.id) AS nb_external_links', - '(SELECT DISTINCT 1 FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id AND '.TaskLink::TABLE.'.link_id = 9) AS is_milestone', + '(SELECT COUNT(*) FROM '.CommentModel::TABLE.' WHERE task_id=tasks.id) AS nb_comments', + '(SELECT COUNT(*) FROM '.TaskFileModel::TABLE.' WHERE task_id=tasks.id) AS nb_files', + '(SELECT COUNT(*) FROM '.SubtaskModel::TABLE.' WHERE '.SubtaskModel::TABLE.'.task_id=tasks.id) AS nb_subtasks', + '(SELECT COUNT(*) FROM '.SubtaskModel::TABLE.' WHERE '.SubtaskModel::TABLE.'.task_id=tasks.id AND status=2) AS nb_completed_subtasks', + '(SELECT COUNT(*) FROM '.TaskLinkModel::TABLE.' WHERE '.TaskLinkModel::TABLE.'.task_id = tasks.id) AS nb_links', + '(SELECT COUNT(*) FROM '.TaskExternalLinkModel::TABLE.' WHERE '.TaskExternalLinkModel::TABLE.'.task_id = tasks.id) AS nb_external_links', + '(SELECT DISTINCT 1 FROM '.TaskLinkModel::TABLE.' WHERE '.TaskLinkModel::TABLE.'.task_id = tasks.id AND '.TaskLinkModel::TABLE.'.link_id = 9) AS is_milestone', 'tasks.id', 'tasks.reference', 'tasks.title', @@ -125,43 +132,24 @@ class TaskFinder extends Base 'tasks.recurrence_child', 'tasks.time_estimated', 'tasks.time_spent', - User::TABLE.'.username AS assignee_username', - User::TABLE.'.name AS assignee_name', - User::TABLE.'.email AS assignee_email', - User::TABLE.'.avatar_path AS assignee_avatar_path', - Category::TABLE.'.name AS category_name', - Category::TABLE.'.description AS category_description', - Column::TABLE.'.title AS column_name', - Column::TABLE.'.position AS column_position', - Swimlane::TABLE.'.name AS swimlane_name', - Project::TABLE.'.default_swimlane', - Project::TABLE.'.name AS project_name' + UserModel::TABLE.'.username AS assignee_username', + UserModel::TABLE.'.name AS assignee_name', + UserModel::TABLE.'.email AS assignee_email', + UserModel::TABLE.'.avatar_path AS assignee_avatar_path', + CategoryModel::TABLE.'.name AS category_name', + CategoryModel::TABLE.'.description AS category_description', + ColumnModel::TABLE.'.title AS column_name', + ColumnModel::TABLE.'.position AS column_position', + SwimlaneModel::TABLE.'.name AS swimlane_name', + ProjectModel::TABLE.'.default_swimlane', + ProjectModel::TABLE.'.name AS project_name' ) - ->join(User::TABLE, 'id', 'owner_id', Task::TABLE) - ->join(Category::TABLE, 'id', 'category_id', Task::TABLE) - ->join(Column::TABLE, 'id', 'column_id', Task::TABLE) - ->join(Swimlane::TABLE, 'id', 'swimlane_id', Task::TABLE) - ->join(Project::TABLE, 'id', 'project_id', Task::TABLE); - } - - /** - * Get all tasks shown on the board (sorted by position) - * - * @access public - * @param integer $project_id Project id - * @param integer $column_id Column id - * @param integer $swimlane_id Swimlane id - * @return array - */ - public function getTasksByColumnAndSwimlane($project_id, $column_id, $swimlane_id = 0) - { - return $this->getExtendedQuery() - ->eq(Task::TABLE.'.project_id', $project_id) - ->eq(Task::TABLE.'.column_id', $column_id) - ->eq(Task::TABLE.'.swimlane_id', $swimlane_id) - ->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN) - ->asc(Task::TABLE.'.position') - ->findAll(); + ->join(UserModel::TABLE, 'id', 'owner_id', TaskModel::TABLE) + ->left(UserModel::TABLE, 'uc', 'id', TaskModel::TABLE, 'creator_id') + ->join(CategoryModel::TABLE, 'id', 'category_id', TaskModel::TABLE) + ->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE) + ->join(SwimlaneModel::TABLE, 'id', 'swimlane_id', TaskModel::TABLE) + ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE); } /** @@ -172,12 +160,13 @@ class TaskFinder extends Base * @param integer $status_id Status id * @return array */ - public function getAll($project_id, $status_id = Task::STATUS_OPEN) + public function getAll($project_id, $status_id = TaskModel::STATUS_OPEN) { return $this->db - ->table(Task::TABLE) - ->eq(Task::TABLE.'.project_id', $project_id) - ->eq(Task::TABLE.'.is_active', $status_id) + ->table(TaskModel::TABLE) + ->eq(TaskModel::TABLE.'.project_id', $project_id) + ->eq(TaskModel::TABLE.'.is_active', $status_id) + ->asc(TaskModel::TABLE.'.id') ->findAll(); } @@ -189,13 +178,14 @@ class TaskFinder extends Base * @param array $status * @return array */ - public function getAllIds($project_id, array $status = array(Task::STATUS_OPEN)) + public function getAllIds($project_id, array $status = array(TaskModel::STATUS_OPEN)) { return $this->db - ->table(Task::TABLE) - ->eq(Task::TABLE.'.project_id', $project_id) - ->in(Task::TABLE.'.is_active', $status) - ->findAllByColumn('id'); + ->table(TaskModel::TABLE) + ->eq(TaskModel::TABLE.'.project_id', $project_id) + ->in(TaskModel::TABLE.'.is_active', $status) + ->asc(TaskModel::TABLE.'.id') + ->findAllByColumn(TaskModel::TABLE.'.id'); } /** @@ -206,24 +196,24 @@ class TaskFinder extends Base */ public function getOverdueTasksQuery() { - return $this->db->table(Task::TABLE) + return $this->db->table(TaskModel::TABLE) ->columns( - Task::TABLE.'.id', - Task::TABLE.'.title', - Task::TABLE.'.date_due', - Task::TABLE.'.project_id', - Task::TABLE.'.creator_id', - Task::TABLE.'.owner_id', - Project::TABLE.'.name AS project_name', - User::TABLE.'.username AS assignee_username', - User::TABLE.'.name AS assignee_name' + TaskModel::TABLE.'.id', + TaskModel::TABLE.'.title', + TaskModel::TABLE.'.date_due', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.creator_id', + TaskModel::TABLE.'.owner_id', + ProjectModel::TABLE.'.name AS project_name', + UserModel::TABLE.'.username AS assignee_username', + UserModel::TABLE.'.name AS assignee_name' ) - ->join(Project::TABLE, 'id', 'project_id') - ->join(User::TABLE, 'id', 'owner_id') - ->eq(Project::TABLE.'.is_active', 1) - ->eq(Task::TABLE.'.is_active', 1) - ->neq(Task::TABLE.'.date_due', 0) - ->lte(Task::TABLE.'.date_due', mktime(23, 59, 59)); + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->join(UserModel::TABLE, 'id', 'owner_id') + ->eq(ProjectModel::TABLE.'.is_active', 1) + ->eq(TaskModel::TABLE.'.is_active', 1) + ->neq(TaskModel::TABLE.'.date_due', 0) + ->lte(TaskModel::TABLE.'.date_due', mktime(23, 59, 59)); } /** @@ -246,7 +236,7 @@ class TaskFinder extends Base */ public function getOverdueTasksByProject($project_id) { - return $this->getOverdueTasksQuery()->eq(Task::TABLE.'.project_id', $project_id)->findAll(); + return $this->getOverdueTasksQuery()->eq(TaskModel::TABLE.'.project_id', $project_id)->findAll(); } /** @@ -258,7 +248,7 @@ class TaskFinder extends Base */ public function getOverdueTasksByUser($user_id) { - return $this->getOverdueTasksQuery()->eq(Task::TABLE.'.owner_id', $user_id)->findAll(); + return $this->getOverdueTasksQuery()->eq(TaskModel::TABLE.'.owner_id', $user_id)->findAll(); } /** @@ -270,7 +260,7 @@ class TaskFinder extends Base */ public function getProjectId($task_id) { - return (int) $this->db->table(Task::TABLE)->eq('id', $task_id)->findOneColumn('project_id') ?: 0; + return (int) $this->db->table(TaskModel::TABLE)->eq('id', $task_id)->findOneColumn('project_id') ?: 0; } /** @@ -282,7 +272,7 @@ class TaskFinder extends Base */ public function getById($task_id) { - return $this->db->table(Task::TABLE)->eq('id', $task_id)->findOne(); + return $this->db->table(TaskModel::TABLE)->eq('id', $task_id)->findOne(); } /** @@ -295,7 +285,7 @@ class TaskFinder extends Base */ public function getByReference($project_id, $reference) { - return $this->db->table(Task::TABLE)->eq('project_id', $project_id)->eq('reference', $reference)->findOne(); + return $this->db->table(TaskModel::TABLE)->eq('project_id', $project_id)->eq('reference', $reference)->findOne(); } /** @@ -362,6 +352,28 @@ class TaskFinder extends Base return $rq->fetch(PDO::FETCH_ASSOC); } + /** + * Get iCal query + * + * @access public + * @return \PicoDb\Table + */ + public function getICalQuery() + { + return $this->db->table(TaskModel::TABLE) + ->left(UserModel::TABLE, 'ua', 'id', TaskModel::TABLE, 'owner_id') + ->left(UserModel::TABLE, 'uc', 'id', TaskModel::TABLE, 'creator_id') + ->columns( + TaskModel::TABLE.'.*', + 'ua.email AS assignee_email', + 'ua.name AS assignee_name', + 'ua.username AS assignee_username', + 'uc.email AS creator_email', + 'uc.name AS creator_name', + 'uc.username AS creator_username' + ); + } + /** * Count all tasks for a given project and status * @@ -370,10 +382,10 @@ class TaskFinder extends Base * @param array $status List of status id * @return integer */ - public function countByProjectId($project_id, array $status = array(Task::STATUS_OPEN, Task::STATUS_CLOSED)) + public function countByProjectId($project_id, array $status = array(TaskModel::STATUS_OPEN, TaskModel::STATUS_CLOSED)) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('project_id', $project_id) ->in('is_active', $status) ->count(); @@ -390,7 +402,7 @@ class TaskFinder extends Base public function countByColumnId($project_id, $column_id) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('project_id', $project_id) ->eq('column_id', $column_id) ->eq('is_active', 1) @@ -409,7 +421,7 @@ class TaskFinder extends Base public function countByColumnAndSwimlaneId($project_id, $column_id, $swimlane_id) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('project_id', $project_id) ->eq('column_id', $column_id) ->eq('swimlane_id', $swimlane_id) @@ -426,6 +438,22 @@ class TaskFinder extends Base */ public function exists($task_id) { - return $this->db->table(Task::TABLE)->eq('id', $task_id)->exists(); + return $this->db->table(TaskModel::TABLE)->eq('id', $task_id)->exists(); + } + + /** + * Get project token + * + * @access public + * @param integer $task_id + * @return string + */ + public function getProjectToken($task_id) + { + return $this->db + ->table(TaskModel::TABLE) + ->eq(TaskModel::TABLE.'.id', $task_id) + ->join(ProjectModel::TABLE, 'id', 'project_id') + ->findOneColumn(ProjectModel::TABLE.'.token'); } } diff --git a/sources/app/Model/TaskLink.php b/sources/app/Model/TaskLinkModel.php similarity index 70% rename from sources/app/Model/TaskLink.php rename to sources/app/Model/TaskLinkModel.php index e46ea47..09978ea 100644 --- a/sources/app/Model/TaskLink.php +++ b/sources/app/Model/TaskLinkModel.php @@ -2,16 +2,17 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\TaskLinkEvent; /** * TaskLink model * - * @package model + * @package Kanboard\Model * @author Olivier Maridat * @author Frederic Guillot */ -class TaskLink extends Base +class TaskLinkModel extends Base { /** * SQL table name @@ -27,6 +28,22 @@ class TaskLink extends Base */ const EVENT_CREATE_UPDATE = 'tasklink.create_update'; + /** + * Get projectId from $task_link_id + * + * @access public + * @param integer $task_link_id + * @return integer + */ + public function getProjectId($task_link_id) + { + return $this->db + ->table(self::TABLE) + ->eq(self::TABLE.'.id', $task_link_id) + ->join(TaskModel::TABLE, 'id', 'task_id') + ->findOneColumn(TaskModel::TABLE . '.project_id') ?: 0; + } + /** * Get a task link * @@ -48,7 +65,7 @@ class TaskLink extends Base */ public function getOppositeTaskLink(array $task_link) { - $opposite_link_id = $this->link->getOppositeLinkId($task_link['link_id']); + $opposite_link_id = $this->linkModel->getOppositeLinkId($task_link['link_id']); return $this->db->table(self::TABLE) ->eq('opposite_task_id', $task_link['task_id']) @@ -71,31 +88,31 @@ class TaskLink extends Base ->columns( self::TABLE.'.id', self::TABLE.'.opposite_task_id AS task_id', - Link::TABLE.'.label', - Task::TABLE.'.title', - Task::TABLE.'.is_active', - Task::TABLE.'.project_id', - Task::TABLE.'.column_id', - Task::TABLE.'.color_id', - Task::TABLE.'.time_spent AS task_time_spent', - Task::TABLE.'.time_estimated AS task_time_estimated', - Task::TABLE.'.owner_id AS task_assignee_id', - User::TABLE.'.username AS task_assignee_username', - User::TABLE.'.name AS task_assignee_name', - Column::TABLE.'.title AS column_title', - Project::TABLE.'.name AS project_name' + LinkModel::TABLE.'.label', + TaskModel::TABLE.'.title', + TaskModel::TABLE.'.is_active', + TaskModel::TABLE.'.project_id', + TaskModel::TABLE.'.column_id', + TaskModel::TABLE.'.color_id', + TaskModel::TABLE.'.time_spent AS task_time_spent', + TaskModel::TABLE.'.time_estimated AS task_time_estimated', + TaskModel::TABLE.'.owner_id AS task_assignee_id', + UserModel::TABLE.'.username AS task_assignee_username', + UserModel::TABLE.'.name AS task_assignee_name', + ColumnModel::TABLE.'.title AS column_title', + ProjectModel::TABLE.'.name AS project_name' ) ->eq(self::TABLE.'.task_id', $task_id) - ->join(Link::TABLE, 'id', 'link_id') - ->join(Task::TABLE, 'id', 'opposite_task_id') - ->join(Column::TABLE, 'id', 'column_id', Task::TABLE) - ->join(User::TABLE, 'id', 'owner_id', Task::TABLE) - ->join(Project::TABLE, 'id', 'project_id', Task::TABLE) - ->asc(Link::TABLE.'.id') - ->desc(Column::TABLE.'.position') - ->desc(Task::TABLE.'.is_active') - ->asc(Task::TABLE.'.position') - ->asc(Task::TABLE.'.id') + ->join(LinkModel::TABLE, 'id', 'link_id') + ->join(TaskModel::TABLE, 'id', 'opposite_task_id') + ->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE) + ->join(UserModel::TABLE, 'id', 'owner_id', TaskModel::TABLE) + ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE) + ->asc(LinkModel::TABLE.'.id') + ->desc(ColumnModel::TABLE.'.position') + ->desc(TaskModel::TABLE.'.is_active') + ->asc(TaskModel::TABLE.'.position') + ->asc(TaskModel::TABLE.'.id') ->findAll(); } @@ -131,7 +148,7 @@ class TaskLink extends Base private function fireEvents(array $events) { foreach ($events as $event) { - $event['project_id'] = $this->taskFinder->getProjectId($event['task_id']); + $event['project_id'] = $this->taskFinderModel->getProjectId($event['task_id']); $this->container['dispatcher']->dispatch(self::EVENT_CREATE_UPDATE, new TaskLinkEvent($event)); } } @@ -151,7 +168,7 @@ class TaskLink extends Base $this->db->startTransaction(); // Get opposite link - $opposite_link_id = $this->link->getOppositeLinkId($link_id); + $opposite_link_id = $this->linkModel->getOppositeLinkId($link_id); $values = array( 'task_id' => $task_id, @@ -203,7 +220,7 @@ class TaskLink extends Base $opposite_task_link = $this->getOppositeTaskLink($task_link); // Get opposite link - $opposite_link_id = $this->link->getOppositeLinkId($link_id); + $opposite_link_id = $this->linkModel->getOppositeLinkId($link_id); // Update the original task link $values = array( @@ -247,7 +264,7 @@ class TaskLink extends Base $this->db->startTransaction(); $link = $this->getById($task_link_id); - $link_id = $this->link->getOppositeLinkId($link['link_id']); + $link_id = $this->linkModel->getOppositeLinkId($link['link_id']); $this->db->table(self::TABLE)->eq('id', $task_link_id)->remove(); diff --git a/sources/app/Model/TaskMetadata.php b/sources/app/Model/TaskMetadataModel.php similarity index 55% rename from sources/app/Model/TaskMetadata.php rename to sources/app/Model/TaskMetadataModel.php index 1fd1841..dc3f56e 100644 --- a/sources/app/Model/TaskMetadata.php +++ b/sources/app/Model/TaskMetadataModel.php @@ -5,17 +5,22 @@ namespace Kanboard\Model; /** * Task Metadata * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskMetadata extends Metadata +class TaskMetadataModel extends MetadataModel { /** - * SQL table name + * Get the table * - * @var string + * @abstract + * @access protected + * @return string */ - const TABLE = 'task_has_metadata'; + protected function getTable() + { + return 'task_has_metadata'; + } /** * Define the entity key diff --git a/sources/app/Model/TaskModel.php b/sources/app/Model/TaskModel.php new file mode 100644 index 0000000..5cddb50 --- /dev/null +++ b/sources/app/Model/TaskModel.php @@ -0,0 +1,146 @@ +taskFinderModel->exists($task_id)) { + return false; + } + + $this->taskFileModel->removeAll($task_id); + + return $this->db->table(self::TABLE)->eq('id', $task_id)->remove(); + } + + /** + * Get a the task id from a text + * + * Example: "Fix bug #1234" will return 1234 + * + * @access public + * @param string $message Text + * @return integer + */ + public function getTaskIdFromText($message) + { + if (preg_match('!#(\d+)!i', $message, $matches) && isset($matches[1])) { + return $matches[1]; + } + + return 0; + } + + /** + * Get task progress based on the column position + * + * @access public + * @param array $task + * @param array $columns + * @return integer + */ + public function getProgress(array $task, array $columns) + { + if ($task['is_active'] == self::STATUS_CLOSED) { + return 100; + } + + $position = 0; + + foreach ($columns as $column_id => $column_title) { + if ($column_id == $task['column_id']) { + break; + } + + $position++; + } + + return round(($position * 100) / count($columns), 1); + } +} diff --git a/sources/app/Model/TaskModification.php b/sources/app/Model/TaskModificationModel.php similarity index 70% rename from sources/app/Model/TaskModification.php rename to sources/app/Model/TaskModificationModel.php index a77b78a..be5f53c 100644 --- a/sources/app/Model/TaskModification.php +++ b/sources/app/Model/TaskModificationModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\TaskEvent; /** * Task Modification * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskModification extends Base +class TaskModificationModel extends Base { /** * Update a task @@ -22,10 +23,11 @@ class TaskModification extends Base */ public function update(array $values, $fire_events = true) { - $original_task = $this->taskFinder->getById($values['id']); + $original_task = $this->taskFinderModel->getById($values['id']); + $this->updateTags($values, $original_task); $this->prepare($values); - $result = $this->db->table(Task::TABLE)->eq('id', $original_task['id'])->update($values); + $result = $this->db->table(TaskModel::TABLE)->eq('id', $original_task['id'])->update($values); if ($fire_events && $result) { $this->fireEvents($original_task, $values); @@ -51,10 +53,10 @@ class TaskModification extends Base unset($event_data['changes']['date_modification']); if ($this->isFieldModified('owner_id', $event_data['changes'])) { - $events[] = Task::EVENT_ASSIGNEE_CHANGE; + $events[] = TaskModel::EVENT_ASSIGNEE_CHANGE; } elseif (! empty($event_data['changes'])) { - $events[] = Task::EVENT_CREATE_UPDATE; - $events[] = Task::EVENT_UPDATE; + $events[] = TaskModel::EVENT_CREATE_UPDATE; + $events[] = TaskModel::EVENT_UPDATE; } foreach ($events as $event) { @@ -79,10 +81,10 @@ class TaskModification extends Base /** * Prepare data before task modification * - * @access public - * @param array $values Form values + * @access protected + * @param array $values */ - public function prepare(array &$values) + protected function prepare(array &$values) { $values = $this->dateParser->convert($values, array('date_due')); $values = $this->dateParser->convert($values, array('date_started'), true); @@ -93,4 +95,19 @@ class TaskModification extends Base $values['date_modification'] = time(); } + + /** + * Update tags + * + * @access protected + * @param array $values + * @param array $original_task + */ + protected function updateTags(array &$values, array $original_task) + { + if (isset($values['tags'])) { + $this->taskTagModel->save($original_task['project_id'], $values['id'], $values['tags']); + unset($values['tags']); + } + } } diff --git a/sources/app/Model/TaskPermission.php b/sources/app/Model/TaskPermission.php deleted file mode 100644 index b1e0258..0000000 --- a/sources/app/Model/TaskPermission.php +++ /dev/null @@ -1,34 +0,0 @@ -userSession->isAdmin() || $this->projectUserRole->getUserRole($task['project_id'], $this->userSession->getId()) === Role::PROJECT_MANAGER) { - return true; - } elseif (isset($task['creator_id']) && $task['creator_id'] == $this->userSession->getId()) { - return true; - } - - return false; - } -} diff --git a/sources/app/Model/TaskPosition.php b/sources/app/Model/TaskPositionModel.php similarity index 87% rename from sources/app/Model/TaskPosition.php rename to sources/app/Model/TaskPositionModel.php index 4c9928d..9fdb8f7 100644 --- a/sources/app/Model/TaskPosition.php +++ b/sources/app/Model/TaskPositionModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\TaskEvent; /** * Task Position * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskPosition extends Base +class TaskPositionModel extends Base { /** * Move a task to another column or to another position @@ -30,9 +31,9 @@ class TaskPosition extends Base return false; } - $task = $this->taskFinder->getById($task_id); + $task = $this->taskFinderModel->getById($task_id); - if ($task['is_active'] == Task::STATUS_CLOSED) { + if ($task['is_active'] == TaskModel::STATUS_CLOSED) { return true; } @@ -131,7 +132,7 @@ class TaskPosition extends Base */ private function saveTaskPositions($project_id, $task_id, $position, $column_id, $swimlane_id) { - $tasks_ids = $this->db->table(Task::TABLE) + $tasks_ids = $this->db->table(TaskModel::TABLE) ->eq('is_active', 1) ->eq('swimlane_id', $swimlane_id) ->eq('project_id', $project_id) @@ -168,7 +169,7 @@ class TaskPosition extends Base $now = time(); - return $this->db->table(Task::TABLE)->eq('id', $task_id)->update(array( + return $this->db->table(TaskModel::TABLE)->eq('id', $task_id)->update(array( 'date_moved' => $now, 'date_modification' => $now, )); @@ -186,7 +187,7 @@ class TaskPosition extends Base */ private function saveTaskPosition($task_id, $position, $column_id, $swimlane_id) { - $result = $this->db->table(Task::TABLE)->eq('id', $task_id)->update(array( + $result = $this->db->table(TaskModel::TABLE)->eq('id', $task_id)->update(array( 'position' => $position, 'column_id' => $column_id, 'swimlane_id' => $swimlane_id, @@ -225,14 +226,14 @@ class TaskPosition extends Base ); if ($task['swimlane_id'] != $new_swimlane_id) { - $this->logger->debug('Event fired: '.Task::EVENT_MOVE_SWIMLANE); - $this->dispatcher->dispatch(Task::EVENT_MOVE_SWIMLANE, new TaskEvent($event_data)); + $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_SWIMLANE); + $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_SWIMLANE, new TaskEvent($event_data)); } elseif ($task['column_id'] != $new_column_id) { - $this->logger->debug('Event fired: '.Task::EVENT_MOVE_COLUMN); - $this->dispatcher->dispatch(Task::EVENT_MOVE_COLUMN, new TaskEvent($event_data)); + $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_COLUMN); + $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_COLUMN, new TaskEvent($event_data)); } elseif ($task['position'] != $new_position) { - $this->logger->debug('Event fired: '.Task::EVENT_MOVE_POSITION); - $this->dispatcher->dispatch(Task::EVENT_MOVE_POSITION, new TaskEvent($event_data)); + $this->logger->debug('Event fired: '.TaskModel::EVENT_MOVE_POSITION); + $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_POSITION, new TaskEvent($event_data)); } } } diff --git a/sources/app/Model/TaskProjectDuplicationModel.php b/sources/app/Model/TaskProjectDuplicationModel.php new file mode 100644 index 0000000..8ebed25 --- /dev/null +++ b/sources/app/Model/TaskProjectDuplicationModel.php @@ -0,0 +1,60 @@ +prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id); + $this->checkDestinationProjectValues($values); + $new_task_id = $this->save($task_id, $values); + + if ($new_task_id !== false) { + $this->tagDuplicationModel->duplicateTaskTagsToAnotherProject($task_id, $new_task_id, $project_id); + } + + return $new_task_id; + } + + /** + * Prepare values before duplication + * + * @access protected + * @param integer $task_id + * @param integer $project_id + * @param integer $swimlane_id + * @param integer $column_id + * @param integer $category_id + * @param integer $owner_id + * @return array + */ + protected function prepare($task_id, $project_id, $swimlane_id, $column_id, $category_id, $owner_id) + { + $values = $this->copyFields($task_id); + $values['project_id'] = $project_id; + $values['column_id'] = $column_id !== null ? $column_id : $values['column_id']; + $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $values['swimlane_id']; + $values['category_id'] = $category_id !== null ? $category_id : $values['category_id']; + $values['owner_id'] = $owner_id !== null ? $owner_id : $values['owner_id']; + return $values; + } +} diff --git a/sources/app/Model/TaskProjectMoveModel.php b/sources/app/Model/TaskProjectMoveModel.php new file mode 100644 index 0000000..eda23c0 --- /dev/null +++ b/sources/app/Model/TaskProjectMoveModel.php @@ -0,0 +1,68 @@ +taskFinderModel->getById($task_id); + $values = $this->prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, $task); + + $this->checkDestinationProjectValues($values); + $this->tagDuplicationModel->syncTaskTagsToAnotherProject($task_id, $project_id); + + if ($this->db->table(TaskModel::TABLE)->eq('id', $task['id'])->update($values)) { + $event = new TaskEvent(array_merge($task, $values, array('task_id' => $task['id']))); + $this->dispatcher->dispatch(TaskModel::EVENT_MOVE_PROJECT, $event); + } + + return true; + } + + /** + * Prepare new task values + * + * @access protected + * @param integer $project_id + * @param integer $swimlane_id + * @param integer $column_id + * @param integer $category_id + * @param integer $owner_id + * @param array $task + * @return array + */ + protected function prepare($project_id, $swimlane_id, $column_id, $category_id, $owner_id, array $task) + { + $values = array(); + $values['is_active'] = 1; + $values['project_id'] = $project_id; + $values['column_id'] = $column_id !== null ? $column_id : $task['column_id']; + $values['position'] = $this->taskFinderModel->countByColumnId($project_id, $values['column_id']) + 1; + $values['swimlane_id'] = $swimlane_id !== null ? $swimlane_id : $task['swimlane_id']; + $values['category_id'] = $category_id !== null ? $category_id : $task['category_id']; + $values['owner_id'] = $owner_id !== null ? $owner_id : $task['owner_id']; + $values['priority'] = $task['priority']; + return $values; + } +} diff --git a/sources/app/Model/TaskRecurrenceModel.php b/sources/app/Model/TaskRecurrenceModel.php new file mode 100644 index 0000000..ffe43f8 --- /dev/null +++ b/sources/app/Model/TaskRecurrenceModel.php @@ -0,0 +1,147 @@ + t('No'), + TaskModel::RECURRING_STATUS_PENDING => t('Yes'), + ); + } + + /** + * Return the list recurrence triggers + * + * @access public + * @return array + */ + public function getRecurrenceTriggerList() + { + return array( + TaskModel::RECURRING_TRIGGER_FIRST_COLUMN => t('When task is moved from first column'), + TaskModel::RECURRING_TRIGGER_LAST_COLUMN => t('When task is moved to last column'), + TaskModel::RECURRING_TRIGGER_CLOSE => t('When task is closed'), + ); + } + + /** + * Return the list options to calculate recurrence due date + * + * @access public + * @return array + */ + public function getRecurrenceBasedateList() + { + return array( + TaskModel::RECURRING_BASEDATE_DUEDATE => t('Existing due date'), + TaskModel::RECURRING_BASEDATE_TRIGGERDATE => t('Action date'), + ); + } + + /** + * Return the list recurrence timeframes + * + * @access public + * @return array + */ + public function getRecurrenceTimeframeList() + { + return array( + TaskModel::RECURRING_TIMEFRAME_DAYS => t('Day(s)'), + TaskModel::RECURRING_TIMEFRAME_MONTHS => t('Month(s)'), + TaskModel::RECURRING_TIMEFRAME_YEARS => t('Year(s)'), + ); + } + + /** + * Duplicate recurring task + * + * @access public + * @param integer $task_id Task id + * @return boolean|integer Recurrence task id + */ + public function duplicateRecurringTask($task_id) + { + $values = $this->copyFields($task_id); + + if ($values['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) { + $values['recurrence_parent'] = $task_id; + $values['column_id'] = $this->columnModel->getFirstColumnId($values['project_id']); + $this->calculateRecurringTaskDueDate($values); + + $recurring_task_id = $this->save($task_id, $values); + + if ($recurring_task_id !== false) { + $this->tagDuplicationModel->duplicateTaskTags($task_id, $recurring_task_id); + + $parent_update = $this->db + ->table(TaskModel::TABLE) + ->eq('id', $task_id) + ->update(array( + 'recurrence_status' => TaskModel::RECURRING_STATUS_PROCESSED, + 'recurrence_child' => $recurring_task_id, + )); + + if ($parent_update) { + return $recurring_task_id; + } + } + } + + return false; + } + + /** + * Calculate new due date for new recurrence task + * + * @access public + * @param array $values Task fields + */ + public function calculateRecurringTaskDueDate(array &$values) + { + if (! empty($values['date_due']) && $values['recurrence_factor'] != 0) { + if ($values['recurrence_basedate'] == TaskModel::RECURRING_BASEDATE_TRIGGERDATE) { + $values['date_due'] = time(); + } + + $factor = abs($values['recurrence_factor']); + $subtract = $values['recurrence_factor'] < 0; + + switch ($values['recurrence_timeframe']) { + case TaskModel::RECURRING_TIMEFRAME_MONTHS: + $interval = 'P' . $factor . 'M'; + break; + case TaskModel::RECURRING_TIMEFRAME_YEARS: + $interval = 'P' . $factor . 'Y'; + break; + default: + $interval = 'P' . $factor . 'D'; + } + + $date_due = new DateTime(); + $date_due->setTimestamp($values['date_due']); + + $subtract ? $date_due->sub(new DateInterval($interval)) : $date_due->add(new DateInterval($interval)); + + $values['date_due'] = $date_due->getTimestamp(); + } + } +} diff --git a/sources/app/Model/TaskStatus.php b/sources/app/Model/TaskStatusModel.php similarity index 74% rename from sources/app/Model/TaskStatus.php rename to sources/app/Model/TaskStatusModel.php index 2b90281..4d573f0 100644 --- a/sources/app/Model/TaskStatus.php +++ b/sources/app/Model/TaskStatusModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\TaskEvent; /** * Task Status * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class TaskStatus extends Base +class TaskStatusModel extends Base { /** * Return true if the task is closed @@ -21,7 +22,7 @@ class TaskStatus extends Base */ public function isClosed($task_id) { - return $this->checkStatus($task_id, Task::STATUS_CLOSED); + return $this->checkStatus($task_id, TaskModel::STATUS_CLOSED); } /** @@ -33,7 +34,7 @@ class TaskStatus extends Base */ public function isOpen($task_id) { - return $this->checkStatus($task_id, Task::STATUS_OPEN); + return $this->checkStatus($task_id, TaskModel::STATUS_OPEN); } /** @@ -45,8 +46,8 @@ class TaskStatus extends Base */ public function close($task_id) { - $this->subtask->closeAll($task_id); - return $this->changeStatus($task_id, Task::STATUS_CLOSED, time(), Task::EVENT_CLOSE); + $this->subtaskModel->closeAll($task_id); + return $this->changeStatus($task_id, TaskModel::STATUS_CLOSED, time(), TaskModel::EVENT_CLOSE); } /** @@ -58,7 +59,7 @@ class TaskStatus extends Base */ public function open($task_id) { - return $this->changeStatus($task_id, Task::STATUS_OPEN, 0, Task::EVENT_OPEN); + return $this->changeStatus($task_id, TaskModel::STATUS_OPEN, 0, TaskModel::EVENT_OPEN); } /** @@ -83,7 +84,13 @@ class TaskStatus extends Base */ public function closeTasksBySwimlaneAndColumn($swimlane_id, $column_id) { - $task_ids = $this->db->table(Task::TABLE)->eq('swimlane_id', $swimlane_id)->eq('column_id', $column_id)->findAllByColumn('id'); + $task_ids = $this->db + ->table(TaskModel::TABLE) + ->eq('swimlane_id', $swimlane_id) + ->eq('column_id', $column_id) + ->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_OPEN) + ->findAllByColumn('id'); + $this->closeMultipleTasks($task_ids); } @@ -99,12 +106,12 @@ class TaskStatus extends Base */ private function changeStatus($task_id, $status, $date_completed, $event) { - if (! $this->taskFinder->exists($task_id)) { + if (! $this->taskFinderModel->exists($task_id)) { return false; } $result = $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('id', $task_id) ->update(array( 'is_active' => $status, @@ -114,7 +121,7 @@ class TaskStatus extends Base if ($result) { $this->logger->debug('Event fired: '.$event); - $this->dispatcher->dispatch($event, new TaskEvent(array('task_id' => $task_id) + $this->taskFinder->getById($task_id))); + $this->dispatcher->dispatch($event, new TaskEvent(array('task_id' => $task_id) + $this->taskFinderModel->getById($task_id))); } return $result; @@ -131,7 +138,7 @@ class TaskStatus extends Base private function checkStatus($task_id, $status) { return $this->db - ->table(Task::TABLE) + ->table(TaskModel::TABLE) ->eq('id', $task_id) ->eq('is_active', $status) ->count() === 1; diff --git a/sources/app/Model/TaskTagModel.php b/sources/app/Model/TaskTagModel.php new file mode 100644 index 0000000..0553cc6 --- /dev/null +++ b/sources/app/Model/TaskTagModel.php @@ -0,0 +1,184 @@ +db->table(TagModel::TABLE) + ->eq(self::TABLE.'.task_id', $task_id) + ->notIn(TagModel::TABLE.'.project_id', array(0, $project_id)) + ->join(self::TABLE, 'tag_id', 'id') + ->findAllByColumn(TagModel::TABLE.'.id'); + } + + /** + * Get all tags associated to a task + * + * @access public + * @param integer $task_id + * @return array + */ + public function getTagsByTask($task_id) + { + return $this->db->table(TagModel::TABLE) + ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name') + ->eq(self::TABLE.'.task_id', $task_id) + ->join(self::TABLE, 'tag_id', 'id') + ->findAll(); + } + + /** + * Get all tags associated to a list of tasks + * + * @access public + * @param integer[] $task_ids + * @return array + */ + public function getTagsByTasks($task_ids) + { + if (empty($task_ids)) { + return array(); + } + + $tags = $this->db->table(TagModel::TABLE) + ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name', self::TABLE.'.task_id') + ->in(self::TABLE.'.task_id', $task_ids) + ->join(self::TABLE, 'tag_id', 'id') + ->findAll(); + + return array_column_index($tags, 'task_id'); + } + + /** + * Get dictionary of tags + * + * @access public + * @param integer $task_id + * @return array + */ + public function getList($task_id) + { + $tags = $this->getTagsByTask($task_id); + return array_column($tags, 'name', 'id'); + } + + /** + * Add or update a list of tags to a task + * + * @access public + * @param integer $project_id + * @param integer $task_id + * @param string[] $tags + * @return boolean + */ + public function save($project_id, $task_id, array $tags) + { + $task_tags = $this->getList($task_id); + $tags = array_filter($tags); + + return $this->associateTags($project_id, $task_id, $task_tags, $tags) && + $this->dissociateTags($task_id, $task_tags, $tags); + } + + /** + * Associate a tag to a task + * + * @access public + * @param integer $task_id + * @param integer $tag_id + * @return boolean + */ + public function associateTag($task_id, $tag_id) + { + return $this->db->table(self::TABLE)->insert(array( + 'task_id' => $task_id, + 'tag_id' => $tag_id, + )); + } + + /** + * Dissociate a tag from a task + * + * @access public + * @param integer $task_id + * @param integer $tag_id + * @return boolean + */ + public function dissociateTag($task_id, $tag_id) + { + return $this->db->table(self::TABLE) + ->eq('task_id', $task_id) + ->eq('tag_id', $tag_id) + ->remove(); + } + + /** + * Associate missing tags + * + * @access protected + * @param integer $project_id + * @param integer $task_id + * @param array $task_tags + * @param string[] $tags + * @return bool + */ + protected function associateTags($project_id, $task_id, $task_tags, $tags) + { + foreach ($tags as $tag) { + $tag_id = $this->tagModel->findOrCreateTag($project_id, $tag); + + if (! isset($task_tags[$tag_id]) && ! $this->associateTag($task_id, $tag_id)) { + return false; + } + } + + return true; + } + + /** + * Dissociate removed tags + * + * @access protected + * @param integer $task_id + * @param array $task_tags + * @param string[] $tags + * @return bool + */ + protected function dissociateTags($task_id, $task_tags, $tags) + { + foreach ($task_tags as $tag_id => $tag) { + if (! in_array($tag, $tags)) { + if (! $this->dissociateTag($task_id, $tag_id)) { + return false; + } + } + } + + return true; + } +} diff --git a/sources/app/Model/TimezoneModel.php b/sources/app/Model/TimezoneModel.php new file mode 100644 index 0000000..8b3e895 --- /dev/null +++ b/sources/app/Model/TimezoneModel.php @@ -0,0 +1,58 @@ + t('Application default')) + $listing; + } + + return $listing; + } + + /** + * Get current timezone + * + * @access public + * @return string + */ + public function getCurrentTimezone() + { + if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['timezone'])) { + return $this->sessionStorage->user['timezone']; + } + + return $this->configModel->get('application_timezone', 'UTC'); + } + + /** + * Set timezone + * + * @access public + */ + public function setCurrentTimezone() + { + date_default_timezone_set($this->getCurrentTimezone()); + } +} diff --git a/sources/app/Model/Transition.php b/sources/app/Model/TransitionModel.php similarity index 76% rename from sources/app/Model/Transition.php rename to sources/app/Model/TransitionModel.php index 870d95f..a4a5847 100644 --- a/sources/app/Model/Transition.php +++ b/sources/app/Model/TransitionModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * Transition * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class Transition extends Base +class TransitionModel extends Base { /** * SQL table name @@ -69,17 +71,17 @@ class Transition extends Base ->columns( 'src.title as src_column', 'dst.title as dst_column', - User::TABLE.'.name', - User::TABLE.'.username', + UserModel::TABLE.'.name', + UserModel::TABLE.'.username', self::TABLE.'.user_id', self::TABLE.'.date', self::TABLE.'.time_spent' ) ->eq('task_id', $task_id) ->desc('date') - ->join(User::TABLE, 'id', 'user_id') - ->join(Column::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src') - ->join(Column::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst') + ->join(UserModel::TABLE, 'id', 'user_id') + ->join(ColumnModel::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src') + ->join(ColumnModel::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst') ->findAll(); } @@ -104,12 +106,12 @@ class Transition extends Base return $this->db->table(self::TABLE) ->columns( - Task::TABLE.'.id', - Task::TABLE.'.title', + TaskModel::TABLE.'.id', + TaskModel::TABLE.'.title', 'src.title as src_column', 'dst.title as dst_column', - User::TABLE.'.name', - User::TABLE.'.username', + UserModel::TABLE.'.name', + UserModel::TABLE.'.username', self::TABLE.'.user_id', self::TABLE.'.date', self::TABLE.'.time_spent' @@ -119,10 +121,10 @@ class Transition extends Base ->eq(self::TABLE.'.project_id', $project_id) ->desc('date') ->desc(self::TABLE.'.id') - ->join(Task::TABLE, 'id', 'task_id') - ->join(User::TABLE, 'id', 'user_id') - ->join(Column::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src') - ->join(Column::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst') + ->join(TaskModel::TABLE, 'id', 'task_id') + ->join(UserModel::TABLE, 'id', 'user_id') + ->join(ColumnModel::TABLE.' as src', 'id', 'src_column_id', self::TABLE, 'src') + ->join(ColumnModel::TABLE.' as dst', 'id', 'dst_column_id', self::TABLE, 'dst') ->findAll(); } } diff --git a/sources/app/Model/UserFilter.php b/sources/app/Model/UserFilter.php deleted file mode 100644 index ff546e9..0000000 --- a/sources/app/Model/UserFilter.php +++ /dev/null @@ -1,80 +0,0 @@ -query = $this->db->table(User::TABLE); - $this->input = $input; - return $this; - } - - /** - * Filter users by name or username - * - * @access public - * @return UserFilter - */ - public function filterByUsernameOrByName() - { - $this->query->beginOr() - ->ilike('username', '%'.$this->input.'%') - ->ilike('name', '%'.$this->input.'%') - ->closeOr(); - - return $this; - } - - /** - * Get all results of the filter - * - * @access public - * @return array - */ - public function findAll() - { - return $this->query->findAll(); - } - - /** - * Get the PicoDb query - * - * @access public - * @return \PicoDb\Table - */ - public function getQuery() - { - return $this->query; - } -} diff --git a/sources/app/Model/UserLocking.php b/sources/app/Model/UserLockingModel.php similarity index 86% rename from sources/app/Model/UserLocking.php rename to sources/app/Model/UserLockingModel.php index 67e4c24..1d4d994 100644 --- a/sources/app/Model/UserLocking.php +++ b/sources/app/Model/UserLockingModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * User Locking Model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserLocking extends Base +class UserLockingModel extends Base { /** * Get the number of failed login for the user @@ -19,7 +21,7 @@ class UserLocking extends Base */ public function getFailedLogin($username) { - return (int) $this->db->table(User::TABLE) + return (int) $this->db->table(UserModel::TABLE) ->eq('username', $username) ->findOneColumn('nb_failed_login'); } @@ -33,7 +35,7 @@ class UserLocking extends Base */ public function resetFailedLogin($username) { - return $this->db->table(User::TABLE) + return $this->db->table(UserModel::TABLE) ->eq('username', $username) ->update(array( 'nb_failed_login' => 0, @@ -50,7 +52,7 @@ class UserLocking extends Base */ public function incrementFailedLogin($username) { - return $this->db->table(User::TABLE) + return $this->db->table(UserModel::TABLE) ->eq('username', $username) ->increment('nb_failed_login', 1); } @@ -64,7 +66,7 @@ class UserLocking extends Base */ public function isLocked($username) { - return $this->db->table(User::TABLE) + return $this->db->table(UserModel::TABLE) ->eq('username', $username) ->neq('lock_expiration_date', 0) ->gte('lock_expiration_date', time()) @@ -81,7 +83,7 @@ class UserLocking extends Base */ public function lock($username, $duration = 15) { - return $this->db->table(User::TABLE) + return $this->db->table(UserModel::TABLE) ->eq('username', $username) ->update(array( 'lock_expiration_date' => time() + $duration * 60 diff --git a/sources/app/Model/UserMention.php b/sources/app/Model/UserMentionModel.php similarity index 79% rename from sources/app/Model/UserMention.php rename to sources/app/Model/UserMentionModel.php index 97a4e41..cdb9949 100644 --- a/sources/app/Model/UserMention.php +++ b/sources/app/Model/UserMentionModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Event\GenericEvent; /** * User Mention * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserMention extends Base +class UserMentionModel extends Base { /** * Get list of mentioned users @@ -24,7 +25,7 @@ class UserMention extends Base $users = array(); if (preg_match_all('/@([^\s]+)/', $content, $matches)) { - $users = $this->db->table(User::TABLE) + $users = $this->db->table(UserModel::TABLE) ->columns('id', 'username', 'name', 'email', 'language') ->eq('notifications_enabled', 1) ->neq('id', $this->userSession->getId()) @@ -46,13 +47,13 @@ class UserMention extends Base public function fireEvents($content, $eventName, GenericEvent $event) { if (empty($event['project_id'])) { - $event['project_id'] = $this->taskFinder->getProjectId($event['task_id']); + $event['project_id'] = $this->taskFinderModel->getProjectId($event['task_id']); } $users = $this->getMentionedUsers($content); foreach ($users as $user) { - if ($this->projectPermission->isMember($event['project_id'], $user['id'])) { + if ($this->projectPermissionModel->isMember($event['project_id'], $user['id'])) { $event['mention'] = $user; $this->dispatcher->dispatch($eventName, $event); } diff --git a/sources/app/Model/UserMetadata.php b/sources/app/Model/UserMetadataModel.php similarity index 55% rename from sources/app/Model/UserMetadata.php rename to sources/app/Model/UserMetadataModel.php index 411837b..e931d3b 100644 --- a/sources/app/Model/UserMetadata.php +++ b/sources/app/Model/UserMetadataModel.php @@ -5,17 +5,22 @@ namespace Kanboard\Model; /** * User Metadata * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserMetadata extends Metadata +class UserMetadataModel extends MetadataModel { /** - * SQL table name + * Get the table * - * @var string + * @abstract + * @access protected + * @return string */ - const TABLE = 'user_has_metadata'; + protected function getTable() + { + return 'user_has_metadata'; + } /** * Define the entity key diff --git a/sources/app/Model/User.php b/sources/app/Model/UserModel.php similarity index 88% rename from sources/app/Model/User.php rename to sources/app/Model/UserModel.php index 5799300..f7a051c 100644 --- a/sources/app/Model/User.php +++ b/sources/app/Model/UserModel.php @@ -3,16 +3,17 @@ namespace Kanboard\Model; use PicoDb\Database; +use Kanboard\Core\Base; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; /** * User model * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class User extends Base +class UserModel extends Base { /** * SQL table name @@ -22,7 +23,7 @@ class User extends Base const TABLE = 'users'; /** - * Id used for everbody (filtering) + * Id used for everybody (filtering) * * @var integer */ @@ -85,7 +86,7 @@ class User extends Base { return $this->userSession->isAdmin() || // Avoid SQL query if connected $this->db - ->table(User::TABLE) + ->table(UserModel::TABLE) ->eq('id', $user_id) ->eq('role', Role::APP_ADMIN) ->exists(); @@ -211,7 +212,7 @@ class User extends Base $listing = $this->prepareList($users); if ($prepend) { - return array(User::EVERYBODY_ID => t('Everybody')) + $listing; + return array(UserModel::EVERYBODY_ID => t('Everybody')) + $listing; } return $listing; @@ -269,7 +270,7 @@ class User extends Base public function create(array $values) { $this->prepare($values); - return $this->persist(self::TABLE, $values); + return $this->db->table(self::TABLE)->persist($values); } /** @@ -320,38 +321,38 @@ class User extends Base */ public function remove($user_id) { - $this->avatarFile->remove($user_id); + $this->avatarFileModel->remove($user_id); return $this->db->transaction(function (Database $db) use ($user_id) { // All assigned tasks are now unassigned (no foreign key) - if (! $db->table(Task::TABLE)->eq('owner_id', $user_id)->update(array('owner_id' => 0))) { + if (! $db->table(TaskModel::TABLE)->eq('owner_id', $user_id)->update(array('owner_id' => 0))) { return false; } // All assigned subtasks are now unassigned (no foreign key) - if (! $db->table(Subtask::TABLE)->eq('user_id', $user_id)->update(array('user_id' => 0))) { + if (! $db->table(SubtaskModel::TABLE)->eq('user_id', $user_id)->update(array('user_id' => 0))) { return false; } // All comments are not assigned anymore (no foreign key) - if (! $db->table(Comment::TABLE)->eq('user_id', $user_id)->update(array('user_id' => 0))) { + if (! $db->table(CommentModel::TABLE)->eq('user_id', $user_id)->update(array('user_id' => 0))) { return false; } // All private projects are removed - $project_ids = $db->table(Project::TABLE) + $project_ids = $db->table(ProjectModel::TABLE) ->eq('is_private', 1) - ->eq(ProjectUserRole::TABLE.'.user_id', $user_id) - ->join(ProjectUserRole::TABLE, 'project_id', 'id') - ->findAllByColumn(Project::TABLE.'.id'); + ->eq(ProjectUserRoleModel::TABLE.'.user_id', $user_id) + ->join(ProjectUserRoleModel::TABLE, 'project_id', 'id') + ->findAllByColumn(ProjectModel::TABLE.'.id'); if (! empty($project_ids)) { - $db->table(Project::TABLE)->in('id', $project_ids)->remove(); + $db->table(ProjectModel::TABLE)->in('id', $project_ids)->remove(); } // Finally remove the user - if (! $db->table(User::TABLE)->eq('id', $user_id)->remove()) { + if (! $db->table(UserModel::TABLE)->eq('id', $user_id)->remove()) { return false; } }); diff --git a/sources/app/Model/UserNotificationFilter.php b/sources/app/Model/UserNotificationFilterModel.php similarity index 94% rename from sources/app/Model/UserNotificationFilter.php rename to sources/app/Model/UserNotificationFilterModel.php index 780ddfc..112ba29 100644 --- a/sources/app/Model/UserNotificationFilter.php +++ b/sources/app/Model/UserNotificationFilterModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * User Notification Filter * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserNotificationFilter extends Base +class UserNotificationFilterModel extends Base { /** * SQL table name @@ -52,7 +54,7 @@ class UserNotificationFilter extends Base */ public function getSelectedFilter($user_id) { - return $this->db->table(User::TABLE)->eq('id', $user_id)->findOneColumn('notifications_filter'); + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->findOneColumn('notifications_filter'); } /** @@ -65,7 +67,7 @@ class UserNotificationFilter extends Base */ public function saveFilter($user_id, $filter) { - return $this->db->table(User::TABLE)->eq('id', $user_id)->update(array( + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->update(array( 'notifications_filter' => $filter, )); } diff --git a/sources/app/Model/UserNotification.php b/sources/app/Model/UserNotificationModel.php similarity index 60% rename from sources/app/Model/UserNotification.php rename to sources/app/Model/UserNotificationModel.php index 7795da2..d77526f 100644 --- a/sources/app/Model/UserNotification.php +++ b/sources/app/Model/UserNotificationModel.php @@ -2,15 +2,16 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; use Kanboard\Core\Translator; /** * User Notification * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserNotification extends Base +class UserNotificationModel extends Base { /** * Send notifications to people @@ -24,7 +25,7 @@ class UserNotification extends Base $users = $this->getUsersWithNotificationEnabled($event_data['task']['project_id'], $this->userSession->getId()); foreach ($users as $user) { - if ($this->userNotificationFilter->shouldReceiveNotification($user, $event_data)) { + if ($this->userNotificationFilterModel->shouldReceiveNotification($user, $event_data)) { $this->sendUserNotification($user, $event_name, $event_data); } } @@ -46,15 +47,15 @@ class UserNotification extends Base if (! empty($user['language'])) { Translator::load($user['language']); } else { - Translator::load($this->config->get('application_language', 'en_US')); + Translator::load($this->configModel->get('application_language', 'en_US')); } - foreach ($this->userNotificationType->getSelectedTypes($user['id']) as $type) { - $this->userNotificationType->getType($type)->notifyUser($user, $event_name, $event_data); + foreach ($this->userNotificationTypeModel->getSelectedTypes($user['id']) as $type) { + $this->userNotificationTypeModel->getType($type)->notifyUser($user, $event_name, $event_data); } // Restore locales - $this->config->setupTranslations(); + $this->languageModel->loadCurrentLanguage(); } /** @@ -67,7 +68,7 @@ class UserNotification extends Base */ public function getUsersWithNotificationEnabled($project_id, $exclude_user_id = 0) { - if ($this->projectPermission->isEverybodyAllowed($project_id)) { + if ($this->projectPermissionModel->isEverybodyAllowed($project_id)) { return $this->getEverybodyWithNotificationEnabled($exclude_user_id); } @@ -93,7 +94,7 @@ class UserNotification extends Base */ public function enableNotification($user_id) { - return $this->db->table(User::TABLE)->eq('id', $user_id)->update(array('notifications_enabled' => 1)); + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->update(array('notifications_enabled' => 1)); } /** @@ -105,7 +106,7 @@ class UserNotification extends Base */ public function disableNotification($user_id) { - return $this->db->table(User::TABLE)->eq('id', $user_id)->update(array('notifications_enabled' => 0)); + return $this->db->table(UserModel::TABLE)->eq('id', $user_id)->update(array('notifications_enabled' => 0)); } /** @@ -125,12 +126,12 @@ class UserNotification extends Base $this->disableNotification($user_id); } - $filter = empty($values['notifications_filter']) ? UserNotificationFilter::FILTER_BOTH : $values['notifications_filter']; + $filter = empty($values['notifications_filter']) ? UserNotificationFilterModel::FILTER_BOTH : $values['notifications_filter']; $project_ids = empty($values['notification_projects']) ? array() : array_keys($values['notification_projects']); - $this->userNotificationFilter->saveFilter($user_id, $filter); - $this->userNotificationFilter->saveSelectedProjects($user_id, $project_ids); - $this->userNotificationType->saveSelectedTypes($user_id, $types); + $this->userNotificationFilterModel->saveFilter($user_id, $filter); + $this->userNotificationFilterModel->saveSelectedProjects($user_id, $project_ids); + $this->userNotificationTypeModel->saveSelectedTypes($user_id, $types); } /** @@ -142,9 +143,9 @@ class UserNotification extends Base */ public function readSettings($user_id) { - $values = $this->db->table(User::TABLE)->eq('id', $user_id)->columns('notifications_enabled', 'notifications_filter')->findOne(); - $values['notification_types'] = $this->userNotificationType->getSelectedTypes($user_id); - $values['notification_projects'] = $this->userNotificationFilter->getSelectedProjects($user_id); + $values = $this->db->table(UserModel::TABLE)->eq('id', $user_id)->columns('notifications_enabled', 'notifications_filter')->findOne(); + $values['notification_types'] = $this->userNotificationTypeModel->getSelectedTypes($user_id); + $values['notification_projects'] = $this->userNotificationFilterModel->getSelectedProjects($user_id); return $values; } @@ -159,25 +160,27 @@ class UserNotification extends Base private function getProjectUserMembersWithNotificationEnabled($project_id, $exclude_user_id) { return $this->db - ->table(ProjectUserRole::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', User::TABLE.'.email', User::TABLE.'.language', User::TABLE.'.notifications_filter') - ->join(User::TABLE, 'id', 'user_id') - ->eq('project_id', $project_id) - ->eq('notifications_enabled', '1') - ->neq(User::TABLE.'.id', $exclude_user_id) + ->table(ProjectUserRoleModel::TABLE) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name', UserModel::TABLE.'.email', UserModel::TABLE.'.language', UserModel::TABLE.'.notifications_filter') + ->join(UserModel::TABLE, 'id', 'user_id') + ->eq(ProjectUserRoleModel::TABLE.'.project_id', $project_id) + ->eq(UserModel::TABLE.'.notifications_enabled', '1') + ->eq(UserModel::TABLE.'.is_active', 1) + ->neq(UserModel::TABLE.'.id', $exclude_user_id) ->findAll(); } private function getProjectGroupMembersWithNotificationEnabled($project_id, $exclude_user_id) { return $this->db - ->table(ProjectGroupRole::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', User::TABLE.'.email', User::TABLE.'.language', User::TABLE.'.notifications_filter') - ->join(GroupMember::TABLE, 'group_id', 'group_id', ProjectGroupRole::TABLE) - ->join(User::TABLE, 'id', 'user_id', GroupMember::TABLE) - ->eq(ProjectGroupRole::TABLE.'.project_id', $project_id) - ->eq(User::TABLE.'.notifications_enabled', '1') - ->neq(User::TABLE.'.id', $exclude_user_id) + ->table(ProjectGroupRoleModel::TABLE) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name', UserModel::TABLE.'.email', UserModel::TABLE.'.language', UserModel::TABLE.'.notifications_filter') + ->join(GroupMemberModel::TABLE, 'group_id', 'group_id', ProjectGroupRoleModel::TABLE) + ->join(UserModel::TABLE, 'id', 'user_id', GroupMemberModel::TABLE) + ->eq(ProjectGroupRoleModel::TABLE.'.project_id', $project_id) + ->eq(UserModel::TABLE.'.notifications_enabled', '1') + ->neq(UserModel::TABLE.'.id', $exclude_user_id) + ->eq(UserModel::TABLE.'.is_active', 1) ->findAll(); } @@ -191,10 +194,11 @@ class UserNotification extends Base private function getEverybodyWithNotificationEnabled($exclude_user_id) { return $this->db - ->table(User::TABLE) - ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name', User::TABLE.'.email', User::TABLE.'.language', User::TABLE.'.notifications_filter') + ->table(UserModel::TABLE) + ->columns(UserModel::TABLE.'.id', UserModel::TABLE.'.username', UserModel::TABLE.'.name', UserModel::TABLE.'.email', UserModel::TABLE.'.language', UserModel::TABLE.'.notifications_filter') ->eq('notifications_enabled', '1') - ->neq(User::TABLE.'.id', $exclude_user_id) + ->neq(UserModel::TABLE.'.id', $exclude_user_id) + ->eq(UserModel::TABLE.'.is_active', 1) ->findAll(); } } diff --git a/sources/app/Model/UserNotificationType.php b/sources/app/Model/UserNotificationTypeModel.php similarity index 92% rename from sources/app/Model/UserNotificationType.php rename to sources/app/Model/UserNotificationTypeModel.php index 89beb48..0f37722 100644 --- a/sources/app/Model/UserNotificationType.php +++ b/sources/app/Model/UserNotificationTypeModel.php @@ -5,10 +5,10 @@ namespace Kanboard\Model; /** * User Notification Type * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserNotificationType extends NotificationType +class UserNotificationTypeModel extends NotificationTypeModel { /** * SQL table name diff --git a/sources/app/Model/UserUnreadNotification.php b/sources/app/Model/UserUnreadNotificationModel.php similarity index 72% rename from sources/app/Model/UserUnreadNotification.php rename to sources/app/Model/UserUnreadNotificationModel.php index cc0f326..6c930ee 100644 --- a/sources/app/Model/UserUnreadNotification.php +++ b/sources/app/Model/UserUnreadNotificationModel.php @@ -2,13 +2,15 @@ namespace Kanboard\Model; +use Kanboard\Core\Base; + /** * User Unread Notification * - * @package model + * @package Kanboard\Model * @author Frederic Guillot */ -class UserUnreadNotification extends Base +class UserUnreadNotificationModel extends Base { /** * SQL table name @@ -35,6 +37,23 @@ class UserUnreadNotification extends Base )); } + /** + * Get one notification + * + * @param integer $notification_id + * @return array|null + */ + public function getById($notification_id) + { + $notification = $this->db->table(self::TABLE)->eq('id', $notification_id)->findOne(); + + if (! empty($notification)) { + $this->unserialize($notification); + } + + return $notification; + } + /** * Get all notifications for a user * @@ -47,8 +66,7 @@ class UserUnreadNotification extends Base $events = $this->db->table(self::TABLE)->eq('user_id', $user_id)->asc('date_creation')->findAll(); foreach ($events as &$event) { - $event['event_data'] = json_decode($event['event_data'], true); - $event['title'] = $this->notification->getTitleWithoutAuthor($event['event_name'], $event['event_data']); + $this->unserialize($event); } return $events; @@ -90,4 +108,10 @@ class UserUnreadNotification extends Base { return $this->db->table(self::TABLE)->eq('user_id', $user_id)->exists(); } + + private function unserialize(&$event) + { + $event['event_data'] = json_decode($event['event_data'], true); + $event['title'] = $this->notificationModel->getTitleWithoutAuthor($event['event_name'], $event['event_data']); + } } diff --git a/sources/app/Notification/ActivityStream.php b/sources/app/Notification/ActivityStreamNotification.php similarity index 81% rename from sources/app/Notification/ActivityStream.php rename to sources/app/Notification/ActivityStreamNotification.php index 325732e..9f23c88 100644 --- a/sources/app/Notification/ActivityStream.php +++ b/sources/app/Notification/ActivityStreamNotification.php @@ -3,14 +3,15 @@ namespace Kanboard\Notification; use Kanboard\Core\Base; +use Kanboard\Core\Notification\NotificationInterface; /** * Activity Stream Notification * - * @package notification + * @package Kanboard\Notification * @author Frederic Guillot */ -class ActivityStream extends Base implements NotificationInterface +class ActivityStreamNotification extends Base implements NotificationInterface { /** * Send notification to a user @@ -35,7 +36,7 @@ class ActivityStream extends Base implements NotificationInterface public function notifyProject(array $project, $event_name, array $event_data) { if ($this->userSession->isLogged()) { - $this->projectActivity->createEvent( + $this->projectActivityModel->createEvent( $project['id'], $event_data['task']['id'], $this->userSession->getId(), diff --git a/sources/app/Notification/Mail.php b/sources/app/Notification/MailNotification.php similarity index 79% rename from sources/app/Notification/Mail.php rename to sources/app/Notification/MailNotification.php index c924fb5..2d27179 100644 --- a/sources/app/Notification/Mail.php +++ b/sources/app/Notification/MailNotification.php @@ -3,18 +3,19 @@ namespace Kanboard\Notification; use Kanboard\Core\Base; -use Kanboard\Model\Task; -use Kanboard\Model\TaskFile; -use Kanboard\Model\Comment; -use Kanboard\Model\Subtask; +use Kanboard\Core\Notification\NotificationInterface; +use Kanboard\Model\TaskModel; +use Kanboard\Model\TaskFileModel; +use Kanboard\Model\CommentModel; +use Kanboard\Model\SubtaskModel; /** * Email Notification * - * @package notification + * @package Kanboard\Notification * @author Frederic Guillot */ -class Mail extends Base implements NotificationInterface +class MailNotification extends Base implements NotificationInterface { /** * Notification type @@ -67,7 +68,7 @@ class Mail extends Base implements NotificationInterface { return $this->template->render( 'notification/'.str_replace('.', '_', $event_name), - $event_data + array('application_url' => $this->config->get('application_url')) + $event_data + array('application_url' => $this->configModel->get('application_url')) ); } @@ -82,50 +83,50 @@ class Mail extends Base implements NotificationInterface public function getMailSubject($event_name, array $event_data) { switch ($event_name) { - case TaskFile::EVENT_CREATE: + case TaskFileModel::EVENT_CREATE: $subject = $this->getStandardMailSubject(e('New attachment'), $event_data); break; - case Comment::EVENT_CREATE: + case CommentModel::EVENT_CREATE: $subject = $this->getStandardMailSubject(e('New comment'), $event_data); break; - case Comment::EVENT_UPDATE: + case CommentModel::EVENT_UPDATE: $subject = $this->getStandardMailSubject(e('Comment updated'), $event_data); break; - case Subtask::EVENT_CREATE: + case SubtaskModel::EVENT_CREATE: $subject = $this->getStandardMailSubject(e('New subtask'), $event_data); break; - case Subtask::EVENT_UPDATE: + case SubtaskModel::EVENT_UPDATE: $subject = $this->getStandardMailSubject(e('Subtask updated'), $event_data); break; - case Task::EVENT_CREATE: + case TaskModel::EVENT_CREATE: $subject = $this->getStandardMailSubject(e('New task'), $event_data); break; - case Task::EVENT_UPDATE: + case TaskModel::EVENT_UPDATE: $subject = $this->getStandardMailSubject(e('Task updated'), $event_data); break; - case Task::EVENT_CLOSE: + case TaskModel::EVENT_CLOSE: $subject = $this->getStandardMailSubject(e('Task closed'), $event_data); break; - case Task::EVENT_OPEN: + case TaskModel::EVENT_OPEN: $subject = $this->getStandardMailSubject(e('Task opened'), $event_data); break; - case Task::EVENT_MOVE_COLUMN: + case TaskModel::EVENT_MOVE_COLUMN: $subject = $this->getStandardMailSubject(e('Column change'), $event_data); break; - case Task::EVENT_MOVE_POSITION: + case TaskModel::EVENT_MOVE_POSITION: $subject = $this->getStandardMailSubject(e('Position change'), $event_data); break; - case Task::EVENT_MOVE_SWIMLANE: + case TaskModel::EVENT_MOVE_SWIMLANE: $subject = $this->getStandardMailSubject(e('Swimlane change'), $event_data); break; - case Task::EVENT_ASSIGNEE_CHANGE: + case TaskModel::EVENT_ASSIGNEE_CHANGE: $subject = $this->getStandardMailSubject(e('Assignee change'), $event_data); break; - case Task::EVENT_USER_MENTION: - case Comment::EVENT_USER_MENTION: + case TaskModel::EVENT_USER_MENTION: + case CommentModel::EVENT_USER_MENTION: $subject = $this->getStandardMailSubject(e('Mentioned'), $event_data); break; - case Task::EVENT_OVERDUE: + case TaskModel::EVENT_OVERDUE: $subject = e('[%s] Overdue tasks', $event_data['project_name']); break; default: diff --git a/sources/app/Notification/Web.php b/sources/app/Notification/WebNotification.php similarity index 75% rename from sources/app/Notification/Web.php rename to sources/app/Notification/WebNotification.php index 9271c19..d881882 100644 --- a/sources/app/Notification/Web.php +++ b/sources/app/Notification/WebNotification.php @@ -3,14 +3,15 @@ namespace Kanboard\Notification; use Kanboard\Core\Base; +use Kanboard\Core\Notification\NotificationInterface; /** * Web Notification * - * @package notification + * @package Kanboard\Notification * @author Frederic Guillot */ -class Web extends Base implements NotificationInterface +class WebNotification extends Base implements NotificationInterface { /** * Notification type @@ -29,7 +30,7 @@ class Web extends Base implements NotificationInterface */ public function notifyUser(array $user, $event_name, array $event_data) { - $this->userUnreadNotification->create($user['id'], $event_name, $event_data); + $this->userUnreadNotificationModel->create($user['id'], $event_name, $event_data); } /** diff --git a/sources/app/Notification/Webhook.php b/sources/app/Notification/WebhookNotification.php similarity index 79% rename from sources/app/Notification/Webhook.php rename to sources/app/Notification/WebhookNotification.php index e187909..1604553 100644 --- a/sources/app/Notification/Webhook.php +++ b/sources/app/Notification/WebhookNotification.php @@ -3,14 +3,15 @@ namespace Kanboard\Notification; use Kanboard\Core\Base; +use Kanboard\Core\Notification\NotificationInterface; /** * Webhook Notification * - * @package notification + * @package Kanboard\Notification * @author Frederic Guillot */ -class Webhook extends Base implements NotificationInterface +class WebhookNotification extends Base implements NotificationInterface { /** * Send notification to a user @@ -34,8 +35,8 @@ class Webhook extends Base implements NotificationInterface */ public function notifyProject(array $project, $event_name, array $event_data) { - $url = $this->config->get('webhook_url'); - $token = $this->config->get('webhook_token'); + $url = $this->configModel->get('webhook_url'); + $token = $this->configModel->get('webhook_token'); if (! empty($url)) { if (strpos($url, '?') !== false) { diff --git a/sources/app/Schema/Mysql.php b/sources/app/Schema/Mysql.php index 934b063..82ccb8c 100644 --- a/sources/app/Schema/Mysql.php +++ b/sources/app/Schema/Mysql.php @@ -6,7 +6,30 @@ use PDO; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; -const VERSION = 110; +const VERSION = 111; + +function version_111(PDO $pdo) +{ + $pdo->exec(" + CREATE TABLE tags ( + id INT NOT NULL AUTO_INCREMENT, + name VARCHAR(255) NOT NULL, + project_id INT NOT NULL, + UNIQUE(project_id, name), + PRIMARY KEY(id) + ) ENGINE=InnoDB CHARSET=utf8 + "); + + $pdo->exec(" + CREATE TABLE task_has_tags ( + task_id INT NOT NULL, + tag_id INT NOT NULL, + FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE, + FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE, + UNIQUE(tag_id, task_id) + ) ENGINE=InnoDB CHARSET=utf8 + "); +} function version_110(PDO $pdo) { diff --git a/sources/app/Schema/Postgres.php b/sources/app/Schema/Postgres.php index 3ef4949..229cbd2 100644 --- a/sources/app/Schema/Postgres.php +++ b/sources/app/Schema/Postgres.php @@ -6,7 +6,29 @@ use PDO; use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; -const VERSION = 89; +const VERSION = 90; + +function version_90(PDO $pdo) +{ + $pdo->exec(" + CREATE TABLE tags ( + id SERIAL PRIMARY KEY, + name VARCHAR(255) NOT NULL, + project_id INTEGER NOT NULL, + UNIQUE(project_id, name) + ) + "); + + $pdo->exec(" + CREATE TABLE task_has_tags ( + task_id INTEGER NOT NULL, + tag_id INTEGER NOT NULL, + FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE, + FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE, + UNIQUE(tag_id, task_id) + ) + "); +} function version_89(PDO $pdo) { diff --git a/sources/app/Schema/Sqlite.php b/sources/app/Schema/Sqlite.php index 9ded7ed..dac348d 100644 --- a/sources/app/Schema/Sqlite.php +++ b/sources/app/Schema/Sqlite.php @@ -6,7 +6,29 @@ use Kanboard\Core\Security\Token; use Kanboard\Core\Security\Role; use PDO; -const VERSION = 101; +const VERSION = 102; + +function version_102(PDO $pdo) +{ + $pdo->exec(" + CREATE TABLE tags ( + id INTEGER PRIMARY KEY, + name TEXT NOT NULL, + project_id INTEGER NOT NULL, + UNIQUE(project_id, name) + ) + "); + + $pdo->exec(" + CREATE TABLE task_has_tags ( + task_id INTEGER NOT NULL, + tag_id INTEGER NOT NULL, + FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE, + FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE, + UNIQUE(tag_id, task_id) + ) + "); +} function version_101(PDO $pdo) { diff --git a/sources/app/ServiceProvider/ActionProvider.php b/sources/app/ServiceProvider/ActionProvider.php index 3692f19..3420205 100644 --- a/sources/app/ServiceProvider/ActionProvider.php +++ b/sources/app/ServiceProvider/ActionProvider.php @@ -2,6 +2,7 @@ namespace Kanboard\ServiceProvider; +use Kanboard\Action\TaskAssignColorPriority; use Pimple\Container; use Pimple\ServiceProviderInterface; use Kanboard\Core\Action\ActionManager; @@ -35,7 +36,7 @@ use Kanboard\Action\TaskCloseNoActivity; /** * Action Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class ActionProvider implements ServiceProviderInterface @@ -59,6 +60,7 @@ class ActionProvider implements ServiceProviderInterface $container['actionManager']->register(new TaskAssignColorColumn($container)); $container['actionManager']->register(new TaskAssignColorLink($container)); $container['actionManager']->register(new TaskAssignColorUser($container)); + $container['actionManager']->register(new TaskAssignColorPriority($container)); $container['actionManager']->register(new TaskAssignCurrentUser($container)); $container['actionManager']->register(new TaskAssignCurrentUserColumn($container)); $container['actionManager']->register(new TaskAssignSpecificUser($container)); diff --git a/sources/app/ServiceProvider/ApiProvider.php b/sources/app/ServiceProvider/ApiProvider.php new file mode 100644 index 0000000..5cf6231 --- /dev/null +++ b/sources/app/ServiceProvider/ApiProvider.php @@ -0,0 +1,81 @@ +setAuthenticationHeader(API_AUTHENTICATION_HEADER); + $server->getMiddlewareHandler() + ->withMiddleware(new AuthenticationMiddleware($container)) + ; + + $server->getProcedureHandler() + ->withObject(new MeProcedure($container)) + ->withObject(new ActionProcedure($container)) + ->withObject(new AppProcedure($container)) + ->withObject(new BoardProcedure($container)) + ->withObject(new ColumnProcedure($container)) + ->withObject(new CategoryProcedure($container)) + ->withObject(new CommentProcedure($container)) + ->withObject(new TaskFileProcedure($container)) + ->withObject(new ProjectFileProcedure($container)) + ->withObject(new LinkProcedure($container)) + ->withObject(new ProjectProcedure($container)) + ->withObject(new ProjectPermissionProcedure($container)) + ->withObject(new SubtaskProcedure($container)) + ->withObject(new SubtaskTimeTrackingProcedure($container)) + ->withObject(new SwimlaneProcedure($container)) + ->withObject(new TaskProcedure($container)) + ->withObject(new TaskLinkProcedure($container)) + ->withObject(new TaskExternalLinkProcedure($container)) + ->withObject(new UserProcedure($container)) + ->withObject(new GroupProcedure($container)) + ->withObject(new GroupMemberProcedure($container)) + ->withBeforeMethod('beforeProcedure') + ; + + $container['api'] = $server; + return $container; + } +} diff --git a/sources/app/ServiceProvider/AuthenticationProvider.php b/sources/app/ServiceProvider/AuthenticationProvider.php index 776e65d..978bc05 100644 --- a/sources/app/ServiceProvider/AuthenticationProvider.php +++ b/sources/app/ServiceProvider/AuthenticationProvider.php @@ -17,7 +17,7 @@ use Kanboard\Auth\ReverseProxyAuth; /** * Authentication Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class AuthenticationProvider implements ServiceProviderInterface @@ -46,9 +46,13 @@ class AuthenticationProvider implements ServiceProviderInterface $container['projectAccessMap'] = $this->getProjectAccessMap(); $container['applicationAccessMap'] = $this->getApplicationAccessMap(); + $container['apiAccessMap'] = $this->getApiAccessMap(); + $container['apiProjectAccessMap'] = $this->getApiProjectAccessMap(); $container['projectAuthorization'] = new Authorization($container['projectAccessMap']); $container['applicationAuthorization'] = new Authorization($container['applicationAccessMap']); + $container['apiAuthorization'] = new Authorization($container['apiAccessMap']); + $container['apiProjectAuthorization'] = new Authorization($container['apiProjectAccessMap']); return $container; } @@ -66,39 +70,44 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->setRoleHierarchy(Role::PROJECT_MANAGER, array(Role::PROJECT_MEMBER, Role::PROJECT_VIEWER)); $acl->setRoleHierarchy(Role::PROJECT_MEMBER, array(Role::PROJECT_VIEWER)); - $acl->add('Action', '*', Role::PROJECT_MANAGER); - $acl->add('ActionProject', '*', Role::PROJECT_MANAGER); - $acl->add('ActionCreation', '*', Role::PROJECT_MANAGER); - $acl->add('Analytic', '*', Role::PROJECT_MANAGER); - $acl->add('Board', 'save', Role::PROJECT_MEMBER); - $acl->add('BoardPopover', '*', Role::PROJECT_MEMBER); - $acl->add('Calendar', 'save', Role::PROJECT_MEMBER); - $acl->add('Category', '*', Role::PROJECT_MANAGER); - $acl->add('Column', '*', Role::PROJECT_MANAGER); - $acl->add('Comment', '*', Role::PROJECT_MEMBER); - $acl->add('Customfilter', '*', Role::PROJECT_MEMBER); - $acl->add('Export', '*', Role::PROJECT_MANAGER); - $acl->add('TaskFile', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER); - $acl->add('Gantt', '*', Role::PROJECT_MANAGER); - $acl->add('Project', array('share', 'integrations', 'notifications', 'duplicate', 'disable', 'enable', 'remove'), Role::PROJECT_MANAGER); - $acl->add('ProjectPermission', '*', Role::PROJECT_MANAGER); - $acl->add('ProjectEdit', '*', Role::PROJECT_MANAGER); - $acl->add('ProjectFile', '*', Role::PROJECT_MEMBER); - $acl->add('Projectuser', '*', Role::PROJECT_MANAGER); - $acl->add('Subtask', '*', Role::PROJECT_MEMBER); - $acl->add('SubtaskRestriction', '*', Role::PROJECT_MEMBER); - $acl->add('SubtaskStatus', '*', Role::PROJECT_MEMBER); - $acl->add('Swimlane', '*', Role::PROJECT_MANAGER); - $acl->add('Task', 'remove', Role::PROJECT_MEMBER); - $acl->add('Taskcreation', '*', Role::PROJECT_MEMBER); - $acl->add('Taskduplication', '*', Role::PROJECT_MEMBER); - $acl->add('TaskRecurrence', '*', Role::PROJECT_MEMBER); - $acl->add('TaskImport', '*', Role::PROJECT_MANAGER); - $acl->add('TaskInternalLink', '*', Role::PROJECT_MEMBER); - $acl->add('TaskExternalLink', '*', Role::PROJECT_MEMBER); - $acl->add('Taskmodification', '*', Role::PROJECT_MEMBER); - $acl->add('Taskstatus', '*', Role::PROJECT_MEMBER); - $acl->add('UserHelper', array('mention'), Role::PROJECT_MEMBER); + $acl->add('ActionController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectActionDuplicationController', '*', Role::PROJECT_MANAGER); + $acl->add('ActionCreationController', '*', Role::PROJECT_MANAGER); + $acl->add('AnalyticController', '*', Role::PROJECT_MANAGER); + $acl->add('BoardAjaxController', 'save', Role::PROJECT_MEMBER); + $acl->add('BoardPopoverController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskPopoverController', '*', Role::PROJECT_MEMBER); + $acl->add('CalendarController', 'save', Role::PROJECT_MEMBER); + $acl->add('CategoryController', '*', Role::PROJECT_MANAGER); + $acl->add('ColumnController', '*', Role::PROJECT_MANAGER); + $acl->add('CommentController', '*', Role::PROJECT_MEMBER); + $acl->add('CustomFilterController', '*', Role::PROJECT_MEMBER); + $acl->add('ExportController', '*', Role::PROJECT_MANAGER); + $acl->add('TaskFileController', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER); + $acl->add('TaskGanttController', '*', Role::PROJECT_MANAGER); + $acl->add('TaskGanttCreationController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectViewController', array('share', 'updateSharing', 'integrations', 'updateIntegrations', 'notifications', 'updateNotifications', 'duplicate', 'doDuplication'), Role::PROJECT_MANAGER); + $acl->add('ProjectPermissionController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectEditController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectFileController', '*', Role::PROJECT_MEMBER); + $acl->add('ProjectUserOverviewController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectStatusController', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectTagController', '*', Role::PROJECT_MANAGER); + $acl->add('SubtaskController', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER); + $acl->add('SwimlaneController', '*', Role::PROJECT_MANAGER); + $acl->add('TaskSuppressionController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskBulkController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskDuplicationController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskRecurrenceController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskImportController', '*', Role::PROJECT_MANAGER); + $acl->add('TaskInternalLinkController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskExternalLinkController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskModificationController', '*', Role::PROJECT_MEMBER); + $acl->add('TaskStatusController', '*', Role::PROJECT_MEMBER); + $acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER); return $acl; } @@ -117,27 +126,87 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->setRoleHierarchy(Role::APP_MANAGER, array(Role::APP_USER, Role::APP_PUBLIC)); $acl->setRoleHierarchy(Role::APP_USER, array(Role::APP_PUBLIC)); - $acl->add('Auth', array('login', 'check'), Role::APP_PUBLIC); - $acl->add('Captcha', '*', Role::APP_PUBLIC); - $acl->add('PasswordReset', '*', Role::APP_PUBLIC); - $acl->add('Webhook', '*', Role::APP_PUBLIC); - $acl->add('Task', 'readonly', Role::APP_PUBLIC); - $acl->add('Board', 'readonly', Role::APP_PUBLIC); - $acl->add('Ical', '*', Role::APP_PUBLIC); - $acl->add('Feed', '*', Role::APP_PUBLIC); - $acl->add('AvatarFile', 'show', Role::APP_PUBLIC); + $acl->add('AuthController', array('login', 'check'), Role::APP_PUBLIC); + $acl->add('CaptchaController', '*', Role::APP_PUBLIC); + $acl->add('PasswordResetController', '*', Role::APP_PUBLIC); + $acl->add('TaskViewController', 'readonly', Role::APP_PUBLIC); + $acl->add('BoardViewController', 'readonly', Role::APP_PUBLIC); + $acl->add('ICalendarController', '*', Role::APP_PUBLIC); + $acl->add('FeedController', '*', Role::APP_PUBLIC); + $acl->add('AvatarFileController', 'show', Role::APP_PUBLIC); - $acl->add('Config', '*', Role::APP_ADMIN); - $acl->add('Currency', '*', Role::APP_ADMIN); - $acl->add('Gantt', array('projects', 'saveProjectDate'), Role::APP_MANAGER); - $acl->add('Group', '*', Role::APP_ADMIN); - $acl->add('Link', '*', Role::APP_ADMIN); - $acl->add('ProjectCreation', 'create', Role::APP_MANAGER); - $acl->add('Projectuser', '*', Role::APP_MANAGER); - $acl->add('Twofactor', 'disable', Role::APP_ADMIN); - $acl->add('UserImport', '*', Role::APP_ADMIN); - $acl->add('User', array('index', 'create', 'save', 'authentication'), Role::APP_ADMIN); - $acl->add('UserStatus', '*', Role::APP_ADMIN); + $acl->add('ConfigController', '*', Role::APP_ADMIN); + $acl->add('TagController', '*', Role::APP_ADMIN); + $acl->add('PluginController', '*', Role::APP_ADMIN); + $acl->add('CurrencyController', '*', Role::APP_ADMIN); + $acl->add('ProjectGanttController', '*', Role::APP_MANAGER); + $acl->add('GroupListController', '*', Role::APP_ADMIN); + $acl->add('GroupCreationController', '*', Role::APP_ADMIN); + $acl->add('GroupModificationController', '*', Role::APP_ADMIN); + $acl->add('LinkController', '*', Role::APP_ADMIN); + $acl->add('ProjectCreationController', 'create', Role::APP_MANAGER); + $acl->add('ProjectUserOverviewController', '*', Role::APP_MANAGER); + $acl->add('TwoFactorController', 'disable', Role::APP_ADMIN); + $acl->add('UserImportController', '*', Role::APP_ADMIN); + $acl->add('UserCreationController', '*', Role::APP_ADMIN); + $acl->add('UserListController', '*', Role::APP_ADMIN); + $acl->add('UserStatusController', '*', Role::APP_ADMIN); + $acl->add('UserCredentialController', array('changeAuthentication', 'saveAuthentication'), Role::APP_ADMIN); + + return $acl; + } + + /** + * Get ACL for the API + * + * @access public + * @return AccessMap + */ + public function getApiAccessMap() + { + $acl = new AccessMap; + $acl->setDefaultRole(Role::APP_USER); + $acl->setRoleHierarchy(Role::APP_ADMIN, array(Role::APP_MANAGER, Role::APP_USER, Role::APP_PUBLIC)); + $acl->setRoleHierarchy(Role::APP_MANAGER, array(Role::APP_USER, Role::APP_PUBLIC)); + + $acl->add('UserProcedure', '*', Role::APP_ADMIN); + $acl->add('GroupMemberProcedure', '*', Role::APP_ADMIN); + $acl->add('GroupProcedure', '*', Role::APP_ADMIN); + $acl->add('LinkProcedure', '*', Role::APP_ADMIN); + $acl->add('TaskProcedure', array('getOverdueTasks'), Role::APP_ADMIN); + $acl->add('ProjectProcedure', array('getAllProjects'), Role::APP_ADMIN); + $acl->add('ProjectProcedure', array('createProject'), Role::APP_MANAGER); + + return $acl; + } + + /** + * Get ACL for the API + * + * @access public + * @return AccessMap + */ + public function getApiProjectAccessMap() + { + $acl = new AccessMap; + $acl->setDefaultRole(Role::PROJECT_VIEWER); + $acl->setRoleHierarchy(Role::PROJECT_MANAGER, array(Role::PROJECT_MEMBER, Role::PROJECT_VIEWER)); + $acl->setRoleHierarchy(Role::PROJECT_MEMBER, array(Role::PROJECT_VIEWER)); + + $acl->add('ActionProcedure', array('removeAction', 'getActions', 'createAction'), Role::PROJECT_MANAGER); + $acl->add('CategoryProcedure', '*', Role::PROJECT_MANAGER); + $acl->add('ColumnProcedure', '*', Role::PROJECT_MANAGER); + $acl->add('CommentProcedure', array('removeComment', 'createComment', 'updateComment'), Role::PROJECT_MEMBER); + $acl->add('ProjectPermissionProcedure', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectProcedure', array('updateProject', 'removeProject', 'enableProject', 'disableProject', 'enableProjectPublicAccess', 'disableProjectPublicAccess'), Role::PROJECT_MANAGER); + $acl->add('SubtaskProcedure', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskTimeTrackingProcedure', '*', Role::PROJECT_MEMBER); + $acl->add('SwimlaneProcedure', '*', Role::PROJECT_MANAGER); + $acl->add('ProjectFileProcedure', '*', Role::PROJECT_MEMBER); + $acl->add('TaskFileProcedure', '*', Role::PROJECT_MEMBER); + $acl->add('TaskLinkProcedure', '*', Role::PROJECT_MEMBER); + $acl->add('TaskExternalLinkProcedure', array('createExternalTaskLink', 'updateExternalTaskLink', 'removeExternalTaskLink'), Role::PROJECT_MEMBER); + $acl->add('TaskProcedure', '*', Role::PROJECT_MEMBER); return $acl; } diff --git a/sources/app/ServiceProvider/AvatarProvider.php b/sources/app/ServiceProvider/AvatarProvider.php index aac4fca..d17985e 100644 --- a/sources/app/ServiceProvider/AvatarProvider.php +++ b/sources/app/ServiceProvider/AvatarProvider.php @@ -12,7 +12,7 @@ use Kanboard\User\Avatar\LetterAvatarProvider; /** * Avatar Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class AvatarProvider implements ServiceProviderInterface diff --git a/sources/app/ServiceProvider/ClassProvider.php b/sources/app/ServiceProvider/ClassProvider.php index 3e654a4..e32c0d4 100644 --- a/sources/app/ServiceProvider/ClassProvider.php +++ b/sources/app/ServiceProvider/ClassProvider.php @@ -4,13 +4,18 @@ namespace Kanboard\ServiceProvider; use Pimple\Container; use Pimple\ServiceProviderInterface; -use Kanboard\Core\Mail\Client as EmailClient; use Kanboard\Core\ObjectStorage\FileStorage; use Kanboard\Core\Paginator; use Kanboard\Core\Http\OAuth2; use Kanboard\Core\Tool; use Kanboard\Core\Http\Client as HttpClient; +/** + * Class ClassProvider + * + * @package Kanboard\ServiceProvider + * @author Frederic Guillot + */ class ClassProvider implements ServiceProviderInterface { private $classes = array( @@ -22,71 +27,68 @@ class ClassProvider implements ServiceProviderInterface 'AverageTimeSpentColumnAnalytic', ), 'Model' => array( - 'Action', - 'ActionParameter', - 'AvatarFile', - 'Board', - 'Category', - 'Color', - 'Column', - 'Comment', - 'Config', - 'Currency', - 'CustomFilter', - 'Group', - 'GroupMember', - 'LastLogin', - 'Link', - 'Notification', - 'PasswordReset', - 'Project', - 'ProjectFile', - 'ProjectActivity', - 'ProjectDuplication', - 'ProjectDailyColumnStats', - 'ProjectDailyStats', - 'ProjectPermission', - 'ProjectNotification', - 'ProjectMetadata', - 'ProjectGroupRole', - 'ProjectGroupRoleFilter', - 'ProjectUserRole', - 'ProjectUserRoleFilter', - 'RememberMeSession', - 'Subtask', - 'SubtaskTimeTracking', - 'Swimlane', - 'Task', - 'TaskAnalytic', - 'TaskCreation', - 'TaskDuplication', - 'TaskExternalLink', - 'TaskFinder', - 'TaskFile', - 'TaskFilter', - 'TaskLink', - 'TaskModification', - 'TaskPermission', - 'TaskPosition', - 'TaskStatus', - 'TaskMetadata', - 'Transition', - 'User', - 'UserLocking', - 'UserMention', - 'UserNotification', - 'UserNotificationFilter', - 'UserUnreadNotification', - 'UserMetadata', - ), - 'Formatter' => array( - 'TaskFilterGanttFormatter', - 'TaskFilterAutoCompleteFormatter', - 'TaskFilterCalendarFormatter', - 'TaskFilterICalendarFormatter', - 'ProjectGanttFormatter', - 'UserFilterAutoCompleteFormatter', - 'GroupAutoCompleteFormatter', + 'ActionModel', + 'ActionParameterModel', + 'AvatarFileModel', + 'BoardModel', + 'CategoryModel', + 'ColorModel', + 'ColumnModel', + 'CommentModel', + 'ConfigModel', + 'CurrencyModel', + 'CustomFilterModel', + 'GroupModel', + 'GroupMemberModel', + 'LanguageModel', + 'LastLoginModel', + 'LinkModel', + 'NotificationModel', + 'PasswordResetModel', + 'ProjectModel', + 'ProjectFileModel', + 'ProjectActivityModel', + 'ProjectDuplicationModel', + 'ProjectDailyColumnStatsModel', + 'ProjectDailyStatsModel', + 'ProjectPermissionModel', + 'ProjectNotificationModel', + 'ProjectMetadataModel', + 'ProjectGroupRoleModel', + 'ProjectTaskDuplicationModel', + 'ProjectTaskPriorityModel', + 'ProjectUserRoleModel', + 'RememberMeSessionModel', + 'SubtaskModel', + 'SubtaskTimeTrackingModel', + 'SwimlaneModel', + 'TagDuplicationModel', + 'TagModel', + 'TaskModel', + 'TaskAnalyticModel', + 'TaskCreationModel', + 'TaskDuplicationModel', + 'TaskProjectDuplicationModel', + 'TaskProjectMoveModel', + 'TaskRecurrenceModel', + 'TaskExternalLinkModel', + 'TaskFinderModel', + 'TaskFileModel', + 'TaskLinkModel', + 'TaskModificationModel', + 'TaskPositionModel', + 'TaskStatusModel', + 'TaskTagModel', + 'TaskMetadataModel', + 'TimezoneModel', + 'TransitionModel', + 'UserModel', + 'UserLockingModel', + 'UserMentionModel', + 'UserNotificationModel', + 'UserNotificationFilterModel', + 'UserUnreadNotificationModel', + 'UserMetadataModel', ), 'Validator' => array( 'ActionValidator', @@ -103,8 +105,9 @@ class ClassProvider implements ServiceProviderInterface 'ProjectValidator', 'SubtaskValidator', 'SwimlaneValidator', - 'TaskValidator', + 'TagValidator', 'TaskLinkValidator', + 'TaskValidator', 'UserValidator', ), 'Import' => array( @@ -166,14 +169,6 @@ class ClassProvider implements ServiceProviderInterface return new FileStorage(FILES_DIR); }; - $container['emailClient'] = function ($container) { - $mailer = new EmailClient($container); - $mailer->setTransport('smtp', '\Kanboard\Core\Mail\Transport\Smtp'); - $mailer->setTransport('sendmail', '\Kanboard\Core\Mail\Transport\Sendmail'); - $mailer->setTransport('mail', '\Kanboard\Core\Mail\Transport\Mail'); - return $mailer; - }; - $container['cspRules'] = array( 'default-src' => "'self'", 'style-src' => "'self' 'unsafe-inline'", diff --git a/sources/app/ServiceProvider/CommandProvider.php b/sources/app/ServiceProvider/CommandProvider.php new file mode 100644 index 0000000..55c2712 --- /dev/null +++ b/sources/app/ServiceProvider/CommandProvider.php @@ -0,0 +1,62 @@ +add(new TaskOverdueNotificationCommand($container)); + $application->add(new SubtaskExportCommand($container)); + $application->add(new TaskExportCommand($container)); + $application->add(new ProjectDailyStatsCalculationCommand($container)); + $application->add(new ProjectDailyColumnStatsExportCommand($container)); + $application->add(new TransitionExportCommand($container)); + $application->add(new LocaleSyncCommand($container)); + $application->add(new LocaleComparatorCommand($container)); + $application->add(new TaskTriggerCommand($container)); + $application->add(new CronjobCommand($container)); + $application->add(new WorkerCommand($container)); + $application->add(new ResetPasswordCommand($container)); + $application->add(new ResetTwoFactorCommand($container)); + $application->add(new PluginUpgradeCommand($container)); + $application->add(new PluginInstallCommand($container)); + $application->add(new PluginUninstallCommand($container)); + + $container['cli'] = $application; + return $container; + } +} diff --git a/sources/app/ServiceProvider/DatabaseProvider.php b/sources/app/ServiceProvider/DatabaseProvider.php index d323807..a3f5745 100644 --- a/sources/app/ServiceProvider/DatabaseProvider.php +++ b/sources/app/ServiceProvider/DatabaseProvider.php @@ -8,13 +8,31 @@ use Pimple\Container; use Pimple\ServiceProviderInterface; use PicoDb\Database; +/** + * Class DatabaseProvider + * + * @package Kanboard\ServiceProvider + * @author Frederic Guillot + */ class DatabaseProvider implements ServiceProviderInterface { + /** + * Register provider + * + * @access public + * @param Container $container + * @return Container + */ public function register(Container $container) { $container['db'] = $this->getInstance(); - $container['db']->stopwatch = DEBUG; - $container['db']->logQueries = DEBUG; + + if (DEBUG) { + $container['db']->getStatementHandler() + ->withLogging() + ->withStopWatch() + ; + } return $container; } @@ -83,6 +101,9 @@ class DatabaseProvider implements ServiceProviderInterface 'database' => DB_NAME, 'charset' => 'utf8', 'port' => DB_PORT, + 'ssl_key' => DB_SSL_KEY, + 'ssl_ca' => DB_SSL_CA, + 'ssl_cert' => DB_SSL_CERT, )); } diff --git a/sources/app/ServiceProvider/EventDispatcherProvider.php b/sources/app/ServiceProvider/EventDispatcherProvider.php index 880caa4..57543fe 100644 --- a/sources/app/ServiceProvider/EventDispatcherProvider.php +++ b/sources/app/ServiceProvider/EventDispatcherProvider.php @@ -2,6 +2,7 @@ namespace Kanboard\ServiceProvider; +use Kanboard\Subscriber\LdapUserPhotoSubscriber; use Pimple\Container; use Pimple\ServiceProviderInterface; use Symfony\Component\EventDispatcher\EventDispatcher; @@ -14,6 +15,12 @@ use Kanboard\Subscriber\SubtaskTimeTrackingSubscriber; use Kanboard\Subscriber\TransitionSubscriber; use Kanboard\Subscriber\RecurringTaskSubscriber; +/** + * Class EventDispatcherProvider + * + * @package Kanboard\ServiceProvider + * @author Frederic Guillot + */ class EventDispatcherProvider implements ServiceProviderInterface { public function register(Container $container) @@ -28,6 +35,10 @@ class EventDispatcherProvider implements ServiceProviderInterface $container['dispatcher']->addSubscriber(new TransitionSubscriber($container)); $container['dispatcher']->addSubscriber(new RecurringTaskSubscriber($container)); + if (LDAP_AUTH && LDAP_USER_ATTRIBUTE_PHOTO !== '') { + $container['dispatcher']->addSubscriber(new LdapUserPhotoSubscriber($container)); + } + return $container; } } diff --git a/sources/app/ServiceProvider/ExternalLinkProvider.php b/sources/app/ServiceProvider/ExternalLinkProvider.php index 8b71ec8..2cec768 100644 --- a/sources/app/ServiceProvider/ExternalLinkProvider.php +++ b/sources/app/ServiceProvider/ExternalLinkProvider.php @@ -12,7 +12,7 @@ use Kanboard\ExternalLink\FileLinkProvider; /** * External Link Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class ExternalLinkProvider implements ServiceProviderInterface diff --git a/sources/app/ServiceProvider/FilterProvider.php b/sources/app/ServiceProvider/FilterProvider.php new file mode 100644 index 0000000..20281a0 --- /dev/null +++ b/sources/app/ServiceProvider/FilterProvider.php @@ -0,0 +1,178 @@ +createUserFilter($container); + $this->createProjectFilter($container); + $this->createTaskFilter($container); + return $container; + } + + public function createUserFilter(Container $container) + { + $container['userQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['db']->table(UserModel::TABLE)); + return $builder; + }); + + return $container; + } + + public function createProjectFilter(Container $container) + { + $container['projectGroupRoleQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['db']->table(ProjectGroupRoleModel::TABLE)); + return $builder; + }); + + $container['projectUserRoleQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['db']->table(ProjectUserRoleModel::TABLE)); + return $builder; + }); + + $container['projectQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['db']->table(ProjectModel::TABLE)); + return $builder; + }); + + $container['projectActivityLexer'] = $container->factory(function ($c) { + $builder = new LexerBuilder(); + $builder + ->withQuery($c['projectActivityModel']->getQuery()) + ->withFilter(new ProjectActivityTaskTitleFilter(), true) + ->withFilter(new ProjectActivityTaskStatusFilter()) + ->withFilter(new ProjectActivityProjectNameFilter()) + ->withFilter(ProjectActivityCreationDateFilter::getInstance() + ->setDateParser($c['dateParser']) + ) + ->withFilter(ProjectActivityCreatorFilter::getInstance() + ->setCurrentUserId($c['userSession']->getId()) + ) + ; + + return $builder; + }); + + $container['projectActivityQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['projectActivityModel']->getQuery()); + + return $builder; + }); + + return $container; + } + + public function createTaskFilter(Container $container) + { + $container['taskQuery'] = $container->factory(function ($c) { + $builder = new QueryBuilder(); + $builder->withQuery($c['taskFinderModel']->getExtendedQuery()); + return $builder; + }); + + $container['taskLexer'] = $container->factory(function ($c) { + $builder = new LexerBuilder(); + + $builder + ->withQuery($c['taskFinderModel']->getExtendedQuery()) + ->withFilter(TaskAssigneeFilter::getInstance() + ->setCurrentUserId($c['userSession']->getId()) + ) + ->withFilter(new TaskCategoryFilter()) + ->withFilter(TaskColorFilter::getInstance() + ->setColorModel($c['colorModel']) + ) + ->withFilter(new TaskColumnFilter()) + ->withFilter(new TaskCommentFilter()) + ->withFilter(TaskCreationDateFilter::getInstance() + ->setDateParser($c['dateParser']) + ) + ->withFilter(TaskCreatorFilter::getInstance() + ->setCurrentUserId($c['userSession']->getId()) + ) + ->withFilter(new TaskDescriptionFilter()) + ->withFilter(TaskDueDateFilter::getInstance() + ->setDateParser($c['dateParser']) + ) + ->withFilter(new TaskIdFilter()) + ->withFilter(TaskLinkFilter::getInstance() + ->setDatabase($c['db']) + ) + ->withFilter(TaskModificationDateFilter::getInstance() + ->setDateParser($c['dateParser']) + ) + ->withFilter(new TaskProjectFilter()) + ->withFilter(new TaskReferenceFilter()) + ->withFilter(new TaskStatusFilter()) + ->withFilter(TaskSubtaskAssigneeFilter::getInstance() + ->setCurrentUserId($c['userSession']->getId()) + ->setDatabase($c['db']) + ) + ->withFilter(new TaskSwimlaneFilter()) + ->withFilter(TaskTagFilter::getInstance() + ->setDatabase($c['db']) + ) + ->withFilter(new TaskTitleFilter(), true) + ; + + return $builder; + }); + + return $container; + } +} diff --git a/sources/app/ServiceProvider/GroupProvider.php b/sources/app/ServiceProvider/GroupProvider.php index b222b21..08548c7 100644 --- a/sources/app/ServiceProvider/GroupProvider.php +++ b/sources/app/ServiceProvider/GroupProvider.php @@ -11,7 +11,7 @@ use Kanboard\Group\LdapBackendGroupProvider; /** * Group Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class GroupProvider implements ServiceProviderInterface diff --git a/sources/app/ServiceProvider/HelperProvider.php b/sources/app/ServiceProvider/HelperProvider.php index 43a78e3..a909e3c 100644 --- a/sources/app/ServiceProvider/HelperProvider.php +++ b/sources/app/ServiceProvider/HelperProvider.php @@ -7,18 +7,26 @@ use Kanboard\Core\Template; use Pimple\Container; use Pimple\ServiceProviderInterface; +/** + * Class HelperProvider + * + * @package Kanboard\ServiceProvider + * @author Frederic Guillot + */ class HelperProvider implements ServiceProviderInterface { public function register(Container $container) { $container['helper'] = new Helper($container); $container['helper']->register('app', '\Kanboard\Helper\AppHelper'); + $container['helper']->register('calendar', '\Kanboard\Helper\CalendarHelper'); $container['helper']->register('asset', '\Kanboard\Helper\AssetHelper'); $container['helper']->register('board', '\Kanboard\Helper\BoardHelper'); $container['helper']->register('dt', '\Kanboard\Helper\DateHelper'); $container['helper']->register('file', '\Kanboard\Helper\FileHelper'); $container['helper']->register('form', '\Kanboard\Helper\FormHelper'); $container['helper']->register('hook', '\Kanboard\Helper\HookHelper'); + $container['helper']->register('ical', '\Kanboard\Helper\ICalHelper'); $container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper'); $container['helper']->register('model', '\Kanboard\Helper\ModelHelper'); $container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper'); @@ -28,6 +36,8 @@ class HelperProvider implements ServiceProviderInterface $container['helper']->register('user', '\Kanboard\Helper\UserHelper'); $container['helper']->register('avatar', '\Kanboard\Helper\AvatarHelper'); $container['helper']->register('projectHeader', '\Kanboard\Helper\ProjectHeaderHelper'); + $container['helper']->register('projectActivity', '\Kanboard\Helper\ProjectActivityHelper'); + $container['helper']->register('mail', '\Kanboard\Helper\MailHelper'); $container['template'] = new Template($container['helper']); diff --git a/sources/app/ServiceProvider/LoggingProvider.php b/sources/app/ServiceProvider/LoggingProvider.php index 68c074f..cb6d0ba 100644 --- a/sources/app/ServiceProvider/LoggingProvider.php +++ b/sources/app/ServiceProvider/LoggingProvider.php @@ -6,27 +6,48 @@ use Psr\Log\LogLevel; use Pimple\Container; use Pimple\ServiceProviderInterface; use SimpleLogger\Logger; +use SimpleLogger\Stderr; +use SimpleLogger\Stdout; use SimpleLogger\Syslog; use SimpleLogger\File; +/** + * Class LoggingProvider + * + * @package Kanboard\ServiceProvider + * @author Frederic Guillot + */ class LoggingProvider implements ServiceProviderInterface { public function register(Container $container) { $logger = new Logger; + $driver = null; - if (ENABLE_SYSLOG) { - $syslog = new Syslog('kanboard'); - $syslog->setLevel(LogLevel::ERROR); - $logger->setLogger($syslog); + switch (LOG_DRIVER) { + case 'syslog': + $driver = new Syslog('kanboard'); + break; + case 'stdout': + $driver = new Stdout(); + break; + case 'stderr': + $driver = new Stderr(); + break; + case 'file': + $driver = new File(LOG_FILE); + break; } - if (DEBUG) { - $logger->setLogger(new File(DEBUG_FILE)); + if ($driver !== null) { + if (! DEBUG) { + $driver->setLevel(LogLevel::INFO); + } + + $logger->setLogger($driver); } $container['logger'] = $logger; - return $container; } } diff --git a/sources/app/ServiceProvider/MailProvider.php b/sources/app/ServiceProvider/MailProvider.php new file mode 100644 index 0000000..685709e --- /dev/null +++ b/sources/app/ServiceProvider/MailProvider.php @@ -0,0 +1,34 @@ +setTransport('smtp', '\Kanboard\Core\Mail\Transport\Smtp'); + $mailer->setTransport('sendmail', '\Kanboard\Core\Mail\Transport\Sendmail'); + $mailer->setTransport('mail', '\Kanboard\Core\Mail\Transport\Mail'); + return $mailer; + }; + + return $container; + } +} diff --git a/sources/app/ServiceProvider/NotificationProvider.php b/sources/app/ServiceProvider/NotificationProvider.php index 83daf65..a057120 100644 --- a/sources/app/ServiceProvider/NotificationProvider.php +++ b/sources/app/ServiceProvider/NotificationProvider.php @@ -4,15 +4,15 @@ namespace Kanboard\ServiceProvider; use Pimple\Container; use Pimple\ServiceProviderInterface; -use Kanboard\Model\UserNotificationType; -use Kanboard\Model\ProjectNotificationType; -use Kanboard\Notification\Mail as MailNotification; -use Kanboard\Notification\Web as WebNotification; +use Kanboard\Model\UserNotificationTypeModel; +use Kanboard\Model\ProjectNotificationTypeModel; +use Kanboard\Notification\MailNotification as MailNotification; +use Kanboard\Notification\WebNotification as WebNotification; /** * Notification Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class NotificationProvider implements ServiceProviderInterface @@ -26,17 +26,17 @@ class NotificationProvider implements ServiceProviderInterface */ public function register(Container $container) { - $container['userNotificationType'] = function ($container) { - $type = new UserNotificationType($container); - $type->setType(MailNotification::TYPE, t('Email'), '\Kanboard\Notification\Mail'); - $type->setType(WebNotification::TYPE, t('Web'), '\Kanboard\Notification\Web'); + $container['userNotificationTypeModel'] = function ($container) { + $type = new UserNotificationTypeModel($container); + $type->setType(MailNotification::TYPE, t('Email'), '\Kanboard\Notification\MailNotification'); + $type->setType(WebNotification::TYPE, t('Web'), '\Kanboard\Notification\WebNotification'); return $type; }; - $container['projectNotificationType'] = function ($container) { - $type = new ProjectNotificationType($container); - $type->setType('webhook', 'Webhook', '\Kanboard\Notification\Webhook', true); - $type->setType('activity_stream', 'ActivityStream', '\Kanboard\Notification\ActivityStream', true); + $container['projectNotificationTypeModel'] = function ($container) { + $type = new ProjectNotificationTypeModel($container); + $type->setType('webhook', 'Webhook', '\Kanboard\Notification\WebhookNotification', true); + $type->setType('activity_stream', 'ActivityStream', '\Kanboard\Notification\ActivityStreamNotification', true); return $type; }; diff --git a/sources/app/ServiceProvider/PluginProvider.php b/sources/app/ServiceProvider/PluginProvider.php index d2f1666..4cf5725 100644 --- a/sources/app/ServiceProvider/PluginProvider.php +++ b/sources/app/ServiceProvider/PluginProvider.php @@ -9,7 +9,7 @@ use Kanboard\Core\Plugin\Loader; /** * Plugin Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class PluginProvider implements ServiceProviderInterface diff --git a/sources/app/ServiceProvider/QueueProvider.php b/sources/app/ServiceProvider/QueueProvider.php new file mode 100644 index 0000000..946b436 --- /dev/null +++ b/sources/app/ServiceProvider/QueueProvider.php @@ -0,0 +1,27 @@ +enable(); // Dashboard - $container['route']->addRoute('dashboard', 'app', 'index'); - $container['route']->addRoute('dashboard/:user_id', 'app', 'index'); - $container['route']->addRoute('dashboard/:user_id/projects', 'app', 'projects'); - $container['route']->addRoute('dashboard/:user_id/tasks', 'app', 'tasks'); - $container['route']->addRoute('dashboard/:user_id/subtasks', 'app', 'subtasks'); - $container['route']->addRoute('dashboard/:user_id/calendar', 'app', 'calendar'); - $container['route']->addRoute('dashboard/:user_id/activity', 'app', 'activity'); - $container['route']->addRoute('dashboard/:user_id/notifications', 'app', 'notifications'); + $container['route']->addRoute('dashboard', 'DashboardController', 'show'); + $container['route']->addRoute('dashboard/:user_id', 'DashboardController', 'show'); + $container['route']->addRoute('dashboard/:user_id/projects', 'DashboardController', 'projects'); + $container['route']->addRoute('dashboard/:user_id/tasks', 'DashboardController', 'tasks'); + $container['route']->addRoute('dashboard/:user_id/subtasks', 'DashboardController', 'subtasks'); + $container['route']->addRoute('dashboard/:user_id/calendar', 'DashboardController', 'calendar'); + $container['route']->addRoute('dashboard/:user_id/activity', 'DashboardController', 'activity'); + $container['route']->addRoute('dashboard/:user_id/notifications', 'DashboardController', 'notifications'); // Search routes - $container['route']->addRoute('search', 'search', 'index'); - $container['route']->addRoute('search/:search', 'search', 'index'); + $container['route']->addRoute('search', 'SearchController', 'index'); + $container['route']->addRoute('search/activity', 'SearchController', 'activity'); // ProjectCreation routes - $container['route']->addRoute('project/create', 'ProjectCreation', 'create'); - $container['route']->addRoute('project/create/private', 'ProjectCreation', 'createPrivate'); + $container['route']->addRoute('project/create', 'ProjectCreationController', 'create'); + $container['route']->addRoute('project/create/private', 'ProjectCreationController', 'createPrivate'); // Project routes - $container['route']->addRoute('projects', 'project', 'index'); - $container['route']->addRoute('project/:project_id', 'project', 'show'); - $container['route']->addRoute('p/:project_id', 'project', 'show'); - $container['route']->addRoute('project/:project_id/customer-filters', 'customfilter', 'index'); - $container['route']->addRoute('project/:project_id/share', 'project', 'share'); - $container['route']->addRoute('project/:project_id/notifications', 'project', 'notifications'); - $container['route']->addRoute('project/:project_id/integrations', 'project', 'integrations'); - $container['route']->addRoute('project/:project_id/duplicate', 'project', 'duplicate'); - $container['route']->addRoute('project/:project_id/remove', 'project', 'remove'); - $container['route']->addRoute('project/:project_id/disable', 'project', 'disable'); - $container['route']->addRoute('project/:project_id/enable', 'project', 'enable'); - $container['route']->addRoute('project/:project_id/permissions', 'ProjectPermission', 'index'); - $container['route']->addRoute('project/:project_id/import', 'taskImport', 'step1'); + $container['route']->addRoute('projects', 'ProjectListController', 'show'); + $container['route']->addRoute('project/:project_id', 'ProjectViewController', 'show'); + $container['route']->addRoute('p/:project_id', 'ProjectViewController', 'show'); + $container['route']->addRoute('project/:project_id/customer-filters', 'CustomFilterController', 'index'); + $container['route']->addRoute('project/:project_id/share', 'ProjectViewController', 'share'); + $container['route']->addRoute('project/:project_id/notifications', 'ProjectViewController', 'notifications'); + $container['route']->addRoute('project/:project_id/integrations', 'ProjectViewController', 'integrations'); + $container['route']->addRoute('project/:project_id/duplicate', 'ProjectViewController', 'duplicate'); + $container['route']->addRoute('project/:project_id/permissions', 'ProjectPermissionController', 'index'); + $container['route']->addRoute('project/:project_id/activity', 'ActivityController', 'project'); + $container['route']->addRoute('project/:project_id/tags', 'ProjectTagController', 'index'); // Project Overview - $container['route']->addRoute('project/:project_id/overview', 'ProjectOverview', 'show'); + $container['route']->addRoute('project/:project_id/overview', 'ProjectOverviewController', 'show'); // ProjectEdit routes - $container['route']->addRoute('project/:project_id/edit', 'ProjectEdit', 'edit'); - $container['route']->addRoute('project/:project_id/edit/dates', 'ProjectEdit', 'dates'); - $container['route']->addRoute('project/:project_id/edit/description', 'ProjectEdit', 'description'); - $container['route']->addRoute('project/:project_id/edit/priority', 'ProjectEdit', 'priority'); + $container['route']->addRoute('project/:project_id/edit', 'ProjectEditController', 'edit'); + $container['route']->addRoute('project/:project_id/edit/dates', 'ProjectEditController', 'dates'); + $container['route']->addRoute('project/:project_id/edit/description', 'ProjectEditController', 'description'); + $container['route']->addRoute('project/:project_id/edit/priority', 'ProjectEditController', 'priority'); // ProjectUser routes - $container['route']->addRoute('projects/managers/:user_id', 'projectuser', 'managers'); - $container['route']->addRoute('projects/members/:user_id', 'projectuser', 'members'); - $container['route']->addRoute('projects/tasks/:user_id/opens', 'projectuser', 'opens'); - $container['route']->addRoute('projects/tasks/:user_id/closed', 'projectuser', 'closed'); - $container['route']->addRoute('projects/managers', 'projectuser', 'managers'); + $container['route']->addRoute('projects/managers/:user_id', 'ProjectUserOverviewController', 'managers'); + $container['route']->addRoute('projects/members/:user_id', 'ProjectUserOverviewController', 'members'); + $container['route']->addRoute('projects/tasks/:user_id/opens', 'ProjectUserOverviewController', 'opens'); + $container['route']->addRoute('projects/tasks/:user_id/closed', 'ProjectUserOverviewController', 'closed'); + $container['route']->addRoute('projects/managers', 'ProjectUserOverviewController', 'managers'); // Action routes - $container['route']->addRoute('project/:project_id/actions', 'action', 'index'); + $container['route']->addRoute('project/:project_id/actions', 'ActionController', 'index'); // Column routes - $container['route']->addRoute('project/:project_id/columns', 'column', 'index'); + $container['route']->addRoute('project/:project_id/columns', 'ColumnController', 'index'); // Swimlane routes - $container['route']->addRoute('project/:project_id/swimlanes', 'swimlane', 'index'); + $container['route']->addRoute('project/:project_id/swimlanes', 'SwimlaneController', 'index'); // Category routes - $container['route']->addRoute('project/:project_id/categories', 'category', 'index'); + $container['route']->addRoute('project/:project_id/categories', 'CategoryController', 'index'); + + // Import routes + $container['route']->addRoute('project/:project_id/import', 'TaskImportController', 'show'); // Task routes - $container['route']->addRoute('project/:project_id/task/:task_id', 'task', 'show'); - $container['route']->addRoute('t/:task_id', 'task', 'show'); - $container['route']->addRoute('public/task/:task_id/:token', 'task', 'readonly'); + $container['route']->addRoute('project/:project_id/task/:task_id', 'TaskViewController', 'show'); + $container['route']->addRoute('t/:task_id', 'TaskViewController', 'show'); + $container['route']->addRoute('public/task/:task_id/:token', 'TaskViewController', 'readonly'); - $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'activity', 'task'); - $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'task', 'transitions'); - $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'task', 'analytics'); - $container['route']->addRoute('project/:project_id/task/:task_id/subtasks', 'subtask', 'show'); - $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'task', 'timetracking'); + $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'ActivityController', 'task'); + $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'TaskViewController', 'transitions'); + $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'TaskViewController', 'analytics'); + $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'TaskViewController', 'timetracking'); // Exports - $container['route']->addRoute('export/tasks/:project_id', 'export', 'tasks'); - $container['route']->addRoute('export/subtasks/:project_id', 'export', 'subtasks'); - $container['route']->addRoute('export/transitions/:project_id', 'export', 'transitions'); - $container['route']->addRoute('export/summary/:project_id', 'export', 'summary'); + $container['route']->addRoute('export/tasks/:project_id', 'ExportController', 'tasks'); + $container['route']->addRoute('export/subtasks/:project_id', 'ExportController', 'subtasks'); + $container['route']->addRoute('export/transitions/:project_id', 'ExportController', 'transitions'); + $container['route']->addRoute('export/summary/:project_id', 'ExportController', 'summary'); // Analytics routes - $container['route']->addRoute('analytics/tasks/:project_id', 'analytic', 'tasks'); - $container['route']->addRoute('analytics/users/:project_id', 'analytic', 'users'); - $container['route']->addRoute('analytics/cfd/:project_id', 'analytic', 'cfd'); - $container['route']->addRoute('analytics/burndown/:project_id', 'analytic', 'burndown'); - $container['route']->addRoute('analytics/average-time-column/:project_id', 'analytic', 'averageTimeByColumn'); - $container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'analytic', 'leadAndCycleTime'); - $container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'analytic', 'compareHours'); + $container['route']->addRoute('analytics/tasks/:project_id', 'AnalyticController', 'tasks'); + $container['route']->addRoute('analytics/users/:project_id', 'AnalyticController', 'users'); + $container['route']->addRoute('analytics/cfd/:project_id', 'AnalyticController', 'cfd'); + $container['route']->addRoute('analytics/burndown/:project_id', 'AnalyticController', 'burndown'); + $container['route']->addRoute('analytics/average-time-column/:project_id', 'AnalyticController', 'averageTimeByColumn'); + $container['route']->addRoute('analytics/lead-cycle-time/:project_id', 'AnalyticController', 'leadAndCycleTime'); + $container['route']->addRoute('analytics/estimated-spent-time/:project_id', 'AnalyticController', 'compareHours'); // Board routes - $container['route']->addRoute('board/:project_id', 'board', 'show'); - $container['route']->addRoute('b/:project_id', 'board', 'show'); - $container['route']->addRoute('public/board/:token', 'board', 'readonly'); + $container['route']->addRoute('board/:project_id', 'BoardViewController', 'show'); + $container['route']->addRoute('b/:project_id', 'BoardViewController', 'show'); + $container['route']->addRoute('public/board/:token', 'BoardViewController', 'readonly'); // Calendar routes - $container['route']->addRoute('calendar/:project_id', 'calendar', 'show'); - $container['route']->addRoute('c/:project_id', 'calendar', 'show'); + $container['route']->addRoute('calendar/:project_id', 'CalendarController', 'show'); + $container['route']->addRoute('c/:project_id', 'CalendarController', 'show'); // Listing routes - $container['route']->addRoute('list/:project_id', 'listing', 'show'); - $container['route']->addRoute('l/:project_id', 'listing', 'show'); + $container['route']->addRoute('list/:project_id', 'TaskListController', 'show'); + $container['route']->addRoute('l/:project_id', 'TaskListController', 'show'); // Gantt routes - $container['route']->addRoute('gantt/:project_id', 'gantt', 'project'); - $container['route']->addRoute('gantt/:project_id/sort/:sorting', 'gantt', 'project'); + $container['route']->addRoute('gantt/:project_id', 'TaskGanttController', 'show'); + $container['route']->addRoute('gantt/:project_id/sort/:sorting', 'TaskGanttController', 'show'); // Feed routes - $container['route']->addRoute('feed/project/:token', 'feed', 'project'); - $container['route']->addRoute('feed/user/:token', 'feed', 'user'); + $container['route']->addRoute('feed/project/:token', 'FeedController', 'project'); + $container['route']->addRoute('feed/user/:token', 'FeedController', 'user'); // Ical routes - $container['route']->addRoute('ical/project/:token', 'ical', 'project'); - $container['route']->addRoute('ical/user/:token', 'ical', 'user'); + $container['route']->addRoute('ical/project/:token', 'ICalendarController', 'project'); + $container['route']->addRoute('ical/user/:token', 'ICalendarController', 'user'); // Users - $container['route']->addRoute('users', 'user', 'index'); - $container['route']->addRoute('user/profile/:user_id', 'user', 'profile'); - $container['route']->addRoute('user/show/:user_id', 'user', 'show'); - $container['route']->addRoute('user/show/:user_id/timesheet', 'user', 'timesheet'); - $container['route']->addRoute('user/show/:user_id/last-logins', 'user', 'last'); - $container['route']->addRoute('user/show/:user_id/sessions', 'user', 'sessions'); - $container['route']->addRoute('user/:user_id/edit', 'user', 'edit'); - $container['route']->addRoute('user/:user_id/password', 'user', 'password'); - $container['route']->addRoute('user/:user_id/share', 'user', 'share'); - $container['route']->addRoute('user/:user_id/notifications', 'user', 'notifications'); - $container['route']->addRoute('user/:user_id/accounts', 'user', 'external'); - $container['route']->addRoute('user/:user_id/integrations', 'user', 'integrations'); - $container['route']->addRoute('user/:user_id/authentication', 'user', 'authentication'); - $container['route']->addRoute('user/:user_id/2fa', 'twofactor', 'index'); + $container['route']->addRoute('users', 'UserListController', 'show'); + $container['route']->addRoute('user/profile/:user_id', 'UserViewController', 'profile'); + $container['route']->addRoute('user/show/:user_id', 'UserViewController', 'show'); + $container['route']->addRoute('user/show/:user_id/timesheet', 'UserViewController', 'timesheet'); + $container['route']->addRoute('user/show/:user_id/last-logins', 'UserViewController', 'lastLogin'); + $container['route']->addRoute('user/show/:user_id/sessions', 'UserViewController', 'sessions'); + $container['route']->addRoute('user/:user_id/edit', 'UserModificationController', 'show'); + $container['route']->addRoute('user/:user_id/password', 'UserCredentialController', 'changePassword'); + $container['route']->addRoute('user/:user_id/share', 'UserViewController', 'share'); + $container['route']->addRoute('user/:user_id/notifications', 'UserViewController', 'notifications'); + $container['route']->addRoute('user/:user_id/accounts', 'UserViewController', 'external'); + $container['route']->addRoute('user/:user_id/integrations', 'UserViewController', 'integrations'); + $container['route']->addRoute('user/:user_id/authentication', 'UserCredentialController', 'changeAuthentication'); + $container['route']->addRoute('user/:user_id/2fa', 'TwoFactorController', 'index'); + $container['route']->addRoute('user/:user_id/avatar', 'AvatarFileController', 'show'); // Groups - $container['route']->addRoute('groups', 'group', 'index'); - $container['route']->addRoute('groups/create', 'group', 'create'); - $container['route']->addRoute('group/:group_id/associate', 'group', 'associate'); - $container['route']->addRoute('group/:group_id/dissociate/:user_id', 'group', 'dissociate'); - $container['route']->addRoute('group/:group_id/edit', 'group', 'edit'); - $container['route']->addRoute('group/:group_id/members', 'group', 'users'); - $container['route']->addRoute('group/:group_id/remove', 'group', 'confirm'); + $container['route']->addRoute('groups', 'GroupListController', 'index'); + $container['route']->addRoute('group/:group_id/members', 'GroupListController', 'users'); // Config - $container['route']->addRoute('settings', 'config', 'index'); - $container['route']->addRoute('settings/plugins', 'config', 'plugins'); - $container['route']->addRoute('settings/application', 'config', 'application'); - $container['route']->addRoute('settings/project', 'config', 'project'); - $container['route']->addRoute('settings/project', 'config', 'project'); - $container['route']->addRoute('settings/board', 'config', 'board'); - $container['route']->addRoute('settings/calendar', 'config', 'calendar'); - $container['route']->addRoute('settings/integrations', 'config', 'integrations'); - $container['route']->addRoute('settings/webhook', 'config', 'webhook'); - $container['route']->addRoute('settings/api', 'config', 'api'); - $container['route']->addRoute('settings/links', 'link', 'index'); - $container['route']->addRoute('settings/currencies', 'currency', 'index'); + $container['route']->addRoute('settings', 'ConfigController', 'index'); + $container['route']->addRoute('settings/application', 'ConfigController', 'application'); + $container['route']->addRoute('settings/project', 'ConfigController', 'project'); + $container['route']->addRoute('settings/project', 'ConfigController', 'project'); + $container['route']->addRoute('settings/board', 'ConfigController', 'board'); + $container['route']->addRoute('settings/calendar', 'ConfigController', 'calendar'); + $container['route']->addRoute('settings/integrations', 'ConfigController', 'integrations'); + $container['route']->addRoute('settings/webhook', 'ConfigController', 'webhook'); + $container['route']->addRoute('settings/api', 'ConfigController', 'api'); + $container['route']->addRoute('settings/links', 'LinkController', 'index'); + $container['route']->addRoute('settings/currencies', 'CurrencyController', 'index'); + $container['route']->addRoute('settings/tags', 'TagController', 'index'); + + // Plugins + $container['route']->addRoute('extensions', 'PluginController', 'show'); + $container['route']->addRoute('extensions/directory', 'PluginController', 'directory'); // Doc - $container['route']->addRoute('documentation/:file', 'doc', 'show'); - $container['route']->addRoute('documentation', 'doc', 'show'); + $container['route']->addRoute('documentation/:file', 'DocumentationController', 'show'); + $container['route']->addRoute('documentation', 'DocumentationController', 'show'); // Auth routes - $container['route']->addRoute('login', 'auth', 'login'); - $container['route']->addRoute('logout', 'auth', 'logout'); + $container['route']->addRoute('login', 'AuthController', 'login'); + $container['route']->addRoute('logout', 'AuthController', 'logout'); // PasswordReset - $container['route']->addRoute('forgot-password', 'PasswordReset', 'create'); - $container['route']->addRoute('forgot-password/change/:token', 'PasswordReset', 'change'); + $container['route']->addRoute('forgot-password', 'PasswordResetController', 'create'); + $container['route']->addRoute('forgot-password/change/:token', 'PasswordResetController', 'change'); } return $container; diff --git a/sources/app/ServiceProvider/SessionProvider.php b/sources/app/ServiceProvider/SessionProvider.php index 0999d53..96dcac2 100644 --- a/sources/app/ServiceProvider/SessionProvider.php +++ b/sources/app/ServiceProvider/SessionProvider.php @@ -11,7 +11,7 @@ use Kanboard\Core\Session\FlashMessage; /** * Session Provider * - * @package serviceProvider + * @package Kanboard\ServiceProvider * @author Frederic Guillot */ class SessionProvider implements ServiceProviderInterface diff --git a/sources/app/Subscriber/AuthSubscriber.php b/sources/app/Subscriber/AuthSubscriber.php index dfb95a0..0097c40 100644 --- a/sources/app/Subscriber/AuthSubscriber.php +++ b/sources/app/Subscriber/AuthSubscriber.php @@ -45,9 +45,9 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface $userAgent = $this->request->getUserAgent(); $ipAddress = $this->request->getIpAddress(); - $this->userLocking->resetFailedLogin($this->userSession->getUsername()); + $this->userLockingModel->resetFailedLogin($this->userSession->getUsername()); - $this->lastLogin->create( + $this->lastLoginModel->create( $event->getAuthType(), $this->userSession->getId(), $ipAddress, @@ -59,7 +59,7 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface } if (isset($this->sessionStorage->hasRememberMe) && $this->sessionStorage->hasRememberMe) { - $session = $this->rememberMeSession->create($this->userSession->getId(), $ipAddress, $userAgent); + $session = $this->rememberMeSessionModel->create($this->userSession->getId(), $ipAddress, $userAgent); $this->rememberMeCookie->write($session['token'], $session['sequence'], $session['expiration']); } } @@ -75,10 +75,10 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface $credentials = $this->rememberMeCookie->read(); if ($credentials !== false) { - $session = $this->rememberMeSession->find($credentials['token'], $credentials['sequence']); + $session = $this->rememberMeSessionModel->find($credentials['token'], $credentials['sequence']); if (! empty($session)) { - $this->rememberMeSession->remove($session['id']); + $this->rememberMeSessionModel->remove($session['id']); } $this->rememberMeCookie->remove(); @@ -97,10 +97,10 @@ class AuthSubscriber extends BaseSubscriber implements EventSubscriberInterface $username = $event->getUsername(); if (! empty($username)) { - $this->userLocking->incrementFailedLogin($username); + $this->userLockingModel->incrementFailedLogin($username); - if ($this->userLocking->getFailedLogin($username) > BRUTEFORCE_LOCKDOWN) { - $this->userLocking->lock($username, BRUTEFORCE_LOCKDOWN_DURATION); + if ($this->userLockingModel->getFailedLogin($username) > BRUTEFORCE_LOCKDOWN) { + $this->userLockingModel->lock($username, BRUTEFORCE_LOCKDOWN_DURATION); } } } diff --git a/sources/app/Subscriber/BaseSubscriber.php b/sources/app/Subscriber/BaseSubscriber.php index 2e41da7..fdea29f 100644 --- a/sources/app/Subscriber/BaseSubscriber.php +++ b/sources/app/Subscriber/BaseSubscriber.php @@ -34,7 +34,6 @@ class BaseSubscriber extends Base } $this->called[$key] = true; - return false; } } diff --git a/sources/app/Subscriber/BootstrapSubscriber.php b/sources/app/Subscriber/BootstrapSubscriber.php index ef0215f..7d12e9a 100644 --- a/sources/app/Subscriber/BootstrapSubscriber.php +++ b/sources/app/Subscriber/BootstrapSubscriber.php @@ -16,12 +16,12 @@ class BootstrapSubscriber extends BaseSubscriber implements EventSubscriberInter public function execute() { $this->logger->debug('Subscriber executed: '.__METHOD__); - $this->config->setupTranslations(); - $this->config->setupTimezone(); + $this->languageModel->loadCurrentLanguage(); + $this->timezoneModel->setCurrentTimezone(); $this->actionManager->attachEvents(); if ($this->userSession->isLogged()) { - $this->sessionStorage->hasSubtaskInProgress = $this->subtask->hasSubtaskInProgress($this->userSession->getId()); + $this->sessionStorage->hasSubtaskInProgress = $this->subtaskModel->hasSubtaskInProgress($this->userSession->getId()); } } @@ -29,13 +29,13 @@ class BootstrapSubscriber extends BaseSubscriber implements EventSubscriberInter { if (DEBUG) { foreach ($this->db->getLogMessages() as $message) { - $this->logger->debug($message); + $this->logger->debug('SQL: ' . $message); } - $this->logger->debug('SQL_QUERIES={nb}', array('nb' => $this->container['db']->nbQueries)); - $this->logger->debug('RENDERING={time}', array('time' => microtime(true) - $this->request->getStartTime())); - $this->logger->debug('MEMORY='.$this->helper->text->bytes(memory_get_usage())); - $this->logger->debug('URI='.$this->request->getUri()); + $this->logger->debug('APP: nb_queries={nb}', array('nb' => $this->db->getStatementHandler()->getNbQueries())); + $this->logger->debug('APP: rendering_time={time}', array('time' => microtime(true) - $this->request->getStartTime())); + $this->logger->debug('APP: memory_usage='.$this->helper->text->bytes(memory_get_usage())); + $this->logger->debug('APP: uri='.$this->request->getUri()); $this->logger->debug('###############################################'); } } diff --git a/sources/app/Subscriber/LdapUserPhotoSubscriber.php b/sources/app/Subscriber/LdapUserPhotoSubscriber.php new file mode 100644 index 0000000..93672cd --- /dev/null +++ b/sources/app/Subscriber/LdapUserPhotoSubscriber.php @@ -0,0 +1,49 @@ + 'syncUserPhoto', + ); + } + + /** + * Save the user profile photo from LDAP to the object storage + * + * @access public + * @param UserProfileSyncEvent $event + */ + public function syncUserPhoto(UserProfileSyncEvent $event) + { + if (is_a($event->getUser(), 'Kanboard\User\LdapUserProvider')) { + $profile = $event->getProfile(); + $photo = $event->getUser()->getPhoto(); + + if (empty($profile['avatar_path']) && ! empty($photo)) { + $this->logger->info('Saving user photo from LDAP profile'); + $this->avatarFileModel->uploadImageContent($profile['id'], $photo); + } + } + } +} diff --git a/sources/app/Subscriber/NotificationSubscriber.php b/sources/app/Subscriber/NotificationSubscriber.php index 651b8a9..db11e58 100644 --- a/sources/app/Subscriber/NotificationSubscriber.php +++ b/sources/app/Subscriber/NotificationSubscriber.php @@ -3,10 +3,11 @@ namespace Kanboard\Subscriber; use Kanboard\Event\GenericEvent; -use Kanboard\Model\Task; -use Kanboard\Model\Comment; -use Kanboard\Model\Subtask; -use Kanboard\Model\TaskFile; +use Kanboard\Job\NotificationJob; +use Kanboard\Model\TaskModel; +use Kanboard\Model\CommentModel; +use Kanboard\Model\SubtaskModel; +use Kanboard\Model\TaskFileModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class NotificationSubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -14,67 +15,32 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn public static function getSubscribedEvents() { return array( - Task::EVENT_USER_MENTION => 'handleEvent', - Task::EVENT_CREATE => 'handleEvent', - Task::EVENT_UPDATE => 'handleEvent', - Task::EVENT_CLOSE => 'handleEvent', - Task::EVENT_OPEN => 'handleEvent', - Task::EVENT_MOVE_COLUMN => 'handleEvent', - Task::EVENT_MOVE_POSITION => 'handleEvent', - Task::EVENT_MOVE_SWIMLANE => 'handleEvent', - Task::EVENT_ASSIGNEE_CHANGE => 'handleEvent', - Subtask::EVENT_CREATE => 'handleEvent', - Subtask::EVENT_UPDATE => 'handleEvent', - Comment::EVENT_CREATE => 'handleEvent', - Comment::EVENT_UPDATE => 'handleEvent', - Comment::EVENT_USER_MENTION => 'handleEvent', - TaskFile::EVENT_CREATE => 'handleEvent', + TaskModel::EVENT_USER_MENTION => 'handleEvent', + TaskModel::EVENT_CREATE => 'handleEvent', + TaskModel::EVENT_UPDATE => 'handleEvent', + TaskModel::EVENT_CLOSE => 'handleEvent', + TaskModel::EVENT_OPEN => 'handleEvent', + TaskModel::EVENT_MOVE_COLUMN => 'handleEvent', + TaskModel::EVENT_MOVE_POSITION => 'handleEvent', + TaskModel::EVENT_MOVE_SWIMLANE => 'handleEvent', + TaskModel::EVENT_ASSIGNEE_CHANGE => 'handleEvent', + SubtaskModel::EVENT_CREATE => 'handleEvent', + SubtaskModel::EVENT_UPDATE => 'handleEvent', + CommentModel::EVENT_CREATE => 'handleEvent', + CommentModel::EVENT_UPDATE => 'handleEvent', + CommentModel::EVENT_USER_MENTION => 'handleEvent', + TaskFileModel::EVENT_CREATE => 'handleEvent', ); } - public function handleEvent(GenericEvent $event, $event_name) + public function handleEvent(GenericEvent $event, $eventName) { - if (! $this->isExecuted($event_name)) { - $this->logger->debug('Subscriber executed: '.__METHOD__); - $event_data = $this->getEventData($event); + if (!$this->isExecuted($eventName)) { + $this->logger->debug('Subscriber executed: ' . __METHOD__); - if (! empty($event_data)) { - if (! empty($event['mention'])) { - $this->userNotification->sendUserNotification($event['mention'], $event_name, $event_data); - } else { - $this->userNotification->sendNotifications($event_name, $event_data); - $this->projectNotification->sendNotifications($event_data['task']['project_id'], $event_name, $event_data); - } - } + $this->queueManager->push(NotificationJob::getInstance($this->container) + ->withParams($event, $eventName, get_class($event)) + ); } } - - public function getEventData(GenericEvent $event) - { - $values = array(); - - if (! empty($event['changes'])) { - $values['changes'] = $event['changes']; - } - - switch (get_class($event)) { - case 'Kanboard\Event\TaskEvent': - $values['task'] = $this->taskFinder->getDetails($event['task_id']); - break; - case 'Kanboard\Event\SubtaskEvent': - $values['subtask'] = $this->subtask->getById($event['id'], true); - $values['task'] = $this->taskFinder->getDetails($values['subtask']['task_id']); - break; - case 'Kanboard\Event\FileEvent': - $values['file'] = $event->getAll(); - $values['task'] = $this->taskFinder->getDetails($values['file']['task_id']); - break; - case 'Kanboard\Event\CommentEvent': - $values['comment'] = $this->comment->getById($event['id']); - $values['task'] = $this->taskFinder->getDetails($values['comment']['task_id']); - break; - } - - return $values; - } } diff --git a/sources/app/Subscriber/ProjectDailySummarySubscriber.php b/sources/app/Subscriber/ProjectDailySummarySubscriber.php index 44138f4..6971a12 100644 --- a/sources/app/Subscriber/ProjectDailySummarySubscriber.php +++ b/sources/app/Subscriber/ProjectDailySummarySubscriber.php @@ -3,7 +3,8 @@ namespace Kanboard\Subscriber; use Kanboard\Event\TaskEvent; -use Kanboard\Model\Task; +use Kanboard\Job\ProjectMetricJob; +use Kanboard\Model\TaskModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -11,11 +12,11 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc public static function getSubscribedEvents() { return array( - Task::EVENT_CREATE_UPDATE => 'execute', - Task::EVENT_CLOSE => 'execute', - Task::EVENT_OPEN => 'execute', - Task::EVENT_MOVE_COLUMN => 'execute', - Task::EVENT_MOVE_SWIMLANE => 'execute', + TaskModel::EVENT_CREATE_UPDATE => 'execute', + TaskModel::EVENT_CLOSE => 'execute', + TaskModel::EVENT_OPEN => 'execute', + TaskModel::EVENT_MOVE_COLUMN => 'execute', + TaskModel::EVENT_MOVE_SWIMLANE => 'execute', ); } @@ -23,8 +24,7 @@ class ProjectDailySummarySubscriber extends BaseSubscriber implements EventSubsc { if (isset($event['project_id']) && !$this->isExecuted()) { $this->logger->debug('Subscriber executed: '.__METHOD__); - $this->projectDailyColumnStats->updateTotals($event['project_id'], date('Y-m-d')); - $this->projectDailyStats->updateTotals($event['project_id'], date('Y-m-d')); + $this->queueManager->push(ProjectMetricJob::getInstance($this->container)->withParams($event['project_id'])); } } } diff --git a/sources/app/Subscriber/ProjectModificationDateSubscriber.php b/sources/app/Subscriber/ProjectModificationDateSubscriber.php index 62804a8..fee04ea 100644 --- a/sources/app/Subscriber/ProjectModificationDateSubscriber.php +++ b/sources/app/Subscriber/ProjectModificationDateSubscriber.php @@ -3,7 +3,7 @@ namespace Kanboard\Subscriber; use Kanboard\Event\GenericEvent; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class ProjectModificationDateSubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -11,14 +11,14 @@ class ProjectModificationDateSubscriber extends BaseSubscriber implements EventS public static function getSubscribedEvents() { return array( - Task::EVENT_CREATE_UPDATE => 'execute', - Task::EVENT_CLOSE => 'execute', - Task::EVENT_OPEN => 'execute', - Task::EVENT_MOVE_SWIMLANE => 'execute', - Task::EVENT_MOVE_COLUMN => 'execute', - Task::EVENT_MOVE_POSITION => 'execute', - Task::EVENT_MOVE_PROJECT => 'execute', - Task::EVENT_ASSIGNEE_CHANGE => 'execute', + TaskModel::EVENT_CREATE_UPDATE => 'execute', + TaskModel::EVENT_CLOSE => 'execute', + TaskModel::EVENT_OPEN => 'execute', + TaskModel::EVENT_MOVE_SWIMLANE => 'execute', + TaskModel::EVENT_MOVE_COLUMN => 'execute', + TaskModel::EVENT_MOVE_POSITION => 'execute', + TaskModel::EVENT_MOVE_PROJECT => 'execute', + TaskModel::EVENT_ASSIGNEE_CHANGE => 'execute', ); } @@ -26,7 +26,7 @@ class ProjectModificationDateSubscriber extends BaseSubscriber implements EventS { if (isset($event['project_id']) && !$this->isExecuted()) { $this->logger->debug('Subscriber executed: '.__METHOD__); - $this->project->updateModificationDate($event['project_id']); + $this->projectModel->updateModificationDate($event['project_id']); } } } diff --git a/sources/app/Subscriber/RecurringTaskSubscriber.php b/sources/app/Subscriber/RecurringTaskSubscriber.php index 09a5665..21cd399 100644 --- a/sources/app/Subscriber/RecurringTaskSubscriber.php +++ b/sources/app/Subscriber/RecurringTaskSubscriber.php @@ -3,7 +3,7 @@ namespace Kanboard\Subscriber; use Kanboard\Event\TaskEvent; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -11,8 +11,8 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI public static function getSubscribedEvents() { return array( - Task::EVENT_MOVE_COLUMN => 'onMove', - Task::EVENT_CLOSE => 'onClose', + TaskModel::EVENT_MOVE_COLUMN => 'onMove', + TaskModel::EVENT_CLOSE => 'onClose', ); } @@ -20,11 +20,11 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI { $this->logger->debug('Subscriber executed: '.__METHOD__); - if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING) { - if ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_FIRST_COLUMN && $this->column->getFirstColumnId($event['project_id']) == $event['src_column_id']) { - $this->taskDuplication->duplicateRecurringTask($event['task_id']); - } elseif ($event['recurrence_trigger'] == Task::RECURRING_TRIGGER_LAST_COLUMN && $this->column->getLastColumnId($event['project_id']) == $event['dst_column_id']) { - $this->taskDuplication->duplicateRecurringTask($event['task_id']); + if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING) { + if ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_FIRST_COLUMN && $this->columnModel->getFirstColumnId($event['project_id']) == $event['src_column_id']) { + $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']); + } elseif ($event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_LAST_COLUMN && $this->columnModel->getLastColumnId($event['project_id']) == $event['dst_column_id']) { + $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']); } } } @@ -33,8 +33,8 @@ class RecurringTaskSubscriber extends BaseSubscriber implements EventSubscriberI { $this->logger->debug('Subscriber executed: '.__METHOD__); - if ($event['recurrence_status'] == Task::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == Task::RECURRING_TRIGGER_CLOSE) { - $this->taskDuplication->duplicateRecurringTask($event['task_id']); + if ($event['recurrence_status'] == TaskModel::RECURRING_STATUS_PENDING && $event['recurrence_trigger'] == TaskModel::RECURRING_TRIGGER_CLOSE) { + $this->taskRecurrenceModel->duplicateRecurringTask($event['task_id']); } } } diff --git a/sources/app/Subscriber/SubtaskTimeTrackingSubscriber.php b/sources/app/Subscriber/SubtaskTimeTrackingSubscriber.php index c0852bc..7e39c12 100644 --- a/sources/app/Subscriber/SubtaskTimeTrackingSubscriber.php +++ b/sources/app/Subscriber/SubtaskTimeTrackingSubscriber.php @@ -3,7 +3,7 @@ namespace Kanboard\Subscriber; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Kanboard\Model\Subtask; +use Kanboard\Model\SubtaskModel; use Kanboard\Event\SubtaskEvent; class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -11,9 +11,9 @@ class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubsc public static function getSubscribedEvents() { return array( - Subtask::EVENT_CREATE => 'updateTaskTime', - Subtask::EVENT_DELETE => 'updateTaskTime', - Subtask::EVENT_UPDATE => array( + SubtaskModel::EVENT_CREATE => 'updateTaskTime', + SubtaskModel::EVENT_DELETE => 'updateTaskTime', + SubtaskModel::EVENT_UPDATE => array( array('logStartEnd', 10), array('updateTaskTime', 0), ) @@ -24,24 +24,24 @@ class SubtaskTimeTrackingSubscriber extends BaseSubscriber implements EventSubsc { if (isset($event['task_id'])) { $this->logger->debug('Subscriber executed: '.__METHOD__); - $this->subtaskTimeTracking->updateTaskTimeTracking($event['task_id']); + $this->subtaskTimeTrackingModel->updateTaskTimeTracking($event['task_id']); } } public function logStartEnd(SubtaskEvent $event) { - if (isset($event['status']) && $this->config->get('subtask_time_tracking') == 1) { + if (isset($event['status']) && $this->configModel->get('subtask_time_tracking') == 1) { $this->logger->debug('Subscriber executed: '.__METHOD__); - $subtask = $this->subtask->getById($event['id']); + $subtask = $this->subtaskModel->getById($event['id']); if (empty($subtask['user_id'])) { return false; } - if ($subtask['status'] == Subtask::STATUS_INPROGRESS) { - return $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']); + if ($subtask['status'] == SubtaskModel::STATUS_INPROGRESS) { + return $this->subtaskTimeTrackingModel->logStartTime($subtask['id'], $subtask['user_id']); } else { - return $this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']); + return $this->subtaskTimeTrackingModel->logEndTime($subtask['id'], $subtask['user_id']); } } } diff --git a/sources/app/Subscriber/TransitionSubscriber.php b/sources/app/Subscriber/TransitionSubscriber.php index bd53748..26d08f8 100644 --- a/sources/app/Subscriber/TransitionSubscriber.php +++ b/sources/app/Subscriber/TransitionSubscriber.php @@ -3,7 +3,7 @@ namespace Kanboard\Subscriber; use Kanboard\Event\TaskEvent; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInterface @@ -11,7 +11,7 @@ class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInte public static function getSubscribedEvents() { return array( - Task::EVENT_MOVE_COLUMN => 'execute', + TaskModel::EVENT_MOVE_COLUMN => 'execute', ); } @@ -22,7 +22,7 @@ class TransitionSubscriber extends BaseSubscriber implements EventSubscriberInte $user_id = $this->userSession->getId(); if (! empty($user_id)) { - $this->transition->save($user_id, $event->getAll()); + $this->transitionModel->save($user_id, $event->getAll()); } } } diff --git a/sources/app/Template/action/index.php b/sources/app/Template/action/index.php index 63d6388..0a94e4f 100644 --- a/sources/app/Template/action/index.php +++ b/sources/app/Template/action/index.php @@ -3,11 +3,11 @@ @@ -63,9 +63,9 @@ - url->link(t('Remove'), 'action', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?> + url->link(t('Remove'), 'ActionController', 'confirm', array('project_id' => $project['id'], 'action_id' => $action['id']), false, 'popover') ?> - \ No newline at end of file + diff --git a/sources/app/Template/action/remove.php b/sources/app/Template/action/remove.php index 070a791..384bec7 100644 --- a/sources/app/Template/action/remove.php +++ b/sources/app/Template/action/remove.php @@ -8,8 +8,8 @@

- url->link(t('Yes'), 'action', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'ActionController', 'remove', array('project_id' => $project['id'], 'action_id' => $action['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
- \ No newline at end of file + diff --git a/sources/app/Template/action_creation/create.php b/sources/app/Template/action_creation/create.php index bccb19b..c0d2880 100644 --- a/sources/app/Template/action_creation/create.php +++ b/sources/app/Template/action_creation/create.php @@ -1,7 +1,7 @@

-
+ form->csrf() ?> form->hidden('project_id', $values) ?> @@ -11,6 +11,6 @@
- url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'ActionController', 'index', array(), false, 'close-popover') ?>
-
\ No newline at end of file + diff --git a/sources/app/Template/action_creation/event.php b/sources/app/Template/action_creation/event.php index e7e5aaf..cdf0031 100644 --- a/sources/app/Template/action_creation/event.php +++ b/sources/app/Template/action_creation/event.php @@ -2,7 +2,7 @@

-
+ form->csrf() ?> @@ -22,6 +22,6 @@
- url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
-
\ No newline at end of file + diff --git a/sources/app/Template/action_creation/params.php b/sources/app/Template/action_creation/params.php index 59ff6ce..fa89217 100644 --- a/sources/app/Template/action_creation/params.php +++ b/sources/app/Template/action_creation/params.php @@ -2,7 +2,7 @@

-
+ form->csrf() ?> @@ -35,6 +35,9 @@ text->contains($param_name, 'link_id')): ?> form->label($param_desc, $param_name) ?> form->select('params['.$param_name.']', $links_list, $values) ?> + + form->label($param_desc, $param_name) ?> + form->select('params['.$param_name.']', $priorities_list, $values) ?> text->contains($param_name, 'duration')): ?> form->label($param_desc, $param_name) ?> form->number('params['.$param_name.']', $values) ?> @@ -47,6 +50,6 @@
- url->link(t('cancel'), 'action', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
-
\ No newline at end of file + diff --git a/sources/app/Template/activity/filter_dropdown.php b/sources/app/Template/activity/filter_dropdown.php new file mode 100644 index 0000000..8d7a7de --- /dev/null +++ b/sources/app/Template/activity/filter_dropdown.php @@ -0,0 +1,14 @@ +
+ +
    +
  • ">
    • +
    • +
    • +
    • +
    • +
    • +
  • + url->doc(t('View advanced search syntax'), 'search') ?> +
    • +
+
\ No newline at end of file diff --git a/sources/app/Template/activity/project.php b/sources/app/Template/activity/project.php index 176d9b9..ce1c8c0 100644 --- a/sources/app/Template/activity/project.php +++ b/sources/app/Template/activity/project.php @@ -1,14 +1,14 @@
- projectHeader->render($project, 'Analytic', $this->app->getRouterAction()) ?> + projectHeader->render($project, 'AnalyticController', $this->app->getRouterAction()) ?>
    -
  • url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?>
    • +
  • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
render('event/events', array('events' => $events)) ?> -
\ No newline at end of file + diff --git a/sources/app/Template/analytic/burndown.php b/sources/app/Template/analytic/burndown.php index ed6c8ae..e979595 100644 --- a/sources/app/Template/analytic/burndown.php +++ b/sources/app/Template/analytic/burndown.php @@ -12,7 +12,7 @@
-
+ form->csrf() ?> diff --git a/sources/app/Template/analytic/cfd.php b/sources/app/Template/analytic/cfd.php index ee259c7..8dfb5b0 100644 --- a/sources/app/Template/analytic/cfd.php +++ b/sources/app/Template/analytic/cfd.php @@ -12,7 +12,7 @@
- + form->csrf() ?> diff --git a/sources/app/Template/analytic/compare_hours.php b/sources/app/Template/analytic/compare_hours.php index 8249e7b..70d8d02 100644 --- a/sources/app/Template/analytic/compare_hours.php +++ b/sources/app/Template/analytic/compare_hours.php @@ -34,13 +34,13 @@ getCollection() as $task): ?> - url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - + diff --git a/sources/app/Template/analytic/layout.php b/sources/app/Template/analytic/layout.php index 35793cb..e3c6099 100644 --- a/sources/app/Template/analytic/layout.php +++ b/sources/app/Template/analytic/layout.php @@ -1,5 +1,5 @@
- projectHeader->render($project, 'Listing', 'show') ?> + projectHeader->render($project, 'TaskListController', 'show') ?>
render($sidebar_template, array('project' => $project)) ?> @@ -8,6 +8,3 @@
- -asset->js('assets/js/vendor/d3.v3.min.js') ?> -asset->js('assets/js/vendor/c3.min.js') ?> \ No newline at end of file diff --git a/sources/app/Template/analytic/lead_cycle_time.php b/sources/app/Template/analytic/lead_cycle_time.php index 82ffe53..2dccc13 100644 --- a/sources/app/Template/analytic/lead_cycle_time.php +++ b/sources/app/Template/analytic/lead_cycle_time.php @@ -16,7 +16,7 @@
- + form->csrf() ?> diff --git a/sources/app/Template/analytic/sidebar.php b/sources/app/Template/analytic/sidebar.php index 76289b9..de3dccf 100644 --- a/sources/app/Template/analytic/sidebar.php +++ b/sources/app/Template/analytic/sidebar.php @@ -1,29 +1,29 @@

    -
  • app->checkMenuSelection('analytic', 'tasks') ?>> - url->link(t('Task distribution'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'tasks') ?>> + url->link(t('Task distribution'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'users') ?>> - url->link(t('User repartition'), 'analytic', 'users', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'users') ?>> + url->link(t('User repartition'), 'AnalyticController', 'users', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'cfd') ?>> - url->link(t('Cumulative flow diagram'), 'analytic', 'cfd', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'cfd') ?>> + url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'burndown') ?>> - url->link(t('Burndown chart'), 'analytic', 'burndown', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'burndown') ?>> + url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'averageTimeByColumn') ?>> - url->link(t('Average time into each column'), 'analytic', 'averageTimeByColumn', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>> + url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'leadAndCycleTime') ?>> - url->link(t('Lead and cycle time'), 'analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>> + url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
    • -
  • app->checkMenuSelection('analytic', 'compareHours') ?>> - url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?> +
  • app->checkMenuSelection('AnalyticController', 'compareHours') ?>> + url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
    • - + hook->render('template:analytic:sidebar', array('project' => $project)) ?> - +
diff --git a/sources/app/Template/app/calendar.php b/sources/app/Template/app/calendar.php deleted file mode 100644 index a154203..0000000 --- a/sources/app/Template/app/calendar.php +++ /dev/null @@ -1,5 +0,0 @@ -
-
diff --git a/sources/app/Template/app/sidebar.php b/sources/app/Template/app/sidebar.php deleted file mode 100644 index 66d15b1..0000000 --- a/sources/app/Template/app/sidebar.php +++ /dev/null @@ -1,27 +0,0 @@ -
-

text->e($user['name'] ?: $user['username']) ?>

-
    -
  • app->checkMenuSelection('app', 'index') ?>> - url->link(t('Overview'), 'app', 'index', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'projects') ?>> - url->link(t('My projects'), 'app', 'projects', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'tasks') ?>> - url->link(t('My tasks'), 'app', 'tasks', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'subtasks') ?>> - url->link(t('My subtasks'), 'app', 'subtasks', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'calendar') ?>> - url->link(t('My calendar'), 'app', 'calendar', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'activity') ?>> - url->link(t('My activity stream'), 'app', 'activity', array('user_id' => $user['id'])) ?> -
    • -
  • app->checkMenuSelection('app', 'notifications') ?>> - url->link(t('My notifications'), 'app', 'notifications', array('user_id' => $user['id'])) ?> -
    • - hook->render('template:dashboard:sidebar') ?> -
-
\ No newline at end of file diff --git a/sources/app/Template/auth/index.php b/sources/app/Template/auth/index.php index cc56217..45bbdb8 100644 --- a/sources/app/Template/auth/index.php +++ b/sources/app/Template/auth/index.php @@ -7,7 +7,7 @@ - + form->csrf() ?> @@ -19,7 +19,7 @@ form->label(t('Enter the text below'), 'captcha') ?> - + Captcha form->text('captcha', array(), $errors, array('required')) ?> @@ -32,11 +32,11 @@ app->config('password_reset') == 1): ?>
- url->link(t('Forgot password?'), 'PasswordReset', 'create') ?> + url->link(t('Forgot password?'), 'PasswordResetController', 'create') ?>
hook->render('template:auth:login-form:after') ?> - \ No newline at end of file + diff --git a/sources/app/Template/avatar_file/show.php b/sources/app/Template/avatar_file/show.php index 266a2cc..37c56ce 100644 --- a/sources/app/Template/avatar_file/show.php +++ b/sources/app/Template/avatar_file/show.php @@ -4,17 +4,20 @@ avatar->render($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path'], '') ?> -
+
+ + url->link(t('Remove my image'), 'AvatarFileController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> + +
+ +
+ +

+ form->csrf() ?> - form->label(t('Upload my avatar image'), 'avatar') ?> form->file('avatar') ?>
- - url->link(t('Remove my image'), 'AvatarFile', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> - - - - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> +
diff --git a/sources/app/Template/board/popover_assignee.php b/sources/app/Template/board/popover_assignee.php deleted file mode 100644 index 87e1681..0000000 --- a/sources/app/Template/board/popover_assignee.php +++ /dev/null @@ -1,20 +0,0 @@ -
-
-

-
-
- - form->csrf() ?> - - form->hidden('id', $values) ?> - form->hidden('project_id', $values) ?> - - task->selectAssignee($users_list, $values, array(), array('autofocus')) ?> - -
- - - url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> -
-
-
\ No newline at end of file diff --git a/sources/app/Template/board/popover_category.php b/sources/app/Template/board/popover_category.php deleted file mode 100644 index e379476..0000000 --- a/sources/app/Template/board/popover_category.php +++ /dev/null @@ -1,20 +0,0 @@ -
-
-

-
-
- - form->csrf() ?> - - form->hidden('id', $values) ?> - form->hidden('project_id', $values) ?> - - task->selectCategory($categories_list, $values, array(), array('autofocus'), true) ?> - -
- - - url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> -
-
-
\ No newline at end of file diff --git a/sources/app/Template/board/table_column.php b/sources/app/Template/board/table_column.php index 48538c8..6336234 100644 --- a/sources/app/Template/board/table_column.php +++ b/sources/app/Template/board/table_column.php @@ -12,15 +12,15 @@
- user->hasProjectAccess('taskcreation', 'create', $column['project_id'])): ?> + user->hasProjectAccess('TaskCreationController', 'show', $column['project_id'])): ?>
- url->link('+', 'taskcreation', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover', t('Add a new task')) ?> + url->link('+', 'TaskCreationController', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover', t('Add a new task')) ?>
- 1 && ! empty($column['nb_column_tasks'])): ?> + 1 && ! empty($column['column_nb_tasks'])): ?> - () + () @@ -35,11 +35,17 @@ - user->hasProjectAccess('BoardPopover', 'closeColumnTasks', $column['project_id']) && $column['nb_tasks'] > 0): ?> + user->hasProjectAccess('TaskCreationController', 'show', $column['project_id'])): ?>
  • - - url->link(t('Close all tasks of this column'), 'BoardPopover', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> + + url->link(t('Create tasks in bulk'), 'TaskBulkController', 'show', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
    • + 0): ?> +
  • + + url->link(t('Close all tasks of this column'), 'BoardPopoverController', 'confirmCloseColumnTasks', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> +
    • + @@ -47,7 +53,7 @@ - '> +   diff --git a/sources/app/Template/board/table_container.php b/sources/app/Template/board/table_container.php index e30f9ce..a93e700 100644 --- a/sources/app/Template/board/table_container.php +++ b/sources/app/Template/board/table_container.php @@ -10,10 +10,10 @@ class="board-project-" data-project-id="" data-check-interval="" - data-save-url="url->href('board', 'save', array('project_id' => $project['id'])) ?>" - data-reload-url="url->href('board', 'reload', array('project_id' => $project['id'])) ?>" - data-check-url="url->href('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" - data-task-creation-url="url->href('taskcreation', 'create', array('project_id' => $project['id'])) ?>" + data-save-url="url->href('BoardAjaxController', 'save', array('project_id' => $project['id'])) ?>" + data-reload-url="url->href('BoardAjaxController', 'reload', array('project_id' => $project['id'])) ?>" + data-check-url="url->href('BoardAjaxController', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" + data-task-creation-url="url->href('TaskCreationController', 'show', array('project_id' => $project['id'])) ?>" > @@ -55,4 +55,4 @@ -
    \ No newline at end of file + diff --git a/sources/app/Template/board/table_swimlane.php b/sources/app/Template/board/table_swimlane.php index 349b9ac..c5937e0 100644 --- a/sources/app/Template/board/table_swimlane.php +++ b/sources/app/Template/board/table_swimlane.php @@ -14,7 +14,7 @@ + data-href="url->href('BoardTooltipController', 'swimlane', array('swimlane_id' => $swimlane['id'], 'project_id' => $project['id'])) ?>"> diff --git a/sources/app/Template/board/task_avatar.php b/sources/app/Template/board/task_avatar.php index 39f6b54..28e0813 100644 --- a/sources/app/Template/board/task_avatar.php +++ b/sources/app/Template/board/task_avatar.php @@ -1,9 +1,9 @@
    user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> class="task-board-assignee task-board-change-assignee" - data-url="url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> + data-url="url->href('TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> class="task-board-assignee"> diff --git a/sources/app/Template/board/task_footer.php b/sources/app/Template/board/task_footer.php index a9d381a..bc34363 100644 --- a/sources/app/Template/board/task_footer.php +++ b/sources/app/Template/board/task_footer.php @@ -6,18 +6,28 @@ url->link( $this->text->e($task['category_name']), - 'boardPopover', - 'changeCategory', + 'TaskModificationController', + 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover' . (! empty($task['category_description']) ? ' tooltip' : ''), - ! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category') + ! empty($task['category_description']) ? $this->text->markdownAttribute($task['category_description']) : t('Change category') ) ?>
    + +
    +
      + +
    • text->e($tag['name']) ?>
      • + +
    +
    + +
    @@ -27,42 +37,46 @@ - + + + $task['date_due']): ?> + + dt->date($task['date_due']) ?> - - + + - - + + - + - + -   +   -   +   -   +   - + @@ -76,7 +90,7 @@ - + hook->render('template:board:task:icons', array('task' => $task)) ?> task->formatPriority($project, $task) ?> diff --git a/sources/app/Template/board/task_menu.php b/sources/app/Template/board/task_menu.php deleted file mode 100644 index c0d97cd..0000000 --- a/sources/app/Template/board/task_menu.php +++ /dev/null @@ -1,18 +0,0 @@ - - -
      -
    •  url->link(t('Change assignee'), 'BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Change category'), 'BoardPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Change description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Edit this task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    •  url->link(t('Add a screenshot'), 'BoardPopover', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • - -
    •  url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • - -
    •  url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • - -
    -     \ No newline at end of file diff --git a/sources/app/Template/board/task_private.php b/sources/app/Template/board/task_private.php index 19bcbcf..94b396a 100644 --- a/sources/app/Template/board/task_private.php +++ b/sources/app/Template/board/task_private.php @@ -1,6 +1,6 @@
    + data-task-url="url->href('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> board->isCollapsed($task['project_id'])): ?>
    - user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> - render('board/task_menu', array('task' => $task)) ?> + user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> + render('task/dropdown', array('task' => $task)) ?> @@ -27,13 +27,13 @@ text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?> - - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
    - user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> - render('board/task_menu', array('task' => $task)) ?> + user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> + render('task/dropdown', array('task' => $task)) ?> @@ -48,7 +48,7 @@ hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
    - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
    hook->render('template:board:private:task:after-title', array('task' => $task)) ?> diff --git a/sources/app/Template/board/task_public.php b/sources/app/Template/board/task_public.php index a53d42c..82eb653 100644 --- a/sources/app/Template/board/task_public.php +++ b/sources/app/Template/board/task_public.php @@ -1,6 +1,6 @@
    - url->link('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + url->link('#'.$task['id'], 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> @@ -12,7 +12,7 @@ hook->render('template:board:public:task:before-title', array('task' => $task)) ?>
    - url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
    hook->render('template:board:public:task:after-title', array('task' => $task)) ?> @@ -21,4 +21,4 @@ 'not_editable' => $not_editable, 'project' => $project, )) ?> -
    \ No newline at end of file +
    diff --git a/sources/app/Template/board/tooltip_files.php b/sources/app/Template/board/tooltip_files.php index 5ade5b5..6f9e264 100644 --- a/sources/app/Template/board/tooltip_files.php +++ b/sources/app/Template/board/tooltip_files.php @@ -9,9 +9,9 @@ - url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->link(t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> -   url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> +   url->link(t('open file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> diff --git a/sources/app/Template/board/tooltip_tasklinks.php b/sources/app/Template/board/tooltip_tasklinks.php index 6424c39..d1156cb 100644 --- a/sources/app/Template/board/tooltip_tasklinks.php +++ b/sources/app/Template/board/tooltip_tasklinks.php @@ -12,7 +12,7 @@ url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), + 'TaskViewController', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), false, $link['is_active'] ? '' : 'task-link-closed' ) ?> @@ -31,4 +31,4 @@ -
    \ No newline at end of file +
    diff --git a/sources/app/Template/board/view_private.php b/sources/app/Template/board/view_private.php index 1370227..a89e7d2 100644 --- a/sources/app/Template/board/view_private.php +++ b/sources/app/Template/board/view_private.php @@ -1,6 +1,6 @@
    - projectHeader->render($project, 'Board', 'show', true) ?> + projectHeader->render($project, 'BoardViewController', 'show', true) ?> render('board/table_container', array( 'project' => $project, diff --git a/sources/app/Template/board/popover_close_all_tasks_column.php b/sources/app/Template/board_popover/close_all_tasks_column.php similarity index 74% rename from sources/app/Template/board/popover_close_all_tasks_column.php rename to sources/app/Template/board_popover/close_all_tasks_column.php index 5090f49..57f703e 100644 --- a/sources/app/Template/board/popover_close_all_tasks_column.php +++ b/sources/app/Template/board_popover/close_all_tasks_column.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('column_id', $values) ?> form->hidden('swimlane_id', $values) ?> @@ -12,7 +12,7 @@
    - url->link(t('cancel'), 'board', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/calendar/show.php b/sources/app/Template/calendar/show.php index f00e810..3635f62 100644 --- a/sources/app/Template/calendar/show.php +++ b/sources/app/Template/calendar/show.php @@ -1,9 +1,9 @@
    - projectHeader->render($project, 'Calendar', 'show') ?> + projectHeader->render($project, 'CalendarController', 'show') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/category/edit.php b/sources/app/Template/category/edit.php index 7b59268..fac56db 100644 --- a/sources/app/Template/category/edit.php +++ b/sources/app/Template/category/edit.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> @@ -18,6 +18,6 @@
    - url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/category/index.php b/sources/app/Template/category/index.php index b3bdfd8..a103d89 100644 --- a/sources/app/Template/category/index.php +++ b/sources/app/Template/category/index.php @@ -15,10 +15,10 @@ @@ -31,7 +31,7 @@

    -
    + form->csrf() ?> form->hidden('project_id', $values) ?> @@ -42,4 +42,4 @@
    -
    \ No newline at end of file + diff --git a/sources/app/Template/category/remove.php b/sources/app/Template/category/remove.php index cad58d3..e7b9c9b 100644 --- a/sources/app/Template/category/remove.php +++ b/sources/app/Template/category/remove.php @@ -9,9 +9,9 @@

    - url->link(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'CategoryController', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'CategoryController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/column/create.php b/sources/app/Template/column/create.php index 2d325f7..023de52 100644 --- a/sources/app/Template/column/create.php +++ b/sources/app/Template/column/create.php @@ -1,7 +1,7 @@

    -
    + form->csrf() ?> @@ -21,4 +21,4 @@ url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> -
    \ No newline at end of file + diff --git a/sources/app/Template/column/edit.php b/sources/app/Template/column/edit.php index 412858a..a742e4b 100644 --- a/sources/app/Template/column/edit.php +++ b/sources/app/Template/column/edit.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> @@ -21,6 +21,6 @@
    - url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/column/index.php b/sources/app/Template/column/index.php index eef176f..04760a1 100644 --- a/sources/app/Template/column/index.php +++ b/sources/app/Template/column/index.php @@ -3,17 +3,17 @@ -

    +

    + data-save-position-url="url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>"> @@ -28,7 +28,7 @@ text->e($column['title']) ?> - '> + @@ -41,10 +41,10 @@
    • - url->link(t('Edit'), 'column', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?> + url->link(t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
    • - url->link(t('Remove'), 'column', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?> + url->link(t('Remove'), 'ColumnController', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/column/remove.php b/sources/app/Template/column/remove.php index ccab889..b231a9a 100644 --- a/sources/app/Template/column/remove.php +++ b/sources/app/Template/column/remove.php @@ -9,7 +9,7 @@

    - url->link(t('Yes'), 'column', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?> - url->link(t('cancel'), 'column', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('Yes'), 'ColumnController', 'remove', array('project_id' => $project['id'], 'column_id' => $column['id'], 'remove' => 'yes'), true, 'btn btn-red') ?> + url->link(t('cancel'), 'ColumnController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/comment/create.php b/sources/app/Template/comment/create.php index b6c27ae..0358107 100644 --- a/sources/app/Template/comment/create.php +++ b/sources/app/Template/comment/create.php @@ -1,7 +1,7 @@

    -
    + form->csrf() ?> form->hidden('task_id', $values) ?> form->hidden('user_id', $values) ?> @@ -15,7 +15,7 @@ 'autofocus', 'required', 'placeholder="'.t('Leave a comment').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"', + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"', ), 'markdown-editor' ) ?> @@ -24,6 +24,6 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/comment/edit.php b/sources/app/Template/comment/edit.php index 4036b67..f69fc0c 100644 --- a/sources/app/Template/comment/edit.php +++ b/sources/app/Template/comment/edit.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('id', $values) ?> @@ -22,6 +22,6 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/comment/remove.php b/sources/app/Template/comment/remove.php index 3174df0..55587b6 100644 --- a/sources/app/Template/comment/remove.php +++ b/sources/app/Template/comment/remove.php @@ -14,8 +14,8 @@ )) ?>
    - url->link(t('Yes'), 'comment', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'CommentController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/comment/show.php b/sources/app/Template/comment/show.php index 3f45e2e..8419a14 100644 --- a/sources/app/Template/comment/show.php +++ b/sources/app/Template/comment/show.php @@ -12,29 +12,7 @@
    - - text->markdown( - $comment['comment'], - array( - 'controller' => 'task', - 'action' => 'readonly', - 'params' => array( - 'token' => $project['token'] - ) - ) - ) ?> - - text->markdown( - $comment['comment'], - array( - 'controller' => 'task', - 'action' => 'show', - 'params' => array( - 'project_id' => $task['project_id'] - ) - ) - ) ?> - + text->markdown($comment['comment'], isset($is_public) && $is_public) ?>
    @@ -48,11 +26,11 @@ user->isAdmin() || $this->user->isCurrentUser($comment['user_id']))): ?>
  • - url->link(t('remove'), 'comment', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?> + url->link(t('remove'), 'CommentController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
  • - url->link(t('edit'), 'comment', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?> + url->link(t('edit'), 'CommentController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id']), false, 'popover') ?>
    • diff --git a/sources/app/Template/comments/create.php b/sources/app/Template/comments/create.php index a638d3b..3fa6ddc 100644 --- a/sources/app/Template/comments/create.php +++ b/sources/app/Template/comments/create.php @@ -1,4 +1,4 @@ -
    + form->csrf() ?> form->hidden('task_id', $values) ?> form->hidden('user_id', $values) ?> @@ -12,7 +12,7 @@ 'data-markdown-editor-disable-toolbar="true"', 'required', 'placeholder="'.t('Leave a comment').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"', + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"', ), 'markdown-editor' ) ?> diff --git a/sources/app/Template/comments/show.php b/sources/app/Template/comments/show.php index 76af559..43f6b2c 100644 --- a/sources/app/Template/comments/show.php +++ b/sources/app/Template/comments/show.php @@ -6,7 +6,7 @@
    - url->link(t('change sorting'), 'comment', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    @@ -30,4 +30,4 @@ )) ?> - \ No newline at end of file + diff --git a/sources/app/Template/config/about.php b/sources/app/Template/config/about.php index 5c1f4b3..8e2d132 100644 --- a/sources/app/Template/config/about.php +++ b/sources/app/Template/config/about.php @@ -5,7 +5,7 @@
    • - http://kanboard.net/ + https://kanboard.net/
    • @@ -65,11 +65,11 @@ text->bytes($db_size) ?>
    • - url->link(t('Download the database'), 'config', 'downloadDb', array(), true) ?>  + url->link(t('Download the database'), 'ConfigController', 'downloadDb', array(), true) ?> 
    • - url->link(t('Optimize the database'), 'config', 'optimizeDb', array(), true) ?>  + url->link(t('Optimize the database'), 'ConfigController', 'optimizeDb', array(), true) ?> 
    @@ -82,5 +82,5 @@

    - -
    \ No newline at end of file + + diff --git a/sources/app/Template/config/api.php b/sources/app/Template/config/api.php index 3ebbb95..95f7735 100644 --- a/sources/app/Template/config/api.php +++ b/sources/app/Template/config/api.php @@ -12,7 +12,7 @@
  • - url->link(t('Reset token'), 'config', 'token', array('type' => 'api'), true) ?> + url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'api'), true) ?>
    • - \ No newline at end of file + diff --git a/sources/app/Template/config/application.php b/sources/app/Template/config/application.php index 259756b..0f842f6 100644 --- a/sources/app/Template/config/application.php +++ b/sources/app/Template/config/application.php @@ -1,7 +1,7 @@

    - + form->csrf() ?> diff --git a/sources/app/Template/config/board.php b/sources/app/Template/config/board.php index ba1bab5..62a736e 100644 --- a/sources/app/Template/config/board.php +++ b/sources/app/Template/config/board.php @@ -1,7 +1,7 @@

    - + form->csrf() ?> diff --git a/sources/app/Template/config/calendar.php b/sources/app/Template/config/calendar.php index b7b230d..90e034e 100644 --- a/sources/app/Template/config/calendar.php +++ b/sources/app/Template/config/calendar.php @@ -2,7 +2,7 @@

    - + form->csrf() ?> @@ -31,4 +31,4 @@ -
    \ No newline at end of file + diff --git a/sources/app/Template/config/email.php b/sources/app/Template/config/email.php new file mode 100644 index 0000000..6ff76ec --- /dev/null +++ b/sources/app/Template/config/email.php @@ -0,0 +1,18 @@ +
    +

    +
    +
    + form->csrf() ?> + + form->label(t('Email sender address'), 'mail_sender_address') ?> + form->text('mail_sender_address', $values, $errors, array('placeholder="'.MAIL_FROM.'"')) ?> + + form->label(t('Email transport'), 'mail_transport') ?> + form->select('mail_transport', $mail_transports, $values, $errors) ?> + + hook->render('template:config:email', array('values' => $values, 'errors' => $errors)) ?> + +
    + +
    + diff --git a/sources/app/Template/config/integrations.php b/sources/app/Template/config/integrations.php index e404c52..3ba4e86 100644 --- a/sources/app/Template/config/integrations.php +++ b/sources/app/Template/config/integrations.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> hook->render('template:config:integrations', array('values' => $values)) ?> @@ -14,4 +14,4 @@
    - \ No newline at end of file + diff --git a/sources/app/Template/config/keyboard_shortcuts.php b/sources/app/Template/config/keyboard_shortcuts.php index da53266..1b1a947 100644 --- a/sources/app/Template/config/keyboard_shortcuts.php +++ b/sources/app/Template/config/keyboard_shortcuts.php @@ -19,7 +19,6 @@

    • = e
      • -
    • = d
    • = s
    • = c
    • = l
      • @@ -33,4 +32,4 @@
    • = ESC
    • = CTRL+ENTER ⌘+ENTER
    - \ No newline at end of file + diff --git a/sources/app/Template/config/layout.php b/sources/app/Template/config/layout.php index f34caaa..6eafa59 100644 --- a/sources/app/Template/config/layout.php +++ b/sources/app/Template/config/layout.php @@ -1,10 +1,9 @@
    -
    \ No newline at end of file + diff --git a/sources/app/Template/config/plugins.php b/sources/app/Template/config/plugins.php deleted file mode 100644 index 04b3f09..0000000 --- a/sources/app/Template/config/plugins.php +++ /dev/null @@ -1,30 +0,0 @@ -
    -

    -
    - - -

    - -
    - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sources/app/Template/config/project.php b/sources/app/Template/config/project.php index b6b7ec2..6d8d131 100644 --- a/sources/app/Template/config/project.php +++ b/sources/app/Template/config/project.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> diff --git a/sources/app/Template/config/sidebar.php b/sources/app/Template/config/sidebar.php index dd51bc7..e304f0d 100644 --- a/sources/app/Template/config/sidebar.php +++ b/sources/app/Template/config/sidebar.php @@ -1,39 +1,42 @@

      -
    • app->checkMenuSelection('config', 'index') ?>> - url->link(t('About'), 'config', 'index') ?> +
    • app->checkMenuSelection('ConfigController', 'index') ?>> + url->link(t('About'), 'ConfigController', 'index') ?>
      • -
    • app->checkMenuSelection('config', 'plugins') ?>> - url->link(t('Plugins'), 'config', 'plugins') ?> +
    • app->checkMenuSelection('ConfigController', 'application') ?>> + url->link(t('Application settings'), 'ConfigController', 'application') ?>
      • -
    • app->checkMenuSelection('config', 'application') ?>> - url->link(t('Application settings'), 'config', 'application') ?> +
    • app->checkMenuSelection('ConfigController', 'email') ?>> + url->link(t('Email settings'), 'ConfigController', 'email') ?>
      • -
    • app->checkMenuSelection('config', 'project') ?>> - url->link(t('Project settings'), 'config', 'project') ?> +
    • app->checkMenuSelection('ConfigController', 'project') ?>> + url->link(t('Project settings'), 'ConfigController', 'project') ?>
      • -
    • app->checkMenuSelection('config', 'board') ?>> - url->link(t('Board settings'), 'config', 'board') ?> +
    • app->checkMenuSelection('ConfigController', 'board') ?>> + url->link(t('Board settings'), 'ConfigController', 'board') ?>
      • -
    • app->checkMenuSelection('config', 'calendar') ?>> - url->link(t('Calendar settings'), 'config', 'calendar') ?> +
    • app->checkMenuSelection('ConfigController', 'calendar') ?>> + url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?>
      • -
    • app->checkMenuSelection('link') ?>> - url->link(t('Link settings'), 'link', 'index') ?> +
    • app->checkMenuSelection('TagController', 'index') ?>> + url->link(t('Tags management'), 'TagController', 'index') ?>
      • -
    • app->checkMenuSelection('currency', 'index') ?>> - url->link(t('Currency rates'), 'currency', 'index') ?> +
    • app->checkMenuSelection('LinkController') ?>> + url->link(t('Link settings'), 'LinkController', 'index') ?>
      • -
    • app->checkMenuSelection('config', 'integrations') ?>> - url->link(t('Integrations'), 'config', 'integrations') ?> +
    • app->checkMenuSelection('CurrencyController', 'index') ?>> + url->link(t('Currency rates'), 'CurrencyController', 'index') ?>
      • -
    • app->checkMenuSelection('config', 'webhook') ?>> - url->link(t('Webhooks'), 'config', 'webhook') ?> +
    • app->checkMenuSelection('ConfigController', 'integrations') ?>> + url->link(t('Integrations'), 'ConfigController', 'integrations') ?>
      • -
    • app->checkMenuSelection('config', 'api') ?>> - url->link(t('API'), 'config', 'api') ?> +
    • app->checkMenuSelection('ConfigController', 'webhook') ?>> + url->link(t('Webhooks'), 'ConfigController', 'webhook') ?> +
      • +
    • app->checkMenuSelection('ConfigController', 'api') ?>> + url->link(t('API'), 'ConfigController', 'api') ?>
      • hook->render('template:config:sidebar') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/config/webhook.php b/sources/app/Template/config/webhook.php index b96979a..e324587 100644 --- a/sources/app/Template/config/webhook.php +++ b/sources/app/Template/config/webhook.php @@ -2,7 +2,7 @@

    - + form->csrf() ?> @@ -16,7 +16,7 @@
    -

    +

      @@ -25,11 +25,7 @@ text->e($values['webhook_token']) ?>
    • - - -
      • -
    • - url->link(t('Reset token'), 'config', 'token', array('type' => 'webhook'), true) ?> + url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'webhook'), true) ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/currency/index.php b/sources/app/Template/currency/index.php index d35ac45..9881cee 100644 --- a/sources/app/Template/currency/index.php +++ b/sources/app/Template/currency/index.php @@ -24,7 +24,7 @@

    - +form->csrf() ?> @@ -38,7 +38,7 @@

    - +form->csrf() ?> diff --git a/sources/app/Template/custom_filter/add.php b/sources/app/Template/custom_filter/add.php index e3e144a..3801cc3 100644 --- a/sources/app/Template/custom_filter/add.php +++ b/sources/app/Template/custom_filter/add.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> form->hidden('project_id', $values) ?> @@ -12,7 +12,7 @@ form->label(t('Filter'), 'filter') ?> form->text('filter', $values, $errors, array('required', 'maxlength="100"')) ?> - user->hasProjectAccess('ProjectEdit', 'edit', $project['id'])): ?> + user->hasProjectAccess('ProjectEditController', 'edit', $project['id'])): ?> form->checkbox('is_shared', t('Share with all project members'), 1) ?> @@ -21,4 +21,4 @@
    - \ No newline at end of file + diff --git a/sources/app/Template/custom_filter/edit.php b/sources/app/Template/custom_filter/edit.php index 5d07e8c..26da8da 100644 --- a/sources/app/Template/custom_filter/edit.php +++ b/sources/app/Template/custom_filter/edit.php @@ -2,7 +2,7 @@

    - +form->csrf() ?> @@ -16,7 +16,7 @@ form->label(t('Filter'), 'filter') ?> form->text('filter', $values, $errors, array('required', 'maxlength="100"')) ?> - user->hasProjectAccess('ProjectEdit', 'edit', $project['id'])): ?> + user->hasProjectAccess('ProjectEditController', 'edit', $project['id'])): ?> form->checkbox('is_shared', t('Share with all project members'), 1, $values['is_shared'] == 1) ?> form->hidden('is_shared', $values) ?> @@ -27,6 +27,6 @@
    - url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/custom_filter/index.php b/sources/app/Template/custom_filter/index.php index 12a4eec..08c8040 100644 --- a/sources/app/Template/custom_filter/index.php +++ b/sources/app/Template/custom_filter/index.php @@ -32,12 +32,12 @@
    - getPluginHomepage()): ?> - text->e($plugin->getPluginName()) ?> - - text->e($plugin->getPluginName()) ?> - - text->e($plugin->getPluginAuthor()) ?>text->e($plugin->getPluginVersion()) ?>text->e($plugin->getPluginDescription()) ?>
    text->e($filter['owner_name'] ?: $filter['owner_username']) ?> - user->getId() || $this->user->hasProjectAccess('customfilter', 'edit', $project['id'])): ?> + user->getId() || $this->user->hasProjectAccess('CustomFilterController', 'edit', $project['id'])): ?>
      -
    • url->link(t('Remove'), 'customfilter', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?>
      • -
    • url->link(t('Edit'), 'customfilter', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?>
      • +
    • url->link(t('Remove'), 'CustomFilterController', 'confirm', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?>
      • +
    • url->link(t('Edit'), 'CustomFilterController', 'edit', array('project_id' => $filter['project_id'], 'filter_id' => $filter['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/custom_filter/remove.php b/sources/app/Template/custom_filter/remove.php index d4c67a2..609f19b 100644 --- a/sources/app/Template/custom_filter/remove.php +++ b/sources/app/Template/custom_filter/remove.php @@ -9,9 +9,9 @@

    - url->link(t('Yes'), 'customfilter', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'CustomFilterController', 'remove', array('project_id' => $project['id'], 'filter_id' => $filter['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'customfilter', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'CustomFilterController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/app/activity.php b/sources/app/Template/dashboard/activity.php similarity index 100% rename from sources/app/Template/app/activity.php rename to sources/app/Template/dashboard/activity.php diff --git a/sources/app/Template/dashboard/calendar.php b/sources/app/Template/dashboard/calendar.php new file mode 100644 index 0000000..75c96d8 --- /dev/null +++ b/sources/app/Template/dashboard/calendar.php @@ -0,0 +1,5 @@ +
    +
    diff --git a/sources/app/Template/app/layout.php b/sources/app/Template/dashboard/layout.php similarity index 69% rename from sources/app/Template/app/layout.php rename to sources/app/Template/dashboard/layout.php index 2a32ac0..795537a 100644 --- a/sources/app/Template/app/layout.php +++ b/sources/app/Template/dashboard/layout.php @@ -1,25 +1,25 @@
      - user->hasAccess('ProjectCreation', 'create')): ?> + user->hasAccess('ProjectCreationController', 'create')): ?>
    • - url->link(t('New project'), 'ProjectCreation', 'create', array(), false, 'popover') ?> + url->link(t('New project'), 'ProjectCreationController', 'create', array(), false, 'popover') ?>
      • app->config('disable_private_project', 0) == 0): ?>
    • - url->link(t('New private project'), 'ProjectCreation', 'createPrivate', array(), false, 'popover') ?> + url->link(t('New private project'), 'ProjectCreationController', 'createPrivate', array(), false, 'popover') ?>
    • - url->link(t('Search'), 'search', 'index') ?> + url->link(t('Search'), 'SearchController', 'index') ?>
    • - url->link(t('Project management'), 'project', 'index') ?> + url->link(t('Project management'), 'ProjectListController', 'show') ?>
    @@ -29,4 +29,4 @@
    - \ No newline at end of file + diff --git a/sources/app/Template/app/notifications.php b/sources/app/Template/dashboard/notifications.php similarity index 59% rename from sources/app/Template/app/notifications.php rename to sources/app/Template/dashboard/notifications.php index 4cb3c57..3b70b49 100644 --- a/sources/app/Template/app/notifications.php +++ b/sources/app/Template/dashboard/notifications.php @@ -2,13 +2,13 @@

    -

    +

    • - url->link(t('Mark all as read'), 'webNotification', 'flush', array('user_id' => $user['id'])) ?> + url->link(t('Mark all as read'), 'WebNotificationController', 'flush', array('user_id' => $user['id'])) ?>
    @@ -36,16 +36,10 @@ - text->contains($notification['event_name'], 'comment')): ?> - url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']), false, '', '', false, 'comment-'.$notification['event_data']['comment']['id']) ?> - text->contains($notification['event_name'], 'task.overdue')): ?> - 1): ?> - - - url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['tasks'][0]['id'], 'project_id' => $notification['event_data']['tasks'][0]['project_id'])) ?> - + text->contains($notification['event_name'], 'task.overdue') && count($notification['event_data']['tasks']) > 1): ?> + - url->link($notification['title'], 'task', 'show', array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id'])) ?> + url->link($notification['title'], 'WebNotificationController', 'redirect', array('notification_id' => $notification['id'], 'user_id' => $user['id'])) ?>     		@@ -53,9 +47,9 @@ - url->link(t('Mark as read'), 'webNotification', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?> + url->link(t('Mark as read'), 'WebNotificationController', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/app/projects.php b/sources/app/Template/dashboard/projects.php similarity index 61% rename from sources/app/Template/app/projects.php rename to sources/app/Template/dashboard/projects.php index 4ab8b10..962e4d8 100644 --- a/sources/app/Template/app/projects.php +++ b/sources/app/Template/dashboard/projects.php @@ -1,5 +1,5 @@
    -

    url->link(t('My projects'), 'app', 'projects', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    +

    url->link(t('My projects'), 'DashboardController', 'projects', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    isEmpty()): ?>

    @@ -8,13 +8,14 @@ order('Id', 'id') ?> order('', 'is_private') ?> - order(t('Project'), \Kanboard\Model\Project::TABLE.'.name') ?> + order(t('Project'), \Kanboard\Model\ProjectModel::TABLE.'.name') ?> + getCollection() as $project): ?> - url->link('#'.$project['id'], 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link') ?> + render('project/dropdown', array('project' => $project)) ?> @@ -22,26 +23,30 @@ - user->hasProjectAccess('gantt', 'project', $project['id'])): ?> - url->link('', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> + user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?> + url->link('', 'TaskGanttController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> - url->link('', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>  - url->link('', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>  + url->link('', 'TaskListController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>  + url->link('', 'CalendarController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>  - url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?> + url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> - '> + + + + text->e($column['title']) ?> + diff --git a/sources/app/Template/app/overview.php b/sources/app/Template/dashboard/show.php similarity index 60% rename from sources/app/Template/app/overview.php rename to sources/app/Template/dashboard/show.php index 0b35479..637b60f 100644 --- a/sources/app/Template/app/overview.php +++ b/sources/app/Template/dashboard/show.php @@ -1,12 +1,12 @@
    - form->hidden('controller', array('controller' => 'search')) ?> + form->hidden('controller', array('controller' => 'SearchController')) ?> form->hidden('action', array('action' => 'index')) ?> form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?> render('app/filters_helper') ?>
    -render('app/projects', array('paginator' => $project_paginator, 'user' => $user)) ?> -render('app/tasks', array('paginator' => $task_paginator, 'user' => $user)) ?> -render('app/subtasks', array('paginator' => $subtask_paginator, 'user' => $user)) ?> \ No newline at end of file +render('dashboard/projects', array('paginator' => $project_paginator, 'user' => $user)) ?> +render('dashboard/tasks', array('paginator' => $task_paginator, 'user' => $user)) ?> +render('dashboard/subtasks', array('paginator' => $subtask_paginator, 'user' => $user)) ?> diff --git a/sources/app/Template/dashboard/sidebar.php b/sources/app/Template/dashboard/sidebar.php new file mode 100644 index 0000000..86cc20f --- /dev/null +++ b/sources/app/Template/dashboard/sidebar.php @@ -0,0 +1,27 @@ +
    +

    text->e($user['name'] ?: $user['username']) ?>

    +
      +
    • app->checkMenuSelection('DashboardController', 'show') ?>> + url->link(t('Overview'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'projects') ?>> + url->link(t('My projects'), 'DashboardController', 'projects', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'tasks') ?>> + url->link(t('My tasks'), 'DashboardController', 'tasks', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'subtasks') ?>> + url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'calendar') ?>> + url->link(t('My calendar'), 'DashboardController', 'calendar', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'activity') ?>> + url->link(t('My activity stream'), 'DashboardController', 'activity', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('DashboardController', 'notifications') ?>> + url->link(t('My notifications'), 'DashboardController', 'notifications', array('user_id' => $user['id'])) ?> +
      • + hook->render('template:dashboard:sidebar') ?> +
    +
    diff --git a/sources/app/Template/app/subtasks.php b/sources/app/Template/dashboard/subtasks.php similarity index 81% rename from sources/app/Template/app/subtasks.php rename to sources/app/Template/dashboard/subtasks.php index cca0948..8e0aa3c 100644 --- a/sources/app/Template/app/subtasks.php +++ b/sources/app/Template/dashboard/subtasks.php @@ -1,5 +1,5 @@
    -

    url->link(t('My subtasks'), 'app', 'subtasks', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    +

    url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    isEmpty()): ?>

    @@ -18,10 +18,10 @@ render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?> - url->link($this->text->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> + url->link($this->text->e($subtask['project_name']), 'BoardViewController', 'show', array('project_id' => $subtask['project_id'])) ?> - url->link($this->text->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> + url->link($this->text->e($subtask['task_name']), 'TaskViewController', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> subtask->toggleStatus($subtask, $subtask['project_id']) ?> @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/app/tasks.php b/sources/app/Template/dashboard/tasks.php similarity index 64% rename from sources/app/Template/app/tasks.php rename to sources/app/Template/dashboard/tasks.php index d7826fb..4b83a96 100644 --- a/sources/app/Template/app/tasks.php +++ b/sources/app/Template/dashboard/tasks.php @@ -1,5 +1,5 @@
    -

    url->link(t('My tasks'), 'app', 'tasks', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    +

    url->link(t('My tasks'), 'DashboardController', 'tasks', array('user_id' => $user['id'])) ?> (getTotal() ?>)

    isEmpty()): ?>

    @@ -9,8 +9,10 @@ order('Id', 'tasks.id') ?> order(t('Project'), 'project_name') ?> order(t('Task'), 'title') ?> + order('Priority', 'tasks.priority') ?> - order(t('Due date'), 'date_due') ?> + order(t('Due date'), 'date_due') ?> + order(t('Column'), 'column_title') ?> getCollection() as $task): ?> @@ -18,10 +20,15 @@ render('task/dropdown', array('task' => $task)) ?> - url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + + + = 0): ?> + Ptext->e($task['priority'])?> + @@ -35,9 +42,12 @@ dt->date($task['date_due']) ?> + + text->e($task['column_title']) ?> + - \ No newline at end of file + diff --git a/sources/app/Template/doc/show.php b/sources/app/Template/doc/show.php index 8fbadc9..a8dbd76 100644 --- a/sources/app/Template/doc/show.php +++ b/sources/app/Template/doc/show.php @@ -3,11 +3,11 @@
    • - url->link(t('Table of contents'), 'doc', 'show', array('file' => 'index')) ?> + url->link(t('Table of contents'), 'DocumentationController', 'show', array('file' => 'index')) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/event/comment_create.php b/sources/app/Template/event/comment_create.php index 9869c94..45132e6 100644 --- a/sources/app/Template/event/comment_create.php +++ b/sources/app/Template/event/comment_create.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/comment_update.php b/sources/app/Template/event/comment_update.php index 19420cf..5a0821b 100644 --- a/sources/app/Template/event/comment_update.php +++ b/sources/app/Template/event/comment_update.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/subtask_create.php b/sources/app/Template/event/subtask_create.php index 7e41d5c..1bf36c0 100644 --- a/sources/app/Template/event/subtask_create.php +++ b/sources/app/Template/event/subtask_create.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/event/subtask_update.php b/sources/app/Template/event/subtask_update.php index 9fea4fe..201402f 100644 --- a/sources/app/Template/event/subtask_update.php +++ b/sources/app/Template/event/subtask_update.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/task_assignee_change.php b/sources/app/Template/event/task_assignee_change.php index db78e7d..7c96222 100644 --- a/sources/app/Template/event/task_assignee_change.php +++ b/sources/app/Template/event/task_assignee_change.php @@ -4,14 +4,14 @@ text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($assignee) ) ?> - text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> + text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> dt->datetime($date_creation) ?>

    text->e($task['title']) ?>

    -
    \ No newline at end of file + diff --git a/sources/app/Template/event/task_close.php b/sources/app/Template/event/task_close.php index 04157b0..90ff920 100644 --- a/sources/app/Template/event/task_close.php +++ b/sources/app/Template/event/task_close.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/task_create.php b/sources/app/Template/event/task_create.php index 6e26cdb..017a5ad 100644 --- a/sources/app/Template/event/task_create.php +++ b/sources/app/Template/event/task_create.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/task_file_create.php b/sources/app/Template/event/task_file_create.php index 0d8e545..d329529 100644 --- a/sources/app/Template/event/task_file_create.php +++ b/sources/app/Template/event/task_file_create.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/task_move_column.php b/sources/app/Template/event/task_move_column.php index 0a78bca..f3155e4 100644 --- a/sources/app/Template/event/task_move_column.php +++ b/sources/app/Template/event/task_move_column.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($task['column_title']) ) ?> dt->datetime($date_creation) ?> diff --git a/sources/app/Template/event/task_move_position.php b/sources/app/Template/event/task_move_position.php index eeadfa0..ecdd02b 100644 --- a/sources/app/Template/event/task_move_position.php +++ b/sources/app/Template/event/task_move_position.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $task['position'], $this->text->e($task['column_title']) ) ?> diff --git a/sources/app/Template/event/task_move_swimlane.php b/sources/app/Template/event/task_move_swimlane.php index a190bc0..fe9bfb5 100644 --- a/sources/app/Template/event/task_move_swimlane.php +++ b/sources/app/Template/event/task_move_swimlane.php @@ -2,12 +2,12 @@ text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($task['swimlane_name']) ) ?> diff --git a/sources/app/Template/event/task_open.php b/sources/app/Template/event/task_open.php index d9cd90b..548aa98 100644 --- a/sources/app/Template/event/task_open.php +++ b/sources/app/Template/event/task_open.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/event/task_update.php b/sources/app/Template/event/task_update.php index 07b94ff..7c7507c 100644 --- a/sources/app/Template/event/task_update.php +++ b/sources/app/Template/event/task_update.php @@ -1,7 +1,7 @@

    text->e($author), - $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) + $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> dt->datetime($date_creation) ?>

    diff --git a/sources/app/Template/export/sidebar.php b/sources/app/Template/export/sidebar.php index 6a1de7e..55fbaee 100644 --- a/sources/app/Template/export/sidebar.php +++ b/sources/app/Template/export/sidebar.php @@ -1,18 +1,18 @@

      -
    • app->getRouterAction() === 'tasks' ? 'class="active"' : '' ?>> - url->link(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ExportController', 'tasks') ?>> + url->link(t('Tasks'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
      • -
    • app->getRouterAction() === 'subtasks' ? 'class="active"' : '' ?>> - url->link(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ExportController', 'subtasks') ?>> + url->link(t('Subtasks'), 'ExportController', 'subtasks', array('project_id' => $project['id'])) ?>
      • -
    • app->getRouterAction() === 'transitions' ? 'class="active"' : '' ?>> - url->link(t('Task transitions'), 'export', 'transitions', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ExportController', 'transitions') ?>> + url->link(t('Task transitions'), 'ExportController', 'transitions', array('project_id' => $project['id'])) ?>
      • -
    • app->getRouterAction() === 'summary' ? 'class="active"' : '' ?>> - url->link(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ExportController', 'summary') ?>> + url->link(t('Daily project summary'), 'ExportController', 'summary', array('project_id' => $project['id'])) ?>
      • hook->render('template:export:sidebar') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/feed/project.php b/sources/app/Template/feed/project.php index 1c6d116..213a04d 100644 --- a/sources/app/Template/feed/project.php +++ b/sources/app/Template/feed/project.php @@ -2,15 +2,15 @@ <?= t('%s\'s activity', $project['name']) ?> - + - url->href('feed', 'project', array('token' => $project['token']), false, '', true) ?> + url->href('FeedController', 'project', array('token' => $project['token']), false, '', true) ?> url->base() ?>assets/img/favicon.png <?= $e['event_title'] ?> - + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/feed/user.php b/sources/app/Template/feed/user.php index 28847f1..0c45f03 100644 --- a/sources/app/Template/feed/user.php +++ b/sources/app/Template/feed/user.php @@ -2,15 +2,15 @@ <?= t('Project activities for %s', $user['name'] ?: $user['username']) ?> - + - url->href('feed', 'user', array('token' => $user['token']), false, '', true) ?> + url->href('FeedController', 'user', array('token' => $user['token']), false, '', true) ?> url->base() ?>assets/img/favicon.png <?= $e['event_title'] ?> - + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/file_viewer/show.php b/sources/app/Template/file_viewer/show.php index 191aaa6..e829a17 100644 --- a/sources/app/Template/file_viewer/show.php +++ b/sources/app/Template/file_viewer/show.php @@ -3,7 +3,7 @@
    - <?= $this->text->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
    text->markdown($content) ?> @@ -11,4 +11,4 @@
    -
    \ No newline at end of file + diff --git a/sources/app/Template/gantt/task_creation.php b/sources/app/Template/gantt/task_creation.php deleted file mode 100644 index 448a808..0000000 --- a/sources/app/Template/gantt/task_creation.php +++ /dev/null @@ -1,35 +0,0 @@ -
    -

    -
    -
    - form->csrf() ?> - form->hidden('project_id', $values) ?> - form->hidden('column_id', $values) ?> - form->hidden('position', $values) ?> - -
    - form->label(t('Title'), 'title') ?> - form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?> - - form->label(t('Description'), 'description') ?> - form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"'), 'markdown-editor') ?> - - render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?> -
    - -
    - task->selectAssignee($users_list, $values, $errors) ?> - task->selectCategory($categories_list, $values, $errors) ?> - task->selectSwimlane($swimlanes_list, $values, $errors) ?> - task->selectPriority($project, $values) ?> - task->selectScore($values, $errors) ?> - task->selectStartDate($values, $errors) ?> - task->selectDueDate($values, $errors) ?> -
    - -
    - - - url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> -
    -
    diff --git a/sources/app/Template/group/associate.php b/sources/app/Template/group/associate.php index 9de46f3..8778756 100644 --- a/sources/app/Template/group/associate.php +++ b/sources/app/Template/group/associate.php @@ -1,25 +1,20 @@ -
    -
    -
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    • url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?>
      • -
    -
    - -

    - -
    - form->csrf() ?> - form->hidden('group_id', $values) ?> +
    +

    +
    + +

    + + + form->csrf() ?> + form->hidden('group_id', $values) ?> - form->label(t('User'), 'user_id') ?> - form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?> + form->label(t('User'), 'user_id') ?> + form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?> -
    - - - url->link(t('cancel'), 'group', 'index') ?> -
    -
    - -
    +
    + + + url->link(t('cancel'), 'GroupListController', 'index', array(), false, 'close-popover') ?> +
    + + diff --git a/sources/app/Template/group/create.php b/sources/app/Template/group/create.php deleted file mode 100644 index 4ce6b1f..0000000 --- a/sources/app/Template/group/create.php +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    -
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    -
    -
    - form->csrf() ?> - - form->label(t('Name'), 'name') ?> - form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?> - -
    - - - url->link(t('cancel'), 'group', 'index') ?> -
    -
    -
    diff --git a/sources/app/Template/group/dissociate.php b/sources/app/Template/group/dissociate.php index e1c6076..50ef6d6 100644 --- a/sources/app/Template/group/dissociate.php +++ b/sources/app/Template/group/dissociate.php @@ -1,17 +1,12 @@ -
    -
    -
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    • url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?>
      • -
    -
    -
    -

    +
    +

    +
    +
    +

    -
    - url->link(t('Yes'), 'group', 'removeUser', array('group_id' => $group['id'], 'user_id' => $user['id']), true, 'btn btn-red') ?> - - url->link(t('cancel'), 'group', 'users', array('group_id' => $group['id'])) ?> -
    +
    + url->link(t('Yes'), 'GroupListController', 'removeUser', array('group_id' => $group['id'], 'user_id' => $user['id']), true, 'btn btn-red') ?> + + url->link(t('cancel'), 'GroupListController', 'users', array('group_id' => $group['id']), false, 'close-popover') ?>
    -
    + diff --git a/sources/app/Template/group/edit.php b/sources/app/Template/group/edit.php deleted file mode 100644 index e9d9dd5..0000000 --- a/sources/app/Template/group/edit.php +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    -
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    -
    -
    - form->csrf() ?> - - form->hidden('id', $values) ?> - form->hidden('external_id', $values) ?> - - form->label(t('Name'), 'name') ?> - form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?> - -
    - - - url->link(t('cancel'), 'group', 'index') ?> -
    -
    -
    diff --git a/sources/app/Template/group/index.php b/sources/app/Template/group/index.php index 8302e5a..1062e18 100644 --- a/sources/app/Template/group/index.php +++ b/sources/app/Template/group/index.php @@ -1,8 +1,8 @@
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • -
    • url->link(t('New group'), 'group', 'create') ?>
      • +
    • url->link(t('All users'), 'UserListController', 'show') ?>
      • +
    • url->link(t('New group'), 'GroupCreationController', 'show', array(), false, 'popover') ?>
    isEmpty()): ?> @@ -24,16 +24,16 @@ text->e($group['external_id']) ?> - text->e($group['name']) ?> + url->link($this->text->e($group['name']), 'GroupListController', 'users', array('group_id' => $group['id'])) ?>
      -
    • url->link(t('Add group member'), 'group', 'associate', array('group_id' => $group['id'])) ?>
      • -
    • url->link(t('Members'), 'group', 'users', array('group_id' => $group['id'])) ?>
      • -
    • url->link(t('Edit'), 'group', 'edit', array('group_id' => $group['id'])) ?>
      • -
    • url->link(t('Remove'), 'group', 'confirm', array('group_id' => $group['id'])) ?>
      • +
    • url->link(t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id']), false, 'popover') ?>
      • +
    • url->link(t('Members'), 'GroupListController', 'users', array('group_id' => $group['id'])) ?>
      • +
    • url->link(t('Edit'), 'GroupModificationController', 'show', array('group_id' => $group['id']), false, 'popover') ?>
      • +
    • url->link(t('Remove'), 'GroupListController', 'confirm', array('group_id' => $group['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/group/remove.php b/sources/app/Template/group/remove.php index 1cb007b..408b3d8 100644 --- a/sources/app/Template/group/remove.php +++ b/sources/app/Template/group/remove.php @@ -1,17 +1,12 @@ -
    -
    -
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    • url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?>
      • -
    -
    -
    -

    +
    +

    +
    +
    +

    -
    - url->link(t('Yes'), 'group', 'remove', array('group_id' => $group['id']), true, 'btn btn-red') ?> - - url->link(t('cancel'), 'group', 'index') ?> -
    +
    + url->link(t('Yes'), 'GroupListController', 'remove', array('group_id' => $group['id']), true, 'btn btn-red') ?> + + url->link(t('cancel'), 'GroupListController', 'index', array(), false, 'close-popover') ?>
    -
    + diff --git a/sources/app/Template/group/users.php b/sources/app/Template/group/users.php index bbd4152..a4895ab 100644 --- a/sources/app/Template/group/users.php +++ b/sources/app/Template/group/users.php @@ -1,8 +1,8 @@
      -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • -
    • url->link(t('Add group member'), 'group', 'associate', array('group_id' => $group['id'])) ?>
      • +
    • url->link(t('View all groups'), 'GroupListController', 'index') ?>
      • +
    • url->link(t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id']), false, 'popover') ?>
    isEmpty()): ?> @@ -19,10 +19,10 @@ getCollection() as $user): ?> - url->link('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?> + url->link('#'.$user['id'], 'UserViewController', 'show', array('user_id' => $user['id'])) ?> - url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> text->e($user['name']) ?> @@ -31,7 +31,8 @@ text->e($user['email']) ?> - url->link(t('Remove this user'), 'group', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?> + + url->link(t('Remove this user'), 'GroupListController', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id']), false, 'popover') ?> diff --git a/sources/app/Template/group_creation/show.php b/sources/app/Template/group_creation/show.php new file mode 100644 index 0000000..b219bd7 --- /dev/null +++ b/sources/app/Template/group_creation/show.php @@ -0,0 +1,15 @@ +
    +

    +
    +
    + form->csrf() ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?> + +
    + + + url->link(t('cancel'), 'GroupListController', 'index', array(), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/group_modification/show.php b/sources/app/Template/group_modification/show.php new file mode 100644 index 0000000..ddf0736 --- /dev/null +++ b/sources/app/Template/group_modification/show.php @@ -0,0 +1,18 @@ +
    +

    +
    +
    + form->csrf() ?> + + form->hidden('id', $values) ?> + form->hidden('external_id', $values) ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?> + +
    + + + url->link(t('cancel'), 'GroupListController', 'index', array(), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/header.php b/sources/app/Template/header.php index a8fd47f..13521ae 100644 --- a/sources/app/Template/header.php +++ b/sources/app/Template/header.php @@ -2,13 +2,17 @@
    diff --git a/sources/app/Template/project/remove.php b/sources/app/Template/project/remove.php deleted file mode 100644 index fa43fc7..0000000 --- a/sources/app/Template/project/remove.php +++ /dev/null @@ -1,14 +0,0 @@ -
    -

    -
    - -
    -

    - -

    - -
    - url->link(t('Yes'), 'project', 'remove', array('project_id' => $project['id'], 'remove' => 'yes'), true, 'btn btn-red') ?> - url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?> -
    -
    \ No newline at end of file diff --git a/sources/app/Template/project/share.php b/sources/app/Template/project/share.php deleted file mode 100644 index 6f66c97..0000000 --- a/sources/app/Template/project/share.php +++ /dev/null @@ -1,19 +0,0 @@ -
    -

    -
    - - - -
    -
      -
    • url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • -
    -
    - - url->link(t('Disable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> - - - url->link(t('Enable public access'), 'project', 'share', array('project_id' => $project['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?> - diff --git a/sources/app/Template/project/sidebar.php b/sources/app/Template/project/sidebar.php index 304b4ae..d0f5059 100644 --- a/sources/app/Template/project/sidebar.php +++ b/sources/app/Template/project/sidebar.php @@ -1,62 +1,62 @@

      -
    • app->checkMenuSelection('project', 'show') ?>> - url->link(t('Summary'), 'project', 'show', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectViewController', 'show') ?>> + url->link(t('Summary'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
      • - user->hasProjectAccess('customfilter', 'index', $project['id'])): ?> -
    • app->checkMenuSelection('customfilter') ?>> - url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?> + user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?> +
    • app->checkMenuSelection('CustomFilterController') ?>> + url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
      • - user->hasProjectAccess('ProjectEdit', 'edit', $project['id'])): ?> -
    • app->checkMenuSelection('ProjectEdit', 'edit') ?>> - url->link(t('Edit project'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?> + user->hasProjectAccess('ProjectEditController', 'edit', $project['id'])): ?> +
    • app->checkMenuSelection('ProjectEditController') ?>> + url->link(t('Edit project'), 'ProjectEditController', 'edit', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('project', 'share') ?>> - url->link(t('Public access'), 'project', 'share', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectViewController', 'share') ?>> + url->link(t('Public access'), 'ProjectViewController', 'share', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('project', 'notifications') ?>> - url->link(t('Notifications'), 'project', 'notifications', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectViewController', 'notifications') ?>> + url->link(t('Notifications'), 'ProjectViewController', 'notifications', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('project', 'integrations') ?>> - url->link(t('Integrations'), 'project', 'integrations', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectViewController', 'integrations') ?>> + url->link(t('Integrations'), 'ProjectViewController', 'integrations', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('column') ?>> - url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ColumnController') ?>> + url->link(t('Columns'), 'ColumnController', 'index', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('swimlane') ?>> - url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('SwimlaneController') ?>> + url->link(t('Swimlanes'), 'SwimlaneController', 'index', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('category') ?>> - url->link(t('Categories'), 'category', 'index', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('CategoryController') ?>> + url->link(t('Categories'), 'CategoryController', 'index', array('project_id' => $project['id'])) ?> +
      • +
    • app->checkMenuSelection('ProjectTagController') ?>> + url->link(t('Tags'), 'ProjectTagController', 'index', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('ProjectPermission') ?>> - url->link(t('Permissions'), 'ProjectPermission', 'index', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectPermissionController') ?>> + url->link(t('Permissions'), 'ProjectPermissionController', 'index', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('action') ?>> - url->link(t('Automatic actions'), 'action', 'index', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ActionController') ?>> + url->link(t('Automatic actions'), 'ActionController', 'index', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('project', 'duplicate') ?>> - url->link(t('Duplicate'), 'project', 'duplicate', array('project_id' => $project['id'])) ?> +
    • app->checkMenuSelection('ProjectViewController', 'duplicate') ?>> + url->link(t('Duplicate'), 'ProjectViewController', 'duplicate', array('project_id' => $project['id'])) ?>
      • -
    • app->checkMenuSelection('project', 'disable') ?>> - url->link(t('Disable'), 'project', 'disable', array('project_id' => $project['id']), true) ?> +
    • + url->link(t('Disable'), 'ProjectStatusController', 'confirmDisable', array('project_id' => $project['id']), false, 'popover') ?> -
    • app->checkMenuSelection('project', 'enable') ?>> - url->link(t('Enable'), 'project', 'enable', array('project_id' => $project['id']), true) ?> +
    • + url->link(t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id']), false, 'popover') ?>
      • -
    • app->checkMenuSelection('taskImport') ?>> - url->link(t('Import'), 'taskImport', 'step1', array('project_id' => $project['id'])) ?> -
      • - user->hasProjectAccess('project', 'remove', $project['id'])): ?> -
    • app->checkMenuSelection('project', 'remove') ?>> - url->link(t('Remove'), 'project', 'remove', array('project_id' => $project['id'])) ?> + user->hasProjectAccess('ProjectStatusController', 'remove', $project['id'])): ?> +
    • + url->link(t('Remove'), 'ProjectStatusController', 'confirmRemove', array('project_id' => $project['id']), false, 'popover') ?>
      • diff --git a/sources/app/Template/action_project/project.php b/sources/app/Template/project_action_duplication/show.php similarity index 84% rename from sources/app/Template/action_project/project.php rename to sources/app/Template/project_action_duplication/show.php index 226f3b1..2eebb26 100644 --- a/sources/app/Template/action_project/project.php +++ b/sources/app/Template/project_action_duplication/show.php @@ -4,8 +4,7 @@

      -
      - + form->csrf() ?> form->label(t('Create from another project'), 'src_project_id') ?> @@ -17,4 +16,4 @@ url->link(t('cancel'), 'Action', 'index', array(), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/project_creation/create.php b/sources/app/Template/project_creation/create.php index c34173a..d00883b 100644 --- a/sources/app/Template/project_creation/create.php +++ b/sources/app/Template/project_creation/create.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('is_private', $values) ?> @@ -22,16 +22,17 @@ form->checkbox('projectPermission', t('Permissions'), 1, true) ?> - form->checkbox('category', t('Categories'), 1, true) ?> - form->checkbox('action', t('Actions'), 1, true) ?> - form->checkbox('swimlane', t('Swimlanes'), 1, true) ?> - form->checkbox('task', t('Tasks'), 1, false) ?> + form->checkbox('categoryModel', t('Categories'), 1, true) ?> + form->checkbox('tagDuplicationModel', t('Tags'), 1, true) ?> + form->checkbox('actionModel', t('Actions'), 1, true) ?> + form->checkbox('swimlaneModel', t('Swimlanes'), 1, true) ?> + form->checkbox('projectTaskDuplicationModel', t('Tasks'), 1, false) ?>
    - url->link(t('cancel'), 'project', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'ProjectListController', 'show', array(), false, 'close-popover') ?>
    @@ -39,4 +40,4 @@

    -
    \ No newline at end of file + diff --git a/sources/app/Template/project_edit/dates.php b/sources/app/Template/project_edit/dates.php index f77b726..48135dd 100644 --- a/sources/app/Template/project_edit/dates.php +++ b/sources/app/Template/project_edit/dates.php @@ -1,13 +1,13 @@

      -
    • url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('General'), 'ProjectEditController', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Dates'), 'ProjectEditController', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Description'), 'ProjectEditController', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Task priority'), 'ProjectEditController', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
    -
    + form->csrf() ?> form->hidden('id', $values) ?> form->hidden('name', $values) ?> diff --git a/sources/app/Template/project_edit/description.php b/sources/app/Template/project_edit/description.php index e6c42ca..f7e7be4 100644 --- a/sources/app/Template/project_edit/description.php +++ b/sources/app/Template/project_edit/description.php @@ -1,13 +1,13 @@

      -
    • url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('General'), 'ProjectEditController', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Dates'), 'ProjectEditController', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Description'), 'ProjectEditController', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Task priority'), 'ProjectEditController', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
    - + form->csrf() ?> form->hidden('id', $values) ?> form->hidden('name', $values) ?> diff --git a/sources/app/Template/project_edit/general.php b/sources/app/Template/project_edit/general.php index 6c3fa68..c742147 100644 --- a/sources/app/Template/project_edit/general.php +++ b/sources/app/Template/project_edit/general.php @@ -1,13 +1,13 @@

      -
    • url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('General'), 'ProjectEditController', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Dates'), 'ProjectEditController', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Description'), 'ProjectEditController', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Task priority'), 'ProjectEditController', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
    - + form->csrf() ?> form->hidden('id', $values) ?> @@ -24,7 +24,7 @@ form->select('owner_id', $owners, $values, $errors) ?> - user->hasProjectAccess('ProjectCreation', 'create', $project['id'])): ?> + user->hasProjectAccess('ProjectCreationController', 'create', $project['id'])): ?>
    form->checkbox('is_private', t('Private project'), 1, $project['is_private'] == 1) ?>

    diff --git a/sources/app/Template/project_edit/task_priority.php b/sources/app/Template/project_edit/task_priority.php index 56c2575..3ef4b3c 100644 --- a/sources/app/Template/project_edit/task_priority.php +++ b/sources/app/Template/project_edit/task_priority.php @@ -1,13 +1,13 @@

      -
    • url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • -
    • url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('General'), 'ProjectEditController', 'edit', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Dates'), 'ProjectEditController', 'dates', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Description'), 'ProjectEditController', 'description', array('project_id' => $project['id']), false, 'popover-link') ?>
      • +
    • url->link(t('Task priority'), 'ProjectEditController', 'priority', array('project_id' => $project['id']), false, 'popover-link') ?>
    - + form->csrf() ?> form->hidden('id', $values) ?> form->hidden('name', $values) ?> diff --git a/sources/app/Template/project_file/create.php b/sources/app/Template/project_file/create.php index 6731528..e262799 100644 --- a/sources/app/Template/project_file/create.php +++ b/sources/app/Template/project_file/create.php @@ -4,7 +4,7 @@ @@ -18,7 +18,7 @@
    + data-url="url->href('ProjectFileController', 'save', array('project_id' => $project['id'])) ?>">
    @@ -27,7 +27,7 @@
    - + - url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/project_file/remove.php b/sources/app/Template/project_file/remove.php index ba83428..0517a9e 100644 --- a/sources/app/Template/project_file/remove.php +++ b/sources/app/Template/project_file/remove.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'ProjectFile', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'ProjectFileController', 'remove', array('project_id' => $project['id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'ProjectOverviewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/gantt/projects.php b/sources/app/Template/project_gantt/show.php similarity index 67% rename from sources/app/Template/gantt/projects.php rename to sources/app/Template/project_gantt/show.php index 84b260b..af22a6e 100644 --- a/sources/app/Template/gantt/projects.php +++ b/sources/app/Template/project_gantt/show.php @@ -2,10 +2,10 @@
    • - url->link(t('Projects list'), 'project', 'index') ?> + url->link(t('Projects list'), 'ProjectListController', 'show') ?>
      • - user->hasAccess('projectuser', 'managers')): ?> -
    • url->link(t('Users overview'), 'projectuser', 'managers') ?>
      • + user->hasAccess('ProjectUserOverviewController', 'managers')): ?> +
    • url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?>
    @@ -16,9 +16,9 @@
    board->isCollapsed($project['id']) ? '' : 'style="display: none;"' ?>> - url->link(t('Expand tasks'), 'board', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + url->link(t('Expand tasks'), 'BoardAjaxController', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> board->isCollapsed($project['id']) ? 'style="display: none;"' : '' ?>> - url->link(t('Collapse tasks'), 'board', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + url->link(t('Collapse tasks'), 'BoardAjaxController', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?>
  • @@ -29,6 +29,66 @@
    • - render('project/dropdown', array('project' => $project)) ?> + + user->hasProjectAccess('TaskCreationController', 'show', $project['id'])): ?> +
  • + + url->link(t('Add a new task'), 'TaskCreationController', 'show', array('project_id' => $project['id']), false, 'popover') ?> +
    • + + +
  • + + url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?> +
    • + + user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?> +
  • + + url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?> +
    • + + + +
  • + + url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?> +
    • + + + hook->render('template:project:dropdown', array('project' => $project)) ?> + + user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?> +
  • + + url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?> +
    • + + + user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?> +
  • + + url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?> +
    • + + + user->hasProjectAccess('TaskImportController', 'tasks', $project['id'])): ?> +
  • + + url->link(t('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> +
    • + + + user->hasProjectAccess('ProjectEditController', 'edit', $project['id'])): ?> +
  • + + url->link(t('Settings'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?> +
    • + + +
  • + + url->link(t('Manage projects'), 'ProjectListController', 'show') ?> +
    • -
    \ No newline at end of file + diff --git a/sources/app/Template/project_header/search.php b/sources/app/Template/project_header/search.php index 4221635..8885d9c 100644 --- a/sources/app/Template/project_header/search.php +++ b/sources/app/Template/project_header/search.php @@ -22,9 +22,9 @@
    @@ -34,9 +34,9 @@
    diff --git a/sources/app/Template/project_header/views.php b/sources/app/Template/project_header/views.php index 353e4b6..3a41c91 100644 --- a/sources/app/Template/project_header/views.php +++ b/sources/app/Template/project_header/views.php @@ -1,24 +1,24 @@
      -
    • app->getRouterController() === 'ProjectOverview' ? 'class="active"' : '' ?>> +
    • app->checkMenuSelection('ProjectOverviewController') ?>> - url->link(t('Overview'), 'ProjectOverview', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?> + url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
      • -
    • app->getRouterController() === 'Board' ? 'class="active"' : '' ?>> +
    • app->checkMenuSelection('BoardViewController') ?>> - url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?> + url->link(t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
      • -
    • app->getRouterController() === 'Calendar' ? 'class="active"' : '' ?>> +
    • app->checkMenuSelection('Calendar') ?>> - url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?> + url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
      • -
    • app->getRouterController() === 'Listing' ? 'class="active"' : '' ?>> +
    • app->checkMenuSelection('TaskListController') ?>> - url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?> + url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
      • - user->hasProjectAccess('gantt', 'project', $project['id'])): ?> -
    • app->getRouterController() === 'Gantt' ? 'class="active"' : '' ?>> + user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?> +
    • app->checkMenuSelection('TaskGanttController') ?>> - url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?> + url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
      • -
    \ No newline at end of file + diff --git a/sources/app/Template/project/index.php b/sources/app/Template/project_list/show.php similarity index 70% rename from sources/app/Template/project/index.php rename to sources/app/Template/project_list/show.php index 10d4aaa..8b9f139 100644 --- a/sources/app/Template/project/index.php +++ b/sources/app/Template/project_list/show.php @@ -1,11 +1,11 @@
      - user->hasAccess('projectuser', 'managers')): ?> -
    • url->link(t('Users overview'), 'projectuser', 'managers') ?>
      • + user->hasAccess('ProjectUserOverviewController', 'managers')): ?> +
    • url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?>
      • - user->hasAccess('gantt', 'projects')): ?> -
    • url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?>
      • + user->hasAccess('ProjectGanttController', 'show')): ?> +
    • url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
    @@ -20,7 +20,7 @@ order(t('Start date'), 'start_date') ?> order(t('End date'), 'end_date') ?> order(t('Owner'), 'owner_id') ?> - user->hasAccess('projectuser', 'managers')): ?> + user->hasAccess('ProjectUserOverviewController', 'managers')): ?> @@ -28,7 +28,7 @@ getCollection() as $project): ?> - url->link('#'.$project['id'], 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link') ?> + render('project/dropdown', array('project' => $project)) ?> @@ -38,8 +38,7 @@ - url->link('', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> - url->link('', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> + url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> @@ -49,12 +48,10 @@ - '> + - - url->link($this->text->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?> dt->date($project['start_date']) ?> @@ -67,10 +64,10 @@ text->e($project['owner_name'] ?: $project['owner_username']) ?> - user->hasAccess('projectuser', 'managers')): ?> + user->hasAccess('ProjectUserOverviewController', 'managers')): ?> - + diff --git a/sources/app/Template/project_overview/attachments.php b/sources/app/Template/project_overview/attachments.php index eaabfd5..ab8cf2a 100644 --- a/sources/app/Template/project_overview/attachments.php +++ b/sources/app/Template/project_overview/attachments.php @@ -3,9 +3,9 @@

    - user->hasProjectAccess('ProjectFile', 'create', $project['id'])): ?> + user->hasProjectAccess('ProjectFileController', 'create', $project['id'])): ?>
    - url->button('fa-plus', t('Upload a file'), 'ProjectFile', 'create', array('project_id' => $project['id']), 'popover') ?> + url->button('fa-plus', t('Upload a file'), 'ProjectFileController', 'create', array('project_id' => $project['id']), 'popover') ?>
    diff --git a/sources/app/Template/project_overview/description.php b/sources/app/Template/project_overview/description.php index 72ccf06..0c2027e 100644 --- a/sources/app/Template/project_overview/description.php +++ b/sources/app/Template/project_overview/description.php @@ -3,9 +3,9 @@

    - user->hasProjectAccess('ProjectEdit', 'description', $project['id'])): ?> + user->hasProjectAccess('ProjectEditController', 'description', $project['id'])): ?>
    - url->button('fa-edit', t('Edit description'), 'ProjectEdit', 'description', array('project_id' => $project['id']), 'popover') ?> + url->button('fa-edit', t('Edit description'), 'ProjectEditController', 'description', array('project_id' => $project['id']), 'popover') ?>
    diff --git a/sources/app/Template/project_overview/files.php b/sources/app/Template/project_overview/files.php index c570b77..fa87093 100644 --- a/sources/app/Template/project_overview/files.php +++ b/sources/app/Template/project_overview/files.php @@ -16,17 +16,17 @@ file->getPreviewType($file['name']) !== null): ?>
  • - url->link(t('View file'), 'FileViewer', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('View file'), 'FileViewerController', 'show', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
  • - url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?> + url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
    • - user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?> + user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
  • - url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
    • diff --git a/sources/app/Template/project_overview/images.php b/sources/app/Template/project_overview/images.php index f6937e1..7f38e2b 100644 --- a/sources/app/Template/project_overview/images.php +++ b/sources/app/Template/project_overview/images.php @@ -2,7 +2,7 @@
    - <?= $this->text->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
    @@ -10,12 +10,12 @@
    • - url->link(t('Download'), 'FileViewer', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?> + url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
      • - user->hasProjectAccess('ProjectFile', 'remove', $project['id'])): ?> + user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
    • - url->link(t('Remove'), 'ProjectFile', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('Remove'), 'ProjectFileController', 'confirm', array('project_id' => $project['id'], 'file_id' => $file['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/project_overview/information.php b/sources/app/Template/project_overview/information.php index 2032ed2..fdf0f75 100644 --- a/sources/app/Template/project_overview/information.php +++ b/sources/app/Template/project_overview/information.php @@ -29,9 +29,9 @@ -
  • url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?>
    • +
  • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    • diff --git a/sources/app/Template/project_overview/show.php b/sources/app/Template/project_overview/show.php index 6fe815b..6b2bc2c 100644 --- a/sources/app/Template/project_overview/show.php +++ b/sources/app/Template/project_overview/show.php @@ -1,5 +1,5 @@
    - projectHeader->render($project, 'ProjectOverview', 'show') ?> + projectHeader->render($project, 'ProjectOverviewController', 'show') ?> render('project_overview/columns', array('project' => $project)) ?> render('project_overview/description', array('project' => $project)) ?> render('project_overview/attachments', array('project' => $project, 'images' => $images, 'files' => $files)) ?> diff --git a/sources/app/Template/project_permission/index.php b/sources/app/Template/project_permission/index.php index a7d666a..d850ec5 100644 --- a/sources/app/Template/project_permission/index.php +++ b/sources/app/Template/project_permission/index.php @@ -26,12 +26,12 @@ $roles, array('role-'.$user['id'] => $user['role']), array(), - array('data-url="'.$this->url->href('ProjectPermission', 'changeUserRole', array('project_id' => $project['id'])).'"', 'data-id="'.$user['id'].'"'), + array('data-url="'.$this->url->href('ProjectPermissionController', 'changeUserRole', array('project_id' => $project['id'])).'"', 'data-id="'.$user['id'].'"'), 'project-change-role' ) ?> - url->link(t('Remove'), 'ProjectPermission', 'removeUser', array('project_id' => $project['id'], 'user_id' => $user['id']), true) ?> + url->link(t('Remove'), 'ProjectPermissionController', 'removeUser', array('project_id' => $project['id'], 'user_id' => $user['id']), true) ?> @@ -40,7 +40,7 @@
    - + form->csrf() ?> form->hidden('project_id', array('project_id' => $project['id'])) ?> form->hidden('user_id', $values) ?> @@ -51,7 +51,7 @@ 'placeholder="'.t('Enter user name...').'"', 'title="'.t('Enter user name...').'"', 'data-dst-field="user_id"', - 'data-search-url="'.$this->url->href('UserHelper', 'autocomplete').'"', + 'data-search-url="'.$this->url->href('UserAjaxController', 'autocomplete').'"', ), 'autocomplete') ?> @@ -86,12 +86,12 @@ $roles, array('role-'.$group['id'] => $group['role']), array(), - array('data-url="'.$this->url->href('ProjectPermission', 'changeGroupRole', array('project_id' => $project['id'])).'"', 'data-id="'.$group['id'].'"'), + array('data-url="'.$this->url->href('ProjectPermissionController', 'changeGroupRole', array('project_id' => $project['id'])).'"', 'data-id="'.$group['id'].'"'), 'project-change-role' ) ?> - url->link(t('Remove'), 'ProjectPermission', 'removeGroup', array('project_id' => $project['id'], 'group_id' => $group['id']), true) ?> + url->link(t('Remove'), 'ProjectPermissionController', 'removeGroup', array('project_id' => $project['id'], 'group_id' => $group['id']), true) ?> @@ -100,7 +100,7 @@
    - + form->csrf() ?> form->hidden('project_id', array('project_id' => $project['id'])) ?> form->hidden('group_id', $values) ?> @@ -113,7 +113,7 @@ 'title="'.t('Enter group name...').'"', 'data-dst-field="group_id"', 'data-dst-extra-field="external_id"', - 'data-search-url="'.$this->url->href('GroupHelper', 'autocomplete').'"', + 'data-search-url="'.$this->url->href('GroupAjaxController', 'autocomplete').'"', ), 'autocomplete') ?> @@ -128,7 +128,7 @@
    - + form->csrf() ?> form->hidden('id', array('id' => $project['id'])) ?> diff --git a/sources/app/Template/project_status/disable.php b/sources/app/Template/project_status/disable.php new file mode 100644 index 0000000..d8145d3 --- /dev/null +++ b/sources/app/Template/project_status/disable.php @@ -0,0 +1,14 @@ +
    +

    +
    + +
    +

    + +

    + +
    + url->link(t('Yes'), 'ProjectStatusController', 'disable', array('project_id' => $project['id']), true, 'btn btn-red') ?> + url->link(t('cancel'), 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/project_status/enable.php b/sources/app/Template/project_status/enable.php new file mode 100644 index 0000000..1f76d09 --- /dev/null +++ b/sources/app/Template/project_status/enable.php @@ -0,0 +1,14 @@ +
    +

    +
    + +
    +

    + +

    + +
    + url->link(t('Yes'), 'ProjectStatusController', 'enable', array('project_id' => $project['id']), true, 'btn btn-red') ?> + url->link(t('cancel'), 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/project_status/remove.php b/sources/app/Template/project_status/remove.php new file mode 100644 index 0000000..8959ef7 --- /dev/null +++ b/sources/app/Template/project_status/remove.php @@ -0,0 +1,14 @@ +
    +

    +
    + +
    +

    + +

    + +
    + url->link(t('Yes'), 'ProjectStatusController', 'remove', array('project_id' => $project['id']), true, 'btn btn-red') ?> + url->link(t('cancel'), 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/project_tag/create.php b/sources/app/Template/project_tag/create.php new file mode 100644 index 0000000..bfd1084 --- /dev/null +++ b/sources/app/Template/project_tag/create.php @@ -0,0 +1,16 @@ +
    +

    +
    + + form->csrf() ?> + form->hidden('project_id', $values) ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?> + +
    + + + url->link(t('cancel'), 'ProjectTagController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> +
    + diff --git a/sources/app/Template/project_tag/edit.php b/sources/app/Template/project_tag/edit.php new file mode 100644 index 0000000..9bf261b --- /dev/null +++ b/sources/app/Template/project_tag/edit.php @@ -0,0 +1,17 @@ +
    +

    +
    +
    + form->csrf() ?> + form->hidden('id', $values) ?> + form->hidden('project_id', $values) ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?> + +
    + + + url->link(t('cancel'), 'ProjectTagController', 'index', array(), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/project_tag/index.php b/sources/app/Template/project_tag/index.php new file mode 100644 index 0000000..8e8dd96 --- /dev/null +++ b/sources/app/Template/project_tag/index.php @@ -0,0 +1,31 @@ +
    +

    +
      +
    • + + url->link(t('Add new tag'), 'ProjectTagController', 'create', array('project_id' => $project['id']), false, 'popover') ?> +
      • +
    +
    + + +

    + + + + + + + + + + + + +
    text->e($tag['name']) ?> + + url->link(t('Remove'), 'ProjectTagController', 'confirm', array('tag_id' => $tag['id'], 'project_id' => $project['id']), false, 'popover') ?> + + url->link(t('Edit'), 'ProjectTagController', 'edit', array('tag_id' => $tag['id'], 'project_id' => $project['id']), false, 'popover') ?> +
    + diff --git a/sources/app/Template/project_tag/remove.php b/sources/app/Template/project_tag/remove.php new file mode 100644 index 0000000..f4aadab --- /dev/null +++ b/sources/app/Template/project_tag/remove.php @@ -0,0 +1,15 @@ +
    +

    +
    + +
    +

    + +

    + +
    + url->link(t('Yes'), 'ProjectTagController', 'remove', array('tag_id' => $tag['id'], 'project_id' => $project['id']), true, 'btn btn-red popover-link') ?> + + url->link(t('cancel'), 'ProjectTagController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/project_user/sidebar.php b/sources/app/Template/project_user/sidebar.php deleted file mode 100644 index ff113eb..0000000 --- a/sources/app/Template/project_user/sidebar.php +++ /dev/null @@ -1,30 +0,0 @@ -
    -

    - - form->select( - 'user_id', - $users, - $filter, - array(), - array('data-redirect-url="'.$this->url->href('projectuser', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'), - 'chosen-select select-auto-redirect' - ) ?> - -

    -
      -
    • app->checkMenuSelection('projectuser', 'managers') ?>> - url->link(t('Project managers'), 'projectuser', 'managers', $filter) ?> -
      • -
    • app->checkMenuSelection('projectuser', 'members') ?>> - url->link(t('Project members'), 'projectuser', 'members', $filter) ?> -
      • -
    • app->checkMenuSelection('projectuser', 'opens') ?>> - url->link(t('Open tasks'), 'projectuser', 'opens', $filter) ?> -
      • -
    • app->checkMenuSelection('projectuser', 'closed') ?>> - url->link(t('Closed tasks'), 'projectuser', 'closed', $filter) ?> -
      • - - hook->render('template:project-user:sidebar') ?> -
    -
    \ No newline at end of file diff --git a/sources/app/Template/project_user/layout.php b/sources/app/Template/project_user_overview/layout.php similarity index 75% rename from sources/app/Template/project_user/layout.php rename to sources/app/Template/project_user_overview/layout.php index 1103e9b..19b8343 100644 --- a/sources/app/Template/project_user/layout.php +++ b/sources/app/Template/project_user_overview/layout.php @@ -3,12 +3,12 @@
    • - url->link(t('Projects list'), 'project', 'index') ?> + url->link(t('Projects list'), 'ProjectListController', 'show') ?>
      • - user->hasAccess('gantt', 'projects')): ?> + user->hasAccess('ProjectGanttController', 'show')): ?>
    • - url->link(t('Projects Gantt chart'), 'gantt', 'projects') ?> + url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
    @@ -24,4 +24,4 @@
    -
    \ No newline at end of file + diff --git a/sources/app/Template/project_user/roles.php b/sources/app/Template/project_user_overview/roles.php similarity index 76% rename from sources/app/Template/project_user/roles.php rename to sources/app/Template/project_user_overview/roles.php index 17fb709..87c8df8 100644 --- a/sources/app/Template/project_user/roles.php +++ b/sources/app/Template/project_user_overview/roles.php @@ -13,9 +13,9 @@ text->e($this->user->getFullname($project)) ?> - url->link('', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> - url->link('', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> - url->link('', 'project', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?> + url->link('', 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> + url->link('', 'TaskGanttController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> + url->link('', 'ProjectViewController', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?> text->e($project['project_name']) ?> @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/project_user_overview/sidebar.php b/sources/app/Template/project_user_overview/sidebar.php new file mode 100644 index 0000000..9a87d4e --- /dev/null +++ b/sources/app/Template/project_user_overview/sidebar.php @@ -0,0 +1,30 @@ +
    +

    + + form->select( + 'user_id', + $users, + $filter, + array(), + array('data-redirect-url="'.$this->url->href('ProjectUserOverviewController', $this->app->getRouterAction(), array('user_id' => 'USER_ID')).'"', 'data-redirect-regex="USER_ID"'), + 'chosen-select select-auto-redirect' + ) ?> + +

    +
      +
    • app->checkMenuSelection('ProjectUserOverviewController', 'managers') ?>> + url->link(t('Project managers'), 'ProjectUserOverviewController', 'managers', $filter) ?> +
      • +
    • app->checkMenuSelection('ProjectUserOverviewController', 'members') ?>> + url->link(t('Project members'), 'ProjectUserOverviewController', 'members', $filter) ?> +
      • +
    • app->checkMenuSelection('ProjectUserOverviewController', 'opens') ?>> + url->link(t('Open tasks'), 'ProjectUserOverviewController', 'opens', $filter) ?> +
      • +
    • app->checkMenuSelection('ProjectUserOverviewController', 'closed') ?>> + url->link(t('Closed tasks'), 'ProjectUserOverviewController', 'closed', $filter) ?> +
      • + + hook->render('template:project-user:sidebar') ?> +
    +
    diff --git a/sources/app/Template/project_user/tasks.php b/sources/app/Template/project_user_overview/tasks.php similarity index 83% rename from sources/app/Template/project_user/tasks.php rename to sources/app/Template/project_user_overview/tasks.php index 108d3b3..af0a3d9 100644 --- a/sources/app/Template/project_user/tasks.php +++ b/sources/app/Template/project_user_overview/tasks.php @@ -14,16 +14,16 @@ getCollection() as $task): ?> - url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> text->e($task['column_name']) ?> - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> diff --git a/sources/app/Template/project_user/tooltip_users.php b/sources/app/Template/project_user_overview/tooltip_users.php similarity index 55% rename from sources/app/Template/project_user/tooltip_users.php rename to sources/app/Template/project_user_overview/tooltip_users.php index f75d964..7117a87 100644 --- a/sources/app/Template/project_user/tooltip_users.php +++ b/sources/app/Template/project_user_overview/tooltip_users.php @@ -1,14 +1,16 @@

    + $role_name): ?> - -
      +
    $user): ?> -
  • url->link($this->text->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?>
    • + - - \ No newline at end of file +
    + url->link($this->text->e($user), 'ProjectUserOverviewController', 'opens', array('user_id' => $user_id)) ?> +
    + diff --git a/sources/app/Template/project_view/duplicate.php b/sources/app/Template/project_view/duplicate.php new file mode 100644 index 0000000..d66ff59 --- /dev/null +++ b/sources/app/Template/project_view/duplicate.php @@ -0,0 +1,29 @@ +
    +

    +
    + +
    +

    + +

    +
    + + form->csrf() ?> + + + form->checkbox('projectPermission', t('Permissions'), 1, true) ?> + + + form->checkbox('categoryModel', t('Categories'), 1, true) ?> + form->checkbox('tagDuplicationModel', t('Tags'), 1, true) ?> + form->checkbox('actionModel', t('Actions'), 1, true) ?> + form->checkbox('swimlaneModel', t('Swimlanes'), 1, false) ?> + form->checkbox('projectMetadataModel', t('Metadata'), 1, false) ?> + form->checkbox('projectTaskDuplicationModel', t('Tasks'), 1, false) ?> + +
    + + url->link(t('cancel'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?> +
    +
    +
    diff --git a/sources/app/Template/project/integrations.php b/sources/app/Template/project_view/integrations.php similarity index 74% rename from sources/app/Template/project/integrations.php rename to sources/app/Template/project_view/integrations.php index 54720c6..f8bff7e 100644 --- a/sources/app/Template/project/integrations.php +++ b/sources/app/Template/project_view/integrations.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> hook->render('template:project:integrations', array('project' => $project, 'values' => $values, 'webhook_token' => $webhook_token)) ?> @@ -12,4 +12,4 @@ -
    \ No newline at end of file + diff --git a/sources/app/Template/project/notifications.php b/sources/app/Template/project_view/notifications.php similarity index 67% rename from sources/app/Template/project/notifications.php rename to sources/app/Template/project_view/notifications.php index 494a322..29cc088 100644 --- a/sources/app/Template/project/notifications.php +++ b/sources/app/Template/project_view/notifications.php @@ -4,7 +4,7 @@

    -
    + form->csrf() ?> @@ -14,7 +14,7 @@
    - url->link(t('cancel'), 'project', 'show', array('project_id' => $project['id'])) ?> + url->link(t('cancel'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/project_view/share.php b/sources/app/Template/project_view/share.php new file mode 100644 index 0000000..409f37e --- /dev/null +++ b/sources/app/Template/project_view/share.php @@ -0,0 +1,18 @@ +
    +

    +
    + + + +
    +
      +
    • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • +
    +
    + + url->link(t('Disable public access'), 'ProjectViewController', 'updateSharing', array('project_id' => $project['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> + + url->link(t('Enable public access'), 'ProjectViewController', 'updateSharing', array('project_id' => $project['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?> + diff --git a/sources/app/Template/project/show.php b/sources/app/Template/project_view/show.php similarity index 79% rename from sources/app/Template/project/show.php rename to sources/app/Template/project_view/show.php index 42eeec4..5efe8ce 100644 --- a/sources/app/Template/project/show.php +++ b/sources/app/Template/project_view/show.php @@ -13,9 +13,9 @@ -
  • url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?>
    • +
  • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    • @@ -35,11 +35,11 @@ 0): ?> 0): ?> -
  • url->link(t('%d tasks on the board', $stats['nb_active_tasks']), 'board', 'show', array('project_id' => $project['id'], 'search' => 'status:open')) ?>
    • +
  • url->link(t('%d tasks on the board', $stats['nb_active_tasks']), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => 'status:open')) ?>
    • 0): ?> -
  • url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'listing', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?>
    • +
  • url->link(t('%d closed tasks', $stats['nb_inactive_tasks']), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => 'status:closed')) ?>
    • @@ -63,7 +63,7 @@ text->e($column['title']) ?> - '> + diff --git a/sources/app/Template/search/activity.php b/sources/app/Template/search/activity.php new file mode 100644 index 0000000..9abc7d7 --- /dev/null +++ b/sources/app/Template/search/activity.php @@ -0,0 +1,39 @@ +
    +
    +
      +
    • + + url->link(t('Search tasks'), 'SearchController', 'index') ?> +
      • +
    +
    + +
    +
    + form->hidden('controller', $values) ?> + form->hidden('action', $values) ?> + form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'form-input-large') ?> + render('activity/filter_dropdown') ?> +
    +
    + + +
    +

    +

    project:"My project" creator:me

    +
      +
    • project:"My project"
      • +
    • creator:admin
      • +
    • created:today
      • +
    • status:open
      • +
    • title:"My task"
      • +
    +

    url->doc(t('View advanced search syntax'), 'search') ?>

    +
    + +

    + + render('event/events', array('events' => $events)) ?> + + +
    diff --git a/sources/app/Template/search/index.php b/sources/app/Template/search/index.php index 9231a6f..bc528af 100644 --- a/sources/app/Template/search/index.php +++ b/sources/app/Template/search/index.php @@ -2,8 +2,8 @@
    • - - url->link(t('All projects'), 'project', 'index') ?> + + url->link(t('Activity stream search'), 'SearchController', 'activity') ?>
    @@ -40,4 +40,4 @@ )) ?> - \ No newline at end of file + diff --git a/sources/app/Template/search/results.php b/sources/app/Template/search/results.php index 79df354..8376b9e 100644 --- a/sources/app/Template/search/results.php +++ b/sources/app/Template/search/results.php @@ -13,10 +13,10 @@ getCollection() as $task): ?> - url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?> - url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?> @@ -28,7 +28,7 @@ text->e($task['category_name']) ?> - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> @@ -41,7 +41,7 @@ dt->date($task['date_due']) ?> - + diff --git a/sources/app/Template/subtask/create.php b/sources/app/Template/subtask/create.php index 029fddf..3c080f7 100644 --- a/sources/app/Template/subtask/create.php +++ b/sources/app/Template/subtask/create.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('task_id', $values) ?> @@ -15,6 +15,6 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/subtask/edit.php b/sources/app/Template/subtask/edit.php index 3c210f6..8f256ce 100644 --- a/sources/app/Template/subtask/edit.php +++ b/sources/app/Template/subtask/edit.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('id', $values) ?> @@ -15,6 +15,6 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/subtask/menu.php b/sources/app/Template/subtask/menu.php index 6c98b95..d5d1bf8 100644 --- a/sources/app/Template/subtask/menu.php +++ b/sources/app/Template/subtask/menu.php @@ -2,10 +2,16 @@
    • - url->link(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?> + + url->link(t('Edit'), 'SubtaskController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
    • - url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?> + + url->link(t('Remove'), 'SubtaskController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?> +
      • +
    • + + url->link(t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/subtask/remove.php b/sources/app/Template/subtask/remove.php index 374256f..426c1a9 100644 --- a/sources/app/Template/subtask/remove.php +++ b/sources/app/Template/subtask/remove.php @@ -3,15 +3,18 @@
    -

    +

    -

    - -

    text->e($subtask['title']) ?>

    +
      +
    • + text->e($subtask['title']) ?> +
      • +
    +
    - url->link(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'SubtaskController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/subtask/table.php b/sources/app/Template/subtask/table.php index 40510a2..4c6484e 100644 --- a/sources/app/Template/subtask/table.php +++ b/sources/app/Template/subtask/table.php @@ -1,7 +1,7 @@ @@ -44,11 +44,11 @@
  • - url->link(t('Stop timer'), 'SubtaskStatus', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> + url->link(t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> (dt->age($subtask['timer_start_date']) ?>) - url->link(t('Start timer'), 'SubtaskStatus', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> + url->link(t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
    • diff --git a/sources/app/Template/subtask_converter/show.php b/sources/app/Template/subtask_converter/show.php new file mode 100644 index 0000000..63f4548 --- /dev/null +++ b/sources/app/Template/subtask_converter/show.php @@ -0,0 +1,20 @@ +
    +

    +
    + +
    +
    + +
      +
    • + text->e($subtask['title']) ?> +
      • +
    +
    + +
    + url->link(t('Yes'), 'SubtaskConverterController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> + + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/subtask_restriction/popover.php b/sources/app/Template/subtask_restriction/show.php similarity index 62% rename from sources/app/Template/subtask_restriction/popover.php rename to sources/app/Template/subtask_restriction/show.php index 916a664..ec8b8d5 100644 --- a/sources/app/Template/subtask_restriction/popover.php +++ b/sources/app/Template/subtask_restriction/show.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> @@ -12,6 +12,6 @@
    - + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/swimlane/create.php b/sources/app/Template/swimlane/create.php index a9b4374..f5aa159 100644 --- a/sources/app/Template/swimlane/create.php +++ b/sources/app/Template/swimlane/create.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> form->hidden('project_id', $values) ?> @@ -15,6 +15,6 @@
    - url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/swimlane/edit.php b/sources/app/Template/swimlane/edit.php index b08099a..b10cdd5 100644 --- a/sources/app/Template/swimlane/edit.php +++ b/sources/app/Template/swimlane/edit.php @@ -2,7 +2,7 @@

    - +form->csrf() ?> @@ -18,6 +18,6 @@
    - url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/swimlane/edit_default.php b/sources/app/Template/swimlane/edit_default.php index 3bf8256..f271c51 100644 --- a/sources/app/Template/swimlane/edit_default.php +++ b/sources/app/Template/swimlane/edit_default.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> form->hidden('id', $values) ?> @@ -13,6 +13,6 @@
    - url->link(t('cancel'), 'Swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/swimlane/index.php b/sources/app/Template/swimlane/index.php index fad3530..4f78a40 100644 --- a/sources/app/Template/swimlane/index.php +++ b/sources/app/Template/swimlane/index.php @@ -3,7 +3,7 @@
    • - url->link(t('Add a new swimlane'), 'Swimlane', 'create', array('project_id' => $project['id']), false, 'popover') ?> + url->link(t('Add a new swimlane'), 'SwimlaneController', 'create', array('project_id' => $project['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/swimlane/remove.php b/sources/app/Template/swimlane/remove.php index 9be39ff..f16b778 100644 --- a/sources/app/Template/swimlane/remove.php +++ b/sources/app/Template/swimlane/remove.php @@ -9,9 +9,9 @@

    - url->link(t('Yes'), 'swimlane', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'SwimlaneController', 'remove', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'swimlane', 'index', array('project_id' => $project['id']), false, 'close-popover') ?> + url->link(t('cancel'), 'SwimlaneController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/swimlane/table.php b/sources/app/Template/swimlane/table.php index 17be692..be123b0 100644 --- a/sources/app/Template/swimlane/table.php +++ b/sources/app/Template/swimlane/table.php @@ -1,6 +1,6 @@
    + data-save-position-url="url->href('SwimlaneController', 'move', array('project_id' => $project['id'])) ?>"> @@ -20,13 +20,13 @@
    • - url->link(t('Edit'), 'Swimlane', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?> + url->link(t('Edit'), 'SwimlaneController', 'editDefault', array('project_id' => $project['id']), false, 'popover') ?>
    • - url->link(t('Disable'), 'Swimlane', 'disableDefault', array('project_id' => $project['id']), true) ?> + url->link(t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?> - url->link(t('Enable'), 'Swimlane', 'enableDefault', array('project_id' => $project['id']), true) ?> + url->link(t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?>
    @@ -45,7 +45,7 @@ text->e($swimlane['name']) ?> - '> + @@ -55,17 +55,17 @@
    • - url->link(t('Edit'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> + url->link(t('Edit'), 'SwimlaneController', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
    • - url->link(t('Disable'), 'swimlane', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + url->link(t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> - url->link(t('Enable'), 'swimlane', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + url->link(t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
    • - url->link(t('Remove'), 'swimlane', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?> + url->link(t('Remove'), 'SwimlaneController', 'confirm', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), false, 'popover') ?>
    diff --git a/sources/app/Template/tag/create.php b/sources/app/Template/tag/create.php new file mode 100644 index 0000000..9b32bc4 --- /dev/null +++ b/sources/app/Template/tag/create.php @@ -0,0 +1,16 @@ +
    +

    +
    +
    + form->csrf() ?> + form->hidden('project_id', $values) ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?> + +
    + + + url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?> +
    + diff --git a/sources/app/Template/tag/edit.php b/sources/app/Template/tag/edit.php new file mode 100644 index 0000000..f751ff4 --- /dev/null +++ b/sources/app/Template/tag/edit.php @@ -0,0 +1,17 @@ +
    +

    +
    +
    + form->csrf() ?> + form->hidden('id', $values) ?> + form->hidden('project_id', $values) ?> + + form->label(t('Name'), 'name') ?> + form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?> + +
    + + + url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?> +
    + diff --git a/sources/app/Template/tag/index.php b/sources/app/Template/tag/index.php new file mode 100644 index 0000000..2a495eb --- /dev/null +++ b/sources/app/Template/tag/index.php @@ -0,0 +1,31 @@ +
    +

    +
      +
    • + + url->link(t('Add new tag'), 'TagController', 'create', array(), false, 'popover') ?> +
      • +
    +
    + + +

    + +
    + + + + + + + + + + +
    text->e($tag['name']) ?> + + url->link(t('Remove'), 'TagController', 'confirm', array('tag_id' => $tag['id']), false, 'popover') ?> + + url->link(t('Edit'), 'TagController', 'edit', array('tag_id' => $tag['id']), false, 'popover') ?> +
    + diff --git a/sources/app/Template/tag/remove.php b/sources/app/Template/tag/remove.php new file mode 100644 index 0000000..46ea3f9 --- /dev/null +++ b/sources/app/Template/tag/remove.php @@ -0,0 +1,15 @@ +
    +

    +
    + +
    +

    + +

    + +
    + url->link(t('Yes'), 'TagController', 'remove', array('tag_id' => $tag['id']), true, 'btn btn-red popover-link') ?> + + url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/task/analytics.php b/sources/app/Template/task/analytics.php index 54eac2b..db2d0ce 100644 --- a/sources/app/Template/task/analytics.php +++ b/sources/app/Template/task/analytics.php @@ -34,6 +34,3 @@
    • - -asset->js('assets/js/vendor/d3.v3.min.js') ?> -asset->js('assets/js/vendor/c3.min.js') ?> \ No newline at end of file diff --git a/sources/app/Template/task/color_picker.php b/sources/app/Template/task/color_picker.php deleted file mode 100644 index 0c62fa7..0000000 --- a/sources/app/Template/task/color_picker.php +++ /dev/null @@ -1,11 +0,0 @@ -
    - $color_name): ?> -
    -
    - -
    - -form->hidden('color_id', $values) ?> \ No newline at end of file diff --git a/sources/app/Template/task/description.php b/sources/app/Template/task/description.php index 9ffe858..f8e313d 100644 --- a/sources/app/Template/task/description.php +++ b/sources/app/Template/task/description.php @@ -4,29 +4,7 @@
    - - text->markdown( - $task['description'], - array( - 'controller' => 'task', - 'action' => 'show', - 'params' => array( - 'project_id' => $task['project_id'] - ) - ) - ) ?> - - text->markdown( - $task['description'], - array( - 'controller' => 'task', - 'action' => 'readonly', - 'params' => array( - 'token' => $project['token'] - ) - ) - ) ?> - + text->markdown($task['description'], isset($is_public) && $is_public) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task/details.php b/sources/app/Template/task/details.php index 6093c15..695957f 100644 --- a/sources/app/Template/task/details.php +++ b/sources/app/Template/task/details.php @@ -1,144 +1,167 @@

    text->e($task['title']) ?>

    + hook->render('template:task:details:top', array('task' => $task)) ?> +
    -
    -
      -
    • - - - - - - +
      +
      +
        +
      • + + + + + + + + +
        • +
      • + +
        • + +
      • + text->e($task['reference']) ?> +
        • - - -
      • - -
        • - -
      • - text->e($task['reference']) ?> -
        • - - -
      • - text->e($task['score']) ?> -
        • - - -
      • - - url->link(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?> -
        • - - -
      • - - url->link(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?> -
        • - -
      • -
      -
      -
      -
        - -
      • - - text->e($task['category_name']) ?> -
        • - - -
      • - - text->e($task['swimlane_name']) ?> -
        • - -
      • - - text->e($task['column_title']) ?> -
        • -
      • - - -
        • -
      -
      -
      -
        -
      • - - - - text->e($task['assignee_name'] ?: $task['assignee_username']) ?> - - + +
      • + text->e($task['score']) ?> +
        • - - - -
      • - - text->e($task['creator_name'] ?: $task['creator_username']) ?> + +
      • + + url->link(t('Public link'), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
        • - - -
      • - - dt->date($task['date_due']) ?> -
        • - - -
      • - - -
        • - - -
      • - - -
        • - -
      -
      -
      -
        -
      • - - dt->datetime($task['date_creation']) ?> -
        • -
      • - - dt->datetime($task['date_modification']) ?> -
        • - -
      • - - dt->datetime($task['date_completed']) ?> -
        • - - -
      • - - dt->datetime($task['date_started']) ?> -
        • - - -
      • - - dt->datetime($task['date_moved']) ?> -
        • - -
      + + +
    • + + url->link(t('Back to the board'), 'BoardViewController', 'readonly', array('token' => $project['token'])) ?> +
      • + +
    • + + hook->render('template:task:details:first-column', array('task' => $task)) ?> +
    +
    +
    +
      + +
    • + + text->e($task['category_name']) ?> +
      • + + +
    • + + text->e($task['swimlane_name']) ?> +
      • + +
    • + + text->e($task['column_title']) ?> +
      • +
    • + + +
      • + + hook->render('template:task:details:second-column', array('task' => $task)) ?> +
    +
    +
    +
      +
    • + + + + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> + + + + +
      • + +
    • + + text->e($task['creator_name'] ?: $task['creator_username']) ?> +
      • + + +
    • + + dt->date($task['date_due']) ?> +
      • + + +
    • + + +
      • + + +
    • + + +
      • + + + hook->render('template:task:details:third-column', array('task' => $task)) ?> +
    +
    +
    +
      +
    • + + dt->datetime($task['date_creation']) ?> +
      • +
    • + + dt->datetime($task['date_modification']) ?> +
      • + +
    • + + dt->datetime($task['date_completed']) ?> +
      • + + +
    • + + dt->datetime($task['date_started']) ?> +
      • + + +
    • + + dt->datetime($task['date_moved']) ?> +
      • + + + hook->render('template:task:details:fourth-column', array('task' => $task)) ?> +
    +
    + +
    +
      + +
    • text->e($tag) ?>
      • + +
    +
    +
    - url->button('fa-play', t('Set start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->button('fa-play', t('Set start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    + + hook->render('template:task:details:bottom', array('task' => $task)) ?>
    diff --git a/sources/app/Template/task/dropdown.php b/sources/app/Template/task/dropdown.php index f98f517..95c7a88 100644 --- a/sources/app/Template/task/dropdown.php +++ b/sources/app/Template/task/dropdown.php @@ -1,60 +1,66 @@
    #
      - +
    • - url->link(t('Set automatically the start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • - url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> -
      • -
    • - - url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
      • +
    • + + url->link(t('Add a screenshot'), 'TaskPopoverController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • + user->canRemoveTask($task)): ?> +
    • + + url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
      • +
    • - url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> - url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • - hook->render('template:task:dropdown') ?> + hook->render('template:task:dropdown', array('task' => $task)) ?>
    diff --git a/sources/app/Template/task/layout.php b/sources/app/Template/task/layout.php index 52db5d1..7f6c291 100644 --- a/sources/app/Template/task/layout.php +++ b/sources/app/Template/task/layout.php @@ -1,12 +1,12 @@
    - projectHeader->render($project, 'Listing', 'show') ?> + projectHeader->render($project, 'TaskListController', 'show') ?> + hook->render('template:task:layout:top', array('task' => $task)) ?> -
    \ No newline at end of file + diff --git a/sources/app/Template/task/public.php b/sources/app/Template/task/public.php index 9478216..b8405ff 100644 --- a/sources/app/Template/task/public.php +++ b/sources/app/Template/task/public.php @@ -1,5 +1,10 @@
    - render('task/details', array('task' => $task, 'project' => $project, 'editable' => false)) ?> + render('task/details', array( + 'task' => $task, + 'tags' => $tags, + 'project' => $project, + 'editable' => false, + )) ?> render('task/description', array( 'task' => $task, diff --git a/sources/app/Template/task/remove.php b/sources/app/Template/task/remove.php deleted file mode 100644 index eb0809b..0000000 --- a/sources/app/Template/task/remove.php +++ /dev/null @@ -1,15 +0,0 @@ -
    -

    -
    - -
    -

    - text->e($task['title'])) ?> -

    - -
    - url->link(t('Yes'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> -
    -
    \ No newline at end of file diff --git a/sources/app/Template/task/show.php b/sources/app/Template/task/show.php index 8642294..8078671 100644 --- a/sources/app/Template/task/show.php +++ b/sources/app/Template/task/show.php @@ -2,8 +2,9 @@ render('task/details', array( 'task' => $task, + 'tags' => $tags, 'project' => $project, - 'editable' => $this->user->hasProjectAccess('taskmodification', 'edit', $project['id']), + 'editable' => $this->user->hasProjectAccess('TaskModificationController', 'edit', $project['id']), )) ?> hook->render('template:task:show:before-description', array('task' => $task, 'project' => $project)) ?> @@ -34,7 +35,7 @@ 'project' => $project, )) ?> -hook->render('template:task:show:before-attachements', array('task' => $task, 'project' => $project)) ?> +hook->render('template:task:show:before-attachments', array('task' => $task, 'project' => $project)) ?> render('task_file/show', array( 'task' => $task, 'files' => $files, @@ -46,7 +47,7 @@ 'task' => $task, 'comments' => $comments, 'project' => $project, - 'editable' => $this->user->hasProjectAccess('comment', 'edit', $project['id']), + 'editable' => $this->user->hasProjectAccess('CommentController', 'edit', $project['id']), )) ?> hook->render('template:task:show:bottom', array('task' => $task, 'project' => $project)) ?> diff --git a/sources/app/Template/task/sidebar.php b/sources/app/Template/task/sidebar.php index 773b28d..b44e6f0 100644 --- a/sources/app/Template/task/sidebar.php +++ b/sources/app/Template/task/sidebar.php @@ -1,98 +1,96 @@

      -
    • app->checkMenuSelection('task', 'show') ?>> +
    • app->checkMenuSelection('TaskViewController', 'show') ?>> - url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • -
    • app->checkMenuSelection('activity', 'task') ?>> +
    • app->checkMenuSelection('ActivityController', 'task') ?>> - url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • -
    • app->checkMenuSelection('task', 'transitions') ?>> +
    • app->checkMenuSelection('TaskViewController', 'transitions') ?>> - url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • -
    • app->checkMenuSelection('task', 'analytics') ?>> +
    • app->checkMenuSelection('TaskViewController', 'analytics') ?>> - url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • 0 || $task['time_spent'] > 0): ?> -
    • app->checkMenuSelection('task', 'timetracking') ?>> +
    • app->checkMenuSelection('TaskViewController', 'timetracking') ?>> - url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • + + hook->render('template:task:sidebar:information', array('task' => $task)) ?>
    - user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>

    • - url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> -
      • -
    • - - url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Edit the task'), 'TaskModificationController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Edit recurrence'), 'TaskRecurrence', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Edit recurrence'), 'TaskRecurrenceController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add internal link'), 'TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add internal link'), 'TaskInternalLinkController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add external link'), 'TaskExternalLinkController', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add a comment'), 'CommentController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Attach a document'), 'TaskFileController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Add a screenshot'), 'TaskFileController', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Duplicate'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Duplicate to another project'), 'TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Move to another project'), 'TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    • - url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Close this task'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> - url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Open this task'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • - task->canRemove($task)): ?> + user->canRemoveTask($task)): ?>
    • - url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?>
      • + + hook->render('template:task:sidebar:actions', array('task' => $task)) ?>
    - - hook->render('template:task:sidebar', array('task' => $task)) ?>
    diff --git a/sources/app/Template/task/time_tracking_details.php b/sources/app/Template/task/time_tracking_details.php index c51b8f5..1a17952 100644 --- a/sources/app/Template/task/time_tracking_details.php +++ b/sources/app/Template/task/time_tracking_details.php @@ -14,11 +14,11 @@ order(t('Subtask'), 'subtask_title') ?> order(t('Start'), 'start') ?> order(t('End'), 'end') ?> - order(t('Time spent'), \Kanboard\Model\SubtaskTimeTracking::TABLE.'.time_spent') ?> + order(t('Time spent'), \Kanboard\Model\SubtaskTimeTrackingModel::TABLE.'.time_spent') ?> getCollection() as $record): ?> - url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?> + url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'UserViewController', 'show', array('user_id' => $record['user_id'])) ?> dt->datetime($record['start']) ?> dt->datetime($record['end']) ?> @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/task/transitions.php b/sources/app/Template/task/transitions.php index 8304017..9e04c4e 100644 --- a/sources/app/Template/task/transitions.php +++ b/sources/app/Template/task/transitions.php @@ -22,9 +22,9 @@ dt->datetime($transition['date']) ?> text->e($transition['src_column']) ?> text->e($transition['dst_column']) ?> - url->link($this->text->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?> + url->link($this->text->e($transition['name'] ?: $transition['username']), 'UserViewController', 'show', array('user_id' => $transition['user_id'])) ?> dt->duration($transition['time_spent']) ?> - \ No newline at end of file + diff --git a/sources/app/Template/task_bulk/show.php b/sources/app/Template/task_bulk/show.php new file mode 100644 index 0000000..e9b138d --- /dev/null +++ b/sources/app/Template/task_bulk/show.php @@ -0,0 +1,24 @@ +
    +

    +
    + +
    + form->csrf() ?> + form->hidden('column_id', $values) ?> + form->hidden('swimlane_id', $values) ?> + form->hidden('project_id', $values) ?> + + task->selectColor($values) ?> + task->selectAssignee($users_list, $values, $errors) ?> + task->selectCategory($categories_list, $values, $errors) ?> + + form->label(t('Tasks'), 'tasks') ?> + form->textarea('tasks', $values, $errors, array('placeholder="'.t('My task title').'"')) ?> +

    + +
    + + url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $project['id']), false, 'close-popover') ?> +
    +
    + diff --git a/sources/app/Template/task_creation/form.php b/sources/app/Template/task_creation/form.php deleted file mode 100644 index 9bfd839..0000000 --- a/sources/app/Template/task_creation/form.php +++ /dev/null @@ -1,53 +0,0 @@ -
    -

    -
    - -
    - - form->csrf() ?> - -
    - form->label(t('Title'), 'title') ?> - form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?> - - form->label(t('Description'), 'description') ?> - form->textarea( - 'description', - $values, - $errors, - array( - 'placeholder="'.t('Leave a description').'"', - 'tabindex="2"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $values['project_id'])).'"' - ), - 'markdown-editor' - ) ?> - - render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?> - - - form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?> - - - hook->render('template:task:form:left-column', array('values'=>$values, 'errors'=>$errors)) ?> -
    - -
    - form->hidden('project_id', $values) ?> - task->selectAssignee($users_list, $values, $errors) ?> - task->selectCategory($categories_list, $values, $errors) ?> - task->selectSwimlane($swimlanes_list, $values, $errors) ?> - task->selectColumn($columns_list, $values, $errors) ?> - task->selectPriority($project, $values) ?> - task->selectScore($values, $errors) ?> - task->selectTimeEstimated($values, $errors) ?> - task->selectDueDate($values, $errors) ?> - - hook->render('template:task:form:right-column', array('values'=>$values, 'errors'=>$errors)) ?> -
    - -
    - - url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> -
    -
    diff --git a/sources/app/Template/task_creation/show.php b/sources/app/Template/task_creation/show.php new file mode 100644 index 0000000..57e77f3 --- /dev/null +++ b/sources/app/Template/task_creation/show.php @@ -0,0 +1,49 @@ +
    +

    +
    + +
    + form->csrf() ?> + +
    +
    + task->selectTitle($values, $errors) ?> + task->selectDescription($values, $errors) ?> + task->selectTags($project) ?> + + + form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?> + + + hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + form->hidden('project_id', $values) ?> + task->selectColor($values) ?> + task->selectAssignee($users_list, $values, $errors) ?> + task->selectCategory($categories_list, $values, $errors) ?> + task->selectSwimlane($swimlanes_list, $values, $errors) ?> + task->selectColumn($columns_list, $values, $errors) ?> + task->selectPriority($project, $values) ?> + task->selectScore($values, $errors) ?> + task->selectReference($values, $errors) ?> + + hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + task->selectTimeEstimated($values, $errors) ?> + task->selectTimeSpent($values, $errors) ?> + task->selectStartDate($values, $errors) ?> + task->selectDueDate($values, $errors) ?> + + hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?> +
    +
    + +
    + + url->link(t('cancel'), 'BoardViewController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/task_duplication/copy.php b/sources/app/Template/task_duplication/copy.php index b7337a1..58b4d83 100644 --- a/sources/app/Template/task_duplication/copy.php +++ b/sources/app/Template/task_duplication/copy.php @@ -6,7 +6,7 @@

    -
    + form->csrf() ?> form->hidden('id', $values) ?> @@ -17,7 +17,7 @@ $projects_list, $values, array(), - array('data-redirect="'.$this->url->href('taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), + array('data-redirect="'.$this->url->href('TaskDuplicationController', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> @@ -41,8 +41,8 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_duplication/duplicate.php b/sources/app/Template/task_duplication/duplicate.php index 376f6b3..c0baf94 100644 --- a/sources/app/Template/task_duplication/duplicate.php +++ b/sources/app/Template/task_duplication/duplicate.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> + url->link(t('Yes'), 'TaskDuplicationController', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_duplication/move.php b/sources/app/Template/task_duplication/move.php index beebf9e..8f01c4b 100644 --- a/sources/app/Template/task_duplication/move.php +++ b/sources/app/Template/task_duplication/move.php @@ -6,7 +6,7 @@

    -
    + form->csrf() ?> form->hidden('id', $values) ?> @@ -17,7 +17,7 @@ $projects_list, $values, array(), - array('data-redirect="'.$this->url->href('taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), + array('data-redirect="'.$this->url->href('TaskDuplicationController', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'dst_project_id' => 'PROJECT_ID')).'"'), 'task-reload-project-destination' ) ?> @@ -41,8 +41,8 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_external_link/create.php b/sources/app/Template/task_external_link/create.php index 5d49eef..beddfc9 100644 --- a/sources/app/Template/task_external_link/create.php +++ b/sources/app/Template/task_external_link/create.php @@ -2,12 +2,12 @@

    -
    + render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
    - url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/task_external_link/edit.php b/sources/app/Template/task_external_link/edit.php index dcbc263..917a28b 100644 --- a/sources/app/Template/task_external_link/edit.php +++ b/sources/app/Template/task_external_link/edit.php @@ -2,12 +2,12 @@

    -
    + render('task_external_link/form', array('task' => $task, 'dependencies' => $dependencies, 'values' => $values, 'errors' => $errors)) ?>
    - url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/task_external_link/find.php b/sources/app/Template/task_external_link/find.php index 3977a66..a88b29c 100644 --- a/sources/app/Template/task_external_link/find.php +++ b/sources/app/Template/task_external_link/find.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('task_id', array('task_id' => $task['id'])) ?> @@ -23,6 +23,6 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/task_external_link/remove.php b/sources/app/Template/task_external_link/remove.php index 0153525..2a888a6 100644 --- a/sources/app/Template/task_external_link/remove.php +++ b/sources/app/Template/task_external_link/remove.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'TaskExternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'TaskExternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskExternalLinkController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_external_link/table.php b/sources/app/Template/task_external_link/table.php index 1f32f4d..56ef036 100644 --- a/sources/app/Template/task_external_link/table.php +++ b/sources/app/Template/task_external_link/table.php @@ -6,7 +6,7 @@ - user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?> + user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?> @@ -27,13 +27,13 @@ dt->date($link['date_creation']) ?> - user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?> + user->hasProjectAccess('TaskExternalLinkController', 'edit', $task['project_id'])): ?>
      -
    • url->link(t('Edit'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    • url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • +
    • url->link(t('Edit'), 'TaskExternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • +
    • url->link(t('Remove'), 'TaskExternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    diff --git a/sources/app/Template/task_file/create.php b/sources/app/Template/task_file/create.php index f03ce8d..e05cf82 100644 --- a/sources/app/Template/task_file/create.php +++ b/sources/app/Template/task_file/create.php @@ -4,7 +4,7 @@ @@ -18,7 +18,7 @@
    + data-url="url->href('TaskFileController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
    @@ -27,7 +27,7 @@
    - + - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    diff --git a/sources/app/Template/task_file/files.php b/sources/app/Template/task_file/files.php index 5603014..7ca59b1 100644 --- a/sources/app/Template/task_file/files.php +++ b/sources/app/Template/task_file/files.php @@ -16,17 +16,17 @@ file->getPreviewType($file['name']) !== null): ?>
  • - url->link(t('View file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('View file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
  • - url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
    • - user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?> + user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
  • - url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
    • @@ -44,4 +44,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/task_file/images.php b/sources/app/Template/task_file/images.php index 55c098c..81c3315 100644 --- a/sources/app/Template/task_file/images.php +++ b/sources/app/Template/task_file/images.php @@ -2,7 +2,7 @@
    - <?= $this->text->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
    @@ -10,12 +10,12 @@
    • - url->link(t('Download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
      • - user->hasProjectAccess('TaskFile', 'remove', $task['project_id'])): ?> + user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
    • - url->link(t('Remove'), 'TaskFile', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + url->link(t('Remove'), 'TaskFileController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
    @@ -31,4 +31,4 @@
    - \ No newline at end of file + diff --git a/sources/app/Template/task_file/remove.php b/sources/app/Template/task_file/remove.php index fe601f6..42894f0 100644 --- a/sources/app/Template/task_file/remove.php +++ b/sources/app/Template/task_file/remove.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'TaskFile', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'TaskFileController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file +
    diff --git a/sources/app/Template/task_file/screenshot.php b/sources/app/Template/task_file/screenshot.php index 2880478..6300159 100644 --- a/sources/app/Template/task_file/screenshot.php +++ b/sources/app/Template/task_file/screenshot.php @@ -6,14 +6,14 @@

    -
    + form->csrf() ?>
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -

    \ No newline at end of file +

    diff --git a/sources/app/Template/gantt/project.php b/sources/app/Template/task_gantt/show.php similarity index 62% rename from sources/app/Template/gantt/project.php rename to sources/app/Template/task_gantt/show.php index e6c8592..c5d338f 100644 --- a/sources/app/Template/gantt/project.php +++ b/sources/app/Template/task_gantt/show.php @@ -1,18 +1,18 @@
    - projectHeader->render($project, 'Gantt', 'project') ?> + projectHeader->render($project, 'TaskGanttController', 'show') ?>
    • > - url->link(t('Sort by position'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'board')) ?> + url->link(t('Sort by position'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'board')) ?>
    • > - url->link(t('Sort by date'), 'gantt', 'project', array('project_id' => $project['id'], 'sorting' => 'date')) ?> + url->link(t('Sort by date'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'date')) ?>
    • - url->link(t('Add task'), 'gantt', 'task', array('project_id' => $project['id']), false, 'popover') ?> + url->link(t('Add task'), 'TaskGanttCreationController', 'show', array('project_id' => $project['id']), false, 'popover') ?>
    @@ -21,7 +21,7 @@

    -
    \ No newline at end of file +
    diff --git a/sources/app/Template/task_gantt_creation/show.php b/sources/app/Template/task_gantt_creation/show.php new file mode 100644 index 0000000..7521d80 --- /dev/null +++ b/sources/app/Template/task_gantt_creation/show.php @@ -0,0 +1,46 @@ +
    +

    +
    +
    + form->csrf() ?> + form->hidden('project_id', $values) ?> + form->hidden('column_id', $values) ?> + form->hidden('position', $values) ?> + +
    +
    + task->selectTitle($values, $errors) ?> + task->selectDescription($values, $errors) ?> + task->selectTags($project) ?> + + hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + task->selectColor($values) ?> + task->selectAssignee($users_list, $values, $errors) ?> + task->selectCategory($categories_list, $values, $errors) ?> + task->selectSwimlane($swimlanes_list, $values, $errors) ?> + task->selectPriority($project, $values) ?> + task->selectScore($values, $errors) ?> + task->selectReference($values, $errors) ?> + + hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + task->selectTimeEstimated($values, $errors) ?> + task->selectTimeSpent($values, $errors) ?> + task->selectStartDate($values, $errors) ?> + task->selectDueDate($values, $errors) ?> + + hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?> +
    +
    + +
    + + + url->link(t('cancel'), 'TaskGanttController', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/task_import/step1.php b/sources/app/Template/task_import/show.php similarity index 82% rename from sources/app/Template/task_import/step1.php rename to sources/app/Template/task_import/show.php index abb4350..cc6a7b3 100644 --- a/sources/app/Template/task_import/step1.php +++ b/sources/app/Template/task_import/show.php @@ -1,7 +1,7 @@

    -
    + form->csrf() ?> form->label(t('Delimiter'), 'delimiter') ?> @@ -31,4 +31,4 @@
    • -

    url->link(t('Download CSV template'), 'taskImport', 'template', array('project_id' => $project['id'])) ?>

    \ No newline at end of file +

    url->link(t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?>

    diff --git a/sources/app/Template/task_import/sidebar.php b/sources/app/Template/task_import/sidebar.php new file mode 100644 index 0000000..4cd92af --- /dev/null +++ b/sources/app/Template/task_import/sidebar.php @@ -0,0 +1,9 @@ +
    +

    +
      +
    • app->checkMenuSelection('TaskImportController', 'show') ?>> + url->link(t('Tasks').' (CSV)', 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> +
      • + hook->render('template:task-import:sidebar') ?> +
    +
    diff --git a/sources/app/Template/task_internal_link/create.php b/sources/app/Template/task_internal_link/create.php index 94dcdd6..fed2960 100644 --- a/sources/app/Template/task_internal_link/create.php +++ b/sources/app/Template/task_internal_link/create.php @@ -2,7 +2,7 @@

    - + form->csrf() ?> form->hidden('task_id', array('task_id' => $task['id'])) ?> @@ -21,13 +21,13 @@ 'placeholder="'.t('Start to type task title...').'"', 'title="'.t('Start to type task title...').'"', 'data-dst-field="opposite_task_id"', - 'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + 'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', ), 'autocomplete') ?>
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/task_internal_link/edit.php b/sources/app/Template/task_internal_link/edit.php index 03622df..f4df57b 100644 --- a/sources/app/Template/task_internal_link/edit.php +++ b/sources/app/Template/task_internal_link/edit.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> form->hidden('id', $values) ?> @@ -22,13 +22,13 @@ 'placeholder="'.t('Start to type task title...').'"', 'title="'.t('Start to type task title...').'"', 'data-dst-field="opposite_task_id"', - 'data-search-url="'.$this->url->href('TaskHelper', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + 'data-search-url="'.$this->url->href('TaskAjaxController', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', ), 'autocomplete') ?>
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    -
    \ No newline at end of file + diff --git a/sources/app/Template/task_internal_link/remove.php b/sources/app/Template/task_internal_link/remove.php index 82156ec..966ad11 100644 --- a/sources/app/Template/task_internal_link/remove.php +++ b/sources/app/Template/task_internal_link/remove.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'TaskInternalLink', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'TaskInternalLinkController', 'remove', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_internal_link/table.php b/sources/app/Template/task_internal_link/table.php index 8f25b29..424d479 100644 --- a/sources/app/Template/task_internal_link/table.php +++ b/sources/app/Template/task_internal_link/table.php @@ -24,7 +24,7 @@ url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', + 'TaskViewController', 'readonly', array('task_id' => $link['task_id'], 'token' => $project['token']), false, @@ -33,7 +33,7 @@ url->link( $this->text->e('#'.$link['task_id'].' '.$link['title']), - 'task', + 'TaskViewController', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), false, @@ -52,7 +52,7 @@ - url->link($this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']), 'user', 'show', array('user_id' => $link['task_assignee_id'])) ?> + url->link($this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']), 'UserViewController', 'show', array('user_id' => $link['task_assignee_id'])) ?> text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?> @@ -72,8 +72,8 @@
      -
    • url->link(t('Edit'), 'TaskInternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • -
    • url->link(t('Remove'), 'TaskInternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • +
    • url->link(t('Edit'), 'TaskInternalLinkController', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
      • +
    • url->link(t('Remove'), 'TaskInternalLinkController', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
    @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/sources/app/Template/listing/show.php b/sources/app/Template/task_list/show.php similarity index 87% rename from sources/app/Template/listing/show.php rename to sources/app/Template/task_list/show.php index 98b9528..bb95b6a 100644 --- a/sources/app/Template/listing/show.php +++ b/sources/app/Template/task_list/show.php @@ -1,5 +1,5 @@
    - projectHeader->render($project, 'Listing', 'show') ?> + projectHeader->render($project, 'TaskListController', 'show') ?> isEmpty()): ?>

    @@ -18,7 +18,7 @@ getCollection() as $task): ?> - user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?> + user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> render('task/dropdown', array('task' => $task)) ?> # @@ -34,7 +34,7 @@ text->e($task['category_name']) ?> - url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> @@ -47,7 +47,7 @@ dt->date($task['date_due']) ?> - + @@ -59,4 +59,4 @@ -
    \ No newline at end of file + diff --git a/sources/app/Template/task_modification/edit_description.php b/sources/app/Template/task_modification/edit_description.php deleted file mode 100644 index 8c149f4..0000000 --- a/sources/app/Template/task_modification/edit_description.php +++ /dev/null @@ -1,27 +0,0 @@ -
    -

    -
    - -
    - - form->csrf() ?> - form->hidden('id', $values) ?> - - form->textarea( - 'description', - $values, - $errors, - array( - 'autofocus', - 'placeholder="'.t('Leave a description').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"' - ), - 'markdown-editor' - ) ?> - -
    - - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> -
    -
    diff --git a/sources/app/Template/task_modification/edit_task.php b/sources/app/Template/task_modification/edit_task.php deleted file mode 100644 index b5891c1..0000000 --- a/sources/app/Template/task_modification/edit_task.php +++ /dev/null @@ -1,35 +0,0 @@ -
    -

    -
    -
    - - form->csrf() ?> - form->hidden('id', $values) ?> - form->hidden('project_id', $values) ?> - -
    - form->label(t('Title'), 'title') ?> - form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"')) ?> - task->selectAssignee($users_list, $values, $errors) ?> - task->selectCategory($categories_list, $values, $errors) ?> - task->selectPriority($project, $values) ?> - task->selectScore($values, $errors) ?> -
    - -
    - task->selectTimeEstimated($values, $errors) ?> - task->selectTimeSpent($values, $errors) ?> - task->selectStartDate($values, $errors) ?> - task->selectDueDate($values, $errors) ?> -
    - -
    - render('task/color_picker', array('colors_list' => $colors_list, 'values' => $values)) ?> -
    - -
    - - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> -
    -
    \ No newline at end of file diff --git a/sources/app/Template/task_modification/show.php b/sources/app/Template/task_modification/show.php new file mode 100644 index 0000000..cc38582 --- /dev/null +++ b/sources/app/Template/task_modification/show.php @@ -0,0 +1,44 @@ +
    +

    +
    +
    + form->csrf() ?> + form->hidden('id', $values) ?> + form->hidden('project_id', $values) ?> + +
    +
    + task->selectTitle($values, $errors) ?> + task->selectDescription($values, $errors) ?> + task->selectTags($project, $tags) ?> + + hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + task->selectColor($values) ?> + task->selectAssignee($users_list, $values, $errors) ?> + task->selectCategory($categories_list, $values, $errors) ?> + task->selectPriority($project, $values) ?> + task->selectScore($values, $errors) ?> + task->selectReference($values, $errors) ?> + + hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?> +
    + +
    + task->selectTimeEstimated($values, $errors) ?> + task->selectTimeSpent($values, $errors) ?> + task->selectStartDate($values, $errors) ?> + task->selectDueDate($values, $errors) ?> + + hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?> +
    +
    + +
    + + + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/task_recurrence/edit.php b/sources/app/Template/task_recurrence/edit.php index 0f5d611..09d1482 100644 --- a/sources/app/Template/task_recurrence/edit.php +++ b/sources/app/Template/task_recurrence/edit.php @@ -2,7 +2,7 @@

    - +
    render('task_recurrence/info', array( 'task' => $task, @@ -13,9 +13,9 @@
    - + -
    + form->csrf() ?> @@ -40,8 +40,8 @@
    - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_recurrence/info.php b/sources/app/Template/task_recurrence/info.php index 1a6574d..04d58c7 100644 --- a/sources/app/Template/task_recurrence/info.php +++ b/sources/app/Template/task_recurrence/info.php @@ -1,7 +1,7 @@
      - +
      • - +
      • @@ -24,14 +24,14 @@
      • - url->link('#'.$task['recurrence_parent'], 'task', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?> + url->link('#'.$task['recurrence_parent'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_parent'], 'project_id' => $task['project_id'])) ?>
      • - url->link('#'.$task['recurrence_child'], 'task', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?> + url->link('#'.$task['recurrence_child'], 'TaskViewController', 'show', array('task_id' => $task['recurrence_child'], 'project_id' => $task['project_id'])) ?>
        • -
      \ No newline at end of file +
    diff --git a/sources/app/Template/task_status/close.php b/sources/app/Template/task_status/close.php index 7d20054..2d7b0ce 100644 --- a/sources/app/Template/task_status/close.php +++ b/sources/app/Template/task_status/close.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> + url->link(t('Yes'), 'TaskStatusController', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_status/open.php b/sources/app/Template/task_status/open.php index 5d19bfb..242b5db 100644 --- a/sources/app/Template/task_status/open.php +++ b/sources/app/Template/task_status/open.php @@ -8,8 +8,8 @@

    - url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> + url->link(t('Yes'), 'TaskStatusController', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?> - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/task_suppression/remove.php b/sources/app/Template/task_suppression/remove.php new file mode 100644 index 0000000..5d0f772 --- /dev/null +++ b/sources/app/Template/task_suppression/remove.php @@ -0,0 +1,15 @@ +
    +

    +
    + +
    +

    + text->e($task['title'])) ?> +

    + +
    + url->link(t('Yes'), 'TaskSuppressionController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => $redirect), true, 'btn btn-red popover-link') ?> + + url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/twofactor/check.php b/sources/app/Template/twofactor/check.php index b0cb482..06801d5 100644 --- a/sources/app/Template/twofactor/check.php +++ b/sources/app/Template/twofactor/check.php @@ -1,4 +1,4 @@ -
    + form->csrf() ?> form->label(t('Code'), 'code') ?> @@ -7,4 +7,4 @@
    -
    \ No newline at end of file + diff --git a/sources/app/Template/twofactor/disable.php b/sources/app/Template/twofactor/disable.php index 36be4ef..bc41918 100644 --- a/sources/app/Template/twofactor/disable.php +++ b/sources/app/Template/twofactor/disable.php @@ -8,7 +8,7 @@

    - url->link(t('Yes'), 'twofactor', 'disable', array('user_id' => $user['id'], 'disable' => 'yes'), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('Yes'), 'TwoFactorController', 'disable', array('user_id' => $user['id'], 'disable' => 'yes'), true, 'btn btn-red') ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/twofactor/index.php b/sources/app/Template/twofactor/index.php index 6de3651..1ed414e 100644 --- a/sources/app/Template/twofactor/index.php +++ b/sources/app/Template/twofactor/index.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?>

    text->e($provider) ?>

    diff --git a/sources/app/Template/twofactor/show.php b/sources/app/Template/twofactor/show.php index 59897e2..0aeef42 100644 --- a/sources/app/Template/twofactor/show.php +++ b/sources/app/Template/twofactor/show.php @@ -19,7 +19,7 @@

    - + form->csrf() ?> form->label(t('Code'), 'code') ?> @@ -28,4 +28,4 @@
    - \ No newline at end of file + diff --git a/sources/app/Template/user/dropdown.php b/sources/app/Template/user/dropdown.php deleted file mode 100644 index b74ed6e..0000000 --- a/sources/app/Template/user/dropdown.php +++ /dev/null @@ -1,27 +0,0 @@ -
    - -
      -
    • - - url->link(t('View profile'), 'user', 'show', array('user_id' => $user['id'])) ?> -
      • - user->hasAccess('UserStatus', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?> -
    • - - url->link(t('Disable'), 'UserStatus', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?> -
      • - - user->hasAccess('UserStatus', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?> -
    • - - url->link(t('Enable'), 'UserStatus', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?> -
      • - - user->hasAccess('UserStatus', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?> -
    • - - url->link(t('Remove'), 'UserStatus', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?> -
      • - -
    -
    \ No newline at end of file diff --git a/sources/app/Template/user/layout.php b/sources/app/Template/user/layout.php deleted file mode 100644 index 3a0a5ba..0000000 --- a/sources/app/Template/user/layout.php +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    - user->hasAccess('user', 'create')): ?> -
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • -
    • url->link(t('New local user'), 'user', 'create') ?>
      • -
    • url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?>
      • -
    - -
    - -
    \ No newline at end of file diff --git a/sources/app/Template/user/share.php b/sources/app/Template/user/share.php deleted file mode 100644 index 56dc867..0000000 --- a/sources/app/Template/user/share.php +++ /dev/null @@ -1,18 +0,0 @@ -
    -

    -
    - - - -
    -
      -
    • url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • -
    • url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • -
    -
    - - url->link(t('Disable public access'), 'user', 'share', array('user_id' => $user['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> - - - url->link(t('Enable public access'), 'user', 'share', array('user_id' => $user['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?> - diff --git a/sources/app/Template/user/sidebar.php b/sources/app/Template/user/sidebar.php deleted file mode 100644 index 5ea2e35..0000000 --- a/sources/app/Template/user/sidebar.php +++ /dev/null @@ -1,83 +0,0 @@ -
    -

    -
      - user->hasAccess('user', 'show')): ?> -
    • app->checkMenuSelection('user', 'show') ?>> - url->link(t('Summary'), 'user', 'show', array('user_id' => $user['id'])) ?> -
      • - - user->isAdmin()): ?> -
    • - url->link(t('User dashboard'), 'app', 'index', array('user_id' => $user['id'])) ?> -
      • - - user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> -
    • app->checkMenuSelection('user', 'timesheet') ?>> - url->link(t('Time tracking'), 'user', 'timesheet', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'last') ?>> - url->link(t('Last logins'), 'user', 'last', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'sessions') ?>> - url->link(t('Persistent connections'), 'user', 'sessions', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'passwordReset') ?>> - url->link(t('Password reset history'), 'user', 'passwordReset', array('user_id' => $user['id'])) ?> -
      • - - - hook->render('template:user:sidebar:information', array('user' => $user)) ?> -
    - -

    -
      - user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> - - user->hasAccess('user', 'edit')): ?> -
    • app->checkMenuSelection('user', 'edit') ?>> - url->link(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('AvatarFile') ?>> - url->link(t('Avatar'), 'AvatarFile', 'show', array('user_id' => $user['id'])) ?> -
      • - - - -
    • app->checkMenuSelection('user', 'password') ?>> - url->link(t('Change password'), 'user', 'password', array('user_id' => $user['id'])) ?> -
      • - - - user->isCurrentUser($user['id'])): ?> -
    • app->checkMenuSelection('twofactor', 'index') ?>> - url->link(t('Two factor authentication'), 'twofactor', 'index', array('user_id' => $user['id'])) ?> -
      • - user->hasAccess('twofactor', 'disable') && $user['twofactor_activated'] == 1): ?> -
    • app->checkMenuSelection('twofactor', 'disable') ?>> - url->link(t('Two factor authentication'), 'twofactor', 'disable', array('user_id' => $user['id'])) ?> -
      • - - -
    • app->checkMenuSelection('user', 'share') ?>> - url->link(t('Public access'), 'user', 'share', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'notifications') ?>> - url->link(t('Notifications'), 'user', 'notifications', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'external') ?>> - url->link(t('External accounts'), 'user', 'external', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'integrations') ?>> - url->link(t('Integrations'), 'user', 'integrations', array('user_id' => $user['id'])) ?> -
      • - - - user->hasAccess('user', 'authentication')): ?> -
    • app->checkMenuSelection('user', 'authentication') ?>> - url->link(t('Edit Authentication'), 'user', 'authentication', array('user_id' => $user['id'])) ?> -
      • - - - hook->render('template:user:sidebar:actions', array('user' => $user)) ?> -
    -
    \ No newline at end of file diff --git a/sources/app/Template/user/create_local.php b/sources/app/Template/user_creation/local.php similarity index 69% rename from sources/app/Template/user/create_local.php rename to sources/app/Template/user_creation/local.php index 7257456..059a011 100644 --- a/sources/app/Template/user/create_local.php +++ b/sources/app/Template/user_creation/local.php @@ -1,15 +1,10 @@ -
    -
    -
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • -
    • url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?>
      • -
    -
    -
    -
    - - form->csrf() ?> +
    +

    +
    + + form->csrf() ?> +
    form->label(t('Username'), 'username') ?> form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?> @@ -42,12 +37,11 @@ form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?>
    +
    -
    - - - url->link(t('cancel'), 'user', 'index') ?> -
    -
    -
    -
    +
    + + + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?> +
    + diff --git a/sources/app/Template/user/create_remote.php b/sources/app/Template/user_creation/remote.php similarity index 59% rename from sources/app/Template/user/create_remote.php rename to sources/app/Template/user_creation/remote.php index 05acbba..41d0d3c 100644 --- a/sources/app/Template/user/create_remote.php +++ b/sources/app/Template/user_creation/remote.php @@ -1,19 +1,15 @@ -
    -
    -
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • -
    • url->link(t('New local user'), 'user', 'create') ?>
      • -
    -
    -
    - - form->csrf() ?> - form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?> +
    +

    +
    + + form->csrf() ?> + form->hidden('is_ldap_user', array('is_ldap_user' => 1)) ?> +
    form->label(t('Username'), 'username') ?> form->text('username', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?> - + form->label(t('Name'), 'name') ?> form->text('name', $values, $errors) ?> @@ -39,17 +35,17 @@ form->checkbox('notifications_enabled', t('Enable email notifications'), 1, isset($values['notifications_enabled']) && $values['notifications_enabled'] == 1 ? true : false) ?> form->checkbox('disable_login_form', t('Disallow login form'), 1, isset($values['disable_login_form']) && $values['disable_login_form'] == 1) ?>
    - -
    - - - url->link(t('cancel'), 'user', 'index') ?> -
    - -
    -
      -
      • -
      • -
    -
    \ No newline at end of file + +
    + + + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?> +
    + +
    +
      +
      • +
      • +
    +
    diff --git a/sources/app/Template/user/authentication.php b/sources/app/Template/user_credential/authentication.php similarity index 80% rename from sources/app/Template/user/authentication.php rename to sources/app/Template/user_credential/authentication.php index 6cfd4e5..fbe2e91 100644 --- a/sources/app/Template/user/authentication.php +++ b/sources/app/Template/user_credential/authentication.php @@ -1,8 +1,7 @@

    -
    - + form->csrf() ?> form->hidden('id', $values) ?> @@ -16,7 +15,7 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    @@ -25,4 +24,4 @@
    • -
    \ No newline at end of file + diff --git a/sources/app/Template/user/password.php b/sources/app/Template/user_credential/password.php similarity index 57% rename from sources/app/Template/user/password.php rename to sources/app/Template/user_credential/password.php index ea6e997..5a6e440 100644 --- a/sources/app/Template/user/password.php +++ b/sources/app/Template/user_credential/password.php @@ -2,15 +2,12 @@

    -
    - + form->hidden('id', $values) ?> form->csrf() ?> -
    - form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?> - form->password('current_password', $values, $errors) ?> -
    + form->label(t('Current password for the user "%s"', $this->user->getFullname()), 'current_password') ?> + form->password('current_password', $values, $errors) ?> form->label(t('New password for the user "%s"', $this->user->getFullname($user)), 'password') ?> form->password('password', $values, $errors) ?> @@ -21,6 +18,6 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    diff --git a/sources/app/Template/user_import/show.php b/sources/app/Template/user_import/show.php new file mode 100644 index 0000000..663f107 --- /dev/null +++ b/sources/app/Template/user_import/show.php @@ -0,0 +1,41 @@ +
    +

    +
      +
    • + + url->link(t('Download CSV template'), 'UserImportController', 'template') ?> +
      • +
    +
    + +
    +
      +
      • +
      • +
      • +
      • +
      • +
      • +
    +
    + +
    + form->csrf() ?> + + form->label(t('Delimiter'), 'delimiter') ?> + form->select('delimiter', $delimiters, $values) ?> + + form->label(t('Enclosure'), 'enclosure') ?> + form->select('enclosure', $enclosures, $values) ?> + + form->label(t('CSV File'), 'file') ?> + form->file('file', $errors) ?> + +

    text->bytes($max_size) : $max_size ?>

    + +
    + + + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?> +
    +
    diff --git a/sources/app/Template/user_import/step1.php b/sources/app/Template/user_import/step1.php deleted file mode 100644 index 592587a..0000000 --- a/sources/app/Template/user_import/step1.php +++ /dev/null @@ -1,46 +0,0 @@ -
    -
    - user->hasAccess('user', 'create')): ?> -
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • -
    • url->link(t('New local user'), 'user', 'create') ?>
      • -
    • url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?>
      • -
    - -
    -
    -

    -
    -
    - form->csrf() ?> - - form->label(t('Delimiter'), 'delimiter') ?> - form->select('delimiter', $delimiters, $values) ?> - - form->label(t('Enclosure'), 'enclosure') ?> - form->select('enclosure', $enclosures, $values) ?> - - form->label(t('CSV File'), 'file') ?> - form->file('file', $errors) ?> - -

    text->bytes($max_size) : $max_size ?>

    - -
    - -
    -
    -
    -

    -
    -
    -
      -
      • -
      • -
      • -
      • -
      • -
      • -
    -
    -

    url->link(t('Download CSV template'), 'userImport', 'template') ?>

    -
    \ No newline at end of file diff --git a/sources/app/Template/user_list/dropdown.php b/sources/app/Template/user_list/dropdown.php new file mode 100644 index 0000000..9e90c23 --- /dev/null +++ b/sources/app/Template/user_list/dropdown.php @@ -0,0 +1,27 @@ +
    + +
      +
    • + + url->link(t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> +
      • + user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?> +
    • + + url->link(t('Disable'), 'UserStatusController', 'confirmDisable', array('user_id' => $user['id']), false, 'popover') ?> +
      • + + user->hasAccess('UserStatusController', 'enable') && ! $this->user->isCurrentUser($user['id'])): ?> +
    • + + url->link(t('Enable'), 'UserStatusController', 'confirmEnable', array('user_id' => $user['id']), false, 'popover') ?> +
      • + + user->hasAccess('UserStatusController', 'remove') && ! $this->user->isCurrentUser($user['id'])): ?> +
    • + + url->link(t('Remove'), 'UserStatusController', 'confirmRemove', array('user_id' => $user['id']), false, 'popover') ?> +
      • + +
    +
    diff --git a/sources/app/Template/user/index.php b/sources/app/Template/user_list/show.php similarity index 76% rename from sources/app/Template/user/index.php rename to sources/app/Template/user_list/show.php index 364fd96..b2bd937 100644 --- a/sources/app/Template/user/index.php +++ b/sources/app/Template/user_list/show.php @@ -1,11 +1,11 @@
    - user->hasAccess('user', 'create')): ?> + user->hasAccess('UserCreationController', 'show')): ?>
      -
    • url->link(t('New local user'), 'user', 'create') ?>
      • -
    • url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?>
      • -
    • url->link(t('Import'), 'userImport', 'step1') ?>
      • -
    • url->link(t('View all groups'), 'group', 'index') ?>
      • +
    • url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?>
      • +
    • url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?>
      • +
    • url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?>
      • +
    • url->link(t('View all groups'), 'GroupListController', 'index') ?>
    @@ -14,6 +14,7 @@ + @@ -26,8 +27,10 @@ getCollection() as $user): ?> + diff --git a/sources/app/Template/user/edit.php b/sources/app/Template/user_modification/show.php similarity index 82% rename from sources/app/Template/user/edit.php rename to sources/app/Template/user_modification/show.php index 7b51eb7..396d550 100644 --- a/sources/app/Template/user/edit.php +++ b/sources/app/Template/user_modification/show.php @@ -1,7 +1,7 @@

    - +form->csrf() ?> @@ -30,6 +30,6 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/user_status/disable.php b/sources/app/Template/user_status/disable.php index 90d8c75..d30b0c2 100644 --- a/sources/app/Template/user_status/disable.php +++ b/sources/app/Template/user_status/disable.php @@ -6,8 +6,8 @@

    - url->link(t('Yes'), 'UserStatus', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/sources/app/Template/user_status/enable.php b/sources/app/Template/user_status/enable.php index cd3d494..29d25ee 100644 --- a/sources/app/Template/user_status/enable.php +++ b/sources/app/Template/user_status/enable.php @@ -6,8 +6,8 @@

    - url->link(t('Yes'), 'UserStatus', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/sources/app/Template/user_status/remove.php b/sources/app/Template/user_status/remove.php index cd5c09a..2b8f2df 100644 --- a/sources/app/Template/user_status/remove.php +++ b/sources/app/Template/user_status/remove.php @@ -6,8 +6,8 @@

    - url->link(t('Yes'), 'UserStatus', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> + url->link(t('Yes'), 'UserStatusController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/sources/app/Template/user/external.php b/sources/app/Template/user_view/external.php similarity index 100% rename from sources/app/Template/user/external.php rename to sources/app/Template/user_view/external.php diff --git a/sources/app/Template/user/integrations.php b/sources/app/Template/user_view/integrations.php similarity index 72% rename from sources/app/Template/user/integrations.php rename to sources/app/Template/user_view/integrations.php index ef9d8e7..4a23734 100644 --- a/sources/app/Template/user/integrations.php +++ b/sources/app/Template/user_view/integrations.php @@ -2,7 +2,7 @@

    - +form->csrf() ?> hook->render('template:user:integrations', array('values' => $values)) ?> diff --git a/sources/app/Template/user/last.php b/sources/app/Template/user_view/last.php similarity index 100% rename from sources/app/Template/user/last.php rename to sources/app/Template/user_view/last.php diff --git a/sources/app/Template/user_view/layout.php b/sources/app/Template/user_view/layout.php new file mode 100644 index 0000000..c3604b9 --- /dev/null +++ b/sources/app/Template/user_view/layout.php @@ -0,0 +1,19 @@ +
    +
    + user->hasAccess('UserCreationController', 'show')): ?> +
      +
    • url->link(t('All users'), 'UserListController', 'show') ?>
      • +
    • url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?>
      • +
    • url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?>
      • +
    • url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?>
      • +
    • url->link(t('View all groups'), 'GroupListController', 'index') ?>
      • +
    + +
    + +
    diff --git a/sources/app/Template/user/notifications.php b/sources/app/Template/user_view/notifications.php similarity index 74% rename from sources/app/Template/user/notifications.php rename to sources/app/Template/user_view/notifications.php index 6e1a000..84ca128 100644 --- a/sources/app/Template/user/notifications.php +++ b/sources/app/Template/user_view/notifications.php @@ -2,7 +2,7 @@

    - +form->csrf() ?>

    @@ -21,6 +21,6 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    - \ No newline at end of file + diff --git a/sources/app/Template/user/password_reset.php b/sources/app/Template/user_view/password_reset.php similarity index 100% rename from sources/app/Template/user/password_reset.php rename to sources/app/Template/user_view/password_reset.php diff --git a/sources/app/Template/user/profile.php b/sources/app/Template/user_view/profile.php similarity index 100% rename from sources/app/Template/user/profile.php rename to sources/app/Template/user_view/profile.php diff --git a/sources/app/Template/user/sessions.php b/sources/app/Template/user_view/sessions.php similarity index 85% rename from sources/app/Template/user/sessions.php rename to sources/app/Template/user_view/sessions.php index d7fe895..eda3ef7 100644 --- a/sources/app/Template/user/sessions.php +++ b/sources/app/Template/user_view/sessions.php @@ -19,7 +19,7 @@ - +
    order(t('Id'), 'id') ?> order(t('Username'), 'username') ?> order(t('Name'), 'name') ?> order(t('Email'), 'email') ?>
    -   - url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + + + url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> text->e($user['name']) ?> @@ -52,7 +55,7 @@ - render('user/dropdown', array('user' => $user)) ?> + render('user_list/dropdown', array('user' => $user)) ?>
    dt->datetime($session['expiration']) ?> text->e($session['ip']) ?> text->e($session['user_agent']) ?>url->link(t('Remove'), 'User', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?>url->link(t('Remove'), 'UserViewController', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?>
    diff --git a/sources/app/Template/user_view/share.php b/sources/app/Template/user_view/share.php new file mode 100644 index 0000000..570b766 --- /dev/null +++ b/sources/app/Template/user_view/share.php @@ -0,0 +1,15 @@ +
    +

    +
    + + +
    +
      +
    • url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • +
    • url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • +
    +
    + url->link(t('Disable public access'), 'UserViewController', 'share', array('user_id' => $user['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> + + url->link(t('Enable public access'), 'UserViewController', 'share', array('user_id' => $user['id'], 'switch' => 'enable'), true, 'btn btn-blue') ?> + diff --git a/sources/app/Template/user/show.php b/sources/app/Template/user_view/show.php similarity index 75% rename from sources/app/Template/user/show.php rename to sources/app/Template/user_view/show.php index df0affb..fc11f8a 100644 --- a/sources/app/Template/user/show.php +++ b/sources/app/Template/user_view/show.php @@ -15,6 +15,10 @@
  • user->getRoleName($user['role']) ?>
    • +
    • + +
  • dt->datetime($user['lock_expiration_date']) ?>
    • +
    @@ -33,8 +37,8 @@
      -
    • url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • -
    • url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • +
    • url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
      • +
    • url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
    diff --git a/sources/app/Template/user_view/sidebar.php b/sources/app/Template/user_view/sidebar.php new file mode 100644 index 0000000..d200a7f --- /dev/null +++ b/sources/app/Template/user_view/sidebar.php @@ -0,0 +1,83 @@ +
    +

    +
      + user->hasAccess('UserViewController', 'show')): ?> +
    • app->checkMenuSelection('UserViewController', 'show') ?>> + url->link(t('Summary'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> +
      • + + user->isAdmin()): ?> +
    • + url->link(t('User dashboard'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?> +
      • + + user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> +
    • app->checkMenuSelection('UserViewController', 'timesheet') ?>> + url->link(t('Time tracking'), 'UserViewController', 'timesheet', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'lastLogin') ?>> + url->link(t('Last logins'), 'UserViewController', 'lastLogin', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'sessions') ?>> + url->link(t('Persistent connections'), 'UserViewController', 'sessions', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'passwordReset') ?>> + url->link(t('Password reset history'), 'UserViewController', 'passwordReset', array('user_id' => $user['id'])) ?> +
      • + + + hook->render('template:user:sidebar:information', array('user' => $user)) ?> +
    + +

    +
      + user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> + + user->hasAccess('UserModificationController', 'show')): ?> +
    • app->checkMenuSelection('UserModificationController', 'show') ?>> + url->link(t('Edit profile'), 'UserModificationController', 'show', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('AvatarFile') ?>> + url->link(t('Avatar'), 'AvatarFileController', 'show', array('user_id' => $user['id'])) ?> +
      • + + + +
    • app->checkMenuSelection('UserCredentialController', 'changePassword') ?>> + url->link(t('Change password'), 'UserCredentialController', 'changePassword', array('user_id' => $user['id'])) ?> +
      • + + + user->isCurrentUser($user['id'])): ?> +
    • app->checkMenuSelection('TwoFactorController', 'index') ?>> + url->link(t('Two factor authentication'), 'TwoFactorController', 'index', array('user_id' => $user['id'])) ?> +
      • + user->hasAccess('TwoFactorController', 'disable') && $user['twofactor_activated'] == 1): ?> +
    • app->checkMenuSelection('TwoFactorController', 'disable') ?>> + url->link(t('Two factor authentication'), 'TwoFactorController', 'disable', array('user_id' => $user['id'])) ?> +
      • + + +
    • app->checkMenuSelection('UserViewController', 'share') ?>> + url->link(t('Public access'), 'UserViewController', 'share', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'notifications') ?>> + url->link(t('Notifications'), 'UserViewController', 'notifications', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'external') ?>> + url->link(t('External accounts'), 'UserViewController', 'external', array('user_id' => $user['id'])) ?> +
      • +
    • app->checkMenuSelection('UserViewController', 'integrations') ?>> + url->link(t('Integrations'), 'UserViewController', 'integrations', array('user_id' => $user['id'])) ?> +
      • + + + user->hasAccess('UserCredentialController', 'changeAuthentication')): ?> +
    • app->checkMenuSelection('UserCredentialController', 'changeAuthentication') ?>> + url->link(t('Edit Authentication'), 'UserCredentialController', 'changeAuthentication', array('user_id' => $user['id'])) ?> +
      • + + + hook->render('template:user:sidebar:actions', array('user' => $user)) ?> +
    +
    diff --git a/sources/app/Template/user/timesheet.php b/sources/app/Template/user_view/timesheet.php similarity index 82% rename from sources/app/Template/user/timesheet.php rename to sources/app/Template/user_view/timesheet.php index 92ebafb..3df5749 100644 --- a/sources/app/Template/user/timesheet.php +++ b/sources/app/Template/user_view/timesheet.php @@ -16,8 +16,8 @@ getCollection() as $record): ?> - url->link($this->text->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> - url->link($this->text->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> + url->link($this->text->e($record['task_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> + url->link($this->text->e($record['subtask_title']), 'TaskViewController', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> dt->datetime($record['start']) ?> dt->datetime($record['end']) ?> @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/sources/app/User/Avatar/AvatarFileProvider.php b/sources/app/User/Avatar/AvatarFileProvider.php index eea565f..790245a 100644 --- a/sources/app/User/Avatar/AvatarFileProvider.php +++ b/sources/app/User/Avatar/AvatarFileProvider.php @@ -23,7 +23,7 @@ class AvatarFileProvider extends Base implements AvatarProviderInterface */ public function render(array $user, $size) { - $url = $this->helper->url->href('AvatarFile', 'image', array('user_id' => $user['id'], 'size' => $size)); + $url = $this->helper->url->href('AvatarFileController', 'image', array('user_id' => $user['id'], 'size' => $size)); $title = $this->helper->text->e($user['name'] ?: $user['username']); return '' . $title . ''; } diff --git a/sources/app/User/Avatar/GravatarProvider.php b/sources/app/User/Avatar/GravatarProvider.php index 87ca51b..e066d76 100644 --- a/sources/app/User/Avatar/GravatarProvider.php +++ b/sources/app/User/Avatar/GravatarProvider.php @@ -37,6 +37,6 @@ class GravatarProvider extends Base implements AvatarProviderInterface */ public function isActive(array $user) { - return !empty($user['email']) && $this->config->get('integration_gravatar') == 1; + return !empty($user['email']) && $this->configModel->get('integration_gravatar') == 1; } } diff --git a/sources/app/User/Avatar/LetterAvatarProvider.php b/sources/app/User/Avatar/LetterAvatarProvider.php index cf04f2a..727f910 100644 --- a/sources/app/User/Avatar/LetterAvatarProvider.php +++ b/sources/app/User/Avatar/LetterAvatarProvider.php @@ -31,7 +31,7 @@ class LetterAvatarProvider extends Base implements AvatarProviderInterface public function render(array $user, $size) { $initials = $this->helper->user->getInitials($user['name'] ?: $user['username']); - $rgb = $this->getBackgroundColor($initials); + $rgb = $this->getBackgroundColor($user['name'] ?: $user['username']); return sprintf( '
    %s
    ', @@ -142,14 +142,14 @@ class LetterAvatarProvider extends Base implements AvatarProviderInterface // Make hash more sensitive for short string like 'a', 'b', 'c' $str .= 'x'; - $max = intval(9007199254740991 / $seed2); + $max = intval(PHP_INT_MAX / $seed2); - for ($i = 0, $ilen = mb_strlen($str); $i < $ilen; $i++) { + for ($i = 0, $ilen = mb_strlen($str, 'UTF-8'); $i < $ilen; $i++) { if ($hash > $max) { $hash = intval($hash / $seed2); } - $hash = $hash * $seed + $this->getCharCode($str[$i]); + $hash = $hash * $seed + $this->getCharCode(mb_substr($str, $i, 1, 'UTF-8')); } return $hash; diff --git a/sources/app/User/LdapUserProvider.php b/sources/app/User/LdapUserProvider.php index 153450d..8ea8976 100644 --- a/sources/app/User/LdapUserProvider.php +++ b/sources/app/User/LdapUserProvider.php @@ -3,6 +3,7 @@ namespace Kanboard\User; use Kanboard\Core\User\UserProviderInterface; +use Kanboard\Model\LanguageModel; /** * LDAP User Provider @@ -60,6 +61,22 @@ class LdapUserProvider implements UserProviderInterface */ protected $groupIds; + /** + * User photo + * + * @access protected + * @var string + */ + protected $photo = ''; + + /** + * User language + * + * @access protected + * @var string + */ + protected $language = ''; + /** * Constructor * @@ -70,8 +87,10 @@ class LdapUserProvider implements UserProviderInterface * @param string $email * @param string $role * @param string[] $groupIds + * @param string $photo + * @param string $language */ - public function __construct($dn, $username, $name, $email, $role, array $groupIds) + public function __construct($dn, $username, $name, $email, $role, array $groupIds, $photo = '', $language = '') { $this->dn = $dn; $this->username = $username; @@ -79,6 +98,8 @@ class LdapUserProvider implements UserProviderInterface $this->email = $email; $this->role = $role; $this->groupIds = $groupIds; + $this->photo = $photo; + $this->language = $language; } /** @@ -170,10 +191,10 @@ class LdapUserProvider implements UserProviderInterface } /** - * Get groups + * Get groups DN * * @access public - * @return array + * @return string[] */ public function getExternalGroupIds() { @@ -188,9 +209,13 @@ class LdapUserProvider implements UserProviderInterface */ public function getExtraAttributes() { - return array( - 'is_ldap_user' => 1, - ); + $attributes = array('is_ldap_user' => 1); + + if (! empty($this->language)) { + $attributes['language'] = LanguageModel::findCode($this->language); + } + + return $attributes; } /** @@ -203,4 +228,15 @@ class LdapUserProvider implements UserProviderInterface { return $this->dn; } + + /** + * Get user photo + * + * @access public + * @return string + */ + public function getPhoto() + { + return $this->photo; + } } diff --git a/sources/app/User/ReverseProxyUserProvider.php b/sources/app/User/ReverseProxyUserProvider.php index 723b815..34d2187 100644 --- a/sources/app/User/ReverseProxyUserProvider.php +++ b/sources/app/User/ReverseProxyUserProvider.php @@ -21,15 +21,24 @@ class ReverseProxyUserProvider implements UserProviderInterface */ protected $username = ''; + /** + * User profile if the user already exists + * + * @access protected + * @var array + */ + private $userProfile = array(); + /** * Constructor * * @access public * @param string $username */ - public function __construct($username) + public function __construct($username, array $userProfile = array()) { $this->username = $username; + $this->userProfile = $userProfile; } /** @@ -84,7 +93,15 @@ class ReverseProxyUserProvider implements UserProviderInterface */ public function getRole() { - return REVERSE_PROXY_DEFAULT_ADMIN === $this->username ? Role::APP_ADMIN : Role::APP_USER; + if (REVERSE_PROXY_DEFAULT_ADMIN === $this->username) { + return Role::APP_ADMIN; + } + + if (isset($this->userProfile['role'])) { + return $this->userProfile['role']; + } + + return Role::APP_USER; } /** diff --git a/sources/app/Validator/ActionValidator.php b/sources/app/Validator/ActionValidator.php index 95ee7d2..4ce5db4 100644 --- a/sources/app/Validator/ActionValidator.php +++ b/sources/app/Validator/ActionValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Action Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class ActionValidator extends Base +class ActionValidator extends BaseValidator { /** * Validate action creation diff --git a/sources/app/Validator/AuthValidator.php b/sources/app/Validator/AuthValidator.php index cd6e04d..03ff6f2 100644 --- a/sources/app/Validator/AuthValidator.php +++ b/sources/app/Validator/AuthValidator.php @@ -9,10 +9,10 @@ use Gregwar\Captcha\CaptchaBuilder; /** * Authentication Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class AuthValidator extends Base +class AuthValidator extends BaseValidator { /** * Validate user login form @@ -59,7 +59,7 @@ class AuthValidator extends Base $result = true; $errors = array(); - if ($this->userLocking->isLocked($values['username'])) { + if ($this->userLockingModel->isLocked($values['username'])) { $result = false; $errors['login'] = t('Your account is locked for %d minutes', BRUTEFORCE_LOCKDOWN_DURATION); $this->logger->error('Account locked: '.$values['username']); @@ -100,7 +100,7 @@ class AuthValidator extends Base $result = true; $errors = array(); - if ($this->userLocking->hasCaptcha($values['username'])) { + if ($this->userLockingModel->hasCaptcha($values['username'])) { if (! isset($this->sessionStorage->captcha)) { $result = false; } else { diff --git a/sources/app/Validator/Base.php b/sources/app/Validator/BaseValidator.php similarity index 93% rename from sources/app/Validator/Base.php rename to sources/app/Validator/BaseValidator.php index ba32a50..6088538 100644 --- a/sources/app/Validator/Base.php +++ b/sources/app/Validator/BaseValidator.php @@ -2,15 +2,16 @@ namespace Kanboard\Validator; +use Kanboard\Core\Base; use SimpleValidator\Validators; /** * Base Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class Base extends \Kanboard\Core\Base +abstract class BaseValidator extends Base { /** * Execute multiple validators diff --git a/sources/app/Validator/CategoryValidator.php b/sources/app/Validator/CategoryValidator.php index 715aed6..fc42d2e 100644 --- a/sources/app/Validator/CategoryValidator.php +++ b/sources/app/Validator/CategoryValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Category Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class CategoryValidator extends Base +class CategoryValidator extends BaseValidator { /** * Validate category creation diff --git a/sources/app/Validator/ColumnValidator.php b/sources/app/Validator/ColumnValidator.php index f0f1659..25aa45d 100644 --- a/sources/app/Validator/ColumnValidator.php +++ b/sources/app/Validator/ColumnValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Column Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class ColumnValidator extends Base +class ColumnValidator extends BaseValidator { /** * Validate column modification diff --git a/sources/app/Validator/CommentValidator.php b/sources/app/Validator/CommentValidator.php index 4eb5420..fc8e6da 100644 --- a/sources/app/Validator/CommentValidator.php +++ b/sources/app/Validator/CommentValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Comment Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class CommentValidator extends Base +class CommentValidator extends BaseValidator { /** * Validate comment creation diff --git a/sources/app/Validator/CurrencyValidator.php b/sources/app/Validator/CurrencyValidator.php index ee19152..4f375c5 100644 --- a/sources/app/Validator/CurrencyValidator.php +++ b/sources/app/Validator/CurrencyValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Currency Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class CurrencyValidator extends Base +class CurrencyValidator extends BaseValidator { /** * Validate diff --git a/sources/app/Validator/CustomFilterValidator.php b/sources/app/Validator/CustomFilterValidator.php index 07f2a1e..1ab9303 100644 --- a/sources/app/Validator/CustomFilterValidator.php +++ b/sources/app/Validator/CustomFilterValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Custom Filter Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class CustomFilterValidator extends Base +class CustomFilterValidator extends BaseValidator { /** * Common validation rules diff --git a/sources/app/Validator/ExternalLinkValidator.php b/sources/app/Validator/ExternalLinkValidator.php index fff4133..9c01770 100644 --- a/sources/app/Validator/ExternalLinkValidator.php +++ b/sources/app/Validator/ExternalLinkValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * External Link Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class ExternalLinkValidator extends Base +class ExternalLinkValidator extends BaseValidator { /** * Validate creation diff --git a/sources/app/Validator/GroupValidator.php b/sources/app/Validator/GroupValidator.php index 2226abd..8b21c69 100644 --- a/sources/app/Validator/GroupValidator.php +++ b/sources/app/Validator/GroupValidator.php @@ -4,15 +4,15 @@ namespace Kanboard\Validator; use SimpleValidator\Validator; use SimpleValidator\Validators; -use Kanboard\Model\Group; +use Kanboard\Model\GroupModel; /** * Group Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class GroupValidator extends Base +class GroupValidator extends BaseValidator { /** * Validate creation @@ -63,7 +63,7 @@ class GroupValidator extends Base return array( new Validators\Required('name', t('The name is required')), new Validators\MaxLength('name', t('The maximum length is %d characters', 100), 100), - new Validators\Unique('name', t('The name must be unique'), $this->db->getConnection(), Group::TABLE, 'id'), + new Validators\Unique('name', t('The name must be unique'), $this->db->getConnection(), GroupModel::TABLE, 'id'), new Validators\MaxLength('external_id', t('The maximum length is %d characters', 255), 255), new Validators\Integer('id', t('This value must be an integer')), ); diff --git a/sources/app/Validator/LinkValidator.php b/sources/app/Validator/LinkValidator.php index 10a826d..8e1c878 100644 --- a/sources/app/Validator/LinkValidator.php +++ b/sources/app/Validator/LinkValidator.php @@ -4,15 +4,15 @@ namespace Kanboard\Validator; use SimpleValidator\Validator; use SimpleValidator\Validators; -use Kanboard\Model\Link; +use Kanboard\Model\LinkModel; /** * Link Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class LinkValidator extends Base +class LinkValidator extends BaseValidator { /** * Validate creation @@ -25,7 +25,7 @@ class LinkValidator extends Base { $v = new Validator($values, array( new Validators\Required('label', t('Field required')), - new Validators\Unique('label', t('This label must be unique'), $this->db->getConnection(), Link::TABLE), + new Validators\Unique('label', t('This label must be unique'), $this->db->getConnection(), LinkModel::TABLE), new Validators\NotEquals('label', 'opposite_label', t('The labels must be different')), )); @@ -48,7 +48,7 @@ class LinkValidator extends Base new Validators\Required('id', t('Field required')), new Validators\Required('opposite_id', t('Field required')), new Validators\Required('label', t('Field required')), - new Validators\Unique('label', t('This label must be unique'), $this->db->getConnection(), Link::TABLE), + new Validators\Unique('label', t('This label must be unique'), $this->db->getConnection(), LinkModel::TABLE), )); return array( diff --git a/sources/app/Validator/PasswordResetValidator.php b/sources/app/Validator/PasswordResetValidator.php index baf2d8d..e44e520 100644 --- a/sources/app/Validator/PasswordResetValidator.php +++ b/sources/app/Validator/PasswordResetValidator.php @@ -9,10 +9,10 @@ use Gregwar\Captcha\CaptchaBuilder; /** * Password Reset Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class PasswordResetValidator extends Base +class PasswordResetValidator extends BaseValidator { /** * Validate creation @@ -87,6 +87,6 @@ class PasswordResetValidator extends Base } } - return array($result, $errors);; + return array($result, $errors); } } diff --git a/sources/app/Validator/ProjectValidator.php b/sources/app/Validator/ProjectValidator.php index 1c6c90f..8c6117a 100644 --- a/sources/app/Validator/ProjectValidator.php +++ b/sources/app/Validator/ProjectValidator.php @@ -4,15 +4,15 @@ namespace Kanboard\Validator; use SimpleValidator\Validator; use SimpleValidator\Validators; -use Kanboard\Model\Project; +use Kanboard\Model\ProjectModel; /** * Project Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class ProjectValidator extends Base +class ProjectValidator extends BaseValidator { /** * Common validation rules @@ -28,13 +28,13 @@ class ProjectValidator extends Base new Validators\Integer('priority_start', t('This value must be an integer')), new Validators\Integer('priority_end', t('This value must be an integer')), new Validators\Integer('is_active', t('This value must be an integer')), - new Validators\Required('name', t('The project name is required')), + new Validators\NotEmpty('name', t('This field cannot be empty')), new Validators\MaxLength('name', t('The maximum length is %d characters', 50), 50), new Validators\MaxLength('identifier', t('The maximum length is %d characters', 50), 50), new Validators\MaxLength('start_date', t('The maximum length is %d characters', 10), 10), new Validators\MaxLength('end_date', t('The maximum length is %d characters', 10), 10), new Validators\AlphaNumeric('identifier', t('This value must be alphanumeric')) , - new Validators\Unique('identifier', t('The identifier must be unique'), $this->db->getConnection(), Project::TABLE), + new Validators\Unique('identifier', t('The identifier must be unique'), $this->db->getConnection(), ProjectModel::TABLE), ); } @@ -47,11 +47,15 @@ class ProjectValidator extends Base */ public function validateCreation(array $values) { + $rules = array( + new Validators\Required('name', t('The project name is required')), + ); + if (! empty($values['identifier'])) { $values['identifier'] = strtoupper($values['identifier']); } - $v = new Validator($values, $this->commonValidationRules()); + $v = new Validator($values, array_merge($this->commonValidationRules(), $rules)); return array( $v->execute(), diff --git a/sources/app/Validator/SubtaskValidator.php b/sources/app/Validator/SubtaskValidator.php index 1989b7f..b80de41 100644 --- a/sources/app/Validator/SubtaskValidator.php +++ b/sources/app/Validator/SubtaskValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Subtask Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class SubtaskValidator extends Base +class SubtaskValidator extends BaseValidator { /** * Validate creation diff --git a/sources/app/Validator/SwimlaneValidator.php b/sources/app/Validator/SwimlaneValidator.php index 4cc780f..16f8bfb 100644 --- a/sources/app/Validator/SwimlaneValidator.php +++ b/sources/app/Validator/SwimlaneValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Swimlane Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class SwimlaneValidator extends Base +class SwimlaneValidator extends BaseValidator { /** * Validate creation diff --git a/sources/app/Validator/TagValidator.php b/sources/app/Validator/TagValidator.php new file mode 100644 index 0000000..0567cf3 --- /dev/null +++ b/sources/app/Validator/TagValidator.php @@ -0,0 +1,76 @@ +commonValidationRules()); + $result = $v->execute(); + $errors = $v->getErrors(); + + if ($result && $this->tagModel->exists($values['project_id'], $values['name'])) { + $result = false; + $errors = array('name' => array(t('The name must be unique'))); + } + + return array($result, $errors); + } + + /** + * Validate modification + * + * @access public + * @param array $values Form values + * @return array $valid, $errors [0] = Success or not, [1] = List of errors + */ + public function validateModification(array $values) + { + $rules = array( + new Validators\Required('id', t('Field required')), + ); + + $v = new Validator($values, array_merge($rules, $this->commonValidationRules())); + $result = $v->execute(); + $errors = $v->getErrors(); + + if ($result && $this->tagModel->exists($values['project_id'], $values['name'], $values['id'])) { + $result = false; + $errors = array('name' => array(t('The name must be unique'))); + } + + return array($result, $errors); + } + + /** + * Common validation rules + * + * @access protected + * @return array + */ + protected function commonValidationRules() + { + return array( + new Validators\Required('project_id', t('Field required')), + new Validators\Required('name', t('Field required')), + new Validators\MaxLength('name', t('The maximum length is %d characters', 255), 255), + ); + } +} diff --git a/sources/app/Validator/TaskLinkValidator.php b/sources/app/Validator/TaskLinkValidator.php index c88c2b1..6da257b 100644 --- a/sources/app/Validator/TaskLinkValidator.php +++ b/sources/app/Validator/TaskLinkValidator.php @@ -4,15 +4,15 @@ namespace Kanboard\Validator; use SimpleValidator\Validator; use SimpleValidator\Validators; -use Kanboard\Model\Task; +use Kanboard\Model\TaskModel; /** * Task Link Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class TaskLinkValidator extends Base +class TaskLinkValidator extends BaseValidator { /** * Common validation rules @@ -27,7 +27,7 @@ class TaskLinkValidator extends Base new Validators\Required('opposite_task_id', t('Field required')), new Validators\Required('link_id', t('Field required')), new Validators\NotEquals('opposite_task_id', 'task_id', t('A task cannot be linked to itself')), - new Validators\Exists('opposite_task_id', t('This linked task id doesn\'t exists'), $this->db->getConnection(), Task::TABLE, 'id') + new Validators\Exists('opposite_task_id', t('This linked task id doesn\'t exists'), $this->db->getConnection(), TaskModel::TABLE, 'id') ); } diff --git a/sources/app/Validator/TaskValidator.php b/sources/app/Validator/TaskValidator.php index 1a77dd3..8aa5c44 100644 --- a/sources/app/Validator/TaskValidator.php +++ b/sources/app/Validator/TaskValidator.php @@ -8,10 +8,10 @@ use SimpleValidator\Validators; /** * Task Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class TaskValidator extends Base +class TaskValidator extends BaseValidator { /** * Common validation rules @@ -40,8 +40,8 @@ class TaskValidator extends Base new Validators\Integer('priority', t('This value must be an integer')), new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200), new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50), - new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getDateFormats(true)), - new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getDateTimeFormats(true)), + new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getParserFormats()), + new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getParserFormats()), new Validators\Numeric('time_spent', t('This value must be numeric')), new Validators\Numeric('time_estimated', t('This value must be numeric')), ); @@ -69,6 +69,32 @@ class TaskValidator extends Base ); } + /** + * Validate task creation + * + * @access public + * @param array $values Form values + * @return array $valid, $errors [0] = Success or not, [1] = List of errors + */ + public function validateBulkCreation(array $values) + { + $rules = array( + new Validators\Required('project_id', t('The project is required')), + new Validators\Required('tasks', t('Field required')), + new Validators\Required('column_id', t('Field required')), + new Validators\Required('swimlane_id', t('Field required')), + new Validators\Integer('category_id', t('This value must be an integer')), + new Validators\Integer('swimlane_id', t('This value must be an integer')), + ); + + $v = new Validator($values, array_merge($rules, $this->commonValidationRules())); + + return array( + $v->execute(), + $v->getErrors() + ); + } + /** * Validate description creation * @@ -155,53 +181,6 @@ class TaskValidator extends Base ); } - /** - * Validate assignee change - * - * @access public - * @param array $values Form values - * @return array $valid, $errors [0] = Success or not, [1] = List of errors - */ - public function validateAssigneeModification(array $values) - { - $rules = array( - new Validators\Required('id', t('The id is required')), - new Validators\Required('project_id', t('The project is required')), - new Validators\Required('owner_id', t('This value is required')), - ); - - $v = new Validator($values, array_merge($rules, $this->commonValidationRules())); - - return array( - $v->execute(), - $v->getErrors() - ); - } - - /** - * Validate category change - * - * @access public - * @param array $values Form values - * @return array $valid, $errors [0] = Success or not, [1] = List of errors - */ - public function validateCategoryModification(array $values) - { - $rules = array( - new Validators\Required('id', t('The id is required')), - new Validators\Required('project_id', t('The project is required')), - new Validators\Required('category_id', t('This value is required')), - - ); - - $v = new Validator($values, array_merge($rules, $this->commonValidationRules())); - - return array( - $v->execute(), - $v->getErrors() - ); - } - /** * Validate project modification * diff --git a/sources/app/Validator/UserValidator.php b/sources/app/Validator/UserValidator.php index e5953f3..9911de5 100644 --- a/sources/app/Validator/UserValidator.php +++ b/sources/app/Validator/UserValidator.php @@ -4,15 +4,15 @@ namespace Kanboard\Validator; use SimpleValidator\Validator; use SimpleValidator\Validators; -use Kanboard\Model\User; +use Kanboard\Model\UserModel; /** * User Validator * - * @package validator + * @package Kanboard\Validator * @author Frederic Guillot */ -class UserValidator extends Base +class UserValidator extends BaseValidator { /** * Common validation rules @@ -25,7 +25,7 @@ class UserValidator extends Base return array( new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25), new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50), - new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), User::TABLE, 'id'), + new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), UserModel::TABLE, 'id'), new Validators\Email('email', t('Email address invalid')), new Validators\Integer('is_ldap_user', t('This value must be an integer')), ); diff --git a/sources/app/check_setup.php b/sources/app/check_setup.php index af830de..d962a6f 100644 --- a/sources/app/check_setup.php +++ b/sources/app/check_setup.php @@ -15,8 +15,8 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) { } // Check data folder if sqlite -if (DB_DRIVER === 'sqlite' && ! is_writable('data')) { - throw new Exception('The directory "data" must be writeable by your web server user'); +if (DB_DRIVER === 'sqlite' && ! is_writable(dirname(DB_FILENAME))) { + throw new Exception('The directory "'.dirname(DB_FILENAME).'" must be writeable by your web server user'); } // Check PDO extensions diff --git a/sources/app/common.php b/sources/app/common.php index 7dbd758..72be360 100644 --- a/sources/app/common.php +++ b/sources/app/common.php @@ -2,41 +2,51 @@ require __DIR__.'/../vendor/autoload.php'; -// Automatically parse environment configuration (Heroku) -if (getenv('DATABASE_URL')) { - $dbopts = parse_url(getenv('DATABASE_URL')); +$dbUrlParser = new PicoDb\UrlParser(); - define('DB_DRIVER', $dbopts['scheme']); - define('DB_USERNAME', $dbopts["user"]); - define('DB_PASSWORD', $dbopts["pass"]); - define('DB_HOSTNAME', $dbopts["host"]); - define('DB_PORT', isset($dbopts["port"]) ? $dbopts["port"] : null); - define('DB_NAME', ltrim($dbopts["path"], '/')); +if ($dbUrlParser->isEnvironmentVariableDefined()) { + $dbSettings = $dbUrlParser->getSettings(); + + define('DB_DRIVER', $dbSettings['driver']); + define('DB_USERNAME', $dbSettings['username']); + define('DB_PASSWORD', $dbSettings['password']); + define('DB_HOSTNAME', $dbSettings['hostname']); + define('DB_PORT', $dbSettings['port']); + define('DB_NAME', $dbSettings['database']); } -if (file_exists('config.php')) { - require 'config.php'; +$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'config.php')); + +if (file_exists($config_file)) { + require $config_file; } -if (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) { - require 'data'.DIRECTORY_SEPARATOR.'config.php'; +$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'data', 'config.php')); + +if (file_exists($config_file)) { + require $config_file; } require __DIR__.'/constants.php'; require __DIR__.'/check_setup.php'; $container = new Pimple\Container; -$container->register(new Kanboard\ServiceProvider\HelperProvider); -$container->register(new Kanboard\ServiceProvider\SessionProvider); -$container->register(new Kanboard\ServiceProvider\LoggingProvider); -$container->register(new Kanboard\ServiceProvider\DatabaseProvider); -$container->register(new Kanboard\ServiceProvider\AuthenticationProvider); -$container->register(new Kanboard\ServiceProvider\NotificationProvider); -$container->register(new Kanboard\ServiceProvider\ClassProvider); -$container->register(new Kanboard\ServiceProvider\EventDispatcherProvider); -$container->register(new Kanboard\ServiceProvider\GroupProvider); -$container->register(new Kanboard\ServiceProvider\RouteProvider); -$container->register(new Kanboard\ServiceProvider\ActionProvider); -$container->register(new Kanboard\ServiceProvider\ExternalLinkProvider); -$container->register(new Kanboard\ServiceProvider\AvatarProvider); -$container->register(new Kanboard\ServiceProvider\PluginProvider); +$container->register(new Kanboard\ServiceProvider\MailProvider()); +$container->register(new Kanboard\ServiceProvider\HelperProvider()); +$container->register(new Kanboard\ServiceProvider\SessionProvider()); +$container->register(new Kanboard\ServiceProvider\LoggingProvider()); +$container->register(new Kanboard\ServiceProvider\DatabaseProvider()); +$container->register(new Kanboard\ServiceProvider\AuthenticationProvider()); +$container->register(new Kanboard\ServiceProvider\NotificationProvider()); +$container->register(new Kanboard\ServiceProvider\ClassProvider()); +$container->register(new Kanboard\ServiceProvider\EventDispatcherProvider()); +$container->register(new Kanboard\ServiceProvider\GroupProvider()); +$container->register(new Kanboard\ServiceProvider\RouteProvider()); +$container->register(new Kanboard\ServiceProvider\ActionProvider()); +$container->register(new Kanboard\ServiceProvider\ExternalLinkProvider()); +$container->register(new Kanboard\ServiceProvider\AvatarProvider()); +$container->register(new Kanboard\ServiceProvider\FilterProvider()); +$container->register(new Kanboard\ServiceProvider\QueueProvider()); +$container->register(new Kanboard\ServiceProvider\ApiProvider()); +$container->register(new Kanboard\ServiceProvider\CommandProvider()); +$container->register(new Kanboard\ServiceProvider\PluginProvider()); diff --git a/sources/app/constants.php b/sources/app/constants.php index bc793b6..47e8689 100644 --- a/sources/app/constants.php +++ b/sources/app/constants.php @@ -1,20 +1,39 @@ 1, 'k2' => 2], ['k1' => 3, 'k2' => 4], ['k1' => 2, 'k2' => 5] + * ] + * + * array_column_index($input, 'k1') will returns: + * + * [ + * 1 => [['k1' => 1, 'k2' => 2], ['k1' => 2, 'k2' => 5]], + * 3 => [['k1' => 3, 'k2' => 4]], + * ] + * + * @param array $input + * @param string $column + * @return array + */ +function array_column_index(array &$input, $column) +{ + $result = array(); + + foreach ($input as &$row) { + if (isset($row[$column])) { + $result[$row[$column]][] = $row; + } + } + + return $result; +} + +/** + * Sum all values from a single column in the input array + * + * $input = [ + * ['column' => 2], ['column' => 3] + * ] + * + * array_column_sum($input, 'column') returns 5 + * + * @param array $input + * @param string $column + * @return double + */ +function array_column_sum(array &$input, $column) +{ + $sum = 0.0; + + foreach ($input as &$row) { + if (isset($row[$column])) { + $sum += (float) $row[$column]; + } + } + + return $sum; +} + /** * Build version number from git-archive output * diff --git a/sources/assets/css/app.css b/sources/assets/css/app.css deleted file mode 100644 index 0081e69..0000000 --- a/sources/assets/css/app.css +++ /dev/null @@ -1,27 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2015-08-09 -* http://jqueryui.com -* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, autocomplete.css, datepicker.css, menu.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ - -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24 -* http://trentrichardson.com/examples/timepicker -* Copyright (c) 2015 Trent Richardson; Licensed MIT */ - -.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{float:left;clear:left;padding:0 0 0 5px}.ui-timepicker-div dl dd{margin:0 10px 10px 40%}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:0 0;border:0;margin:0;padding:0}.ui-timepicker-div .ui_tpicker_unit_hide{display:none}.ui-timepicker-rtl{direction:rtl}.ui-timepicker-rtl dl{text-align:right;padding:0 5px 0 0}.ui-timepicker-rtl dl dt{float:right;clear:right}.ui-timepicker-rtl dl dd{margin:0 40% 10px 10px}.ui-timepicker-div.ui-timepicker-oneLine{padding-right:2px}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,.ui-timepicker-div.ui-timepicker-oneLine dt{display:none}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label{display:block;padding-top:2px}.ui-timepicker-div.ui-timepicker-oneLine dl{text-align:right}.ui-timepicker-div.ui-timepicker-oneLine dl dd,.ui-timepicker-div.ui-timepicker-oneLine dl dd>div{display:inline-block;margin:0}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before{content:':';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before{content:'.';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{display:none}/* Chosen v1.1.0 | (c) 2011-2013 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ - -.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;*display:inline;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:23px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(../img/chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(../img/chosen-sprite.png) no-repeat 100% -20px;background:url(../img/chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:5px;height:15px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#666;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 0 3px 5px;padding:3px 20px 3px 5px;border:1px solid #aaa;border-radius:3px;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(../img/chosen-sprite.png) no-repeat -30px -20px;background:url(../img/chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(../img/chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}/*! - * FullCalendar v2.4.0 Stylesheet - * Docs & License: http://fullcalendar.io/ - * (c) 2015 Adam Shaw - */.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}body .fc{font-size:1em}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1;opacity:.3;filter:alpha(opacity=30)}.fc-bgevent{background:#8fdf82;opacity:.3;filter:alpha(opacity=30)}.fc-nonbusiness{background:#d7d7d7}.fc-icon{display:inline-block;width:1em;height:1em;line-height:1em;font-size:1em;text-align:center;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative;margin:0 -1em}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%;left:3%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%;left:-3%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%;left:-2%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%;left:2%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;white-space:nowrap;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-default{background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-button-group{display:inline-block}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-popover .fc-header .fc-close{cursor:pointer}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc-bg{bottom:0}.fc-bg table{height:100%}.fc table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc th{text-align:center}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{overflow-y:scroll;overflow-x:hidden}.fc-scroller>*{position:relative;width:100%;overflow:hidden}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-event.fc-draggable,.fc-event[href]{cursor:pointer}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:3}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-h-event .fc-resizer{top:-1px;bottom:-1px;left:-1px;right:-1px;width:5px}.fc-ltr .fc-h-event .fc-start-resizer,.fc-ltr .fc-h-event .fc-start-resizer:after,.fc-ltr .fc-h-event .fc-start-resizer:before,.fc-rtl .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-end-resizer:after,.fc-rtl .fc-h-event .fc-end-resizer:before{right:auto;cursor:w-resize}.fc-ltr .fc-h-event .fc-end-resizer,.fc-ltr .fc-h-event .fc-end-resizer:after,.fc-ltr .fc-h-event .fc-end-resizer:before,.fc-rtl .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-start-resizer:after,.fc-rtl .fc-h-event .fc-start-resizer:before{left:auto;cursor:e-resize}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-day-grid-event .fc-resizer{left:-3px;right:-3px;width:7px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-toolbar{text-align:center;margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid{overflow:hidden}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number{text-align:center}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px;white-space:nowrap}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-bgevent-skeleton,.fc-time-grid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-time-grid .fc-bgevent-skeleton{z-index:3}.fc-time-grid .fc-highlight-skeleton{z-index:4}.fc-time-grid .fc-content-skeleton{z-index:5}.fc-time-grid .fc-helper-skeleton{z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight-container{position:relative}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-time-grid .fc-bgevent-container,.fc-time-grid .fc-event-container{position:relative}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em;white-space:nowrap}.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-time-grid-event .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-time-grid-event .fc-resizer:after{content:"="}/*! - * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.5.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"} -.c3 svg{font:10px sans-serif}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}/** - * simplemde v1.10.1 - * Copyright Next Step Webs, Inc. - * @link https://github.com/NextStepWebs/simplemde-markdown-editor - * @license MIT - */ -.CodeMirror{color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror,.CodeMirror-scroll{min-height:300px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror{height:auto;border:1px solid #ddd;border-bottom-left-radius:4px;border-bottom-right-radius:4px;padding:10px;font:inherit;z-index:1}.CodeMirror-fullscreen{background:#fff;position:fixed!important;top:50px;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-sided{width:50%!important}.editor-toolbar{position:relative;opacity:.6;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;padding:0 10px;border-top:1px solid #bbb;border-left:1px solid #bbb;border-right:1px solid #bbb;border-top-left-radius:4px;border-top-right-radius:4px}.editor-toolbar:after,.editor-toolbar:before{display:block;content:' ';height:1px}.editor-toolbar:before{margin-bottom:8px}.editor-toolbar:after{margin-top:8px}.editor-toolbar:hover,.editor-wrapper input.title:focus,.editor-wrapper input.title:hover{opacity:.8}.editor-toolbar.fullscreen{width:100%;height:50px;overflow-x:auto;overflow-y:hidden;white-space:nowrap;padding-top:10px;padding-bottom:10px;box-sizing:border-box;background:#fff;border:0;position:fixed;top:0;left:0;opacity:1;z-index:9}.editor-toolbar.fullscreen::before{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,1)),color-stop(100%,rgba(255,255,255,0)));background:-webkit-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-o-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:linear-gradient(to right,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);position:fixed;top:0;left:0;margin:0;padding:0}.editor-toolbar.fullscreen::after{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);position:fixed;top:0;right:0;margin:0;padding:0}.editor-toolbar a{display:inline-block;text-align:center;text-decoration:none!important;color:#2c3e50!important;width:30px;height:30px;margin:0;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover{background:#fcfcfc;border-color:#95a5a6}.editor-toolbar a:before{line-height:30px}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 6px}.editor-toolbar a.fa-header-x:after{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:65%;vertical-align:text-bottom;position:relative;top:2px}.editor-toolbar a.fa-header-1:after{content:"1"}.editor-toolbar a.fa-header-2:after{content:"2"}.editor-toolbar a.fa-header-3:after{content:"3"}.editor-toolbar a.fa-header-bigger:after{content:"▲"}.editor-toolbar a.fa-header-smaller:after{content:"▼"}.editor-toolbar.disabled-for-preview a:not(.no-disable){pointer-events:none;background:#fff;border-color:transparent;text-shadow:inherit}@media only screen and (max-width:700px){.editor-toolbar a.no-mobile{display:none}}.editor-statusbar{padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-preview,.editor-preview-side{padding:10px;background:#fafafa;overflow:auto;display:none;box-sizing:border-box}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-statusbar .characters:before{content:'characters: '}.editor-preview{position:absolute;width:100%;height:100%;top:0;left:0;z-index:7}.editor-preview-side{position:fixed;bottom:0;width:50%;top:50px;right:0;z-index:9;border:1px solid #ddd}.editor-preview-active,.editor-preview-active-side{display:block}.editor-preview-side>p,.editor-preview>p{margin-top:0}.editor-preview pre,.editor-preview-side pre{background:#eee;margin-bottom:10px}.editor-preview table td,.editor-preview table th,.editor-preview-side table td,.editor-preview-side table th{border:1px solid #ddd;padding:5px}.CodeMirror .CodeMirror-code .cm-tag{color:#63a35c}.CodeMirror .CodeMirror-code .cm-attribute{color:#795da3}.CodeMirror .CodeMirror-code .cm-string{color:#183691}.CodeMirror .CodeMirror-selected{background:#d9d9d9}.CodeMirror .CodeMirror-code .cm-header-1{font-size:200%;line-height:200%}.CodeMirror .CodeMirror-code .cm-header-2{font-size:160%;line-height:160%}.CodeMirror .CodeMirror-code .cm-header-3{font-size:125%;line-height:125%}.CodeMirror .CodeMirror-code .cm-header-4{font-size:110%;line-height:110%}.CodeMirror .CodeMirror-code .cm-comment{background:rgba(0,0,0,.05);border-radius:2px}.CodeMirror .CodeMirror-code .cm-link{color:#7f8c8d}.CodeMirror .CodeMirror-code .cm-url{color:#aab2b3}.CodeMirror .CodeMirror-code .cm-strikethrough{text-decoration:line-through}.CodeMirror .CodeMirror-placeholder{opacity:.5}.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word){background:rgba(255,0,0,.15)}li,ul,ol,table,tr,td,th,p,blockquote,body{margin:0;padding:0;font-size:100%}body{margin-left:10px;margin-right:10px;padding-bottom:10px;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;text-rendering:optimizeLegibility}.page{clear:both}ul.no-bullet li{list-style-type:none;margin-left:0}.pull-right{text-align:right}hr{border:0;height:0;border-top:1px solid rgba(0,0,0,0.1);border-bottom:1px solid rgba(255,255,255,0.3)}.chosen-select{min-height:27px}#ui-datepicker-div{font-size:.8em}#app-loading-icon{position:fixed;right:3px;bottom:3px}.web-notification-icon{color:#36c}.web-notification-icon:focus,.web-notification-icon:hover{color:#000}.smaller{font-size:.85em}a{color:#36c;border:0}a:focus{outline:0;color:#df5353;text-decoration:none;border:1px dotted #aaa}a:hover{color:#333;text-decoration:none}h1,h2,h3{font-weight:normal;color:#333}h2{font-size:1.3em;margin-bottom:10px}h3{margin-top:10px;font-size:1.2em}table{width:100%;border-collapse:collapse;border-spacing:0;margin-bottom:20px;font-size:.95em}#calendar table{margin-bottom:0}th,td{border:1px solid #eee;padding-top:.5em;padding-bottom:.5em;padding-left:3px;padding-right:3px}td{vertical-align:top}th{background:#fbfbfb;text-align:left}td li{margin-left:20px}.table-small{font-size:.8em}th a{text-decoration:none;color:#333}th a:focus,th a:hover{text-decoration:underline}.table-fixed{table-layout:fixed;white-space:nowrap}.table-fixed th{overflow:hidden}.table-fixed td{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.table-stripped tr:nth-child(odd){background:#fefefe}.column-3{width:3%}.column-5{width:5%}.column-8{width:7.5%}.column-10{width:10%}.column-12{width:12%}.column-15{width:15%}.column-18{width:18%}.column-20{width:20%}.column-25{width:25%}.column-30{width:30%}.column-35{width:35%}.column-40{width:40%}.column-50{width:50%}.column-60{width:60%}.column-70{width:70%}.column-80{width:70%}.draggable-row-handle{cursor:move;color:#dedede}.draggable-row-handle:hover{color:#333}tr.draggable-item-selected{background:#fff;border:2px solid #666;box-shadow:4px 2px 10px -4px rgba(0,0,0,0.55)}tr.draggable-item-selected td{border-top:0;border-bottom:0}tr.draggable-item-selected td:first-child{border-left:0}tr.draggable-item-selected td:last-child{border-right:0}.table-stripped tr.draggable-item-hover,tr.draggable-item-hover{background:#fefff2}form{margin-bottom:20px}label{cursor:pointer;display:block;margin-top:10px}input[type="number"],input[type="date"],input[type="email"],input[type="password"],input[type="text"]{color:#888;border:1px solid #ccc;width:300px;max-width:95%;font-size:100%;height:25px;padding-bottom:0;font-family:sans-serif;margin-top:10px;-webkit-appearance:none;appearance:none}input[type="number"]:focus,input[type="date"]:focus,input[type="email"]:focus,input[type="password"]:focus,input[type="text"]:focus,textarea:focus{color:#000;border-color:rgba(82,168,236,0.8);outline:0;box-shadow:0 0 8px rgba(82,168,236,0.6)}input.form-numeric,input[type="number"]{width:70px}textarea{border:1px solid #ccc;width:400px;max-width:99%;height:200px;font-size:100%;font-family:sans-serif}select{max-width:95%}select:focus{outline:0}::-webkit-input-placeholder{color:#ddd;padding-top:2px}::-ms-input-placeholder{color:#ddd;padding-top:2px}::-moz-placeholder{color:#ddd;padding-top:2px}.form-actions{padding-top:20px;clear:both}input.form-error,textarea.form-error{border:2px solid #b94a48}input.form-error:focus,textarea.form-error:focus{box-shadow:none;border:2px solid #b94a48}.form-required{color:red;padding-left:5px;font-weight:bold}.form-errors{color:#b94a48;list-style-type:none}ul.form-errors li{margin-left:0}.form-help{font-size:.8em;color:brown;margin-bottom:15px}.form-inline{padding:0;margin:0;border:0}.form-inline label{display:inline}.form-inline input,.form-inline select{margin:0;margin-right:15px}.form-inline .form-required{display:none}.form-inline-group{display:inline}input.form-datetime,input.form-date{width:150px}input.form-input-large{width:400px}.form-column{float:left;margin-right:3%;max-width:50%;min-width:40%}.form-column ul{margin-top:15px}.form-clear{clear:both;padding-top:20px;padding-bottom:10px}.form-login{width:350px;margin:0 auto;margin-top:8%}.form-column li,.form-login li{margin-left:25px;line-height:25px}.form-login h2{margin-bottom:30px;font-size:1.5em;font-weight:bold}.popover-form{margin-bottom:0}.reset-password{margin-top:20px}.reset-password a{font-size:.8em;color:#999}.btn{font-size:1.1em;font-weight:normal;cursor:pointer;-webkit-appearance:none;appearance:none;display:inline-block;color:#333;background:#f5f5f5;border:1px solid #ddd;border-radius:2px;padding:3px 10px;margin:0}a.btn{text-decoration:none}.btn:hover{border:1px solid #bbb;color:#000;background:#fafafa}.btn-red{border-color:#b0281a;background:#d14836;color:#fff}.btn-red:hover,.btn-red:focus{color:#fff;background:#c53727}.btn-blue{border-color:#3079ed;background:#4d90fe;color:#fff}.btn-blue:hover,.btn-blue:focus{border-color:#2f5bb7;background:#357ae8;color:#fff}.btn:disabled{color:#ccc;border:1px solid #ccc;background:#f7f7f7}.buttons-header{font-size:.9em;margin-bottom:15px}.alert{padding:8px 35px 8px 14px;margin-top:5px;margin-bottom:5px;color:#c09853;background-color:#fcf8e3;border:1px solid #fbeed5;border-radius:4px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-normal{color:#333;background-color:#f0f0f0;border-color:#ddd}.alert ul{margin-top:10px;margin-bottom:10px}.alert li{margin-left:25px}.alert-fade-out{text-align:center;position:fixed;bottom:0;left:20%;width:60%;padding-top:5px;padding-bottom:5px;margin-bottom:0;border-width:1px 0 0;border-radius:0;border-top-left-radius:4px;border-top-right-radius:4px;z-index:9999}.tooltip-arrow:after{background:#fff;border:1px solid #aaa;box-shadow:0 0 5px #aaa}div.ui-tooltip{min-width:200px;max-width:600px;font-size:.85em}.tooltip-arrow{width:20px;height:10px;overflow:hidden;position:absolute}.tooltip-arrow.top{top:-10px}.tooltip-arrow.bottom{bottom:-10px}.tooltip-arrow.align-left{left:10px}.tooltip-arrow.align-right{right:10px}.tooltip-arrow:after{content:"";position:absolute;width:14px;height:14px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.tooltip-arrow.bottom:after{top:-10px}.tooltip-arrow.top:after{bottom:-10px}.tooltip-arrow.align-left:after{left:0}.tooltip-arrow.align-right:after{right:0}.tooltip-large{width:600px}.ui-tooltip-content .markdown p{margin-bottom:0}.tooltip .fa-info-circle{color:#999;font-size:.95em}header{margin-top:10px;padding-bottom:10px;border-bottom:1px solid #dedede}header h1{margin:0;padding:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:70%;float:left}header ul{text-align:right;font-size:.9em}header li{display:inline;padding-left:30px}header a{color:#777;text-decoration:none}nav .active a{color:#333;font-weight:bold}.logo a{opacity:.5;color:#d40000}.logo span{color:#333}.logo a:hover{opacity:.8;color:#333}.logo a:focus span,.logo a:hover span{color:#d40000}header .user-links .dropdown{margin-left:15px}header h1 .tooltip{opacity:.3;font-size:.6em}.page-header{margin-bottom:20px}.page-header h2{margin:0;padding:0;font-size:1.4em;font-weight:bold;border-bottom:1px dotted #ccc}.page-header h2 a{color:#333;text-decoration:none}.page-header h2 a:focus,.page-header h2 a:hover{color:#aaa}.page-header ul{text-align:left;margin-top:5px;display:inline-block}.menu-inline li,.page-header li{display:inline;padding-right:15px;font-size:.95em}.page-header li.active a{color:#333;text-decoration:none;font-weight:bold}.page-header li.active a:hover,.page-header li.active a:focus{text-decoration:underline}.menu-inline{margin-bottom:5px}.public-board{margin-top:5px}.public-task{max-width:800px;margin:0 auto;margin-top:5px}#board-container{overflow-x:auto}#board{table-layout:fixed;margin-bottom:0}#board th.board-column-header{width:240px}#board td{vertical-align:top}.board-container-compact{overflow-x:initial}@media all and (-ms-high-contrast:active),(-ms-high-contrast:none){.board-container-compact #board{table-layout:auto}}#board th.board-column-header.board-column-compact{width:initial}.board-column-collapsed{display:none}td.board-column-task-collapsed{font-weight:bold;background-color:#fbfbfb}#board th.board-column-header-collapsed{width:28px;min-width:28px;text-align:center;overflow:hidden}.board-rotation-wrapper{position:relative;padding:8px 4px;min-height:150px;overflow:hidden}.board-rotation{white-space:nowrap;-webkit-backface-visibility:hidden;-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);-webkit-transform-origin:0 100%;-moz-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.board-column-title .dropdown-menu{text-decoration:none}.board-add-icon{float:left;padding:0 5px}.board-add-icon a{text-decoration:none;color:#36c;font-size:150%;line-height:70%}.board-add-icon a:focus,.board-add-icon a:hover{text-decoration:none;color:red}.board-column-header-task-count{color:#999;font-weight:normal}th.board-column-header-collapsed .board-column-header-task-count{font-size:.85em}a.board-swimlane-toggle{font-size:.95em;text-decoration:none}a.board-swimlane-toggle:hover,a.board-swimlane-toggle:focus{color:#000;text-decoration:none;border:0}.board-task-list{overflow:auto;min-height:60px}.board-task-list-limit{background-color:#df5353}.draggable-item{cursor:pointer;user-select:none;-webkit-user-select:none;-moz-user-select:none}.draggable-placeholder{border:2px dashed #000;background:#fafafa;height:70px;margin-bottom:10px}div.draggable-item-selected{border:1px solid #000}.task-board-sort-handle{float:left;padding-right:5px}.task-board-saving-state{opacity:.3}.task-board-saving-icon{position:absolute;margin:auto;width:100%;text-align:center;color:#000}.task-table .dropdown-menu{color:#000;text-decoration:none;font-weight:bold}.task-table .dropdown-menu:focus,.task-table .dropdown-menu:hover{text-decoration:underline}td.task-table a{color:#000;text-decoration:none}td.task-table a:hover{text-decoration:underline}.task-board{position:relative;margin-bottom:4px;border:1px solid #000;padding:2px;font-size:.85em;word-wrap:break-word}div.task-board-recent{border-width:2px}div.task-board-status-closed{user-select:none;border:1px dotted #555}.task-board a{color:#000;text-decoration:none}.task-board .dropdown-menu{font-weight:bold}.task-board-collapsed{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.task-board-title{font-size:1.15em;margin-top:5px;margin-bottom:8px}.task-board-title a:hover{text-decoration:underline}.task-board-category-container{text-align:right;margin-top:8px;margin-bottom:8px}.task-board-category{font-weight:500;color:#000;border:1px solid #555;padding:1px 2px 1px 2px;border-radius:4px}.task-board-category:hover{opacity:.6}.task-board-avatars{text-align:right;float:right}.task-board-change-assignee:hover{opacity:.6}.task-board-change-assignee{cursor:pointer}.task-board-icons{text-align:right;margin-top:4px;margin-bottom:2px}.task-board-icons a{opacity:.5}.task-board-icons span{opacity:.5;margin-left:2px}.task-board-icons a:hover,.task-board-icons span:hover{opacity:1.0}.task-board-date{font-weight:bold;color:#000}span.task-board-date-overdue{color:#d90000;opacity:1.0}.task-board .task-score{font-weight:bold}.task-board-age{display:inline-block;font-size:.9em}span.task-board-age-total{border:#666 1px solid;padding:1px 3px 1px 3px;border-top-left-radius:3px;border-bottom-left-radius:3px}span.task-board-age-column{border:#666 1px solid;border-left:0;margin-left:-5px;padding:1px 3px 1px 3px;border-top-right-radius:3px;border-bottom-right-radius:3px}#task-summary{margin-bottom:15px}#task-summary h2{color:#666;font-size:2.5em;margin-top:0;padding-top:0}.task-summary-buttons{margin-top:10px;font-size:.85em}.task-summary-container{border:2px solid #000;border-radius:8px;padding:15px;display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;justify-content:space-between}.task-summary-column{font-size:.9em;color:#666}.task-summary-column span{color:#555}.task-summary-column li{line-height:23px}.task-show-title{border:2px solid #000;border-radius:8px;margin-bottom:20px}.task-show-title h2{color:#555;font-size:1.8em;margin:0;padding:8px}.task-link-closed{text-decoration:line-through}.flag-milestone{color:green}.color-picker{min-height:35px}.color-square{display:inline-block;width:30px;height:30px;margin-right:5px;margin-bottom:5px;border:1px solid #000;cursor:pointer}.color-square:hover{border-style:dotted}div.color-square-selected{border-width:2px;width:28px;height:28px;box-shadow:3px 2px 10px 0 rgba(180,180,180,0.9)}.assign-me{font-size:.8em;vertical-align:bottom}.comment-sorting{text-align:right;font-size:.5em}.comment-sorting a{color:#555;font-weight:normal;text-decoration:none}.comment-sorting a:hover{color:#aaa}.comment{padding:5px;margin-bottom:15px}.comment:hover{background:#fafafa}.comment-title{border-bottom:1px dotted #eee;margin-left:55px;margin-bottom:10px}.comment-username{font-weight:bold;font-size:1.1em}.comment-date{color:#999;font-size:.7em;font-weight:200}.comment-actions{font-size:.8em;margin-left:55px;margin-top:8px}.comment-actions li{display:inline}.comment-actions a{color:#999;text-decoration:none}.comment-actions a:focus,.comment-actions a:hover{color:#333;text-decoration:underline}.comment-content{margin-left:55px}.subtasks-table{font-size:.85em}.subtasks-table td{vertical-align:middle}.task-links-table{font-size:.85em}.task-links-table td{vertical-align:middle}.task-links-task-count{color:#999}div.CodeMirror,div.CodeMirror-scroll{max-height:250px;min-height:200px}.markdown-editor-small div.CodeMirror,.markdown-editor-small div.CodeMirror-scroll{min-height:100px;max-height:180px}.form-column div.CodeMirror{margin-bottom:10px}.markdown{line-height:1.4em}.markdown h1{margin-top:5px;margin-bottom:10px;font-size:1.5em;font-weight:bold;text-decoration:underline}.markdown h2{font-size:1.2em;font-weight:bold;text-decoration:underline}.markdown h3{font-size:1.1em;text-decoration:underline}.markdown h4{font-size:1.1em;text-decoration:underline}.markdown p{margin-bottom:10px}.markdown ol,.markdown ul{margin-left:25px;margin-top:10px;margin-bottom:10px}.markdown pre{background:#fbfbfb;padding:10px;border-radius:5px;border:1px solid #ddd;overflow:auto;color:#444}.markdown blockquote{font-style:italic;border-left:3px solid #ddd;padding-left:10px;margin-bottom:10px;margin-left:20px}.markdown img{display:block;max-width:80%;margin-top:10px}.documentation{margin:0 auto;padding:20px;max-width:850px;background:#fefefe;border:1px solid #ccc;border-radius:5px;font-size:1.1em;color:#555}.documentation img{border:1px solid #333}.documentation h1{text-decoration:none;font-size:1.8em;margin-bottom:30px}.documentation h2{font-size:1.3em;text-decoration:none;border-bottom:1px solid #ccc;margin-bottom:25px}.documentation li{line-height:30px}.user-mention-link{font-weight:bold;color:#000;text-decoration:none}.user-mention-link:hover{color:#555}.listing{border-radius:4px;padding:8px 35px 8px 14px;margin-bottom:20px;border:1px solid #ddd;color:#333;background-color:#fcfcfc;overflow:auto}.listing li{list-style-type:square;margin-left:20px;margin-bottom:3px}.listing ul{margin-top:15px;margin-bottom:15px}.activity-event{margin-bottom:15px;padding:10px}.activity-event:hover{background:#fafafa}.activity-date{margin-left:10px;font-weight:normal;color:#999;font-size:.8em}.activity-content{margin-left:55px}.activity-title{font-weight:bold;color:#000;border-bottom:1px dotted #efefef}.activity-description{font-size:.95em;color:#555;margin-top:10px}.activity-description li{list-style-type:circle}.activity-description ul{margin-top:10px;margin-left:20px}.dashboard-project-stats span{font-size:.75em;margin-right:10px;color:#999}.dashboard-project-stats strong{font-size:1.2em}.dashboard-table-link{font-weight:bold;color:#444;text-decoration:none}.dashboard-table-link:focus,.dashboard-table-link:hover{color:#999}.pagination{text-align:center}.pagination-next{margin-left:5px}.pagination-previous{margin-right:5px}#popover-container{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.8);overflow:auto;z-index:100}#popover-content{position:absolute;width:70%;left:15%;top:1%;padding:15px;background:#fff;overflow:auto;max-height:90%}#main .confirm{max-width:700px;font-size:1.1em}.sidebar-container{margin-top:10px;height:100%;width:100%;display:-ms-flexbox;display:-webkit-box;display:-moz-box;display:-ms-box;display:box;-ms-flex-direction:row;-webkit-box-orient:horizontal;-moz-box-orient:horizontal;-ms-box-orient:horizontal;box-orient:horizontal}.sidebar-content{padding-left:10px;-ms-flex:1;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;box-flex:1}.sidebar{padding-right:10px;border-right:1px dotted #eee;font-size:.95em;max-width:240px;min-width:190px;width:18%;-ms-flex:0 100px;-webkit-box-flex:0;-moz-box-flex:0;-ms-box-flex:0;box-flex:0}.sidebar h2{margin-top:0}.sidebar a{text-decoration:none;color:#999;font-weight:300}.sidebar a:hover{color:#333}.sidebar li{list-style-type:none;line-height:35px;border-bottom:1px dotted #efefef;padding-left:13px}.sidebar li:hover{border-left:5px solid #555;padding-left:8px}.sidebar li.active{border-left:5px solid #333;padding-left:8px}.sidebar li.active a{color:#333;font-weight:bold}.sidebar-icons li{padding-left:0}.sidebar-icons li:hover,.sidebar-icons li.active{padding-left:0;border-left:0}.sidebar li.active a:focus,.sidebar li.active a:hover{color:#555}.sidebar li:last-child{margin-bottom:15px}@media only screen and (max-width:1024px){body{font-size:.85em}.form-tab{max-width:404px}.form-inline-group input[type="submit"],.form-inline-group label{display:block}.form-inline-group input[type="submit"]{margin-top:20px}td>input[type="text"]{max-width:150px}.page-header .form-input-large{width:300px}}@media only screen and (max-width:1024px) and (orientation:landscape){header{padding-bottom:4px}div.chosen-container{font-size:.9em}input[type="number"],input[type="date"],input[type="email"],input[type="password"],input[type="text"]{height:18px}.page-header .form-input-large{width:300px}}@media only screen and (max-width:640px){.hide-mobile{display:none}}.dropdown{display:inline;position:relative}.dropdown ul{display:none}ul.dropdown-submenu-open{display:block;position:absolute;z-index:1000;min-width:285px;list-style:none;margin:3px 0 0 1px;padding:6px 0;background-color:#fff;border:1px solid #b2b2b2;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,0.15)}.textarea-dropdown li,.dropdown-submenu-open li{display:block;margin:0;padding:0;padding-left:10px;padding-right:10px;padding-top:8px;padding-bottom:8px;font-size:.85em;border-bottom:1px solid #f8f8f8;cursor:pointer}.dropdown-submenu-open li.no-hover{cursor:default}.textarea-dropdown li:last-child,.dropdown-submenu-open li:last-child{border:0}.textarea-dropdown .active,.textarea-dropdown li:hover,.dropdown-submenu-open li:not(.no-hover):hover{background:#4078c0;color:#fff}.textarea-dropdown .active a,.textarea-dropdown li:hover a,.dropdown-submenu-open li:hover a{color:#fff}.textarea-dropdown a,.dropdown-submenu-open a{text-decoration:none;color:#333}.dropdown-submenu-open a:focus{text-decoration:underline}.page-header .dropdown{padding-right:10px}.dropdown-menu-link-text,.dropdown-menu-link-icon{color:#333;text-decoration:none}.dropdown-menu-link-text:hover{text-decoration:underline}.textarea-dropdown{list-style:none;margin:3px 0 0 1px;padding:6px 0;background-color:#fff;border:1px solid #b2b2b2;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,0.15)}#file-dropzone,#screenshot-zone{position:relative;border:2px dashed #ccc;width:99%;height:250px;overflow:auto}#file-dropzone-inner,#screenshot-inner{position:absolute;left:0;bottom:48%;width:100%;text-align:center;color:#aaa}#screenshot-zone.screenshot-pasted{border:2px solid #333}#file-list{margin:20px}#file-list li{list-style-type:none;padding-top:8px;padding-bottom:8px;border-bottom:1px dotted #ddd;width:95%}#file-list li.file-error{font-weight:bold;color:#b94a48}.project-header{margin-top:8px;margin-bottom:20px}.action-menu{color:#333;text-decoration:none}.action-menu:hover,.action-menu:focus{text-decoration:underline}.filter-box{display:inline-block;position:relative;font-size:0;margin-bottom:20px}.project-header .filter-box{margin:0}.filter-box form{margin:0}.filter-box input[type="text"]{margin:0;font-size:16px;height:26px;border-color:#ddd;border-top-left-radius:5px;border-bottom-left-radius:5px;vertical-align:top}.filter-box input[type="text"]:focus{color:#000;border-color:rgba(82,168,236,0.8);outline:0;box-shadow:0 0 8px rgba(82,168,236,0.6)}.filter-box div.dropdown{background:#fafafa;display:inline-block;font-size:16px;border:1px solid #ddd;border-left:0;margin:0;padding:0;padding-left:5px;padding-right:8px;height:27px}.filter-box div.dropdown:last-child{border-top-right-radius:5px;border-bottom-right-radius:5px}.filter-box div.dropdown a{line-height:27px}div.ganttview-hzheader-month,div.ganttview-hzheader-day,div.ganttview-vtheader,div.ganttview-vtheader-item-name,div.ganttview-vtheader-series,div.ganttview-grid,div.ganttview-grid-row-cell{float:left}div.ganttview-hzheader-month,div.ganttview-hzheader-day{text-align:center}div.ganttview-grid-row-cell.last,div.ganttview-hzheader-day.last,div.ganttview-hzheader-month.last{border-right:0}div.ganttview{border:1px solid #999}div.ganttview-hzheader-month{width:60px;height:20px;border-right:1px solid #d0d0d0;line-height:20px;overflow:hidden}div.ganttview-hzheader-day{width:20px;height:20px;border-right:1px solid #f0f0f0;border-top:1px solid #d0d0d0;line-height:20px;color:#777}div.ganttview-vtheader{margin-top:41px;width:400px;overflow:hidden;background-color:#fff}div.ganttview-vtheader-item{color:#666}div.ganttview-vtheader-series-name{width:400px;height:31px;line-height:31px;padding-left:3px;border-top:1px solid #d0d0d0;font-size:.9em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}div.ganttview-vtheader-series-name a{color:#666;text-decoration:none}div.ganttview-vtheader-series-name a:hover{color:#333;text-decoration:underline}div.ganttview-vtheader-series-name a i{color:#000}div.ganttview-vtheader-series-name a:hover i{color:#666}div.ganttview-slide-container{overflow:auto;border-left:1px solid #999}div.ganttview-grid-row-cell{width:20px;height:31px;border-right:1px solid #f0f0f0;border-top:1px solid #f0f0f0}div.ganttview-grid-row-cell.ganttview-weekend{background-color:#fafafa}div.ganttview-blocks{margin-top:40px}div.ganttview-block-container{height:28px;padding-top:4px}div.ganttview-block{position:relative;height:25px;background-color:#e5ecf9;border:1px solid silver;border-radius:3px}.ganttview-block-movable{cursor:move}div.ganttview-block-not-defined{border-color:#000;background-color:#000}div.ganttview-block-text{position:absolute;height:12px;font-size:.7em;color:#999;padding:2px 3px}div.ganttview-block div.ui-resizable-handle.ui-resizable-s{bottom:-0}.project-creation-options{max-width:500px;border-left:3px dotted #efefef;margin-top:20px;padding-left:15px;padding-bottom:5px;padding-top:5px}.project-overview-columns{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;margin-bottom:20px;font-size:1.4em}.project-overview-column{text-align:center;margin-right:80px;padding:3px 15px 3px 15px;border:1px dashed #ddd;border-radius:8px}.project-overview-column strong{font-size:1.3em;color:#444}.project-overview-column span{font-size:.8em;color:#777}.file-thumbnails{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:flex-start;justify-content:flex-start}.file-thumbnail{width:250px;border:1px solid #efefef;border-radius:5px;margin-bottom:20px;box-shadow:4px 2px 10px -6px rgba(0,0,0,0.55);margin-right:15px}.file-thumbnail img{border-top-left-radius:5px;border-top-right-radius:5px}.file-thumbnail img:hover{opacity:.5}.file-thumbnail-content{padding-left:8px;padding-right:8px}.file-thumbnail-title{font-weight:700;font-size:.9em;color:#555}.file-thumbnail-description{font-size:.8em;color:#aaa;margin-top:8px;margin-bottom:5px}.file-viewer{position:relative}.file-viewer img{max-width:95%;max-height:85%;margin-top:10px}.views{display:inline-block;margin-left:10px;margin-right:10px;font-size:.9em}.views li{background:#fafafa;border-left:1px solid #ddd;border-top:1px solid #ddd;border-bottom:1px solid #ddd;padding-left:8px;padding-right:8px;padding-top:5px;padding-bottom:5px;display:inline}.views a{color:#555;text-decoration:none}.views a:hover{color:#333;text-decoration:underline}.menu-inline li.active a,.views li.active a{font-weight:bold;color:#000;text-decoration:none}.views li:first-child{border-top-left-radius:5px;border-bottom-left-radius:5px}.views li:last-child{border-right:1px solid #ddd;border-top-right-radius:5px;border-bottom-right-radius:5px}.accordion-title{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEQ5RDgxQzc2RjQ5MTFFMjhEMUNENzFGRUMwRjhBRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEQ5RDgxQzg2RjQ5MTFFMjhEMUNENzFGRUMwRjhBRTciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RDlEODFDNTZGNDkxMUUyOEQxQ0Q3MUZFQzBGOEFFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RDlEODFDNjZGNDkxMUUyOEQxQ0Q3MUZFQzBGOEFFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvXFWFAAAAAYSURBVHjaYvj//z8D0/Pnz/8zgFgAAQYAS5UJscReGMIAAAAASUVORK5CYII=) repeat-x scroll 0 10px}.accordion-title h3{display:inline;padding-right:5px;background:#fff}.accordion-content{margin-top:15px;margin-bottom:25px}.accordion-toggle{color:#333;text-decoration:none}.accordion-toggle:focus,.accordion-toggle:hover{color:#999}.accordion-toggle:before{content:"\f0d7"}.accordion-collapsed .accordion-toggle:before{content:"\f0da"}.accordion-collapsed{margin-bottom:25px}.accordion-collapsed .accordion-content{display:none}.avatar img{vertical-align:bottom}.avatar-left{float:left;margin-right:10px}.avatar-inline{display:inline-block;margin-right:3px}.avatar-48 img,.avatar-48 div{border-radius:30px}.avatar-48 .avatar-letter{line-height:48px;width:48px;font-size:25px}.avatar-20 img,.avatar-20 div{border-radius:10px}.avatar-20 .avatar-letter{line-height:20px;width:20px;font-size:11px}.avatar-letter{color:#fff;text-align:center} \ No newline at end of file diff --git a/sources/assets/css/app.min.css b/sources/assets/css/app.min.css new file mode 100644 index 0000000..88acd0a --- /dev/null +++ b/sources/assets/css/app.min.css @@ -0,0 +1 @@ +a:focus,a:hover,th a{text-decoration:none}h3,label{margin-top:10px}.tooltip-arrow.bottom:after,.tooltip-arrow.top{top:-10px}.form-errors,.ui-tooltip li,ul.no-bullet li{list-style-type:none}.table-fixed td,.table-fixed th,.tooltip-arrow,header h1{overflow:hidden}#board td,td{vertical-align:top}.table-fixed td,.task-board-collapsed,div.ganttview-vtheader-series-name,header h1{text-overflow:ellipsis;white-space:nowrap}blockquote,body,li,ol,p,table,td,th,tr,ul{margin:0;padding:0;font-size:100%}form,table{margin-bottom:20px}body{margin-left:10px;margin-right:10px;padding-bottom:10px;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;text-rendering:optimizeLegibility}.page{clear:both}ul.no-bullet li{margin-left:0}.pull-right{text-align:right}hr{border:0;height:0;border-top:1px solid rgba(0,0,0,.1);border-bottom:1px solid rgba(255,255,255,.3)}.chosen-select{min-height:27px}#ui-datepicker-div{font-size:.8em}#app-loading-icon{position:fixed;right:3px;bottom:3px}.web-notification-icon{color:#36C}.web-notification-icon:focus,.web-notification-icon:hover{color:#000}a:hover,h1,h2,h3,th a{color:#333}.smaller{font-size:.85em}a{color:#36C;border:none}a:focus{outline:0;color:#DF5353;border:1px dotted #aaa}h1,h2,h3{font-weight:400}h2{font-size:1.3em;margin-bottom:10px}h3{font-size:1.2em}table{width:100%;border-collapse:collapse;border-spacing:0;font-size:.95em}#calendar table{margin-bottom:0}td,th{border:1px solid #eee;padding:.5em 3px}th{background:#fbfbfb;text-align:left}td li{margin-left:20px}.table-small{font-size:.8em}th a:focus,th a:hover{text-decoration:underline}.page-header h2 a,a.btn,header a{text-decoration:none}.table-fixed{table-layout:fixed;white-space:nowrap}.table-stripped tr:nth-child(odd){background:#fefefe}.column-3{width:3%}.column-5{width:5%}.column-8{width:7.5%}.column-10{width:10%}.column-12{width:12%}.column-15{width:15%}.column-18{width:18%}.column-20{width:20%}.column-25{width:25%}.column-30{width:30%}.column-35{width:35%}.column-40{width:40%}.column-50{width:50%}.column-60{width:60%}.column-70,.column-80{width:70%}.draggable-row-handle{cursor:move;color:#dedede}.btn,.draggable-item,.task-board-change-assignee,label{cursor:pointer}.draggable-row-handle:hover{color:#333}tr.draggable-item-selected{background:#fff;border:2px solid #666;box-shadow:4px 2px 10px -4px rgba(0,0,0,.55)}tr.draggable-item-selected td{border-top:none;border-bottom:none}tr.draggable-item-selected td:first-child{border-left:none}tr.draggable-item-selected td:last-child{border-right:none}.table-stripped tr.draggable-item-hover,tr.draggable-item-hover{background:#FEFFF2}label{display:block}input[type=number],input[type=date],input[type=email],input[type=password],input[type=text]{color:#888;border:1px solid #ccc;width:300px;max-width:95%;font-size:100%;height:25px;padding-bottom:0;font-family:sans-serif;margin-top:10px;-webkit-appearance:none;appearance:none}input[type=number]:focus,input[type=date]:focus,input[type=email]:focus,input[type=password]:focus,input[type=text]:focus,textarea:focus{color:#000;border-color:rgba(82,168,236,.8);outline:0;box-shadow:0 0 8px rgba(82,168,236,.6)}input.form-numeric,input[type=number]{width:70px}.tag-autocomplete,textarea{width:400px}textarea{border:1px solid #ccc;max-width:99%;height:200px;font-size:100%;font-family:sans-serif}select{max-width:95%}select:focus{outline:0}span.select2-container{margin-top:2px}::-webkit-input-placeholder{color:#ddd;padding-top:2px}::-ms-input-placeholder{color:#ddd;padding-top:2px}::-moz-placeholder{color:#ddd;padding-top:2px}.form-actions{padding-top:20px;clear:both}input.form-error,textarea.form-error{border:2px solid #b94a48}input.form-error:focus,textarea.form-error:focus{box-shadow:none;border:2px solid #b94a48}.form-required{color:red;padding-left:5px;font-weight:700}.form-errors{color:#b94a48}ul.form-errors li{margin-left:0}.form-help{font-size:.8em;color:brown;margin-bottom:15px}.form-inline{padding:0;margin:0;border:none}.form-inline label{display:inline}.form-inline input,.form-inline select{margin:0 15px 0 0}.form-inline .form-required{display:none}.form-inline-group{display:inline}input.form-date,input.form-datetime{width:150px}input.form-input-large{width:400px}input.form-input-small{width:150px}.form-columns{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row}.form-column{margin-right:25px}.form-login{width:350px;margin:8% auto 0}.form-login li{margin-left:25px;line-height:25px}.form-login h2{margin-bottom:30px;font-size:1.5em;font-weight:700}.popover-form{margin-bottom:0}.reset-password{margin-top:20px}.reset-password a{font-size:.8em;color:#999}.btn{font-size:1.1em;font-weight:400;-webkit-appearance:none;appearance:none;display:inline-block;color:#333;background:#f5f5f5;border:1px solid #ddd;border-radius:2px;padding:3px 10px;margin:0}.btn:hover{border:1px solid #bbb;color:#000;background:#fafafa}.btn-red{border-color:#b0281a;background:#d14836;color:#fff}.btn-red:focus,.btn-red:hover{color:#fff;background:#c53727}.btn-blue{border-color:#3079ed;background:#4d90fe;color:#fff}.btn-blue:focus,.btn-blue:hover{border-color:#2f5bb7;background:#357ae8;color:#fff}.btn:disabled{color:#ccc;border:1px solid #ccc;background:#f7f7f7}.buttons-header{font-size:.9em;margin-bottom:15px}.alert{padding:8px 35px 8px 14px;margin-top:5px;margin-bottom:5px;color:#c09853;background-color:#fcf8e3;border:1px solid #fbeed5;border-radius:4px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-normal{color:#333;background-color:#f0f0f0;border-color:#ddd}.alert ul{margin-top:10px;margin-bottom:10px}.alert-fade-out,.ui-tooltip-content .markdown p{margin-bottom:0}.alert li{margin-left:25px}.alert-fade-out{text-align:center;position:fixed;bottom:0;left:20%;width:60%;padding-top:5px;padding-bottom:5px;border-width:1px 0 0;border-radius:4px 4px 0 0;z-index:9999}.tooltip-arrow.bottom,.tooltip-arrow.top:after{bottom:-10px}div.ui-tooltip{min-width:200px;max-width:600px;font-size:.85em}.tooltip-arrow{width:20px;height:10px;position:absolute}.tooltip-arrow.align-left{left:10px}.tooltip-arrow.align-right{right:10px}.tooltip-arrow:after{background:#fff;border:1px solid #aaa;box-shadow:0 0 5px #aaa;content:"";position:absolute;width:14px;height:14px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.textarea-dropdown,ul.dropdown-submenu-open{list-style:none;box-shadow:0 1px 3px rgba(0,0,0,.15)}.tooltip-arrow.align-left:after{left:0}.tooltip-arrow.align-right:after{right:0}.tooltip-large{width:600px}.tooltip .fa-info-circle{color:#999;font-size:.95em}header{margin-top:10px;padding-bottom:10px;border-bottom:1px solid #dedede}header h1{margin:0;padding:0;max-width:70%;float:left}header ul{text-align:right;font-size:.9em}header li{display:inline;padding-left:30px}header a{color:#333}header a:hover{color:#666}nav .active a{color:#333;font-weight:700}.logo a{opacity:.5;color:#d40000}.logo span{color:#333}.logo a:hover{opacity:.8;color:#333}.logo a:focus span,.logo a:hover span{color:#d40000}header .user-links .dropdown{margin-left:15px}header h1 .tooltip{opacity:.3;font-size:.6em}.page-header{margin-bottom:20px}.page-header h2{margin:0;padding:0;font-size:1.4em;font-weight:700;border-bottom:1px dotted #ccc}.page-header h2 a{color:#333}.page-header h2 a:focus,.page-header h2 a:hover{color:#aaa}.page-header ul{text-align:left;margin-top:5px;display:inline-block}.menu-inline li,.page-header li{display:inline;padding-right:15px;font-size:.95em}.page-header li.active a{color:#333;text-decoration:none;font-weight:700}.page-header li.active a:focus,.page-header li.active a:hover{text-decoration:underline}.menu-inline{margin-bottom:5px}.public-board{margin-top:5px}.public-task{max-width:800px;margin:5px auto 0}#board-container{overflow-x:auto}#board{table-layout:fixed;margin-bottom:0}#board th.board-column-header{width:240px}.board-container-compact{overflow-x:initial}@media all and (-ms-high-contrast:active),(-ms-high-contrast:none){.board-container-compact #board{table-layout:auto}}#board th.board-column-header.board-column-compact{width:initial}.board-column-collapsed{display:none}td.board-column-task-collapsed{font-weight:700;background-color:#fbfbfb}#board th.board-column-header-collapsed{width:28px;min-width:28px;text-align:center;overflow:hidden}.board-rotation-wrapper{position:relative;padding:8px 4px;min-height:150px;overflow:hidden}.board-rotation{white-space:nowrap;-webkit-backface-visibility:hidden;-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);-webkit-transform-origin:0 100%;-moz-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.board-column-title .dropdown-menu{text-decoration:none}.board-add-icon{float:left;padding:0 5px}.board-add-icon a{text-decoration:none;color:#36C;font-size:150%;line-height:70%}.board-add-icon a:focus,.board-add-icon a:hover{text-decoration:none;color:red}.board-column-header-task-count{color:#999;font-weight:400}th.board-column-header-collapsed .board-column-header-task-count{font-size:.85em}a.board-swimlane-toggle{font-size:.95em;text-decoration:none}a.board-swimlane-toggle:focus,a.board-swimlane-toggle:hover{color:#000;text-decoration:none;border:none}.board-task-list{overflow:auto;min-height:60px}.board-task-list-limit{background-color:#DF5353}.draggable-item{user-select:none;-webkit-user-select:none;-moz-user-select:none}.draggable-placeholder{border:2px dashed #000;background:#fafafa;height:70px;margin-bottom:10px}.task-board,div.draggable-item-selected{border:1px solid #000}.task-board-sort-handle{float:left;padding-right:5px}.task-table .dropdown-menu{color:#000;text-decoration:none;font-weight:700}.task-table .dropdown-menu:focus,.task-table .dropdown-menu:hover{text-decoration:underline}td.task-table a{color:#000;text-decoration:none}td.task-table a:hover{text-decoration:underline}.task-board{position:relative;margin-bottom:4px;padding:2px;font-size:.85em;word-wrap:break-word}div.task-board-recent{border-width:2px}div.task-board-status-closed{user-select:none;border:1px dotted #555}.task-board a{color:#000;text-decoration:none}.task-board .dropdown-menu{font-weight:700}.task-board-collapsed{overflow:hidden}.task-board-saving-state{opacity:.3}.task-board-category:hover,.task-board-change-assignee:hover{opacity:.6}.task-board-saving-icon{position:absolute;margin:auto;width:100%;text-align:center;color:#000}.task-board-title{font-size:1.15em;margin-top:5px;margin-bottom:8px}.task-board-title a:hover{text-decoration:underline}.task-board-category-container{text-align:right;margin-top:8px;margin-bottom:8px}.task-board-category{font-weight:500;color:#000;border:1px solid #555;padding:1px 2px;border-radius:4px}.task-tags li{display:inline;margin:0 4px 0 0;padding:2px;color:#666;border:1px solid #666;border-radius:2px}.task-summary-container .task-tags{margin-top:10px}.task-board-avatars{text-align:right;float:right}.file-thumbnail img:hover,.task-board-icons a{opacity:.5}.task-board-icons{text-align:right;margin-top:4px;margin-bottom:2px}.task-board-icons span{opacity:.5;margin-left:2px}.task-board-icons a:hover,.task-board-icons span:hover{opacity:1}.task-board-date{font-weight:700;color:#000}span.task-board-date-today{color:#0000D9;opacity:1}span.task-board-date-overdue{color:#D90000;opacity:1}.task-board .task-score{font-weight:700}.task-board-age{display:inline-block;font-size:.9em}.project-overview-columns,.task-summary-columns{display:-webkit-flex;-webkit-flex-direction:row}span.task-board-age-total{border:1px solid #666;padding:1px 3px;border-top-left-radius:3px;border-bottom-left-radius:3px}span.task-board-age-column{border:1px solid #666;border-left:none;margin-left:-5px;padding:1px 3px;border-top-right-radius:3px;border-bottom-right-radius:3px}#task-summary{margin-bottom:15px}#task-summary h2{color:#666;font-size:2.5em;margin-top:0;padding-top:0}.task-summary-buttons{margin-top:10px;font-size:.85em}.task-summary-container{border:2px solid #000;border-radius:8px;padding:15px}.task-summary-columns{display:flex;flex-direction:row;-webkit-justify-content:space-between;justify-content:space-between}.task-summary-column{font-size:.9em;color:#666}.task-summary-column span{color:#555}.task-summary-column li{line-height:23px}.task-show-title{border:2px solid #000;border-radius:8px;margin-bottom:20px}.task-show-title h2{color:#555;font-size:1.8em;margin:0;padding:8px}.comment-actions,.comment-content,.comment-title{margin-left:55px}.task-link-closed{text-decoration:line-through}.flag-milestone{color:green}.color-picker{width:180px}.color-picker-option{height:25px}.color-picker-square{display:inline-block;width:18px;height:18px;margin-right:5px;border:1px solid #000}.color-picker-label{display:inline-block;vertical-align:bottom;padding-bottom:3px}#select2-form-color_id-results li.select2-results__option{padding:3px}.assign-me{font-size:.8em;vertical-align:bottom}.subtasks-table td,.task-links-table td{vertical-align:middle}.comment-sorting{text-align:right;font-size:.5em}.avatar-letter,.pagination,.project-overview-column,div.ganttview-hzheader-day,div.ganttview-hzheader-month{text-align:center}.comment-sorting a{color:#555;font-weight:400;text-decoration:none}.comment-sorting a:hover{color:#aaa}.comment{padding:5px;margin-bottom:15px}.comment-title,.form-column div.CodeMirror,.markdown blockquote,.markdown h1,.markdown p{margin-bottom:10px}.comment:hover{background:#fafafa}.comment-title{border-bottom:1px dotted #eee}.comment-username{font-weight:700;font-size:1.1em}.comment-date{color:#999;font-size:.7em;font-weight:200}.comment-actions{font-size:.8em;margin-top:8px}.subtasks-table,.task-links-table{font-size:.85em}.comment-actions li{display:inline}.comment-actions a{color:#999;text-decoration:none}.markdown h1,.markdown h2,.markdown h3,.markdown h4{text-decoration:underline}.comment-actions a:focus,.comment-actions a:hover{color:#333;text-decoration:underline}.task-links-task-count{color:#999}div.CodeMirror,div.CodeMirror-scroll{max-height:250px;min-height:200px}.markdown-editor-small div.CodeMirror,.markdown-editor-small div.CodeMirror-scroll{min-height:100px;max-height:180px}.markdown{line-height:1.4em}.markdown h1{margin-top:5px;font-size:1.5em;font-weight:700}.markdown h2{font-size:1.2em;font-weight:700}.markdown h3,.markdown h4{font-size:1.1em}.markdown ol,.markdown ul{margin-left:25px;margin-top:10px;margin-bottom:10px}.markdown pre{background:#fbfbfb;padding:10px;border-radius:5px;border:1px solid #ddd;overflow:auto;color:#444}.markdown blockquote{font-style:italic;border-left:3px solid #ddd;padding-left:10px;margin-left:20px}.markdown img{display:block;max-width:80%;margin-top:10px}.documentation{margin:0 auto;padding:20px;max-width:850px;background:#fefefe;border:1px solid #ccc;border-radius:5px;font-size:1.1em;color:#555}.documentation img{border:1px solid #333}.documentation h1{text-decoration:none;font-size:1.8em;margin-bottom:30px}.documentation h2{font-size:1.3em;text-decoration:none;border-bottom:1px solid #ccc;margin-bottom:25px}.documentation li{line-height:30px}.user-mention-link{font-weight:700;color:#000;text-decoration:none}.user-mention-link:hover{color:#555}.listing{border-radius:4px;padding:8px 35px 8px 14px;margin-bottom:20px;border:1px solid #ddd;color:#333;background-color:#fcfcfc;overflow:auto}.activity-title,.sidebar>ul li{border-bottom:1px dotted #efefef}.listing li{list-style-type:square;margin-left:20px;margin-bottom:3px}.activity-event,.listing ul,.sidebar>ul li:last-child{margin-bottom:15px}.listing ul{margin-top:15px}.activity-event{padding:10px}.activity-event:hover{background:#fafafa}.activity-date{margin-left:10px;font-weight:400;color:#999;font-size:.8em}.activity-content{margin-left:55px}.activity-title{font-weight:700;color:#000}.activity-description{font-size:.95em;color:#555;margin-top:10px}.activity-description li{list-style-type:circle}.activity-description ul{margin-top:10px;margin-left:20px}.dashboard-project-stats span{font-size:.75em;margin-right:10px;color:#999}.dashboard-project-stats strong{font-size:1.2em}.dashboard-table-link{font-weight:700;color:#444;text-decoration:none}.dashboard-table-link:focus,.dashboard-table-link:hover{color:#999}.pagination-next{margin-left:5px}.pagination-previous{margin-right:5px}#popover-container{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,.8);overflow:auto;z-index:100}#popover-content{position:absolute;width:70%;left:15%;top:1%;padding:15px;background:#fff;overflow:auto;max-height:90%}#main .confirm{max-width:700px;font-size:1.1em}.sidebar-container{margin-top:10px;height:100%;width:100%;display:-ms-flexbox;display:-webkit-box;display:-moz-box;display:-ms-box;display:box;-ms-flex-direction:row;-webkit-box-orient:horizontal;-moz-box-orient:horizontal;-ms-box-orient:horizontal;box-orient:horizontal}.sidebar-content{padding-left:10px;-ms-flex:1;-webkit-box-flex:1;-moz-box-flex:1;-ms-box-flex:1;box-flex:1}.sidebar{padding-right:10px;border-right:1px dotted #eee;font-size:.95em;max-width:240px;min-width:190px;width:18%;-ms-flex:0 100px;-webkit-box-flex:0;-moz-box-flex:0;-ms-box-flex:0;box-flex:0}.sidebar h2{margin-top:0}.sidebar>ul a{text-decoration:none;color:#999;font-weight:300}.sidebar>ul a:hover{color:#333}.sidebar>ul li{list-style-type:none;line-height:35px;padding-left:13px}.sidebar>ul li:hover{border-left:5px solid #555;padding-left:8px}.sidebar>ul li.active{border-left:5px solid #333;padding-left:8px}.sidebar>ul li.active a{color:#333;font-weight:700}.sidebar-icons>ul li{padding-left:0}.sidebar-icons>ul li.active,.sidebar-icons>ul li:hover{padding-left:0;border-left:none}.sidebar>ul li.active a:focus,.sidebar>ul li.active a:hover{color:#555}@media only screen and (max-width:1024px){body{font-size:.85em}.form-tab{max-width:404px}.form-inline-group input[type=submit],.form-inline-group label{display:block}.form-inline-group input[type=submit]{margin-top:20px}td>input[type=text]{max-width:150px}.page-header .form-input-large{width:300px}}@media only screen and (max-width:1024px) and (orientation:landscape){header{padding-bottom:4px}div.chosen-container{font-size:.9em}input[type=number],input[type=date],input[type=email],input[type=password],input[type=text]{height:18px}.page-header .form-input-large{width:300px}}@media only screen and (max-width:640px){.hide-mobile{display:none}}.dropdown{display:inline;position:relative}.dropdown ul{display:none}ul.dropdown-submenu-open{display:block;position:absolute;z-index:1000;min-width:285px;margin:3px 0 0 1px;padding:6px 0;background-color:#fff;border:1px solid #b2b2b2;border-radius:3px}.dropdown-submenu-open li,.textarea-dropdown li{display:block;margin:0;padding:8px 10px;font-size:.85em;border-bottom:1px solid #f8f8f8;cursor:pointer}.dropdown-submenu-open li.no-hover{cursor:default}.dropdown-submenu-open li:last-child,.textarea-dropdown li:last-child{border:none}.dropdown-submenu-open li:not(.no-hover):hover,.textarea-dropdown .active,.textarea-dropdown li:hover{background:#4078C0;color:#fff}.dropdown-submenu-open li:hover a,.textarea-dropdown .active a,.textarea-dropdown li:hover a{color:#fff}.dropdown-submenu-open a,.textarea-dropdown a{text-decoration:none;color:#333}.dropdown-submenu-open a:focus{text-decoration:underline}.page-header .dropdown{padding-right:10px}.dropdown-menu-link-icon,.dropdown-menu-link-text{color:#333;text-decoration:none}.dropdown-menu-link-text:hover{text-decoration:underline}.textarea-dropdown{margin:3px 0 0 1px;padding:6px 0;background-color:#fff;border:1px solid #b2b2b2;border-radius:3px}#file-dropzone,#screenshot-zone{position:relative;border:2px dashed #ccc;width:99%;height:250px;overflow:auto}#file-dropzone-inner,#screenshot-inner{position:absolute;left:0;bottom:48%;width:100%;text-align:center;color:#aaa}#screenshot-zone.screenshot-pasted{border:2px solid #333}#file-list{margin:20px}#file-list li{list-style-type:none;padding-top:8px;padding-bottom:8px;border-bottom:1px dotted #ddd;width:95%}#file-list li.file-error{font-weight:700;color:#b94a48}.project-header{margin-top:8px;margin-bottom:20px}.action-menu{color:#333;text-decoration:none}.action-menu:focus,.action-menu:hover{text-decoration:underline}.filter-box{display:inline-block;position:relative;font-size:0;margin-bottom:20px}.filter-box form,.project-header .filter-box{margin:0}.filter-box input[type=text]{margin:0;font-size:16px;height:26px;border-color:#ddd;border-top-left-radius:5px;border-bottom-left-radius:5px;vertical-align:top}.filter-box input[type=text]:focus{color:#000;border-color:rgba(82,168,236,.8);outline:0;box-shadow:0 0 8px rgba(82,168,236,.6)}.filter-box div.dropdown{background:#fafafa;display:inline-block;font-size:16px;border:1px solid #ddd;border-left:none;margin:0;padding:0 8px 0 5px;height:27px}.filter-box div.dropdown:last-child{border-top-right-radius:5px;border-bottom-right-radius:5px}.filter-box div.dropdown a{line-height:27px}div.ganttview-grid,div.ganttview-grid-row-cell,div.ganttview-hzheader-day,div.ganttview-hzheader-month,div.ganttview-vtheader,div.ganttview-vtheader-item-name,div.ganttview-vtheader-series{float:left}div.ganttview-grid-row-cell.last,div.ganttview-hzheader-day.last,div.ganttview-hzheader-month.last{border-right:none}div.ganttview{border:1px solid #999}div.ganttview-hzheader-month{width:60px;height:20px;border-right:1px solid #d0d0d0;line-height:20px;overflow:hidden}div.ganttview-hzheader-day{width:20px;height:20px;border-right:1px solid #f0f0f0;border-top:1px solid #d0d0d0;line-height:20px;color:#777}div.ganttview-vtheader{margin-top:41px;width:400px;overflow:hidden;background-color:#fff}div.ganttview-vtheader-item{color:#666}div.ganttview-vtheader-series-name{width:400px;height:31px;line-height:31px;padding-left:3px;border-top:1px solid #d0d0d0;font-size:.9em;overflow:hidden}div.ganttview-vtheader-series-name a{color:#666;text-decoration:none}div.ganttview-vtheader-series-name a:hover{color:#333;text-decoration:underline}div.ganttview-vtheader-series-name a i{color:#000}div.ganttview-vtheader-series-name a:hover i{color:#666}div.ganttview-slide-container{overflow:auto;border-left:1px solid #999}div.ganttview-grid-row-cell{width:20px;height:31px;border-right:1px solid #f0f0f0;border-top:1px solid #f0f0f0}div.ganttview-grid-row-cell.ganttview-weekend{background-color:#fafafa}div.ganttview-blocks{margin-top:40px}div.ganttview-block-container{height:28px;padding-top:4px}div.ganttview-block{position:relative;height:25px;background-color:#E5ECF9;border:1px solid silver;border-radius:3px}.ganttview-block-movable{cursor:move}div.ganttview-block-not-defined{border-color:#000;background-color:#000}div.ganttview-block-text{position:absolute;height:12px;font-size:.7em;color:#999;padding:2px 3px}div.ganttview-block div.ui-resizable-handle.ui-resizable-s{bottom:0}.project-creation-options{max-width:500px;border-left:3px dotted #efefef;margin-top:20px;padding-left:15px;padding-bottom:5px;padding-top:5px}.project-overview-columns{display:flex;flex-direction:row;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;margin-bottom:20px;font-size:1.4em}.project-overview-column{margin-right:80px;padding:3px 15px;border:1px dashed #ddd;border-radius:8px}.project-overview-column strong{font-size:1.3em;color:#444}.project-overview-column span{font-size:.8em;color:#777}.file-thumbnails{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:flex-start;justify-content:flex-start}.file-thumbnail{width:250px;border:1px solid #efefef;border-radius:5px;margin-bottom:20px;box-shadow:4px 2px 10px -6px rgba(0,0,0,.55);margin-right:15px}.file-thumbnail img{border-top-left-radius:5px;border-top-right-radius:5px}.file-thumbnail-content{padding-left:8px;padding-right:8px}.file-thumbnail-title{font-weight:700;font-size:.9em;color:#555}.file-thumbnail-description{font-size:.8em;color:#aaa;margin-top:8px;margin-bottom:5px}.accordion-collapsed,.accordion-content{margin-bottom:25px}.file-viewer{position:relative}.file-viewer img{max-width:95%;max-height:85%;margin-top:10px}.views{display:inline-block;margin-left:10px;margin-right:10px;font-size:.9em}.views li{background:#fafafa;border-left:1px solid #ddd;border-top:1px solid #ddd;border-bottom:1px solid #ddd;display:inline;padding:5px 8px}.views a{color:#555;text-decoration:none}.views a:hover{color:#333;text-decoration:underline}.menu-inline li.active a,.views li.active a{font-weight:700;color:#000;text-decoration:none}.views li:first-child{border-top-left-radius:5px;border-bottom-left-radius:5px}.views li:last-child{border-right:1px solid #ddd;border-top-right-radius:5px;border-bottom-right-radius:5px}.accordion-title{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEQ5RDgxQzc2RjQ5MTFFMjhEMUNENzFGRUMwRjhBRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEQ5RDgxQzg2RjQ5MTFFMjhEMUNENzFGRUMwRjhBRTciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RDlEODFDNTZGNDkxMUUyOEQxQ0Q3MUZFQzBGOEFFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RDlEODFDNjZGNDkxMUUyOEQxQ0Q3MUZFQzBGOEFFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvXFWFAAAAAYSURBVHjaYvj//z8D0/Pnz/8zgFgAAQYAS5UJscReGMIAAAAASUVORK5CYII=) 0 10px repeat-x}.accordion-title h3{display:inline;padding-right:5px;background:#fff}.accordion-content{margin-top:15px}.accordion-toggle{color:#333;text-decoration:none}.accordion-toggle:focus,.accordion-toggle:hover{color:#999}.accordion-toggle:before{content:"\f0d7"}.accordion-collapsed .accordion-toggle:before{content:"\f0da"}.accordion-collapsed .accordion-content{display:none}.avatar img{vertical-align:bottom}.avatar-left{float:left;margin-right:10px}.avatar-inline{display:inline-block;margin-right:3px}.avatar-48 div,.avatar-48 img{border-radius:30px}.avatar-48 .avatar-letter{line-height:48px;width:48px;font-size:25px}.avatar-20 div,.avatar-20 img{border-radius:10px}.avatar-20 .avatar-letter{line-height:20px;width:20px;font-size:11px}.avatar-letter{color:#fff} \ No newline at end of file diff --git a/sources/assets/css/chosen-sprite.png b/sources/assets/css/chosen-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..c57da70b4b5b1e08a6977ddde182677af0e5e1b8 GIT binary patch literal 538 zcmV+#0_FXQP)cz2)-WJLkv8J@4bb5L`rsE?Kc|FrXHkKz)ov z76MHYM&Apx%05P7orE!>9=yZ~6O0^V?1%{=1UASqa<2Pgnk7fs!OIs9gh{NCN+@=) z>Gfttd5uq;oeR{%NHjtqV~jEQeY?tDff=(jqx>~SZ_e+iN26HR*`0Q!Re)~HD85p> zbL()Mw}bI^#`7wp0+cv&7*LhrtOmR)?PK>(-BeLm#jL5Jfogv-QS(TBnUb;))Krqm zD}uDDeVLNhm1G*pFB`O?iA=dnWBEpqHk8Yh%Qu45EIG=&F-dDmt|;|nN@|3lOkVZ7>z*~a1?_t?U)c+&|JFJke1`&0-a z#PjhRlg?=$KTo4|rU@NyV_fzDy@>h!lVyKShsO8>V>$xyIXRbHK%H~^Aaz=s$Jz^V zlb?KfaKdZqu3^#m$mintvgJ15@j`sb2Zr%69Sn=xN01Tm5r)NQanT=jhwm7zqj2>O cEB}D~0$b-QdD7|v=>Px#07*qoM6N<$g6AXnUH||9 literal 0 HcmV?d00001 diff --git a/sources/assets/css/chosen-sprite@2x.png b/sources/assets/css/chosen-sprite@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6b50545202cb4770039362c55025b0b9824663ad GIT binary patch literal 738 zcmV<80v-K{P)oJoIWh{eAG@xkM<0ryd(K3(} zP8JV&;uuIJ4nL%g8!wSG9E$P+3QVMGgj><+00}M5I5kMzaT<~M;uJ`UhLfbp9Ahdsrux5(g+(>Q*+9wU{AuYPH0}W_u4`|q(9c->{ zt>Jn|lbhH<_x5jU6prFi#S}&XMZ=~Y5VyC3+ZN%hXciz8 zPcLpJgbIK#a49e31-%wf2zh2F&&(Nq;AL%4zA(=QJRGq`sx3y3#0_cg9Fim739XTOu1NKKjlWs`52Q+3 Uja*K~(*OVf07*qoM6N<$g3mu-GXMYp literal 0 HcmV?d00001 diff --git a/sources/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/sources/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png index 583b407a825205bf24ac68da383794ba5a0c70bf..5b5dab2ab7b1c50dea9cfe73dc5a269a92d2d4b4 100644 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FscKIb$B>N1x91EQ4=4yQ7#`R^ z$vje}bP0l+XkK DSH>_4 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F1SA+{?>A)!QcOwS?k)_>#w|r1Kptm-M`SUO z_5fqIli7AahM1>|V~EA+ zRdP`(kYX@0Ff`RQu+TNI3^6dbGB&j`Fwr(Jure?ZzH1VNq9HdwB{QuOw}zyKo@YP} N44$rjF6*2UngDX$GhzS$ diff --git a/sources/assets/css/images/ui-bg_flat_75_ffffff_40x100.png b/sources/assets/css/images/ui-bg_flat_75_ffffff_40x100.png index 8492708236e57310545386d75b2a1f747f36e66b..ac8b229af950c29356abf64a6c4aa894575445f0 100644 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQYz+E8 zPo9&<{J;c_6SHRil>2s{Zw^OT)6@jj2u|u!(plXsM>LJD`vD!n;OXk;vd$@?2>^GI BH@yG= literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F2qYNp$opRhQcOwS?k)_Bce{j_0C}7R9+AaB z+5?Q;PG;Ky8A6^ejv*T7lYj6t@hpC#;TbB#aBAWwna#KLs)4eqC9V-ADTyViR>?)F zK#IZ0z|d6Jz(Uu+GQ_~#%GlJ(z(m`?z{K0(g)ZU`PeCcr`%fR literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fCnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12TF&T^vI^j=w#x$i?I+((tf;UXnmgbH|3oY>pC!)f}(GR!16S-u+#{ ze6YEqRkW=8vGl=5qArKM<9}TC-}iEvB{zdaTcX5$wyRTK&ALYGq)eZD3$! kU?6o$-w@N{tuvFLq!T9J=ILFDj-xA*^_(H7(EYB{rK$s(^q q9zmKpuobsI>TdAc};So9`We0p-SUX6{7tt~KViiB#L?#H*c%{96w wP84iTNJ?@_Q`~W*qw)J04MVRUp&J|w$CEklEcp455oiK~r>mdKI;Vst0MVl%`v3p{ literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&0LWmFTHNUZq?nSt-Ch3w7g=q17Rci)@Q5r1 z(jH*!b~4)z#PD=+46!(!T=8puqDZgOs>RXUCGx5b?-VBQkUm|IuXOmYJrBRJgj{Vx zMbNnqUkncy+qa2-mWYc>swkcIuvGK#>(0d)B7)5f`@$Ei28nH~0h*~=;u=wsl30>z zm0Xkxq!^403{7puobsI>Tdb&7M<*E w_R((w4jd1ocU6amzAa^UnAB(9@4o`a2nfgwMF>o$nc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12VciT^vI^j=w#>k(V)1qW$CZ|6)SVV-&*#dav<$DMuV&n0Dbpw@a9nO2EgLsCP}GoS_rPgg&ebxsLQ0GN1lJ^%m! diff --git a/sources/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/sources/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png index 75b474e48056669a16a72abadb3526d2da2cf672..7c9fa6c6edcfcdd3e5b77e6f547b719e6fc66e30 100644 GIT binary patch delta 83 zcmbQilsZAemxGOgfx%rTDgj98c)B=-NK8$x`10any&4-ETbrWGpa1{my%rQ+?5O|$ mPf-8#fddSp&dI#iObpXkSZO(T9`Xn3WAJqKb6Mw<&;$T?`W&DD literal 280 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 literal 6922 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 Q^5g_ikWrPcku(qaFX2Wbe*gdg diff --git a/sources/assets/css/images/ui-icons_2e83ff_256x240.png b/sources/assets/css/images/ui-icons_2e83ff_256x240.png index f2bf8388370920783b94285cb75827ce4b4cc1c5..45e8928e5284adacea3f9ec07b9b50667d2ac65f 100644 GIT binary patch delta 4140 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 literal 4549 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 F{sUG;a@YU> diff --git a/sources/assets/css/images/ui-icons_444444_256x240.png b/sources/assets/css/images/ui-icons_444444_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..1df074598ad32a172dc9c0ae96dffa13358e75e9 GIT binary patch literal 6992 zcmZvhcTiK^xA&6}ieLbdCcXC(Iz)Prj&zhBx=I(MlYk(-NhgR%Z_+_J2uKSZY0^}o&BA4_MY`QQMx*+5JDP40000{S5wvp0DyNc;D7*p zcUQ^rl)p0|8%g0Ej=lzQ5-&4|aoc9L+MCFN+jnH>;R zh0Vkc1z=@5{ceMgQBudKbL|6H>8x0sw*tt1>owfmwF3~7ZD?YY0+o&68m@dV*sRMq zSvhwW1pRv>qVP-#LkW%20l!bdx9Vq5qy*G~?oS~&<}MOsgQ+)VKS6BKkKr~AG|GD` z@hV*@M+DmhdI0}V0M1thiM`qvaKGmkD>V9TVOB@Iuar zzBfhn-L;Wumy>PiXFZ!LdVG8fBy-QHlh*#?nhA)OSP%e-phCXuA(HR;Z&AkGeSuDr zSHZ}@MTK-kf}VpMav>go5_0HnV(iL(`$5M06lZQ^O>bURLv3gu-@Oi*iP9a*RUh%0 zt#{e`QrMAt`Mp?HxD^huR49dVln$6Q%O4z1(;-|bSq2duXAZ(V=Jehp?WIXnRU_hQ-rqI8x3 zn*YC6H=;3Cx>Zy8>pFu%G@{z_q(iiuNt4u6Q+J8nEp9QL>ij))0|nC zxl$bdx*ufNFk6#L zY@`CTPv)%CQ)IJbSpOM+-qR;j**M&yci*cNY%hvL?NmshA#@E|okP^r6cuJIAxar# zP?9MOQ1{VUF30#Pbc<|n^NP3k4{yl-*$V%tceFO%`+R5B`V4>hX;VEiMy1|VdSTva z)?9=6A@bL+oS4?Lmyq$thMH(&&o7kF=B$wlkB5b}=!oMJ?~IZ~5WF%4dEs7ie*a^P zN`T^Fg%3-vCVE6HtmDd+KNoGw;?wpf&v35-PaI;1b@E?BRtAcXfBVp~PtZ7;S-YS^ z6L8OKd(NV1LGw2z(b7eTt5$qq!UZ2Kf+-p0e5XI;@U~{unx4GpPPUzLrUa{Rvg8Ga zZv5mBy)|l;4xeFX1PRCDs^{R|j zeO{UXh1a$Cz!zbKjJ&rSr_PFxfGUUikgiRL{__F;yJszJ6ES;)16cg(uXa_Qr5DQD z0Y062on9gKH30)VmWw3Tp@TNRJp}}7=ComS(CPf&Ydpt?2VMSG)1%fFfd)G`ij8Dk zlxTbIFHXcG@q)&!*9-fLm4htsr_8Z#w-CM>Z;a*C+QfL&j^&h0h(B@ef|qrpiM^6i zsy30{SdANM@)Anm(eMYCJ*Vu*Xv0lzUOHs}EH6%;_C-yVN^tiKXO1*+{-}&TceMMv zw}KwO)fZClz`zq=CLnUAo=4cZu5Ui>v$tx${5aD~2s5Hg@uY~V+%vJEe|+nn2f=_A zGY>8U_g|;hbee^}Yk)wXaccm9NNqb{ho1sdG=|6A?vuo3r~97gT}jKQB0*gZ`=ECZT7YfDc0g#AKFXvu*>WkboIC_-!DaMuDaP>DmnN?~ z>SJIz#&9Vxv^nHXv^Qs#$_^y6%~~V`Hm6vwW8v~swLe&>tK?(UugX!YWxd3w-$sIz zeYB@v#+8UqNlAW3`_WNWHi}9Ss*rU_s=7-ZJRJREK!qmV_FHEP>xJd=Ib@Ojh zxnS4Kn>m7S10N{Xgqgi4DM*Qffyz`JAmk`5taWejZuo8k8O)yz1cx&uQHM@jo^KqT z41Es7(Z%pHy|P)#kzPpE;<)hD*as;nkbo6`mxT9P#Pb z(eU<*yHEF#-Q9xs;#Ai-*<+%a_lE)1ImZZ&fxvg~YgY?JblXQas# zc9s|I9=3b0sZV$4F+{WuPZaeNM}=ntEDgVPJ0@BG>CCrlO7>T_H5}^sfCWe`QBbri zVLb&nFy{d=zm_g0NQ#tCx_)5VJZ7`)3QemYNodCTOXFgH1yNH`vk2XOW}r=lR}st# zzr_l1#2|MAjlbR4;DkQcQwiF%XCEm7l0A^`30_~E&^gliC3`G6O!CuBf~Q2aNfD); zJ3_InpMmp>ztl(uFh|kO-^+Lq-dz`Ytw{&$043gE{aqEJa=OXu3z>C?*qY}Xy*GI+ zW`a}3(C7@8(>kDgJ$#t$@OYDaVOSXb=9}LQbtl~|EpLij=$8jaJT5=zn0~qR@fS|f zU>GTGyd+~Gjietear6$?-=!?(?*TB&=v}IjG5u2%SU!7@GF2z( z8Zk;VS;aEUGa-$iVcdpE{e;sdc9!Xu=M?Ob_@|rKT3ns-{k>uU9|`8 zrUWvU8Y<@2w@?deA>6B$gG<~I<+4r!g|9c3MGSDL1NN@r>JS;=E?XvQb~B_Z?!Wi> z{P3qogPsrUfKF0$!!tb_7;OnHZvLIAQ2y4xX>yue*Qk*Rs@GoAdC5-va?ALzE~{rh zij|5zTP^zg&n0J{D~^ba1s*8{LYyb;X`Y$vjaY5O`{M2}8%y>@ciUV`(q`kPW!UKD zrMDhS)a;|ziqCbfL^by5n+rb7ep7h}#kB-OPsss$|M%KPmJ8ET^h7^?3wgHTfn%$MZ9U`Nv_5 z7$MnV+r|E#EW9k6x6h3U#bpk+ih1zUcNaRpwKffN-$bp9|CMxl9iE6x4o~ffC8pjI zJfw+`tSsOh=>+hlJAVypNy%DJxv=?4&{<&q{DXZsuE4mq_+lhx)lSO$!?s4eX>U8| zC3=nD`4HzOj`1k8k3;es?6vuLme=ko){isY>2;LZUsab9C;oPq0`#jiVM~KO3XQ~* z4tsWQ^Os^vqeOpPV`%Af0D)lYgou91$MbZn74=yiqxEpJ2;#?kQ}1f$$lQcI{%Py zJ-9vSTH4%o9jI|}&HY<2Oln9E*44vT*L5DLxlYFv=1ZKbzk15d#6-KM$bN0%?7_Q& z`4EWmp{$s>cRAf|Wv*&6!p(v&VgXmu$hl#c?MeE4E7R)6tv$NtS%ywd zAJ)}Kbk{Y@MA92inX3Frb_9OTHs&7%YEfN8u5(Tt&BzCh?F#qf#`l$(bu#KkY_8ekfH3DjPuIUdA| zDwEHzfL2jmpL=&?(h;JkRf7{pH1d1j&YwuI5>7;;IKyx!dFR;w&PRL7x)uR@ z`J;@eo7jx3)gSe}VUH<2t2!oD059uR-+o+GX|bCcdq~)F^_T=Tl>s}!<-LS+oY6e% zjb~c-YwN=vvjZ54(XXOONpOhHn<_D@$%nfMs+|)dZCStXVSv#rTW2_;bjy_g8V%wx z_vG!we{*qt_?{AwtOSFZt;im$@ey_n)&q5nb*fqr$QGvuo&q<)I<4hvU+3^@Oi4pl zY*IzC*Y?{!U=Ml2GxT-?`EJ;kz3A4+vFyJnU73HiXY=$*v{nsZ9R{$DT$3)$4n%$f zCj~6quU6H?pZ^pLu{SN9ugi#x;T^o$^Z)3WDQ+S;SY)HeKIE6#DoIuKWp}nG;ZXQn zYB%fl+3b0#4Zl}r@$*k3sgm@5pO;;UpY8=%6f)1Zozn1Byj?PnWLn~?t90L>6&C1K z8=23Wy2qu{eV+l{#c}MMCtSkuYX9D)5yx!)Vet?0>xaQZ0f9~@>ltfwo5 zC*W&dsxLgL@`I2W*TFf`dX$?l+f%`F8T%00&vdI9qK5;dIG4 z5pDY8fV`VX=YS0iKmzCXUROfx%*c036y;;-5x#OSaUd;F))&H z?i)sT#Hh_NZbzE=8Rv2AeS~Mr&m*c19#O6%R8D(1(2Mxe%A!+THWBnU2@)QuN8sD~ zZ(sWw%+Y9bwD;kyL&+%K!d*2_ByCd&EfSSXI!{V^-Wh56{)f_wOS8xokU(9j6EgC8 z<(I(n=x5~x7G>odLSFbp(@g|wav$k~}KXfP}ITQbRwNDo)lFt`n(FjlY4G#x1dxa`w|&Pi1wf;Db& zm+AP{`K7_qx!d24W9#T*jACv#HVIic6xjiJ5(3}hhtf8$Vm8({e5 zb@maVbDd4arOaA6 zvrm`x`a~5EX%^W!=w2npH<+K21|)cY&FYx#2)@MA1Ee86`nVZ(CG%s;{b9Ixs-IPV zju~l|!lEIxP)3QHHt`((us8-n6K(S6(x1;es*)hU;&Yn$iR#BqY+|t-Z`PuM*sBXA zo48q}IJgBDM>Q>l$9UK06^HAFUvzwRF`q10#f&c*_XLG&;V8FvP*e#CzUW?XUA7SJ zjhn>g$(~QD%NgyZOZb+I&8jYl_Sv2h@m##fS>u%Md7(|%ivn3Xna0m zOc#DDb2Igc$eD*DGiq|SW`%-kZo={<&dNZLgZn&M64$xoUyA9zl3@@FWLzEb z1uSBFdLm?RK0Ot0AJ0h2by~}IMw01&8;WVY^2&7G2`^Ub?A@osyb*X5=<-xb?}--9 z9ETrvZI^Hd`)f4Uk$YS0?Q*uW$;}&1qDE42{{cMBLq2PZss8e1uy8>n`0ilJDZ%{4 z)Jg5gNPmi)f=^2ZqfQ^rtrO!v(Fd5j)7Bj}D*L7oMMoKmj6VY&P^uaE}v;_^FAbd5)&j! zo|7e}^*)r?NX*bMdi_fa_kKVLu65j_pGKpw3Zb6+QFsIXYE05%sDSt6Ue(`LXk(RE z5_HLt4bgGgy{~G9?kfm{i-8=T722z<@NbrFBnOd}l#28HQU!7!g|3Q2IgDj|80<;|6WS)>_0_tr{ zN+mq=`(}gf90PQf{>-JTfpb+Pyoq1OR=yu}aqvyS--4NQB}t_7VJdl_E!wt3;0-E{ zOHuw6Wn})Pz`$bIq7*-F6COXE={#ZNar0%5t7gTE1i}Jzny^nc=)wtnD<&{Cv#8TP z%;_6$1j{1Q%6I3nnzpTZ{70#+?^CGUe&ViQ>Mm}??#qjEQ^dss7l|7Kzr8bECQr&B zP!j=ZKvJg~>R~v;cMLh2&plSEh3`PEG5_u(qgFSvaGKzw%T{I$)UQ_LChT^X3T zzxxd|w>8*=itFFOn-NQtxt7n&;>Fq9M&afLUxK%fU!I`+EUghw!K>ESY~VKLD=UUi zMywgk460S{6`2B!qZnbm4ViEirB#Ow;k02BcaQ|c zW=gl^$_-Q7d&A&_bRu(VCFzO_mZ%=~ywWa+5w!cXzWoq1{iI(_RXrWeNSPzcq33*3 zwx9f6utE!AY10XteIE&4%`-%TsVG*Ie{Fx%rah>Wx=0T{(UZQekHCXR*uJ3rLpb z9ir&6pP5^;IGj>FH!v=6_ud{mq_-@lzrCRSO*L0XbrL-5Hhwa6K&wbY>;`fEU-0ff zaGjav?V{jQMx7Q_+<}>{JI+xl>}Ao?KmJJ){M~k`QY_qGMxx|HXhc{WV2-*8U73{A zx{tj15)F#;`CFCOtO;D`-f#nXk`cl0x#bYCcNh&2HH~SC)uJ5 zN@fu*pkI1qM{MKbH?xHS_vw{^)ul7=;s8UW6~W8@>&zKig%}Kxj2>R$2LescRUxNr3|3-&90IH_Ag-|vw@6WF&HN8Y8Ms-_Bg@q$t zD(_9lz`KLx@VD;S*^W~J&9Yh>Vh|h9eR3Z7Z9!7U{wAP3ln=lGfo9fnobwik%@RG0 zRup9}s3H@}ybdPa0=`qn@jWF0RMO4W Ju2i%R{Vx&%ER_HN literal 0 HcmV?d00001 diff --git a/sources/assets/css/images/ui-icons_454545_256x240.png b/sources/assets/css/images/ui-icons_454545_256x240.png index d6169e8bf9389ab9b5b7d2c6f0c5fe3e4d363105..7ec70d11bfb2f77374dfd00ef61ba0c3647b5a0c 100644 GIT binary patch literal 4369 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 k*Kv;w;*%(i9W@fAqs5i2wiq literal 6992 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 U(6`q`=`0AKgEG*pQpY~}KNtZxZvX%Q literal 0 HcmV?d00001 diff --git a/sources/assets/css/images/ui-icons_777777_256x240.png b/sources/assets/css/images/ui-icons_777777_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..b5f6ac803878c57d1df89e3675d911f6254a582c GIT binary patch literal 6999 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 diff --git a/sources/assets/css/images/ui-icons_cc0000_256x240.png b/sources/assets/css/images/ui-icons_cc0000_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..d0fa9b7cdaf99023216ed6ed3d512e2a82ffbb32 GIT binary patch literal 4549 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 VN4`BSDyKmJU6i4Ag(mj#{{h3EBPRd= literal 0 HcmV?d00001 diff --git a/sources/assets/css/images/ui-icons_cd0a0a_256x240.png b/sources/assets/css/images/ui-icons_cd0a0a_256x240.png index 49370189231d006600b0f0c2967cad1583eba634..7930a558099bc8d92b4264eb67a0f040460f4a4f 100644 GIT binary patch delta 4140 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 literal 4549 zcmeHK_fr#0w@yL`gaFc{D^V0dT0jt_h7t_DO6Mg=QF;{=0tBf_mm;7byix@LktRh# z5u`-G(3BPtq!;M~LO%4)d^7il`ybqAcJ`dz*=Nq~vomMTd17R6n~8y!0RR9nX`?kw z007{b3)rHkIh!Z6b&k$9n2q$zPy_~s{~!NVK!y;wdM1!nfQf-AfQRJVvlOKeK;) zG(fA@T?GI*=cKKvX7=#=x*g1MvYr*vi+;15^~~;rE_=zlF{dxTu6`?DZK_QC?%~-~ zxXc!0w@Ia@0%SGD=VuM=t|036I5|bK3akyK@NV;ce80zy5LQw^%%g1EddqL}P7 zAP;7}p`4_>$jI<)(!NRDe~wUl2Lbz~U&xhZ6L-Mi58IN#JcL!Jb>u7w;&Pb=G?j|j z+4;j5CveHSt*{{pnG-wAV&ig>k>+1?#rZDhk&-C+Q7Ct0?m<+Z+Iv1=SjY7(0$nxq zk`*~W-I5nikKwr=c*9oDk~SS+7*M7oAkBSuy`fgUbnRO05@D;12PXct`w1wF~RUTU^h$gt=%W0m`Cw0Xb zn_s*Iw0*)iGT7-%&x*f>!&j*t1{iXhwkybGzn6Yb1ht-6`9IYEJQ)#1P^bTyNu&tz zRu;qux2t%4(*U3DBA?9rA-5ibuLB(35_6kYoAFm)34GMo`X6zo%ywrpzY_^)vF71v z)c2DilF6NXvKP}tDJWcNaLins3AqfCH1H&imJMu>z!m++EvXggAWG(8=5>-NUj^6s z--27)SG?akzYm$a3a^&4wImGm;GVa2Nl&w9g&{h=3GsU|SJ(O9RTJZ{*ZjGb%Jfc+ zX06OTMtgY|8_(2ecn@67x%Df1xi&r;S}liv1eMcq0lt3$SpBYGUl8;UV2l>c1q}p- zNE*Jp#oakW04gPa!be%*FrvFa&}TT>pnd6MHd5HfX1#5!D$Y}-)3(ZGeUFxo@PVWd zx(b&0Q5=u!Vq@MZ4w)0l^Rmf>JYzT=s75ic>B6iUVH29|ldKT3rw2 z7Gh*hjvi(>`v}{1HJ85LD;er=0;Y$u&ItTUV2(HFWfzQClC6ab%TP(LRGVTNH^`_z zA7|@bXmO(D;;V>nutl~0u>Y5ul?kfo7b`xX7D1_PWN0lf~n1=@8PLsIw}H5Zv*Rg+HW z!(_+Lw~tJl)iFnf2vU%9AO=SqUcWpXl7Ft39=a4SLB9Rx2~%QDeTJWJ4u-p5_H{2E z(|7*qVrrjs0LtTAyHoj0_fvw#4vfiwGN~ATw_yz2$U_hDuMN}wb1e65` z+Ghf(l_fEw)!FpWqsX)^N80DKc#a`~JHE;gfLs3X+|TV@M}7P--Eo^VeWU*(^W??N z%wC`l?kiP859ewE-=i}yep*Z+B|RpBm@`%o$|E}fD_5#G@C{bxlll1)Sh^i)!)}T; zQ~e*%(M(=SMwLDKjJ)4^ZW?@L9;fu|N-UJYfiyqgr3}FrI3ZV(p~B(TpguJgRv-J^ zP->VzsgxI-9H+1ZHUNZZYOsJ*I(FE1K6xJf(@39xz9W*Yw1Y@A9TMsjgDbu?Sa`7k zDq0gF)vAZWdw)bK*{dbJVpX?8Up#zp)Il~72C}OIxH%Ey(rJ{FJau zhKB8mRZN&kGCF11=fL>Ui{O#C2i4Qv6Fb&<4U6WLy{FwZENz$8MOqGIc|0$qX>8Xg z?hQ&4@OqC@?;UZ_D%SMww2q~|H%VRone1lK;(*MnK$_?14GLLQlDhpKC|ffzEDRK_ zw<_P6`tn;glyNI-sfxdd{cYPeVRA|Co#I{Lm$9>b<3KMXp(_8FZ9ex%nR=Es_Qkma z`HzI66uuh7!p~l*XLpXdU=}n5f&13L1=l#xn4@i;KuZA zqE>e8CSya7E?$6?yuEj=BHxelBq8z~51*mm%5lBl`asD(`QpvXymT%;)hYaD9sk^L ze7|@({~~P)EkFL%j{>ih5dr;g(c&b@IriTc%0&S>Vx)9SyvRFTG;7G`i$+W)o><+L zBdN>KTyZo_2 z61ldO^ivYwcOo({a4riLR4ib2E8=fP55$S&WtmszJ=_c%Dxnpr zSUBdL%^3uI$PwtUun(okVk2_=^LHgLsa9;Xr(N^$9xY6xa1sJEZp;q#?IQVFjN3$F zzXgyxFnH?1-AiIlR=1wsRFkeQo;iH7-*Q^ECAt2zvZMw_3-kIOP-CX6GSXiDMbNHC z526_CTdgzHp5d1;zSU7hZj{$2RQcA zr>7a;@6@>drtGQN@%QYUWHqposr!S*j=Hho&p7*3(4JItk~u;cmZTzm6SD z67Bm6dHgIK)NeXvEk0k(7p5u2n|AwyZ1C8mgYw1l3_hJXlea1Ks)$6?K zl|iMnSc^VFh3(rmbACHjw9 z2KQ|E!M)sDcFK?uMqvs}kl(IsKW~XRPUjQDZA5#az@aL;#dY`i@FzKzJIjP4 zDWmQKL;K+VHqEKG93SJamsHZZ8|s|n_%00Mlgl{q+Wumj>paS&jpGNJ(Nnrhr#w3O zB@^zDR~J5YjLgI44VIg&8m=OY$&t*qOqEvV=Ufma>04+ROY(@s*BZ*?v z0iPGEj9IvBR7rJrOe29RP|XUYvBqnG89jiVNk9%o0UF3h*w#_fg;`oH+%y^Z_iA!{ zr;DE}6~9s$4wwCFgG_@(?#V5M_>KA(Zka~p-TNH>Jd;kCcQz`Fs%G&hz_OEi1qfO< zFs~TkrrGT^X|->Ap>(s*N21FxTE557rpnMs(_O{B{CqaQ;k;pUC|?qRvZezu%_|*u zD%|ii-+ZA;v=Fw(efJC}!ShetYUitu!j#c)?U4vA6*EZ+CFHu@MQ!HWI!IR_+v4HV za$g6}H3Ka$*0@0SchdF}LUc0%R=bFTyf&53R-kVTjKnbegaszWQrr~OV+*Sns6MxD z&U?@AJ@UW$DknMa3`7*bg;$!3&b=n^FG7`ysp%B-%p*E_3{z_hkyBEuyG&+sa zS>K8)@OBLKer>mahzWEeE13LsoR6En+AaK1CN7TtoLkS2uk*u^CscejmI(?_1unou zh0iKyvf;U&C!yCD1H{73%1^Ru&w7luJzC)_^7|2AfmT7D0dB1jVG&rRL|`k$$E zyf@fb@2^6@L#v?~yR$L0Mxj;dr^U4Clau|=BXNQ2gpqNQQEsSb53VAjO!ebj#;HXQ zglvt>psuXUj)N*&PD3|A%#^BiZWi1ab!7rM1ZqMqPoHRMCh$|~YVl8V9(y!%pEcfB z15lO$P7VRi3XXoxX9ggRkdhTg+z^+NGLw=~kiDfKB`u0TC?F7sGS~9|Mey`?a&>w1 ze-qSphq=xOJbxmXdbWU+9qu`sI6F8!^6hn2Iy(f=Mj2>Us$(Ai E2b3c!L;wH) diff --git a/sources/assets/css/images/ui-icons_ffffff_256x240.png b/sources/assets/css/images/ui-icons_ffffff_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..c964d9a9bf49a0ea5210af5a054bdfe03705703b GIT binary patch literal 6299 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 B!s-A3 literal 0 HcmV?d00001 diff --git a/sources/assets/css/print.css b/sources/assets/css/print.css deleted file mode 100644 index b9d0acd..0000000 --- a/sources/assets/css/print.css +++ /dev/null @@ -1,27 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2015-08-09 -* http://jqueryui.com -* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, autocomplete.css, datepicker.css, menu.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ - -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24 -* http://trentrichardson.com/examples/timepicker -* Copyright (c) 2015 Trent Richardson; Licensed MIT */ - -.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{float:left;clear:left;padding:0 0 0 5px}.ui-timepicker-div dl dd{margin:0 10px 10px 40%}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:0 0;border:0;margin:0;padding:0}.ui-timepicker-div .ui_tpicker_unit_hide{display:none}.ui-timepicker-rtl{direction:rtl}.ui-timepicker-rtl dl{text-align:right;padding:0 5px 0 0}.ui-timepicker-rtl dl dt{float:right;clear:right}.ui-timepicker-rtl dl dd{margin:0 40% 10px 10px}.ui-timepicker-div.ui-timepicker-oneLine{padding-right:2px}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,.ui-timepicker-div.ui-timepicker-oneLine dt{display:none}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label{display:block;padding-top:2px}.ui-timepicker-div.ui-timepicker-oneLine dl{text-align:right}.ui-timepicker-div.ui-timepicker-oneLine dl dd,.ui-timepicker-div.ui-timepicker-oneLine dl dd>div{display:inline-block;margin:0}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before{content:':';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before{content:'.';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{display:none}/* Chosen v1.1.0 | (c) 2011-2013 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ - -.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;*display:inline;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:23px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(../img/chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(../img/chosen-sprite.png) no-repeat 100% -20px;background:url(../img/chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:5px;height:15px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#666;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 0 3px 5px;padding:3px 20px 3px 5px;border:1px solid #aaa;border-radius:3px;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(../img/chosen-sprite.png) no-repeat -30px -20px;background:url(../img/chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(../img/chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}/*! - * FullCalendar v2.4.0 Stylesheet - * Docs & License: http://fullcalendar.io/ - * (c) 2015 Adam Shaw - */.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}body .fc{font-size:1em}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1;opacity:.3;filter:alpha(opacity=30)}.fc-bgevent{background:#8fdf82;opacity:.3;filter:alpha(opacity=30)}.fc-nonbusiness{background:#d7d7d7}.fc-icon{display:inline-block;width:1em;height:1em;line-height:1em;font-size:1em;text-align:center;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative;margin:0 -1em}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%;left:3%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%;left:-3%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%;left:-2%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%;left:2%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;white-space:nowrap;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-default{background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-button-group{display:inline-block}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-popover .fc-header .fc-close{cursor:pointer}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc-bg{bottom:0}.fc-bg table{height:100%}.fc table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc th{text-align:center}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{overflow-y:scroll;overflow-x:hidden}.fc-scroller>*{position:relative;width:100%;overflow:hidden}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-event.fc-draggable,.fc-event[href]{cursor:pointer}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:3}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-h-event .fc-resizer{top:-1px;bottom:-1px;left:-1px;right:-1px;width:5px}.fc-ltr .fc-h-event .fc-start-resizer,.fc-ltr .fc-h-event .fc-start-resizer:after,.fc-ltr .fc-h-event .fc-start-resizer:before,.fc-rtl .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-end-resizer:after,.fc-rtl .fc-h-event .fc-end-resizer:before{right:auto;cursor:w-resize}.fc-ltr .fc-h-event .fc-end-resizer,.fc-ltr .fc-h-event .fc-end-resizer:after,.fc-ltr .fc-h-event .fc-end-resizer:before,.fc-rtl .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-start-resizer:after,.fc-rtl .fc-h-event .fc-start-resizer:before{left:auto;cursor:e-resize}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-day-grid-event .fc-resizer{left:-3px;right:-3px;width:7px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-toolbar{text-align:center;margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid{overflow:hidden}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number{text-align:center}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px;white-space:nowrap}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-bgevent-skeleton,.fc-time-grid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-time-grid .fc-bgevent-skeleton{z-index:3}.fc-time-grid .fc-highlight-skeleton{z-index:4}.fc-time-grid .fc-content-skeleton{z-index:5}.fc-time-grid .fc-helper-skeleton{z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight-container{position:relative}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-time-grid .fc-bgevent-container,.fc-time-grid .fc-event-container{position:relative}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em;white-space:nowrap}.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-time-grid-event .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-time-grid-event .fc-resizer:after{content:"="}/*! - * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.5.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"} -.c3 svg{font:10px sans-serif}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}/** - * simplemde v1.10.1 - * Copyright Next Step Webs, Inc. - * @link https://github.com/NextStepWebs/simplemde-markdown-editor - * @license MIT - */ -.CodeMirror{color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror,.CodeMirror-scroll{min-height:300px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror{height:auto;border:1px solid #ddd;border-bottom-left-radius:4px;border-bottom-right-radius:4px;padding:10px;font:inherit;z-index:1}.CodeMirror-fullscreen{background:#fff;position:fixed!important;top:50px;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-sided{width:50%!important}.editor-toolbar{position:relative;opacity:.6;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;padding:0 10px;border-top:1px solid #bbb;border-left:1px solid #bbb;border-right:1px solid #bbb;border-top-left-radius:4px;border-top-right-radius:4px}.editor-toolbar:after,.editor-toolbar:before{display:block;content:' ';height:1px}.editor-toolbar:before{margin-bottom:8px}.editor-toolbar:after{margin-top:8px}.editor-toolbar:hover,.editor-wrapper input.title:focus,.editor-wrapper input.title:hover{opacity:.8}.editor-toolbar.fullscreen{width:100%;height:50px;overflow-x:auto;overflow-y:hidden;white-space:nowrap;padding-top:10px;padding-bottom:10px;box-sizing:border-box;background:#fff;border:0;position:fixed;top:0;left:0;opacity:1;z-index:9}.editor-toolbar.fullscreen::before{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,1)),color-stop(100%,rgba(255,255,255,0)));background:-webkit-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-o-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:linear-gradient(to right,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);position:fixed;top:0;left:0;margin:0;padding:0}.editor-toolbar.fullscreen::after{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);position:fixed;top:0;right:0;margin:0;padding:0}.editor-toolbar a{display:inline-block;text-align:center;text-decoration:none!important;color:#2c3e50!important;width:30px;height:30px;margin:0;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover{background:#fcfcfc;border-color:#95a5a6}.editor-toolbar a:before{line-height:30px}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 6px}.editor-toolbar a.fa-header-x:after{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:65%;vertical-align:text-bottom;position:relative;top:2px}.editor-toolbar a.fa-header-1:after{content:"1"}.editor-toolbar a.fa-header-2:after{content:"2"}.editor-toolbar a.fa-header-3:after{content:"3"}.editor-toolbar a.fa-header-bigger:after{content:"▲"}.editor-toolbar a.fa-header-smaller:after{content:"▼"}.editor-toolbar.disabled-for-preview a:not(.no-disable){pointer-events:none;background:#fff;border-color:transparent;text-shadow:inherit}@media only screen and (max-width:700px){.editor-toolbar a.no-mobile{display:none}}.editor-statusbar{padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-preview,.editor-preview-side{padding:10px;background:#fafafa;overflow:auto;display:none;box-sizing:border-box}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-statusbar .characters:before{content:'characters: '}.editor-preview{position:absolute;width:100%;height:100%;top:0;left:0;z-index:7}.editor-preview-side{position:fixed;bottom:0;width:50%;top:50px;right:0;z-index:9;border:1px solid #ddd}.editor-preview-active,.editor-preview-active-side{display:block}.editor-preview-side>p,.editor-preview>p{margin-top:0}.editor-preview pre,.editor-preview-side pre{background:#eee;margin-bottom:10px}.editor-preview table td,.editor-preview table th,.editor-preview-side table td,.editor-preview-side table th{border:1px solid #ddd;padding:5px}.CodeMirror .CodeMirror-code .cm-tag{color:#63a35c}.CodeMirror .CodeMirror-code .cm-attribute{color:#795da3}.CodeMirror .CodeMirror-code .cm-string{color:#183691}.CodeMirror .CodeMirror-selected{background:#d9d9d9}.CodeMirror .CodeMirror-code .cm-header-1{font-size:200%;line-height:200%}.CodeMirror .CodeMirror-code .cm-header-2{font-size:160%;line-height:160%}.CodeMirror .CodeMirror-code .cm-header-3{font-size:125%;line-height:125%}.CodeMirror .CodeMirror-code .cm-header-4{font-size:110%;line-height:110%}.CodeMirror .CodeMirror-code .cm-comment{background:rgba(0,0,0,.05);border-radius:2px}.CodeMirror .CodeMirror-code .cm-link{color:#7f8c8d}.CodeMirror .CodeMirror-code .cm-url{color:#aab2b3}.CodeMirror .CodeMirror-code .cm-strikethrough{text-decoration:line-through}.CodeMirror .CodeMirror-placeholder{opacity:.5}.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word){background:rgba(255,0,0,.15)}header,.sidebar,#comments form,.page-header{display:none}a{color:#36c;border:0}a:focus{outline:0;color:#df5353;text-decoration:none;border:1px dotted #aaa}a:hover{color:#333;text-decoration:none}table{width:100%;border-collapse:collapse;border-spacing:0;margin-bottom:20px;font-size:.95em}#calendar table{margin-bottom:0}th,td{border:1px solid #eee;padding-top:.5em;padding-bottom:.5em;padding-left:3px;padding-right:3px}td{vertical-align:top}th{background:#fbfbfb;text-align:left}td li{margin-left:20px}.table-small{font-size:.8em}th a{text-decoration:none;color:#333}th a:focus,th a:hover{text-decoration:underline}.table-fixed{table-layout:fixed;white-space:nowrap}.table-fixed th{overflow:hidden}.table-fixed td{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.table-stripped tr:nth-child(odd){background:#fefefe}.column-3{width:3%}.column-5{width:5%}.column-8{width:7.5%}.column-10{width:10%}.column-12{width:12%}.column-15{width:15%}.column-18{width:18%}.column-20{width:20%}.column-25{width:25%}.column-30{width:30%}.column-35{width:35%}.column-40{width:40%}.column-50{width:50%}.column-60{width:60%}.column-70{width:70%}.column-80{width:70%}.draggable-row-handle{cursor:move;color:#dedede}.draggable-row-handle:hover{color:#333}tr.draggable-item-selected{background:#fff;border:2px solid #666;box-shadow:4px 2px 10px -4px rgba(0,0,0,0.55)}tr.draggable-item-selected td{border-top:0;border-bottom:0}tr.draggable-item-selected td:first-child{border-left:0}tr.draggable-item-selected td:last-child{border-right:0}.table-stripped tr.draggable-item-hover,tr.draggable-item-hover{background:#fefff2}.public-board{margin-top:5px}.public-task{max-width:800px;margin:0 auto;margin-top:5px}#board-container{overflow-x:auto}#board{table-layout:fixed;margin-bottom:0}#board th.board-column-header{width:240px}#board td{vertical-align:top}.board-container-compact{overflow-x:initial}@media all and (-ms-high-contrast:active),(-ms-high-contrast:none){.board-container-compact #board{table-layout:auto}}#board th.board-column-header.board-column-compact{width:initial}.board-column-collapsed{display:none}td.board-column-task-collapsed{font-weight:bold;background-color:#fbfbfb}#board th.board-column-header-collapsed{width:28px;min-width:28px;text-align:center;overflow:hidden}.board-rotation-wrapper{position:relative;padding:8px 4px;min-height:150px;overflow:hidden}.board-rotation{white-space:nowrap;-webkit-backface-visibility:hidden;-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);-webkit-transform-origin:0 100%;-moz-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.board-column-title .dropdown-menu{text-decoration:none}.board-add-icon{float:left;padding:0 5px}.board-add-icon a{text-decoration:none;color:#36c;font-size:150%;line-height:70%}.board-add-icon a:focus,.board-add-icon a:hover{text-decoration:none;color:red}.board-column-header-task-count{color:#999;font-weight:normal}th.board-column-header-collapsed .board-column-header-task-count{font-size:.85em}a.board-swimlane-toggle{font-size:.95em;text-decoration:none}a.board-swimlane-toggle:hover,a.board-swimlane-toggle:focus{color:#000;text-decoration:none;border:0}.board-task-list{overflow:auto;min-height:60px}.board-task-list-limit{background-color:#df5353}.draggable-item{cursor:pointer;user-select:none;-webkit-user-select:none;-moz-user-select:none}.draggable-placeholder{border:2px dashed #000;background:#fafafa;height:70px;margin-bottom:10px}div.draggable-item-selected{border:1px solid #000}.task-board-sort-handle{float:left;padding-right:5px}.task-board-saving-state{opacity:.3}.task-board-saving-icon{position:absolute;margin:auto;width:100%;text-align:center;color:#000}.task-table .dropdown-menu{color:#000;text-decoration:none;font-weight:bold}.task-table .dropdown-menu:focus,.task-table .dropdown-menu:hover{text-decoration:underline}td.task-table a{color:#000;text-decoration:none}td.task-table a:hover{text-decoration:underline}.task-board{position:relative;margin-bottom:4px;border:1px solid #000;padding:2px;font-size:.85em;word-wrap:break-word}div.task-board-recent{border-width:2px}div.task-board-status-closed{user-select:none;border:1px dotted #555}.task-board a{color:#000;text-decoration:none}.task-board .dropdown-menu{font-weight:bold}.task-board-collapsed{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.task-board-title{font-size:1.15em;margin-top:5px;margin-bottom:8px}.task-board-title a:hover{text-decoration:underline}.task-board-category-container{text-align:right;margin-top:8px;margin-bottom:8px}.task-board-category{font-weight:500;color:#000;border:1px solid #555;padding:1px 2px 1px 2px;border-radius:4px}.task-board-category:hover{opacity:.6}.task-board-avatars{text-align:right;float:right}.task-board-change-assignee:hover{opacity:.6}.task-board-change-assignee{cursor:pointer}.task-board-icons{text-align:right;margin-top:4px;margin-bottom:2px}.task-board-icons a{opacity:.5}.task-board-icons span{opacity:.5;margin-left:2px}.task-board-icons a:hover,.task-board-icons span:hover{opacity:1.0}.task-board-date{font-weight:bold;color:#000}span.task-board-date-overdue{color:#d90000;opacity:1.0}.task-board .task-score{font-weight:bold}.task-board-age{display:inline-block;font-size:.9em}span.task-board-age-total{border:#666 1px solid;padding:1px 3px 1px 3px;border-top-left-radius:3px;border-bottom-left-radius:3px}span.task-board-age-column{border:#666 1px solid;border-left:0;margin-left:-5px;padding:1px 3px 1px 3px;border-top-right-radius:3px;border-bottom-right-radius:3px}#task-summary{margin-bottom:15px}#task-summary h2{color:#666;font-size:2.5em;margin-top:0;padding-top:0}.task-summary-buttons{margin-top:10px;font-size:.85em}.task-summary-container{border:2px solid #000;border-radius:8px;padding:15px;display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;justify-content:space-between}.task-summary-column{font-size:.9em;color:#666}.task-summary-column span{color:#555}.task-summary-column li{line-height:23px}.task-show-title{border:2px solid #000;border-radius:8px;margin-bottom:20px}.task-show-title h2{color:#555;font-size:1.8em;margin:0;padding:8px}.task-link-closed{text-decoration:line-through}.flag-milestone{color:green}.color-picker{min-height:35px}.color-square{display:inline-block;width:30px;height:30px;margin-right:5px;margin-bottom:5px;border:1px solid #000;cursor:pointer}.color-square:hover{border-style:dotted}div.color-square-selected{border-width:2px;width:28px;height:28px;box-shadow:3px 2px 10px 0 rgba(180,180,180,0.9)}.assign-me{font-size:.8em;vertical-align:bottom}.comment-sorting{text-align:right;font-size:.5em}.comment-sorting a{color:#555;font-weight:normal;text-decoration:none}.comment-sorting a:hover{color:#aaa}.comment{padding:5px;margin-bottom:15px}.comment:hover{background:#fafafa}.comment-title{border-bottom:1px dotted #eee;margin-left:55px;margin-bottom:10px}.comment-username{font-weight:bold;font-size:1.1em}.comment-date{color:#999;font-size:.7em;font-weight:200}.comment-actions{font-size:.8em;margin-left:55px;margin-top:8px}.comment-actions li{display:inline}.comment-actions a{color:#999;text-decoration:none}.comment-actions a:focus,.comment-actions a:hover{color:#333;text-decoration:underline}.comment-content{margin-left:55px}.subtasks-table{font-size:.85em}.subtasks-table td{vertical-align:middle}.task-links-table{font-size:.85em}.task-links-table td{vertical-align:middle}.task-links-task-count{color:#999}div.CodeMirror,div.CodeMirror-scroll{max-height:250px;min-height:200px}.markdown-editor-small div.CodeMirror,.markdown-editor-small div.CodeMirror-scroll{min-height:100px;max-height:180px}.form-column div.CodeMirror{margin-bottom:10px}.markdown{line-height:1.4em}.markdown h1{margin-top:5px;margin-bottom:10px;font-size:1.5em;font-weight:bold;text-decoration:underline}.markdown h2{font-size:1.2em;font-weight:bold;text-decoration:underline}.markdown h3{font-size:1.1em;text-decoration:underline}.markdown h4{font-size:1.1em;text-decoration:underline}.markdown p{margin-bottom:10px}.markdown ol,.markdown ul{margin-left:25px;margin-top:10px;margin-bottom:10px}.markdown pre{background:#fbfbfb;padding:10px;border-radius:5px;border:1px solid #ddd;overflow:auto;color:#444}.markdown blockquote{font-style:italic;border-left:3px solid #ddd;padding-left:10px;margin-bottom:10px;margin-left:20px}.markdown img{display:block;max-width:80%;margin-top:10px}.documentation{margin:0 auto;padding:20px;max-width:850px;background:#fefefe;border:1px solid #ccc;border-radius:5px;font-size:1.1em;color:#555}.documentation img{border:1px solid #333}.documentation h1{text-decoration:none;font-size:1.8em;margin-bottom:30px}.documentation h2{font-size:1.3em;text-decoration:none;border-bottom:1px solid #ccc;margin-bottom:25px}.documentation li{line-height:30px}.user-mention-link{font-weight:bold;color:#000;text-decoration:none}.user-mention-link:hover{color:#555} \ No newline at end of file diff --git a/sources/assets/css/print.min.css b/sources/assets/css/print.min.css new file mode 100644 index 0000000..9bc2d61 --- /dev/null +++ b/sources/assets/css/print.min.css @@ -0,0 +1 @@ +a:hover,th a{text-decoration:none;color:#333}.table-fixed td,.table-fixed th{overflow:hidden}#board td,td{vertical-align:top}#comments form,.board-column-collapsed,.page-header,.sidebar,header{display:none}.table-fixed td,.task-board-collapsed{white-space:nowrap;text-overflow:ellipsis}a{color:#36C;border:none}a:focus{outline:0;color:#DF5353;text-decoration:none;border:1px dotted #aaa}table{width:100%;border-collapse:collapse;border-spacing:0;margin-bottom:20px;font-size:.95em}#calendar table{margin-bottom:0}td,th{border:1px solid #eee;padding:.5em 3px}th{background:#fbfbfb;text-align:left}td li{margin-left:20px}.table-small{font-size:.8em}th a:focus,th a:hover{text-decoration:underline}.table-fixed{table-layout:fixed;white-space:nowrap}.table-stripped tr:nth-child(odd){background:#fefefe}.column-3{width:3%}.column-5{width:5%}.column-8{width:7.5%}.column-10{width:10%}.column-12{width:12%}.column-15{width:15%}.column-18{width:18%}.column-20{width:20%}.column-25{width:25%}.column-30{width:30%}.column-35{width:35%}.column-40{width:40%}.column-50{width:50%}.column-60{width:60%}.column-70,.column-80{width:70%}.draggable-row-handle{cursor:move;color:#dedede}.draggable-row-handle:hover{color:#333}tr.draggable-item-selected{background:#fff;border:2px solid #666;box-shadow:4px 2px 10px -4px rgba(0,0,0,.55)}tr.draggable-item-selected td{border-top:none;border-bottom:none}tr.draggable-item-selected td:first-child{border-left:none}tr.draggable-item-selected td:last-child{border-right:none}.table-stripped tr.draggable-item-hover,tr.draggable-item-hover{background:#FEFFF2}.public-board{margin-top:5px}.public-task{max-width:800px;margin:5px auto 0}#board-container{overflow-x:auto}#board{table-layout:fixed;margin-bottom:0}#board th.board-column-header{width:240px}.board-container-compact{overflow-x:initial}@media all and (-ms-high-contrast:active),(-ms-high-contrast:none){.board-container-compact #board{table-layout:auto}}#board th.board-column-header.board-column-compact{width:initial}td.board-column-task-collapsed{font-weight:700;background-color:#fbfbfb}#board th.board-column-header-collapsed{width:28px;min-width:28px;text-align:center;overflow:hidden}.board-rotation-wrapper{position:relative;padding:8px 4px;min-height:150px;overflow:hidden}.board-rotation{white-space:nowrap;-webkit-backface-visibility:hidden;-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);-webkit-transform-origin:0 100%;-moz-transform-origin:0 100%;-ms-transform-origin:0 100%;transform-origin:0 100%}.board-column-title .dropdown-menu{text-decoration:none}.board-add-icon{float:left;padding:0 5px}.board-add-icon a{text-decoration:none;color:#36C;font-size:150%;line-height:70%}.board-add-icon a:focus,.board-add-icon a:hover{text-decoration:none;color:red}.board-column-header-task-count{color:#999;font-weight:400}th.board-column-header-collapsed .board-column-header-task-count{font-size:.85em}a.board-swimlane-toggle{font-size:.95em;text-decoration:none}a.board-swimlane-toggle:focus,a.board-swimlane-toggle:hover{color:#000;text-decoration:none;border:none}.board-task-list{overflow:auto;min-height:60px}.board-task-list-limit{background-color:#DF5353}.draggable-item{cursor:pointer;user-select:none;-webkit-user-select:none;-moz-user-select:none}.draggable-placeholder{border:2px dashed #000;background:#fafafa;height:70px;margin-bottom:10px}.task-board,div.draggable-item-selected{border:1px solid #000}.task-board-sort-handle{float:left;padding-right:5px}.task-table .dropdown-menu{color:#000;text-decoration:none;font-weight:700}.task-table .dropdown-menu:focus,.task-table .dropdown-menu:hover{text-decoration:underline}td.task-table a{color:#000;text-decoration:none}td.task-table a:hover{text-decoration:underline}.task-board{position:relative;margin-bottom:4px;padding:2px;font-size:.85em;word-wrap:break-word}div.task-board-recent{border-width:2px}div.task-board-status-closed{user-select:none;border:1px dotted #555}.task-board a{color:#000;text-decoration:none}.task-board .dropdown-menu{font-weight:700}.task-board-collapsed{overflow:hidden}.task-board-saving-state{opacity:.3}.task-board-category:hover,.task-board-change-assignee:hover{opacity:.6}.task-board-saving-icon{position:absolute;margin:auto;width:100%;text-align:center;color:#000}.task-board-title{font-size:1.15em;margin-top:5px;margin-bottom:8px}.task-board-title a:hover{text-decoration:underline}.task-board-category-container{text-align:right;margin-top:8px;margin-bottom:8px}.task-board-category{font-weight:500;color:#000;border:1px solid #555;padding:1px 2px;border-radius:4px}.task-tags li{display:inline;margin:0 4px 0 0;padding:2px;color:#666;border:1px solid #666;border-radius:2px}.task-summary-container .task-tags{margin-top:10px}.task-board-avatars{text-align:right;float:right}.task-board-change-assignee{cursor:pointer}.task-board-icons{text-align:right;margin-top:4px;margin-bottom:2px}.task-board-icons a{opacity:.5}.task-board-icons span{opacity:.5;margin-left:2px}.task-board-icons a:hover,.task-board-icons span:hover{opacity:1}.task-board-date{font-weight:700;color:#000}span.task-board-date-today{color:#0000D9;opacity:1}span.task-board-date-overdue{color:#D90000;opacity:1}.task-board .task-score{font-weight:700}.task-board-age{display:inline-block;font-size:.9em}span.task-board-age-total{border:1px solid #666;padding:1px 3px;border-top-left-radius:3px;border-bottom-left-radius:3px}span.task-board-age-column{border:1px solid #666;border-left:none;margin-left:-5px;padding:1px 3px;border-top-right-radius:3px;border-bottom-right-radius:3px}#task-summary{margin-bottom:15px}#task-summary h2{color:#666;font-size:2.5em;margin-top:0;padding-top:0}.task-summary-buttons{margin-top:10px;font-size:.85em}.task-summary-container{border:2px solid #000;border-radius:8px;padding:15px}.task-summary-columns{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;justify-content:space-between}.task-summary-column{font-size:.9em;color:#666}.task-summary-column span{color:#555}.task-summary-column li{line-height:23px}.task-show-title{border:2px solid #000;border-radius:8px;margin-bottom:20px}.task-show-title h2{color:#555;font-size:1.8em;margin:0;padding:8px}.comment-actions,.comment-content,.comment-title{margin-left:55px}.task-link-closed{text-decoration:line-through}.flag-milestone{color:green}.color-picker{width:180px}.color-picker-option{height:25px}.color-picker-square{display:inline-block;width:18px;height:18px;margin-right:5px;border:1px solid #000}.color-picker-label{display:inline-block;vertical-align:bottom;padding-bottom:3px}#select2-form-color_id-results li.select2-results__option{padding:3px}.assign-me{font-size:.8em;vertical-align:bottom}.subtasks-table td,.task-links-table td{vertical-align:middle}.comment-sorting{text-align:right;font-size:.5em}.comment-sorting a{color:#555;font-weight:400;text-decoration:none}.comment-sorting a:hover{color:#aaa}.comment{padding:5px;margin-bottom:15px}.comment-title,.form-column div.CodeMirror,.markdown blockquote,.markdown h1,.markdown p{margin-bottom:10px}.comment:hover{background:#fafafa}.comment-title{border-bottom:1px dotted #eee}.comment-username{font-weight:700;font-size:1.1em}.comment-date{color:#999;font-size:.7em;font-weight:200}.comment-actions{font-size:.8em;margin-top:8px}.subtasks-table,.task-links-table{font-size:.85em}.comment-actions li{display:inline}.comment-actions a{color:#999;text-decoration:none}.markdown h1,.markdown h2,.markdown h3,.markdown h4{text-decoration:underline}.comment-actions a:focus,.comment-actions a:hover{color:#333;text-decoration:underline}.task-links-task-count{color:#999}div.CodeMirror,div.CodeMirror-scroll{max-height:250px;min-height:200px}.markdown-editor-small div.CodeMirror,.markdown-editor-small div.CodeMirror-scroll{min-height:100px;max-height:180px}.markdown{line-height:1.4em}.markdown h1{margin-top:5px;font-size:1.5em;font-weight:700}.markdown h2{font-size:1.2em;font-weight:700}.markdown h3,.markdown h4{font-size:1.1em}.markdown ol,.markdown ul{margin-left:25px;margin-top:10px;margin-bottom:10px}.markdown pre{background:#fbfbfb;padding:10px;border-radius:5px;border:1px solid #ddd;overflow:auto;color:#444}.markdown blockquote{font-style:italic;border-left:3px solid #ddd;padding-left:10px;margin-left:20px}.markdown img{display:block;max-width:80%;margin-top:10px}.documentation{margin:0 auto;padding:20px;max-width:850px;background:#fefefe;border:1px solid #ccc;border-radius:5px;font-size:1.1em;color:#555}.documentation img{border:1px solid #333}.documentation h1{text-decoration:none;font-size:1.8em;margin-bottom:30px}.documentation h2{font-size:1.3em;text-decoration:none;border-bottom:1px solid #ccc;margin-bottom:25px}.documentation li{line-height:30px}.user-mention-link{font-weight:700;color:#000;text-decoration:none}.user-mention-link:hover{color:#555} \ No newline at end of file diff --git a/sources/assets/css/src/board.css b/sources/assets/css/src/board.css index 586093b..95e0410 100644 --- a/sources/assets/css/src/board.css +++ b/sources/assets/css/src/board.css @@ -157,16 +157,3 @@ div.draggable-item-selected { float: left; padding-right: 5px; } - -/* board saving state */ -.task-board-saving-state { - opacity: 0.3; -} - -.task-board-saving-icon { - position: absolute; - margin: auto; - width: 100%; - text-align: center; - color: #000; -} diff --git a/sources/assets/css/src/form.css b/sources/assets/css/src/form.css index fd778c8..2c81707 100644 --- a/sources/assets/css/src/form.css +++ b/sources/assets/css/src/form.css @@ -61,6 +61,14 @@ select:focus { outline: 0; } +.tag-autocomplete { + width: 400px; +} + +span.select2-container { + margin-top: 2px; +} + ::-webkit-input-placeholder { color: #ddd; padding-top: 2px; @@ -146,21 +154,19 @@ input.form-input-large { width: 400px; } +input.form-input-small { + width: 150px; +} + +.form-columns { + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + flex-direction: row; +} + .form-column { - float: left; - margin-right: 3%; - max-width: 50%; - min-width: 40%; -} - -.form-column ul { - margin-top: 15px; -} - -.form-clear { - clear: both; - padding-top: 20px; - padding-bottom: 10px; + margin-right: 25px; } .form-login { @@ -169,7 +175,6 @@ input.form-input-large { margin-top: 8%; } -.form-column li, .form-login li { margin-left: 25px; line-height: 25px; diff --git a/sources/assets/css/src/header.css b/sources/assets/css/src/header.css index 530eba4..0d68f3e 100644 --- a/sources/assets/css/src/header.css +++ b/sources/assets/css/src/header.css @@ -26,10 +26,14 @@ header li { } header a { - color: #777; + color: #333; text-decoration: none; } +header a:hover { + color: #666; +} + nav .active a { color: #333; font-weight: bold; diff --git a/sources/assets/css/src/sidebar.css b/sources/assets/css/src/sidebar.css index df63547..791d0e0 100644 --- a/sources/assets/css/src/sidebar.css +++ b/sources/assets/css/src/sidebar.css @@ -41,53 +41,53 @@ margin-top: 0; } -.sidebar a { +.sidebar > ul a { text-decoration: none; color: #999; font-weight: 300; } -.sidebar a:hover { +.sidebar > ul a:hover { color: #333; } -.sidebar li { +.sidebar > ul li { list-style-type: none; line-height: 35px; border-bottom: 1px dotted #efefef; padding-left: 13px; } -.sidebar li:hover { +.sidebar > ul li:hover { border-left: 5px solid #555; padding-left: 8px; } -.sidebar li.active { +.sidebar > ul li.active { border-left: 5px solid #333; padding-left: 8px; } -.sidebar li.active a { +.sidebar > ul li.active a { color: #333; font-weight: bold; } -.sidebar-icons li { +.sidebar-icons > ul li { padding-left: 0; } -.sidebar-icons li:hover, -.sidebar-icons li.active { +.sidebar-icons > ul li:hover, +.sidebar-icons > ul li.active { padding-left: 0; border-left: none; } -.sidebar li.active a:focus, -.sidebar li.active a:hover { +.sidebar > ul li.active a:focus, +.sidebar > ul li.active a:hover { color: #555; } -.sidebar li:last-child { +.sidebar > ul li:last-child { margin-bottom: 15px; } diff --git a/sources/assets/css/src/task.css b/sources/assets/css/src/task.css index 271d2f1..dc04d93 100644 --- a/sources/assets/css/src/task.css +++ b/sources/assets/css/src/task.css @@ -53,6 +53,19 @@ div.task-board-status-closed { text-overflow: ellipsis; } +/* board saving state */ +.task-board-saving-state { + opacity: 0.3; +} + +.task-board-saving-icon { + position: absolute; + margin: auto; + width: 100%; + text-align: center; + color: #000; +} + /* title one the card */ .task-board-title { font-size: 1.15em; @@ -83,6 +96,21 @@ div.task-board-status-closed { opacity: 0.6; } +/* tags list */ +.task-tags li { + display: inline; + margin: 0; + margin-right: 4px; + padding: 2px; + color: #666; + border: 1px solid #666; + border-radius: 2px; +} + +.task-summary-container .task-tags { + margin-top: 10px; +} + /* avatars on the card */ .task-board-avatars { text-align: right; @@ -123,6 +151,11 @@ div.task-board-status-closed { color: #000; } +span.task-board-date-today { + color: #0000D9; + opacity: 1.0; +} + span.task-board-date-overdue { color: #D90000; opacity: 1.0; @@ -176,6 +209,9 @@ span.task-board-age-column { border: 2px solid #000; border-radius: 8px; padding: 15px; +} + +.task-summary-columns { display: -webkit-flex; display: flex; -webkit-flex-direction: row; @@ -220,28 +256,29 @@ span.task-board-age-column { /* color picker */ .color-picker { - min-height: 35px; + width: 180px; } -.color-square { +.color-picker-option { + height: 25px; +} + +.color-picker-square { display: inline-block; - width: 30px; - height: 30px; + width: 18px; + height: 18px; margin-right: 5px; - margin-bottom: 5px; border: 1px solid #000; - cursor: pointer; } -.color-square:hover { - border-style: dotted; +.color-picker-label { + display: inline-block; + vertical-align: bottom; + padding-bottom: 3px; } -div.color-square-selected { - border-width: 2px; - width: 28px; - height: 28px; - box-shadow: 3px 2px 10px 0 rgba(180,180,180,0.9); +#select2-form-color_id-results li.select2-results__option { + padding: 3px; } /* Assign to me */ diff --git a/sources/assets/css/src/tooltip.css b/sources/assets/css/src/tooltip.css index 5fe56f8..8b6551f 100644 --- a/sources/assets/css/src/tooltip.css +++ b/sources/assets/css/src/tooltip.css @@ -68,6 +68,10 @@ div.ui-tooltip { margin-bottom: 0px; } +.ui-tooltip li { + list-style-type: none; +} + .tooltip .fa-info-circle { color: #999; font-size: 0.95em; diff --git a/sources/assets/css/vendor.min.css b/sources/assets/css/vendor.min.css new file mode 100644 index 0000000..9d81051 --- /dev/null +++ b/sources/assets/css/vendor.min.css @@ -0,0 +1,481 @@ +/*! jQuery UI - v1.11.3 - 2015-02-12 +* http://jqueryui.com +* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px +* Copyright jQuery Foundation and other contributors; Licensed MIT */ + +.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;min-height:0;font-size:100%}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,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");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;cursor:pointer}.ui-selectmenu-button span.ui-icon{right:0.5em;left:auto;margin-top:-8px;position:absolute;top:50%}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:0.4em 2.1em 0.4em 1em;display:block;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#2b2b2b;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:0 0 0 0;padding:5px;background:#666;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px} +/*! jQuery Timepicker Addon - v1.6.3 - 2016-04-20 +* http://trentrichardson.com/examples/timepicker +* Copyright (c) 2016 Trent Richardson; Licensed MIT */ + +.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{float:left;clear:left;padding:0 0 0 5px}.ui-timepicker-div dl dd{margin:0 10px 10px 40%}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:0 0;border:0;margin:0;padding:0}.ui-timepicker-div .ui_tpicker_unit_hide{display:none}.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input{background:0 0;color:inherit;border:0;outline:0;border-bottom:solid 1px #555;width:95%}.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus{border-bottom-color:#aaa}.ui-timepicker-rtl{direction:rtl}.ui-timepicker-rtl dl{text-align:right;padding:0 5px 0 0}.ui-timepicker-rtl dl dt{float:right;clear:right}.ui-timepicker-rtl dl dd{margin:0 40% 10px 10px}.ui-timepicker-div.ui-timepicker-oneLine{padding-right:2px}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,.ui-timepicker-div.ui-timepicker-oneLine dt{display:none}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label{display:block;padding-top:2px}.ui-timepicker-div.ui-timepicker-oneLine dl{text-align:right}.ui-timepicker-div.ui-timepicker-oneLine dl dd,.ui-timepicker-div.ui-timepicker-oneLine dl dd>div{display:inline-block;margin:0}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before{content:':';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before{content:'.';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{display:none} +/*! +Chosen, a Select Box Enhancer for jQuery and Prototype +by Patrick Filler for Harvest, http://getharvest.com + +Version 1.5.0 +Full source at https://github.com/harvesthq/chosen +Copyright (c) 2011-2016 Harvest http://getharvest.com + +MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md +This file is generated by `grunt build`, do not edit it by hand. +*/ + +/* @group Base */ +.chosen-container { + position: relative; + display: inline-block; + vertical-align: middle; + font-size: 13px; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} +.chosen-container * { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.chosen-container .chosen-drop { + position: absolute; + top: 100%; + left: -9999px; + z-index: 1010; + width: 100%; + border: 1px solid #aaa; + border-top: 0; + background: #fff; + box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15); +} +.chosen-container.chosen-with-drop .chosen-drop { + left: 0; +} +.chosen-container a { + cursor: pointer; +} +.chosen-container .search-choice .group-name, .chosen-container .chosen-single .group-name { + margin-right: 4px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: normal; + color: #999999; +} +.chosen-container .search-choice .group-name:after, .chosen-container .chosen-single .group-name:after { + content: ":"; + padding-left: 2px; + vertical-align: top; +} + +/* @end */ +/* @group Single Chosen */ +.chosen-container-single .chosen-single { + position: relative; + display: block; + overflow: hidden; + padding: 0 0 0 8px; + height: 25px; + border: 1px solid #aaa; + border-radius: 5px; + background-color: #fff; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4)); + background: -webkit-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: -moz-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: -o-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%); + background-clip: padding-box; + box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1); + color: #444; + text-decoration: none; + white-space: nowrap; + line-height: 24px; +} +.chosen-container-single .chosen-default { + color: #999; +} +.chosen-container-single .chosen-single span { + display: block; + overflow: hidden; + margin-right: 26px; + text-overflow: ellipsis; + white-space: nowrap; +} +.chosen-container-single .chosen-single-with-deselect span { + margin-right: 38px; +} +.chosen-container-single .chosen-single abbr { + position: absolute; + top: 6px; + right: 26px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-single .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single.chosen-disabled .chosen-single abbr:hover { + background-position: -42px -10px; +} +.chosen-container-single .chosen-single div { + position: absolute; + top: 0; + right: 0; + display: block; + width: 18px; + height: 100%; +} +.chosen-container-single .chosen-single div b { + display: block; + width: 100%; + height: 100%; + background: url('chosen-sprite.png') no-repeat 0px 2px; +} +.chosen-container-single .chosen-search { + position: relative; + z-index: 1010; + margin: 0; + padding: 3px 4px; + white-space: nowrap; +} +.chosen-container-single .chosen-search input[type="text"] { + margin: 1px 0; + padding: 4px 20px 4px 5px; + width: 100%; + height: auto; + outline: 0; + border: 1px solid #aaa; + background: white url('chosen-sprite.png') no-repeat 100% -20px; + background: url('chosen-sprite.png') no-repeat 100% -20px; + font-size: 1em; + font-family: sans-serif; + line-height: normal; + border-radius: 0; +} +.chosen-container-single .chosen-drop { + margin-top: -1px; + border-radius: 0 0 4px 4px; + background-clip: padding-box; +} +.chosen-container-single.chosen-container-single-nosearch .chosen-search { + position: absolute; + left: -9999px; +} + +/* @end */ +/* @group Results */ +.chosen-container .chosen-results { + color: #444; + position: relative; + overflow-x: hidden; + overflow-y: auto; + margin: 0 4px 4px 0; + padding: 0 0 0 4px; + max-height: 240px; + -webkit-overflow-scrolling: touch; +} +.chosen-container .chosen-results li { + display: none; + margin: 0; + padding: 5px 6px; + list-style: none; + line-height: 15px; + word-wrap: break-word; + -webkit-touch-callout: none; +} +.chosen-container .chosen-results li.active-result { + display: list-item; + cursor: pointer; +} +.chosen-container .chosen-results li.disabled-result { + display: list-item; + color: #ccc; + cursor: default; +} +.chosen-container .chosen-results li.highlighted { + background-color: #3875d7; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc)); + background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%); + background-image: linear-gradient(#3875d7 20%, #2a62bc 90%); + color: #fff; +} +.chosen-container .chosen-results li.no-results { + color: #777; + display: list-item; + background: #f4f4f4; +} +.chosen-container .chosen-results li.group-result { + display: list-item; + font-weight: bold; + cursor: default; +} +.chosen-container .chosen-results li.group-option { + padding-left: 15px; +} +.chosen-container .chosen-results li em { + font-style: normal; + text-decoration: underline; +} + +/* @end */ +/* @group Multi Chosen */ +.chosen-container-multi .chosen-choices { + position: relative; + overflow: hidden; + margin: 0; + padding: 0 5px; + width: 100%; + height: auto !important; + height: 1%; + border: 1px solid #aaa; + background-color: #fff; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff)); + background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: -o-linear-gradient(#eeeeee 1%, #ffffff 15%); + background-image: linear-gradient(#eeeeee 1%, #ffffff 15%); + cursor: text; +} +.chosen-container-multi .chosen-choices li { + float: left; + list-style: none; +} +.chosen-container-multi .chosen-choices li.search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} +.chosen-container-multi .chosen-choices li.search-field input[type="text"] { + margin: 1px 0; + padding: 0; + height: 25px; + outline: 0; + border: 0 !important; + background: transparent !important; + box-shadow: none; + color: #999; + font-size: 100%; + font-family: sans-serif; + line-height: normal; + border-radius: 0; +} +.chosen-container-multi .chosen-choices li.search-choice { + position: relative; + margin: 3px 5px 3px 0; + padding: 3px 20px 3px 5px; + border: 1px solid #aaa; + max-width: 100%; + border-radius: 3px; + background-color: #eeeeee; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-size: 100% 19px; + background-repeat: repeat-x; + background-clip: padding-box; + box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05); + color: #333; + line-height: 13px; + cursor: default; +} +.chosen-container-multi .chosen-choices li.search-choice span { + word-wrap: break-word; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close { + position: absolute; + top: 4px; + right: 3px; + display: block; + width: 12px; + height: 12px; + background: url('chosen-sprite.png') -42px 1px no-repeat; + font-size: 1px; +} +.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-choices li.search-choice-disabled { + padding-right: 5px; + border: 1px solid #ccc; + background-color: #e4e4e4; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%); + color: #666; +} +.chosen-container-multi .chosen-choices li.search-choice-focus { + background: #d4d4d4; +} +.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close { + background-position: -42px -10px; +} +.chosen-container-multi .chosen-results { + margin: 0; + padding: 0; +} +.chosen-container-multi .chosen-drop .result-selected { + display: list-item; + color: #ccc; + cursor: default; +} + +/* @end */ +/* @group Active */ +.chosen-container-active .chosen-single { + border: 1px solid #5897fb; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +} +.chosen-container-active.chosen-with-drop .chosen-single { + border: 1px solid #aaa; + -moz-border-radius-bottomright: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomleft: 0; + border-bottom-left-radius: 0; + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff)); + background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%); + background-image: linear-gradient(#eeeeee 20%, #ffffff 80%); + box-shadow: 0 1px 0 #fff inset; +} +.chosen-container-active.chosen-with-drop .chosen-single div { + border-left: none; + background: transparent; +} +.chosen-container-active.chosen-with-drop .chosen-single div b { + background-position: -18px 2px; +} +.chosen-container-active .chosen-choices { + border: 1px solid #5897fb; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); +} +.chosen-container-active .chosen-choices li.search-field input[type="text"] { + color: #222 !important; +} + +/* @end */ +/* @group Disabled Support */ +.chosen-disabled { + opacity: 0.5 !important; + cursor: default; +} +.chosen-disabled .chosen-single { + cursor: default; +} +.chosen-disabled .chosen-choices .search-choice .search-choice-close { + cursor: default; +} + +/* @end */ +/* @group Right to Left */ +.chosen-rtl { + text-align: right; +} +.chosen-rtl .chosen-single { + overflow: visible; + padding: 0 8px 0 0; +} +.chosen-rtl .chosen-single span { + margin-right: 0; + margin-left: 26px; + direction: rtl; +} +.chosen-rtl .chosen-single-with-deselect span { + margin-left: 38px; +} +.chosen-rtl .chosen-single div { + right: auto; + left: 3px; +} +.chosen-rtl .chosen-single abbr { + right: auto; + left: 26px; +} +.chosen-rtl .chosen-choices li { + float: right; +} +.chosen-rtl .chosen-choices li.search-field input[type="text"] { + direction: rtl; +} +.chosen-rtl .chosen-choices li.search-choice { + margin: 3px 5px 3px 0; + padding: 3px 5px 3px 19px; +} +.chosen-rtl .chosen-choices li.search-choice .search-choice-close { + right: auto; + left: 4px; +} +.chosen-rtl.chosen-container-single-nosearch .chosen-search, +.chosen-rtl .chosen-drop { + left: 9999px; +} +.chosen-rtl.chosen-container-single .chosen-results { + margin: 0 0 4px 4px; + padding: 0 4px 0 0; +} +.chosen-rtl .chosen-results li.group-option { + padding-right: 15px; + padding-left: 0; +} +.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div { + border-right: none; +} +.chosen-rtl .chosen-search input[type="text"] { + padding: 4px 5px 4px 20px; + background: white url('chosen-sprite.png') no-repeat -30px -20px; + background: url('chosen-sprite.png') no-repeat -30px -20px; + direction: rtl; +} +.chosen-rtl.chosen-container-single .chosen-single div b { + background-position: 6px 2px; +} +.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b { + background-position: -12px 2px; +} + +/* @end */ +/* @group Retina compatibility */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) { + .chosen-rtl .chosen-search input[type="text"], + .chosen-container-single .chosen-single abbr, + .chosen-container-single .chosen-single div b, + .chosen-container-single .chosen-search input[type="text"], + .chosen-container-multi .chosen-choices .search-choice .search-choice-close, + .chosen-container .chosen-results-scroll-down span, + .chosen-container .chosen-results-scroll-up span { + background-image: url('chosen-sprite@2x.png') !important; + background-size: 52px 37px !important; + background-repeat: no-repeat !important; + } +} +/* @end */ + +.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;margin:-1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb} + +/*! + * FullCalendar v2.7.1 Stylesheet + * Docs & License: http://fullcalendar.io/ + * (c) 2016 Adam Shaw + */.fc-bgevent,.fc-highlight{opacity:.3;filter:alpha(opacity=30)}.fc-icon,body .fc{font-size:1em}.fc-button-group,.fc-icon{display:inline-block}.fc-bg,.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-icon,.fc-unselectable{-khtml-user-select:none;-webkit-touch-callout:none}.fc .fc-axis,.fc button,.fc-time-grid-event .fc-time,.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}.fc th,.fc-basic-view .fc-week-number,.fc-icon,.fc-toolbar{text-align:center}.fc-unthemed .fc-content,.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1}.fc-bgevent{background:#8fdf82}.fc-nonbusiness{background:#d7d7d7}.fc-icon{height:1em;line-height:1em;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid;background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-event.fc-draggable,.fc-event[href],.fc-popover .fc-header .fc-close{cursor:pointer}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-bg table,.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{-webkit-overflow-scrolling:touch}.fc-row.fc-rigid,.fc-time-grid-event{overflow:hidden}.fc-scroller>.fc-day-grid,.fc-scroller>.fc-time-grid{position:relative;width:100%}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:4}.fc-touch .fc-event .fc-resizer{display:none}.fc-touch .fc-event.fc-selected .fc-resizer{display:block}.fc-expander{position:relative}.fc-touch .fc-event .fc-resizer:before,.fc-touch .fc-expander:before{content:"";position:absolute;z-index:9999;top:50%;left:50%;width:40px;height:40px;margin-left:-20px;margin-top:-20px}.fc-event.fc-selected{z-index:9999!important;box-shadow:0 2px 5px rgba(0,0,0,.2)}.fc-event.fc-selected.fc-dragging{box-shadow:0 2px 7px rgba(0,0,0,.3)}.fc-h-event.fc-selected:before{content:"";position:absolute;z-index:3;top:-10px;bottom:-10px;left:0;right:0}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-ltr .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-end-resizer{cursor:w-resize;left:-1px}.fc-ltr .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-start-resizer{cursor:e-resize;right:-1px}.fc-cursor .fc-h-event .fc-resizer{width:7px;top:-1px;bottom:-1px}.fc-touch .fc-h-event .fc-resizer{border-radius:4px;border-width:1px;width:6px;height:6px;border-style:solid;border-color:inherit;background:#fff;top:50%;margin-top:-4px}.fc-touch.fc-ltr .fc-h-event .fc-start-resizer,.fc-touch.fc-rtl .fc-h-event .fc-end-resizer{margin-left:-4px}.fc-touch.fc-ltr .fc-h-event .fc-end-resizer,.fc-touch.fc-rtl .fc-h-event .fc-start-resizer{margin-right:-4px}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event.fc-selected:after{content:"";position:absolute;z-index:1;top:-1px;right:-1px;bottom:-1px;left:-1px;background:#000;opacity:.25;filter:alpha(opacity=25)}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-cursor.fc-ltr .fc-day-grid-event .fc-start-resizer,.fc-cursor.fc-rtl .fc-day-grid-event .fc-end-resizer{margin-left:-2px}.fc-cursor.fc-ltr .fc-day-grid-event .fc-end-resizer,.fc-cursor.fc-rtl .fc-day-grid-event .fc-start-resizer{margin-right:-2px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-now-indicator{position:absolute;border:0 solid red}.fc-unselectable{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.fc-toolbar{margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-content-col{position:relative}.fc-time-grid .fc-content-skeleton{position:absolute;z-index:3;top:0;left:0;right:0}.fc-time-grid .fc-business-container{position:relative;z-index:1}.fc-time-grid .fc-bgevent-container{position:relative;z-index:2}.fc-time-grid .fc-highlight-container{z-index:3;position:relative}.fc-time-grid .fc-event-container{position:relative;z-index:4}.fc-time-grid .fc-now-indicator-line{z-index:5}.fc-time-grid .fc-helper-container{position:relative;z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event.fc-selected{overflow:visible}.fc-time-grid-event.fc-selected .fc-bg{display:none}.fc-time-grid-event .fc-content{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-cursor .fc-time-grid-event .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-cursor .fc-time-grid-event .fc-resizer:after{content:"="}.fc-touch .fc-time-grid-event .fc-resizer{border-radius:5px;border-width:1px;width:8px;height:8px;border-style:solid;border-color:inherit;background:#fff;left:50%;margin-left:-5px;bottom:-5px}.fc-time-grid .fc-now-indicator-line{border-top-width:1px;left:0;right:0}.fc-time-grid .fc-now-indicator-arrow{margin-top:-5px}.fc-ltr .fc-time-grid .fc-now-indicator-arrow{left:0;border-width:5px 0 5px 6px;border-top-color:transparent;border-bottom-color:transparent}.fc-rtl .fc-time-grid .fc-now-indicator-arrow{right:0;border-width:5px 6px 5px 0;border-top-color:transparent;border-bottom-color:transparent} +/** + * simplemde v1.10.1 + * Copyright Next Step Webs, Inc. + * @link https://github.com/NextStepWebs/simplemde-markdown-editor + * @license MIT + */ +.CodeMirror{color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror,.CodeMirror-scroll{min-height:300px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror{height:auto;border:1px solid #ddd;border-bottom-left-radius:4px;border-bottom-right-radius:4px;padding:10px;font:inherit;z-index:1}.CodeMirror-fullscreen{background:#fff;position:fixed!important;top:50px;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-sided{width:50%!important}.editor-toolbar{position:relative;opacity:.6;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;padding:0 10px;border-top:1px solid #bbb;border-left:1px solid #bbb;border-right:1px solid #bbb;border-top-left-radius:4px;border-top-right-radius:4px}.editor-toolbar:after,.editor-toolbar:before{display:block;content:' ';height:1px}.editor-toolbar:before{margin-bottom:8px}.editor-toolbar:after{margin-top:8px}.editor-toolbar:hover,.editor-wrapper input.title:focus,.editor-wrapper input.title:hover{opacity:.8}.editor-toolbar.fullscreen{width:100%;height:50px;overflow-x:auto;overflow-y:hidden;white-space:nowrap;padding-top:10px;padding-bottom:10px;box-sizing:border-box;background:#fff;border:0;position:fixed;top:0;left:0;opacity:1;z-index:9}.editor-toolbar.fullscreen::before{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,1)),color-stop(100%,rgba(255,255,255,0)));background:-webkit-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-o-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:linear-gradient(to right,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);position:fixed;top:0;left:0;margin:0;padding:0}.editor-toolbar.fullscreen::after{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);position:fixed;top:0;right:0;margin:0;padding:0}.editor-toolbar a{display:inline-block;text-align:center;text-decoration:none!important;color:#2c3e50!important;width:30px;height:30px;margin:0;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover{background:#fcfcfc;border-color:#95a5a6}.editor-toolbar a:before{line-height:30px}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 6px}.editor-toolbar a.fa-header-x:after{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:65%;vertical-align:text-bottom;position:relative;top:2px}.editor-toolbar a.fa-header-1:after{content:"1"}.editor-toolbar a.fa-header-2:after{content:"2"}.editor-toolbar a.fa-header-3:after{content:"3"}.editor-toolbar a.fa-header-bigger:after{content:"▲"}.editor-toolbar a.fa-header-smaller:after{content:"▼"}.editor-toolbar.disabled-for-preview a:not(.no-disable){pointer-events:none;background:#fff;border-color:transparent;text-shadow:inherit}@media only screen and (max-width:700px){.editor-toolbar a.no-mobile{display:none}}.editor-statusbar{padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-preview,.editor-preview-side{padding:10px;background:#fafafa;overflow:auto;display:none;box-sizing:border-box}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-statusbar .characters:before{content:'characters: '}.editor-preview{position:absolute;width:100%;height:100%;top:0;left:0;z-index:7}.editor-preview-side{position:fixed;bottom:0;width:50%;top:50px;right:0;z-index:9;border:1px solid #ddd}.editor-preview-active,.editor-preview-active-side{display:block}.editor-preview-side>p,.editor-preview>p{margin-top:0}.editor-preview pre,.editor-preview-side pre{background:#eee;margin-bottom:10px}.editor-preview table td,.editor-preview table th,.editor-preview-side table td,.editor-preview-side table th{border:1px solid #ddd;padding:5px}.CodeMirror .CodeMirror-code .cm-tag{color:#63a35c}.CodeMirror .CodeMirror-code .cm-attribute{color:#795da3}.CodeMirror .CodeMirror-code .cm-string{color:#183691}.CodeMirror .CodeMirror-selected{background:#d9d9d9}.CodeMirror .CodeMirror-code .cm-header-1{font-size:200%;line-height:200%}.CodeMirror .CodeMirror-code .cm-header-2{font-size:160%;line-height:160%}.CodeMirror .CodeMirror-code .cm-header-3{font-size:125%;line-height:125%}.CodeMirror .CodeMirror-code .cm-header-4{font-size:110%;line-height:110%}.CodeMirror .CodeMirror-code .cm-comment{background:rgba(0,0,0,.05);border-radius:2px}.CodeMirror .CodeMirror-code .cm-link{color:#7f8c8d}.CodeMirror .CodeMirror-code .cm-url{color:#aab2b3}.CodeMirror .CodeMirror-code .cm-strikethrough{text-decoration:line-through}.CodeMirror .CodeMirror-placeholder{opacity:.5}.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word){background:rgba(255,0,0,.15)} +/*! + * Font Awesome 4.6.3 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.6.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.6.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.6.3') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.6.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.6.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.6.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} + +.c3 svg{font:10px sans-serif;-webkit-tap-highlight-color:transparent}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-title{font:14px sans-serif}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000} \ No newline at end of file diff --git a/sources/assets/css/vendor/c3.min.css b/sources/assets/css/vendor/c3.min.css deleted file mode 100644 index 08e5084..0000000 --- a/sources/assets/css/vendor/c3.min.css +++ /dev/null @@ -1 +0,0 @@ -.c3 svg{font:10px sans-serif}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000} \ No newline at end of file diff --git a/sources/assets/css/vendor/chosen.min.css b/sources/assets/css/vendor/chosen.min.css deleted file mode 100755 index 815c9df..0000000 --- a/sources/assets/css/vendor/chosen.min.css +++ /dev/null @@ -1,3 +0,0 @@ -/* Chosen v1.1.0 | (c) 2011-2013 by Harvest | MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md */ - -.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;*display:inline;-webkit-user-select:none;-moz-user-select:none;user-select:none}.chosen-container .chosen-drop{position:absolute;top:100%;left:-9999px;z-index:1010;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;border:1px solid #aaa;border-top:0;background:#fff;box-shadow:0 4px 5px rgba(0,0,0,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:0 0 0 8px;height:23px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-single abbr{position:absolute;top:6px;right:26px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-single .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(../img/chosen-sprite.png) no-repeat 0 2px}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:#fff url(../img/chosen-sprite.png) no-repeat 100% -20px;background:url(../img/chosen-sprite.png) no-repeat 100% -20px;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-results{position:relative;overflow-x:hidden;overflow-y:auto;margin:0 4px 4px 0;padding:0 0 0 4px;max-height:240px;-webkit-overflow-scrolling:touch}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-results li.highlighted{background-color:#3875d7;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#3875d7),color-stop(90%,#2a62bc));background-image:-webkit-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-moz-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:-o-linear-gradient(#3875d7 20%,#2a62bc 90%);background-image:linear-gradient(#3875d7 20%,#2a62bc 90%);color:#fff}.chosen-container .chosen-results li.no-results{display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:5px;height:15px;outline:0;border:0!important;background:transparent!important;box-shadow:none;color:#666;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-choices li.search-field .default{color:#999}.chosen-container-multi .chosen-choices li.search-choice{position:relative;margin:3px 0 3px 5px;padding:3px 20px 3px 5px;border:1px solid #aaa;border-radius:3px;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close{position:absolute;top:4px;right:3px;display:block;width:12px;height:12px;background:url(../img/chosen-sprite.png) -42px 1px no-repeat;font-size:1px}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-choices li.search-choice-disabled{padding-right:5px;border:1px solid #ccc;background-color:#e4e4e4;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-single{border:1px solid #aaa;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:0;background:transparent}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 2px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#111!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-single{cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl.chosen-container-single-nosearch .chosen-search,.chosen-rtl .chosen-drop{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:0}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:#fff url(../img/chosen-sprite.png) no-repeat -30px -20px;background:url(../img/chosen-sprite.png) no-repeat -30px -20px;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dppx){.chosen-rtl .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-container-single .chosen-search input[type=text],.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span{background-image:url(../img/chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}} \ No newline at end of file diff --git a/sources/assets/css/vendor/font-awesome.min.css b/sources/assets/css/vendor/font-awesome.min.css deleted file mode 100644 index d0603cb..0000000 --- a/sources/assets/css/vendor/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.5.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"} diff --git a/sources/assets/css/vendor/fullcalendar.min.css b/sources/assets/css/vendor/fullcalendar.min.css deleted file mode 100644 index 6f1aa0a..0000000 --- a/sources/assets/css/vendor/fullcalendar.min.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! - * FullCalendar v2.4.0 Stylesheet - * Docs & License: http://fullcalendar.io/ - * (c) 2015 Adam Shaw - */.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}body .fc{font-size:1em}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1;opacity:.3;filter:alpha(opacity=30)}.fc-bgevent{background:#8fdf82;opacity:.3;filter:alpha(opacity=30)}.fc-nonbusiness{background:#d7d7d7}.fc-icon{display:inline-block;width:1em;height:1em;line-height:1em;font-size:1em;text-align:center;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative;margin:0 -1em}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%;left:3%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%;left:-3%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%;left:-2%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%;left:2%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;white-space:nowrap;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-default{background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-button-group{display:inline-block}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-popover .fc-header .fc-close{cursor:pointer}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc-bg{bottom:0}.fc-bg table{height:100%}.fc table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc th{text-align:center}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{overflow-y:scroll;overflow-x:hidden}.fc-scroller>*{position:relative;width:100%;overflow:hidden}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-event.fc-draggable,.fc-event[href]{cursor:pointer}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:3}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-h-event .fc-resizer{top:-1px;bottom:-1px;left:-1px;right:-1px;width:5px}.fc-ltr .fc-h-event .fc-start-resizer,.fc-ltr .fc-h-event .fc-start-resizer:after,.fc-ltr .fc-h-event .fc-start-resizer:before,.fc-rtl .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-end-resizer:after,.fc-rtl .fc-h-event .fc-end-resizer:before{right:auto;cursor:w-resize}.fc-ltr .fc-h-event .fc-end-resizer,.fc-ltr .fc-h-event .fc-end-resizer:after,.fc-ltr .fc-h-event .fc-end-resizer:before,.fc-rtl .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-start-resizer:after,.fc-rtl .fc-h-event .fc-start-resizer:before{left:auto;cursor:e-resize}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-day-grid-event .fc-resizer{left:-3px;right:-3px;width:7px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-toolbar{text-align:center;margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid{overflow:hidden}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number{text-align:center}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px;white-space:nowrap}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-bgevent-skeleton,.fc-time-grid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-time-grid .fc-bgevent-skeleton{z-index:3}.fc-time-grid .fc-highlight-skeleton{z-index:4}.fc-time-grid .fc-content-skeleton{z-index:5}.fc-time-grid .fc-helper-skeleton{z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight-container{position:relative}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-time-grid .fc-bgevent-container,.fc-time-grid .fc-event-container{position:relative}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em;white-space:nowrap}.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-time-grid-event .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-time-grid-event .fc-resizer:after{content:"="} \ No newline at end of file diff --git a/sources/assets/css/vendor/jquery-ui-timepicker-addon.min.css b/sources/assets/css/vendor/jquery-ui-timepicker-addon.min.css deleted file mode 100644 index 28f2d81..0000000 --- a/sources/assets/css/vendor/jquery-ui-timepicker-addon.min.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! jQuery Timepicker Addon - v1.5.5 - 2015-05-24 -* http://trentrichardson.com/examples/timepicker -* Copyright (c) 2015 Trent Richardson; Licensed MIT */ - -.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{float:left;clear:left;padding:0 0 0 5px}.ui-timepicker-div dl dd{margin:0 10px 10px 40%}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:0 0;border:0;margin:0;padding:0}.ui-timepicker-div .ui_tpicker_unit_hide{display:none}.ui-timepicker-rtl{direction:rtl}.ui-timepicker-rtl dl{text-align:right;padding:0 5px 0 0}.ui-timepicker-rtl dl dt{float:right;clear:right}.ui-timepicker-rtl dl dd{margin:0 40% 10px 10px}.ui-timepicker-div.ui-timepicker-oneLine{padding-right:2px}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,.ui-timepicker-div.ui-timepicker-oneLine dt{display:none}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label{display:block;padding-top:2px}.ui-timepicker-div.ui-timepicker-oneLine dl{text-align:right}.ui-timepicker-div.ui-timepicker-oneLine dl dd,.ui-timepicker-div.ui-timepicker-oneLine dl dd>div{display:inline-block;margin:0}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before{content:':';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before{content:'.';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{display:none} \ No newline at end of file diff --git a/sources/assets/css/vendor/jquery-ui.min.css b/sources/assets/css/vendor/jquery-ui.min.css deleted file mode 100755 index 9069d34..0000000 --- a/sources/assets/css/vendor/jquery-ui.min.css +++ /dev/null @@ -1,7 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2015-08-09 -* http://jqueryui.com -* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, autocomplete.css, datepicker.css, menu.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ - -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px} \ No newline at end of file diff --git a/sources/assets/css/vendor/jquery-ui.theme.min.css b/sources/assets/css/vendor/jquery-ui.theme.min.css deleted file mode 100755 index 8fa7ca1..0000000 --- a/sources/assets/css/vendor/jquery-ui.theme.min.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2015-08-09 -* http://jqueryui.com -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ - -.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px} \ No newline at end of file diff --git a/sources/assets/css/vendor/simplemde.min.css b/sources/assets/css/vendor/simplemde.min.css deleted file mode 100644 index bc07d43..0000000 --- a/sources/assets/css/vendor/simplemde.min.css +++ /dev/null @@ -1,7 +0,0 @@ -/** - * simplemde v1.10.1 - * Copyright Next Step Webs, Inc. - * @link https://github.com/NextStepWebs/simplemde-markdown-editor - * @license MIT - */ -.CodeMirror{color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror,.CodeMirror-scroll{min-height:300px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected,.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror{height:auto;border:1px solid #ddd;border-bottom-left-radius:4px;border-bottom-right-radius:4px;padding:10px;font:inherit;z-index:1}.CodeMirror-fullscreen{background:#fff;position:fixed!important;top:50px;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-sided{width:50%!important}.editor-toolbar{position:relative;opacity:.6;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;padding:0 10px;border-top:1px solid #bbb;border-left:1px solid #bbb;border-right:1px solid #bbb;border-top-left-radius:4px;border-top-right-radius:4px}.editor-toolbar:after,.editor-toolbar:before{display:block;content:' ';height:1px}.editor-toolbar:before{margin-bottom:8px}.editor-toolbar:after{margin-top:8px}.editor-toolbar:hover,.editor-wrapper input.title:focus,.editor-wrapper input.title:hover{opacity:.8}.editor-toolbar.fullscreen{width:100%;height:50px;overflow-x:auto;overflow-y:hidden;white-space:nowrap;padding-top:10px;padding-bottom:10px;box-sizing:border-box;background:#fff;border:0;position:fixed;top:0;left:0;opacity:1;z-index:9}.editor-toolbar.fullscreen::before{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,1)),color-stop(100%,rgba(255,255,255,0)));background:-webkit-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-o-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);background:linear-gradient(to right,rgba(255,255,255,1) 0,rgba(255,255,255,0) 100%);position:fixed;top:0;left:0;margin:0;padding:0}.editor-toolbar.fullscreen::after{width:20px;height:50px;background:-moz-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-webkit-gradient(linear,left top,right top,color-stop(0,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-o-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:-ms-linear-gradient(left,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);background:linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,1) 100%);position:fixed;top:0;right:0;margin:0;padding:0}.editor-toolbar a{display:inline-block;text-align:center;text-decoration:none!important;color:#2c3e50!important;width:30px;height:30px;margin:0;border:1px solid transparent;border-radius:3px;cursor:pointer}.editor-toolbar a.active,.editor-toolbar a:hover{background:#fcfcfc;border-color:#95a5a6}.editor-toolbar a:before{line-height:30px}.editor-toolbar i.separator{display:inline-block;width:0;border-left:1px solid #d9d9d9;border-right:1px solid #fff;color:transparent;text-indent:-10px;margin:0 6px}.editor-toolbar a.fa-header-x:after{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:65%;vertical-align:text-bottom;position:relative;top:2px}.editor-toolbar a.fa-header-1:after{content:"1"}.editor-toolbar a.fa-header-2:after{content:"2"}.editor-toolbar a.fa-header-3:after{content:"3"}.editor-toolbar a.fa-header-bigger:after{content:"▲"}.editor-toolbar a.fa-header-smaller:after{content:"▼"}.editor-toolbar.disabled-for-preview a:not(.no-disable){pointer-events:none;background:#fff;border-color:transparent;text-shadow:inherit}@media only screen and (max-width:700px){.editor-toolbar a.no-mobile{display:none}}.editor-statusbar{padding:8px 10px;font-size:12px;color:#959694;text-align:right}.editor-statusbar span{display:inline-block;min-width:4em;margin-left:1em}.editor-preview,.editor-preview-side{padding:10px;background:#fafafa;overflow:auto;display:none;box-sizing:border-box}.editor-statusbar .lines:before{content:'lines: '}.editor-statusbar .words:before{content:'words: '}.editor-statusbar .characters:before{content:'characters: '}.editor-preview{position:absolute;width:100%;height:100%;top:0;left:0;z-index:7}.editor-preview-side{position:fixed;bottom:0;width:50%;top:50px;right:0;z-index:9;border:1px solid #ddd}.editor-preview-active,.editor-preview-active-side{display:block}.editor-preview-side>p,.editor-preview>p{margin-top:0}.editor-preview pre,.editor-preview-side pre{background:#eee;margin-bottom:10px}.editor-preview table td,.editor-preview table th,.editor-preview-side table td,.editor-preview-side table th{border:1px solid #ddd;padding:5px}.CodeMirror .CodeMirror-code .cm-tag{color:#63a35c}.CodeMirror .CodeMirror-code .cm-attribute{color:#795da3}.CodeMirror .CodeMirror-code .cm-string{color:#183691}.CodeMirror .CodeMirror-selected{background:#d9d9d9}.CodeMirror .CodeMirror-code .cm-header-1{font-size:200%;line-height:200%}.CodeMirror .CodeMirror-code .cm-header-2{font-size:160%;line-height:160%}.CodeMirror .CodeMirror-code .cm-header-3{font-size:125%;line-height:125%}.CodeMirror .CodeMirror-code .cm-header-4{font-size:110%;line-height:110%}.CodeMirror .CodeMirror-code .cm-comment{background:rgba(0,0,0,.05);border-radius:2px}.CodeMirror .CodeMirror-code .cm-link{color:#7f8c8d}.CodeMirror .CodeMirror-code .cm-url{color:#aab2b3}.CodeMirror .CodeMirror-code .cm-strikethrough{text-decoration:line-through}.CodeMirror .CodeMirror-placeholder{opacity:.5}.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word){background:rgba(255,0,0,.15)} \ No newline at end of file diff --git a/sources/assets/fonts/FontAwesome.otf b/sources/assets/fonts/FontAwesome.otf index 3ed7f8b48ad9bfab52eb03822fefcd6b77d2e680..d4de13e832d567ff29c5b4e9561b8c370348cc9c 100644 GIT binary patch delta 61161 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 X*%aAS*^JYp4#U8YCTuIUEB^lh%)3(? delta 45774 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 diff --git a/sources/assets/fonts/fontawesome-webfont.eot b/sources/assets/fonts/fontawesome-webfont.eot index 9b6afaedc0fd7aaf927a07f82da9c11022251b8b..c7b00d2ba8896fd29de846b19f89fcf0d56ad152 100644 GIT binary patch literal 76518 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%0DyT{kunD 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⋙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 diff --git a/sources/assets/fonts/fontawesome-webfont.svg b/sources/assets/fonts/fontawesome-webfont.svg index d05688e..8b66187 100644 --- a/sources/assets/fonts/fontawesome-webfont.svg +++ b/sources/assets/fonts/fontawesome-webfont.svg @@ -169,7 +169,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -626,7 +626,7 @@ - + @@ -641,15 +641,45 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sources/assets/fonts/fontawesome-webfont.ttf b/sources/assets/fonts/fontawesome-webfont.ttf index 26dea7951a73079223b50653c455c5adf46a4648..f221e50a2ef60738ba30932d834530cdfe55cb3e 100644 GIT binary patch delta 13912 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 diff --git a/sources/assets/fonts/fontawesome-webfont.woff b/sources/assets/fonts/fontawesome-webfont.woff index dc35ce3c2cf688c89b0bd0d4a82bc4be82b14c40..6e7483cf61b490c08ed644d6ef802c69472eb247 100644 GIT binary patch delta 89953 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 delta 83080 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
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:k.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?""!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("

    *r@`mw=nF{1pakSqUq_LWnICN?vDkRnDU^6|Mg>8bIonzGc zH{?evg4R^6!gPQ>pU^XW^K_hsJPD4Gl`S;+5w^7QK!;dsEmLxm`^9g{y_ z9Mn45taREn%3uBh-LfEMB-#|POVJ0y7w_4zW~}%qS(e(UG5Np#-r1kno|cQvSWoG< zTlnZ**`4L=YVZ&sR>-q~=C9i^W%?dYmqO9$)$QI6d}VK$E%r0oCyUh+x5xw&!-!d> z!b=D*;Xr4XYGQb5Ghw;+v6Yy<<@Vld<>g%Am3|`rg?kBa=$~`3)r^{%)wG z{ug(LEp7Y#Uf$dzpm_9D(b>SA=8Wnt+pjgYOB0`bmIu@5yM}6mau1{-v?Ur3mIee# z?Ux)A>c<*z+i<_;X1bCQ$%Rs|mS(w0A|v>@9evD_@j_N?ub#%S`G<;`Ls`q#t32j* zTb;Pc{aZaP){p6vS$&_$+18_{1U|q0r;4vuf`LOvr=`%NBTYJ=;~apu>vN?Do-3V> z$tZu>G>4#%@9&IGpW~0^o)L@&QvaOw{Rz38FGHY*Tww9ofV*r)ohbj+^`QNZ`XNkp zmD=51bNZ>qWt7OV`_yu@kEf)`S2@Rc(B;XdO*kEaf%$VxD+~I^!jTah)!Zh$?EbMq ze+E1{^IJop{xkEYNhOeF^rPg0GTWQ(bVv%dhRT3KxIP+9@ z(!Zhz=?9Wr_xIjMMHTWXIt;rC;`2qWv+A5M)q)%0<5Z0H96d{AJUTxImCw+~^`C#_ z1e~ISWEo=?1dRZ@8v#LCe|b~N!pAqXj3&O#sG zz;V(_ zaC_|0sau-1^$rIvO}q|RR}8Cj#eO5P?S6-lRy(`PO9g%kA6J~B(~bhZt4Xhg^&Qre z{n|0FnDQNjwcgsE=dB+hn(z_~yan6s0jR;f79Ady=8$s6)_s5z6xa~S*#od7*sHBOX!w3v~GI9$wsja8Yfgq9gd>9F{I)6Ym z@5kB^66}}K7rWyY^8=PR|0iYi*XfIo^{Rj;0~zR&)QY_1eK3_jusqinHj7n1q9T|& z(9-2ZFWCi4;Jt5&>NMPJ)j#{}B(0c2yD7iq8i($?GqS1JF$!dmYjNnuQZ(OBtn0k#=)Nh@`tobkUi;GY1E(lk zrZ_J-!-IE*ixO*(1m5=PT8*}UuU6*5{B<~9p9pbVIKsBX``9NNJG@+@rlyw2u7OTB zL&MHzvEYl^E*$!;fii41r3u&oy&*8)7|8w`OX2(ODKpyi0dRDy$SD{W#zSgG6XG(1 zLWi^C{Sw4^fm(K*r^O?k(kdBx<}qIFyustib+?W9V3m+jx~o43`hXRnq1Gr+r$4VhfNCh)uRvo`9+-lc*&X-gajG{6!BEW_kk z2D}VLDKSNr-f73AA`S(5s$G!4q_be9DO+4_BBEhoI&{PKjE~dl)@257ldHEA57J?Dro4p`euV*U#YF(MxF1;Y{R9xYym>fZA9_m>HL#M@?dR`! z^*Wg{?74_m1=@KEr6O;O6maP1NhlGl=sfrLNXhTCYS8oZf)#qXkv#!aQ8g?F+kYSG zXKN!RMpQ=TRO8T8%7P`Msqk-0juQT}te5YvZe7ik(+DqN{r&+V)So76YKF_temO<+ zWJ|mbeVfaRR#v{f4Ru?o0RXcD%kxv5?2?w}+l70a>B7!?yWNU-6Aqqa6Z^{u=B5?X z(zbWSwiR|t`E49y=gh*!$j!SHMXKbIV(IS-kiS3sdo`yM=R{VRQxheIcUz zZq{n0e-6Z<$J5E6!+rkz>h8!FNZ=N5tOFi5gp9Uix3yhrhQh=?K!7MD1CLZB7KH=K zc>m6(p>TNY4MNM>;SkHvshjXWTgUQ>opbI>Q&OY%_l<{Ho1O~Jhv{@xSq4)_E=zJ_ zLHFhnzU8*~W2}s;2O@13xl8Vu)wl(8=lIKD>Y1tRdQhwqBrR>? ziu~thhJqm%Atr1NNq_-13u-%bT!}I^>~>6Z4m?7FA{2XW;6zi$2Z^XJ6nM~FY@HVY z1z0{-n^&TVC%3!nYzPW1CTa|nN~Phx!Yx*v-si2XRf)v-eZ|u5jACE&*`+1QDTVOo zu{jdqR%D$kzqe|0Tg!I`#OYszvb78Q9EC!if(du|VycPAC;;Pl2gn(s#O5YzPDWV; zFD8X5IL2csrPJkaJq8`zO%iyGqw|O-IPi@2+y!4mLywc)I&EG@xW7K>JWX)l;EQXH z->NT;GK^vv6Cl_<=Ynxp_^Zim+ag$4fogx@_z%lbJX4PtbxOk+rD9l?wWlZSl>WaK z*y>p|yet+!Q~^sNa44&>1#3nHzKe`_uu+?fyFmRVCT^Uay611mI-r(yK7J~CSbrT= z^%*^qX1u8G`@)t3zfqb?z?YjxD|Q+UD-+deIRy4dn|V^4*CqdOONZ}ef%!orFDLW; zuZuXxg^zKuv}2Y4&(RBNnqKzV6gj{t>=L!;aClgq`PYJr72-Q-W zgJAER4)r78WKg&TV#V|%)+Zc?Id8MPW2)09+J&Tc)HJ)1NFGUgNi-1-e^fvZDY+$1c0Pep*ZrFRkg%1ZQm3r|&@X_Y>+{49#K{E0Zm zwA!O{$hB79D65Y_6}ik;$TDx`{u=H$}^1(Q*rjZqtqRvdT`;8fi zzf&Iid_0qAzd$@+2i?YFkFi!*6+C|hmxfx{AkP5LROZU}B+R(3QdO1Mv}j$aw{ZhD z;X^{y(pgq?3qMenItH~IuoiNK5kI(rqRwwHO7Xu z&!7e1bfXW#+q6vDiLaGRqhd#sr>(*Z(E=(Xhr>}B;?M@|4wX>}qbF>fQ^(xRS*@9& zsEEu#n!4Rm#Vo;l#?HShk6abIB%}&l3e%x?WEKjKL0(Lh7i(*#t0Q(1+FK%l9nhwQ z!>`F((k0o0`0*YXd=IWnK}OkiB9|~} z!4cz6f-rMO)`#6fWqI@3BM&AsCWGZ;rs*#Aj1g(4po&h8GAfp&hzhL<&RWJp?-v2? zDSCwDH1a^lIS78k@ethLr0P^@peN27jbNhWASjg(A4j4yT@z~Wc#C<#SzDut_lM)T z1&gN^ilQFYV&=*7IpvdGXJX%z*k~{@lj4yiL(~q6apZ)|xpYMx$@82`L=vlrA|HyM zx2V)WoDpL&YvF4(pWHJjBQta4;EMs3OE_|kMi0`)kZ=+(a0Z~LJZ|YeT|!KU4_abl zL68|jQ%nljC*pQ&)TqVFhX~2qMOe2KgbO2sOe9s>%`#w^e5De^bFBS=aXiuy$AZ;n zOvEu$yy8)kOdCGZ$Phi!s9`=N#sghH zqZBYC6snDWBL%1yjAePSbrL*f`T0?(8CD10q$y$RcApaD~y?>mmtu< zBbZm-!3#CKo**7eIv7wGZmSoXphp%-u<3asiYAd*U?dmcEg@usE*Ozd=3&k(FpVe> zciAkqWeNOoT5A$kl@3=jagg3WA#7AVB3BLwrhCYvEB+pv`&Y6BFY zk?2LE8OcJeo$v&}mk1U^99*(d(&_a&VpsG?(D8~*4>cKy4Vw%)og|4EMpe)uBah9{ z16XMY8$@B`*6=5x9zYgMw6!{zW`7E41S)`Kg+&3NxJHDPYs7lO+n_VVkTBQFHC7id z)#{jrf%CLeyqVEWPO42<#`5(gtyU@n>IX1qVh5a!W8ZRcNP^R?ea=Bct?*}xE2y65 zrf3u&jXj9paJRmFm!?qDv1^LWrvCaH!u>bst#awE;rEa{ayium#Yfjah=2CSX5RL+ z##jpajSa@5!<)&Pxel)So0gg`L@k`Ioj|<=(?L}Jo#k7or|!aWyaw+#ea+bfZnZZjE&loWHU!)7hBo)KB~qb=q%f93OR$!j{o>8 zN=z;AbA0LBB=jnqeq4O;G?e`Tx2_KjYHU0-*tbsL@+O;7V0;;@`?^~xC z)m~REyE&KIHleHn=jfMp^y~yGGoLb4u|_I?1W2e}`Utw{Ug&iB zgFE-CkEoB_O9!a*F`awSMG&BPO{O@#qhe{$MUaVoiK^g@GAml-cN6FH$HwKNMzm-y znu68MQqZ~uMUzeBn4NH$o5oG&W^l{6HH=eE2^5>gO~_Ki)DwRNy2PO?e+`7f9a&M5FeSk) zOK-dMi6uhc%+4MC;*FXBAqFU1vIt$+)a;Jb-C49u@`-67!Q}JQ`qG!Ci;pc@a)Yq# z&bo-Zxe0Azk!4-4d&Mondt8v4$z4{mI0B@wpJ!wnkYc08QGYV1Y&@kLmMx3e5O;>t zwAr`=ez$ZdkEu6_h;ITe1_GXZEo<4K6rp%QGnd*qgA2?)i1bXFY+YJbQP~ zp-uh0{vQLqaV@MlGt*HIQmg3<>av=2d`V)ZnH~c{6n{(0A=xSXvwilaQ~6D^+tELB zW%E=~Z%%zjeGh+Eeb13!b>6OB=aCw8Pf4)r>RIYC^!fS-x<|b_qHQ~~fYNND%>7E12X6em4cbfIHmL1r$biE`rHlMrqzCFvAMdN-tlu{Dy(M)6474`uX$q=KAI7y9YWikDaqT zb@#%yX^8JbyLD2|779D|HSI}uhUuf&ncUM9W)D2nVGKKTtzKdSvs}G2a503nc&wpz^#@FUg?-6bkZe*5}9c9ZDn)Qp4kb6n< z0WoG%s><&imtMH>(QUV1Jo3-0-+1iNYw`JpZkyRqeBzu-HXRrsy56O^<-NrhybX2H z8uXB%$7V99m-Jq~f5Lm!w{0i$69iVfUt`(O zy_%8Up^7nL^1JaN=^(q zB)n4{Q$1SC7q9JGHMP!{(|@%aW;WUpP9I)%t!V+yJr=enm#3PixNB-VI+N3v%}p$8 z$<}nK-_XX)Vpqs@7hTl&MBF4t26m~Jt2b35#*Hhf(jiK78`xetMo2KCDVSt5!>Zax z7^p%DJJ>3h10-0oI9tAv)09Fe-ki>Al0fc~y)-IaB{F5-512F{`hS+s-FDk25TDrA zca_0t5lqW1iS(+S*UXyP*Y~s88#^NJpogVKcUxrM;`xhjxMs=z=~f-38!xf?twLyO zb5G~|T>rwUtxFnke)QXQxzN-L*F2ZsrI^Ce#W!@>Yk{VGpnXke$Ex`=XZAQ+e4f)> zEPd66?6gozo89S-+kZ?ti}~_4e>5@$H!O(irbog~SFN|Jd)D&#bya-Pi|DPB5^dFt z$+A8rvXa{=Y6IeOx|OQlYCUezhRlipwA`+&yE0fby-RV8j$BOp?wbsQG~PB~TSQ09 zwOy$_4J(#z^|$*G?#gv3W`r!_)KK@T^ER$*Z*G&rvQx4G&3~;lG+%7N%U>PX0krZYk6+$9A~J=ag4Xie-HPVW_6*u@A5c5`oHWSU*Gs|Y|`(1 zSAF8W$~`tl0Bs>MwNCeYp1Y z!zG&z3e!1krdBe5@I_%JH{DvX1sZYFouU_^N#6Vs6o1*Q{u(#gPoA`A>@VBxf=J&d zf3SYN-w!`@{V^jC_FKyiZ z+q*CO>aI1-ix>KJ*n~wn`QxJx9^JdSdx1q4ac2@eD{3y1`QvKY0_PIOrwyDxx8aMi z>3iQhbj^4FKjz*8K91tnzDdwrtDY#!a{(%LdC0 zgMW?f!PqXn=BNKMdFM0z zeNXQ?qhi(!y_M0hoVoUm`)|De(*9;#Ia{=*Wxivj!~AT1obHZAzQ;oKAoQnscbwnV z(7W^E_O-WrSdF35Y!_P>9en5R3m^DwVY6@B!s42Vo90ffkyft0H5<&Evu(MEynlwh zHNDn|K?%vPwa0O(O<2$gM56vEl5wmNYh<*9O5eyy2j8Pz6XwTOU3ulIr7e9MZX6sM z8ocinu=wn=&q4nIAzy}t+nvFEj=Grt>X)x>TC*B!U*6h|vz-Gk9wFW0`R^Vz#V%9u zbS*HCRN7VrB1mRQmCoH%ec~*bFVm~qnJbMs;6}Hs-tfmJ^B{h_@?xuXK_YQ4ooj@P5ork1@8>Mb3u60 zqM82TwliNR3t`*jzHHBIJf`4)Ni`82< zW<>|y#L_wB>wK0}SBb7r6Um%fRI+5et2`cgW3|ik%`b@M5!303XU?@>aV8qLWNC=1M zGe}wlDX}htm4KFw6rGT-m4CUiWhZ(J;xSC(_ER`+KLv=dgeW__%hx8TB*ann`Ybc8 z0uO*!_PGZ!iTwMB89w49OfY$6mcjV!047M87 z?A$sCd(%mgJv*I*y)yN5cD`eh#|QPIhv_|@6q(oZxjbX5;@>*h?HYCr1)al>dh#M)_(v(uh)4V%+^mB7DxlWAek^Am#cE;|8O_12W12GK0 zMezov0urbF5@N+wsFq|!d1V9WzqDb>xe)*&=T2#O2uy9LSlK0Awp25*q9tZW({rq) zVxne=^pLOhoVhdD)PKYkbmQ>H#KYZL6a4q8^6HwJ>hhg`2!RE&u8l~?6MS`1i6E2| zRr86@9p%@z&FouF-udHbJljCx=PDG82%GG#i#-a7Mqj3Qx0=0zsTz2#eiEt(mPyZm z72vFSaL($pez2OkMtXMkg0}fqt@JDs`#~49lutRU?cq1+Yk!8l^dCWO*UFV$)6P6| z_=EJzP*}HpQp6oezYDGbUrm^Bt!F}g@t;Rx)Yp+Y5r;IFgn~GPK7zGw*r$ig9UMPO z&5uFy7_>Cs@w)WU?T<*mKAQ)s%QZ$5-}UzPz8Ch-p1uEtzLif+zC2Gezjr+lufH7> zzD^fPFH0Z2zJKGoeVPK*el^sr=tJ4xL|08|-=C+szi`dQ9j~J@mY%S3e`9}(ahtp& zfM0Qtr<=n;v#fHgl_4R;tX=6sVGc*%vx@G>z>u&FHiYqGGkB_h3#=!+wKoPUPEflI zr3PqaOpJ;yq+MF4;MA8EN_~ZDwN2}$-9e4XtTA&IXn!z(rQ>A-JGN19S0~jLMPmhyx~Gw)>bf%;_LWScHLA z-h8u$bAQ!_`8CbUO_rWp_ghSra3wjDeuZqHlJAPEME|i%{Nhy@5ejSo-Ctb|$eHO- zp%*>`b~~#KE~m7YozXmFe`(K*=FJ8<$17yBP0p8+j{l*k=mWq#gKu*6SJG3NaY4qd zvf=rULV_BSeK4#$ACnQ?OJb%VlLNHEA^al|t$zs6a<|kc-Es7qy$fBA@Xb3b8YZ>8 z3RWFG3TEfwT(L&S7@(`K!0q4@a66N{;_r%&cH`mwCvxvnSL*EmxKJm%rpPdG-;P|(v zM=IEP-cd9@fD;sb0UE=+vK>}7K*U8>HcluG@o1Ew12~vuo1jg9q%UGLW;64W)X%5{ zy}u7mPE3G6HFg&6&=v_3!F zFO|yV9%rwvJC(T>A5C@FrRsCCNeZoIXHkn4xhUiGj?rh#v07Qnh?h-V#uS9T$$!A8 zT{4-;@%=Fh&l=by1gt?HPi{viZ+`RUU|n$L>Y3hF+AHd{x|&6eo#$2XRz_MIb%zGDT7j0 zBc2PASd|Y3fhUW%nm!xlpPwf0d{9=?W7CS>h~|UdtXxU>R7_MUwUpQ4TFtUb_F% zjgvYxWtyb^BYhHWJCkQsH8nHU1qD_5wy>pVd5a(iVYM$n6Df&OVwK7Y(wn7}BDBJ^ee z7l~>)3#*vH*(3ZuQ4(WYk+T40Y+0COk3EH5nWY575V`RXCUoq@gpMmTFk@}L@?30f zz8%m_Q&#jJEZciO>@^6Wm)Lm*35(<)s@4kK+r$RF_x-qA|2C+6^xD>g{oSp_N5_^i zL>!l8oQJF*ZbU&=IDcsw@ncXc+@;AY>?z7PXuvf=`E@#jAdxl(y`uE_NeW5jbBy!U zBC0oM(P6W`8gv|er6ky24(`Vhj-EK`0Ql?8AcBR+a5Q2+7^=fQm~JNP*dd#GnV{^p zp$#nm4!qoNz6Xvi$L$v6O(=MiB3p< zdpH!=DxV>eM1O5IY+*`+48eTw`#~qCF*p0M+q<{;2v8j<_Tsd^*{tE5!T0aQhZ?4! z)}dvmgGB2}tF-OVhaVo=XZh{51e(HKf}}V>I)`ZQ4hU$c#0@dW*0sO2>>~%Su&!)H zO{4H-%63(}nhnUlQEU!k9Ic%qSyw0phdh$;h>`{gGJhg7I7}sF7br;WTbe)znIr~Y z+qaZP>ElS=l0Bb>hEq%TvD7})rnxw=$fzi>?;jaPC%$Je*!K$ll4Zk$BHR1On?AWn@T6qXEFRW{s?F-`cR+@vD!7M}J!d*(2D`L9x6iOM46Vf%7yv>6bdN zinupW7`QhB-C_{nP$rdsR4_363VTbBC-Gf4VukONE-TW32Hi1%p|Ch`jG}upMkB*u z&boJk%B68Mbru7DtS#v=>L=72)E}uYkpyJ~#h?nbjOBigj@oBO?FYu;dOp?p!2i## zKYv~R(e=fs+UAV6;x zgZfamrvDsU@w{W{e~xqTpZ^ClO8-1%$&Ou*fjfs}0WQxS7;7L;@y$F-{hs>z|Nd9< zzv-n}zl^;8S^zSb{r>1kZ=)6vv5v)vkAHZxE13Tyz5Dz2z7u#QjK)EnmU|&Nl~r>k)urGF5a!RR2^>ey1j=>hMTMeqtb8ZrBMe+XLzqoHUV z8#1Huh#eh`HbL3f7ewqVW4G~1Ablte4ke`DPr}XLJD5lerg}Y|WGa>PczRQKp9n*f zKp=tH8(1fR2@m=ot-}mz4;UQsq&zA|(xF1zAu#AsBG)~$x6!*rxNKC?*)zhO4ni!JFLmwtQV8}zKJP90cae|6YmlCN|>cc}Ikw_*} zp5dVpyrY;sBu6iCguMXh z{~G0+II3LVhYxkUa!Dz8l# z5oYd)_8Q5tAdGjAiJY$1BMyH)rl|P&;M{Q!Q*yZuqjGJ@Z?9224Z?T_QMpc9-Ej`X z!((4A%7F_u&S5+jq5cK8koSm7r3RxZi%~~Xa*yaY^ylL@78&1A-+*(o_x#?S;AC%` z+;axdGZA{Oe9!;j1%HCGPxemmJ*&_?x8%zCJsY2{I!SXXc4%2{td?;{^O1UFTfW7e zU6I$df@t0tf>n**5fOn)5Ziuw$m5ZT#yy@ifl1FAVw0gj>oo*Uscd{ERggUuMXlhKs26{jem-{3qm{dA3y2OB#_$0?Eg4LQhks$g)HDxBqX!!eUQeq8c zD4p7D#9$`6z#^+(bMXe_=a9YjpkaEnu6uevY>|!YSC9>pCUE=x(}$av?_0inAM=%B zdY3`X_J8hMikTCa?)!QFbevK8A6Z(L4e9Bt@eQX>r~i&GU7o&2J}HMJNSoy=_l@)! z(aL_5nO@3`MkP^v8}mBj2o6|ap)sU_0uqY-!P$zD{#RCW#3Q27aSv_O@j8>y%(DL0 zm78w4Z6zjtl_(LfA<+j9e|2{h4E{j+Gw*Y%&3_i7+Rt^y*9>l(A1l`3m|c<$|6r6< z>Fi6gSgjQK?rNw-cqT9aUl`O8rnO}bqlLamFS_<$Fyd|4_e*d{;w@!Iv%FPw$?oX^daLJqp=3H`MWn!o$c&J-Bpc z@_+vQm-TyFFLOmU+`InzyKmUH?%wqg*JYruXI^LLypcZ_ocDlLtF=CG-lB`9R~Zad z(=P(5H!hel(Ck-pVp;3zi96r?{Lq|5Ti4E-=l9H+xpwQq*@Gj$D?5G*%D9KWnp2Lx zGUE_hil-Af^D`!19YaDi1j)HX7FG~`GJl$tNaljv#$qnW5RQ-nbuy40YGDG33t|Cp zbacVc!j;Xj7v-0WSj_Dv3YyB`7ve$#s`6U4AuPRD zaiHUPDqC)}vP;Fzuo>Ype?_r$qr>E{EC%asPYvd(@-S$MPP(VHQMxfYDOZ`LgMT$) zPnH8n;q)$~N~k)*)I&_DK>|18Mq^UE6}Z7@U_Z(fh8_bnxgi?)g?ys#a{|AXejQLb zoCVdYf=eH`v_LhX)*)$RUz+K%FU|C|4}UHVfBx`Vv<1xP4}UzGto*g}Z@A%nbOUso zo>i-QoDNepc%xswntb{azHDvoHh*Zi9`)UhUpE_p@{{fT*y93!F8@K@RF2vSO0B93 zoDLPPs}%pw>J}-eHf5@%LbpLxh3fxp-L%AazXDtNGk%D;i+%qpC4i;OYOU@QR#=Hu5af@%=O;%qah^5)Q_Bw<3S zjIxp5emiyG{R64DrME%l+jR16kQ#FhPM$@oqj-3|EiIDXP9{MmcmQA~aAQ_4g2!U) zM~&yoxzq}3J++;>h-hB#p`IjGd{iei9H4r{^U|TbG|GeC8%m>E1Wumkw8u}DX7khL zY&wefMZ)kk+9qJ?HKBh=(|?c&{ZsZB$~24wM!MIO&YmY5F#c|4D^bdRZi{X^fG_wC zO{>$R-x2&wjG_q!NRF@ae$!u#IV6pf9GLO7+iet$!Ng)N~=|;6+Z$F!Uc9 zqiXJm8S*bIQN36WzWCoYB-Sk>5v@pkb;6!!R*~(s`^K+a&Nu!?loey@0BZ)G23H8< zRuaHEi-A@^90csHH!71AJpqZb1i?lYw~NX`(iTzV^uCH{A*Zr%bOEfmG4ak_BlCdU zjywo{F&U$)D6%(p1fL{r#*qLs8gJUQt6paYDkr%1zJDpR^v6f#la3Ys^sp?e!V`zN z-Ruyhp-NF5s!-e0W;;uV)IcN{t^vXwgqee4m^cVY;3De=%-sM;x3{|wHG$S<9r#+h zaRFan6dzJ|q^iQRM)@ zep8u$@Hw)%xvmlpbzYjBTUm!zqjinOc(DU(%7G*r2l)Zb#i1#cp|UvIGg|k~Y^q(> zGO@xxRWIoD_v%^IAehi|_ue_ck-5MDr^c2yHM?x~c?IU;fLJy6dcUi&x;#--aE3{> zOXJo9O>5sxne{fr-?STZQstvx$bWRVnaRwGzgv3r440Jkz(Hpsk)f1EiKNW;B7>1- zp)WvEF^;8EL1ry6F3G{KkXng;+*w|aQ4bMmc}*RngGwBC{_Wj`AcS{Apb!MGbv6Jz zL--{AVYoEONE1*rJZe#_#IC1&Sl<<}`f-H6AHxQDqY;tzN4*5}AQEeXUVp2f7J=1E z9EzFD8w$xRF(g(e5~VNv_K-tG(`t?JHc3jp^!(+(as{-aBebgEN&t2}_bU7}EzwNf z%rj=zHI+re2HQGkVD7qeE~}Zos5?%7a{v9q9_Fy*Ik7|qQ9dp-0BV1gnzWIrGcV}+gH^uZ)&V)_V&pAjm7?B^j=h_$=|0=?8)my zf6qF7mX;WLWSx38oO9WvRja2lr>W9=ue++i*c!F3>uBr@^^p1iwBFjo${2H00Q;@m zuu(mV_deW5iIQO+tTQHmqHm0dyn+c_9l%`RdVCyka-+%PNVXCsshqesb z$~wOH$@tkP<6;rSY>Xjm_3;KMBR*&2jWJP<5-U&*d?8=djBzoraEpVMGeOFPY6ugr zSh2!-I%rX_cve|gRcGKF53p%{d-}pH^ZaH04YTK+>khcXfu0oy)d960KnRNi z^uZN9fiOCL?);t&D1XBzo#toO_f&y(_wsn4!+Bs9{`(P)^r$X42szW&I* zwfDhUYtGszSAQT1-O^3TeMiLJh*A;fh^p#4B@MdLiEn|o=nlAs=VpDQW!@p5?Aw68 zOVMmGu!Jl!i$BgJq{Q~+e@k_&x_s;Is7Y6-GeviAy?j-N?BoIyFnRo%wrS7NkEf{x z4_3?kFzrDq-|W+@g&4-wWm`L~<2 z8%^ZgAtdW{=X}Zo3Y23YjKiBoI@89Z7;QlLtZ^(_)+ySHP6h}>43xde=^yA+I);`K zTEhuy<9~JXWVdUTr)gkHi-j?ln)G(Fjuq=CuB$ItzHhk!gbiAdq8W4*E5GwzDP>ag zpce|-wf4ui43nve_VhpK-dNo<&8zbBx>|?EGkxMDp}Z2;%3G`zU@zd+xNapUJe+Kc ztjc32B5uSEQC4>+IrC+?IoDj+|hfbC!Ww3y6PW%ReIu8=}-9g7G`+O51X3H z;eYWoODF0*-r*_q^Y{-;ncda(laanJc)+0o@mL*NRb}w$ITC@AZ{DG=S}TguYak+u zYw;?sQ53;1#5#D%C{5;7_$-K^e03teqEXHa-#sa&y8L|f=#TQT>UuF9*8n5!fh-2gyt zfzgEp?~cW8AEymS^Q$urG5Q@;jj5OX5=N_&KPQba`h~&mZ4 zxbyhbM&|k8@u_Hddqw&hXu<01@45@j1!X@`+RDVsJRS4%zEyb~ss(V=lL2%T ze|cPT{B$Wb(uO6k>xs0IL$?ijIFrponJDG&WOfi4wieiwcqeeCM3nwS<^RZO3?cAS z8K(A3(E1_19?r{NTAAK`T5Ar`p&*exNoO#$#;g$8)A>&)>q|*HrLfoM_-WdcNsarH z^>YC^EUz);FrQ{WzZ~QJfLs~CZ^ujKfAcl-l#7aDOKaBO1rt{i+YsSJ07Ui(!Z0Yo z%njtYjS=J%WBCrD>?RBz(o4^MVz8L?x4y3hf4ID#l%ZD-&FwuV5Z5FgpXimQ5^}7NA`Ur?$1%` z(#M3-6b`hqs#Ll`wFx9rrGnWB5<)9_t(nIDlBnP8s zP`I~=8GVi7K8Ps<&0ZoQ#yr^ND^*(Jl2YiVQp#yYkCajd?Vw(*W+~AyeAhIOgzgKH z#lZkfYEuS_I8qiU$&&>@e<&vljQI=?!?nunUiIIKIDloMwfS%HbGTNK1yCM2^Q|I% zN&frHjr$xL*{#Yuwe#2!oj@v(_EXblpb!`t$NI(HaC2RKFL=vfmOe1+4QAjsOUI!{ z8cGk*$)$ybHy8F4E`@_5SWX|gxvsY!{FfeIV$kDD(h2AR=-ZTre_-!Ybj8hug-d%+ z_T3j?pIXJ&lIMyuEJ1M~D-g!@)bq`rL~}if@}rTU7n?{1Lv1U1cdTiC`j0wV?Eovc*HsUen^~9| z(O9|hAEGxaP;O#F0cK!ElQ&Sj4M$K<;ouD%Xd_XyC(o^LjME`VC6i!Q`cEe)v?Bk2 zI3~)u;fhgHat^}{qg+)f7#;FQgPLLVNHMyVnDYg@loH!Te<@`b%%w0{db8r&siz5i zLVgp`%lySs!sP;~V!uD_8Q};zYWx~iCV99}28q*`$y}OFmYM}SnkCvrkg#t%d6~dH ze!ssMq+Bj3Q7rxL`rz9ObL8{zx=G<=i5I=b?&?Jn$nEhHvJh*Mq+XW z{d#_xi2OFX0PBZ9209l?_ z*5mXrYLB*@C+$d0zKraGjej^~3v+DAjK-NzVRJ^4Ll2`S?=%Ra{>&A)rYpYr$@2%% z65%Yhe_pR)%X_Ql_kkJ`JoW~-Q!w0(UgR~>bvWli)W!CQ`il(0A0Ph1E>(eMj}|~R zTUfHZ`(43skzSN8ep&`H22|Y%ihc{NA6Ck|#rB;&odvAfe|Q#eGOFRGy@9~&o$f$ST`W{Jv%0-3 zTws3j4pD!pL1riZJe^}X>)0Vh~-%LmTKaBDoK zuB?hU(6cVpK&XYQoT>%03Tu63cB@J7yDG~Xnx>WQf7AUGhK7Ee^LfinoM1U%1hj@0 zfBZ%E1)a{ykjpO$7JGHDb>brBo$W>MtTiKp8vt)p7=lAoDC;mB&k8WXj2xZ`|E>Tw zJGRd36$}s9-+t(RP-4)itUouYrPndO$H2b3Y|?z9Q@f+#zpukZqsjO8*J|^_Xf;^A z)*xK_l;sKOR+Av;z{XeA`aODa!5qPWe@<)?^%vv3DA_VsAV7vl)FAxil-I9-_bbpO z+3qHb9JLr#87*H$l1AfdB-72TxejOH;F3pBryy~Oz$0&eBmG3B(g;5jHSdZ6O&R|a zmGviPjanuB@?FyB{s4UP7F7jI6AWkR#rcAvPcOoDlgT7V3xf+Ci_G9&(PS{Ee_s&w zeFkB^s6WdfNYCg+g-2dqchr-$I_~(GA0@wJ+0K~zbh0UVRAa=w{Wy}VA8bs&EIk6g zBMM7i)Zd>mOJ{7=(DgEX*2@=232>LR`(Njdc3wjVZbW6@W)Si?hg6gfNjn8-v^@v) z4AC#zEcUvX828$}k&quBK#L&xe}KG3q)CsV{j|&=O=nA+8xQHsd+~}Rwl<#5Djaxh zpNF##O$PvM^-J%2z+G4PCxb&X@1Bj0Z1hU+63p&*?&Tea9Q+TC-jB9gGaP&q*XJ?s z)p&FEVpgLuUG8Mh0B4=aJ9azxmEi1Utn+e{M#C=Ih_hVhdlHQq^Fak#e?Bvq)$5UD zGMPq8Y3UubgAN@|COxQ^rf+sQU?2K5XkZ_awPnpRSY*`e9Ma98&msTn^hW6cB?DgH z)}Nr5Pf$BXsHp^J$cD*I3=D7eM|~ly-|R!5Q5;D@=192t!?G-4w@R!PAkV;ey3Er z8V&&IH8ee_4EEx%jDNIy_t3O!j^2oG8g{?=fS z`V2NtY5nn`49bJd;gP*>Df(`v;x@H=%@|02WL&nzCY}bGd-Ohg1U<9VX6Vc>O8v{@ z!B31%GbIKaE^_+Ce_UxXPF32IU7G>Jcu6dO`cR#AaTwXWglebepc+Lm9gv?#lM#@y zmom#IdD0=PDi)Jl#o7R-Ex?{Hn7IHT;lqkEMn%j@5c2a8ycHuNbN>&g>M;Eslm1F0 z{S&bz$7Nz$sqwNR0vgAMV4U@vF>u@-+*1sh=brIZ1XTnOq@7 zc1}=a2mSVrSL-~u_kWxwDNlEq`WtigA6?79DPH|34a#ZunGqF`Jma?p92`~W5v`GH zCr`F2o5yPku=(^2K>9rUy3*%6uorNE82O3i{^Wf=e_+9I-l1S9F3X{DKjtD-BAxID zfI$n8jDQ_3Fb4_SzNo3LwX3ssa{A7bRQd~Neb2T@tzm}{GMWOxd23A2I=iy}l55Z2 zd9PclxF0}XCA7{-?fhd~|Fq5Bu?6GRIo`Vc>^U_i6~BpR^xGEN3$IzT?!XJMdh=%R zIPYLhe>%O;xZwHpW@=2`Lq4l0z-%)SfPyKYqek^ zFvw%|5*2j10s)sZI2d$F#KsFe&LA@wH_~CVf7uvPHzqDF={C3DzHr7)zcW};;OMLA z^a@V3n%5RuL}$3G+G|t;Q50x{iUHP{n~Bv1-4nX9K^y3IL0hG#yQRLRAuuqh8y35q z6#xXB@WO%sgqsr!y+U)KJXG0i5v|3wrOj?fu)EU7IV^_FRF*3}LE_3>3ie|5<&9p! ze+O(;yv~j4|Oal&OoACc*8|L}T7G^2b|F))4FBVAD+LZ;Z-73xWlxjo#|6 zuv4@YYI(KVDR?_;`Wyu%L8pJ`jD@$io4ZRcPBf}RMzc9g)0vh?|3z*C(jJesESkC5 zU~zDP(iuUAyScQs*eY6@D?{ahX2H8Kf3X?DKmoka833Td=_-cZlLi6}sNuRj7NE}~_fZu9Cx$9zen8yeQX4HZ@LPh8G5JXZ1@X|y284~aLe~_O5 zU|J)X+?4ogA#q7o++pwyvr-PfQjReSyqk*5CX>17x%T$-OFh$Of**E-0$w%O4uHX8 z18uyn%&;r-faf52-ks)@L)R#&8^$oh0g2Z6Be;I!!O;G28}&tLDT zH4T{__C+F}OqLdd`zP;~t}Cr7GzEcA`iBD=i-BX~fjVn>Sqb?3uF`VrGwLFPO(+ez znl5Z|1%ri+-4i2DptEY}`r9Ls+w0Qw59d}ku|^}?RJri*Ur$am;Gt zL%X$v^_J&6q>EsfaMUY2lXim>e>gpqekEkL+3X=O=ZrIk8`n!OuUic~ix<0H0u2_c zbm0jxa9C}Q)mAKCTs0wPR)aZ9(6APM(iQ6H3>6lICQU^P6__4eumHZ{G%RX-F714- zak1Ws(oN68k4bvix%T|khU!3J{}k{{VPH~6u&^-LF)2_8W-W=kNlG4=!Jx{w4TAx}@And%y2(w0ao1dZL{lCtAjm{_28S#k@WG_e}E$b_Dk1!p{)Y!l6@#KSMI+l5l8$3PF_LB#oAD2!Hl)S z){IgH!~i}B=WD)k1;4afG-&|t(rMN9FH4>DueI9rSD;6$(b&E$cSwf?2ns@fx6x|^ zX4 z*Z|p!g#Z%6?PH8DyRF5~2`XN->qWI%WdK1yzQ20DSft~;`A2S1T7#C`7SD46uTo3H z;1<>IM<}Uj@PSXOGyfJyKQI{dCG>2aKOKUS*N+z1;C%r9+jQAjoEl2TGbi{G)JXFt zD6zYwt5;oX0jvfgAcLS>)ctL!hC zW(En1AOzFNprF!##KF{t`zCg+RuvSeR(DOjZ^Ou4O2)6^QtW80o9a?mMAw4A7*huqYcvU36FYULoX=AEN9Y3%x|SXOK$>$^bhIp(oaDVy<7UJ^barr3E)~Z zwtP+eM6{^A!7^sYLM~4R|&7USrkA?;d3D92}nGrH$V7q7L{@NBUoD z;o7zDfe(_BKm7#l>3;=7=_E{6-f`dU(0M>Qd>wpdXZplWdS`l1FTC*BU55@)`Sup8 zf*(hr(E>ZLVtQ>f#`u-FpUO&yxlm2n|1UmTVw!WQCHel|m!wZDSNWYxRY8gL(bLI2 zPd~jU367Q)Jz7*sejeRA`}qFZTer?;&YivW9C%q<=k9kd0Ds0*XIuI_r{52r{PwZO zzI_Z{e_vr)S>b)?qR(^Lx8{8lMuLkm+SeqKjTFs9cMxhIxtD@lFL?Zd3m%7$lTC*A zNAA7D58z|Uzx;0xqLCl-W{X}nq6U$;cZ8c0^(*Nd7+WqyrRefLr~$`EBMTgmULS%_ zre_R-n(^X!dwthPRB^n z5=ra;lD}v)_O}5fD!2hBas;O!fDSYG4Ca`Km$2Axg05C=i-w8{gC$+@jfP*WY@1Fq z*DqbN<0H$|${Ohd>GO(kLU1pQH-GegTXg9Hl~G?=vVY)>m(B`LnUk;-csSvYFg|4E zOiw%Kvy~OzVd>Uy4;Za_mWOJ;)v2b7eDx*nT}Qx9Px;^GObIgLS$-I7Z zW#RdgmLyfGo8bTy^T&mv=rg)mi0s8?|8}urS<*!TFI*U)+V<}vsw*;*~3u;G=;ehJIF;l2neb|gLV~78dZ#zrYOX3B9Ld!pt{5_qPIAzx2HG8lmT1 z=fY(h7gn*nv}ibe%v~3C1DJ0kml;<>oPVDS!>HLC#m*2s>g7n7!p~|2W9*0nt(8qB zbp;v#PEbcwfGvow>D*hf@U~TxE(Lezx8L+!AgYNlI!oAZZdshJWb$ zk7xWbD41qb_@0W-M;2x{uEbQqboM@0lO8O`cL%HVj3^!_&d5fF3$1F4{T!c}jf)}Bt zxYMA@uL5eItS|c})Sf{SC8#Wguz#TI_t7w_NUB)gC95TwQxjykNM&L;yT!(C3eCGP zS+iup#Fp8!BRAi8{icCOrmpMrRjph*W&85Fx>^2-`=t+y+-QJBeHzc1;1c+v`nAg78A7GjT_dN(I%SFWq*C)33j(U zD^tK6FcbD8WeXolFTj6Xa(Ekdi-JOW+j3Y1|0jJmjHb5_f3XYRNS`zOF}#EDEfSno zb~o`;EJRY=477frsM;8rpBQD!%Cnf?uGL#Ra)&@TC*zF!0IDg`?**x~)K5gK6Oed~|(s zcvW)46kez2r>=N=#Z+Fe6;?H>R z&+=~~3~vQD#$VdD?WOoddY;qmD=*)t<9L1g#>`a}O-*PX#q!Q~gny&LNcoUtV*w?g z2225868sTAra-E-b3qeUW zG9)(yzCUgPB2-670ny#uG;iVTvhyU?SP?x|5T7I(EL7{bJbybz2=oiDw&>nU}G4IHe_t#RGh6KP^i%gNTx6s*i7pMpe`$*fv?b21cBPjYdA*B zn*p#m%oYG_YJXJ-=vj@yrg7P-Plxp3{48Af^u`v=XKfi5OSQB z*VBcwVm52JjRx)_y z)j{+~&Pv-MG((%Q1a!um_w$Rd7Y2d2LXzYkcm?1!A|Qa!N_0u;|`|m?)`m zuo@o#X!zC`7MR@*Yt$3*sr3TXu?+Chw9j&(-?4h4y`q8^ESmEtbXI8@H1G*-UKOwf zE$0|?41cWa2~CXlmo!Xbk&Lh^zSxLF4XwuIiunYWpf*5TP%v3UP5l|AO)Xu~3EGgy z>!l6AV04;X%o-p94pjvhX|0}<<^YwMWmOsoOd48+UpJI)6&%I_m#IkO<15$+=U6Ol zcW*6)Ox2EXsJU3sfz~_#nsW}s7>)dmiggyxDFkwMZY!x-%V=uDzf&8Q*E zG91kVL$gz-Z7o*Qd_miU&LZxC24StrVJ&VeEEEAdagENy*e_KZ!=<#bsV3~`RGCze zRe$q!CgaqgiVGKX*o%O;)ni?^*eL`&TDsiqgiy@_qvdBRo@Qtb#{+1JGe8*9npFUB z05C3^{S0y{Xassa$LLv(M$HD8V=wCp>^7U(q8Au(n#;rs>LMHJ#^@y#dI|t&)}wB% zGi&V&wWbMy619%e2tHqz*TT|zV>##0*?+XgPJ>y^6{t9mf#xdfCWg#EuAAmlJ507B z%zV8z)@iw>Zr~SZ?5wbYB3JpL&K27?t!sL7Va=3M2z>$6=qgcH#0CuW;*)nxoWgo* z`~|351zPR2DZ1i_+od&TV#%=_W}rMsh7MD;R4cUrd*cLxv>zMGF&`Hl3^86jLx0<4 z>RdFEpkczp26;Tf0UsY@@!XDf7%>>aSCO%#71X*Jdu)W~efdfVO|ctxU*C5KgFF&6C7y4`fuDe%!=xyhuShH2~eewj*6(kzE3Zvzm9d$1n ztqfTB@_5*VO8d1^%kkPHOjiTUGaRXP)3VPJX6=PIjg60Ef*gQQG zBeQGDYl~_l|9Y_Nl8x;(`we+IE0@Sue>82 z$2&w{Rf*OOuaFp!HmZ|EDrM{laf0PtODKJVdDg*LoYP=e4B{9IF!@^+YLt#S0sTpU zEwrZV?Zq7M+uhzTZEo73XNs-T@30mZoFVu=HqK~eIL_v(^-6!&tAAC}a$A=!-aUst zZ$-j(C(}BEnfWuj&u2OQBzi!v(^zEO+hRr6mKOzFUvx>kq+gnC)=Ha2qn2C+yxP{y z?v1bL?;rlu3>v^iBlU2K4|!mWhvRARK(RfS$je|zv2; z@rJ|#O6;JtA(ttb<$n!iDRzi(CCb*D5bd{$Hsb#?g2<#UE=K*d!fZxjrjZ<@~kdEnWWx}{_CQP{tFD1)>nY} z`=m8S!5Ngk3b(h1fhp(|jNrC?(!&+?r9}>qT)$pQI_O?}!GA?^Ss7f`0P$c|1YQ40 zwsMO69UdShc~hEzxAe6V!NUWCJp%*a zwOlzeIxjEwTW`f`feZs2L?V^VUXrieVZm~fxv08yL5riLxv9j_vY;$nWHvF2Mh!5Z zg7<9GdW)S%T7M}mE%X6raql$S)#Hp2m1u48HhTi~qb{r)CFEvkK&Wj60W_@O_^?ob z#3r-Eoi-4}u8&y8j0cEsEgL7q>;&(IB@V218=G2k+dH4WbK4Sm12!@y>3zM?Aie*T z#-n*kdf#BwOYfT)R{hjdYL+p95_A%jJf-%jp8_T5B!4JTPC{+&HfR$yvc1ylCXI$$ z{;gjB?Q%||F@f4%)@as!`>o!D&VpL`tWGDNm0m|@P5N)Y)hX+~AG3QX0rgNSfX6jF ztZ`%njMSC{I7S)jgjfj?lQ9$qcDN-{IP*oU{u$}lPxbxk#M*~H-+L{ZFoVmbi-&H< zbgWxm0)N6Sm1e=aV99}FH=KJ;S+RltE2>TGnbdvF(xdP0{ruszJAeMlKX<$i3U9v! z*k9en!LqXAnQv^l;n;zQP;4lbalp8gVhgTNJpYKI(>uoheN0S9A`f)}uFd~~(V1i9 z42LFo*E>QB2Tu6fhm&#R2$SZ_qi^@unyWG2s`iCDFceLNc7yY zMcVx9Mj004uo$cp57XU;#k!z)c*rSDPA7i^G(Uo8)CC{jepIXzMe!xpROWGFAT?Jg zq<=TOVKoU+%bzz7;)(_33+3BLzk}4pKl%~+z)zf@0KbcwLR~_9?KpWIXO9#^Bn?2c z&||qEnjL90?%OSdFaj%m@Da4gA}BLRYQeK4{&mx}@m7YQE|BFG?ki|bV-|C$rE zxR890WO~kQPzk>B)&KgM{hB!JevXk^53sRG)?3qm(` z_`(Kl^y!ktC3FJ?U^9l+m-3=AK#q|^A-uSim+0^wY&M-~wF#ZGx2n{7LlJLw8{AJ< z{b}R++11rY`!}vYtHeR+#DPCbzc;7{0XXnS5CFkx*Zx#WOCL-BdS~wy$$tmI;%O7B z7|vkixGR1WuBw8pL8EI}+PQUJfvBpmqk>r$wK>We*6C;l^A|=!>e`r7Rany6`pCk< z3A*CKo&Om2O*R^wUf(2->o&cMWwrWZ1FK!WwztIh{EB5uT}4kf_ueqsVE_Dpyt%sb znv42cJGMW&VGCfA4_-1Yaetjbhq?i5YH8b|H)v6hYFr0bEZG|@-W=c(om|van!J@S`X1%vS9+McC027Y}OS6p; zn6n>#>BWcl|J>*QxpZ6l)u-gbXwu8z43x0Q7mqaGJ$w zwiv{sVHU0Y83S78pdkwDMhy5<=5UhT;aRl2Z`JZy%_j3E>Cl^^(CeTE?=~A z!Cdd=moMGiRuFaawtp#|E9NXnRB@B{tX$9%@!D8Mr*ciHuQLQAU1v9!u$)Cu@o0@? zsE#dKabYJ6walD9ue-@?w%2lw={?)GUJZWOv$e%T8{7pN%}3IAz!@w6?;J4*Dt+a& z-E*rg{+ZpC7Yza$(&nQ2Xj)+E@(jGxyACaSQ1Cp|8J;w>O1@um*`PRwTdtjirbewuQtd5h)AE{_eo)HRHd4 zHN#-U{B6tZ25C6`OaBD=?ep8gW51%SnYJ^;@lyxL~ zX+C+WaMH43j!#^`9CayX{v14IVTY6=f;P+~Dl?c$Cr(+~F*3ZYGtCtfoGxmK3OX%j zIb_Rh!SSc32<}Q@za*U!a-|Cn|KfYZQt{~9FV4lV3x6j;*jGZ<%TI-~uSBK;≠d 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≠dR0E9ICQ{-tcR;@{R^I5P#1GUH!p=-{c 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 literal 66624 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 diff --git a/sources/assets/img/chosen-sprite@2x.png b/sources/assets/img/chosen-sprite@2x.png deleted file mode 100644 index ffe4d7d1121ca45cd35783696940050c690a8676..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 872 zcmeAS@N?(olHy`uVBq!ia0vp^89?mC!3-o5mOWetq|OBRgt-3y{~yTgfB`oc01C8& zL0el}Lqh|Q1oD8A5J8A6G6@lfkU;ftMr&&;+$f+RkloVK0wm!8C|FWb0x`e2xj8g6 z6i7l;BAWwL4-tfu5G@ccP!{MmqnYOy06pVW666=m!0_*bfx(A_gav;C1PU5HKT!C5 z;g7@l4POuZ{>hQBP{j4uqq`I2WP9&Sn{}I8xJi*&v*QL&+Dw-Bf-CQLyLk0Ht2-;T zynum$iPO`?F{C2y?bYjfj|~J`6Xz~`vM4Ef+U{Vpli%)D%kKSey_RG0Bi9Xw4jtOb z@!)?~_%DVelO793W#Pl3vjdNCDTnGGb(^YY+BbF2;mJK!nq}@nBGoHxCn#7X*gdxr z+~ZQF6rpL6;MDP)JzehcJBL53AM-QU?@65Plc4-}1EW@`H@EEGrnFmTubZ~5iUzVn zrZYyBIm|RmW$3F@+wkq2)c>|mGh5Rv3%(p~zjStyruBl(TP2_51LpTH2noN*e&}J; z1;$+4EpJ(Mb+^1}Fv>ms%b`r}+KYy~zf5x(4?8l28%eNnEHzx({;NGP)_hX&tEw9t zSKv=Qjt(d#~b;F7hbDdUu$OUK8iumkkl&-=~$APCd2zdqHg6@=Z#Pt*5RY_s@Hw*YS9+ z^u)7AmzM6Ux!dus_!gJY)Vtf?+t>a3wO2S)_Vct=T}#@RuG(h!d8WYZS9Tst+VfKv zt~zntPsvfyqLY`klZSPslCz_dlcSRJLa$Px)_+W2Y&u!?oJrIMCNTz2S3j3^P6a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; - -return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
    a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/\s*$/g,ra={option:[1,""],legend:[1,"