From 6b3e162a9dd10b578efdcda833fcbae1fc2e5f19 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Wed, 11 May 2016 10:45:46 +0200
Subject: [PATCH] flag folder path
---
.../Controls/LanguageSwitches/DropDown.html | 3 ++-
.../Controls/LanguageSwitches/DropDown.php | 3 ++-
.../Controls/LanguageSwitches/Flags.html | 24 ++++++++++++-------
.../Controls/LanguageSwitches/Flags.php | 3 ++-
4 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
index 028b791..c265b46 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.html
@@ -1,5 +1,6 @@
{assign var=Site value=$this->getAttribute('Site')}
{assign var=siteLang value=$Project->getLang()}
+{assign var=path value=$this->getAttribute('flagFolderPath')}
{if count($langs) > 1}
<div class="quiqqer-control-languageswitch-dropdown quiqqer-control-languageswitch-dropdown__withArrow">
@@ -25,7 +26,7 @@
<a class="quiqqer-control-languageswitch-dropdown-dd-entry" href="{url id=$Site->getId( $lang ) lang=$lang}">
{if $this->getAttribute('showFlags')}
<span class="quiqqer-control-languageswitch-dropdown-dd-icon">
- <img src="{$smarty.const.URL_BIN_DIR}16x16/flags/{$lang}.png"/>
+ <img src="{$path}{$lang}.png"/>
</span>
{/if}
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
index e488f4a..13d9e06 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/DropDown.php
@@ -29,7 +29,8 @@ public function __construct($attributes = array())
'Site' => false,
'showFlags' => true,
'showText' => true,
- 'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/DropDown'
+ 'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/DropDown',
+ 'flagFolderPath' => URL_BIN_DIR . '16x16/flags/'
));
parent::__construct($attributes);
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
index a29aefa..77ee3c4 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.html
@@ -1,23 +1,31 @@
{assign var=Site value=$this->getAttribute('Site')}
{assign var=siteLang value=$Project->getLang()}
+{assign var=siteLang value=$Project->getLang()}
{assign var=all value=$this->getAttribute('all')}
+{assign var=path value=$this->getAttribute('flagFolderPath')}
{if count($langs) > 1}
{strip}
<div class="quiqqer-bricks-languageswitch-flag">
{foreach from=$langs item=lang}
- {if $all || $siteLang != $lang && $Site->existLang( $lang )}
- <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=$Site->getId( $lang ) lang=$lang}">
+ {if $all || $siteLang != $lang}
+
+ {if $Site->getId($lang)}
+ <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=$Site->getId($lang) lang=$lang}">
+ {else}
+ <a class="quiqqer-bricks-languageswitch-flag-entry" href="{url id=1 lang=$lang}">
+ {/if}
+
{if $this->getAttribute('showFlags')}
- <span class="quiqqer-bricks-languageswitch-flag-entry-icon">
- <img src="{$smarty.const.URL_BIN_DIR}16x16/flags/{$lang}.png"/>
- </span>
+ <span class="quiqqer-bricks-languageswitch-flag-entry-icon">
+ <img src="{$path}{$lang}.png"/>
+ </span>
{/if}
{if $this->getAttribute('showText')}
- <span class="quiqqer-bricks-languageswitch-flag-entry-text">
- {$lang}
- </span>
+ <span class="quiqqer-bricks-languageswitch-flag-entry-text">
+ {$lang}
+ </span>
{/if}
</a>
{/if}
diff --git a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
index 637e8d9..0a15820 100644
--- a/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
+++ b/src/QUI/Bricks/Controls/LanguageSwitches/Flags.php
@@ -30,7 +30,8 @@ public function __construct($attributes = array())
'showFlags' => true,
'showText' => true,
'all' => true,
- 'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/Flags'
+ 'data-qui' => 'package/quiqqer/bricks/bin/Controls/LanguageSwitches/Flags',
+ 'flagFolderPath' => URL_BIN_DIR . '16x16/flags/'
));
parent::__construct($attributes);
--
GitLab