IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix help button.

Browse Source
This commit is contained in:
James Cole 2017-07-16 18:28:46 +02:00
parent 021d0e6359
commit 77d077ec08
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Controller.php
View File

@ -68,6 +68,7 @@ class Controller extends BaseController
// get shown-intro-preference: // get shown-intro-preference:
if (auth()->check()) { if (auth()->check()) {
$route = Route::currentRouteName(); $route = Route::currentRouteName();
$originalRoute = $route;
$route = str_replace('.', '_', $route); $route = str_replace('.', '_', $route);
$key = 'shown_demo_' . $route; $key = 'shown_demo_' . $route;
$config = config('intro.' . $route); $config = config('intro.' . $route);
@ -78,6 +79,7 @@ class Controller extends BaseController
} }
View::share('shownDemo', $shownDemo); View::share('shownDemo', $shownDemo);
View::share('current_route_name', $route); View::share('current_route_name', $route);
View::share('original_route_name', $originalRoute);
} }
return $next($request); return $next($request);

5
app/Http/Controllers/Json/IntroController.php
View File

@ -11,6 +11,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json; namespace FireflyIII\Http\Controllers\Json;
use Preferences;
use Response; use Response;
/** /**
@ -44,7 +45,6 @@ class IntroController
$currentStep['intro'] = trans('intro.' . $route . '_' . $key); $currentStep['intro'] = trans('intro.' . $route . '_' . $key);
// save in array: // save in array:
$steps[] = $currentStep; $steps[] = $currentStep;
} }
@ -61,8 +61,7 @@ class IntroController
public function postFinished(string $route) public function postFinished(string $route)
{ {
$key = 'shown_demo_' . $route; $key = 'shown_demo_' . $route;
Preferences::set($key, true);
// Preferences::set($key, true);
return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]); return Response::json(['result' => sprintf('Reported demo watched for route "%s".', $route)]);
} }

4
resources/views/layout/default.twig
View File

@ -62,8 +62,8 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="hidden-sm hidden-xs"> <li class="hidden-sm hidden-xs">
<a href="#" id="help" data-route="{{ current_route_name }}"> <a href="#" id="help" data-route="{{ original_route_name }}">
<i class="fa fa-question-circle" data-route="{{ current_route_name }}"></i> <i class="fa fa-question-circle" data-route="{{ original_route_name }}"></i>
</a> </a>
</li> </li>