From 226b278f71857c4f04eb197e47a4086434e4fbc7 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 8 Feb 2016 21:46:11 +0100 Subject: [PATCH] Modifications mineures --- config/bdd.sql | 112 +++++++++++++++++++++++++++++- config/database-local.json | 6 ++ config/database.json | 4 +- css/container.css | 2 +- css/container.scss | 20 ++++-- manager/Database.php | 7 +- manager/ModuleAnswer.php | 3 +- src/static/container/card.svg | 0 src/static/container/mail.svg | 0 src/static/menu-side/machines.svg | 0 src/static/menu-side/settings.svg | 0 view/users.php | 4 +- 12 files changed, 143 insertions(+), 15 deletions(-) create mode 100755 config/database-local.json mode change 100644 => 100755 src/static/container/card.svg mode change 100644 => 100755 src/static/container/mail.svg mode change 100644 => 100755 src/static/menu-side/machines.svg mode change 100644 => 100755 src/static/menu-side/settings.svg diff --git a/config/bdd.sql b/config/bdd.sql index e908dea..5aff9cd 100755 --- a/config/bdd.sql +++ b/config/bdd.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Client: localhost --- Généré le: Mer 03 Février 2016 à 23:20 +-- Généré le: Lun 08 Février 2016 à 18:09 -- Version du serveur: 5.5.47-0ubuntu0.14.04.1 -- Version de PHP: 5.5.9-1ubuntu4.14 @@ -58,12 +58,118 @@ CREATE TABLE IF NOT EXISTS `user` ( `code` varchar(20) NOT NULL, `username` varchar(30) NOT NULL, `firstname` varchar(30) NOT NULL, - `lasname` varchar(30) NOT NULL, + `lastname` varchar(30) NOT NULL, `mail` varchar(50) NOT NULL, `password` varchar(40) NOT NULL, `status` int(11) NOT NULL, PRIMARY KEY (`id_user`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=101 ; + +-- +-- Contenu de la table `user` +-- + +INSERT INTO `user` (`id_user`, `code`, `username`, `firstname`, `lastname`, `mail`, `password`, `status`) VALUES +(1, '92-55-B9-B3', 'Daniels', 'Juliana', 'French', 'julianafrench@corecom.com', '7718fd0fb9c0d5659603abdae0523bf487ee6af3', 1), +(2, '10-FE-BD-61', 'Lucas', 'Curry', 'Church', 'currychurch@corecom.com', '9b38c49bd76669828ee450ee727270824129a795', 0), +(3, 'E0-11-41-DB', 'Liz', 'Geneva', 'Diaz', 'genevadiaz@corecom.com', 'a22ba74507e8011b9779b1eb91fbf1b04eb71beb', 1), +(4, '23-77-93-8C', 'Jessie', 'Joann', 'Melendez', 'joannmelendez@corecom.com', '0f561939beae883a24d4a07cf96dd3cec5629187', 1), +(5, 'E7-DA-79-9B', 'Elaine', 'Fox', 'Kerr', 'foxkerr@corecom.com', '348633ada63ae6a9887872401f6d307134aaeee9', 1), +(6, '0F-9F-56-50', 'Tameka', 'Nieves', 'Velasquez', 'nievesvelasquez@corecom.com', 'cb23ab1722ddbdd9fe7cf71a9898b8687e4455ed', 0), +(7, 'DB-A3-8A-D7', 'Katheryn', 'Rodriquez', 'Gomez', 'rodriquezgomez@corecom.com', 'df3d3345e05eae7544f032bebd4687fed6d03525', 1), +(8, 'AF-BB-68-6B', 'Bowen', 'Bender', 'Holder', 'benderholder@corecom.com', 'abcfa52d4c5f88f1a396eb2a151cc531892f33b4', 1), +(9, '39-DF-20-69', 'Flores', 'Beck', 'Murray', 'beckmurray@corecom.com', 'ebdf9559b529045694a37dd70797f89505b91770', 1), +(10, '88-FA-FC-C3', 'Dominique', 'Tracy', 'Morin', 'tracymorin@corecom.com', 'a2416579bcc2e0d4e32d94ba72fe74b9ec664975', 1), +(11, '75-E1-A6-9E', 'Deirdre', 'Phoebe', 'Pearson', 'phoebepearson@corecom.com', '2b89badb731c174884f63f9dc057d9b5d3abb664', 0), +(12, 'CC-28-79-89', 'Elvira', 'Latasha', 'Myers', 'latashamyers@corecom.com', 'cbce0e5b4b2d17f0c79abbd76f07f3282aa6a2ca', 1), +(13, 'E1-C8-AB-8C', 'Sonya', 'Shepherd', 'Mcgowan', 'shepherdmcgowan@corecom.com', '20a30cc9baba12fdede04e17d5f170cc9fcf822e', 0), +(14, '7C-94-C4-9A', 'Patrick', 'Sandoval', 'Wolfe', 'sandovalwolfe@corecom.com', '554ee1ceef62cdad454af3b69d0d754630f4b4df', 1), +(15, '36-3C-BB-F4', 'Tamra', 'Julie', 'Alvarado', 'juliealvarado@corecom.com', '7413e384e2768966e7eeb926eed610e923bf587b', 0), +(16, 'E7-52-B2-35', 'Lawanda', 'Erin', 'Hayes', 'erinhayes@corecom.com', '124b79396de86930007b4f1aa9356b11af471fd8', 0), +(17, '94-E7-44-49', 'Susie', 'Jannie', 'Thomas', 'janniethomas@corecom.com', '37405dfe6877accb9428ffb8d369c5626a10ac5f', 1), +(18, '89-64-A2-C2', 'Marlene', 'Janine', 'Mcgee', 'janinemcgee@corecom.com', '5e60c724022514b4e42b1c277c5326938eee9527', 1), +(19, 'AB-E2-19-73', 'Lara', 'Janell', 'Wilcox', 'janellwilcox@corecom.com', 'dc66424c5e8aaeb0d65373ccc0e4395e268aea8f', 0), +(20, '88-13-39-95', 'Callahan', 'Gutierrez', 'Hale', 'gutierrezhale@corecom.com', '41d57f3f623589e04db73f28e9a6dc10c3f900bd', 0), +(21, '6A-8B-F5-05', 'Ball', 'Lowery', 'Clarke', 'loweryclarke@corecom.com', 'c994259253ea665065862485bcff5fde4cd409f7', 1), +(22, 'F2-8B-B7-52', 'Tiffany', 'Noelle', 'Grant', 'noellegrant@corecom.com', '0ee717856d3b9f62e12b832ac11e9940b4ed9e64', 0), +(23, 'C2-97-8A-D1', 'Alisha', 'Dorsey', 'Cohen', 'dorseycohen@corecom.com', '03e337fd61e20c27378c4064913baecb964f8d2e', 1), +(24, 'D1-CD-18-D5', 'Kristen', 'Mosley', 'Allen', 'mosleyallen@corecom.com', 'eb3cbffe04f7db182deb056eda47aa3774b08a94', 0), +(25, 'BF-18-2B-5A', 'Hicks', 'Georgia', 'Henry', 'georgiahenry@corecom.com', '466f50eaccf0704b77724028b81267a254b4217e', 1), +(26, '3A-B9-55-4C', 'Miriam', 'Rosetta', 'Daugherty', 'rosettadaugherty@corecom.com', '724b16ed8ea7c5a83f119f8ae1e5dfabd3bc7d8c', 0), +(27, '6C-90-5E-0A', 'Vilma', 'Adrian', 'Small', 'adriansmall@corecom.com', '72f036819075f34abf4da3f4916e4f8d4e7288e1', 0), +(28, '3B-FE-71-B1', 'Woods', 'Benton', 'Long', 'bentonlong@corecom.com', '68073113e98d49c58d228d97c34442a85f918e4a', 0), +(29, '94-B6-5A-D4', 'Atkinson', 'Atkins', 'Riddle', 'atkinsriddle@corecom.com', 'fd6afb3b2dd3a95462dabc8fb22cd92f998cba8d', 0), +(30, 'C3-61-78-F2', 'Rogers', 'Jolene', 'Young', 'joleneyoung@corecom.com', 'd24a404d3a33003e94037186dbcf2fbd270b9903', 0), +(31, '7D-2B-DB-BD', 'Kirsten', 'Bush', 'Luna', 'bushluna@corecom.com', '057431e9586c02fb55a225af0452e2a02d1fea20', 0), +(32, 'D8-A3-FB-FC', 'Iva', 'Fran', 'Odom', 'franodom@corecom.com', '00dfd8c0cf85fc35e00d8943927c4a3aa443af78', 1), +(33, 'D8-3D-79-D5', 'Morales', 'Stevens', 'Vaughan', 'stevensvaughan@corecom.com', 'ee773b00b2745a6a013b281524345649986524c3', 0), +(34, 'CE-08-DB-1D', 'Kellie', 'Kristi', 'Gilliam', 'kristigilliam@corecom.com', '09d3a7e416cc5d8a0cb55467b893a27cbf47ac0a', 1), +(35, 'F1-3C-AA-0D', 'Mullen', 'Trudy', 'Wolf', 'trudywolf@corecom.com', 'c2488c6e89659ccc8ec0a9d94a8fe93a10af7543', 1), +(36, '86-EE-8D-B3', 'Harper', 'Penelope', 'Harrell', 'penelopeharrell@corecom.com', '2826391ff5a4eb68610b1eaaaa1822eb9e497990', 0), +(37, '34-1E-E7-CC', 'Pollard', 'Pena', 'Roberson', 'penaroberson@corecom.com', '76a17172e62891db5b6f464c4e7b1dfb4b85ba0f', 0), +(38, '36-E8-D6-7F', 'Howell', 'Maryann', 'Keith', 'maryannkeith@corecom.com', 'a029a2716b8d8fd8c8460a58952a90e46a323946', 1), +(39, '23-77-0B-03', 'Lina', 'Allie', 'Matthews', 'alliematthews@corecom.com', 'c611086b8e509e75dd6e840ba9252a39a611e529', 0), +(40, '83-1B-E8-D4', 'Glover', 'Giles', 'Carpenter', 'gilescarpenter@corecom.com', 'd076d97255e6011adca2459e618c8a9dba140261', 1), +(41, '59-4F-13-7B', 'Clarke', 'Newman', 'Mays', 'newmanmays@corecom.com', '1d5da1ad97f86f1e6325ca221843de7b4cf78629', 0), +(42, '03-58-61-02', 'Daphne', 'Josephine', 'Ferguson', 'josephineferguson@corecom.com', 'c4967ca585254f8f2b6b4dc5eb865e3630923d5b', 0), +(43, '5F-CA-AD-DC', 'Maddox', 'Larson', 'Guthrie', 'larsonguthrie@corecom.com', '8840ac79e06e6ab074d29643f2ec6b70d92570d3', 1), +(44, '29-12-1D-1B', 'Ernestine', 'Heidi', 'Harris', 'heidiharris@corecom.com', '0776675c8522200f8376336a99d8fe3b404fe968', 0), +(45, 'E9-61-60-8B', 'Bernice', 'Ella', 'Golden', 'ellagolden@corecom.com', '0aec0b8cf2230cbee1b75b0feba719f6bc7b4e0b', 0), +(46, '3B-27-8E-1F', 'Rhodes', 'Cantrell', 'Castaneda', 'cantrellcastaneda@corecom.com', '7a4ea97f9c78fb5596c03b414170afd804e204b2', 1), +(47, '49-DF-A5-C2', 'Nancy', 'Audrey', 'Wallace', 'audreywallace@corecom.com', '8b0804f444da8c44fe3754aba17139bf3bf3c94d', 1), +(48, 'B1-87-EA-BF', 'Abigail', 'Mcmillan', 'Savage', 'mcmillansavage@corecom.com', '468b273cb88b002da5dc922c80c89b909357cbaa', 0), +(49, '63-7F-09-29', 'Levy', 'Shawna', 'Hicks', 'shawnahicks@corecom.com', '5748e09d9c2133bb782d3ba78dec0b095b3ca2a4', 1), +(50, 'C9-48-F7-62', 'Juarez', 'Lynn', 'Roth', 'lynnroth@corecom.com', '7b427ab021a717478391d3361e956d8ba34ea879', 0), +(51, 'DF-CD-42-C9', 'Pruitt', 'Minerva', 'Tran', 'minervatran@corecom.com', 'd46cf1a3954580cb538921caaf85fae0dd758e5a', 1), +(52, '9F-E7-39-8A', 'Richard', 'Norris', 'West', 'norriswest@corecom.com', '70c47fb0abe612be1cd0f3fa51dcce5e9a36fc1a', 0), +(53, 'F5-AA-76-14', 'Lindsay', 'Wright', 'Delgado', 'wrightdelgado@corecom.com', 'fee325ea1fd06bae0aef0a6c76bb9dc45b49b653', 0), +(54, 'A5-C8-50-F5', 'Darla', 'May', 'Mcconnell', 'maymcconnell@corecom.com', '2725d19076cb23aa8fd149dcee24f61ab5388cbd', 1), +(55, 'A0-0E-D0-AC', 'Nolan', 'Herrera', 'Randall', 'herrerarandall@corecom.com', '0fdaee6506f65f91737e5e686c2b2b46efef28c7', 0), +(56, 'FF-1F-FD-20', 'Zelma', 'Gwendolyn', 'Yates', 'gwendolynyates@corecom.com', '023c94ccd4e8650575362287242fe3adc4085519', 1), +(57, '7D-0D-95-B1', 'Avila', 'Ramos', 'Benton', 'ramosbenton@corecom.com', '6911c3f6b80310363b6d880eb9c143f38921fcfd', 0), +(58, '9D-5A-95-A9', 'Etta', 'Graves', 'Horne', 'graveshorne@corecom.com', 'dbce0141e9e291a4d378d14c2d2d25cbe7f9eeec', 0), +(59, 'B9-3C-5A-74', 'Ava', 'Maribel', 'Lawrence', 'maribellawrence@corecom.com', 'f194d0f315ca8f468b5d80a8fdd394a181fd752d', 0), +(60, 'E0-B9-0F-F5', 'Stein', 'Peterson', 'Lindsey', 'petersonlindsey@corecom.com', 'd2ab2005065787d5bfbff3556ff51ac6786a2ba8', 1), +(61, 'BD-A1-69-F0', 'Tommie', 'Lee', 'Chen', 'leechen@corecom.com', '9a990087014b1d85646c9ec2d504fe067f60c39c', 0), +(62, '81-8B-3B-DD', 'Holmes', 'Doreen', 'Ramos', 'doreenramos@corecom.com', 'a5510d2adc6b1785f6fe08fd9599be777952eadc', 1), +(63, '8D-C8-12-6C', 'Todd', 'Sherri', 'Knight', 'sherriknight@corecom.com', '1590a127ffe84d37118ff543d4cc8c0b0fc828d1', 1), +(64, '12-74-96-57', 'Henry', 'Kane', 'Martinez', 'kanemartinez@corecom.com', '3e6a21cc8850b55ce954e0bc0614ca814c13a840', 0), +(65, '5E-CA-06-D0', 'Liliana', 'Eleanor', 'Molina', 'eleanormolina@corecom.com', '9dc9e7d76223a7f7494d644c69fb73e72bbfb8c0', 0), +(66, '46-D5-1C-58', 'Angelita', 'Pennington', 'Simpson', 'penningtonsimpson@corecom.com', '92ec823b4054e1ebb72eb42cef777f2cbae5191b', 0), +(67, '04-D8-00-77', 'Mcintyre', 'Tami', 'Clements', 'tamiclements@corecom.com', 'e76563ed028f6a61b3676c1d6ff3dfef13c335bf', 0), +(68, '85-F4-B2-64', 'Baker', 'Noreen', 'Chang', 'noreenchang@corecom.com', '8f0b82179c2e3c01d22c7cfc61469a08c11fe972', 1), +(69, '99-82-48-DC', 'Barbra', 'Charlene', 'Meadows', 'charlenemeadows@corecom.com', '1d605e5128de62077fb24442c4a2e650786bfc79', 1), +(70, '51-FC-6F-FB', 'Delacruz', 'Lois', 'Ware', 'loisware@corecom.com', 'ab1214f59416305b6e3c79a87ab88b1b724a1b33', 0), +(71, 'C5-20-CB-4B', 'Wall', 'Mcgee', 'Washington', 'mcgeewashington@corecom.com', '578bcdf6c794d5adae4e18c4ff71eb03b9b5b1f1', 1), +(72, 'BA-25-6F-EA', 'Wilkinson', 'Langley', 'Oneil', 'langleyoneil@corecom.com', 'af13286c8c24ba418182d3aaefde6a5cc01e8e6e', 0), +(73, 'D6-9E-A2-80', 'Rosalie', 'Frost', 'Floyd', 'frostfloyd@corecom.com', '92ed95d940adddb5b4b7bbe2874856b09062f007', 0), +(74, '26-C4-EB-5D', 'Mae', 'Diaz', 'Pruitt', 'diazpruitt@corecom.com', '7539b4a221bf6c0764d269514a6f548c2b4c9f3c', 1), +(75, '8A-BF-C9-3D', 'Bernadine', 'Bullock', 'Tucker', 'bullocktucker@corecom.com', '938f7a23f86230770b7edec8a316edd05f01a38f', 0), +(76, '17-4B-80-EC', 'Norman', 'Foster', 'Hyde', 'fosterhyde@corecom.com', 'bc5dc4129b7e3e89901e688f94b44f92b7547f9e', 0), +(77, 'C8-5B-C6-4A', 'Terra', 'Hahn', 'Larsen', 'hahnlarsen@corecom.com', '59e34409cc08114706d32c96097b4045843739e2', 0), +(78, 'BD-6F-75-F0', 'Ina', 'Payne', 'Hawkins', 'paynehawkins@corecom.com', '98c8df2cb860a5eb7243fae1b541b469cda83265', 1), +(79, 'C4-DB-18-8B', 'Sabrina', 'Leach', 'Cantrell', 'leachcantrell@corecom.com', '8f68f0d8f4bf7c279cc5f67335d307cd0735e3bf', 0), +(80, '23-4D-56-D9', 'Karla', 'Roxanne', 'Bullock', 'roxannebullock@corecom.com', 'a67ab1116f048e5fde51019badc8246cf9201f36', 1), +(81, '04-08-EB-92', 'Clements', 'Munoz', 'Brooks', 'munozbrooks@corecom.com', 'fccfbfa65dbe6c0cb6c7a489c4b9771443782fce', 0), +(82, 'EB-DB-FD-87', 'Mccullough', 'Sofia', 'Farley', 'sofiafarley@corecom.com', '669c1c48f4ba6090f16e2ebfe3a6dfd3e55ea291', 1), +(83, '83-F4-17-0D', 'Cheri', 'Trina', 'Walls', 'trinawalls@corecom.com', '5ed0a7f1b6e13841fe06e93d67d67886dbca283e', 1), +(84, 'E7-7D-E0-52', 'Mcclain', 'Price', 'Gentry', 'pricegentry@corecom.com', '2c2aa9f5961bc8906718abdd09b2e54aa3caf6a7', 1), +(85, '0F-6C-B6-F9', 'Leona', 'Adriana', 'Williamson', 'adrianawilliamson@corecom.com', 'f3255b73f2e807b11cedcd2124c689e4c3ec742e', 1), +(86, '2D-C2-9C-32', 'Roslyn', 'Garner', 'Armstrong', 'garnerarmstrong@corecom.com', '7de33fcbdc4ea015f72d867d6b956bc3fe47ab0a', 0), +(87, '1C-5E-93-06', 'Castillo', 'Rachael', 'Trevino', 'rachaeltrevino@corecom.com', 'c2283af9be2c0db8ec5fbdc2c6b4bfa9eec424bb', 0), +(88, '6F-49-74-A5', 'Helen', 'Samantha', 'Gates', 'samanthagates@corecom.com', '1d9e72419c316b6da5d006748ac983087b38f072', 1), +(89, '54-65-6C-9F', 'Olson', 'Sweet', 'Barry', 'sweetbarry@corecom.com', '11e5db47cc15fec40f359674802f80c1d7a00f5b', 1), +(90, 'BC-1E-40-1A', 'Ann', 'Evans', 'Howe', 'evanshowe@corecom.com', 'f19aab303f71391069117399362f280378962469', 1), +(91, 'F1-D0-5D-4E', 'Haynes', 'Russell', 'Shannon', 'russellshannon@corecom.com', 'fa3204a1deabacda8d4f2e25056a61c7c3a50b71', 1), +(92, 'D5-E3-43-71', 'Malinda', 'Alvarez', 'Singleton', 'alvarezsingleton@corecom.com', '9274d7ab8718f07d5b06c7bda94320b01cbce80d', 0), +(93, '23-41-81-AB', 'Cochran', 'Mcgowan', 'Mclaughlin', 'mcgowanmclaughlin@corecom.com', 'f6bd26e02cd87c09a62087210a3ac35615e248ed', 0), +(94, '28-86-38-25', 'Winters', 'Eugenia', 'Anthony', 'eugeniaanthony@corecom.com', '87c91e44121cfba9f5ef76b0f121f6ace5997989', 1), +(95, 'C7-7C-E2-41', 'Richardson', 'King', 'Rodriguez', 'kingrodriguez@corecom.com', '5b7d5be566bf6ff86a8f241741165bd0b7d2a944', 1), +(96, '6B-1B-5E-A7', 'Walker', 'Montoya', 'Meyer', 'montoyameyer@corecom.com', '323c935631ef2396afc59d93ce7080df7e7cd1b5', 0), +(97, '48-03-38-1F', 'Witt', 'Larsen', 'Strong', 'larsenstrong@corecom.com', '8292d357d783eb4ab3900fba170fb8977e9a8720', 0), +(98, 'E0-4B-04-F6', 'Valarie', 'Craft', 'Klein', 'craftklein@corecom.com', 'b1f2ec40a2f4457d88662b3ef22ff8fe16fb5e4c', 0), +(99, '2F-7D-0A-51', 'Jessica', 'Delgado', 'Campos', 'delgadocampos@corecom.com', '8125b1397016438dc4342d829c286b7597c69803', 0), +(100, '91-D4-7E-65', 'Velez', 'Mcmahon', 'Lott', 'mcmahonlott@corecom.com', 'b6a433da4441737be56635dd80d1a5a8eec2bcd3', 1); /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; diff --git a/config/database-local.json b/config/database-local.json new file mode 100755 index 0000000..d11c9a0 --- /dev/null +++ b/config/database-local.json @@ -0,0 +1,6 @@ +{ + "host" : "localhost", + "dbname" : "stefproject", + "user" : "php", + "password" : "Qt358nUdyeTxLDM8" +} \ No newline at end of file diff --git a/config/database.json b/config/database.json index d11c9a0..2ca9745 100755 --- a/config/database.json +++ b/config/database.json @@ -1,6 +1,6 @@ { - "host" : "localhost", + "host" : "sql31.free-h.org:3306", "dbname" : "stefproject", "user" : "php", - "password" : "Qt358nUdyeTxLDM8" + "password" : "Hx2c#e77" } \ No newline at end of file diff --git a/css/container.css b/css/container.css index a56901f..ef14f5d 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{display:none;flex-grow:1}#WRAPPER>#CONTAINER>section.active{display:block}#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}#WRAPPER>#CONTAINER>section>.inline-box .title{display:inline-block;font-size:1.15em;font-weight:bold}#WRAPPER>#CONTAINER>section>.inline-box .title>span{font-size:.8em;color:#333}#WRAPPER>#CONTAINER>section>.inline-box .code{display:inline-block;color:#777}#WRAPPER>#CONTAINER>section>.inline-box .code svg{display:inline-block;position:relative;margin-left:.5em;margin-right:.5em;margin-bottom:-.6em;width:1.5em;height:2em}#WRAPPER>#CONTAINER>section>.inline-box .code svg path{fill:#777 !important}#WRAPPER>#CONTAINER>section>.inline-box .mail{display:block;margin:1em;color:#777}#WRAPPER>#CONTAINER>section>.inline-box .mail svg{display:inline-block;position:relative;margin-left:.5em;margin-right:.5em;margin-bottom:-.6em;width:1.5em;height:2em}#WRAPPER>#CONTAINER>section>.inline-box .mail svg path{fill:#777 !important} +#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{display:none;flex-grow:1}#WRAPPER>#CONTAINER>section.active{display:block}#WRAPPER>#CONTAINER>section.active.list{display:flex;flex-direction:column}#WRAPPER>#CONTAINER>section.active.list .inline-box{flex:1 1 1}#WRAPPER>#CONTAINER>section>.inline-box{display:inline-block;position:relative;margin:.3em 0;padding:1em;border-radius:3px;box-shadow:0 0 1px #b7b7b7;background-color:#fff}#WRAPPER>#CONTAINER>section>.inline-box .title{display:inline-block;font-size:1.15em;font-weight:bold}#WRAPPER>#CONTAINER>section>.inline-box .title>span{font-size:.8em;color:#333}#WRAPPER>#CONTAINER>section>.inline-box .code{display:inline-block;color:#777}#WRAPPER>#CONTAINER>section>.inline-box .code svg{display:inline-block;position:relative;margin-left:.5em;margin-right:.5em;margin-bottom:-.6em;width:1.5em;height:2em}#WRAPPER>#CONTAINER>section>.inline-box .code svg path{fill:#777 !important}#WRAPPER>#CONTAINER>section>.inline-box .mail{display:block;margin:1em;color:#777}#WRAPPER>#CONTAINER>section>.inline-box .mail svg{display:inline-block;position:relative;margin-left:.5em;margin-right:.5em;margin-bottom:-.6em;width:1.5em;height:2em}#WRAPPER>#CONTAINER>section>.inline-box .mail svg path{fill:#777 !important} /*# sourceMappingURL=container.css.map */ diff --git a/css/container.scss b/css/container.scss index 1abe866..216c1dd 100755 --- a/css/container.scss +++ b/css/container.scss @@ -16,7 +16,7 @@ width: 7.5em; padding: .3em 1em .3em 2em; - margin: 1em ; + margin: 1em; border-radius: 3px; @@ -83,15 +83,27 @@ display: block; } + // @active + .list + & > section.active.list{ + display: flex; + flex-direction: column; + // justify-content: space-between; + // flex-wrap: wrap; + + .inline-box{ + flex: 1 1 1; + } + } + /* [3] INLINE-BOX pour afficher les listes de donnees =========================================================*/ & > section > .inline-box{ - display: block; + display: inline-block; position: relative; - width: calc( 100% - 2*1em - 2*1em ); - margin: 1em; + // width: calc( 100% - 2*1em - 2*1em ); + margin: .3em 0; padding: 1em; border-radius: 3px; diff --git a/manager/Database.php b/manager/Database.php index dbda89b..64072ff 100755 --- a/manager/Database.php +++ b/manager/Database.php @@ -6,7 +6,7 @@ class DataBase{ /* ATTRIBUTS STATIQUES */ - public static $config_path = '/f/json/database/conf'; + public static $config_path = array('/f/json/database/conf', '/f/json/database-local/conf'); private static $pdo; private static $instance; @@ -34,7 +34,10 @@ if( self::$instance == null ){ // chargement de la configuration du server SQL - $conf = json_decode( ResourceDispatcher::getResource(self::$config_path), true ); + if( $_SERVER['HTTP_HOST'] == 'stefprojectv2' ) + $conf = json_decode( ResourceDispatcher::getResource(self::$config_path[0]), true ); + else + $conf = json_decode( ResourceDispatcher::getResource(self::$config_path[1]), true ); // creation de l'instance en fonction des parametres self::$instance = new DataBase($conf['host'], $conf['dbname'], $conf['user'], $conf['password']); diff --git a/manager/ModuleAnswer.php b/manager/ModuleAnswer.php index ad1610f..3a5b899 100755 --- a/manager/ModuleAnswer.php +++ b/manager/ModuleAnswer.php @@ -125,7 +125,8 @@ */ public function serialize(){ - $returnData = array_merge( $this->data, array('ModuleError' => $this->error) ); + // On rajoute l'erreur au message + $returnData = array_merge( array('ModuleError' => $this->error), $this->data ); return json_encode($returnData); diff --git a/src/static/container/card.svg b/src/static/container/card.svg old mode 100644 new mode 100755 diff --git a/src/static/container/mail.svg b/src/static/container/mail.svg old mode 100644 new mode 100755 diff --git a/src/static/menu-side/machines.svg b/src/static/menu-side/machines.svg old mode 100644 new mode 100755 diff --git a/src/static/menu-side/settings.svg b/src/static/menu-side/settings.svg old mode 100644 new mode 100755 diff --git a/view/users.php b/view/users.php index 913bd16..893980f 100755 --- a/view/users.php +++ b/view/users.php @@ -60,8 +60,8 @@ $request = new \manager\ModuleRequest('userDefaultModule/getAll'); // On utilise la methode 'getAll' du module 'userDefaultModule' $answer = $request->dispatch(); // On recupere la reponse - echo "
"; - echo 'Liste des utilisateurs:
'; + echo "
"; + // echo 'Liste des utilisateurs:
'; // si erreur, on affiche l'explicitation if( $answer->error != \manager\ManagerError::Success )