Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from RaspbianFrance/master 

Update master
This commit is contained in:
Damien GUILLEM 2015-04-27 23:56:39 +02:00
parent f893004dba 405bafe9ca
commit 65dfb67dba
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/style.css
View File

@ -76,3 +76,8 @@ footer
{
border: none;
}
.side-nav>li>ul>li.active>a {
color: #fff;
background-color: #000;
}

8
model/DataBase.php
View File

@ -212,9 +212,6 @@
$query .= $generted_in['QUERY'];
$params = $generted_in['PARAMS'];
$req = $this->bdd->prepare($query);
$req->execute($params);
return $this->runQuery($query, $params, self::ROWCOUNT);
}
@ -621,7 +618,7 @@
/**
* Insert un sms
* @param string $date : La date d'envoie du SMS
* @param string $date : La date d'envoi du SMS
* @param string $content : Le contenu du SMS
* @return int : le nombre de lignes crées
*/
@ -1053,9 +1050,6 @@
'email' => $email
);
$req = $this->bdd->prepare($query);
$req->execute($params);
return $this->runQuery($query, $params, self::FETCH);
}

2
templates/addScheduled.php
View File

@ -43,7 +43,7 @@
<textarea name="content" class="form-control" required></textarea>
</div>
<div class="form-group">
<label>Date d'envoie du SMS</label>
<label>Date d'envoi du SMS</label>
<input name="date" class="form-control form-datetime" type="text" value="<?php secho($now); ?>" readonly>
</div>
<div class="form-group">

2
templates/editScheduleds.php
View File

@ -68,7 +68,7 @@
<textarea name="scheduleds[<?php secho($scheduled['id']); ?>][content]" class="form-control" required><?php secho($scheduled['content'], true); ?></textarea>
</div>
<div class="form-group">
<label>Date d'envoie du SMS</label>
<label>Date d'envoi du SMS</label>
<input name="scheduleds[<?php secho($scheduled['id']); ?>][date]" class="form-control form-datetime" type="text" value="<?php secho($scheduled['at']); ?>" readonly>
</div>
<div class="form-group">

8
templates/nav.php
View File

@ -13,14 +13,14 @@
<!-- Top Menu Items -->
<ul class="nav navbar-right top-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> <?php secho($email); ?> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-user"></i> <?php secho($email); ?> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="<?php echo $this->generateUrl('profile'); ?>"><i class="fa fa-fw fa-user"></i> Profil</a>
</li>
<li class="divider"></li>
<li>
<a href="<?php echo $this->generateUrl('connect', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
<a href="<?php echo $this->generateUrl('connect', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Déconnexion</a>
</li>
</ul>
</li>
@ -39,7 +39,7 @@
</li>
<li>
<a href="javascript:;" data-toggle="collapse" data-target="#repertoire"><i class="fa fa-fw fa-book"></i> Répertoire <i class="fa fa-fw fa-caret-down"></i></a>
<ul id="repertoire" class="collapse">
<ul id="repertoire" class="collapse <?php echo in_array($page, array('contacts', 'groups')) ? 'in' : ''; ?>">
<li <?php echo $page == 'contacts' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->generateUrl('contacts'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
</li>
@ -50,7 +50,7 @@
</li>
<li>
<a href="javascript:;" data-toggle="collapse" data-target="#logs"><i class="fa fa-fw fa-file-text"></i> Logs <i class="fa fa-fw fa-caret-down"></i></a>
<ul id="logs" class="collapse">
<ul id="logs" class="collapse <?php echo in_array($page, array('sendeds', 'receiveds', 'events')) ? 'in' : ''; ?>">
<li <?php echo $page == 'sendeds' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->generateUrl('sendeds'); ?>"><i class="fa fa-fw fa-send"></i> SMS envoyés</a>
</li>

2
templates/profile.php
View File

@ -88,7 +88,7 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title"><i class="fa fa-delete fa-fw"></i> Supprimer ce compte</h4>
<h4 class="panel-title"><i class="fa fa-trash-o fa-fw"></i> Supprimer ce compte</h4>
</div>
<div class="panel-body">
<form action="<?php echo $this->generateUrl('profile', 'delete', array('csrf' => $_SESSION['csrf'])); ?>" method="POST">