updated to font-awesome 5 (#181)

templates/admin/activity.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'plus-square': path('admin_activity_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'create': path('admin_activity_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin') }}

templates/admin/customer.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_customer.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'plus-square': path('admin_customer_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'create': path('admin_customer_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin') }}

templates/admin/project.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'plus-square': path('admin_project_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'create': path('admin_project_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin') }}

templates/admin/timesheet.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'plus-square': path('admin_timesheet_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'create': path('admin_timesheet_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin') }}

templates/admin/user.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_user.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'plus-square': path('admin_user_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'create': path('admin_user_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin') }}

templates/base.html.twig

@@ -52,14 +52,14 @@
         {% if is_granted('ROLE_USER') %}
             <li class="visible-xs-inline-block">
                 <a href="{{ path('timesheet') }}" class="ddt-large">
-                    <i class="fa fa-clock-o fa-2x"></i>
+                    <i class="{{ 'timesheet'|icon }} fa-2x"></i>
                 </a>
             </li>
         {% endif %}
         {% if is_granted('ROLE_TEAMLEAD') %}
             <li class="visible-xs-inline-block">
                 <a href="{{ path('invoice') }}" class="ddt-large">
-                    <i class="fa fa-print fa-2x"></i>
+                    <i class="{{ 'invoice'|icon }} fa-2x"></i>
                 </a>
             </li>
         {% endif %}

templates/bundles/AvanzuAdminThemeBundle/Partials/_control-sidebar.html.twig

@@ -2,7 +2,7 @@
     <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="fa fa-{{ tab.icon }}"></i></a></li>
+                <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>

templates/bundles/TwigBundle/Exception/error403.html.twig

@@ -21,7 +21,7 @@
         <h2 class="headline text-yellow"> {{ status_code }}</h2>
 
         <div class="error-content">
-            <h3><i class="fa fa-unlock-alt text-yellow"></i> {{ errorTitleTrans }}</h3>
+            <h3><i class="fas fa-unlock-alt text-yellow"></i> {{ errorTitleTrans }}</h3>
             <p>{{ errorMessageTrans }}</p>
         </div>
     </div>

templates/bundles/TwigBundle/Exception/error404.html.twig

@@ -21,7 +21,7 @@
         <h2 class="headline text-yellow"> {{ status_code }}</h2>
 
         <div class="error-content">
-            <h3><i class="fa fa-unlock-alt text-yellow"></i> {{ errorTitleTrans }}</h3>
+            <h3><i class="fas fa-unlock-alt text-yellow"></i> {{ errorTitleTrans }}</h3>
             <p>{{ errorMessageTrans }}</p>
         </div>
     </div>

templates/default/_form.html.twig

@@ -3,7 +3,7 @@
         <h3 class="box-title">
             {{ title }}
             {% if form.vars.documentation is defined and form.vars.documentation is not empty %}
-                <a href="{{ path('help_chapter', {'chapter': form.vars.documentation}) }}"><i class="fa fa-question-circle"></i></a>
+                <a href="{{ path('help_chapter', {'chapter': form.vars.documentation}) }}"><i class="{{ 'help'|icon }}"></i></a>
             {% endif %}
         </h3>
     </div>

templates/form/kimai-theme.html.twig

@@ -2,7 +2,7 @@
 
 {% block form_label %}
     {% if form.vars.documentation is defined and form.vars.documentation is not empty %}
-        <a href="{{ path('help_chapter', {'chapter': form.vars.documentation}) }}"><i class="fa fa-question-circle"></i></a>
+        <a href="{{ path('help_chapter', {'chapter': form.vars.documentation}) }}"><i class="{{ 'help'|icon }}"></i></a>
     {% endif %}
     {{ parent() }}
 {% endblock form_label %}

templates/invoice/index.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'invoice.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseInvoice', 'plus-square': path('admin_invoice_template_create'), 'list': path('admin_invoice_template')}) }}{% 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 %}
 

templates/invoice/renderer/print.html.twig

@@ -1,7 +1,7 @@
 <div class="row">
     <div class="col-xs-12">
         <h2 class="page-header">
-            <i class="fa fa-globe"></i> <span contenteditable="true">{{ model.template.title }}</span>
+            <span contenteditable="true">{{ model.template.title }}</span>
             <small class="pull-right">{{ 'label.date'|trans }}: {{ model.invoiceDate|date_short }}</small>
         </h2>
     </div>
@@ -110,7 +110,7 @@
 <div class="row no-print">
     <div class="col-xs-12">
         <button type="button" class="btn btn-success pull-right" onclick="window.print();return false;" style="margin-right: 5px;">
-            <i class="fa fa-print"></i> {{ 'button.print'|trans }}
+            <i class="{{ 'print'|icon }}"></i> {{ 'button.print'|trans }}
         </button>
     </div>
 </div>

templates/invoice/renderer/timesheet.html.twig

@@ -96,7 +96,7 @@
 <div class="row no-print">
     <div class="col-xs-12">
         <button type="button" class="btn btn-success pull-right" onclick="window.print();return false;" style="margin-right: 5px;">
-            <i class="fa fa-print"></i> {{ 'button.print'|trans }}
+            <i class="{{ 'print'|icon }}"></i> {{ 'button.print'|trans }}
         </button>
     </div>
 </div>

templates/invoice/templates.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_title %}{{ 'admin_invoice_template.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_invoice_template.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'plus-square': path('admin_invoice_template_create'), 'print': path('invoice')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'create': path('admin_invoice_template_create'), 'invoice': path('invoice')}) }}{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}

templates/macros/widgets.html.twig

@@ -4,7 +4,7 @@
         <div class="box-tools">
             <div class="btn-group">
                 {% for icon,url in tools  %}
-                    <a class="btn btn-default" href="{{ url }}"{% if '#collapse' in url %} data-toggle="collapse" {% endif %}><i class="fa fa-{{ icon }}"></i></a>
+                    <a class="btn btn-default" href="{{ url }}"{% if '#collapse' in url %} data-toggle="collapse" {% endif %}><i class="{{ icon|icon(icon) }}"></i></a>
                 {% endfor %}
             </div>
         </div>
@@ -90,21 +90,21 @@
 {% macro alert(type, description, title, icon) %}
     <div class="alert alert-{{ type|default('danger') }} alert-dismissible">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-        {% if title %}<h4><i class="icon fa fa-{{ icon|default('ban') }}"></i> {{ title|trans }}</h4>{% endif %}
+        {% if title %}<h4><i class="icon {{ icon|icon(icon) }}"></i> {{ title|trans }}</h4>{% endif %}
         {{ description|trans }}
     </div>
 {% endmacro %}
 
 {% macro callout(type, description, title, icon) %}
     <div class="callout callout-{{ type|default('danger') }} lead">
-        {% if title %}<h4>{% if icon %}<i class="fa fa-{{ icon }}">{% endif %}</i> {{ title|trans }}</h4>{% endif %}
+        {% if title %}<h4>{% if icon %}<i class="{{ icon|icon(icon) }}">{% endif %}</i> {{ title|trans }}</h4>{% endif %}
         <p>{{ description|trans }}</p>
     </div>
 {% endmacro %}
 
 {% macro info_box_counter(title, amount, icon, color, url) %}
 <div class="info-box">
-    <span class="info-box-icon bg-{{ color|default(kimai_context.box_color) }}"><i class="fa fa-{{ icon|default('flag-o') }}"></i></span>
+    <span class="info-box-icon bg-{{ color|default(kimai_context.box_color) }}"><i class="{{ icon|icon(icon) }}"></i></span>
 
     <div class="info-box-content">
         {# this is a ugly hack, make me look nicely (dashboard widget with link) #}
@@ -122,7 +122,7 @@
 
 {% macro info_box_progress(title, description, amount, percentage, icon, color) %}
     <div class="info-box bg-{{ color|default(kimai_context.box_color) }}">
-        <span class="info-box-icon"><i class="fa fa-{{ icon|default('thumbs-o-up') }}"></i></span>
+        <span class="info-box-icon"><i class="{{ icon|icon(icon) }}"></i></span>
 
         <div class="info-box-content">
             <span class="info-box-text">{{ title|trans }}</span>
@@ -146,10 +146,10 @@
             <p>{{ title|trans }}</p>
         </div>
         <div class="icon">
-            <i class="fa fa-{{ icon|default('bar-chart') }}"></i>
+            <i class="{{ icon|icon(icon) }}"></i>
         </div>
         <a href="{{ url }}" class="small-box-footer">
-            {{ 'more.info.link'|trans }} <i class="fa fa-arrow-circle-right"></i>
+            {{ 'more.info.link'|trans }} <i class="{{ icon|icon(icon) }}"></i>
         </a>
     </div>
 {% endmacro %}
@@ -180,6 +180,6 @@
 
 {% macro button_action(icon, url) %}
     <a href="{{ url }}" class="btn btn-default btn-{{ icon }}">
-        <i class="fa fa-{{ icon }}"></i>
+        <i class="{{ icon|icon(icon) }}"></i>
     </a>
 {% endmacro %}

templates/navbar/active-entries.html.twig

@@ -1,7 +1,7 @@
 {% if entries is not empty %}
 <li class="dropdown messages-menu">
     <a href="#" class="dropdown-toggle ddt-large ticktac" data-toggle="dropdown">
-        <i class="fa fa-play-circle fa-2x"></i>
+        <i class="{{ 'start'|icon }} fa-2x"></i>
         <span class="label label-{% if entries|length >= kimai_context.active_warning %}danger{% else %}warning{% endif %}">{{ entries|length }}</span>
     </a>
     <ul class="dropdown-menu">
@@ -15,11 +15,11 @@
                     <li>
                         <a href="{{ path('timesheet_stop', {'id' : entry.id}) }}">
                             <div class="pull-left">
-                                <i class="fa fa-stop-circle fa-2x"></i>
+                                <i class="{{ 'stop-small'|icon }} fa-2x"></i>
                             </div>
                             <h4>
                                 {{ entry.activity.name }}
-                                <small><i class="fa fa-clock-o"></i> {{ entry|duration }}</small>
+                                <small><i class="{{ 'timesheet'|icon }}"></i> {{ entry|duration }}</small>
                             </h4>
                             <p>{{ entry.activity.project.name }} ({{ entry.activity.project.customer.name }})</p>
                         </a>
@@ -28,7 +28,7 @@
                 </ul>
             {% else %}
                 <div class="start_record">
-                    <a href="{{ path('timesheet_create') }}"><i class="fa fa-play-circle-o fa-5x"></i></a>
+                    <a href="{{ path('timesheet_create') }}"><i class="{{ 'start'|icon }} fa-5x"></i></a>
                 </div>
             {% endif %}
         </li>
@@ -38,7 +38,7 @@
 {% else %}
     <li class="messages-menu">
         <a href="{{ path('timesheet_create') }}" class="ddt-large">
-            <i class="fa fa-play-circle fa-2x"></i>
+            <i class="{{ 'start'|icon }} fa-2x"></i>
         </a>
     </li>
 {% endif %}

templates/navbar/recent-activities.html.twig

@@ -1,7 +1,7 @@
 {% if activities is not empty %}
     <li class="dropdown notifications-menu">
         <a href="#" class="dropdown-toggle ddt-large" data-toggle="dropdown">
-            <i class="fa fa-tasks fa-2x"></i>
+            <i class="{{ 'activity'|icon }} fa-2x"></i>
             <span class="label label-success">{{ activities|length }}</span>
         </a>
         <ul class="dropdown-menu">
@@ -11,7 +11,7 @@
                     {% for activity in activities %}
                         <li>
                             <a href="{{ path('timesheet_start', {'id' : activity.id}) }}">
-                                <i class="fa fa-play-circle text-green"></i> {{ 'recent.activities.format'|trans({'%activity%': activity.name, '%project%': activity.project.name, '%customer%': activity.project.customer.name}) }}
+                                <i class="{{ 'start-small'|icon }} text-green"></i> {{ 'recent.activities.format'|trans({'%activity%': activity.name, '%project%': activity.project.name, '%customer%': activity.project.customer.name}) }}
                             </a>
                         </li>
                     {% endfor %}

templates/sidebar/home.html.twig

@@ -1,7 +1,7 @@
 <ul class="control-sidebar-menu">
     <li>
         <a href="{{ path('help') }}">
-            <i class="menu-icon fa fa-book bg-yellow"></i>
+            <i class="menu-icon {{ 'manual'|icon }} bg-yellow"></i>
 
             <div class="menu-info">
                 <h4 class="control-sidebar-subheading">{{ 'help.title'|trans({}, 'sidebar') }}</h4>

templates/timesheet/index.html.twig

@@ -5,7 +5,7 @@
 
 {% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'plus-square': path('timesheet_create')}) }}{% endblock %}
+{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'create': path('timesheet_create')}) }}{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseTimesheet') }}