diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index 262a09f4d1..f80fef8b9b 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -13,8 +13,8 @@ use ProcessMaker\Models\Process; use ProcessMaker\Models\ProcessCategory; use ProcessMaker\Models\ProcessLaunchpad; -use ProcessMaker\Traits\HasControllerAddons; use ProcessMaker\Package\SavedSearch\Models\SavedSearch; +use ProcessMaker\Traits\HasControllerAddons; /** * @param Request $request @@ -70,6 +70,7 @@ private function getDefaultSavedSearchId() ); $id = $savedSearch->id; } + return $id; } } diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php index 415bece910..04b14ce302 100755 --- a/ProcessMaker/Http/Controllers/TaskController.php +++ b/ProcessMaker/Http/Controllers/TaskController.php @@ -42,10 +42,12 @@ class TaskController extends Controller public function index() { - $title = 'To Do Tasks'; - - $showOldTaskScreen = Request::path() !== 'inbox'; + $routerPath = Request::route('router'); + $title = 'To Do Tasks'; + $path = Request::path() !== 'inbox'; + $showOldTaskScreen = $path === true && $routerPath === null; + $selectedProcess = $routerPath === null ? 'inbox' : 'reload'; if (Request::input('status') == 'CLOSED') { $title = 'Completed Tasks'; } @@ -62,7 +64,9 @@ public function index() $userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? []; - return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen')); + $currentUser = Auth::user(); + + return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen', 'currentUser', 'selectedProcess')); } public function edit(ProcessRequestToken $task, string $preview = '') diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php index d50a0d9224..0b8470e92d 100644 --- a/ProcessMaker/Http/Middleware/GenerateMenus.php +++ b/ProcessMaker/Http/Middleware/GenerateMenus.php @@ -28,7 +28,7 @@ public function handle(Request $request, Closure $next) $request_items->add( __('Home'), ['route' => 'home', 'id' => 'home'] - )->active('home/*'); + )->active('home/*|inbox|inbox/*'); }); } $menu->group(['prefix' => 'processes'], function ($request_items) { diff --git a/devhub/pm-font/svg/inbox.svg b/devhub/pm-font/svg/inbox.svg new file mode 100644 index 0000000000..8c14f25d15 --- /dev/null +++ b/devhub/pm-font/svg/inbox.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/fonts/pm-font/index.html b/resources/fonts/pm-font/index.html index 3b551c9017..f426b13d92 100644 --- a/resources/fonts/pm-font/index.html +++ b/resources/fonts/pm-font/index.html @@ -115,7 +115,7 @@

ProcessMaker Icons4.12.2

diff --git a/resources/fonts/pm-font/processmaker-font.css b/resources/fonts/pm-font/processmaker-font.css index 3b50d72e70..cfe1b8db93 100644 --- a/resources/fonts/pm-font/processmaker-font.css +++ b/resources/fonts/pm-font/processmaker-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/ - src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1738008776900") format("woff2"), - url("processmaker-font.woff?t=1738008776900") format("woff"), - url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/ + src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1738184445914") format("woff2"), + url("processmaker-font.woff?t=1738184445914") format("woff"), + url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -45,19 +45,20 @@ .fp-folder-outline:before { content: "\ea1b"; } .fp-fullscreen:before { content: "\ea1c"; } .fp-github:before { content: "\ea1d"; } -.fp-layout-icon:before { content: "\ea1e"; } -.fp-map:before { content: "\ea1f"; } -.fp-mobile:before { content: "\ea20"; } -.fp-pdf:before { content: "\ea21"; } -.fp-play-outline:before { content: "\ea22"; } -.fp-plus:before { content: "\ea23"; } -.fp-screen-outline:before { content: "\ea24"; } -.fp-script-outline:before { content: "\ea25"; } -.fp-slack-notification:before { content: "\ea26"; } -.fp-slack:before { content: "\ea27"; } -.fp-slideshow:before { content: "\ea28"; } -.fp-table:before { content: "\ea29"; } -.fp-tachometer-alt-average:before { content: "\ea2a"; } -.fp-trash:before { content: "\ea2b"; } -.fp-unlink:before { content: "\ea2c"; } +.fp-inbox:before { content: "\ea1e"; } +.fp-layout-icon:before { content: "\ea1f"; } +.fp-map:before { content: "\ea20"; } +.fp-mobile:before { content: "\ea21"; } +.fp-pdf:before { content: "\ea22"; } +.fp-play-outline:before { content: "\ea23"; } +.fp-plus:before { content: "\ea24"; } +.fp-screen-outline:before { content: "\ea25"; } +.fp-script-outline:before { content: "\ea26"; } +.fp-slack-notification:before { content: "\ea27"; } +.fp-slack:before { content: "\ea28"; } +.fp-slideshow:before { content: "\ea29"; } +.fp-table:before { content: "\ea2a"; } +.fp-tachometer-alt-average:before { content: "\ea2b"; } +.fp-trash:before { content: "\ea2c"; } +.fp-unlink:before { content: "\ea2d"; } diff --git a/resources/fonts/pm-font/processmaker-font.eot b/resources/fonts/pm-font/processmaker-font.eot index fed84252fa..aaee702754 100644 Binary files a/resources/fonts/pm-font/processmaker-font.eot and b/resources/fonts/pm-font/processmaker-font.eot differ diff --git a/resources/fonts/pm-font/processmaker-font.less b/resources/fonts/pm-font/processmaker-font.less index 0592fd0072..6d47039b0c 100644 --- a/resources/fonts/pm-font/processmaker-font.less +++ b/resources/fonts/pm-font/processmaker-font.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/ - src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1738008776900") format("woff2"), - url("processmaker-font.woff?t=1738008776900") format("woff"), - url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/ + src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1738184445914") format("woff2"), + url("processmaker-font.woff?t=1738184445914") format("woff"), + url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -43,18 +43,19 @@ .fp-folder-outline:before { content: "\ea1b"; } .fp-fullscreen:before { content: "\ea1c"; } .fp-github:before { content: "\ea1d"; } -.fp-layout-icon:before { content: "\ea1e"; } -.fp-map:before { content: "\ea1f"; } -.fp-mobile:before { content: "\ea20"; } -.fp-pdf:before { content: "\ea21"; } -.fp-play-outline:before { content: "\ea22"; } -.fp-plus:before { content: "\ea23"; } -.fp-screen-outline:before { content: "\ea24"; } -.fp-script-outline:before { content: "\ea25"; } -.fp-slack-notification:before { content: "\ea26"; } -.fp-slack:before { content: "\ea27"; } -.fp-slideshow:before { content: "\ea28"; } -.fp-table:before { content: "\ea29"; } -.fp-tachometer-alt-average:before { content: "\ea2a"; } -.fp-trash:before { content: "\ea2b"; } -.fp-unlink:before { content: "\ea2c"; } +.fp-inbox:before { content: "\ea1e"; } +.fp-layout-icon:before { content: "\ea1f"; } +.fp-map:before { content: "\ea20"; } +.fp-mobile:before { content: "\ea21"; } +.fp-pdf:before { content: "\ea22"; } +.fp-play-outline:before { content: "\ea23"; } +.fp-plus:before { content: "\ea24"; } +.fp-screen-outline:before { content: "\ea25"; } +.fp-script-outline:before { content: "\ea26"; } +.fp-slack-notification:before { content: "\ea27"; } +.fp-slack:before { content: "\ea28"; } +.fp-slideshow:before { content: "\ea29"; } +.fp-table:before { content: "\ea2a"; } +.fp-tachometer-alt-average:before { content: "\ea2b"; } +.fp-trash:before { content: "\ea2c"; } +.fp-unlink:before { content: "\ea2d"; } diff --git a/resources/fonts/pm-font/processmaker-font.module.less b/resources/fonts/pm-font/processmaker-font.module.less index 2e0e2c1b21..74ce407152 100644 --- a/resources/fonts/pm-font/processmaker-font.module.less +++ b/resources/fonts/pm-font/processmaker-font.module.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/ - src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1738008776900") format("woff2"), - url("processmaker-font.woff?t=1738008776900") format("woff"), - url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/ + src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1738184445914") format("woff2"), + url("processmaker-font.woff?t=1738184445914") format("woff"), + url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -44,20 +44,21 @@ .fp-folder-outline:before { content: "\ea1b"; } .fp-fullscreen:before { content: "\ea1c"; } .fp-github:before { content: "\ea1d"; } -.fp-layout-icon:before { content: "\ea1e"; } -.fp-map:before { content: "\ea1f"; } -.fp-mobile:before { content: "\ea20"; } -.fp-pdf:before { content: "\ea21"; } -.fp-play-outline:before { content: "\ea22"; } -.fp-plus:before { content: "\ea23"; } -.fp-screen-outline:before { content: "\ea24"; } -.fp-script-outline:before { content: "\ea25"; } -.fp-slack-notification:before { content: "\ea26"; } -.fp-slack:before { content: "\ea27"; } -.fp-slideshow:before { content: "\ea28"; } -.fp-table:before { content: "\ea29"; } -.fp-tachometer-alt-average:before { content: "\ea2a"; } -.fp-trash:before { content: "\ea2b"; } -.fp-unlink:before { content: "\ea2c"; } +.fp-inbox:before { content: "\ea1e"; } +.fp-layout-icon:before { content: "\ea1f"; } +.fp-map:before { content: "\ea20"; } +.fp-mobile:before { content: "\ea21"; } +.fp-pdf:before { content: "\ea22"; } +.fp-play-outline:before { content: "\ea23"; } +.fp-plus:before { content: "\ea24"; } +.fp-screen-outline:before { content: "\ea25"; } +.fp-script-outline:before { content: "\ea26"; } +.fp-slack-notification:before { content: "\ea27"; } +.fp-slack:before { content: "\ea28"; } +.fp-slideshow:before { content: "\ea29"; } +.fp-table:before { content: "\ea2a"; } +.fp-tachometer-alt-average:before { content: "\ea2b"; } +.fp-trash:before { content: "\ea2c"; } +.fp-unlink:before { content: "\ea2d"; } } \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.scss b/resources/fonts/pm-font/processmaker-font.scss index 3f797793ee..c17dd4b8be 100644 --- a/resources/fonts/pm-font/processmaker-font.scss +++ b/resources/fonts/pm-font/processmaker-font.scss @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/ - src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1738008776900") format("woff2"), - url("processmaker-font.woff?t=1738008776900") format("woff"), - url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/ + src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1738184445914") format("woff2"), + url("processmaker-font.woff?t=1738184445914") format("woff"), + url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -43,21 +43,22 @@ .fp-folder-outline:before { content: "\ea1b"; } .fp-fullscreen:before { content: "\ea1c"; } .fp-github:before { content: "\ea1d"; } -.fp-layout-icon:before { content: "\ea1e"; } -.fp-map:before { content: "\ea1f"; } -.fp-mobile:before { content: "\ea20"; } -.fp-pdf:before { content: "\ea21"; } -.fp-play-outline:before { content: "\ea22"; } -.fp-plus:before { content: "\ea23"; } -.fp-screen-outline:before { content: "\ea24"; } -.fp-script-outline:before { content: "\ea25"; } -.fp-slack-notification:before { content: "\ea26"; } -.fp-slack:before { content: "\ea27"; } -.fp-slideshow:before { content: "\ea28"; } -.fp-table:before { content: "\ea29"; } -.fp-tachometer-alt-average:before { content: "\ea2a"; } -.fp-trash:before { content: "\ea2b"; } -.fp-unlink:before { content: "\ea2c"; } +.fp-inbox:before { content: "\ea1e"; } +.fp-layout-icon:before { content: "\ea1f"; } +.fp-map:before { content: "\ea20"; } +.fp-mobile:before { content: "\ea21"; } +.fp-pdf:before { content: "\ea22"; } +.fp-play-outline:before { content: "\ea23"; } +.fp-plus:before { content: "\ea24"; } +.fp-screen-outline:before { content: "\ea25"; } +.fp-script-outline:before { content: "\ea26"; } +.fp-slack-notification:before { content: "\ea27"; } +.fp-slack:before { content: "\ea28"; } +.fp-slideshow:before { content: "\ea29"; } +.fp-table:before { content: "\ea2a"; } +.fp-tachometer-alt-average:before { content: "\ea2b"; } +.fp-trash:before { content: "\ea2c"; } +.fp-unlink:before { content: "\ea2d"; } $fp-arrow-left: "\ea01"; $fp-box-arrow-up-right: "\ea02"; @@ -88,19 +89,20 @@ $fp-flowgenie-outline: "\ea1a"; $fp-folder-outline: "\ea1b"; $fp-fullscreen: "\ea1c"; $fp-github: "\ea1d"; -$fp-layout-icon: "\ea1e"; -$fp-map: "\ea1f"; -$fp-mobile: "\ea20"; -$fp-pdf: "\ea21"; -$fp-play-outline: "\ea22"; -$fp-plus: "\ea23"; -$fp-screen-outline: "\ea24"; -$fp-script-outline: "\ea25"; -$fp-slack-notification: "\ea26"; -$fp-slack: "\ea27"; -$fp-slideshow: "\ea28"; -$fp-table: "\ea29"; -$fp-tachometer-alt-average: "\ea2a"; -$fp-trash: "\ea2b"; -$fp-unlink: "\ea2c"; +$fp-inbox: "\ea1e"; +$fp-layout-icon: "\ea1f"; +$fp-map: "\ea20"; +$fp-mobile: "\ea21"; +$fp-pdf: "\ea22"; +$fp-play-outline: "\ea23"; +$fp-plus: "\ea24"; +$fp-screen-outline: "\ea25"; +$fp-script-outline: "\ea26"; +$fp-slack-notification: "\ea27"; +$fp-slack: "\ea28"; +$fp-slideshow: "\ea29"; +$fp-table: "\ea2a"; +$fp-tachometer-alt-average: "\ea2b"; +$fp-trash: "\ea2c"; +$fp-unlink: "\ea2d"; diff --git a/resources/fonts/pm-font/processmaker-font.styl b/resources/fonts/pm-font/processmaker-font.styl index 0592fd0072..6d47039b0c 100644 --- a/resources/fonts/pm-font/processmaker-font.styl +++ b/resources/fonts/pm-font/processmaker-font.styl @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/ - src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1738008776900") format("woff2"), - url("processmaker-font.woff?t=1738008776900") format("woff"), - url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1738184445914'); /* IE9*/ + src: url('processmaker-font.eot?t=1738184445914#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1738184445914") format("woff2"), + url("processmaker-font.woff?t=1738184445914") format("woff"), + url('processmaker-font.ttf?t=1738184445914') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1738184445914#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -43,18 +43,19 @@ .fp-folder-outline:before { content: "\ea1b"; } .fp-fullscreen:before { content: "\ea1c"; } .fp-github:before { content: "\ea1d"; } -.fp-layout-icon:before { content: "\ea1e"; } -.fp-map:before { content: "\ea1f"; } -.fp-mobile:before { content: "\ea20"; } -.fp-pdf:before { content: "\ea21"; } -.fp-play-outline:before { content: "\ea22"; } -.fp-plus:before { content: "\ea23"; } -.fp-screen-outline:before { content: "\ea24"; } -.fp-script-outline:before { content: "\ea25"; } -.fp-slack-notification:before { content: "\ea26"; } -.fp-slack:before { content: "\ea27"; } -.fp-slideshow:before { content: "\ea28"; } -.fp-table:before { content: "\ea29"; } -.fp-tachometer-alt-average:before { content: "\ea2a"; } -.fp-trash:before { content: "\ea2b"; } -.fp-unlink:before { content: "\ea2c"; } +.fp-inbox:before { content: "\ea1e"; } +.fp-layout-icon:before { content: "\ea1f"; } +.fp-map:before { content: "\ea20"; } +.fp-mobile:before { content: "\ea21"; } +.fp-pdf:before { content: "\ea22"; } +.fp-play-outline:before { content: "\ea23"; } +.fp-plus:before { content: "\ea24"; } +.fp-screen-outline:before { content: "\ea25"; } +.fp-script-outline:before { content: "\ea26"; } +.fp-slack-notification:before { content: "\ea27"; } +.fp-slack:before { content: "\ea28"; } +.fp-slideshow:before { content: "\ea29"; } +.fp-table:before { content: "\ea2a"; } +.fp-tachometer-alt-average:before { content: "\ea2b"; } +.fp-trash:before { content: "\ea2c"; } +.fp-unlink:before { content: "\ea2d"; } diff --git a/resources/fonts/pm-font/processmaker-font.svg b/resources/fonts/pm-font/processmaker-font.svg index a7d02ce1b8..892971e416 100644 --- a/resources/fonts/pm-font/processmaker-font.svg +++ b/resources/fonts/pm-font/processmaker-font.svg @@ -94,50 +94,53 @@ - + diff --git a/resources/fonts/pm-font/processmaker-font.symbol.svg b/resources/fonts/pm-font/processmaker-font.symbol.svg index c7bef51f0a..63ea9eecdd 100644 --- a/resources/fonts/pm-font/processmaker-font.symbol.svg +++ b/resources/fonts/pm-font/processmaker-font.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.ttf b/resources/fonts/pm-font/processmaker-font.ttf index 67b99a35d4..b733579e97 100644 Binary files a/resources/fonts/pm-font/processmaker-font.ttf and b/resources/fonts/pm-font/processmaker-font.ttf differ diff --git a/resources/fonts/pm-font/processmaker-font.woff b/resources/fonts/pm-font/processmaker-font.woff index 8dcc0c0efe..f198b5124b 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff and b/resources/fonts/pm-font/processmaker-font.woff differ diff --git a/resources/fonts/pm-font/processmaker-font.woff2 b/resources/fonts/pm-font/processmaker-font.woff2 index a958beacaf..46f7401138 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff2 and b/resources/fonts/pm-font/processmaker-font.woff2 differ diff --git a/resources/fonts/pm-font/symbol.html b/resources/fonts/pm-font/symbol.html index 1494fa6063..bafff0e1c2 100644 --- a/resources/fonts/pm-font/symbol.html +++ b/resources/fonts/pm-font/symbol.html @@ -317,6 +317,13 @@

fp-fullscreen

fp-github

+
  • + +

    fp-inbox

    +
    • +

  • ProcessMaker Icons4.12.2

    diff --git a/resources/img/launchpad-images/icons/Info.svg b/resources/img/launchpad-images/icons/Info.svg new file mode 100644 index 0000000000..adfacac399 --- /dev/null +++ b/resources/img/launchpad-images/icons/Info.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/img/launchpad-images/icons/Launchpad.svg b/resources/img/launchpad-images/icons/Launchpad.svg new file mode 100644 index 0000000000..267f272a34 --- /dev/null +++ b/resources/img/launchpad-images/icons/Launchpad.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/js/components/shared/EllipsisMenu.vue b/resources/js/components/shared/EllipsisMenu.vue index 5b78eb5fab..322f8de17a 100644 --- a/resources/js/components/shared/EllipsisMenu.vue +++ b/resources/js/components/shared/EllipsisMenu.vue @@ -144,21 +144,20 @@ export default { filterActions() { let btns = this.filterActionsByPermissions(); btns = this.filterActionsByConditionals(btns); - return btns; }, filterAboveDivider() { const filteredActions = this.filterActions; const firstActions = filteredActions.slice(0, -1); - + console.log("firstActions above",firstActions); return firstActions; }, filterBelowDivider() { const filteredActions = this.filterActions; const lastAction = filteredActions.slice(-1); - + console.log("lastAction below",lastAction); return lastAction; }, contractedMenu() { @@ -260,7 +259,7 @@ export default { }, isProcessesCatalogueInUrl() { const currentUrl = window.location.href; - const isInUrl = currentUrl.includes("process-browser"); + const isInUrl = /process-browser|inbox/.test(currentUrl); return isInUrl; }, }, diff --git a/resources/js/components/shared/LaunchpadSettingsModal.vue b/resources/js/components/shared/LaunchpadSettingsModal.vue index 039e914ca0..10dda3e785 100755 --- a/resources/js/components/shared/LaunchpadSettingsModal.vue +++ b/resources/js/components/shared/LaunchpadSettingsModal.vue @@ -123,9 +123,9 @@ :title="$t('Edit Task Column')" >

    -