diff --git a/css/container.css b/css/container.css
index 9ddc38a..6df7b04 100755
--- a/css/container.css
+++ b/css/container.css
@@ -1,2 +1,2 @@
-#WRAPPER>#CONTAINER>.sub-menu-side{display:block;position:relative}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]{display:block;position:relative;width:7.5em;padding:.3em 1em .3em 2em;margin:1em;border-radius:3px;color:#5b5e63;text-shadow:1px 1px white;white-space:nowrap;transition:all .2s;cursor:pointer;overflow:hidden}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]>.svg>svg{display:inline-block;position:absolute;left:.5em;top:50%;width:1em;height:1em;transform:translateY(-50%)}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]>.svg>svg path{fill:#5b5e63 !important}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:hover,#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink].active{color:#121213;background-color:#d8deea;box-shadow:inset 0 0 4px #c8ced9}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:hover>.svg>svg path,#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink].active>.svg>svg path{fill:#121213 !important}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:nth-child(1){margin-top:1em}#WRAPPER>#CONTAINER>section{flex-grow:1}
+#WRAPPER>#CONTAINER>.sub-menu-side{display:block;position:relative}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]{display:block;position:relative;width:7.5em;padding:.3em 1em .3em 2em;margin:1em;border-radius:3px;color:#5b5e63;text-shadow:1px 1px white;white-space:nowrap;transition:all .2s;cursor:pointer;overflow:hidden}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]>.svg>svg{display:inline-block;position:absolute;left:.5em;top:50%;width:1em;height:1em;transform:translateY(-50%)}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]>.svg>svg path{fill:#5b5e63 !important}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:hover,#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink].active{color:#121213;background-color:#d8deea;box-shadow:inset 0 0 4px #c8ced9}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:hover>.svg>svg path,#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink].active>.svg>svg path{fill:#121213 !important}#WRAPPER>#CONTAINER>.sub-menu-side>span[data-sublink]:nth-child(1){margin-top:1em}#WRAPPER>#CONTAINER>section{flex-grow:1}#WRAPPER>#CONTAINER>section>.inline-box{display:block;position:relative;width:calc( 100% - 2*1em - 2*1em );margin:1em;padding:1em;border-radius:3px;box-shadow:0 0 1px #b7b7b7;background-color:#fff}
/*# sourceMappingURL=container.css.map */
diff --git a/css/container.scss b/css/container.scss
index 7d2010d..b751078 100755
--- a/css/container.scss
+++ b/css/container.scss
@@ -2,9 +2,9 @@
#WRAPPER > #CONTAINER{
- /**************************/
- /* Menu interne (submenu) */
- /**************************/
+ /* [1] Menu interne (sub-menu-side)
+ =========================================================*/
+
& > .sub-menu-side{
display: block;
position: relative;
@@ -70,10 +70,30 @@
}
+
+ /* [2] Section (contenu)
+ =========================================================*/
& > section{
// background-color: #f00;
flex-grow: 1;
}
+
+ /* [3] INLINE-BOX pour afficher les listes de donnees
+ =========================================================*/
+ & > section > .inline-box{
+ display: block;
+ position: relative;
+ width: calc( 100% - 2*1em - 2*1em );
+ margin: 1em;
+ padding: 1em;
+
+ border-radius: 3px;
+ box-shadow: 0 0 1px #b7b7b7;
+
+ background-color: #fff;
+ }
+
+
}
\ No newline at end of file
diff --git a/js/lib/page-manager.js b/js/lib/page-manager.js
index d513b15..967dda0 100755
--- a/js/lib/page-manager.js
+++ b/js/lib/page-manager.js
@@ -22,8 +22,8 @@ pageManagerClass.prototype = {
page: null, // l'indice de la page courante dans pagelist
vars: [], // les variables suivant le nom de la page dans l'URL
path: '', // le chemin du dossier contenant les pages (.php)
- jsPath: '/f/jsview/', // le chemin du dossier contenant les scripts (.js)
- cssPath: '/f/cssview/', // le chemin du dossier contenant les feuilles de style (.css)
+ jsPath: '/view/jsview', // le chemin du dossier contenant les scripts (.js)
+ cssPath: '/view/cssview', // le chemin du dossier contenant les feuilles de style (.css)
pagelist: null, // la liste des pages pouvant être chargées
container: null, // élément DOM qui contiendra le contenu des pages à charger
/* =======================================================================
diff --git a/src/static/menu-side/analytics.svg b/src/static/menu-side/analytics.svg
new file mode 100755
index 0000000..615aca0
--- /dev/null
+++ b/src/static/menu-side/analytics.svg
@@ -0,0 +1,82 @@
+
+
diff --git a/src/static/menu-side/menu-dashboard.svg b/src/static/menu-side/dashboard.svg
similarity index 56%
rename from src/static/menu-side/menu-dashboard.svg
rename to src/static/menu-side/dashboard.svg
index bc3acb9..f097a71 100755
--- a/src/static/menu-side/menu-dashboard.svg
+++ b/src/static/menu-side/dashboard.svg
@@ -8,14 +8,14 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
enable-background="new 0 0 32 32"
- height="32px"
+ height="32"
id="Layer_1"
version="1.1"
viewBox="0 0 32 32"
- width="32px"
+ width="32"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="menu-dashboard.svg">image/svg+xml
\ No newline at end of file
diff --git a/src/static/menu-side/machines.svg b/src/static/menu-side/machines.svg
new file mode 100644
index 0000000..ae8f022
--- /dev/null
+++ b/src/static/menu-side/machines.svg
@@ -0,0 +1,84 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/static/menu-side/menu-machines.svg b/src/static/menu-side/menu-machines.svg
deleted file mode 100755
index 0a4ec33..0000000
--- a/src/static/menu-side/menu-machines.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/static/menu-side/menu-settings.svg b/src/static/menu-side/menu-settings.svg
deleted file mode 100755
index 203bf72..0000000
--- a/src/static/menu-side/menu-settings.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/static/menu-side/menu-sync.svg b/src/static/menu-side/menu-sync.svg
deleted file mode 100755
index 5b8ccdf..0000000
--- a/src/static/menu-side/menu-sync.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
diff --git a/src/static/menu-side/menu-users.svg b/src/static/menu-side/menu-users.svg
deleted file mode 100755
index f2883e5..0000000
--- a/src/static/menu-side/menu-users.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/static/menu-side/settings.svg b/src/static/menu-side/settings.svg
new file mode 100644
index 0000000..8b3a284
--- /dev/null
+++ b/src/static/menu-side/settings.svg
@@ -0,0 +1,84 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/static/menu-side/users.svg b/src/static/menu-side/users.svg
new file mode 100755
index 0000000..7010ea9
--- /dev/null
+++ b/src/static/menu-side/users.svg
@@ -0,0 +1,55 @@
+
+
\ No newline at end of file
diff --git a/src/static/menu-side/users2.svg b/src/static/menu-side/users2.svg
deleted file mode 100755
index 078c571..0000000
--- a/src/static/menu-side/users2.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
\ No newline at end of file
diff --git a/todo.md b/todo.md
index fbf32b8..8e00f73 100755
--- a/todo.md
+++ b/todo.md
@@ -14,6 +14,7 @@
# EN COURS #
############
+- [ ] [/users/view]
- [x] Conception BDD + ameliorations
- [x] Liste des tables
- [x] Liste de attributs
@@ -31,6 +32,7 @@
########
# FAIT #
########
+- [x] Mise a jour / Modification / Correction des images du menu-side
- [x] [ModuleRequest->dispatch] Passage de l'erreur a la reponse
- [x] [ModuleAnswer->serialize] Integration de l'erreur dans la serialisation
- [x] [ModuleAnswer->get+getAll] Accesseurs aux donnees de la reponse
diff --git a/view.php b/view.php
index 4589d5a..f06c41c 100755
--- a/view.php
+++ b/view.php
@@ -42,15 +42,15 @@
diff --git a/view/users.php b/view/users.php
index 00c5a5c..9454365 100755
--- a/view/users.php
+++ b/view/users.php
@@ -5,7 +5,7 @@