Merge remote-tracking branch 'origin/master'

10 years ago · c7b507f8c6
--- a/addEvent.css
+++ b/addEvent.css
@ -1,5 +1,3 @@
 /* TODO: submit button styling */
 /* TODO: checkboxes bugfix */
 #eventForm {
  margin-top: 30px;
  border: 1px solid #5B5B5B;
@ -7,9 +5,23 @@
  padding-left: 20%;
  padding-top:40px;
  -moz-border-radius: 10px;
 -webkit-border-radius: 10px;
 border-radius: 10px; /* future proofing */
 -khtml-border-radius: 10px; /* for old Konqueror browsers */
  -webkit-border-radius: 10px;
  border-radius: 10px; /* future proofing */
  -khtml-border-radius: 10px; /* for old Konqueror browsers */
 }
 #checkboxGrp {
  display: -webkit-flex;
  display: flex;
  -webkit-align-items: left;
  align-items: left;
  -webkit-justify-content: center;
  justify-content: center;
  -webkit-flex-flow: column wrap;
  flex-flow: column wrap;
  -webkit-align-content: stretch;
  align-content: stretch;
  max-height: 300px;
 }
 #buttonDiv {
@ -17,7 +29,7 @@ border-radius: 10px; /* future proofing */
  text-align: center;
 }
 #submit {
 #submitButton {
  margin-top:30px;
  margin-left:auto;
  margin-right:auto;
@ -43,14 +55,6 @@ border-radius: 10px; /* future proofing */
  font-weight: bold;
 }
 textarea, input {
 textarea, input[type="text"], input[type="url"] {
  width: 80%;
 }
 #checkboxGrp {
  width:80%;
 }
 #checkboxGrp input {
  margin:3px;
 }
--- a/addEvent.php
+++ b/addEvent.php
@ -92,8 +92,7 @@ else
                if($edit)
                {
 ?>
        <a href="deleteEvent.php?id=<?php echo $id; ?>" id="deleteButton"><img src="icons/ic_delete_forever_24px.svg" />
 Supprimer l'évènement !</a>
        <a href="deleteEvent.php?id=<?php echo $id; ?>" id="deleteButton" title="Supprimer l'évènement !"><img alt="supprimer" src="icons/ic_delete_forever_24px.svg" /></a>
 <?php
                }
 ?>
--- a/editEvent.php
+++ b/editEvent.php
@ -1,131 +0,0 @@
 <?php
 /** /
 require_once('./CAS-1.3.4/CAS.php');
 phpCAS::client(CAS_VERSION_2_0, 'sso-cas.univ-rennes1.fr', 443, '', false);
 phpCAS::setNoCasServerValidation();
 phpCAS::forceAuthentication();
 $uid = phpCAS::getUser();
 /**/
 include_once('databaseOperations.php');
 include('datetimeOperations.php');
 $db = connect();
 if(!isset($_GET['id']) || !is_numeric($_GET['id']))
 header('Location:./');
 $id = htmlspecialchars($_GET['id']);
 $event = getOneEvent($db, $id);
 ?>
 <!DOCTYPE html>
 <html>
 <head>
  <title>Kiwi Calendar : Ajouter un évènement</title>
  <meta charset="utf-8" />
  <link rel="stylesheet" href="./main.css" />
  <link rel="stylesheet" href="./event.css" />
  <link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
  <link rel="stylesheet" type="text/css" media="screen"
  href="http://tarruda.github.com/bootstrap-datetimepicker/assets/css/bootstrap-datetimepicker.min.css">
  <link rel="icon" type="image/png" href="favicon.png" />
  <link rel="stylesheet" href="./addEvent.css" />
  <!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /><![endif]-->
 </head>
 <body>
  <?php include('header.php'); ?>
  <div id="descEvent">
    <h1>Modifier un Évènement</h1>
    <form id="eventForm" name="eventForm" method="post" action="eventAdded.php" onsubmit="return verifyCheckbox();">
      <input type="hidden" name="id" value="<?php echo $id; ?>">
      <div id="left">Titre :</div>
      <input type="text" name="title" value="<?php echo $event["event_title"]; ?>" required>
      <br>
      <div id="left">Catégories :</div>
      <div id="checkboxGrp">
        <?php
        $cats = getCategoriesNames($db);
        $catsForId = getCategoriesForOneEvent($db, $id);
        for ($i=0; $i<count($cats); $i++) {
          $checked = '';
          if(in_array(trim($cats[$i][0]), $catsForId)) $checked = 'checked';
          echo "<input type=\"checkbox\" class=\"checkboxRequired\" name=\"chk_group[]\" value=\"".$cats[$i][0]."\" ".$checked."/>".$cats[$i][1]." ";
        }
        ?>
      </div>
      <br>
      <div id="left">Adresse :</div>
      <input type="text" name="address" value="<?php echo $event["event_localisation"];?>" required>
      <br>
      <div id="left">Date de début :</div>
      <div id="datetimepicker" class="input-append date">
        <input type="text" name="dtstart"  value="<?php echo $event["event_dtstart"]; ?>"  required></input>
        <span class="add-on">
          <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
        </span>
      </div>
      <br>
      <div id="left">Date de fin :</div>
      <div id="datetimepicker2" class="input-append date">
        <input type="text" name="dtend"  value="<?php echo $event["event_dtend"];?>" required></input>
        <span class="add-on">
          <i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
        </span>
      </div>
      <br>
      <div id="left">Description de l'évènement :</div>
      <textarea name="description" rows="4" cols="50" form="eventForm"><?php echo $event["event_description"];?></textarea>
      <br>
      <div id="left">Site de l'évènement :</div>
      <input type="url" value="<?php echo $event["event_site"];?>"  name="site">
      <br>
      <div id="left">Image de l'évènement :</div>
      <input type="url"  value="<?php echo $event["event_urlImage"];?>"  name="urlImage">
      <br>
      <div id="left">Contact :</div>
      <input type="text"  value="<?php echo $event["event_contact"];?>" name="contact">
      <br>
      <div id="buttonDiv"><button id="submit">Modifier l'évènement !</button>
      <button id="submit" action="alert('TODO');">Supprimer l'évènement !</button></div>
    </form>
    <script type="text/javascript"
    src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.3/jquery.min.js">
    </script>
    <script type="text/javascript"
    src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/js/bootstrap.min.js">
    </script>
    <script type="text/javascript"
    src="http://tarruda.github.com/bootstrap-datetimepicker/assets/js/bootstrap-datetimepicker.min.js">
    </script>
    <script type="text/javascript"
    src="http://tarruda.github.com/bootstrap-datetimepicker/assets/js/bootstrap-datetimepicker.pt-BR.js">
    </script>
    <script type="text/javascript">
    $('#datetimepicker').datetimepicker({
      format: 'dd/MM/yyyy hh:mm:ss',
      language: 'fr_FR'
    });
    $('#datetimepicker2').datetimepicker({
      format: 'dd/MM/yyyy hh:mm:ss',
      language: 'fr_FR'
    });
    var verifyCheckbox = function () {
      var checkboxes = $('#checkboxGrp');
      var inputs = checkboxes.find('input');
      for(var i = 0; i < inputs.length; i++)
        if(inputs[i].checked)
          return true;
      return false;
    }
    </script>
  </div>
 </body>
 </html>