From bf778e940515bf462e8e81dd591453242fa87ca8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 16 Aug 2019 17:09:40 +0800
Subject: [PATCH] Tweak

---
 app/Http/Controllers/UserController.php | 11 +++++++++++
 resources/views/user/index.blade.php    | 14 ++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index f50a7c13..0cee09a2 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -37,11 +37,22 @@ class UserController extends Controller
     {
         $user = Auth::user();
 
+        list($from, $to) = explode(',', option('sign_score'));
+        $scoreIntro = nl2br(trans('user.score-intro.introduction', [
+            'initial_score' => option('user_initial_score'),
+            'score-from'    => $from,
+            'score-to'      => $to,
+            'return-score'  => option('return_score')
+                ? trans('user.score-intro.will-return-score')
+                : trans('user.score-intro.no-return-score')
+        ]));
+
         return view('user.index')->with([
             'statistics' => [
                 'players' => $this->calculatePercentageUsed($user->players->count(), option('score_per_player')),
                 'storage' => $this->calculatePercentageUsed($this->getStorageUsed($user), option('score_per_storage')),
             ],
+            'scoreIntro' => $scoreIntro,
             'announcement' => app('parsedown')->text(option_localized('announcement')),
             'extra' => ['unverified' => option('require_verification') && ! $user->verified],
         ]);
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 7b302bae..814d7987 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -8,9 +8,7 @@
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-        <h1>
-            @lang('general.dashboard')
-        </h1>
+        <h1>@lang('general.dashboard')</h1>
     </section>
 
     <!-- Main content -->
@@ -49,16 +47,8 @@
                 <h4 class="modal-title">@lang('user.score-intro.title')</h4>
             </div>
             <div class="modal-body">
-                <?php list($from, $to) = explode(',', Option::get('sign_score')); ?>
-                {!! nl2br(trans('user.score-intro.introduction', [
-                    'initial_score' => option('user_initial_score'),
-                    'score-from'    => $from,
-                    'score-to'      => $to,
-                    'return-score'  => option('return_score') ? trans('user.score-intro.will-return-score') : trans('user.score-intro.no-return-score')
-                ])) !!}
-
+                {!! $scoreIntro !!}
                 <hr />
-
                 <div class="row">
                     <div class="col-md-4">
                         <p class="text-center">@lang('user.score-intro.rates.storage', ['score' => option('score_per_storage')])</p>