mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Merge branch 'layout-v2' into develop
* layout-v2: First version of login page. Make FA and Google Font local Basic views. All assets for tabler layout.
This commit is contained in:
		
							
								
								
									
										92
									
								
								resources/views/v2/auth/login.twig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								resources/views/v2/auth/login.twig
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,92 @@ | ||||
| <!doctype html> | ||||
| <html lang="en" dir="ltr"> | ||||
| <head> | ||||
|     <base href="{{ route('index') }}/"> | ||||
|     <meta charset="UTF-8"> | ||||
|     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> | ||||
|     <meta http-equiv="X-UA-Compatible" content="ie=edge"> | ||||
|     <meta http-equiv="Content-Language" content="en"/> | ||||
|  | ||||
|     {# favicons #} | ||||
|     {% include('partials.favicons') %} | ||||
|  | ||||
|     <title>TODO replace meLogin</title> | ||||
|     <link rel="stylesheet" href="v2/lib/font-awesome/4.7.0/css/font-awesome.min.css"> | ||||
|     <link rel="stylesheet" href="v2/assets/css/gf-source.css"> | ||||
|     <script src="v2/assets/js/require.min.js"></script> | ||||
|     <script> | ||||
|         requirejs.config({ | ||||
|                              baseUrl: '.' | ||||
|                          }); | ||||
|     </script> | ||||
|     <!-- Dashboard Core --> | ||||
|     <link href="v2/assets/css/dashboard.css" rel="stylesheet"/> | ||||
|     <script src="v2/assets/js/dashboard.js"></script> | ||||
|     <!-- Input Mask Plugin --> | ||||
|     <script src="v2/assets/plugins/input-mask/plugin.js"></script> | ||||
| </head> | ||||
| <body class=""> | ||||
| <div class="page"> | ||||
|     <div class="page-single"> | ||||
|         <div class="container"> | ||||
|             <div class="row"> | ||||
|                 <div class="col col-login mx-auto"> | ||||
|                     <div class="text-center mb-6"> | ||||
|                         <img src="v2/assets/images/firefly-iii-48.png" class="h-6" alt="Firefly III"> | ||||
|                     </div> | ||||
|                     <form class="card" action="{{ route('login') }}" method="post"> | ||||
|                         <input type="hidden" name="_token" value="{{ csrf_token() }}"/> | ||||
|                         <div class="card-body p-6"> | ||||
|                             <div class="card-title"> | ||||
|                                 {% if IS_DEMO_SITE %} | ||||
|                                     Welcome to the Firefly III demonstration website! | ||||
|                                 {% else %} | ||||
|                                     {{ 'sign_in_to_start'|_ }} | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                             {% if IS_DEMO_SITE %} | ||||
|                                 <p> | ||||
|                                     To log in, please use email address <strong>{{ DEMO_USERNAME }}</strong> with password <strong>{{ DEMO_PASSWORD }}</strong> | ||||
|                                 </p> | ||||
|                             {% endif %} | ||||
|                             <div class="form-group"> | ||||
|                                 {% if env('LOGIN_PROVIDER', 'eloquent') == 'eloquent' %} | ||||
|                                     <label class="form-label">{{ trans('form.email') }}</label> | ||||
|                                     <input type="email" class="form-control" id="email" autocomplete="email" aria-describedby="emailHelp" placeholder="{{ trans('form.email') }}"> | ||||
|                                 {% else %} | ||||
|                                     <label class="form-label">{{ trans('form.login_name') }}</label> | ||||
|                                     <input type="email" class="form-control" id="email" autocomplete="username" aria-describedby="emailHelp" placeholder="{{ trans('form.login_name') }}"> | ||||
|                                 {% endif %} | ||||
|                             </div> | ||||
|                             <div class="form-group"> | ||||
|                                 <label class="form-label"> | ||||
|                                     Password | ||||
|                                     {% if allowReset %} | ||||
|                                     <a href="{{ route('password.reset.request') }}" class="float-right small">{{ 'forgot_my_password'|_ }}</a> | ||||
|                                     {% endif %} | ||||
|                                 </label> | ||||
|                                 <input type="password" class="form-control" autocomplete="password" id="password" placeholder="Password"> | ||||
|                             </div> | ||||
|                             <div class="form-group"> | ||||
|                                 <label class="custom-control custom-checkbox"> | ||||
|                                     <input type="checkbox" class="custom-control-input" name="remember" {% if remember %}checked{% endif %} value="1" /> | ||||
|                                     <span class="custom-control-label">{{ trans('form.remember_me') }}</span> | ||||
|                                 </label> | ||||
|                             </div> | ||||
|                             <div class="form-footer"> | ||||
|                                 <button type="submit" class="btn btn-primary btn-block">{{ 'sign_in'|_ }}</button> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                     </form> | ||||
|                     {% if allowRegistration %} | ||||
|                     <div class="text-center text-muted"> | ||||
|                         Don't have account yet? <a href="./register.html">Sign up</a> | ||||
|                     </div> | ||||
|                     {% endif %} | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
							
								
								
									
										1584
									
								
								resources/views/v2/index.twig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1584
									
								
								resources/views/v2/index.twig
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										0
									
								
								resources/views/v2/layout/auth.twig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								resources/views/v2/layout/auth.twig
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										273
									
								
								resources/views/v2/layout/default.twig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										273
									
								
								resources/views/v2/layout/default.twig
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,273 @@ | ||||
| <!doctype html> | ||||
| <html lang="en" dir="ltr"> | ||||
| <head> | ||||
|     <base href="{{ route('index') }}/"> | ||||
|     <meta charset="UTF-8"> | ||||
|     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> | ||||
|     <meta http-equiv="X-UA-Compatible" content="ie=edge"> | ||||
|     <meta http-equiv="Content-Language" content="en" /> | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|     <meta name="msapplication-TileColor" content="#2d89ef"> | ||||
|     <meta name="theme-color" content="#4188c9"> | ||||
|     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> | ||||
|     <meta name="apple-mobile-web-app-capable" content="yes"> | ||||
|     <meta name="mobile-web-app-capable" content="yes"> | ||||
|     <meta name="HandheldFriendly" content="True"> | ||||
|     <meta name="MobileOptimized" content="320"> | ||||
|     <link rel="icon" href="./favicon.ico" type="image/x-icon"/> | ||||
|     <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" /> | ||||
|     <!-- Generated: 2018-04-16 09:29:05 +0200 --> | ||||
|     <title> | ||||
|         {% if subTitle %} | ||||
|             {{ subTitle }} » | ||||
|         {% endif %} | ||||
|         {% if title != "Firefly III" %} | ||||
|             {{ title }} » | ||||
|         {% endif %} | ||||
|  | ||||
|         Firefly III | ||||
|     </title> | ||||
|     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> | ||||
|     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&subset=latin-ext"> | ||||
|     <script src="v2/assets/js/require.min.js"></script> | ||||
|     <script> | ||||
|         requirejs.config({ | ||||
|                              baseUrl: '.' | ||||
|                          }); | ||||
|     </script> | ||||
|     <!-- Dashboard Core --> | ||||
|     <link href="v2/assets/css/dashboard.css" rel="stylesheet" /> | ||||
|     <script src="v2/assets/js/dashboard.js"></script> | ||||
|     <!-- c3.js Charts Plugin --> | ||||
|     <link href="v2/assets/plugins/charts-c3/plugin.css" rel="stylesheet" /> | ||||
|     <script src="v2/assets/plugins/charts-c3/plugin.js"></script> | ||||
|     <!-- Google Maps Plugin --> | ||||
|     <link href="v2/assets/plugins/maps-google/plugin.css" rel="stylesheet" /> | ||||
|     <script src="v2/assets/plugins/maps-google/plugin.js"></script> | ||||
|     <!-- Input Mask Plugin --> | ||||
|     <script src="v2/assets/plugins/input-mask/plugin.js"></script> | ||||
| </head> | ||||
| <body class=""> | ||||
| <div class="page"> | ||||
|     <div class="page-main"> | ||||
|         <div class="header py-4"> | ||||
|             <div class="container"> | ||||
|                 <div class="d-flex"> | ||||
|                     <a class="header-brand" href="./index.html"> | ||||
|                         <img src="v2/demo/brand/tabler.svg" class="header-brand-img" alt="tabler logo"> | ||||
|                     </a> | ||||
|                     <div class="d-flex order-lg-2 ml-auto"> | ||||
|                         <div class="nav-item d-none d-md-flex"> | ||||
|                             <a href="https://github.com/tabler/tabler" class="btn btn-sm btn-outline-primary" target="_blank">Source code</a> | ||||
|                         </div> | ||||
|                         <div class="dropdown d-none d-md-flex"> | ||||
|                             <a class="nav-link icon" data-toggle="dropdown"> | ||||
|                                 <i class="fe fe-bell"></i> | ||||
|                                 <span class="nav-unread"></span> | ||||
|                             </a> | ||||
|                             <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow"> | ||||
|                                 <a href="#" class="dropdown-item d-flex"> | ||||
|                                     <span class="avatar mr-3 align-self-center" style="background-image: url(demo/faces/male/41.jpg)"></span> | ||||
|                                     <div> | ||||
|                                         <strong>Nathan</strong> pushed new commit: Fix page load performance issue. | ||||
|                                         <div class="small text-muted">10 minutes ago</div> | ||||
|                                     </div> | ||||
|                                 </a> | ||||
|                                 <a href="#" class="dropdown-item d-flex"> | ||||
|                                     <span class="avatar mr-3 align-self-center" style="background-image: url(demo/faces/female/1.jpg)"></span> | ||||
|                                     <div> | ||||
|                                         <strong>Alice</strong> started new task: Tabler UI design. | ||||
|                                         <div class="small text-muted">1 hour ago</div> | ||||
|                                     </div> | ||||
|                                 </a> | ||||
|                                 <a href="#" class="dropdown-item d-flex"> | ||||
|                                     <span class="avatar mr-3 align-self-center" style="background-image: url(demo/faces/female/18.jpg)"></span> | ||||
|                                     <div> | ||||
|                                         <strong>Rose</strong> deployed new version of NodeJS REST Api V3 | ||||
|                                         <div class="small text-muted">2 hours ago</div> | ||||
|                                     </div> | ||||
|                                 </a> | ||||
|                                 <div class="dropdown-divider"></div> | ||||
|                                 <a href="#" class="dropdown-item text-center text-muted-dark">Mark all as read</a> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                         <div class="dropdown"> | ||||
|                             <a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown"> | ||||
|                                 <span class="avatar" style="background-image: url(./demo/faces/female/25.jpg)"></span> | ||||
|                                 <span class="ml-2 d-none d-lg-block"> | ||||
|                       <span class="text-default">Jane Pearson</span> | ||||
|                       <small class="text-muted d-block mt-1">Administrator</small> | ||||
|                     </span> | ||||
|                             </a> | ||||
|                             <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow"> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <i class="dropdown-icon fe fe-user"></i> Profile | ||||
|                                 </a> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <i class="dropdown-icon fe fe-settings"></i> Settings | ||||
|                                 </a> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <span class="float-right"><span class="badge badge-primary">6</span></span> | ||||
|                                     <i class="dropdown-icon fe fe-mail"></i> Inbox | ||||
|                                 </a> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <i class="dropdown-icon fe fe-send"></i> Message | ||||
|                                 </a> | ||||
|                                 <div class="dropdown-divider"></div> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <i class="dropdown-icon fe fe-help-circle"></i> Need help? | ||||
|                                 </a> | ||||
|                                 <a class="dropdown-item" href="#"> | ||||
|                                     <i class="dropdown-icon fe fe-log-out"></i> Sign out | ||||
|                                 </a> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <a href="#" class="header-toggler d-lg-none ml-3 ml-lg-0" data-toggle="collapse" data-target="#headerMenuCollapse"> | ||||
|                         <span class="header-toggler-icon"></span> | ||||
|                     </a> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="header collapse d-lg-flex p-0" id="headerMenuCollapse"> | ||||
|             <div class="container"> | ||||
|                 <div class="row align-items-center"> | ||||
|                     <div class="col-lg-3 ml-auto"> | ||||
|                         <form class="input-icon my-3 my-lg-0"> | ||||
|                             <input type="search" class="form-control header-search" placeholder="Search…" tabindex="1"> | ||||
|                             <div class="input-icon-addon"> | ||||
|                                 <i class="fe fe-search"></i> | ||||
|                             </div> | ||||
|                         </form> | ||||
|                     </div> | ||||
|                     <div class="col-lg order-lg-first"> | ||||
|                         <ul class="nav nav-tabs border-0 flex-column flex-lg-row"> | ||||
|                             <li class="nav-item"> | ||||
|                                 <a href="./index.html" class="nav-link active"><i class="fe fe-home"></i> Home</a> | ||||
|                             </li> | ||||
|                             <li class="nav-item"> | ||||
|                                 <a href="javascript:void(0)" class="nav-link" data-toggle="dropdown"><i class="fe fe-box"></i> Interface</a> | ||||
|                                 <div class="dropdown-menu dropdown-menu-arrow"> | ||||
|                                     <a href="./cards.html" class="dropdown-item ">Cards design</a> | ||||
|                                     <a href="./charts.html" class="dropdown-item ">Charts</a> | ||||
|                                     <a href="./pricing-cards.html" class="dropdown-item ">Pricing cards</a> | ||||
|                                 </div> | ||||
|                             </li> | ||||
|                             <li class="nav-item dropdown"> | ||||
|                                 <a href="javascript:void(0)" class="nav-link" data-toggle="dropdown"><i class="fe fe-calendar"></i> Components</a> | ||||
|                                 <div class="dropdown-menu dropdown-menu-arrow"> | ||||
|                                     <a href="./maps.html" class="dropdown-item ">Maps</a> | ||||
|                                     <a href="./icons.html" class="dropdown-item ">Icons</a> | ||||
|                                     <a href="./store.html" class="dropdown-item ">Store</a> | ||||
|                                     <a href="./blog.html" class="dropdown-item ">Blog</a> | ||||
|                                     <a href="./carousel.html" class="dropdown-item ">Carousel</a> | ||||
|                                 </div> | ||||
|                             </li> | ||||
|                             <li class="nav-item dropdown"> | ||||
|                                 <a href="javascript:void(0)" class="nav-link" data-toggle="dropdown"><i class="fe fe-file"></i> Pages</a> | ||||
|                                 <div class="dropdown-menu dropdown-menu-arrow"> | ||||
|                                     <a href="./profile.html" class="dropdown-item ">Profile</a> | ||||
|                                     <a href="./login.html" class="dropdown-item ">Login</a> | ||||
|                                     <a href="./register.html" class="dropdown-item ">Register</a> | ||||
|                                     <a href="./forgot-password.html" class="dropdown-item ">Forgot password</a> | ||||
|                                     <a href="./400.html" class="dropdown-item ">400 error</a> | ||||
|                                     <a href="./401.html" class="dropdown-item ">401 error</a> | ||||
|                                     <a href="./403.html" class="dropdown-item ">403 error</a> | ||||
|                                     <a href="./404.html" class="dropdown-item ">404 error</a> | ||||
|                                     <a href="./500.html" class="dropdown-item ">500 error</a> | ||||
|                                     <a href="./503.html" class="dropdown-item ">503 error</a> | ||||
|                                     <a href="./email.html" class="dropdown-item ">Email</a> | ||||
|                                     <a href="./empty.html" class="dropdown-item ">Empty page</a> | ||||
|                                     <a href="./rtl.html" class="dropdown-item ">RTL mode</a> | ||||
|                                 </div> | ||||
|                             </li> | ||||
|                             <li class="nav-item dropdown"> | ||||
|                                 <a href="./form-elements.html" class="nav-link"><i class="fe fe-check-square"></i> Forms</a> | ||||
|                             </li> | ||||
|                             <li class="nav-item"> | ||||
|                                 <a href="./gallery.html" class="nav-link"><i class="fe fe-image"></i> Gallery</a> | ||||
|                             </li> | ||||
|                             <li class="nav-item"> | ||||
|                                 <a href="./docs/index.html" class="nav-link"><i class="fe fe-file-text"></i> Documentation</a> | ||||
|                             </li> | ||||
|                         </ul> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="my-3 my-md-5"> | ||||
|             <div class="container"> | ||||
|                 <div class="page-header"> | ||||
|                     <h1 class="page-title"> | ||||
|                         Dashboard | ||||
|                     </h1> | ||||
|                 </div> | ||||
|                 {% block content %}{% endblock %} | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class="footer"> | ||||
|         <div class="container"> | ||||
|             <div class="row"> | ||||
|                 <div class="col-lg-8"> | ||||
|                     <div class="row"> | ||||
|                         <div class="col-6 col-md-3"> | ||||
|                             <ul class="list-unstyled mb-0"> | ||||
|                                 <li><a href="#">First link</a></li> | ||||
|                                 <li><a href="#">Second link</a></li> | ||||
|                             </ul> | ||||
|                         </div> | ||||
|                         <div class="col-6 col-md-3"> | ||||
|                             <ul class="list-unstyled mb-0"> | ||||
|                                 <li><a href="#">Third link</a></li> | ||||
|                                 <li><a href="#">Fourth link</a></li> | ||||
|                             </ul> | ||||
|                         </div> | ||||
|                         <div class="col-6 col-md-3"> | ||||
|                             <ul class="list-unstyled mb-0"> | ||||
|                                 <li><a href="#">Fifth link</a></li> | ||||
|                                 <li><a href="#">Sixth link</a></li> | ||||
|                             </ul> | ||||
|                         </div> | ||||
|                         <div class="col-6 col-md-3"> | ||||
|                             <ul class="list-unstyled mb-0"> | ||||
|                                 <li><a href="#">Other link</a></li> | ||||
|                                 <li><a href="#">Last link</a></li> | ||||
|                             </ul> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="col-lg-4 mt-4 mt-lg-0"> | ||||
|                     Premium and Open Source dashboard template with responsive and high quality UI. For Free! | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <footer class="footer"> | ||||
|         <div class="container"> | ||||
|             <div class="row align-items-center flex-row-reverse"> | ||||
|                 <div class="col-auto ml-lg-auto"> | ||||
|                     <div class="row align-items-center"> | ||||
|                         <div class="col-auto"> | ||||
|                             <ul class="list-inline list-inline-dots mb-0"> | ||||
|                                 <li class="list-inline-item"><a href="./docs/index.html">Documentation</a></li> | ||||
|                                 <li class="list-inline-item"><a href="./faq.html">FAQ</a></li> | ||||
|                             </ul> | ||||
|                         </div> | ||||
|                         <div class="col-auto"> | ||||
|                             <a href="https://github.com/tabler/tabler" class="btn btn-outline-primary btn-sm">Source code</a> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center"> | ||||
|                     Copyright © 2018 <a href=".">Tabler</a>. Theme by <a href="https://codecalm.net" target="_blank">codecalm.net</a> All rights reserved. | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|     </footer> | ||||
| </div> | ||||
| </body> | ||||
| </html> | ||||
							
								
								
									
										12
									
								
								resources/views/v2/partials/favicons.twig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								resources/views/v2/partials/favicons.twig
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png"> | ||||
| <link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32"> | ||||
| <link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16"> | ||||
| <link rel="manifest" href="manifest.json"> | ||||
| <link rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5"> | ||||
| <meta name="theme-color" content="#3c8dbc"> | ||||
| <meta name="msapplication-TileColor" content="#2d89ef"> | ||||
| <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/> | ||||
| <meta name="apple-mobile-web-app-capable" content="yes"> | ||||
| <meta name="mobile-web-app-capable" content="yes"> | ||||
| <meta name="HandheldFriendly" content="True"> | ||||
| <meta name="MobileOptimized" content="320"> | ||||
		Reference in New Issue
	
	Block a user