Lien pour ajouter des flux quand FreshRSS est vide

https://github.com/marienfressinaud/FreshRSS/issues/355
+ Correction bug cache thèmes du précédant patch
This commit is contained in:
Alexandre Alapetite
2014-01-13 23:31:07 +01:00
parent 693cd17cb8
commit fd26178d7c
8 changed files with 21 additions and 7 deletions

View File

@@ -117,7 +117,7 @@ class FreshRSS extends Minz_FrontController {
$theme = FreshRSS_Themes::load($this->conf->theme);
if ($theme) {
foreach($theme['files'] as $file) {
Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['id'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file)));
Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['id'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['id'] . '/' . $file)));
}
}

View File

@@ -157,7 +157,7 @@ return array (
'not_yet_implemented' => 'Not yet implemented',
'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
'no_selected_feed' => 'No feed selected.',
'think_to_add' => 'Think to add RSS feeds!',
'think_to_add' => '<a href="./?c=configure&amp;a=feed">Remember to add some RSS feeds!</a>',
'current_user' => 'Current user',
'default_user' => 'Username of the default user (maximum 16 alphanumeric characters)',
@@ -242,7 +242,7 @@ return array (
'before_yesterday' => 'Before yesterday',
'by_author' => 'By <em>%s</em>',
'related_tags' => 'Related tags',
'no_feed_to_display' => 'No feed to show.',
'no_feed_to_display' => 'There is no feed to show yet.',
'about_freshrss' => 'About FreshRSS',
'project_website' => 'Project website',

View File

@@ -157,7 +157,7 @@ return array (
'not_yet_implemented' => 'Pas encore implémenté',
'access_protected_feeds' => 'La connexion permet daccéder aux flux protégés par une authentification HTTP',
'no_selected_feed' => 'Aucun flux sélectionné.',
'think_to_add' => 'Pensez à en ajouter !',
'think_to_add' => '<a href="./?c=configure&amp;a=feed">Pensez à en ajouter !</a>',
'current_user' => 'Utilisateur actuel',
'password' =>'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
@@ -242,7 +242,7 @@ return array (
'before_yesterday' => 'À partir davant-hier',
'by_author' => 'Par <em>%s</em>',
'related_tags' => 'Tags associés',
'no_feed_to_display' => 'Il ny a aucun flux à afficher.',
'no_feed_to_display' => 'Il ny a aucun flux à afficher pour linstant.',
'about_freshrss' => 'À propos de FreshRSS',
'project_website' => 'Site du projet',

View File

@@ -217,5 +217,6 @@ if (!empty($this->entries)) {
<?php } else { ?>
<div id="stream" class="alert alert-warn normal">
<span class="alert-head"><?php echo Minz_Translate::t ('no_feed_to_display'); ?></span>
<?php echo Minz_Translate::t ('think_to_add'); ?>
</div>
<?php } ?>
<?php } ?>

View File

@@ -44,5 +44,6 @@ if (!empty($this->entries)) {
<?php } else { ?>
<div id="stream" class="alert alert-warn reader">
<span class="alert-head"><?php echo Minz_Translate::t ('no_feed_to_display'); ?></span>
<?php echo Minz_Translate::t ('think_to_add'); ?>
</div>
<?php } ?>
<?php } ?>

View File

@@ -464,6 +464,10 @@ input, select, textarea {
font-weight: bold;
font-size: 110%;
}
.alert > a {
color: inherit;
text-decoration: underline;
}
.alert-warn {
border: 1px solid #c95;
color: #c95;

View File

@@ -469,6 +469,10 @@ input, select, textarea {
font-weight: bold;
font-size: 110%;
}
.alert > a {
color: inherit;
text-decoration: underline;
}
.alert-warn {
background: #ffe;
border: 1px solid #eeb;

View File

@@ -477,6 +477,10 @@ input, select, textarea {
font-weight: bold;
font-size: 110%;
}
.alert > a {
color: inherit;
text-decoration: underline;
}
.alert-warn {
background: #ffe;
border: 1px solid #eeb;