Added locale selector

dboldbaatar · Nov 10, 2017 · 3fac236 · 3fac236
1 parent edf59ff
commit 3fac236
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 26 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -10,13 +10,14 @@
 	<title>Aimeos on Laravel</title>
 
 	<link type="text/css" rel="stylesheet" href='https://fonts.googleapis.com/css?family=Roboto:400,300'>
-    <link type="text/css" rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+	<link type="text/css" rel="stylesheet" href="/css/app.css">
 
 	@yield('aimeos_styles')
 
 </head>
 <body>
 	<nav class="navbar navbar-default">
+
 	<div class="container-fluid">
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -29,34 +30,29 @@
 			</div>
 
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-				<ul class="nav navbar-nav">
-					<li><a href="/">Home</a></li>
-				</ul>
-
-				<div class="nav navbar-nav navbar-right">
+				<ul class="nav navbar-nav navbar-right">
 
-                    @if (Auth::guest())
-                        <li><a href="/login">Login</a></li>
-                        <li><a href="/register">Register</a></li>
-                    @else
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ Auth::user()->name }} <span class="caret"></span></a>
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{
+					@if (Auth::guest())
+						<li><a href="/login">Login</a></li>
+						<li><a href="/register">Register</a></li>
+					@else
+						<li class="dropdown">
+							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ Auth::user()->name }} <span class="caret"></span></a>
+							<ul class="dropdown-menu" role="menu">
+								<li><a href="{{
 route('aimeos_shop_account',['site'=>Route::current()->parameter('site','default'),'locale'=>Route::current()->parameter('locale','en'),'currency'=>Route::current()->parameter('currency','EUR')])
 }}" title="My account">My account</a></li>
-                                <li><form id="logout" action="/logout" method="POST">{{csrf_field()}}</form><a href="javascript: document.getElementById('logout').submit();">Logout</a></li>
-                            </ul>
-                        </li>
-                    @endif
+								<li><form id="logout" action="/logout" method="POST">{{csrf_field()}}</form><a href="javascript: document.getElementById('logout').submit();">Logout</a></li>
+							</ul>
+						</li>
+					@endif
 
-					@yield('aimeos_head')
-
-				</div>
+					<li>@yield('aimeos_head')</li>
+				</ul>
 			</div>
 		</div>
 	</nav>
-    <div class="col-xs-12">
+	<div class="col-xs-12">
 
 		@yield('aimeos_nav')
 		@yield('aimeos_stage')
@@ -67,8 +63,7 @@
 	</div>
 
 	<!-- Scripts -->
-	<script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
-	<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+	<script type="text/javascript" src="/js/app.js"></script>
 
 	@yield('aimeos_scripts')
 

diff --git a/resources/views/vendor/shop/account/index.blade.php b/resources/views/vendor/shop/account/index.blade.php
@@ -0,0 +1,27 @@
+@extends('shop::base')
+
+@section('aimeos_header')
+    <?= $aiheader['locale/select'] ?>
+    <?= $aiheader['basket/mini'] ?>
+    <?= $aiheader['account/profile'] ?>
+    <?= $aiheader['account/history'] ?>
+    <?= $aiheader['account/favorite'] ?>
+    <?= $aiheader['account/watch'] ?>
+    <?= $aiheader['catalog/session'] ?>
+@stop
+
+@section('aimeos_head')
+    <?= $aibody['locale/select'] ?>
+    <?= $aibody['basket/mini'] ?>
+@stop
+
+@section('aimeos_body')
+    <?= $aibody['account/profile'] ?>
+    <?= $aibody['account/history'] ?>
+    <?= $aibody['account/favorite'] ?>
+    <?= $aibody['account/watch'] ?>
+@stop
+
+@section('aimeos_aside')
+    <?= $aibody['catalog/session'] ?>
+@stop
diff --git a/resources/views/vendor/shop/basket/index.blade.php b/resources/views/vendor/shop/basket/index.blade.php
@@ -0,0 +1,16 @@
+@extends('shop::base')
+
+@section('aimeos_header')
+    <?= $aiheader['locale/select'] ?>
+    <?= $aiheader['basket/standard'] ?>
+    <?= $aiheader['basket/related'] ?>
+@stop
+
+@section('aimeos_head')
+    <?= $aibody['locale/select'] ?>
+@stop
+
+@section('aimeos_body')
+    <?= $aibody['basket/standard'] ?>
+    <?= $aibody['basket/related'] ?>
+@stop
diff --git a/resources/views/vendor/shop/catalog/detail.blade.php b/resources/views/vendor/shop/catalog/detail.blade.php
@@ -0,0 +1,31 @@
+@extends('shop::base')
+
+@section('aimeos_scripts')
+	@parent
+    <script type="text/javascript" src="<?php echo asset('packages/aimeos/shop/themes/aimeos-detail.js'); ?>"></script>
+@stop
+
+@section('aimeos_header')
+    <?= $aiheader['locale/select'] ?>
+    <?= $aiheader['basket/mini'] ?>
+    <?= $aiheader['catalog/stage'] ?>
+    <?= $aiheader['catalog/detail'] ?>
+    <?= $aiheader['catalog/session'] ?>
+@stop
+
+@section('aimeos_head')
+    <?= $aibody['locale/select'] ?>
+    <?= $aibody['basket/mini'] ?>
+@stop
+
+@section('aimeos_stage')
+    <?= $aibody['catalog/stage'] ?>
+@stop
+
+@section('aimeos_body')
+    <?= $aibody['catalog/detail'] ?>
+@stop
+
+@section('aimeos_aside')
+    <?= $aibody['catalog/session'] ?>
+@stop
diff --git a/resources/views/vendor/shop/catalog/list.blade.php b/resources/views/vendor/shop/catalog/list.blade.php
@@ -0,0 +1,26 @@
+@extends('shop::base')
+
+@section('aimeos_header')
+    <?= $aiheader['locale/select'] ?>
+    <?= $aiheader['basket/mini'] ?>
+    <?= $aiheader['catalog/filter'] ?>
+    <?= $aiheader['catalog/stage'] ?>
+    <?= $aiheader['catalog/lists'] ?>
+@stop
+
+@section('aimeos_head')
+    <?= $aibody['locale/select'] ?>
+    <?= $aibody['basket/mini'] ?>
+@stop
+
+@section('aimeos_nav')
+    <?= $aibody['catalog/filter'] ?>
+@stop
+
+@section('aimeos_stage')
+    <?= $aibody['catalog/stage'] ?>
+@stop
+
+@section('aimeos_body')
+     <?= $aibody['catalog/lists'] ?>
+@stop