diff --git a/bin/Controls/SimpleGoogleMaps.js b/bin/Controls/SimpleGoogleMaps.js deleted file mode 100644 index 7efa92d83bdc5b019be47f17aaee2758aa3a0fa3..0000000000000000000000000000000000000000 --- a/bin/Controls/SimpleGoogleMaps.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * QUIQQER Simple Google Map Control - * - * @author www.pcsg.de (Michael Danielczok) - * @module Bricks\Controls\SimpleGoogleMaps - * - * @require qui/QUI - * @require qui/controls/Control - */ -define('package/quiqqer/bricks/bin/Controls/SimpleGoogleMaps', [ - - 'qui/QUI', - 'qui/controls/Control' - -], function (QUI, QUIControl) -{ - "use strict"; - - return new Class({ - - Extends: QUIControl, - Type : 'Controls/SimpleGoogleMaps', - - Binds: [ - '$onImport' - ], - - initialize: function (options) - { - this.parent(options); - - this.mapWrapper = null; - - this.addEvents({ - onImport: this.$onImport - }); - }, - - /** - * event : on import - */ - $onImport: function () - { - this.mapWrapper = document.getElement('.simpleGoogleMap-wrapper'); - - this.mapWrapper.addEvent('click', function() { - this.mapWrapper.addClass('simpleGoogleMap-hideWrapper'); - }.bind(this)); - } - }); -}); diff --git a/bricks.xml b/bricks.xml index 5f13cedd963d14c9373df47164a850129e10ea45..b8f59a7d497c5bfe92f900a110a3475a83f6fbc2 100644 --- a/bricks.xml +++ b/bricks.xml @@ -84,7 +84,7 @@ <locale group="quiqqer/bricks" var="brick.control.setting.order"/> <option value=""/> - <option value="name ASC"> + <option value="name ASC" selected="selected"> <locale group="quiqqer/system" var="name_asc"/> </option> <option value="name DESC"> @@ -968,8 +968,8 @@ <option value="authorTop"> <locale group="quiqqer/bricks" var="brick.listTemplate.authorTop"/> </option> - <option value="grid3x3"> - <locale group="quiqqer/bricks" var="brick.listTemplate.grid3x3"/> + <option value="cardRows"> + <locale group="quiqqer/bricks" var="brick.listTemplate.cardRows"/> </option> </setting> diff --git a/locale.xml b/locale.xml index 9e85102c0ac216952218e8cf6c8fa9138cdbad87..a06d82115be9f9262a9d4af2749754d56c893851 100644 --- a/locale.xml +++ b/locale.xml @@ -800,44 +800,48 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de> <locale name="brick.control.simplegooglemaps.title"> <de><![CDATA[Bausteine: Einfache Google Maps Karte]]></de> <en><![CDATA[Bricks: Simple Google Maps]]></en> + <pl><![CDATA[Bricks: Simple Google Maps]]></pl> </locale> <locale name="brick.control.simplegooglemaps.description"> <de><![CDATA[Einstellungen fĂĽr Karten]]></de> <en><![CDATA[Maps settings]]></en> - </locale> - <locale name="brick.control.simplegooglemaps.clickToActivate"> - <de><![CDATA[Zum Aktivieren klicken]]></de> - <en><![CDATA[Click to activate]]></en> - <pl><![CDATA[Kliknij, zeby aktywowac]]></pl> + <pl><![CDATA[Ustawienia mapy]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.place"> <de><![CDATA[Google Place]]></de> <en><![CDATA[Google Place]]></en> + <pl><![CDATA[Google Place]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.title"> <de><![CDATA[Title]]></de> <en><![CDATA[Title]]></en> + <pl><![CDATA[TytuĹ‚]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.street"> <de><![CDATA[StraĂźe]]></de> <en><![CDATA[Street]]></en> + <pl><![CDATA[Ulica]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.zip"> <de><![CDATA[PLZ]]></de> <en><![CDATA[ZIP code]]></en> + <pl><![CDATA[Kod pocztowy]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.city"> <de><![CDATA[Stadt]]></de> <en><![CDATA[City]]></en> + <pl><![CDATA[Miejscowość]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.zoom"> <de><![CDATA[Zoom]]></de> <en><![CDATA[Zoom]]></en> + <pl><![CDATA[Zoom]]></pl> </locale> <locale name="brick.control.simplegooglemaps.settings.api"> <de><![CDATA[API Key]]></de> <en><![CDATA[API Key]]></en> + <pl><![CDATA[Klucz API]]></pl> </locale> <!-- Box Content --> @@ -947,6 +951,11 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de> <en><![CDATA[Author and date top]]></en> <pl><![CDATA[Autor i data na gĂłrze]]></pl> </locale> + <locale name="brick.listTemplate.cardRows"> + <de><![CDATA[Cards]]></de> + <en><![CDATA[Cards]]></en> + <pl><![CDATA[Cards]]></pl> + </locale> <!-- max siten --> diff --git a/src/QUI/Bricks/Controls/SimpleGoogleMaps.css b/src/QUI/Bricks/Controls/SimpleGoogleMaps.css index 202f8e7b906330ee00374d1806b90e0c6053237c..0020072d0e17d2054bfe5f863fe87711081ffb30 100644 --- a/src/QUI/Bricks/Controls/SimpleGoogleMaps.css +++ b/src/QUI/Bricks/Controls/SimpleGoogleMaps.css @@ -11,52 +11,4 @@ min-height: 300px; position: relative; width: 100%; -} - -.simpleGoogleMap-wrapper { - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: rgba(0, 0, 0, 0.4); - z-index: 1; - display: flex; - align-items: center; - justify-content: center; - opacity: 0; - transition: 0.3s all ease-in-out; -} - -.simpleGoogleMap-wrapper span { - text-align: center; - display: inline-block; - font-size: 1.7em; - color: #fff; - padding: 10px 20px; - border: 2px solid rgba(255, 255, 255, 0.7); - cursor: default; - transition: 0.3s all ease-in-out; - margin: 0 10px; -} - -.simpleGoogleMap-wrapper span:hover { - box-shadow: 0 0 6px 0 #fff; - background: rgba(255, 255, 255, 0); - -} - -.simpleGoogleMap-wrapper:hover { - opacity: 1; - transition-delay: 350ms; -} - -.simpleGoogleMap-wrapper.simpleGoogleMap-hideWrapper { - display: none; -} - -@media screen and (max-width: 767px) { - .simpleGoogleMap-wrapper { - display: none; - } } \ No newline at end of file diff --git a/src/QUI/Bricks/Controls/SimpleGoogleMaps.html b/src/QUI/Bricks/Controls/SimpleGoogleMaps.html index 1768d7057e8a0338dfdef91fa9930e9fe1bc9569..eb6ea808c246c6f77239b108766a81381cd0ebd4 100644 --- a/src/QUI/Bricks/Controls/SimpleGoogleMaps.html +++ b/src/QUI/Bricks/Controls/SimpleGoogleMaps.html @@ -9,9 +9,7 @@ {$this->getAttribute('content')} </div> {/if} + <div class="simpleGoogleMap"> - <div class="simpleGoogleMap-wrapper"> - <span>{locale group='quiqqer/bricks' var='brick.control.simplegooglemaps.clickToActivate'}</span> - </div> <iframe class="simpleGoogleMap-iframe" src="{$url}"></iframe> </div> \ No newline at end of file diff --git a/src/QUI/Bricks/Controls/SimpleGoogleMaps.php b/src/QUI/Bricks/Controls/SimpleGoogleMaps.php index 847733d5ee60c95fc500cb5e916cd10dcf01a9dd..a2c140fd4b67c58a04fe55ebd98e8df07641404a 100644 --- a/src/QUI/Bricks/Controls/SimpleGoogleMaps.php +++ b/src/QUI/Bricks/Controls/SimpleGoogleMaps.php @@ -33,7 +33,7 @@ public function __construct($attributes = array()) dirname(__FILE__) . '/SimpleGoogleMaps.css' ); - $this->setAttribute('qui-class', "package/quiqqer/bricks/bin/Controls/SimpleGoogleMaps"); +// $this->setAttribute('qui-class', "package/quiqqer/bricks/bin/Controls/SimpleGoogleMaps"); } /**