jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updated to AdminLTEBundle 1.0 #201 (#206)

Browse Source
This commit is contained in:
Kevin Papst
2018-07-12 20:37:08 +02:00
committed by GitHub
parent 7a0d690101
commit e68bef7ea7
19 changed files with 142 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/base.html.twig
View File

@@ -1,6 +1,4 @@
{% extends '@AdminLTE/layout/default-layout.html.twig' %}
{% block avanzu_page_content_class %}{{ parent() }} {% block main_content_class %}{% endblock %}{% endblock %}
{% extends '@AdminLTE/layout/default-layout-avanzu.html.twig' %}
{% block avanzu_page_content_before %}
<div class="pad no-print">
@@ -13,7 +11,6 @@
{% endblock %}
{% block avanzu_page_content %}
{{ include('default/_flash_messages.html.twig') }}
{% block main %}{% endblock %}
{% endblock %}
@@ -29,8 +26,6 @@
{% block page_subtitle %}{% endblock %}
{% endblock %}
{% block avanzu_logo_path %}{{ path('dashboard') }}{% endblock %}
{% block avanzu_logo_mini %}
<b>K</b>TT
{% endblock %}
@@ -74,14 +69,11 @@
{% endif %}
{% endblock %}
{% block avanzu_navbar_toggle %}{{ parent() }}{% endblock %}
{% block avanzu_navbar_tasks %}{#{ parent() }#}{% endblock %}
{% block avanzu_navbar_user %}{#{ parent() }#}{% endblock %}
{% block avanzu_navbar_control_sidebar_toggle %}{{ parent() }}{% endblock %}
{% block avanzu_sidebar_user %}{# right now we simply deactivate that box #}{% endblock %}
{% block avanzu_sidebar_search %}{# right now we simply deactivate that box #}{% endblock %}
{% block avanzu_sidebar_nav %}{{ parent() }}{% endblock %}
{% block avanzu_breadcrumb %}
{{ block('page_actions') }}
@@ -89,13 +81,18 @@
{% block page_actions %}{% endblock %}
{% block avanzu_control_sidebar %}{{ parent() }}{% endblock %}
{% block avanzu_javascripts %}
{% block javascript_imports %}{% endblock %}
{% block stylesheets %}
{# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
<link rel="stylesheet" href="{{ asset('build/app.css') }}">
{% endblock %}
{% block avanzu_javascripts_inline %}
{% block head %}
{{ parent() }}
<script src="{{ asset('build/app.js') }}"></script>
{% endblock %}
{% block javascripts %}
{# we do not call parent() as we use a custom built for the frontend assets and don't want the default <script> #}
<script type="text/javascript">
$(document).ready(function () {
$.kimai.init({imagePath: '{{ asset('images') }}', confirmDelete: '{{ 'confirm.delete'|trans }}'});

2
templates/dashboard/index.html.twig
View File

@@ -4,7 +4,7 @@
{% block page_title %}{{ 'dashboard.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'dashboard.subtitle'|trans }}{% endblock %}
{% block main_content_class %}dashboard{% endblock %}
{% block page_content_class %}{{ parent() }} dashboard{% endblock %}
{% block main %}

9
templates/default/_flash_messages.html.twig
View File

@@ -1,9 +0,0 @@
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% if app.session.started and app.session.flashbag.peekAll|length > 0 %}
<div class="row">
<div class="col-sm-12">
{{ macro.session_flash(avanzu_adminlte_close_alert|default(true), false, '', 'flashmessages') }}
</div>
</div>
{% endif %}

2
templates/invoice/index.html.twig
View File

@@ -6,7 +6,7 @@
{% block page_subtitle %}{{ 'invoice.subtitle'|trans }}{% endblock %}
{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseInvoice', 'create': path('admin_invoice_template_create'), 'list': path('admin_invoice_template')}) }}{% endblock %}
{% block main_content_class %}invoice{% endblock %}
{% block page_content_class %}{{ parent() }} invoice{% endblock %}
{% block main_before %}
{{ toolbar.toolbar(form, 'collapseInvoice', true) }}

90
templates/security/login.html.twig
View File

@@ -1,82 +1,14 @@
<!DOCTYPE html{% block avanzu_html_start %}{% endblock %}>
<html>
<head>
{% include('@AdminLTE/Partials/_head.html.twig') %}
<title>{{ 'browser.title'|trans }}</title>
</head>
<body{% block avanzu_body_start %}{% endblock %} class="hold-transition login-page">
{% block avanzu_after_body_start %}{% endblock %}
{% block avanzu_login_box %}
<div class="login-box">
<div class="login-logo">
<a href="{{ path('homepage') }}"><b>Kimai</b><br>TimeTracking</a>
</div>
<div class="login-box-body">
<p class="login-box-msg">
{{ 'security.title.login'|trans }}
{% extends '@AdminLTE/layout/login-layout.html.twig' %}
{% if error|default(false) %}
<div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
{% endif %}
</p>
{% block login_social_auth %}{% endblock %}
{% block login_actions %}{% endblock %}
{% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
{% block avanzu_login_form %}
<form action="{{ path('security_login') }}" method="post">
<div class="form-group has-feedback">
<input type="text" name="_username" class="form-control" placeholder="{{ 'label.username'|trans }}" value="{{ last_username }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input name="_password" type="password" class="form-control" placeholder="{{ 'label.password'|trans }}">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-8">
<div class="checkbox icheck">
<label>
<input id="remember_me" name="_remember_me" type="checkbox">
<label for="remember_me">{{ 'Remember Me'|trans({}, 'AvanzuAdminTheme') }}</label>
</label>
</div>
</div>
<div class="col-xs-4">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'action.sign_in'|trans }}</button>
</div>
</div>
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
</form>
{% endblock %}
{#% block avanzu_login_social_auth %}
<div class="social-auth-links text-center">
<p>{{ '- OR -'|trans({}, 'AvanzuAdminTheme') }}</p>
<a href="#" class="btn btn-block btn-social btn-facebook btn-flat"><i class="fa fa-facebook"></i>
{{ 'Sign in using Facebook'|trans({}, 'AvanzuAdminTheme') }}
</a>
<a href="#" class="btn btn-block btn-social btn-google btn-flat"><i class="fa fa-google-plus"></i>
{{ 'Sign in usingGoogle+'|trans({}, 'AvanzuAdminTheme') }}
</a>
</div>
{% endblock %}
{% block avanzu_login_actions %}
<a href="#">
{{ 'I forgot my password'|trans({}, 'AvanzuAdminTheme') }}
</a>
<br>
<a href="register.html" class="text-center">
{{ 'Register a new membership'|trans({}, 'AvanzuAdminTheme') }}
</a>
{% endblock %#}
</div>
</div>
{% block stylesheets %}
{# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
<link rel="stylesheet" href="{{ asset('build/app.css') }}">
{% endblock %}
{% block login_form_end %}
<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
{% endblock %}
<script>
$(function () {
$('input').iCheck({
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue',
increaseArea: '20%' // optional
});
});
</script>
</body>
</html>

2
templates/user/profile.html.twig
View File

@@ -57,6 +57,7 @@
<canvas id="barChart{{ year }}" style="height: 230px;"></canvas>
</div>
<script type="text/javascript">
$(document).ready(function () {
var barChartData{{ year }} = {
labels: barChartLabels,
datasets: [
@@ -89,6 +90,7 @@
var barChart = new Chart(barChartCanvas{{ year }});
barChart.Bar(barChartData{{ year }}, barChartOptions);
});
});
</script>
{% endfor %}