aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-11 21:47:39 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-11 21:47:39 +0200
commit327b4ed3740db45ae0b52528f5f3fd73e3ec87df (patch)
tree849d5fb472b31e10e9e508036f2ed092e0b6deb6 /app
parentc00370659480d64e052aa09a7c326456e8fba91e (diff)
Séparation du style en deux fichiers pour faciliter la lecture et les mises à jour
Diffstat (limited to 'app')
-rw-r--r--app/App_FrontController.php3
-rwxr-xr-xapp/controllers/feedController.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index 8a5dcdcba..1ddbfd89c 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -33,7 +33,8 @@ class App_FrontController extends FrontController {
}
private function loadStylesAndScripts () {
- View::prependStyle (Url::display ('/theme/base.css'));
+ View::prependStyle (Url::display ('/theme/global.css'));
+ View::prependStyle (Url::display ('/theme/freshrss.css'));
View::appendScript ('https://login.persona.org/include.js');
View::appendScript (Url::display ('/scripts/jquery.js'));
View::appendScript (Url::display ('/scripts/notification.js'));
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index d2a2f29f5..3e6ae4800 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -132,7 +132,7 @@ class feedController extends ActionController {
// notif
$notif = array (
'type' => 'good',
- 'content' => '10 flux ont été mis à jour'
+ 'content' => $i . ' flux ont été mis à jour'
);
Session::_param ('notification', $notif);