diff --git a/core/core.php b/core/core.php
index fdffd2d..e791074 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1805,22 +1805,20 @@ class common {
echo $this->showi18n();
}
echo '';
-
- if( $this->getData(['theme', 'menu', 'textAlign']) === 'right'){
- if( $itemsRight === '') $space1Menu ='';
- echo '
' . $itemsLeft . $space1Menu . $itemsRight ;
- if($this->getData(['config', 'i18n', 'enable']) === true) {
- if( $itemsRight === '') echo $space2Menu;
- echo $this->showi18n();
- }
- }
- else{
- if( $itemsRight === '') $space1Menu ='';
- echo '' . $itemsRight . $space1Menu . $itemsLeft ;
- if($this->getData(['config', 'i18n', 'enable']) === true) {
- echo $space2Menu;
- echo $this->showi18n();
+ if( $itemsRight === '') $space1Menu ='';
+ echo '' . $itemsLeft . $space1Menu . $itemsRight ;
+ if($this->getData(['config', 'i18n', 'enable']) === true) {
+ if( $itemsRight === ''){
+ $spaceOK = false;
+ foreach (self::$i18nList as $key => $value) {
+ if( $this->getData(['config', 'i18n', $key]) === 'site' || $this->getData(['config', 'i18n', $key]) === 'script' ){
+ $spaceOK = true;
+ continue;
+ }
+ }
+ if($spaceOK === true) echo $space2Menu;
}
+ echo $this->showi18n();
}
echo '
';
}
diff --git a/core/layout/common.css b/core/layout/common.css
index 8db5ac7..3de5aaf 100644
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -760,12 +760,16 @@ li .menuSideChild {
.i18nFlag {
width: 25px;
- margin-left: 5px;
+ margin: 0 10px 0 -10px;
}
.i18nFlagSelected {
width: 30px;
- margin-left: 5px;
+ margin: 0 10px 0 -10px;
+ }
+
+ .zwiico-login{
+ margin-right: 20px;
}
}