From e23a6c00acdc93132e4e742acaa143ad06518446 Mon Sep 17 00:00:00 2001 From: Antoine Duquenoy Date: Sat, 20 Oct 2018 21:52:25 +0200 Subject: [PATCH] UI : modifications mineures --- PFE06/src/main/java/com/PFE/ServerManager/MainController.java | 6 ++++-- PFE06/src/main/resources/application.properties | 4 ++-- PFE06/src/main/resources/static/css/home.css | 9 ++------- PFE06/src/main/resources/static/css/login.css | 3 ++- PFE06/src/main/resources/static/css/registration.css | 6 +++--- PFE06/src/main/resources/static/js/home.js | 1 + PFE06/src/main/resources/templates/all.html | 2 +- PFE06/src/main/resources/templates/denied.html | 4 ++-- PFE06/src/main/resources/templates/home.html | 4 +++- PFE06/src/main/resources/templates/login.html | 11 +++++------ PFE06/src/main/resources/templates/registration.html | 26 ++++++++++++++++++++------ 11 files changed, 45 insertions(+), 31 deletions(-) diff --git a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java index 92d51a2..a69e5ec 100644 --- a/PFE06/src/main/java/com/PFE/ServerManager/MainController.java +++ b/PFE06/src/main/java/com/PFE/ServerManager/MainController.java @@ -82,10 +82,12 @@ public class MainController { modelAndView.setViewName("registration"); /////// if(temp != null) { - modelAndView.addObject("ok", "l'utilisateur existe déjà"); + modelAndView.addObject("message", "L'utilisateur existe déjà !"); + modelAndView.addObject("fail", true); } else { - modelAndView.addObject("ok", "l'utilisateur a bien été ajouté"); + modelAndView.addObject("message", "L'utilisateur a bien été ajouté !"); + modelAndView.addObject("ok", true); customerRepository.save(n); } modelAndView.setViewName("registration"); diff --git a/PFE06/src/main/resources/application.properties b/PFE06/src/main/resources/application.properties index 08b2821..8940957 100644 --- a/PFE06/src/main/resources/application.properties +++ b/PFE06/src/main/resources/application.properties @@ -8,9 +8,9 @@ spring.jpa.hibernate.ddl-auto=create #"update" met à jour la base données #Postgres config : -spring.datasource.url=jdbc:postgresql://localhost:5432/sql_only +spring.datasource.url=jdbc:postgresql://localhost:3306/sql_only spring.datasource.username=postgres -spring.datasource.password=idalurf123 +spring.datasource.password=admin # montre les communications JPA avec la BDD diff --git a/PFE06/src/main/resources/static/css/home.css b/PFE06/src/main/resources/static/css/home.css index e4b4bb9..38dfa9a 100644 --- a/PFE06/src/main/resources/static/css/home.css +++ b/PFE06/src/main/resources/static/css/home.css @@ -1,5 +1,5 @@ body { background-color: #FFF; } -/* + .upload-drop-zone { height: 200px; border-width: 2px; @@ -9,12 +9,7 @@ body { background-color: #FFF; } border-color: #ccc; line-height: 200px; text-align: center -}*/ -/* -body { - padding-top: 70px; - padding-bottom: 30px; -}*/ +} .theme-dropdown .dropdown-menu { position: static; diff --git a/PFE06/src/main/resources/static/css/login.css b/PFE06/src/main/resources/static/css/login.css index e7ffb69..27e74e7 100644 --- a/PFE06/src/main/resources/static/css/login.css +++ b/PFE06/src/main/resources/static/css/login.css @@ -20,6 +20,7 @@ body { background-color: #E9EEF2; } border-radius: 5px; margin: 50px auto; max-width: 38%; + min-width: 400px; padding: 50px 70px 70px 71px; } @@ -27,7 +28,7 @@ body { background-color: #E9EEF2; } margin-bottom:10px; } -.login-form { text-align:center;} +.login-form { text-align:center; } .forgot a { color: #777777; diff --git a/PFE06/src/main/resources/static/css/registration.css b/PFE06/src/main/resources/static/css/registration.css index 9c8cb37..8cd9b61 100644 --- a/PFE06/src/main/resources/static/css/registration.css +++ b/PFE06/src/main/resources/static/css/registration.css @@ -20,6 +20,7 @@ body { background-color: #E9EEF2; } border-radius: 5px; margin: 50px auto; max-width: 38%; + min-width: 400px; padding: 50px 70px 70px 71px; } @@ -27,14 +28,14 @@ body { background-color: #E9EEF2; } margin-bottom:10px; } -.login-form { text-align:center;} +.login-form { text-align:center; } .forgot a { color: #777777; font-size: 14px; text-decoration: underline; } -.login-form .btn.btn-primary { +.login-form .btn.btn-primary { background: #f0ad4e none repeat scroll 0 0; border-color: #f0ad4e; color: #ffffff; @@ -49,7 +50,6 @@ body { background-color: #E9EEF2; } background: #ff9900 none repeat scroll 0 0; } - .back { text-align: left; margin-top:10px; } .back a {color: #444444; font-size: 13px;text-decoration: none;} diff --git a/PFE06/src/main/resources/static/js/home.js b/PFE06/src/main/resources/static/js/home.js index fb33dd3..51c5fc2 100644 --- a/PFE06/src/main/resources/static/js/home.js +++ b/PFE06/src/main/resources/static/js/home.js @@ -3,6 +3,7 @@ $(document).ready(function() { /********** Tableau **********/ var tableNodes = $('#nodes-table').DataTable( { + responsive: true, select: { style: 'multi' } diff --git a/PFE06/src/main/resources/templates/all.html b/PFE06/src/main/resources/templates/all.html index e1b1801..1ae6d19 100644 --- a/PFE06/src/main/resources/templates/all.html +++ b/PFE06/src/main/resources/templates/all.html @@ -15,7 +15,7 @@
+

Formulaire d'ajout

Merci d'entrer le login et le mot de passe du nouvel utilisateur

+ +
+ +
+ +
+ +
+
- +
- +
@@ -58,7 +72,7 @@
- +
-- libgit2 0.21.2