Merge branch 'spidev' into 'master'

SMS Bereinigung/Responsive Anpassungen/Zeiterfassung

See merge request fronk/thetool!163

Layout/default/TimerecordingCategories/Form.php

@@ -76,7 +76,16 @@
                                     <div class="col-lg-3">
                                         <div class="form-check">
                                             <input class="form-check-input" <?php if ($timerecordingcategoriess->require_comment) echo 'checked="checked"'; ?>
-                                                   type="checkbox" name="require_comment" value="1" id="olt">
+                                                   type="checkbox" name="require_comment" value="1">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-lg-2 col-form-label" for="only_admin">Nur für Buchhaltung zu buchen</label>
+                                    <div class="col-lg-3">
+                                        <div class="form-check">
+                                            <input class="form-check-input" <?php if ($timerecordingcategoriess->only_admin) echo 'checked="checked"'; ?>
+                                                   type="checkbox" name="only_admin" value="1">
                                         </div>
                                     </div>
                                 </div>

Layout/default/TimerecordingCategories/Index.php

@@ -41,6 +41,7 @@
                     <th class="text-center">Buchungszeitraum</th>
                     <th class="text-center">Genehmigungspflichtig</th>
                     <th class="text-center">Anmerkung Pflichtfeld</th>
+                    <th class="text-center">Nur Buchhaltung</th>
                     <th class="edit-width"></th>
                 </tr>
                 <tr id="filterrow">
@@ -50,6 +51,7 @@
                     <th></th>
                     <th></th>
                     <th></th>
+                    <th></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -60,6 +62,7 @@
                         <td><?= $timerecordingcategorieshourday[$timerecordingcategories->hourday] ?></td>
                         <td><?= $timerecordingcategoriesapproval[$timerecordingcategories->approval] ?></td>
                         <td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->require_comment] ?></td>
+                        <td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->only_admin] ?></td>
                  <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                             <a href="<?= self::getUrl("TimerecordingCategory", "edit", ["id" => $timerecordingcategories->id]) ?>"><i
                                         class="far fa-edit" title="Bearbeiten"></i></a>
@@ -80,7 +83,7 @@
 
 
     <script type="text/javascript">
-        var hidesearch = [5];
+        var hidesearch = [6];
 
         $(document).ready(function () {
 

Layout/default/UserProfile/Form.php

@@ -94,7 +94,7 @@ if ($twofa == 0) {
                                     </div>
                                     <?php if ($twofa == 2) : ?>
                                         <div class="col-lg-4 ">
-                                            <span class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</span>
+                                            <div class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</div>
                                         </div>
                                     <?php endif; ?>
                                 </div>

Layout/default/header.php

@@ -57,7 +57,7 @@
         <!-- End Navigation Bar-->
         
   
-<div class="wrapper">
+<div class="wrapper pl-0 pl-lg-1 pr-0 pr-lg-1 ">
   <div class="container-fluid">
         
     <?php if(isset($_flash_set) && $_flash_set == true): ?>

Layout/default/mfLogin/Index.php

@@ -133,10 +133,10 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
                 <?= $twoFactorInput ?>
                 <?= $error ?>
                 <div class="row">
-                    <div class="col-8">
+                    <div class="col-6 col-lg-8">
                     </div>
                     <!-- /.col -->
-                    <div class="col-4">
+                    <div class="col-6 col-lg-4">
                         <button type="submit" class="btn btn-primary btn-block">Einloggen</button>
                     </div>
                     <!-- /.col -->