Update app.php

Update app.php (French translations Fix) + version app (2.4.4)

app/Http/Controllers/ItemController.php

@@ -145,11 +145,38 @@ class ItemController extends Controller
         //
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
         $data['tags']->prepend(__('app.dashboard'), 0);
-        $data['current_tags'] = collect([0 => __('app.dashboard')]);
+        $data['current_tags'] = '0';
         return view('items.create', $data);
 
     }
 
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        // Get the item
+        $item = Item::find($id);
+        if($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
+            $app = Application::where('class', $item->class)->first();
+            if($app) {
+                $item->appid = $app->appid;
+            }
+        }
+        $data['item'] = $item;
+        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['tags']->prepend(__('app.dashboard'), 0);
+        $data['current_tags'] = $data['item']->tags();
+        //$data['current_tags'] = $data['item']->parent;
+        //die(print_r($data['current_tags']));
+        // show the edit form and pass the nerd
+        return view('items.edit', $data);    
+    }
+
+
     public function storelogic($request, $id = null)
     {
         $application = Application::single($request->input('appid'));
@@ -238,31 +265,6 @@ class ItemController extends Controller
         //
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        // Get the item
-        $item = Item::find($id);
-        if($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
-            $app = Application::where('class', $item->class)->first();
-            if($app) {
-                $item->appid = $app->appid;
-            }
-        }
-        $data['item'] = $item;
-        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
-        $data['tags']->prepend(__('app.dashboard'), 0);
-        $data['current_tags'] = $data['item']->tags();
-        //$data['current_tags'] = $data['item']->parent;
-        //die(print_r($data['current_tags']));
-        // show the edit form and pass the nerd
-        return view('items.edit', $data);    
-    }
 
     /**
      * Update the specified resource in storage.

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.4.3',
+    'version' => '2.4.5',
 
     /*
     |--------------------------------------------------------------------------

resources/lang/fr/app.php

@@ -6,6 +6,7 @@ return array (
   'settings.miscellaneous' => 'Divers',
   'settings.support' => 'Support',
   'settings.donate' => 'Contribuer',
+  'settings.advanced' => 'Options avancées',
   
   'settings.version' => 'Version',
   'settings.background_image' => 'Image d\'arrière-plan',
@@ -71,6 +72,8 @@ return array (
   'apps.preview' => 'Aperçu',
   'apps.apptype' => 'Type d\'application ',
   'apps.only_admin_account' => 'Seulement si vous avez un compte administrateur!',
+  'apps.autologin_url' => 'URL de connexion automatique',
+  'apps.show_deleted' => 'Afficher les applications supprimées',
 
   'dashboard' => 'Tableau de bord',
 

resources/views/items/preview.blade.php

@@ -3,11 +3,13 @@
                     ?>
                     <section class="item-container" data-id="">
                         <div class="item set-bg-elem" style="background-color: {{ $item->colour ?? '#222' }}">
-                            @if(isset($item->icon) && !empty($item->icon))
-                            <img class="app-icon" src="{{ asset('/storage/'.$item->icon) }}" />
-                            @else
-                            <img class="app-icon" src="{{ asset('/img/heimdall-icon-small.png') }}" />
-                            @endif
+                            <div class="app-icon-container">
+                                @if(isset($item->icon) && !empty($item->icon))
+                                <img class="app-icon" src="{{ asset('/storage/'.$item->icon) }}" />
+                                @else
+                                <img class="app-icon" src="{{ asset('/img/heimdall-icon-small.png') }}" />
+                                @endif
+                            </div>
                             <div class="details">
                                 <div class="title{{ title_color($item->colour) ?? 'white' }}">{{ $item->title ?? '' }}</div>
                                 @if($item->enhanced())