FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix updater

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-06-22 09:26:08 -05:00
parent 230d3bebd3
commit 9125cc3d87
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/Installer/Resources/views/app.blade.php
+3 -8
View File
@@ -16,6 +16,8 @@
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/> <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
@@ -24,8 +26,8 @@
<style> <style>
.table tr:first-child td { border-top: 0px; } .table tr:first-child td { border-top: 0px; }
@yield('css')
</style> </style>
@yield('css')
</head> </head>
<body> <body>
@@ -33,13 +35,6 @@
<nav class="navbar navbar-toggleable-md" style="background: #067ec1;"> <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
<div class="container" style="width: 85%!important;"> <div class="container" style="width: 85%!important;">
<div class="navbar-translate"> <div class="navbar-translate">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-bar bar1"></span>
<span class="navbar-toggler-bar bar2"></span>
<span class="navbar-toggler-bar bar3"></span>
</button>
<p class="navbar-brand text-white" data-placement="bottom" target="_blank"> <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
<a href="{{ url('/') }}"> <a href="{{ url('/') }}">
<img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/> <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
modules/Installer/Services/MigrationService.php
+1 -1
View File
@@ -33,7 +33,7 @@ class MigrationService extends Service
'core' => \App::databasePath() . '/migrations' 'core' => \App::databasePath() . '/migrations'
]; ];
$modules = Module::enabled(); $modules = Module::allEnabled();
foreach ($modules as $module) { foreach ($modules as $module) {
$module_path = $module->getPath() . '/Database/migrations'; $module_path = $module->getPath() . '/Database/migrations';
if(file_exists($module_path)) { if(file_exists($module_path)) {
resources/views/admin/app.blade.php
+6 -5
View File
@@ -18,12 +18,12 @@
<link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/> <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
<link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'/>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="{{ public_asset('/assets/global/css/vendor.css') }}"> <link rel="stylesheet" href="{{ public_asset('/assets/global/css/vendor.css') }}"/>
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/vendor.css') }}"> <link rel="stylesheet" href="{{ public_asset('/assets/admin/css/vendor.css') }}"/>
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}"> <link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}"/>
<style type="text/css"> <style type="text/css">
@yield('css') @yield('css')
@@ -36,6 +36,7 @@
@else @else
const PHPVMS_USER_API_KEY = false; const PHPVMS_USER_API_KEY = false;
@endif @endif
@yield('scripts_head')
</script> </script>
</head> </head>
resources/views/layouts/default/app.blade.php
+6 -1
View File
@@ -15,14 +15,19 @@
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
{{-- Start of the required files in the head block --}} {{-- Start of the required files in the head block --}}
<link href="{{ public_asset('/assets/global/css/vendor.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/global/css/vendor.css') }}" rel="stylesheet"/>
<style type="text/css">
@yield('css') @yield('css')
</style>
<script>
@yield('scripts_head') @yield('scripts_head')
</script>
{{-- End of the required stuff in the head block --}} {{-- End of the required stuff in the head block --}}
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
</head> </head>
<body> <body>
<!-- Navbar --> <!-- Navbar -->