Skip to content

Commit

Permalink
Fixed asset for mamie fox, Pascal's feedback on links/typos, trying t…
Browse files Browse the repository at this point in the history
…o fix page sharing via FB
  • Loading branch information
TheoChevalier committed Oct 27, 2014
1 parent e761b65 commit a2409e8
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion classes/FirefoxOSfr/Cache.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace FirefoxOSfr;

/* Cache class comming from Transvision project: https://github.com/mozfr/transvision */
/* Cache class coming from Transvision project: https://github.com/mozfr/transvision */

/**
* Cache class
Expand Down
10 changes: 9 additions & 1 deletion classes/FirefoxOSfr/TileTwitter.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,15 @@ public function __construct($pathToConf) {
}
}

public function getTweetWritenBy($idAccountToFollow, $numberOfTweet, $screenNameToFollow) {
/**
* Uses Twitter API to fetch one or several tweets from a given Twitter account
* @param $idAccountToFollow Integer, Twitter account ID
* @param $numberOfTweet Integer, number of tweet (text, scren name, name) you need
* @param $numberOfTweet String, the screen name of the account (e.g. Firefox OS FR)
* @return Array of tweet ID containing another array which contains the text of the tweet,
* the screen name and the account name (e.g. firefoxosfr).
*/
public function getTweetWrittenBy($idAccountToFollow, $numberOfTweet, $screenNameToFollow) {

$cache_id = 'twitter' . $idAccountToFollow . $numberOfTweet;
if (! $tweets = Cache::getKey($cache_id)) {
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"require" : {
"facebook/php-sdk-v4" : "4.0.*",
"ricardoper/twitteroauth": "1.*"
"ricardoper/twitteroauth": "1.*",
"monolog/monolog" : "1.10.0"
},
"autoload": {
"psr-0": {"FirefoxOSfr": "classes/"}
Expand Down
2 changes: 1 addition & 1 deletion web/includes/body.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
</li>
<li id="promo-6" class="item promo-large-landscape mamie-fox" tabindex="0" data-name="Mamie fox">
<img class="primary go" src="media/img/mamie-fox.png" alt="Mamie fox">
<img class="primary go" src="media/img/mamie-fox.png?27-10-2014" alt="Mamie fox">
<h2 class="primary go">Mamie fox</h2>
<a class="panel-link" href="#">
<div class="secondary">
Expand Down
12 changes: 6 additions & 6 deletions web/includes/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
<meta name="description" content="Site de présentation de Firefox OS, maintenu par la communauté Mozilla francophone.">
<meta property="og:type" content="website">
<meta property="og:site_name" content="Firefox OS en français">
<meta property="og:locale" content="fr">
<meta property="og:locale" content="fr_FR">
<meta property="og:url" content="http://firefoxos.mozfr.org/">
<meta property="og:image" content="http://firefoxos.mozfr.org/media/img/firefox-os256.png">
<meta property="og:image" content="/media/img/firefox-os256.png">
<meta property="og:title" content="Firefox OS en français">
<meta property="og:description" content="Site de présentation de Firefox OS, maintenu par la communauté Mozilla francophone.">
<meta property="fb:page_id" content="571893379557863">
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@firefoxosfr">
<meta name="twitter:domain" content="firefoxos.mozfr.org">
<link rel="shortcut icon" href="./media/img/favicon128.png">
<link rel="apple-touch-icon" type="image/png" sizes="128x128" href="./media/img/favicon128.png">
<link rel="icon" type="image/png" sizes="128x128" href="./media/img/favicon128.png">
<link rel="shortcut icon" href="/media/img/favicon128.png">
<link rel="apple-touch-icon" type="image/png" sizes="128x128" href="/media/img/favicon128.png">
<link rel="icon" type="image/png" sizes="128x128" href="/media/img/favicon128.png">
<link rel="canonical" hreflang="fr" href="http://firefoxos.mozfr.org/">
<link rel="stylesheet" media="screen,projection,tv" href="css/responsive-min.css">
<link rel="stylesheet" media="screen,projection,tv" href="css/home-2015-min.css">
<link rel="stylesheet" media="screen,projection,tv" href="css/main.css">
<link rel="shortcut icon" href="./media/img/favicon.ico?v=3">
<link rel="shortcut icon" href="/media/img/favicon.ico?v=3">
<script src="media/js/site-min.js"></script>
<!-- Async player loading -->
<script src="media/js/player.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion web/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$fb_res = $fb->getLatestStatus();

$twitter = new TileTwitter('../config/config.ini');
$tweet = $twitter->getTweetWritenBy(2228736763, 1, 'firefoxosfr');
$tweet = $twitter->getTweetWrittenBy(2228736763, 1, 'firefoxosfr');
$tweet_id = array_keys($tweet)[0];
$tweet_text = $tweet[$tweet_id]['text'];

Expand Down
Binary file modified web/media/img/mamie-fox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a2409e8

Please sign in to comment.