Головна сторінка Огляд Довідка
Реєстрація Увійти
wesley
/
furniture
2
1
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

test

dyjh 6 роки тому
батько
43a826c184
коміт
9654d2452f
15 змінених файлів з 47 додано та 47 видалено
Розділений вигляд Показати статистику Diff
  1. 1 1
      app/Helper/functions.inc.php
  2. 3 3
      app/Http/Controllers/Admin/Controller.php
  3. 1 1
      app/Widget/Tools/FileUpload.php
  4. 5 5
      app/Widget/Tools/ImgUpload.php
  5. 1 1
      resources/views/admin/album/agent/edit.blade.php
  6. 7 7
      resources/views/admin/album/order/check.blade.php
  7. 2 2
      resources/views/admin/album/order/index.blade.php
  8. 7 7
      resources/views/admin/album/order/view.blade.php
  9. 4 4
      resources/views/admin/auth/albumlogin.blade.php
  10. 4 4
      resources/views/admin/auth/login.blade.php
  11. 1 1
      resources/views/admin/base/actionlog/index.blade.php
  12. 3 3
      resources/views/admin/base/index/index.blade.php
  13. 1 1
      resources/views/admin/base/resources/manage.blade.php
  14. 1 1
      resources/views/admin/base/role/auth.blade.php
  15. 6 6
      resources/views/admin/layout.blade.php

+ 1 - 1
app/Helper/functions.inc.php
Переглянути файл

xqd 
@@ -642,7 +642,7 @@ function editor($textareaid = 'content', $getParam = array(), $options = array()
 
     $_csrf_token = csrf_token();
 
 
     $editer = <<<HTML
 
-        <link rel="stylesheet" href="/base/kindeditor-4.1.10/themes/default/default.css" />
 
+        <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/kindeditor-4.1.10/themes/default/default.css" />
 
         <script charset="utf-8" src="/base/kindeditor-4.1.10/kindeditor-min.js"></script>
 
         <script charset="utf-8" src="/base/kindeditor-4.1.10/lang/zh_CN.js"></script>
 
         <script>

+ 3 - 3
app/Http/Controllers/Admin/Controller.php
Переглянути файл

xqd 
@@ -166,9 +166,9 @@ abstract class Controller extends BaseController
 
                     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                     <meta name="renderer" content="webkit">
 
                     <title>' . $titleHtml .'</title>
 
-                    <link href="/base/css/bootstrap.min.css?v=3.4.0.css"  rel="stylesheet">
 
-                    <link href="/base/css/font-awesome.min.css?v=4.3.0.css"  rel="stylesheet">
 
-                    <link href="/base/css/style.min.css?v=3.0.0.css"  rel="stylesheet">
 
+                    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css"  rel="stylesheet">
 
+                    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css"  rel="stylesheet">
 
+                    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v=3.0.0.css"  rel="stylesheet">
 
                     <script type="text/javascript">
 
                             setTimeout(function(){
 
                                 var url = "' . $urls[0]['url'] . '";

+ 1 - 1
app/Widget/Tools/FileUpload.php
Переглянути файл

xqd 
@@ -34,7 +34,7 @@ class FileUpload {
 
 
         $token = csrf_token();
 
         $html = <<<EOF
 
-         <link href="/base/webuploader/webuploader.css" rel="stylesheet">
 
+         <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/webuploader/webuploader.css" rel="stylesheet">
 
                         <script src="/base/webuploader/webuploader.min.js"></script>
 
             <div class="WebUploader">
 
                 <div class="WebUploader_button">

+ 5 - 5
app/Widget/Tools/ImgUpload.php
Переглянути файл

xqd xqd xqd xqd xqd 
@@ -46,7 +46,7 @@ class ImgUpload {
 
             }
 
         }
 
         $html = <<<EOF
 
-                        <link href="/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
+                        <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
                         <script src="/base/plugins/webuploader/webuploader.js"></script>
 
                             <div style="clear:both">
 
                             <div id="$id" class="layout_upload">
 
@@ -182,7 +182,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="/base/plugins/webuploader/webuploader.css">
 
+<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
 <script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {
 
@@ -356,7 +356,7 @@ EOF;
 
 
 
         $html = <<<EOF
 
-                        <link href="/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
+                        <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
                         <script src="/base/plugins/webuploader/webuploader.js"></script>
 
                             <div style="clear:both">
 
                             <div id="multi" class="layout_upload">
 
@@ -502,7 +502,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="/base/plugins/webuploader/webuploader.css">
 
+<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
 <script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {
 
@@ -651,7 +651,7 @@ EOF;
 
             $upload_url = $upload_url . '&' . $key . '=' . $val;
 
         }
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="/base/plugins/webuploader/webuploader.css">
 
+<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
 <script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {

+ 1 - 1
resources/views/admin/album/agent/edit.blade.php
Переглянути файл

xqd 
@@ -1,7 +1,7 @@
 
 @extends('admin.layout')
 
 @section('header')
 
 
-    <link href="/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
 
     <script src="/base/js/fileinput.js" type="text/javascript"></script>
 
     <script src="/base/js/fileinput_locale_zh.js" type="text/javascript"></script>

+ 7 - 7
resources/views/admin/album/order/check.blade.php
Переглянути файл

xqd 
@@ -10,20 +10,20 @@
 
     <!-- CSRF Token -->
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
 
-    <link href="/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
 
     <!-- Data Tables -->
 
-    <link href="/base/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
 
 
-    <link href="/base/css/animate.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
-    <link href="/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 
     <!-- fine-uploader -->
 
-    <!--     <link rel="stylesheet" href="/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
+    <!--     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
 
     <!-- cropperjs -->
 
-    <link rel="stylesheet" href="/base/plugins/cropperjs/cropper.min.css">
 
+    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
     <!-- 全局js -->
 
     <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>

+ 2 - 2
resources/views/admin/album/order/index.blade.php
Переглянути файл

xqd 
@@ -1,8 +1,8 @@
 
 @extends('admin.layout')
 
 
 @section('content')
 
-    <link href="/base/css/time/jquery.datetimepicker.css" rel="stylesheet">
 
-    <link href="/base/css/time/jquery-ui-1.10.1.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/time/jquery.datetimepicker.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/time/jquery-ui-1.10.1.css" rel="stylesheet">
 
     <div class="wrapper wrapper-content animated fadeInRight">
 
         <div class="row">
 
             <div class="col-sm-12">

+ 7 - 7
resources/views/admin/album/order/view.blade.php
Переглянути файл

xqd 
@@ -10,20 +10,20 @@
 
     <!-- CSRF Token -->
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
 
-    <link href="/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
 
     <!-- Data Tables -->
 
-    <link href="/base/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
 
 
-    <link href="/base/css/animate.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
-    <link href="/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 
     <!-- fine-uploader -->
 
-    <!--     <link rel="stylesheet" href="/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
+    <!--     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
 
     <!-- cropperjs -->
 
-    <link rel="stylesheet" href="/base/plugins/cropperjs/cropper.min.css">
 
+    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
     <!-- 全局js -->
 
     <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>

+ 4 - 4
resources/views/admin/auth/albumlogin.blade.php
Переглянути файл

xqd 
@@ -6,10 +6,10 @@
 
     <meta name="renderer" content="webkit">
 
     <title>管理后台</title>
 
     <meta name="keywords" content="管理后台">
 
-    <link href="/base/css/bootstrap.min.css" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css"  rel="stylesheet">
 
-    <link href="/base/css/animate.min.css" rel="stylesheet">
 
-    <link href="/base/css/style.min.css"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css"  rel="stylesheet">
 
 </head>
 
 
 <body class="gray-bg">

+ 4 - 4
resources/views/admin/auth/login.blade.php
Переглянути файл

xqd 
@@ -6,10 +6,10 @@
 
     <meta name="renderer" content="webkit">
 
     <title>管理后台</title>
 
     <meta name="keywords" content="管理后台">
 
-    <link href="/base/css/bootstrap.min.css" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css"  rel="stylesheet">
 
-    <link href="/base/css/animate.min.css" rel="stylesheet">
 
-    <link href="/base/css/style.min.css"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css"  rel="stylesheet">
 
 </head>
 
 
 <body class="gray-bg">

+ 1 - 1
resources/views/admin/base/actionlog/index.blade.php
Переглянути файл

xqd 
@@ -7,7 +7,7 @@
 
 .footable-row-detail-inner{width: 100%;}
 
 </style>
 
 
-<link href="/base/css/plugins/footable/footable.core.css" rel="stylesheet">
 
+<link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/plugins/footable/footable.core.css" rel="stylesheet">
 
 @endsection
 
 
 @section('content')

+ 3 - 3
resources/views/admin/base/index/index.blade.php
Переглянути файл

xqd 
@@ -15,9 +15,9 @@
 
     <![endif]-->
 
 
     <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css?v=4.3.0" rel="stylesheet">
 
-    <link href="/base/css/animate.min.css" rel="stylesheet">
 
-    <link href="/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 </head>
 
 
 <body class="fixed-sidebar full-height-layout gray-bg">

+ 1 - 1
resources/views/admin/base/resources/manage.blade.php
Переглянути файл

xqd 
@@ -2,7 +2,7 @@
 
 
 @section('content')
 
 
-<link href="/base/js/swfupload/swfupload.css?v={{config("sys.version")}}" rel="stylesheet">
 
+<link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.css?v={{config("sys.version")}}" rel="stylesheet">
 
 <script type="text/javascript" src="/base/js/zclip/jquery.zclip.min.js?v={{config("sys.version")}}" ></script>
 
 <style type="text/css">
 
 i,em{font-style:normal;}

+ 1 - 1
resources/views/admin/base/role/auth.blade.php
Переглянути файл

xqd 
@@ -140,7 +140,7 @@
 
 @endsection
 
 @section('footer')
 
 	 <!-- ztree -->
 
-    <link rel="stylesheet" href="/base/js/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css">
 
+    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css">
 
     <script type="text/javascript" src="/base/js/zTree_v3/js/jquery.ztree.core-3.5.js?v={{config("sys.version")}}" ></script>
 
     <script type="text/javascript" src="/base/js/zTree_v3/js/jquery.ztree.excheck-3.5.js?v={{config("sys.version")}}" ></script>
 
 @endsection

+ 6 - 6
resources/views/admin/layout.blade.php
Переглянути файл

xqd 
@@ -11,19 +11,19 @@
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
 
     <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
-    <link href="/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
 
     <!-- Data Tables -->
 
-    <link href="/base/css/plugins/dataTables/dataTables.bootstrap.css"rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/plugins/dataTables/dataTables.bootstrap.css"rel="stylesheet">
 
 
-    <link href="/base/css/animate.min.css?v={{config("sys.version")}}"  rel="stylesheet">
 
-    <link href="/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css?v={{config("sys.version")}}"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 
     <!-- fine-uploader -->
 
-<!--     <link rel="stylesheet" href="/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
+<!--     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
 
     <!-- cropperjs -->
 
-    <link rel="stylesheet" href="/base/plugins/cropperjs/cropper.min.css">
 
+    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
    	<!-- 全局js -->
 
     <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}" ></script>