Merge test

Merge branch 'master' of https://go.caribana.ch/git/lars/accred
This commit is contained in:
Caribana 2018-04-09 21:13:48 +02:00
commit 7cef09185c

View File

@ -45,28 +45,28 @@ require_once 'vendor/autoload.php';
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="google-signin-client_id" content="538635499162-g21v86gk87qm863u03er6vnm3q15bl82.apps.googleusercontent.com"> <meta name="google-signin-client_id" content="538635499162-g21v86gk87qm863u03er6vnm3q15bl82.apps.googleusercontent.com">
<script src="https://apis.google.com/js/platform.js" async defer></script> <script src="https://apis.google.com/js/platform.js" async defer></script>
<title>Nouvelle Demande / Edition de demande</title> <title>Nouvelle Demande / Edition de demande</title>
<!-- load Zebra_Form's stylesheet file --> <!-- load Zebra_Form's stylesheet file -->
<link rel="stylesheet" href="./vendor/stefangabos/zebra_form/examples/public/css/reset.css"> <link rel="stylesheet" href="./vendor/stefangabos/zebra_form/examples/public/css/reset.css">
<link rel="stylesheet" href="./vendor/stefangabos/zebra_form/examples/public/css/style.css"> <link rel="stylesheet" href="./vendor/stefangabos/zebra_form/examples/public/css/style.css">
<link rel="stylesheet" href="vendor/stefangabos/zebra_form/public/css/zebra_form.css"> <link rel="stylesheet" href="vendor/stefangabos/zebra_form/public/css/zebra_form.css">
<link rel="stylesheet" type="text/css" href="accred_style.css"> <link rel="stylesheet" type="text/css" href="accred_style.css">
</head> </head>
<body> <body>
<div class="right-blob">Bienvenue <?php echo $uname; ?></div> <div class="right-blob">Bienvenue <?php echo $uname; ?></div>
<?php <?php
echo (isset($zf_error) ? $zf_error : (isset($error) ? $error : '')); echo (isset($zf_error) ? $zf_error : (isset($error) ? $error : ''));
?> ?>
<?php <?php
// include the Zebra_Form class // include the Zebra_Form class
require 'vendor/stefangabos/zebra_form/Zebra_Form.php'; require 'vendor/stefangabos/zebra_form/Zebra_Form.php';
@ -364,60 +364,6 @@ die();
), 'mycallback, 5'), ), 'mycallback, 5'),
)); ));
/*
// "department"
$form->add('label', 'label_department', 'department', 'Department:');
$obj = $form->add('select', 'department', '', array('other' => true));
$obj->add_options(array(
'Marketing',
'Operations',
'Customer Service',
'Human Resources',
'Sales Department',
'Accounting Department',
'Legal Department',
));
$obj->set_rule(array(
'required' => array('error', 'Department is required!')
));
// "room"
$form->add('label', 'label_room', 'room', 'Which room would you like to reserve:');
$obj = $form->add('radios', 'room', array(
'A' => 'Room A',
'B' => 'Room B',
'C' => 'Room C',
));
$obj->set_rule(array(
'required' => array('error', 'Room selection is required!')
));
// "extra"
$form->add('label', 'label_extra', 'extra', 'Extra requirements:');
$obj = $form->add('checkboxes', 'extra[]', array(
'flipchard' => 'Flipchard and pens',
'plasma' => 'Plasma TV screen',
'beverages' => 'Coffee, tea and mineral water',
));
// "date"
$form->add('label', 'label_date', 'date', 'Reservation date');
$date = $form->add('date', 'date');
$date->set_rule(array(
'required' => array('error', 'Date is required!'),
'date' => array('error', 'Date is invalid!'),
));
// date format
// don't forget to use $date->get_date() if the form is valid to get the date in YYYY-MM-DD format ready to be used
// in a database or with PHP's strtotime function!
$date->format('M d, Y');
// selectable dates are starting with the current day
$date->direction(1);
$form->add('note', 'note_date', 'date', 'Date format is M d, Y');
*/
// "submit" // "submit"
$form->add('submit', 'btnsubmit', 'Enregistrer'); $form->add('submit', 'btnsubmit', 'Enregistrer');
if($row['status']==1) { if($row['status']==1) {