Manual merge html from master
- Delete old files - Re-estructure project dirs
German Correa
@ -1,5 +0,0 @@
|
||||
<?php include_once 'header.php';?>
|
||||
|
||||
<h1>pagina de include</h1>
|
||||
|
||||
<?php include_once 'footer.php';?>
|
||||
@ -1,3 +0,0 @@
|
||||
[Trash Info]
|
||||
Path=included.php
|
||||
DeletionDate=2017-09-05T19:02:02
|
||||
@ -1,3 +0,0 @@
|
||||
[Trash Info]
|
||||
Path=sidebar.html
|
||||
DeletionDate=2017-09-05T18:56:27
|
||||
@ -17,3 +17,17 @@ CREATE TABLE IF NOT EXISTS Registro
|
||||
roommate VARCHAR(50),
|
||||
fechaRegistro DATETIME NOT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS Speakers
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
nombre VARCHAR(50) NOT NULL,
|
||||
apellido VARCHAR(50) NOT NULL,
|
||||
afiliacion VARCHAR(50) NOT NULL,
|
||||
foto VARCHAR(100)
|
||||
|
||||
);
|
||||
INSERT INTO Speakers(nombre,apellido,afiliacion,foto)
|
||||
VALUES('Jairo','Bochi','Universidad Católica de Chile','img/speakers/jariobochi.jpg');
|
||||
INSERT INTO Speakers(nombre,apellido,afiliacion,foto)
|
||||
VALUES('Christian','Bonatti','Université de Bourgogne','img/speakers/cbonatti.jpg');
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
<?php include_once 'header.php';?>
|
||||
|
||||
<h1>pagina de include</h1>
|
||||
|
||||
<?php include_once 'footer.php';?>
|
||||
@ -1,3 +0,0 @@
|
||||
[Trash Info]
|
||||
Path=included.php
|
||||
DeletionDate=2017-09-05T19:02:02
|
||||
@ -1,3 +0,0 @@
|
||||
[Trash Info]
|
||||
Path=sidebar.html
|
||||
DeletionDate=2017-09-05T18:56:27
|
||||
3
public/.gitignore
vendored
@ -1,3 +0,0 @@
|
||||
2021y22.csv
|
||||
*.bak
|
||||
bkp/*
|
||||
@ -1,25 +0,0 @@
|
||||
<?php include_once 'header.php'; ?>
|
||||
|
||||
<!-- Full Calendar -->
|
||||
<link rel='stylesheet' href='js/fullcalendar/fullcalendar.css' />
|
||||
<link rel='stylesheet' href='js/fullcalendar/sched/scheduler.css' />
|
||||
<script src="js/fullcalendar/lib/moment.min.js"></script>
|
||||
<script src="js/fullcalendar/fullcalendar.js"></script>
|
||||
<script src="js/fullcalendar/locale-all.js"></script>
|
||||
<script type="text/javascript" src="js/fullcalendar/sched/scheduler.js"></script>
|
||||
<script src="js/calprog.js"></script>
|
||||
<div class="row">
|
||||
<div id="content" class="col-xs-12 col-sm-8">
|
||||
<div class="row">
|
||||
<h1 id="welcome"><strong>Calendario</strong></h1>
|
||||
<div id="calendario">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<?php include_once 'sidebar.php'; ?>
|
||||
<?php include_once 'footer.php'; ?>
|
||||
@ -1,10 +0,0 @@
|
||||
<?php
|
||||
|
||||
|
||||
class Config {
|
||||
/**
|
||||
* path to the sqlite file
|
||||
*/
|
||||
const PATH_TO_SQLITE_FILE = 'db/ggdworkshop.db';
|
||||
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* SQLite connnection
|
||||
*/
|
||||
class SQLiteConnection {
|
||||
/**
|
||||
* PDO instance
|
||||
* @var type
|
||||
*/
|
||||
private $pdo;
|
||||
|
||||
/**
|
||||
* return in instance of the PDO object that connects to the SQLite database
|
||||
* @return \PDO
|
||||
*/
|
||||
public function connect() {
|
||||
if ($this->pdo == null) {
|
||||
try {
|
||||
$this->pdo = new \PDO("sqlite:" . Config::PATH_TO_SQLITE_FILE);
|
||||
} catch (\PDOException $e) {
|
||||
// handle the exception here
|
||||
}
|
||||
|
||||
}
|
||||
return $this->pdo;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 1.1 KiB |
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<comment version="3.0">
|
||||
<caption>La Rambla</caption>
|
||||
<note>Vista al atardecer de La Rambla República del Perú en el borde costero de Montevideo, Uruguay.</note>
|
||||
<place/>
|
||||
<categories>
|
||||
<category value="Borde"/>
|
||||
<category value="Clouds"/>
|
||||
<category value="Montevideo"/>
|
||||
<category value="Rambla"/>
|
||||
<category value="República del Perú"/>
|
||||
<category value="Sky"/>
|
||||
<category value="Uruguay"/>
|
||||
<category value="costa"/>
|
||||
<category value="long exposure"/>
|
||||
<category value="río de la plata"/>
|
||||
<category value="sea"/>
|
||||
<category value="sunset"/>
|
||||
</categories>
|
||||
</comment>
|
||||
|
Before Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 748 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 575 KiB |
|
Before Width: | Height: | Size: 767 KiB |
BIN
public/img/intercityhotel.jpg
Normal file
|
After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 30 KiB |
6
public/js/bootstrap.min.js
vendored
@ -1,33 +0,0 @@
|
||||
$(document).ready(function(){
|
||||
|
||||
$("#calendario").fullCalendar({
|
||||
locale: 'es',
|
||||
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
|
||||
defaultDate: '2017-12-21',
|
||||
defaultView: 'agendaWeek',
|
||||
visibleRange:{
|
||||
start: '2017-12-21',
|
||||
end: '2017-12-23'
|
||||
},
|
||||
allDaySlot: false,
|
||||
minTime: "08:00:00",
|
||||
maxTime: "22:00:00",
|
||||
resources: [
|
||||
{ id:"s1", title: "Salon 1"},
|
||||
{ id:"s2", title: "Salon 2"},
|
||||
|
||||
|
||||
],
|
||||
|
||||
events: [
|
||||
{
|
||||
id:"1",
|
||||
resourceid: 's1',
|
||||
title: "Charla Pedorra",
|
||||
start: "2017-12-21T12:00",
|
||||
end: "2017-12-21T13:00"
|
||||
}
|
||||
]
|
||||
|
||||
});
|
||||
});
|
||||
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |