aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2017-11-12 10:29:57 +0100
committerGeorg Ehrke <developer@georgehrke.com>2018-06-27 13:19:48 +0200
commit9af82296c7fa01cd6f6d940f8ffcd32362b90d55 (patch)
tree730a24dba8a051b1ccefa965db63081b500e6f02 /settings
parentbf6bfad76bcf40266f7a7bdc71cbf59e8873abe7 (diff)
downloadnextcloud-server-9af82296c7fa01cd6f6d940f8ffcd32362b90d55.tar.gz
nextcloud-server-9af82296c7fa01cd6f6d940f8ffcd32362b90d55.zip
fix position of locale input
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.scss3
-rw-r--r--settings/templates/settings/personal/personal.info.php55
2 files changed, 29 insertions, 29 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 5742b6a5523..0ca3a96360b 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -118,7 +118,8 @@ input {
select {
&#timezone,
- &#languageinput {
+ &#languageinput,
+ &#localeinput {
width: 100%;
}
}
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index 20e346c867a..83530222f3e 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -341,6 +341,33 @@ vendor_style('jcrop/css/jquery.Jcrop');
</a>
</form>
<?php } ?>
+ <?php if (isset($_['activelocale'])) { ?>
+ <form id="locale" class="section">
+ <h2>
+ <label for="localeinput"><?php p($l->t('Locale'));?></label>
+ </h2>
+ <select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
+ <option value="<?php p($_['activelocale']['code']);?>">
+ <?php p($_['activelocale']['name']);?>
+ </option>
+ <optgroup label="––––––––––"></optgroup>
+ <?php foreach($_['localesforlanguage'] as $locale):?>
+ <option value="<?php p($locale['code']);?>">
+ <?php p($locale['name']);?>
+ </option>
+ <?php endforeach;?>
+ <optgroup label="––––––––––"></optgroup>
+ <option value="<?php p($_['activelocale']['code']);?>">
+ <?php p($_['activelocale']['name']);?>
+ </option>
+ <?php foreach($_['locales'] as $locale):?>
+ <option value="<?php p($locale['code']);?>">
+ <?php p($locale['name']);?>
+ </option>
+ <?php endforeach;?>
+ </select>
+ </form>
+ <?php } ?>
</div>
<div class="personal-settings-setting-box personal-settings-password-box">
<?php
@@ -380,31 +407,3 @@ vendor_style('jcrop/css/jquery.Jcrop');
</div>
</div>
-
-<?php if (isset($_['activelocale'])) { ?>
-<form id="locale" class="section">
- <h2>
- <label for="localeinput"><?php p($l->t('Locale'));?></label>
- </h2>
- <select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
- <option value="<?php p($_['activelocale']['code']);?>">
- <?php p($_['activelocale']['name']);?>
- </option>
- <optgroup label="––––––––––"></optgroup>
- <?php foreach($_['localesforlanguage'] as $locale):?>
- <option value="<?php p($locale['code']);?>">
- <?php p($locale['name']);?>
- </option>
- <?php endforeach;?>
- <optgroup label="––––––––––"></optgroup>
- <option value="<?php p($_['activelocale']['code']);?>">
- <?php p($_['activelocale']['name']);?>
- </option>
- <?php foreach($_['locales'] as $locale):?>
- <option value="<?php p($locale['code']);?>">
- <?php p($locale['name']);?>
- </option>
- <?php endforeach;?>
- </select>
-</form>
-<?php } ?>