diff options
| -rw-r--r-- | app/i18n/en.php | 8 | ||||
| -rw-r--r-- | app/i18n/fr.php | 8 | ||||
| -rw-r--r-- | app/views/configure/display.phtml | 28 | ||||
| -rw-r--r-- | app/views/configure/feed.phtml | 11 | ||||
| -rw-r--r-- | public/themes/flat-design/global.css | 8 |
5 files changed, 35 insertions, 28 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 8c87062f4..5bcc33be1 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -158,9 +158,9 @@ return array ( 'display_articles_unfolded' => 'Show articles unfolded by default', 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', 'auto_read_when' => 'Mark as read when', - 'article_selected' => 'Article is selected', - 'article_open_on_website' => 'Article is opened on its original website', - 'scroll' => 'Page scrolls', + 'article_selected' => 'article is selected', + 'article_open_on_website' => 'article is opened on its original website', + 'scroll' => 'page scrolls', 'your_shaarli' => 'Your Shaarli', 'sharing' => 'Sharing', 'share' => 'Share', @@ -168,7 +168,7 @@ return array ( 'on_shaarli' => 'On your Shaarli', 'optimize_bdd' => 'Optimize database', 'optimize_todo_sometimes' => 'To do occasionally to reduce size of database', - 'themes' => 'Themes', + 'theme' => 'Theme', 'article' => 'Article', 'title' => 'Title', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 73da583ed..4273c0b75 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -158,9 +158,9 @@ return array ( 'display_articles_unfolded' => 'Afficher les articles dépliés par défaut', 'img_with_lazyload' => 'Utiliser le mode "lazy load" pour charger les images', 'auto_read_when' => 'Marquer comme lu lorsque', - 'article_selected' => 'L\'article est sélectionné', - 'article_open_on_website' => 'L\'article est ouvert sur le site d\'origine', - 'scroll' => 'Au défilement de la page', + 'article_selected' => 'l\'article est sélectionné', + 'article_open_on_website' => 'l\'article est ouvert sur le site d\'origine', + 'scroll' => 'au défilement de la page', 'your_shaarli' => 'Votre Shaarli', 'sharing' => 'Partage', 'share' => 'Partager', @@ -168,7 +168,7 @@ return array ( 'on_shaarli' => 'Sur votre Shaarli', 'optimize_bdd' => 'Optimiser la base de données', 'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD', - 'themes' => 'Thèmes', + 'theme' => 'Thème', 'article' => 'Article', 'title' => 'Titre', diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 2516f2692..932425604 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -19,6 +19,19 @@ </div> <div class="form-group"> + <label class="group-name" for="theme"><?php echo Translate::t ('theme'); ?></label> + <div class="group-controls"> + <select name="theme" id="theme"> + <?php foreach ($this->themes as $theme) { ?> + <option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme () == $theme['path'] ? ' selected="selected"' : ''; ?>> + <?php echo $theme['name'] . ' ' . Translate::t ('by') . ' ' . $theme['author']; ?> + </option> + <?php } ?> + </select> + </div> + </div> + + <div class="form-group"> <label class="group-name" for="old_entries"><?php echo Translate::t ('delete_articles_every'); ?></label> <div class="group-controls"> <input type="number" id="old_entries" name="old_entries" value="<?php echo $this->conf->oldEntries (); ?>" /> <?php echo Translate::t ('month'); ?> @@ -41,19 +54,6 @@ <legend><?php echo Translate::t ('reading_configuration'); ?></legend> <div class="form-group"> - <label class="group-name" for="theme"><?php echo Translate::t ('themes'); ?></label> - <div class="group-controls"> - <select name="theme" id="theme"> - <?php foreach ($this->themes as $theme) { ?> - <option value="<?php echo $theme['path']; ?>"<?php echo $this->conf->theme () == $theme['path'] ? ' selected="selected"' : ''; ?>> - <?php echo $theme['name'] . ' ' . Translate::t ('by') . ' ' . $theme['author']; ?> - </option> - <?php } ?> - </select> - </div> - </div> - - <div class="form-group"> <label class="group-name" for="posts_per_page"><?php echo Translate::t ('articles_per_page'); ?></label> <div class="group-controls"> <input type="number" id="posts_per_page" name="posts_per_page" value="<?php echo $this->conf->postsPerPage (); ?>" /> @@ -71,7 +71,7 @@ </div> <div class="form-group"> - <label class="group-name"><?php echo Translate::t ('default_view'); ?></label> + <label class="group-name" for="view_mode"><?php echo Translate::t ('default_view'); ?></label> <div class="group-controls"> <select name="view_mode" id="view_mode"> <option value="normal"<?php echo $this->conf->viewMode () == 'normal' ? ' selected="selected"' : ''; ?>><?php echo Translate::t ('normal_view'); ?></option> diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index ec2ff3bdb..d2d978f54 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -46,16 +46,17 @@ </div> </div> - <legend><?php echo Translate::t ('category'); ?> - <a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a></legend> <div class="form-group"> - <label class="group-name"><?php echo Translate::t ('categorize'); ?></label> + <label class="group-name" for="category"><?php echo Translate::t ('category'); ?></label> <div class="group-controls"> + <select name="category" id="category"> <?php foreach ($this->categories as $cat) { ?> - <label class="radio" for="cat_<?php echo $cat->id (); ?>"> - <input type="radio" name="category" id="cat_<?php echo $cat->id (); ?>" value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == $this->flux->category () ? ' checked="checked"' : ''; ?> /> + <option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->flux->category () ? ' selected="selected"' : ''; ?>> <?php echo $cat->name (); ?> - </label> + </option> <?php } ?> + </select> + <a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a> </div> </div> diff --git a/public/themes/flat-design/global.css b/public/themes/flat-design/global.css index 8be9d38e0..8a00cb88c 100644 --- a/public/themes/flat-design/global.css +++ b/public/themes/flat-design/global.css @@ -98,9 +98,15 @@ input, select, textarea { } .form-group { - margin: 0; + margin: 5px 0; clear: both; + border: 1px solid transparent; } + .form-group:hover { + background: #fff; + border: 1px solid #eee; + border-radius: 3px; + } .form-group.form-actions { min-width: 250px; margin: 20px 0; |