mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-07 14:43:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Organisation page configuration (issue #97)

Browse Source 
Réorganisation de quelques options, mise en évidence des groupes
d'option
Changement des flux de catégorie via <select /> et non plus via liste de
<radio />
This commit is contained in:
Marien Fressinaud
2013-08-18 15:36:58 +02:00
parent 37b641966f
commit 2c764af215
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/i18n/en.php
View File

@@ -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',

8
app/i18n/fr.php
View File

@@ -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',

28
app/views/configure/display.phtml
View File

@@ -18,6 +18,19 @@
</div>
</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">
@@ -40,19 +53,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">
@@ -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>

11
app/views/configure/feed.phtml
View File

@@ -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>

8
public/themes/flat-design/global.css
View File

@@ -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;