Merge branch 'master' into beta

1 år sedan · b60c3bad72
--- a/src/client/app/css/app.css
+++ b/src/client/app/css/app.css
@@ -1250,7 +1250,7 @@ h6.calendar-week {
    cursor: pointer;
 }
 .radio-icons p .selected-icon {
    padding-left: 6px;

 }
 .radio-icons p i {
    font-size: 0.65rem;
--- a/src/client/app/index.php
+++ b/src/client/app/index.php
@@ -1,7 +1,7 @@
 <?php
    require_once __DIR__ . '/../../server/server/config/boot_global.php';
    require_once __DIR__ . '/../../server/server/config/boot_local.php';
    $version = 'v=2.1.2';//time();//Francis_Utils_Config::get( 'version' );
    $version = 'v=2.1.3';//time();//Francis_Utils_Config::get( 'version' );
 ?>
 <!DOCTYPE html>
 <html lang="en">
--- a/src/client/app/js/app/state/AppointmentCreate.js
+++ b/src/client/app/js/app/state/AppointmentCreate.js
@@ -47,7 +47,7 @@ app.state.AppointmentCreate = function()
                            if (selectedIcon) {
                                iconSpan.innerHTML = '<i class="fas ' + selectedIcon + '"></i>';
                            } else {
                                iconSpan.innerHTML = '';
                                iconSpan.innerHTML = 'Ohne';
                            }
                            radioIconsInner.style.display = 'none';
                        }
--- a/src/client/app/js/app/state/AppointmentEdit.js
+++ b/src/client/app/js/app/state/AppointmentEdit.js
@@ -52,7 +52,7 @@ app.state.AppointmentEdit= function()
                            if (selectedIcon) {
                                iconSpan.innerHTML = '<i class="fas ' + selectedIcon + '"></i>';
                            } else {
                                iconSpan.innerHTML = '';
                                iconSpan.innerHTML = 'Ohne';
                            }
                            radioIconsInner.style.display = 'none';
                        }
--- a/src/client/app/tmpl/appointment-form-edit.html
+++ b/src/client/app/tmpl/appointment-form-edit.html
@@ -25,9 +25,20 @@
                    <div class="form-group">
                        <div class="form-row">
                            <div class="col">
                                <label>
                                    <%= _lc( 'APPOINTMENT_ICON' ) %>
                                </label>
                                <div class="radio-icons" id="radio-icons">
                                    <p class="d-flex justify-content-between align-items-center">
                                        <span><%= _lc( 'APPOINTMENT_ICON' ) %><span class="selected-icon"><i class="fas <%= a.getIcon() %>"></i></span></span>
                                        <span>
                                            <span class="selected-icon">
                                                <% if (a.getIcon() === "") { %>
                                                    Ohne
                                                <% } else { %>
                                                    <i class="fas <%= a.getIcon() %>"></i>
                                                <% } %>
                                            </span>
                                        </span>
                                        <i class="fas fa-chevron-down"></i>
                                    </p>
                                    <div class="radio-icons-inner">
--- a/src/client/app/tmpl/appointment-form.html
+++ b/src/client/app/tmpl/appointment-form.html
@@ -39,9 +39,14 @@
                <div class="form-group">
                    <div class="form-row">
                        <div class="col">
                            <label>
                                <%= _lc( 'APPOINTMENT_ICON' ) %>
                            </label>
                            <div class="radio-icons" id="radio-icons">
                                <p class="d-flex justify-content-between align-items-center">
                                    <span><%= _lc( 'APPOINTMENT_ICON' ) %></span>
                                    <span>
                                        <span class="selected-icon">Ohne</span>
                                    </span>
                                    <i class="fas fa-chevron-down"></i>
                                </p>
                                <div class="radio-icons-inner">