Merge pull request #3292 from Leantime/fix/phase0-misc-improvements

fix: accessibility, view system, and composer improvements from phase-0

Author: marcelfolaron

app/Core/UI/ViewsServiceProvider.php

@@ -62,11 +62,10 @@ public function registerFactory()
 
             $factory = $this->createFactory($resolver, $finder, $app['events']);
 
-            // Backwards compatible view engine resolver
+            // Legacy template extensions — still needed for plugins with .tpl.php/.sub.php/.inc.php
             array_map(fn ($ext) => $factory->addExtension($ext, 'php'), ['inc.php', 'sub.php', 'tpl.php']);
 
-            // reprioritize blade
-            // Use blade engine for all things blade
+            // Use blade engine for all things blade (registered last to take priority)
             $factory->addExtension('blade.php', 'blade');
 
             // We will also set the container instance on this view environment since the
@@ -411,6 +410,7 @@ private function discoverViewPaths()
 
         $storePaths = $domainPaths
             ->merge($pluginPaths)
+            ->merge(['globals' => APP_ROOT.'/app/Views/Templates'])
             ->merge(['global' => APP_ROOT.'/app/Views/Templates'])
             ->merge(['__components' => $this->app['config']->get('view.compiled')])
             ->all();

app/Views/Composers/App.php

@@ -6,6 +6,7 @@
 use Leantime\Core\Controller\Frontcontroller as FrontcontrollerCore;
 use Leantime\Core\Events\DispatchesEvents;
 use Leantime\Core\UI\Composer;
+use Leantime\Core\UI\Theme;
 use Leantime\Domain\Menu\Repositories\Menu;
 
 class App extends Composer
@@ -18,9 +19,12 @@ class App extends Composer
 
     private Menu $menuRepo;
 
-    public function init(Menu $menuRepo): void
+    private Theme $themeCore;
+
+    public function init(Menu $menuRepo, Theme $themeCore): void
     {
         $this->menuRepo = $menuRepo;
+        $this->themeCore = $themeCore;
     }
 
     /**
@@ -39,8 +43,10 @@ public function with(): array
         $announcement = self::dispatch_filter('appAnnouncement', $announcement);
 
         return [
+            'module' => strtolower(FrontcontrollerCore::getModuleName()),
             'section' => $menuType,
             'appAnnouncement' => $announcement,
+            'themeBgUrl' => $this->themeCore->getBackgroundImage(),
         ];
     }
 }

app/Views/Composers/Header.php

@@ -85,6 +85,8 @@ public function with(): array
             'accents' => [
                 $this->themeCore->getPrimaryColor(),
                 $this->themeCore->getSecondaryColor(),
+                false,  // accent3 uses CSS default
+                false,  // accent4 uses CSS default
             ],
             'themeBg' => $this->themeCore->getBackgroundImage(),
             'themeOpacity' => $backgroundOpacity,

app/Views/Templates/sections/header.blade.php

@@ -3,7 +3,7 @@
 <meta name="requestId" content="{{ \Illuminate\Support\Str::random(4) }}">
 <meta name="description" content="{{ $sitename }}">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="apple-touch-fullscreen" content="yes">
 <meta name="theme-color" content="{{ $primaryColor }}">