Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
package-bricks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QUIQQER
package-bricks
Commits
be2ab8a6
Commit
be2ab8a6
authored
Dec 04, 2018
by
Michael Danielczok
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev'
parents
89dd5d68
0539e0ec
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
139 additions
and
7 deletions
+139
-7
bricks.xml
bricks.xml
+15
-0
locale.xml
locale.xml
+13
-0
src/QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.css
src/QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.css
+70
-0
src/QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.html
...QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.html
+23
-0
src/QUI/Bricks/Controls/SimpleGoogleMaps.Standard.css
src/QUI/Bricks/Controls/SimpleGoogleMaps.Standard.css
+0
-0
src/QUI/Bricks/Controls/SimpleGoogleMaps.Standard.html
src/QUI/Bricks/Controls/SimpleGoogleMaps.Standard.html
+0
-0
src/QUI/Bricks/Controls/SimpleGoogleMaps.php
src/QUI/Bricks/Controls/SimpleGoogleMaps.php
+18
-7
No files found.
bricks.xml
View file @
be2ab8a6
...
...
@@ -672,6 +672,21 @@
<setting
name=
"preventLoadMap"
type=
"checkbox"
>
<locale
group=
"quiqqer/bricks"
var=
"brick.control.simplegooglemaps.settings.preventLoadMap"
/>
</setting>
<setting
name=
"template"
type=
"select"
>
<locale
group=
"quiqqer/bricks"
var=
"brick.control.simplegooglemaps.settings.template"
/>
<option
value=
"standard"
>
<locale
group=
"quiqqer/bricks"
var=
"brick.control.simplegooglemaps.settings.template.standard"
/>
</option>
<option
value=
"nextToEachOther"
>
<locale
group=
"quiqqer/bricks"
var=
"brick.control.simplegooglemaps.settings.template.nextToEachOther"
/>
</option>
</setting>
<setting
name=
"place"
>
<locale
group=
"quiqqer/bricks"
var=
"brick.control.simplegooglemaps.settings.place"
/>
</setting>
...
...
locale.xml
View file @
be2ab8a6
...
...
@@ -1257,6 +1257,19 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<de>
<![CDATA[Das automatische Laden von Google Maps verhindern. Der Benutzer muss sie manuell aktivieren.]]>
</de>
<en>
<![CDATA[Prevent auto-load Google Maps. User must activate it manually.]]>
</en>
</locale>
<locale
name=
"brick.control.simplegooglemaps.settings.template"
>
<de>
<![CDATA[Template]]>
</de>
<en>
<![CDATA[Template]]>
</en>
</locale>
<locale
name=
"brick.control.simplegooglemaps.settings.template.standard"
>
<de>
<![CDATA[Standard (Inhalt über der Karte)]]>
</de>
<en>
<![CDATA[Template (content above the map)]]>
</en>
</locale>
<locale
name=
"brick.control.simplegooglemaps.settings.template.nextToEachOther"
>
<de>
<![CDATA[Nebeneinander (Text neben der Karte)]]>
</de>
<en>
<![CDATA[Next to each other (content next to the map)]]>
</en>
</locale>
<locale
name=
"brick.control.simplegooglemaps.settings.place"
>
<de>
<![CDATA[Google Place]]>
</de>
<en>
<![CDATA[Google Place]]>
</en>
...
...
src/QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.css
0 → 100644
View file @
be2ab8a6
.simpleGoogleMap-nextToEachOther
{
display
:
flex
;
}
.simpleGoogleMap-nextToEachOther-mapContainer
,
.simpleGoogleMap-nextToEachOther-contentContainer
{
width
:
100%
;
}
.simpleGoogleMap-nextToEachOther-contentContainer
{
margin-left
:
1em
;
}
.simpleGoogleMap-nextToEachOther-contentContainer
p
:last-child
{
margin-bottom
:
0
;
}
.simpleGoogleMap-wrapper
{
background-position
:
center
;
background-size
:
cover
;
height
:
100%
;
}
.simpleGoogleMap
{
align-items
:
stretch
;
display
:
flex
;
height
:
100%
;
justify-content
:
center
;
min-height
:
300px
;
position
:
relative
;
}
.simpleGoogleMap-iframe
{
background
:
none
;
border
:
none
;
display
:
block
;
height
:
auto
;
position
:
relative
;
width
:
100%
;
}
.btn-active-map
{
align-self
:
center
;
background
:
none
;
border-color
:
#333
;
color
:
#333
;
font-size
:
1.2rem
;
margin-left
:
1em
;
margin-right
:
1em
;
}
.btn-active-map
:hover
,
.btn-active-map
:active
{
background
:
#33333311
;
color
:
#333
;
}
@media
screen
and
(
max-width
:
767px
)
{
.simpleGoogleMap-nextToEachOther
{
display
:
block
;
}
.simpleGoogleMap-nextToEachOther-mapContainer
{
margin-bottom
:
1em
;
}
.simpleGoogleMap-nextToEachOther-contentContainer
{
margin-left
:
0
;
}
}
\ No newline at end of file
src/QUI/Bricks/Controls/SimpleGoogleMaps.NextToEachOther.html
0 → 100644
View file @
be2ab8a6
{if $this->getAttribute('showTitle')
&&
$this->getAttribute('frontendTitle')}
<header
class=
"control-header"
>
<h1>
{$this->getAttribute('frontendTitle')}
</h1>
</header>
{/if}
<div
class=
"simpleGoogleMap-nextToEachOther"
>
<div
class=
"simpleGoogleMap-nextToEachOther-mapContainer"
>
<div
class=
"simpleGoogleMap-wrapper"
>
<div
class=
"simpleGoogleMap"
>
{if !$preventLoadMap}
<iframe
class=
"simpleGoogleMap-iframe"
src=
"{$url}"
></iframe>
{/if}
</div>
</div>
</div>
{if $this->getAttribute('content') != ""}
<div
class=
"simpleGoogleMap-nextToEachOther-contentContainer"
>
{$this->getAttribute('content')}
</div>
{/if}
</div>
\ No newline at end of file
src/QUI/Bricks/Controls/SimpleGoogleMaps.css
→
src/QUI/Bricks/Controls/SimpleGoogleMaps.
Standard.
css
View file @
be2ab8a6
File moved
src/QUI/Bricks/Controls/SimpleGoogleMaps.html
→
src/QUI/Bricks/Controls/SimpleGoogleMaps.
Standard.
html
View file @
be2ab8a6
File moved
src/QUI/Bricks/Controls/SimpleGoogleMaps.php
View file @
be2ab8a6
...
...
@@ -25,14 +25,11 @@ class SimpleGoogleMaps extends QUI\Control
// default options
$this
->
setAttributes
([
'title'
=>
''
,
'preventLoadMap'
=>
false
'preventLoadMap'
=>
false
,
'template'
=>
'standard'
]);
parent
::
__construct
(
$attributes
);
$this
->
addCSSFile
(
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.css'
);
}
/**
...
...
@@ -59,8 +56,8 @@ class SimpleGoogleMaps extends QUI\Control
'q'
=>
"
{
$brickPlace
}
,
{
$brickZip
}
,
{
$brickStreet
}
,
{
$brickCity
}
"
]);
// prevent load map
$url
=
'https://www.google.com/maps/embed/v1/place?'
.
$query
.
"&zoom="
.
$zoom
;
if
(
$preventLoadMap
)
{
$imgUrl
=
URL_OPT_DIR
.
'quiqqer/bricks/bin/images/SimpleGoogleMapsBackground1.png'
;
...
...
@@ -71,12 +68,26 @@ class SimpleGoogleMaps extends QUI\Control
]);
}
// template
switch
(
$this
->
getAttribute
(
'template'
))
{
case
'nextToEachOther'
:
$template
=
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.NextToEachOther.html'
;
$css
=
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.NextToEachOther.css'
;
break
;
case
'default'
:
default
:
$template
=
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.Standard.html'
;
$css
=
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.Standard.css'
;
}
$Engine
->
assign
([
'this'
=>
$this
,
'url'
=>
$url
,
'preventLoadMap'
=>
$preventLoadMap
]);
return
$Engine
->
fetch
(
dirname
(
__FILE__
)
.
'/SimpleGoogleMaps.html'
);
$this
->
addCSSFile
(
$css
);
return
$Engine
->
fetch
(
$template
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment