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

form improvement

Browse Source 
using theme clone
This commit is contained in:
Kevin Papst
2016-11-13 22:19:18 +01:00
parent cc269d3142
commit aaa2fffa08
22 changed files with 411 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Resources/translations/messages.de.xliff
View File

@@ -209,6 +209,10 @@
<source>label.language</source>
<target>Sprache</target>
</trans-unit>
<trans-unit id="label.customer">
<source>label.customer</source>
<target>Kunde</target>
</trans-unit>
<!--
Buttons & Actions

4
app/Resources/views/admin/user.html.twig
View File

@@ -10,8 +10,8 @@
{% if entries.count > 0 %}
{{ tables.data_table_header({
'label.id': '',
'label.alias': 'bookmark-o',
'label.username': 'user',
'label.alias': 'comment-o',
'label.email': 'envelope-o',
'label.title': 'graduation-cap',
'label.active': 'lock',
@@ -22,8 +22,8 @@
{% for entry in entries %}
<tr>
<td>{{ entry.id }}</td>
<td><a href="{{ path('user_profile', {'username' : entry.username}) }}">{{ entry.username }}</a></td>
<td>{{ entry.alias }}</td>
<td>{{ entry.username }}</td>
<td>{{ entry.email }}</td>
<td>{{ entry.title }}</td>
<td>{{ widgets.label_visible(entry.active) }}</td>

9
app/Resources/views/default/_flash_messages.html.twig
View File

@@ -1,12 +1,3 @@
{#
This is a template fragment designed to be included in other templates
See http://symfony.com/doc/current/book/templating.html#including-other-templates
A common practice to better distinguish between templates and fragments is to
prefix fragments with an underscore. That's why this template is called
'_flash_messages.html.twig' instead of 'flash_messages.html.twig'
#}
{% if app.session.started and app.session.flashBag.peekAll is not empty %}
<div class="messages">
{% for type, messages in app.session.flashBag.all %}

17
app/Resources/views/macros/datatables.html.twig
View File

@@ -1,9 +1,20 @@
{% macro data_table_header(entries) %}
<div class="box">
{# <div class="box-header">
<h3 class="box-title">Hover Data Table</h3>
</div> #}
{#
<div class="box-header">
<h3 class="box-title"><a href="#" class="btn btn-primary">jkbkj</a></h3>
<div class="box-tools">
<ul class="pagination pagination-sm no-margin pull-right">
<li><a href="#">«</a></li>
<li><a href="#">1</a></li>
<li><a href="#">2</a></li>
<li><a href="#">3</a></li>
<li><a href="#">»</a></li>
</ul>
</div>
</div>
#}
<div class="box-body no-padding">
<div class="dataTables_wrapper form-inline dt-bootstrap">
<div class="row">

6
app/config/config.yml
View File

@@ -54,9 +54,9 @@ framework:
twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
form_themes:
- "bootstrap_3_layout.html.twig"
- "form/fields.html.twig"
# form_themes:
# - "bootstrap_3_layout.html.twig"
# - "form/fields.html.twig"
globals:
kimai_context:
date_1: "d.m.Y" # used for display in timesheets

7
app/config/parameters.yml.dist
View File

@@ -1,6 +1,5 @@
# This file defines the canonical configuration parameters of the application.
# Symfony uses this file as a template to generate the real app/config/parameters.yml
# used by the application.
# Symfony uses this file as a template to generate the real app/config/parameters.yml used by the application.
# See http://symfony.com/doc/current/best_practices/configuration.html#canonical-parameters
parameters:
@@ -28,8 +27,8 @@ parameters:
mailer_password: ~
mailer_from: anonymous@example.com
# The code of the default language used by the application ('en' = English)
locale: en
# The code of the default language used by the application ('en' = English, 'de' = German)
locale: de
# The 'secret' value is a random string of characters, numbers and symbols
# used internally by Symfony in several places (CSRF tokens, URI signing,