|
|
@@ -43,6 +43,12 @@ class App_FrontController extends FrontController {
|
|
|
$this->conf = Session::param ('conf', new RSSConfiguration ());
|
|
|
View::_param ('conf', $this->conf);
|
|
|
Session::_param ('language', $this->conf->language ());
|
|
|
+
|
|
|
+ $output = Request::param ('output');
|
|
|
+ if(!$output) {
|
|
|
+ $output = $this->conf->viewMode();
|
|
|
+ Request::_param ('output', $output);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
private function loadStylesAndScripts () {
|
|
|
@@ -53,11 +59,13 @@ class App_FrontController extends FrontController {
|
|
|
}
|
|
|
}
|
|
|
View::appendStyle (Url::display ('/themes/printer/style.css?' . @filemtime(PUBLIC_PATH . '/themes/printer/style.css')), 'print');
|
|
|
+
|
|
|
if (login_is_conf ($this->conf)) {
|
|
|
View::appendScript ('https://login.persona.org/include.js');
|
|
|
}
|
|
|
View::appendScript (Url::display ('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js')));
|
|
|
- if ($this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) {
|
|
|
+ if ($this->conf->lazyload () === 'yes' &&
|
|
|
+ ($this->conf->displayPosts () === 'yes' || Request::param ('output') === 'reader')) {
|
|
|
View::appendScript (Url::display ('/scripts/jquery.lazyload.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.lazyload.min.js')));
|
|
|
}
|
|
|
View::appendScript (Url::display ('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
|