Code Indentation ・ de8b6b9 ・ Gitprep

- Code Indentation;
- Browse files
- ycawidro commited on 2018-04-25
- 1 parent 5fc0919
  
  commit de8b6b9ed709c6bf41dd3170819defe0efbfd141

Showing 2 changed files with 47 additions and 48 deletions

+28 -28

includes/default.php

@@ -2,43 +2,43 @@
 function DisplayNewsDefault(){
 
   ?>
-  <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> News.fr   </div>
-          <div class="panel-body">
-            <div class="row">
-            <div class="col-md-6">
-            <div class="panel panel-default">
+      <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> News.fr   </div>
             <div class="panel-body">
-            <p><b>FR</b> Interface web responsive simple pour consulter les flux RSS de diff&eacute;rents sites d'informations fran&ccedil;ais.
-            Le canevas original vient de <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
-            <p><b>EN</b> A simple, responsive web interface to see french newspaper feeds.
-            The original responsive template is from <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
-            <h2><i class="fa fa-rss" aria-hidden="true"></i> RSS</h2>
-            <ul>
-            <?php
+              <div class="row">
+                <div class="col-md-6">
+                  <div class="panel panel-default">
+                    <div class="panel-body">
+                      <p>Interface web responsive simple pour consulter les flux RSS de diff&eacute;rents sites d'informations fran&ccedil;ais.
+                      Le canevas original vient de <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
+                      <h2><i class="fa fa-rss" aria-hidden="true"></i> RSS</h2>
+                      <ul>
+<?php
             $location="sources/rss.php";
             exec('awk -F"\'" \'{print $(NF-1)}\' '.$location.'|grep "http"', $contents, $return);
             $cpt=0;
             foreach( $contents as $content ) {
+              echo "\t\t\t\t\t\t";
               echo '<li><a href="'.$content.'" target="feed-'.$cpt.'">'.$content.'</a></li>';
+              echo "\n";
               $cpt++;
             }
-            ?>
-            </ul>
+?>
+                      </ul>
 
-            <h2>License</h2>
-            <p>GPLv3 <a href="https://git.kawi.fr/ycawidro/news/blob/master/LICENSE" target="license"><strong>LICENSE</strong></a></p>
-            </div><!-- ./panel-body -->
-            </div><!-- ./panel panel-default -->
-            </div><!-- ./col-md-6 -->
-            </div> <!-- /row -->
-          </div><!-- /.panel-body -->
-        <div class="panel-footer"><a href="https://git.kawi.fr/ycawidro/news" target="git">https://git.kawi.fr/ycawidro/news</a></div>
-      </div><!-- /.panel-default -->
-    </div><!-- /.col-lg-12 -->
-  </div><!-- /.row -->
+                      <h2>License</h2>
+                      <p>GPLv3 <a href="https://git.kawi.fr/ycawidro/news/blob/master/LICENSE" target="license"><strong>LICENSE</strong></a></p>
+                    </div><!-- ./panel-body -->
+                  </div><!-- ./panel panel-default -->
+                </div><!-- ./col-md-6 -->
+              </div> <!-- /row -->
+            </div><!-- /.panel-body -->
+            <div class="panel-footer"><a href="https://git.kawi.fr/ycawidro/news" target="git">https://git.kawi.fr/ycawidro/news</a></div>
+          </div><!-- /.panel-default -->
+        </div><!-- /.col-lg-12 -->
+      </div><!-- /.row -->
   <?php
 }
 

+19 -20

index.php

View

@@ -15,7 +15,6 @@ if( isset($_GET['page'])) {
 $theme = 'hackernews.css';
 $theme_url = 'dist/css/' . $theme;
 ?>
-
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -76,11 +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">
-            <?php
+<?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";
+              echo "\t\t\t\t<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 -->
@@ -88,8 +87,8 @@ $theme_url = 'dist/css/' . $theme;
 
       <div id="page-wrapper">
 
-        <!-- Page Heading -->
-        <?php 
+      <!-- Page Heading -->
+<?php 
         $page_found=false;
         foreach ($array_title as $key => $title) {
           if( 0 == strcmp( $key, $page ) ) {
@@ -101,24 +100,24 @@ $theme_url = 'dist/css/' . $theme;
         if( false == $page_found ) {
           DisplayNewsDefault();
         } 
-        ?>
-      </div><!-- /#page-wrapper --> 
-    </div><!-- /#wrapper -->
-
-    <!-- RaspAP JavaScript -->
-    <script src="dist/js/functions.js"></script>
+?>
+    
+    </div><!-- /#page-wrapper --> 
+  </div><!-- /#wrapper -->
 
-    <!-- jQuery -->
-    <script src="bower_components/jquery/dist/jquery.min.js"></script>
+  <!-- RaspAP JavaScript -->
+  <script src="dist/js/functions.js"></script>
 
-    <!-- Bootstrap Core JavaScript -->
-    <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+  <!-- jQuery -->
+  <script src="bower_components/jquery/dist/jquery.min.js"></script>
 
-    <!-- Metis Menu Plugin JavaScript -->
-    <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
+  <!-- Bootstrap Core JavaScript -->
+  <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 
+  <!-- Metis Menu Plugin JavaScript -->
+  <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
 
-    <!-- Custom Theme JavaScript -->
-    <script src="dist/js/sb-admin-2.js"></script>
+  <!-- Custom Theme JavaScript -->
+  <script src="dist/js/sb-admin-2.js"></script>
   </body>
 </html>

...	...	@@ -2,43 +2,43 @@
2	2	function DisplayNewsDefault(){
3	3
4	4	?>
5		- <div class="row">
6		- <div class="col-lg-12">
7		- <div class="panel panel-primary">
8		- <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> News.fr </div>
9		- <div class="panel-body">
10		- <div class="row">
11		- <div class="col-md-6">
12		- <div class="panel panel-default">
	5	+ <div class="row">
	6	+ <div class="col-lg-12">
	7	+ <div class="panel panel-primary">
	8	+ <div class="panel-heading"><i class="fa fa-newspaper-o fa-fw"></i> News.fr </div>
13	9	<div class="panel-body">
14		- <p><b>FR</b> Interface web responsive simple pour consulter les flux RSS de différents sites d'informations français.
15		- Le canevas original vient de <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
16		- <p><b>EN</b> A simple, responsive web interface to see french newspaper feeds.
17		- The original responsive template is from <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
18		- <h2><i class="fa fa-rss" aria-hidden="true"></i> RSS</h2>
19		- <ul>
20		- <?php
	10	+ <div class="row">
	11	+ <div class="col-md-6">
	12	+ <div class="panel panel-default">
	13	+ <div class="panel-body">
	14	+ <p>Interface web responsive simple pour consulter les flux RSS de différents sites d'informations français.
	15	+ Le canevas original vient de <a href="https://github.com/billz/raspap-webgui"><strong>raspap-webgui</strong></a></p>
	16	+ <h2><i class="fa fa-rss" aria-hidden="true"></i> RSS</h2>
	17	+ <ul>
	18	+<?php
21	19	$location="sources/rss.php";
22	20	exec('awk -F"\'" \'{print $(NF-1)}\' '.$location.'\|grep "http"', $contents, $return);
23	21	$cpt=0;
24	22	foreach( $contents as $content ) {
	23	+ echo "\t\t\t\t\t\t";
25	24	echo '<li><a href="'.$content.'" target="feed-'.$cpt.'">'.$content.'</a></li>';
	25	+ echo "\n";
26	26	$cpt++;
27	27	}
28		- ?>
29		- </ul>
	28	+?>
	29	+ </ul>
30	30
31		- <h2>License</h2>
32		- <p>GPLv3 <a href="https://git.kawi.fr/ycawidro/news/blob/master/LICENSE" target="license"><strong>LICENSE</strong></a></p>
33		- </div><!-- ./panel-body -->
34		- </div><!-- ./panel panel-default -->
35		- </div><!-- ./col-md-6 -->
36		- </div> <!-- /row -->
37		- </div><!-- /.panel-body -->
38		- <div class="panel-footer"><a href="https://git.kawi.fr/ycawidro/news" target="git">https://git.kawi.fr/ycawidro/news</a></div>
39		- </div><!-- /.panel-default -->
40		- </div><!-- /.col-lg-12 -->
41		- </div><!-- /.row -->
	31	+ <h2>License</h2>
	32	+ <p>GPLv3 <a href="https://git.kawi.fr/ycawidro/news/blob/master/LICENSE" target="license"><strong>LICENSE</strong></a></p>
	33	+ </div><!-- ./panel-body -->
	34	+ </div><!-- ./panel panel-default -->
	35	+ </div><!-- ./col-md-6 -->
	36	+ </div> <!-- /row -->
	37	+ </div><!-- /.panel-body -->
	38	+ <div class="panel-footer"><a href="https://git.kawi.fr/ycawidro/news" target="git">https://git.kawi.fr/ycawidro/news</a></div>
	39	+ </div><!-- /.panel-default -->
	40	+ </div><!-- /.col-lg-12 -->
	41	+ </div><!-- /.row -->
42	42	<?php
43	43	}
44	44

...	...	@@ -15,7 +15,6 @@ if( isset($_GET['page'])) {
15	15	$theme = 'hackernews.css';
16	16	$theme_url = 'dist/css/' . $theme;
17	17	?>
18		-
19	18	<!DOCTYPE html>
20	19	<html lang="en">
21	20	<head>
...	...	@@ -76,11 +75,11 @@ $theme_url = 'dist/css/' . $theme;
76	75	<div class="navbar-default sidebar" role="navigation">
77	76	<div class="sidebar-nav navbar-collapse">
78	77	<ul class="nav" id="side-menu">
79		- <?php
	78	+<?php
80	79	foreach ($array_title as $key => $title) {
81		- echo "<li><a href=\"index.php?page=$key\"><i class=\"fa fa-newspaper-o fa-fw\"></i> $title</a></li>\n";
	80	+ echo "\t\t\t\t<li><a href=\"index.php?page=$key\"><i class=\"fa fa-newspaper-o fa-fw\"></i> $title</a></li>\n";
82	81	}
83		- ?>
	82	+?>
84	83	</ul>
85	84	</div><!-- /.navbar-collapse -->
86	85	</div><!-- /.navbar-default -->
...	...	@@ -88,8 +87,8 @@ $theme_url = 'dist/css/' . $theme;
88	87
89	88	<div id="page-wrapper">
90	89
91		- <!-- Page Heading -->
92		- <?php
	90	+ <!-- Page Heading -->
	91	+<?php
93	92	$page_found=false;
94	93	foreach ($array_title as $key => $title) {
95	94	if( 0 == strcmp( $key, $page ) ) {
...	...	@@ -101,24 +100,24 @@ $theme_url = 'dist/css/' . $theme;
101	100	if( false == $page_found ) {
102	101	DisplayNewsDefault();
103	102	}
104		- ?>
105		- </div><!-- /#page-wrapper -->
106		- </div><!-- /#wrapper -->
107		-
108		- <!-- RaspAP JavaScript -->
109		- <script src="dist/js/functions.js"></script>
	103	+?>
	104	+
	105	+ </div><!-- /#page-wrapper -->
	106	+ </div><!-- /#wrapper -->
110	107
111		- <!-- jQuery -->
112		- <script src="bower_components/jquery/dist/jquery.min.js"></script>
	108	+ <!-- RaspAP JavaScript -->
	109	+ <script src="dist/js/functions.js"></script>
113	110
114		- <!-- Bootstrap Core JavaScript -->
115		- <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
	111	+ <!-- jQuery -->
	112	+ <script src="bower_components/jquery/dist/jquery.min.js"></script>
116	113
117		- <!-- Metis Menu Plugin JavaScript -->
118		- <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
	114	+ <!-- Bootstrap Core JavaScript -->
	115	+ <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
119	116
	117	+ <!-- Metis Menu Plugin JavaScript -->
	118	+ <script src="bower_components/metisMenu/dist/metisMenu.min.js"></script>
120	119
121		- <!-- Custom Theme JavaScript -->
122		- <script src="dist/js/sb-admin-2.js"></script>
	120	+ <!-- Custom Theme JavaScript -->
	121	+ <script src="dist/js/sb-admin-2.js"></script>
123	122	</body>
124	123	</html>