Explorar o código

Merge pull request #1907 from flc1125/2.x-hotfix

fixed hotfix
Jiang Qinghua %!s(int64=3) %!d(string=hai) anos
pai
achega
2b71975fe4

+ 28 - 28
resources/views/layouts/page.blade.php

@@ -1,28 +1,28 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="chrome=1,IE=edge">
-    {{-- 默认使用谷歌浏览器内核--}}
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-
-    <title>{{ Dcat\Admin\Admin::title() }} @if(! empty($header)) | {{ $header }}@endif</title>
-
-    @if(! config('admin.disable_no_referrer_meta'))
-        <meta name="referrer" content="no-referrer"/>
-    @endif
-
-    @if(! empty($favicon = Dcat\Admin\Admin::favicon()))
-        <link rel="shortcut icon" href="{{ $favicon }}">
-    @endif
-
-    {!! admin_section(Dcat\Admin\Admin::SECTION['HEAD']) !!}
-
-    {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
-
-    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
-</head>
-
-@extends('admin::layouts.container')
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="chrome=1,IE=edge">
+    {{-- 默认使用谷歌浏览器内核--}}
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <title>@if(! empty($header)){{ $header }} | @endif {{ Dcat\Admin\Admin::title() }}</title>
+
+    @if(! config('admin.disable_no_referrer_meta'))
+        <meta name="referrer" content="no-referrer"/>
+    @endif
+
+    @if(! empty($favicon = Dcat\Admin\Admin::favicon()))
+        <link rel="shortcut icon" href="{{ $favicon }}">
+    @endif
+
+    {!! admin_section(Dcat\Admin\Admin::SECTION['HEAD']) !!}
+
+    {!! Dcat\Admin\Admin::asset()->headerJsToHtml() !!}
+
+    {!! Dcat\Admin\Admin::asset()->cssToHtml() !!}
+</head>
+
+@extends('admin::layouts.container')

+ 2 - 2
src/Grid/Column/HasDisplayers.php

@@ -108,7 +108,7 @@ trait HasDisplayers
     }
 
     /**
-     * @param  string  $val
+     * @param  \Closure|string  $val
      * @return $this
      */
     public function prepend($val)
@@ -131,7 +131,7 @@ trait HasDisplayers
     }
 
     /**
-     * @param  string  $val
+     * @param  \Closure|string  $val
      * @return $this
      */
     public function append($val)

+ 2 - 2
src/Grid/Displayers/Modal.php

@@ -73,8 +73,8 @@ class Modal extends AbstractDisplayer
 
     protected function renderButton()
     {
-        $icon = $this->icon ? "<i class='fa {$this->icon}'></i>" : '';
+        $icon = $this->icon ? "<i class='fa {$this->icon}'></i>&nbsp;&nbsp;" : '';
 
-        return "<a href='javascript:void(0)'>{$icon}&nbsp;&nbsp;{$this->value}</a>";
+        return "<a href='javascript:void(0)'>{$icon}{$this->value}</a>";
     }
 }