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

replaced AvanzuAdminTheme with AdminLTE bundle #201 (#202)

Browse Source
This commit is contained in:
Kevin Papst
2018-07-09 18:25:08 +02:00
committed by GitHub
parent 0eb8ae5117
commit 7a0d690101
38 changed files with 452 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/timesheet.html.twig
View File

@@ -60,7 +60,7 @@
<td class="{{ tables.data_table_column_class(tableName, columns, 'activity') }}">
<a href="{{ path('admin_activity_edit', {'id': entry.activity.id}) }}">{{ widgets.label_activity(entry.activity) }}</a>
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'username') }}"><a href="{{ path('profile'|route_alias, {'username' : entry.user.username}) }}">{{ widgets.label_user(entry.user) }}</a></td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'username') }}"><a href="{{ path('user_profile'|route_alias, {'username' : entry.user.username}) }}">{{ widgets.label_user(entry.user) }}</a></td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ entry.description }}</td>
<td>
{% set actionButtons = {} %}

2
templates/base.html.twig
View File

@@ -1,4 +1,4 @@
{% extends '@AvanzuAdminTheme/layout/default-layout.html.twig' %}
{% extends '@AdminLTE/layout/default-layout.html.twig' %}
{% block avanzu_page_content_class %}{{ parent() }} {% block main_content_class %}{% endblock %}{% endblock %}

2
templates/bundles/AvanzuAdminThemeBundle/Navbar/user.html.twig → templates/bundles/AdminLTEBundle/Navbar/user.html.twig
View File

@@ -1,5 +1,5 @@
{# User Account: style can be found in dropdown.less #}
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{ macro.avatar(user.avatar, user.username, 'user-image') }}

0
templates/bundles/AvanzuAdminThemeBundle/Partials/_head.html.twig → templates/bundles/AdminLTEBundle/Partials/_head.html.twig
View File

23
templates/bundles/AvanzuAdminThemeBundle/Partials/_control-sidebar.html.twig
View File

@@ -1,23 +0,0 @@
<aside class="control-sidebar control-sidebar-dark">
<ul class="nav nav-tabs nav-justified control-sidebar-tabs">
{% if kimai_context.control_sidebar is defined %}
{% for name, tab in kimai_context.control_sidebar %}
<li{% if loop.first %} class="active"{% endif %}><a href="#control-sidebar-{{ name }}-tab" data-toggle="tab"><i class="{{ tab.icon|icon(tab.icon) }}"></i></a></li>
{% endfor %}
{% endif %}
</ul>
<div class="tab-content">
{% if kimai_context.control_sidebar is defined %}
{% for name, tab in kimai_context.control_sidebar %}
<div class="tab-pane {% if loop.first %}active{% endif %}" id="control-sidebar-{{ name }}-tab">
{% if tab.controller is defined %}
{{ render(controller(tab.controller)) }}
{% elseif tab.template is defined %}
{% include tab.template %}
{% endif %}
</div>
{% endfor %}
{% endif %}
</div>
</aside>
<div class="control-sidebar-bg"></div>

0
templates/bundles/AvanzuAdminThemeBundle/Partials/_scripts.html.twig
View File

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

@@ -1,4 +1,4 @@
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% if app.session.started and app.session.flashbag.peekAll|length > 0 %}
<div class="row">

2
templates/form/kimai-theme.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "@AvanzuAdminTheme/layout/form-theme.html.twig" %}
{% extends "@AdminLTE/layout/form-theme.html.twig" %}
{% block form_label %}
{% if form.vars.documentation is defined and form.vars.documentation is not empty %}

2
templates/form/toolbar-theme.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "@AvanzuAdminTheme/layout/form-theme.html.twig" %}
{% extends "@AdminLTE/layout/form-theme.html.twig" %}
{% block date_widget %}
{% if widget == 'single_text' %}

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

@@ -1,7 +1,7 @@
<!DOCTYPE html{% block avanzu_html_start %}{% endblock %}>
<html>
<head>
{% include('@AvanzuAdminTheme/Partials/_head.html.twig') %}
{% include('@AdminLTE/Partials/_head.html.twig') %}
<title>{{ 'browser.title'|trans }}</title>
</head>
<body{% block avanzu_body_start %}{% endblock %} class="hold-transition login-page">

2
templates/sidebar/settings.html.twig
View File

@@ -1,4 +1,4 @@
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% import "macros/widgets.html.twig" as widgets %}

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

@@ -125,7 +125,7 @@
{% endmacro %}
{% macro profile_box(user, stats) %}
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% import "macros/widgets.html.twig" as widgets %}
<div class="box box-primary">
@@ -163,7 +163,7 @@
{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
{% macro profile_list_unused(user, items, color) %}
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% import "macros/widgets.html.twig" as widgets %}
<div class="box box-widget widget-user-2">
@@ -188,7 +188,7 @@
{# -------------------------------- UNUSED FOR NOW -------------------------------- #}
{% macro profile_box_unused(user, stats, color) %}
{% import "@AvanzuAdminTheme/layout/macros.html.twig" as macro %}
{% import "@AdminLTE/Macros/default.html.twig" as macro %}
{% import "macros/widgets.html.twig" as widgets %}
<div class="box box-widget widget-user">