diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-05-13 19:31:50 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-05-13 19:31:50 +0200 |
| commit | 708331200060eb2b43ac2150ae30e171699405fc (patch) | |
| tree | 9d8b8f0e9bed7aa8038a65e6a7cc353ec5f2d641 | |
| parent | 8ef32a10c6fd8e4ace44a5e797f6176f80b9560e (diff) | |
| parent | 717a37c6519c7fef1fbc07a0d56f9db4aaf0d1cd (diff) | |
Merge branch '491-homescreen' into dev
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 24 | ||||
| -rw-r--r-- | constants.php | 2 | ||||
| -rw-r--r-- | p/themes/icons/apple-touch-icon.png | bin | 0 -> 5648 bytes |
5 files changed, 18 insertions, 14 deletions
@@ -1,6 +1,6 @@ # Journal des modifications -## 2014-0x-xx FreshRSS 0.8 +## 2014-02-19 FreshRSS 0.7.1 * API compatible with Google Reader API level 2 * FreshRSS can now be used from e.g.: @@ -8,8 +8,8 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an * Site officiel : http://freshrss.org * Démo : http://demo.freshrss.org/ * Développeur : Marien Fressinaud <dev@marienfressinaud.fr> -* Version actuelle : 0.8-dev -* Date de publication 2014-0x-xx +* Version actuelle : 0.7.1 +* Date de publication 2014-02-19 * License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)  diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 63255b54f..c22288adb 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -3,18 +3,18 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="initial-scale=1.0" /> - <?php echo self::headTitle (); ?> - <?php echo self::headStyle (); ?> - <?php echo self::headScript (); ?> + <?php echo self::headTitle(); ?> + <?php echo self::headStyle(); ?> + <?php echo self::headScript(); ?> <script>//<![CDATA[ -<?php $this->renderHelper ('javascript_vars'); ?> +<?php $this->renderHelper('javascript_vars'); ?> //]]></script> <?php if (!empty($this->nextId)) { - $params = Minz_Request::params (); + $params = Minz_Request::params(); $params['next'] = $this->nextId; ?> - <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display (array ('c' => Minz_Request::controllerName (), 'a' => Minz_Request::actionName (), 'params' => $params)); ?>" /> + <link id="prefetch" rel="next prefetch" href="<?php echo Minz_Url::display(array('c' => Minz_Request::controllerName(), 'a' => Minz_Request::actionName(), 'params' => $params)); ?>" /> <?php } ?> <link rel="shortcut icon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" /> <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" /> @@ -23,26 +23,30 @@ $rss_url = $this->url; $rss_url['params']['output'] = 'rss'; ?> - <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display ($rss_url); ?>" /> + <link rel="alternate" type="application/rss+xml" title="<?php echo $this->rss_title; ?>" href="<?php echo Minz_Url::display($rss_url); ?>" /> <?php } ?> <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('starred', true); ?>"> <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('non-starred', true); ?>"> <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('read', true); ?>"> <link rel="prefetch" href="<?php echo FreshRSS_Themes::icon('unread', true); ?>"> + <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>"> + <meta name="apple-mobile-web-app-capable" content="yes" /> + <meta name="apple-mobile-web-app-status-bar-style" content="black" /> + <meta name="apple-mobile-web-app-title" content="<?php echo Minz_Configuration::title(); ?>"> <meta name="msapplication-TileColor" content="#FFF" /> <meta name="robots" content="noindex,nofollow" /> </head> <body class="<?php echo Minz_Request::param('output', 'normal'); ?>"> -<?php $this->partial ('header'); ?> +<?php $this->partial('header'); ?> <div id="global"> - <?php $this->render (); ?> + <?php $this->render(); ?> </div> <?php $msg = ''; $status = 'closed'; - if (isset ($this->notification)) { + if (isset($this->notification)) { $msg = $this->notification['content']; $status = $this->notification['type']; diff --git a/constants.php b/constants.php index e32b8cbc3..849a5ada3 100644 --- a/constants.php +++ b/constants.php @@ -1,5 +1,5 @@ <?php -define('FRESHRSS_VERSION', '0.8-dev'); +define('FRESHRSS_VERSION', '0.7.1'); define('FRESHRSS_WEBSITE', 'http://freshrss.org'); // PHP text output compression http://php.net/ob_gzhandler (better to do it at Web server level) diff --git a/p/themes/icons/apple-touch-icon.png b/p/themes/icons/apple-touch-icon.png Binary files differnew file mode 100644 index 000000000..0bbab07ea --- /dev/null +++ b/p/themes/icons/apple-touch-icon.png |
