Skip to content

Commit 621089d

Browse files
danspringerdanspringer
committed
V 1.5
* Anpassung an neuen Login-Screen ab REDAXO 5.12 * Hintergrundbild des neuen Login-Screens (REX 5.12) kann nun bequem im AddOn eingestellt werden * Media-Manager-Types für JPG und WebP werden bei Reinstall und Update in REX 5.12 angelegt. * Credits wurden nicht mehr angezeigt => fixed Danke @helpy
1 parent 1292e81 commit 621089d

File tree

11 files changed

+543
-245
lines changed

11 files changed

+543
-245
lines changed

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ Features
1818

1919
Last Changes
2020
-------
21+
### Version 1.5 ####
22+
23+
=== 26.03.2021 ===
24+
* Anpassung an neuen Login-Screen ab REDAXO 5.12
25+
* Hintergrundbild des neuen Login-Screens (REX 5.12) kann nun bequem im AddOn eingestellt werden
26+
* Media-Manager-Types für JPG und WebP werden bei Reinstall und Update in REX 5.12 angelegt.
27+
* Credits wurden nicht mehr angezeigt => fixed Danke @helpy
28+
2129
### Version 1.4.2 ####
2230

2331
=== 28.09.2020 ===

‎boot.php‎

Lines changed: 291 additions & 218 deletions
Large diffs are not rendered by default.

‎fragments/core/header.php‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎fragments/core/login_background.php‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?php
2+
/**
3+
* @var rex_fragment $this
4+
* @psalm-scope-this rex_fragment
5+
*/
6+
$login_bg_2100_webp = rex_url::pluginAssets('be_style', 'redaxo', 'images/peter-olexa-RYtiT3b7XW4-unsplash_2100.webp');
7+
$login_bg_3300_webp = rex_url::pluginAssets('be_style', 'redaxo', 'images/peter-olexa-RYtiT3b7XW4-unsplash_3300.webp');
8+
$login_bg_2100_jpg = rex_url::pluginAssets('be_style', 'redaxo', 'images/peter-olexa-RYtiT3b7XW4-unsplash_2100.jpg');
9+
$login_bg_3300_webp = rex_url::pluginAssets('be_style', 'redaxo', 'images/peter-olexa-RYtiT3b7XW4-unsplash_3300.jpg');
10+
11+
if(rex_addon::get('be_branding')->getConfig('login_bg')) {
12+
$login_bg_2100_webp = rex_media_manager::getUrl('be_branding_login_2100_webp', rex_addon::get('be_branding')->getConfig('login_bg'));
13+
$login_bg_3300_webp = rex_media_manager::getUrl('be_branding_login_3300_webp', rex_addon::get('be_branding')->getConfig('login_bg'));
14+
$login_bg_2100_jpg = rex_media_manager::getUrl('be_branding_login_2100_jpg', rex_addon::get('be_branding')->getConfig('login_bg'));
15+
$login_bg_3300_webp = rex_media_manager::getUrl('be_branding_login_3300_jpg', rex_addon::get('be_branding')->getConfig('login_bg'));
16+
}
17+
?>
18+
<picture class="rex-background">
19+
<source
20+
srcset="
21+
<?= $login_bg_2100_webp ?> 2100w,
22+
<?= $login_bg_3300_webp ?> 3300w"
23+
sizes="100vw"
24+
type="image/webp"
25+
/>
26+
<img
27+
alt=""
28+
src="<?= $login_bg_2100_jpg ?>"
29+
srcset="
30+
<?= $login_bg_2100_jpg ?> 2100w,
31+
<?= $login_bg_3300_webp ?> 3300w"
32+
sizes="100vw"
33+
/>
34+
</picture>
35+
36+
<script>
37+
var picture = document.querySelector('.rex-background');
38+
picture.classList.add('rex-background--process');
39+
picture.querySelector('img').onload = function() {
40+
picture.classList.add('rex-background--ready');
41+
}
42+
</script>
43+
44+
<footer class="rex-global-footer">
45+
<nav class="rex-nav-footer">
46+
<ul class="list-inline">
47+
<?php
48+
if( rex_addon::get('be_branding')->getConfig('agency') )
49+
echo '<li>' . rex_addon::get('be_branding')->getConfig('agency') .'</li>';
50+
?>
51+
<li><a href="https://www.yakamara.de" target="_blank" rel="noreferrer noopener">yakamara.de</a></li>
52+
<li><a href="https://www.redaxo.org" target="_blank" rel="noreferrer noopener">redaxo.org</a></li>
53+
<?php
54+
if( !rex_addon::get('be_branding')->getConfig('login_bg') )
55+
echo '<li class="rex-background-credits"><a href="https://unsplash.com/@deeezyfree" target="_blank" rel="noreferrer noopener">Photo by Peter Olexa on Unsplash</a></li>';
56+
?>
57+
</ul>
58+
</nav>
59+
</footer>

‎fragments/core/login_branding.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
/**
3+
* @var rex_fragment $this
4+
* @psalm-scope-this rex_fragment
5+
*/
6+
?>
7+
<div class="rex-branding">
8+
<?= rex_file::get(rex_path::coreAssets('redaxo-logo.svg')) ?>
9+
</div>

‎fragments/core/navigation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="navbar-collapse collapse">
55
<?php
66
if(rex_addon::get('be_branding')->getConfig('file')) {
7-
echo '<img src="'.checkExtension(rex_addon::get('be_branding')->getConfig('file')).'" class="img-responsive center-block" style="padding: 20px 0px 5px 0px; width: 370px;"/></a>';
7+
echo '<img src="'.checkExtension(rex_addon::get('be_branding')->getConfig('file')).'" class="img-responsive center-block" style="padding: 20px 10px 5px 10px; width: 100%;"/></a>';
88
}
99

1010
echo $this->navigation;

‎install.php‎

Lines changed: 65 additions & 1 deletion
Large diffs are not rendered by default.

‎lib/fe_favicon.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static function getHtml($hex_name){
4141

4242
foreach (array('16x16', '32x32', '96x96', '128x128') as $size) {
4343
if (file_exists(rex_path::addonAssets('be_branding','fe_favicon/favicon-'.$size.'-'.$hex_name.'.png'))) {
44-
$html .= "<link rel=\"icon\" type=\"image/png\" href=\"../assets/addons/be_branding/fe_favicon/favicon-{$size}-{$hex_name}.png\" sizes=\"{$size}\">\n";
44+
$html .= "<link rel=\"icon\" type=\"image/png\" href=\"".rex::getServer()."assets/addons/be_branding/fe_favicon/favicon-{$size}-{$hex_name}.png\" sizes=\"{$size}\">\n";
4545
}
4646
}
4747

@@ -50,18 +50,18 @@ static function getHtml($hex_name){
5050
as $size
5151
) {
5252
if (file_exists(rex_path::addonAssets('be_branding','fe_favicon/apple-touch-icon-'.$size.'-'.$hex_name.'.png'))) {
53-
$html .= "<link rel=\"apple-touch-icon\" sizes=\"{$size}\" href=\"../assets/addons/be_branding/fe_favicon/apple-touch-icon-{$size}-{$hex_name}.png\">\n";
53+
$html .= "<link rel=\"apple-touch-icon\" sizes=\"{$size}\" href=\"".rex::getServer()."assets/addons/be_branding/fe_favicon/apple-touch-icon-{$size}-{$hex_name}.png\">\n";
5454
}
5555
}
5656

5757
if (file_exists(rex_path::addonAssets('be_branding','fe_favicon/android-chrome-192x192-'.$hex_name.'.png'))) {
58-
$html .= "<link rel=\"icon\" type=\"image/png\" href=\"../assets/addons/be_branding/fe_favicon/android-chrome-192x192-{$hex_name}.png\" sizes=\"192x192\">\n";
58+
$html .= "<link rel=\"icon\" type=\"image/png\" href=\"".rex::getServer()."assets/addons/be_branding/fe_favicon/android-chrome-192x192-{$hex_name}.png\" sizes=\"192x192\">\n";
5959
}
6060
if (file_exists(rex_path::addonAssets('be_branding','fe_favicon/manifest-'.$hex_name.'.png'))) {
61-
$html .= "<link rel=\"manifest\" href=\"../assets/addons/be_branding/fe_favicon/manifest-{$hex_name}.json\">\n";
61+
$html .= "<link rel=\"manifest\" href=\"".rex::getServer()."assets/addons/be_branding/fe_favicon/manifest-{$hex_name}.json\">\n";
6262
}
6363
if (file_exists(rex_path::addonAssets('be_branding','fe_favicon/mstile-144x144-'.$hex_name.'.png'))) {
64-
$html .= "<meta name=\"msapplication-TileImage\" content=\"../assets/addons/be_branding/fe_favicon/mstile-144x144-{$hex_name}.png\">\n";
64+
$html .= "<meta name=\"msapplication-TileImage\" content=\"".rex::getServer()."assets/addons/be_branding/fe_favicon/mstile-144x144-{$hex_name}.png\">\n";
6565
}
6666
if ($addon->getConfig('fe_favicon_tilecolor')) {
6767
$html .= "<meta name=\"msapplication-TileColor\" content=\"#{$hex_name}\">\n";

‎package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Alle hier gesetzten Werte können über $addon->getProperty($key) abgefragt werden
22

33
package: be_branding # Pflichtfeld
4-
version: '1.4.2' # Pflichtfeld
4+
version: '1.5' # Pflichtfeld
55
author: Medienfeuer, Daniel Springer
66
supportpage: https://github.com/medienfeuer/be_branding
77

‎pages/branding.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
['border_color', 'string'],
1515
['color1', 'string'],
1616
['color2', 'string'],
17+
['login_bg', 'string'],
1718

1819

1920
]));
@@ -98,6 +99,43 @@
9899
$fragment->setVar('elements', $formElements, false);
99100
$content .= $fragment->parse('core/form/container.php');
100101

102+
103+
// Wenn REX 5.12 - erst ab hier gibt es den Login-Screen mit BG
104+
if(rex_string::versionCompare(rex::getVersion(), '5.12', '>=')) {
105+
106+
$formElements = [];
107+
$n = [];
108+
$n['label'] = '<label for="REX_MEDIA_3">Hintergrundbild des Login-Screens</label>';
109+
110+
$n['field'] = '
111+
<div class="rex-js-widget rex-js-widget-media">
112+
<div class="input-group">
113+
<input class="form-control" type="text" name="config[login_bg]" value="' . $this->getConfig('login_bg') . '" id="REX_MEDIA_3" readonly="readonly">
114+
<span class="input-group-btn">
115+
<a href="#" class="btn btn-popup" onclick="openREXMedia(3);return false;" title="ÖFFNEN">
116+
<i class="rex-icon rex-icon-open-mediapool"></i>
117+
</a>
118+
<a href="#" class="btn btn-popup" onclick="addREXMedia(3);return false;" title="NEU">
119+
<i class="rex-icon rex-icon-add-media"></i>
120+
</a>
121+
<a href="#" class="btn btn-popup" onclick="deleteREXMedia(3);return false;" title="REMOVE">
122+
<i class="rex-icon rex-icon-delete-media"></i>
123+
</a>
124+
<a href="#" class="btn btn-popup" onclick="viewREXMedia(3);return false;" title="ANSEHEN">
125+
<i class="rex-icon rex-icon-view-media"></i>
126+
</a>
127+
</span>
128+
</div>
129+
</div>
130+
';
131+
$formElements[] = $n;
132+
133+
$fragment = new rex_fragment();
134+
$fragment->setVar('elements', $formElements, false);
135+
$content .= $fragment->parse('core/form/container.php');
136+
137+
} // Eo REX 5.12
138+
101139
$content .= '</fieldset>';
102140

103141

0 commit comments

Comments
 (0)