From e04326c9f34a1c64878fa9d80294274a65acb032 Mon Sep 17 00:00:00 2001 From: Pierre Date: Wed, 24 May 2017 16:21:34 +0200 Subject: [PATCH] Added login form --- assets/adminLTE/bootstrap/js/npm.js | 13 ----- assets/css/components/menuBar.css | 12 +++++ assets/js/components/mailCachingController.js | 5 ++ assets/js/components/menuBar/common.js | 11 +++++ .../js/components/menuBar/notAuthenticated.js | 49 +++++++++++++++++-- corePage/config/dev.config.php | 5 ++ 6 files changed, 79 insertions(+), 16 deletions(-) delete mode 100755 assets/adminLTE/bootstrap/js/npm.js create mode 100644 assets/css/components/menuBar.css create mode 100644 assets/js/components/mailCachingController.js diff --git a/assets/adminLTE/bootstrap/js/npm.js b/assets/adminLTE/bootstrap/js/npm.js deleted file mode 100755 index bf6aa806..00000000 --- a/assets/adminLTE/bootstrap/js/npm.js +++ /dev/null @@ -1,13 +0,0 @@ -// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. -require('../../js/transition.js') -require('../../js/alert.js') -require('../../js/button.js') -require('../../js/carousel.js') -require('../../js/collapse.js') -require('../../js/dropdown.js') -require('../../js/modal.js') -require('../../js/tooltip.js') -require('../../js/popover.js') -require('../../js/scrollspy.js') -require('../../js/tab.js') -require('../../js/affix.js') \ No newline at end of file diff --git a/assets/css/components/menuBar.css b/assets/css/components/menuBar.css new file mode 100644 index 00000000..a1154ba7 --- /dev/null +++ b/assets/css/components/menuBar.css @@ -0,0 +1,12 @@ +/** + * Menubar stylesheet + * + * @author Pierre HUBERT + */ + +/** + * Login form + */ +.menubar-loginForm .form-control { + margin-right: 1px; +} \ No newline at end of file diff --git a/assets/js/components/mailCachingController.js b/assets/js/components/mailCachingController.js new file mode 100644 index 00000000..6c52fe74 --- /dev/null +++ b/assets/js/components/mailCachingController.js @@ -0,0 +1,5 @@ +/** + * Mail caching controller + * + * @author Pierre HUBERT + */ \ No newline at end of file diff --git a/assets/js/components/menuBar/common.js b/assets/js/components/menuBar/common.js index 75b7803f..72e0e36a 100644 --- a/assets/js/components/menuBar/common.js +++ b/assets/js/components/menuBar/common.js @@ -70,6 +70,17 @@ ComunicWeb.components.menuBar.common = { ComunicWeb.common.page.openPage("home"); }); + //Create navbar collapsed button + var navbarCollapsedButton = createElem("button", navbarHeader); + navbarCollapsedButton.type = "button"; + navbarCollapsedButton.className = "navbar-toggle collapsed"; + navbarCollapsedButton.setAttribute("data-toggle", "collapse"); + navbarCollapsedButton.setAttribute("data-target", "#navbar-collapse"); + + //Create navbar icon + var navbarCollapsIcon = createElem("i", navbarCollapsedButton); + navbarCollapsIcon.className = "fa fa-bars"; + //Now we need to know if user is logged in or not var userLoggedIn = ComunicWeb.user.userLogin.getUserLoginState(); diff --git a/assets/js/components/menuBar/notAuthenticated.js b/assets/js/components/menuBar/notAuthenticated.js index 1764409c..b8a01b03 100644 --- a/assets/js/components/menuBar/notAuthenticated.js +++ b/assets/js/components/menuBar/notAuthenticated.js @@ -8,9 +8,52 @@ ComunicWeb.components.menuBar.notAuthenticated = { /** * Add not-authenticated user specific elements * - * @param {HTMLElement} addElements The container element of the Menubar + * @param {HTMLElement} container The container element of the Menubar */ - addElements: function(addElements){ - + addElements: function(container){ + + //Create an auto-collapsed element + var navbarCollapse = createElem("div", container); + navbarCollapse.id = "navbar-collapse"; + navbarCollapse.className = "navbar-collapse pull-right collapse"; + + //Create login form + var loginForm = createElem("form", navbarCollapse); + loginForm.className = "navbar-form navbar-left menubar-loginForm"; + loginForm.setAttribute("role", "login"); + + loginForm.onsubmit = function(){ + //Try to login user; in case of failure redirect + } + + //Add email address formGroup + var emailFormGroup = createElem("div", loginForm); + emailFormGroup.className = "form-group"; + + //Add email input + var emailInput = createElem("input", emailFormGroup); + emailInput.className = "form-control"; + emailInput.placeholder = "Email address"; + emailInput.type = "email"; + + //Add password formGroup + var passwordFormGroup = createElem("div", loginForm); + passwordFormGroup.className = "form-group"; + + //Add password input + var passwordInput = createElem("input", passwordFormGroup); + passwordInput.className = "form-control"; + passwordInput.placeholder = "Password"; + passwordInput.type = "password"; + + //Add submit button formGroup + var submitFromGroup = createElem("div", loginForm); + submitFromGroup.className = "form-group"; + + //Add submit input + var submitInput = createElem("input", submitFromGroup); + submitInput.className = "form-control"; + submitInput.value = "Login"; + submitInput.type = "submit"; } } \ No newline at end of file diff --git a/corePage/config/dev.config.php b/corePage/config/dev.config.php index bb7cef41..dbbcf309 100644 --- a/corePage/config/dev.config.php +++ b/corePage/config/dev.config.php @@ -21,14 +21,19 @@ $config['CSSfiles'] = array( //App stylesheets "%PATH_ASSETS%css/common/global.css", "%PATH_ASSETS%css/common/page/waitSplashScreen.css", + + //Components stylesheets + "%PATH_ASSETS%css/components/menuBar.css", ); //JS files to include (at the end of the page) $config['JSfiles'] = array( //Framewokr inclusions "%PATH_ASSETS%adminLTE/plugins/jQuery/jquery-2.2.3.min.js", + "%PATH_ASSETS%adminLTE/bootstrap/js/bootstrap.min.js", "%PATH_ASSETS%adminLTE/plugins/jquery-ui/jquery-ui.min.js", "%PATH_ASSETS%adminLTE/plugins/iCheck/icheck.min.js", + "%PATH_ASSETS%adminLTE/dist/js/app.min.js", //Utilities "%PATH_ASSETS%js/common/utils.js",