Code factoring ・ 6e0bf19 ・ Gitprep

- Code factoring;
- Browse files
- ycawidro commited on 2018-01-18
- 1 parent a3d091d
  
  commit 6e0bf19177febca2794535fc7a1698ac13b65f86

Showing 11 changed files with 46 additions and 393 deletions

+4 -5

includes/vicefr.php → includes/display.php

@@ -1,6 +1,5 @@
 <?php
-
-function DisplayNewsViceFr(){
+function DisplayNews($title,$source,$rss){
 
   $status = new StatusMessages();
   ?>
@@ -16,7 +15,7 @@ function DisplayNewsViceFr(){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Vice.fr   </div>
+      <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> <?php echo $title; ?></div>
           <div class="panel-body">
             <p><?php $status->showMessages(); ?></p>
             <div class="row">
@@ -24,7 +23,7 @@ function DisplayNewsViceFr(){
             <div class="panel panel-default">
             <div class="panel-body">
             <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_VICEFR);
+              $articles = file_get_contents($source);
               echo $articles;
             ?>
             </div><!-- ./panel-body -->
@@ -32,7 +31,7 @@ function DisplayNewsViceFr(){
             </div><!-- ./col-md-6 -->
             </div> <!-- /row -->
           </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_VICEFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_VICEFR; ?></a></div>
+        <div class="panel-footer"><a href="<?php echo $rss; ?>"><i class="fa fa-rss"></i> <?php echo $rss; ?></a></div>
       </div><!-- /.panel-default -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->

-41

includes/huffingtonpostfr.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsHuffingtonPostFr(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> HuffingtonPost.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_HUFFINGTONPOSTFR);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_HUFFINGTONPOSTFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_HUFFINGTONPOSTFR; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/lemonde.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsLeMonde(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LeMonde.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_LEMONDE);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEMONDE; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEMONDE; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/lepointfr.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsLePointFr(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LePoint.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_LEPOINTFR);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEPOINTFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEPOINTFR; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/lesinrocks.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsLesInrocks(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LesInrocks.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_LESINROCKS);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_LESINROCKS; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LESINROCKS; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/lexpressfr.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsLExpressFr(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> L'Express.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_LEXPRESSFR);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEXPRESSFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEXPRESSFR; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/liberation.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsLiberation(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Liberation.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_LIBERATION);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_LIBERATION; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LIBERATION; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/numerama.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsNumerama(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Numerama   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_NUMERAMA);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_NUMERAMA; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_NUMERAMA; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

-41

includes/slatefr.php

View

@@ -1,41 +0,0 @@
-<?php
-function DisplayNewsSlateFr(){
-
-  $status = new StatusMessages();
-  ?>
-  <script>
-  function onArticle(index) {
-    var string_index = "article-"+index;
-    var url = location.href;
-    document.getElementById("article-current").innerHTML =
-      document.getElementById(string_index).innerHTML;
-    location.href = "#article-top";
-  }
-  </script>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Slate.fr   </div>
-          <div class="panel-body">
-            <p><?php $status->showMessages(); ?></p>
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
-            <div class="panel-body">
-            <?php
-              $articles = file_get_contents(SRC_NEWS_RSS_SLATEFR);
-              echo $articles;
-            ?>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="<?php echo NEWS_RSS_SLATEFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_SLATEFR; ?></a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
-  <?php
-}
-
-?>

+15 -60

index.php

View

@@ -4,16 +4,8 @@ include_once( 'sources/rss.php' );
 include_once( 'includes/functions.php' );
 include_once( 'includes/status_messages.php' );
 include_once( 'includes/themes.php' );
-include_once( 'includes/lemonde.php' );
-include_once( 'includes/liberation.php' );
-include_once( 'includes/slatefr.php' );
-include_once( 'includes/vicefr.php' );
-include_once( 'includes/lesinrocks.php' );
-include_once( 'includes/numerama.php' );
-include_once( 'includes/huffingtonpostfr.php' );
-include_once( 'includes/lepointfr.php' );
-include_once( 'includes/lexpressfr.php' );
 include_once( 'includes/default.php' );
+include_once( 'includes/display.php' );
 
 $output = $return = 0;
 $page = "";
@@ -83,15 +75,11 @@ $theme_url = 'dist/css/' . $theme;
         <div class="navbar-default sidebar" role="navigation">
           <div class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
-              <li><a href="index.php?page=lemonde"><i class="fa fa-newspaper-o fa-fw"></i> Le Monde</a></li>
-              <li><a href="index.php?page=liberation"><i class="fa fa-newspaper-o fa-fw"></i> Liberation</a></li>
-              <li><a href="index.php?page=slatefr"><i class="fa fa-newspaper-o fa-fw"></i> Slate.fr</a></li>
-              <li><a href="index.php?page=numerama"><i class="fa fa-newspaper-o fa-fw"></i> Numerama</a></li>
-              <li><a href="index.php?page=huffingtonpostfr"><i class="fa fa-newspaper-o fa-fw"></i> HuffingtonPost.fr</a></li>
-              <li><a href="index.php?page=lepointfr"><i class="fa fa-newspaper-o fa-fw"></i> LePoint.fr</a></li>
-              <li><a href="index.php?page=lexpressfr"><i class="fa fa-newspaper-o fa-fw"></i> L'Express.fr</a></li>
-              <li><a href="index.php?page=vicefr"><i class="fa fa-newspaper-o fa-fw"></i> Vice.fr</a></li>
-              <li><a href="index.php?page=lesinrocks"><i class="fa fa-newspaper-o fa-fw"></i> LesInrocks.fr</a></li>
+            <?php
+            foreach ($array_title as $key => $title) {
+              echo "<li><a href=\"index.php?page=$key\"><i class=\"fa fa-newspaper-o fa-fw\"></i> $title</a></li>\n";
+            }
+            ?>
             </ul>
           </div><!-- /.navbar-collapse -->
         </div><!-- /.navbar-default -->
@@ -100,47 +88,18 @@ $theme_url = 'dist/css/' . $theme;
       <div id="page-wrapper">
 
         <!-- Page Heading -->
-<!--
-        <div class="row">
-          <div class="col-lg-12">
-            <h1 class="page-header">
-              <i class="fa fa-newspaper-o fa-fw"></i>News.fr
-            </h1>
-          </div>
-        </div><!-- /.row -->
         <?php 
-        // handle page actions
-        switch( $page ) {
-          case "lemonde":
-            DisplayNewsLeMonde();
+        $page_found=false;
+        foreach ($array_title as $key => $title) {
+          if( 0 == strcmp( $key, $page ) ) {
+            $page_found=true;
+            DisplayNews($title,"sources/".$key.".html",$array_url[$key]);
             break;
-          case "liberation":
-            DisplayNewsLiberation();
-            break;
-          case "slatefr":
-            DisplayNewsSlateFr();
-            break;
-          case "vicefr":
-            DisplayNewsViceFr();
-            break;
-          case "lesinrocks":
-            DisplayNewsLesInrocks();
-            break;
-          case "numerama":
-            DisplayNewsNumerama();
-            break;
-          case "huffingtonpostfr":
-            DisplayNewsHuffingtonPostFr();
-            break;
-          case "lepointfr":
-            DisplayNewsLePointFr();
-            break;
-          case "lexpressfr":
-            DisplayNewsLExpressFr();
-            break;
-          default:
-            DisplayNewsDefault();
+          }
         }
+        if( false == $page_found ) {
+          DisplayNewsDefault();
+        } 
         ?>
       </div><!-- /#page-wrapper --> 
     </div><!-- /#wrapper -->
@@ -157,10 +116,6 @@ $theme_url = 'dist/css/' . $theme;
     <!-- Metis Menu Plugin JavaScript -->
     <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
 
-    <!-- Morris Charts JavaScript -->
-    <!--script src="bower_components/raphael/raphael-min.js"></script-->
-    <!--script src="bower_components/morrisjs/morris.min.js"></script-->
-    <!--script src="js/morris-data.js"></script-->
 
     <!-- Custom Theme JavaScript -->
     <script src="dist/js/sb-admin-2.js"></script>

+27

sources/rss.php

View

...	...	@@ -8,6 +8,7 @@ define('NEWS_RSS_NUMERAMA', 'https://www.numerama.com/rss/news.rss');
8	8	define('NEWS_RSS_HUFFINGTONPOSTFR', 'https://www.huffingtonpost.fr/feeds/index.xml');
9	9	define('NEWS_RSS_LEPOINTFR', 'http://www.lepoint.fr/24h-infos/rss.xml');
10	10	define('NEWS_RSS_LEXPRESSFR', 'https://www.lexpress.fr/rss/alaune.xml');
	11	+define('NEWS_RSS_BUZZFEEDFR', 'https://www.buzzfeed.com/index.xml?country=fr');
11	12
12	13	define('SRC_NEWS_RSS_LEMONDE', 'sources/lemonde.html');
13	14	define('SRC_NEWS_RSS_LIBERATION', 'sources/liberation.html');
...	...	@@ -18,4 +19,30 @@ define('SRC_NEWS_RSS_NUMERAMA', 'sources/numerama.html');
18	19	define('SRC_NEWS_RSS_HUFFINGTONPOSTFR', 'sources/huffingtonpostfr.html');
19	20	define('SRC_NEWS_RSS_LEPOINTFR', 'sources/lepointfr.html');
20	21	define('SRC_NEWS_RSS_LEXPRESSFR', 'sources/lexpressfr.html');
	22	+define('SRC_NEWS_RSS_BUZZFEEDFR', 'sources/buzzfeedfr.html');
	23	+
	24	+$array_title=array(
	25	+ "lemonde" => "LeMonde.fr",
	26	+ "liberation" => "Liberation.fr",
	27	+ "slatefr" => "Slate.fr",
	28	+ "numerama" => "Numerama",
	29	+ "huffingtonpostfr" => "HuffingtonPost.fr",
	30	+ "lepointfr" => "LePoint.fr",
	31	+ "lexpressfr" => "L'Express.fr",
	32	+ "vicefr" => "Vice.fr",
	33	+ "buzzfeedfr" => "Buzzfeed.com fr",
	34	+ "lesinrocks" => "LesInrocks.fr"
	35	+);
	36	+$array_url=array(
	37	+ "lemonde" => NEWS_RSS_LEMONDE,
	38	+ "liberation" => NEWS_RSS_LIBERATION,
	39	+ "slatefr" => NEWS_RSS_SLATEFR,
	40	+ "numerama" => NEWS_RSS_NUMERAMA,
	41	+ "huffingtonpostfr" => NEWS_RSS_HUFFINGTONPOSTFR,
	42	+ "lepointfr" => NEWS_RSS_LEPOINTFR,
	43	+ "lexpressfr" => NEWS_RSS_LEXPRESSFR,
	44	+ "vicefr" => NEWS_RSS_VICEFR,
	45	+ "buzzfeedfr" => NEWS_RSS_BUZZFEEDFR,
	46	+ "lesinrocks" => NEWS_RSS_LESINROCKS
	47	+);
21	48	?>

...	...	@@ -1,6 +1,5 @@
1	1	<?php
2		-
3		-function DisplayNewsViceFr(){
	2	+function DisplayNews($title,$source,$rss){
4	3
5	4	$status = new StatusMessages();
6	5	?>
...	...	@@ -16,7 +15,7 @@ function DisplayNewsViceFr(){
16	15	<div class="row">
17	16	<div class="col-lg-12">
18	17	<div class="panel panel-primary">
19		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Vice.fr </div>
	18	+ <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> <?php echo $title; ?></div>
20	19	<div class="panel-body">
21	20	<p><?php $status->showMessages(); ?></p>
22	21	<div class="row">
...	...	@@ -24,7 +23,7 @@ function DisplayNewsViceFr(){
24	23	<div class="panel panel-default">
25	24	<div class="panel-body">
26	25	<?php
27		- $articles = file_get_contents(SRC_NEWS_RSS_VICEFR);
	26	+ $articles = file_get_contents($source);
28	27	echo $articles;
29	28	?>
30	29	</div><!-- ./panel-body -->
...	...	@@ -32,7 +31,7 @@ function DisplayNewsViceFr(){
32	31	</div><!-- ./col-md-6 -->
33	32	</div> <!-- /row -->
34	33	</div><!-- /.panel-body -->
35		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_VICEFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_VICEFR; ?></a></div>
	34	+ <div class="panel-footer"><a href="<?php echo $rss; ?>"><i class="fa fa-rss"></i> <?php echo $rss; ?></a></div>
36	35	</div><!-- /.panel-default -->
37	36	</div><!-- /.col-lg-12 -->
38	37	</div><!-- /.row -->

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsHuffingtonPostFr(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> HuffingtonPost.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_HUFFINGTONPOSTFR);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_HUFFINGTONPOSTFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_HUFFINGTONPOSTFR; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsLeMonde(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LeMonde.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_LEMONDE);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEMONDE; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEMONDE; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsLePointFr(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LePoint.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_LEPOINTFR);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEPOINTFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEPOINTFR; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsLesInrocks(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> LesInrocks.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_LESINROCKS);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_LESINROCKS; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LESINROCKS; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsLExpressFr(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> L'Express.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_LEXPRESSFR);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_LEXPRESSFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LEXPRESSFR; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsLiberation(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Liberation.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_LIBERATION);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_LIBERATION; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_LIBERATION; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsNumerama(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Numerama </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_NUMERAMA);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_NUMERAMA; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_NUMERAMA; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -1,41 +0,0 @@
1		-<?php
2		-function DisplayNewsSlateFr(){
3		-
4		- $status = new StatusMessages();
5		- ?>
6		- <script>
7		- function onArticle(index) {
8		- var string_index = "article-"+index;
9		- var url = location.href;
10		- document.getElementById("article-current").innerHTML =
11		- document.getElementById(string_index).innerHTML;
12		- location.href = "#article-top";
13		- }
14		- </script>
15		- <div class="row">
16		- <div class="col-lg-12">
17		- <div class="panel panel-primary">
18		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> Slate.fr </div>
19		- <div class="panel-body">
20		- <p><?php $status->showMessages(); ?></p>
21		- <div class="row">
22		- <div class="col-md-6">
23		- <div class="panel panel-default">
24		- <div class="panel-body">
25		- <?php
26		- $articles = file_get_contents(SRC_NEWS_RSS_SLATEFR);
27		- echo $articles;
28		- ?>
29		- </div><!-- ./panel-body -->
30		- </div><!-- ./panel panel-default -->
31		- </div><!-- ./col-md-6 -->
32		- </div> <!-- /row -->
33		- </div><!-- /.panel-body -->
34		- <div class="panel-footer"><a href="<?php echo NEWS_RSS_SLATEFR; ?>"><i class="fa fa-rss"></i> <?php echo NEWS_RSS_SLATEFR; ?></a></div>
35		- </div><!-- /.panel-default -->
36		- </div><!-- /.col-lg-12 -->
37		- </div><!-- /.row -->
38		- <?php
39		-}
40		-
41		-?>

...	...	@@ -4,16 +4,8 @@ include_once( 'sources/rss.php' );
4	4	include_once( 'includes/functions.php' );
5	5	include_once( 'includes/status_messages.php' );
6	6	include_once( 'includes/themes.php' );
7		-include_once( 'includes/lemonde.php' );
8		-include_once( 'includes/liberation.php' );
9		-include_once( 'includes/slatefr.php' );
10		-include_once( 'includes/vicefr.php' );
11		-include_once( 'includes/lesinrocks.php' );
12		-include_once( 'includes/numerama.php' );
13		-include_once( 'includes/huffingtonpostfr.php' );
14		-include_once( 'includes/lepointfr.php' );
15		-include_once( 'includes/lexpressfr.php' );
16	7	include_once( 'includes/default.php' );
	8	+include_once( 'includes/display.php' );
17	9
18	10	$output = $return = 0;
19	11	$page = "";
...	...	@@ -83,15 +75,11 @@ $theme_url = 'dist/css/' . $theme;
83	75	<div class="navbar-default sidebar" role="navigation">
84	76	<div class="sidebar-nav navbar-collapse">
85	77	<ul class="nav" id="side-menu">
86		- <li><a href="index.php?page=lemonde"><i class="fa fa-newspaper-o fa-fw"></i> Le Monde</a></li>
87		- <li><a href="index.php?page=liberation"><i class="fa fa-newspaper-o fa-fw"></i> Liberation</a></li>
88		- <li><a href="index.php?page=slatefr"><i class="fa fa-newspaper-o fa-fw"></i> Slate.fr</a></li>
89		- <li><a href="index.php?page=numerama"><i class="fa fa-newspaper-o fa-fw"></i> Numerama</a></li>
90		- <li><a href="index.php?page=huffingtonpostfr"><i class="fa fa-newspaper-o fa-fw"></i> HuffingtonPost.fr</a></li>
91		- <li><a href="index.php?page=lepointfr"><i class="fa fa-newspaper-o fa-fw"></i> LePoint.fr</a></li>
92		- <li><a href="index.php?page=lexpressfr"><i class="fa fa-newspaper-o fa-fw"></i> L'Express.fr</a></li>
93		- <li><a href="index.php?page=vicefr"><i class="fa fa-newspaper-o fa-fw"></i> Vice.fr</a></li>
94		- <li><a href="index.php?page=lesinrocks"><i class="fa fa-newspaper-o fa-fw"></i> LesInrocks.fr</a></li>
	78	+ <?php
	79	+ foreach ($array_title as $key => $title) {
	80	+ echo "<li><a href=\"index.php?page=$key\"><i class=\"fa fa-newspaper-o fa-fw\"></i> $title</a></li>\n";
	81	+ }
	82	+ ?>
95	83	</ul>
96	84	</div><!-- /.navbar-collapse -->
97	85	</div><!-- /.navbar-default -->
...	...	@@ -100,47 +88,18 @@ $theme_url = 'dist/css/' . $theme;
100	88	<div id="page-wrapper">
101	89
102	90	<!-- Page Heading -->
103		-<!--
104		- <div class="row">
105		- <div class="col-lg-12">
106		- <h1 class="page-header">
107		- <i class="fa fa-newspaper-o fa-fw"></i>News.fr
108		- </h1>
109		- </div>
110		- </div><!-- /.row -->
111	91	<?php
112		- // handle page actions
113		- switch( $page ) {
114		- case "lemonde":
115		- DisplayNewsLeMonde();
	92	+ $page_found=false;
	93	+ foreach ($array_title as $key => $title) {
	94	+ if( 0 == strcmp( $key, $page ) ) {
	95	+ $page_found=true;
	96	+ DisplayNews($title,"sources/".$key.".html",$array_url[$key]);
116	97	break;
117		- case "liberation":
118		- DisplayNewsLiberation();
119		- break;
120		- case "slatefr":
121		- DisplayNewsSlateFr();
122		- break;
123		- case "vicefr":
124		- DisplayNewsViceFr();
125		- break;
126		- case "lesinrocks":
127		- DisplayNewsLesInrocks();
128		- break;
129		- case "numerama":
130		- DisplayNewsNumerama();
131		- break;
132		- case "huffingtonpostfr":
133		- DisplayNewsHuffingtonPostFr();
134		- break;
135		- case "lepointfr":
136		- DisplayNewsLePointFr();
137		- break;
138		- case "lexpressfr":
139		- DisplayNewsLExpressFr();
140		- break;
141		- default:
142		- DisplayNewsDefault();
	98	+ }
143	99	}
	100	+ if( false == $page_found ) {
	101	+ DisplayNewsDefault();
	102	+ }
144	103	?>
145	104	</div><!-- /#page-wrapper -->
146	105	</div><!-- /#wrapper -->
...	...	@@ -157,10 +116,6 @@ $theme_url = 'dist/css/' . $theme;
157	116	<!-- Metis Menu Plugin JavaScript -->
158	117	<script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
159	118
160		- <!-- Morris Charts JavaScript -->
161		- <!--script src="bower_components/raphael/raphael-min.js"></script-->
162		- <!--script src="bower_components/morrisjs/morris.min.js"></script-->
163		- <!--script src="js/morris-data.js"></script-->
164	119
165	120	<!-- Custom Theme JavaScript -->
166	121	<script src="dist/js/sb-admin-2.js"></script>