diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-23 18:03:44 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-23 18:03:44 +0100 |
| commit | 4985e457eb004a4455148802a52ad14d81e7276f (patch) | |
| tree | cb561da3b15cc333977edf6ad8506aa04995a361 /app | |
| parent | 3eb5d216f3dd2a18427a62ea52f256b03a1027c7 (diff) | |
N'affiche <option></option> que lorsque nécessaire
Corrige https://github.com/marienfressinaud/FreshRSS/issues/372
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/configure/display.phtml | 19 | ||||
| -rw-r--r-- | app/views/configure/users.phtml | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 725356c8d..9104e4ef1 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -21,14 +21,17 @@ <div class="form-group"> <label class="group-name" for="theme"><?php echo Minz_Translate::t ('theme'); ?></label> <div class="group-controls"> - <select name="theme" id="theme" required=""> - <option></option> - <?php foreach ($this->themes as $theme) { ?> - <option value="<?php echo $theme['id']; ?>"<?php echo $this->conf->theme === $theme['id'] ? ' selected="selected"' : ''; ?>> - <?php echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author']; ?> - </option> - <?php } ?> - </select> + <select name="theme" id="theme" required=""><?php + $found = false; + foreach ($this->themes as $theme) { + ?><option value="<?php echo $theme['id']; ?>"<?php if ($this->conf->theme === $theme['id']) { echo ' selected="selected"'; $found = true; } ?>><?php + echo $theme['name'] . ' — ' . Minz_Translate::t ('by') . ' ' . $theme['author']; + ?></option><?php + } + if (!$found) { + ?><option selected="selected"></option><?php + } + ?></select> </div> </div> diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml index 990c80acc..f37b2320f 100644 --- a/app/views/configure/users.phtml +++ b/app/views/configure/users.phtml @@ -49,7 +49,9 @@ <label class="group-name" for="auth_type"><?php echo Minz_Translate::t('auth_type'); ?></label> <div class="group-controls"> <select id="auth_type" name="auth_type" required="required"> - <option value=""></option> + <?php if (!in_array(Minz_Configuration::authType(), array('form', 'persona', 'http_auth', 'none'))) { ?> + <option selected="selected"></option> + <?php } ?> <option value="form"<?php echo Minz_Configuration::authType() === 'form' ? ' selected="selected"' : '', version_compare(PHP_VERSION, '5.3', '<') ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('auth_form'); ?></option> <option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('auth_persona'); ?></option> <option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo Minz_Translate::t('http_auth'); ?> (REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option> |