Browse Source

Merge branch '491-homescreen' into dev

Marien Fressinaud 12 years ago
parent
commit
7083312000
5 changed files with 18 additions and 14 deletions
  1. 1 1
      CHANGELOG
  2. 2 2
      README.md
  3. 14 10
      app/layout/layout.phtml
  4. 1 1
      constants.php
  5. BIN
      p/themes/icons/apple-touch-icon.png

+ 1 - 1
CHANGELOG

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

+ 2 - 2
README.md

@@ -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)
 
 ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)

+ 14 - 10
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'];
 

+ 1 - 1
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)

BIN
p/themes/icons/apple-touch-icon.png