Merge branch 'master' into 'fronkdev'

# Conflicts:
#   Layout/default/ConstructionConsent/Form.php

Layout/default/ConstructionConsent/Form.php

@@ -55,9 +55,9 @@
                             </div>
 
                             <div class="form-group row">
-                                <label class="col-lg-2 col-form-label" for="name">Name</label>
+                                <label class="col-lg-2 col-form-label" for="name">Name*</label>
                                 <div class="col-lg-10">
-                                    <input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" />
+                                    <input type="text" class="form-control" name="name" id="name" value="<?=(isset($item)) ? $item->name : ""?>" placeholder="z.B. Straße oder Adresse" data-toggle="popover" data-trigger="focus" data-placement="left" data-content="Wird in der Zustimmungserklärung in der Objektanschrift verwendet." />
                                 </div>
                             </div>
 
@@ -404,6 +404,22 @@
             $("#consent_plan_image").change();
         }
     });
+
+
+    $(document).ready(function(){
+        $('[data-toggle="popover"]').popover();
+    });
+
+
 </script>
+    <style>
+        .popover {
+            background-color: #ffff99;
+        }
+        .popover .arrow::after {
+            border-top-color: #ffff99;
+        }
+    </style>
+
 
 <?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>

Layout/default/ConstructionConsent/Index.php

@@ -112,6 +112,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                         <th>Name</th>
                         <th>Objekttyp</th>
                         <th>Objektadresse</th>
+                        <th>GST-Nr.</th>
 <!--                        <th title="Grundstücksnummer">GST-Nr.</th>-->
 <!--                        <th title="Grundbuch Einlagezahl">EZ</th>-->
 <!--                        <th>Besitzer</th>-->
@@ -137,7 +138,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                                     <?=$item->adb_hausnummer->strasse->gemeinde->name?>
                                 <?php endif; ?>
                             </td>
-<!--                            <td>--><?php //=$item->gstnr?><!--</td>-->
+                            <td><?=$item->gst?></td>
 <!--                            <td>--><?php //=$item->ez?><!--</td>-->
 <!--                            <td>--><?php //=$item->owner_name?><!--</td>-->
 <!--                            <td>-->