From af868621a9a9820b529a5b9c1a226c2ea96582e5 Mon Sep 17 00:00:00 2001 From: Damien GUILLEM Date: Wed, 22 Apr 2015 11:58:24 +0200 Subject: [PATCH 1/6] * Fix Database class problems : double query execution in "deleteContactsIn()" and "getUserFromEmail()" --- model/DataBase.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/model/DataBase.php b/model/DataBase.php index c6d274a..9f0385b 100755 --- a/model/DataBase.php +++ b/model/DataBase.php @@ -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); } @@ -1053,9 +1050,6 @@ 'email' => $email ); - $req = $this->bdd->prepare($query); - $req->execute($params); - return $this->runQuery($query, $params, self::FETCH); } From 0e9668bc088f932c8767f522414bbf5ce4c7e775 Mon Sep 17 00:00:00 2001 From: dam09fr Date: Mon, 27 Apr 2015 23:09:42 +0200 Subject: [PATCH 2/6] Fix wrong text. --- model/DataBase.php | 2 +- templates/addScheduled.php | 2 +- templates/editScheduleds.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 @@
- +
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 @@
- +
From 01000337a7893df6981a4cabf5ae53f0ba0f963b Mon Sep 17 00:00:00 2001 From: Damien GUILLEM Date: Mon, 27 Apr 2015 12:13:56 +0200 Subject: [PATCH 3/6] Add icon on profile delete block. --- templates/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
-

Supprimer ce compte

+

Supprimer ce compte

From aad3e6979fe7b2bbc7bca2b9b989e45cd1115567 Mon Sep 17 00:00:00 2001 From: Damien GUILLEM Date: Mon, 27 Apr 2015 11:29:54 +0200 Subject: [PATCH 4/6] Add space between icon and email in top navbar. --- templates/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nav.php b/templates/nav.php index bb860ab..85fc38d 100755 --- a/templates/nav.php +++ b/templates/nav.php @@ -13,7 +13,7 @@
  • - +
    • Profil From 4fe0224bede6ac9abfe96f2ff5f6427c6a54770d Mon Sep 17 00:00:00 2001 From: dam09fr Date: Mon, 27 Apr 2015 23:24:13 +0200 Subject: [PATCH 5/6] =?UTF-8?q?Log=20Off=20=3D>=20D=C3=A9connexion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nav.php b/templates/nav.php index 85fc38d..4c6354f 100755 --- a/templates/nav.php +++ b/templates/nav.php @@ -20,7 +20,7 @@
    • - Log Out + Déconnexion
    • From cc50d5be476b2a7691f48368772a73ad46942296 Mon Sep 17 00:00:00 2001 From: dam09fr Date: Mon, 27 Apr 2015 23:27:32 +0200 Subject: [PATCH 6/6] Improve menu display. --- css/style.css | 5 +++++ templates/nav.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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/templates/nav.php b/templates/nav.php index 4c6354f..84e78de 100755 --- a/templates/nav.php +++ b/templates/nav.php @@ -39,7 +39,7 @@
  • Répertoire -