Merge pull request #212 from RRZE-Webteam/dev

v1.23.1

assets/css/_alerts.scss

@@ -7,6 +7,7 @@
     border: 1px solid transparent;
     font-weight: normal;
     background-color: #e9edf2;
+    overflow: hidden;
     strong {
         color: inherit;
     }
@@ -58,4 +59,43 @@
 .alert.alert-danger p {
     font-size: 1rem;
     line-height: 1.5;
+}
+
+.alert-example,
+#content .alert-example {
+    margin: 30px 20px 40px;
+    padding: 30px 10px 5px;
+    position: relative;
+    background: #fff;
+    overflow: initial;
+    border: 1px dashed var(--color-TextLight, $medium-grey);
+    border-radius: 3px;
+    &:after {
+        background: #fff;
+        border: 1px dashed var(--color-TextLight, $medium-grey);
+        color: var(--color-Text);
+        content: "Beispiel";
+        font-family: sans-serif;
+        font-size: .8rem;
+        line-height: inherit;
+        font-weight: 700;
+        padding: 3px 10px;
+        position: absolute;
+        right: 20px;
+        text-transform: uppercase;
+        top: -1.2rem;
+        z-index: 1;
+        overflow: auto;
+        :lang(en) & {
+            content: 'Example';
+        }
+        .fau-events & {
+            width: auto;
+            height: auto;
+            visibility: initial;
+        }
+    }
+    &[title]:after {
+        content: attr(title);
+    }
 }

assets/css/_textcolumns.scss

@@ -0,0 +1,9 @@
+.elements-textcolumns {
+    column-gap: 2em;
+    padding-bottom: 1em;
+    figure {
+        -webkit-column-break-inside: avoid;
+        page-break-inside: avoid;
+        break-inside: avoid;
+    }
+}

assets/css/rrze-elements.scss

@@ -56,4 +56,7 @@
 @import "latex";
 
 //Font-Awesome-Icons
-@import "icons";
+@import "icons";
+
+//Text-Columns (Fließtext in Spalten)
+//@import "textcolumns";

includes/Accordion/Accordion.php

@@ -9,10 +9,12 @@
  */
 class Accordion
 {
-    /**
+	protected $pluginFile;
+
+	/**
      * [__construct description]
      */
-    public function __construct()
+    public function __construct($pluginFile)
     {
         add_shortcode('collapsibles', [$this, 'shortcodeCollapsibles']);
         add_shortcode('accordion', [$this, 'shortcodeCollapsibles']);
@@ -23,6 +25,7 @@ public function __construct()
         add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
         add_action('wp_enqueue_scripts', [$this, 'enqueueScriptTranslations'], 100);
 
+		$this->pluginFile = $pluginFile;
     }
 
     /**
@@ -172,12 +175,12 @@ public static function enqueueScripts() {
             plugins_url('assets/js/rrze-accordion.min.js', plugin_basename(__FILE__)),
             //plugins_url('assets/js/rrze-accordion.js', plugin_basename(__FILE__)),
             ['jquery', 'wp-i18n'],
-            '1.23.0'
+            '1.23.1'
         );
     }
 
-    public static function enqueueScriptTranslations()
+    public function enqueueScriptTranslations()
     {
-       wp_set_script_translations('rrze-accordions', 'rrze-elements');
+		wp_set_script_translations('rrze-accordions', 'rrze-elements',plugin_dir_path( $this->pluginFile ) . 'languages/');
     }
 }

includes/Accordion/assets/js/rrze-accordion.js

@@ -17,8 +17,6 @@ jQuery(document).ready(function($) {
             var open = $(this).find(".accordion-body.open");
             if (items.length == open.length) {
                 $(this).find('button.expand-all').attr("data-status", 'open').data('status', 'open').html(__('Collapse All', 'rrze-elements'));
-                //$(this).find('button.expand-all').attr("data-status", 'open').data('status', 'open').html(accordionToggle.collapse_all);
-                //console.log("items = " + items.length + " open = " + open.length);
             }
         }
     });