diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-09 21:32:06 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-09 21:32:06 +0200 |
| commit | fce624218eb247d7174cdb186026174a8a6e5e8b (patch) | |
| tree | f399b3bd6264d9c0f5f9597e3055adab532314b0 /app/views | |
| parent | b6e89d4e06814541802c428c4df0e28633f551cd (diff) | |
| parent | d477373ef2879bdeeaa3c157287c0fab98afefdc (diff) | |
Merge branch 'dev' into 411-update-system
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/reading.phtml | 29 | ||||
| -rw-r--r-- | app/views/importExport/index.phtml | 8 |
2 files changed, 23 insertions, 14 deletions
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index d56726730..e96bcea42 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -44,10 +44,9 @@ <div class="form-group"> <div class="group-controls"> - <label class="checkbox" for="auto_load_more"> - <input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> /> - <?php echo Minz_Translate::t ('auto_load_more'); ?> - <noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript> + <label class="checkbox" for="hide_read_feeds"> + <input type="checkbox" name="hide_read_feeds" id="hide_read_feeds" value="1"<?php echo $this->conf->hide_read_feeds ? ' checked="checked"' : ''; ?> /> + <?php echo Minz_Translate::t('hide_read_feeds'); ?> </label> </div> </div> @@ -64,9 +63,9 @@ <div class="form-group"> <div class="group-controls"> - <label class="checkbox" for="lazyload"> - <input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> /> - <?php echo Minz_Translate::t ('img_with_lazyload'); ?> + <label class="checkbox" for="sticky_post"> + <input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> /> + <?php echo Minz_Translate::t ('sticky_post'); ?> <noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript> </label> </div> @@ -74,9 +73,19 @@ <div class="form-group"> <div class="group-controls"> - <label class="checkbox" for="sticky_post"> - <input type="checkbox" name="sticky_post" id="sticky_post" value="1"<?php echo $this->conf->sticky_post ? ' checked="checked"' : ''; ?> /> - <?php echo Minz_Translate::t ('sticky_post'); ?> + <label class="checkbox" for="auto_load_more"> + <input type="checkbox" name="auto_load_more" id="auto_load_more" value="1"<?php echo $this->conf->auto_load_more ? ' checked="checked"' : ''; ?> /> + <?php echo Minz_Translate::t ('auto_load_more'); ?> + <noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript> + </label> + </div> + </div> + + <div class="form-group"> + <div class="group-controls"> + <label class="checkbox" for="lazyload"> + <input type="checkbox" name="lazyload" id="lazyload" value="1"<?php echo $this->conf->lazyload ? ' checked="checked"' : ''; ?> /> + <?php echo Minz_Translate::t ('img_with_lazyload'); ?> <noscript> — <strong><?php echo Minz_Translate::t ('javascript_should_be_activated'); ?></strong></noscript> </label> </div> diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml index 96cd2b4e7..e1458e916 100644 --- a/app/views/importExport/index.phtml +++ b/app/views/importExport/index.phtml @@ -30,18 +30,18 @@ </label> <label class="checkbox" for="export_starred"> - <input type="checkbox" name="export_starred" id="export_starred" value="1" checked="checked" /> + <input type="checkbox" name="export_starred" id="export_starred" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> /> <?php echo _t('export_starred'); ?> </label> <?php $select_args = ''; if (extension_loaded('zip')) { - $select_args = ' size="<?php echo min(10, count($this->feeds)); ?>" multiple="multiple"'; + $select_args = ' size="' . min(10, count($this->feeds)) .'" multiple="multiple"'; } ?> - <select name="export_feeds[]"<?php echo $select_arg; ?>> - <?php echo extension_loaded('zip')? '': '<option></option>'; ?> + <select name="export_feeds[]"<?php echo $select_args; ?>> + <?php echo extension_loaded('zip') ? '' : '<option></option>'; ?> <?php foreach ($this->feeds as $feed) { ?> <option value="<?php echo $feed->id(); ?>"><?php echo $feed->name(); ?></option> <?php } ?> |