diff --git a/css/style.css b/css/style.css index 3474858..dea9794 100755 --- a/css/style.css +++ b/css/style.css @@ -76,3 +76,8 @@ footer { border: none; } + +.side-nav>li>ul>li.active>a { + color: #fff; + background-color: #000; +} diff --git a/model/DataBase.php b/model/DataBase.php index c6d274a..e1434ac 100755 --- a/model/DataBase.php +++ b/model/DataBase.php @@ -621,7 +621,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 */ diff --git a/templates/addScheduled.php b/templates/addScheduled.php index c7213d2..71c94b1 100755 --- a/templates/addScheduled.php +++ b/templates/addScheduled.php @@ -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"> diff --git a/templates/editScheduleds.php b/templates/editScheduleds.php index 9deeda0..1a3e632 100755 --- a/templates/editScheduleds.php +++ b/templates/editScheduleds.php @@ -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"> diff --git a/templates/nav.php b/templates/nav.php index bb860ab..84e78de 100755 --- a/templates/nav.php +++ b/templates/nav.php @@ -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> diff --git a/templates/profile.php b/templates/profile.php index de527ea..06b1e24 100755 --- a/templates/profile.php +++ b/templates/profile.php @@ -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">