Switched to bootstrap
This commit is contained in:
@@ -1,110 +1,56 @@
|
||||
<!doctype html>
|
||||
<html lang="{{ app()->getLocale() }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
@extends('layouts.master')
|
||||
|
||||
<title>Laravel</title>
|
||||
@section('title', $pagetitle)
|
||||
|
||||
<!-- Fonts -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
|
||||
|
||||
<!-- Styles -->
|
||||
<style>
|
||||
html, body {
|
||||
background-color: #fff;
|
||||
color: #636b6f;
|
||||
font-family: 'Raleway', sans-serif;
|
||||
font-weight: 100;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.full-height {
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.flex-center {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.position-ref {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.top-right {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
.content {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 84px;
|
||||
}
|
||||
|
||||
.links > a {
|
||||
color: #636b6f;
|
||||
padding: 0 25px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
letter-spacing: .1rem;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.m-b-md {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
{!! Charts::styles() !!}
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div class="flex-center position-ref full-height">
|
||||
@if (Route::has('login'))
|
||||
<div class="top-right links">
|
||||
@auth
|
||||
<a href="{{ url('/home') }}">Home</a>
|
||||
@else
|
||||
<a href="{{ route('login') }}">Login</a>
|
||||
<a href="{{ route('register') }}">Register</a>
|
||||
@endauth
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="content">
|
||||
<div class="title m-b-md">
|
||||
HumidityPi
|
||||
</div>
|
||||
|
||||
<div class="links">
|
||||
<a href="https://laravel.com/docs">Dokumentation</a>
|
||||
<a href="https://laracasts.com">Kategorie 1</a>
|
||||
<a href="https://laravel-news.com">Kategorie 2</a>
|
||||
<a href="https://gitlab.com/STRUCTiX/dht22tempstats">GitLab</a>
|
||||
<a href="https://github.com/laravel/laravel">Einstellungen</a>
|
||||
</div>
|
||||
|
||||
<div class="title m-b-md">
|
||||
{!! $latestShit !!}
|
||||
</div>
|
||||
|
||||
<!--{!! $chart->render() !!}-->
|
||||
@section('content')
|
||||
{!! Charts::styles() !!}
|
||||
<h1>Dashboard <small>Infos auf einen Blick</small></h1>
|
||||
|
||||
<table style="width:100%">
|
||||
<tr>
|
||||
<td>
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Temperatur</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>{!! $latestTemp !!} °C</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{!! $chart->html() !!}
|
||||
{!! Charts::scripts() !!}
|
||||
{!! $chart->script() !!}
|
||||
</body>
|
||||
</html>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Luftfeuchtigkeit</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>{!! $latestHumidity !!} %</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">Absoluter Feuchtegehalt </h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>{!! $latestGM3 !!} g/m³</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
||||
<div class="resizechart resizechart2">
|
||||
{!! $chart->html() !!}
|
||||
</div>
|
||||
|
||||
|
||||
{!! Charts::scripts() !!}
|
||||
{!! $chart->script() !!}
|
||||
@endsection
|
||||
|
||||
110
Laravel/resources/views/dashboardOld.blade.php
Normal file
110
Laravel/resources/views/dashboardOld.blade.php
Normal file
@@ -0,0 +1,110 @@
|
||||
<!doctype html>
|
||||
<html lang="{{ app()->getLocale() }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<title>Laravel</title>
|
||||
|
||||
<!-- Fonts -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
|
||||
|
||||
<!-- Styles -->
|
||||
<style>
|
||||
html, body {
|
||||
background-color: #fff;
|
||||
color: #636b6f;
|
||||
font-family: 'Raleway', sans-serif;
|
||||
font-weight: 100;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.full-height {
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.flex-center {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.position-ref {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.top-right {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
.content {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 84px;
|
||||
}
|
||||
|
||||
.links > a {
|
||||
color: #636b6f;
|
||||
padding: 0 25px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
letter-spacing: .1rem;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.m-b-md {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
{!! Charts::styles() !!}
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div class="flex-center position-ref full-height">
|
||||
@if (Route::has('login'))
|
||||
<div class="top-right links">
|
||||
@auth
|
||||
<a href="{{ url('/home') }}">Home</a>
|
||||
@else
|
||||
<a href="{{ route('login') }}">Login</a>
|
||||
<a href="{{ route('register') }}">Register</a>
|
||||
@endauth
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="content">
|
||||
<div class="title m-b-md">
|
||||
HumidityPi
|
||||
</div>
|
||||
|
||||
<div class="links">
|
||||
<a href="https://laravel.com/docs">Dokumentation</a>
|
||||
<a href="https://laracasts.com">Kategorie 1</a>
|
||||
<a href="https://laravel-news.com">Kategorie 2</a>
|
||||
<a href="https://gitlab.com/STRUCTiX/dht22tempstats">GitLab</a>
|
||||
<a href="https://github.com/laravel/laravel">Einstellungen</a>
|
||||
</div>
|
||||
|
||||
<div class="title m-b-md">
|
||||
{!! $latestShit !!}
|
||||
</div>
|
||||
|
||||
<!--{!! $chart->render() !!}-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{!! $chart->html() !!}
|
||||
{!! Charts::scripts() !!}
|
||||
{!! $chart->script() !!}
|
||||
</body>
|
||||
</html>
|
||||
96
Laravel/resources/views/layouts/master.blade.php
Normal file
96
Laravel/resources/views/layouts/master.blade.php
Normal file
@@ -0,0 +1,96 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
{{-- Don't touch the above lines! Or heaven might... --}}
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
<link rel="icon" href="{{ asset('img/favicon.ico') }}">
|
||||
|
||||
<title>@yield('title')</title>
|
||||
|
||||
@section('header')
|
||||
{{-- Material Design fonts --}}
|
||||
<link href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" type="text/css">
|
||||
<link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
|
||||
{{-- Bootstrap --}}
|
||||
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="{{ asset('css/font-awesome.min.css') }}" rel="stylesheet">
|
||||
|
||||
{{-- Bootstrap Material Design --}}
|
||||
<link href="{{ asset('css/bootstrap-flatly.min.css') }}" rel="stylesheet">
|
||||
<link href="{{ asset('css/ripples.min.css') }}" rel="stylesheet">
|
||||
|
||||
{{-- Eigene Ergänzungen --}}
|
||||
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
{{-- jQuery --}}
|
||||
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
|
||||
@show
|
||||
</head>
|
||||
<body>
|
||||
@section('navbar')
|
||||
<nav class="navbar navbar-default navbar-fixed-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
{{-- Collapsed Hamburger --}}
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
{{-- Branding Image --}}
|
||||
<a class="navbar-brand" href="{{ url('/') }}">HumidityPi</a>
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
{{-- Left Side Of Navbar --}}
|
||||
<ul class="nav navbar-nav">
|
||||
{{-- Navlink Startseite --}}
|
||||
@if(isset($activeNav) && $activeNav == 'dashboard')
|
||||
<li class="active">
|
||||
@else
|
||||
<li>
|
||||
@endif
|
||||
<a href="{{ url('/dashboard') }}">Dashboard</a>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
</div>{{-- /.nav-collapse --}}
|
||||
</div>
|
||||
</nav>
|
||||
@show
|
||||
<div class="container">
|
||||
@section('content')
|
||||
<h1>Überschrift 1 <small>2016-01-02</small></h1>
|
||||
<p>Absatz mit dem Wort Absatz und einem Punkt.</p>
|
||||
<ul>
|
||||
<li><a href="{{ url('/') }}">Link in UL auf die Startseite</a></li>
|
||||
</ul>
|
||||
<p>Und noch ein Absatz mit noch einem Punkt.</p>
|
||||
@show
|
||||
</div>{{-- /.container --}}
|
||||
@section('footer')
|
||||
<script src="{{ asset('js/bootstrap.min.js')}}"></script>
|
||||
<script src="{{ asset('js/material.min.js')}}"></script>
|
||||
<script src="{{ asset('js/ripples.min.js')}}"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
$.material.init();
|
||||
});
|
||||
</script>
|
||||
@show
|
||||
</body>
|
||||
</html>
|
||||
103
Laravel/resources/views/layouts/odlmaster.blade.php
Normal file
103
Laravel/resources/views/layouts/odlmaster.blade.php
Normal file
@@ -0,0 +1,103 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
{{-- Don't touch the above lines! Or heaven might... --}}
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
<link rel="icon" href="{{ asset('img/favicon.ico') }}">
|
||||
|
||||
<title>@yield('title')</title>
|
||||
|
||||
@section('header')
|
||||
{{-- Material Design fonts --}}
|
||||
<link href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" type="text/css">
|
||||
<link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
|
||||
{{-- Bootstrap --}}
|
||||
<link href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="{{ asset('css/font-awesome.min.css') }}" rel="stylesheet">
|
||||
|
||||
{{-- Bootstrap Material Design --}}
|
||||
<link href="{{ asset('css/bootstrap-material-design.min.css') }}" rel="stylesheet">
|
||||
<link href="{{ asset('css/ripples.min.css') }}" rel="stylesheet">
|
||||
|
||||
{{-- Eigene Ergänzungen --}}
|
||||
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
{{-- jQuery --}}
|
||||
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
|
||||
@show
|
||||
</head>
|
||||
<body>
|
||||
@section('navbar')
|
||||
<nav class="navbar navbar-default navbar-fixed-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
{{-- Collapsed Hamburger --}}
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
{{-- Branding Image --}}
|
||||
<a class="navbar-brand" href="{{ url('/') }}">HumidityPi</a>
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
{{-- Left Side Of Navbar --}}
|
||||
<ul class="nav navbar-nav">
|
||||
{{-- Navlink Startseite --}}
|
||||
@if(isset($activeNav) && $activeNav == 'startseite')
|
||||
<li class="active">
|
||||
@else
|
||||
<li>
|
||||
@endif
|
||||
<a href="{{ url('/') }}">Startseite</a>
|
||||
</li>
|
||||
|
||||
{{-- Navlink Berichtsheft --}}
|
||||
@if(isset($activeNav) && ($activeNav == 'berichtshefte' || $activeNav == 'gruppe-a' || $activeNav == 'gruppe-b'))
|
||||
<li class="active">
|
||||
@else
|
||||
<li>
|
||||
@endif
|
||||
<a href="{{ url('/berichtshefte') }}">Berichtsheft</a>
|
||||
</li>
|
||||
|
||||
|
||||
</ul>
|
||||
|
||||
</div>{{-- /.nav-collapse --}}
|
||||
</div>
|
||||
</nav>
|
||||
@show
|
||||
<div class="container">
|
||||
@section('content')
|
||||
<h1>Überschrift 1 <small>2016-01-02</small></h1>
|
||||
<p>Absatz mit dem Wort Absatz und einem Punkt.</p>
|
||||
<ul>
|
||||
<li><a href="{{ url('/') }}">Link in UL auf die Startseite</a></li>
|
||||
</ul>
|
||||
<p>Und noch ein Absatz mit noch einem Punkt.</p>
|
||||
@show
|
||||
</div>{{-- /.container --}}
|
||||
@section('footer')
|
||||
<script src="{{ asset('js/bootstrap.min.js')}}"></script>
|
||||
<script src="{{ asset('js/material.min.js')}}"></script>
|
||||
<script src="{{ asset('js/ripples.min.js')}}"></script>
|
||||
<!--<script>
|
||||
$(function () {
|
||||
$.material.init();
|
||||
});
|
||||
</script>-->
|
||||
@show
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,95 +1,12 @@
|
||||
<!doctype html>
|
||||
<html lang="{{ app()->getLocale() }}">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
@extends('layouts.master')
|
||||
|
||||
<title>Laravel</title>
|
||||
@section('title', $pagetitle)
|
||||
|
||||
<!-- Fonts -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
|
||||
|
||||
<!-- Styles -->
|
||||
<style>
|
||||
html, body {
|
||||
background-color: #fff;
|
||||
color: #636b6f;
|
||||
font-family: 'Raleway', sans-serif;
|
||||
font-weight: 100;
|
||||
height: 100vh;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.full-height {
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.flex-center {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.position-ref {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.top-right {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
.content {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 84px;
|
||||
}
|
||||
|
||||
.links > a {
|
||||
color: #636b6f;
|
||||
padding: 0 25px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
letter-spacing: .1rem;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.m-b-md {
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="flex-center position-ref full-height">
|
||||
@if (Route::has('login'))
|
||||
<div class="top-right links">
|
||||
@auth
|
||||
<a href="{{ url('/home') }}">Home</a>
|
||||
@else
|
||||
<a href="{{ route('login') }}">Login</a>
|
||||
<a href="{{ route('register') }}">Register</a>
|
||||
@endauth
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="content">
|
||||
<div class="title m-b-md">
|
||||
Laravel
|
||||
</div>
|
||||
|
||||
<div class="links">
|
||||
<a href="https://laravel.com/docs">Documentation</a>
|
||||
<a href="https://laracasts.com">Laracasts</a>
|
||||
<a href="https://laravel-news.com">News</a>
|
||||
<a href="https://forge.laravel.com">Forge</a>
|
||||
<a href="https://github.com/laravel/laravel">GitHub</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@section('content')
|
||||
<h1>Infos <small>...</small></h1>
|
||||
<div class="jumbotron">
|
||||
<h1>Jumbotron</h1>
|
||||
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
|
||||
<p><a class="btn btn-primary btn-lg">Learn more</a></p>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user