Merge branch 'master' of github.com:TheMrNomis/KiWi-calendar

10 years ago · fc7a0b55a4
--- a/day.php
+++ b/day.php
@ -11,11 +11,11 @@
    <body>
        <header id="title">
            <img alt="logo ESIR" src="./images/esir.png" />
            <img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" />
            <a href="./index.php"><img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" /></a>
        </header>
        

        <div id="descEvent">
          <h1><?php 
          <h1><?php
          date_default_timezone_set('America/Los_Angeles');
          $date = $_GET["date"];
          echo date('d M Y',strtotime($date));
@ -41,7 +41,7 @@
          echo "<div id=\"dateLieu\">".date('H:i',strtotime($row['dtstart']))." - ".date('H:i',strtotime($row['dtend'])).". ".$row['localisation']."</div>\n";
          echo "<div id=\"descfull\">".$row['description'] ."</div>\n<div id=\"More\"><a href=\"\">En savoir +</a></div>\n</div>\n";
   }
   

   $db->close();
 ?>
        </div>
--- a/event.php
+++ b/event.php
@ -26,7 +26,7 @@
  <body>
      <header id="title">
          <img alt="logo ESIR" src="./images/esir.png" />
          <img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" />
          <a href="./index.php"><img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" /></a>
      </header>
  <div id="descEvent">
    <h1><?php echo $event["titre"]; ?></h1>
--- a/index.php
+++ b/index.php
@ -49,7 +49,7 @@ $categories = getCategories($db);
        <header id="title">
            <a id="hamburgerButton" href="#"><img alt="menu" src="./images/menu.png" /></a>
            <img alt="logo ESIR" src="./images/esir.png" />
            <img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" />
            <a href="./index.php"><img class="rightLogo" alt="logo Kiwi" src="./images/KiWiCalendar.png" /></a>
        </header>


@ -136,14 +136,15 @@ $categories = getCategories($db);

                echo('
                <li class="day'.$class.'">
                    <a href="./day.php?date='.$date.'">
                    <h2>
                        <span class="minititle left">'.$days[date("N",$date)].'</span>
                        '.date("d", $date));
                if(date('m', $date) != date('m', $monthDate))
                    echo('
                        <span class="minititle right">/'.date("m",$date).'</class>');
                    echo('<span class="minititle right">/'.date("m",$date).'</class>');
                echo('
                    </h2>
                    </a>
                    <ul>');

                foreach($events as $event)