From 68847b98e7b7804656e2abe09190a1b3553dbfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Pu=C5=A1nik?= Date: Tue, 29 Sep 2015 13:12:02 +0200 Subject: logout, sign in + change password modals, setting drop-down, profile screen --- css/codeq.css | 32 -------- index.html | 214 ++++++++++++++++++++++++++++++++++++++++++++++--- js/codeq/core.js | 4 +- js/codeq/login.js | 1 + js/codeq/navigation.js | 9 +++ js/codeq/statusbar.js | 2 +- 6 files changed, 219 insertions(+), 43 deletions(-) diff --git a/css/codeq.css b/css/codeq.css index 153e870..138761b 100644 --- a/css/codeq.css +++ b/css/codeq.css @@ -109,18 +109,6 @@ body { min-height: 100%; height: 100%; } - /* focus on 1st block */ - .quadrants.block1 > * > .block { min-width: 22%; width: 22%; } - .quadrants.block1 > * > .block.block1 { min-width: 34%; width: 34%; } - /* focus on 2nd block */ - .quadrants.block2 > * > .block { min-width: 22%; width: 22%; } - .quadrants.block2 > * > .block.block2 { min-width: 34%; width: 34%; } - /* focus on 3rd block */ - .quadrants.block3 > * > .block { min-width: 22%; width: 22%; } - .quadrants.block3 > * > .block.block3 { min-width: 34%; width: 34%; } - /* focus on 4th block */ - .quadrants.block4 > * > .block { min-width: 22%; width: 22%; } - .quadrants.block4 > * > .block.block4 { min-width: 34%; width: 34%; } } /* md */ @@ -135,26 +123,6 @@ body { min-height: 50%; height: 50%; } - /* focus on 1st block */ - .quadrants.block1 > * > .block1 { min-height: 60%; height: 60%; min-width: 60%; width: 60%; } - .quadrants.block1 > * > .block2 { min-height: 60%; height: 60%; min-width: 40%; width: 40%; } - .quadrants.block1 > * > .block3 { min-height: 40%; height: 40%; min-width: 60%; width: 60%; } - .quadrants.block1 > * > .block4 { min-height: 40%; height: 40%; min-width: 40%; width: 40%; } - /* focus on 2nd block */ - .quadrants.block2 > * > .block1 { min-height: 60%; height: 60%; min-width: 40%; width: 40%; } - .quadrants.block2 > * > .block2 { min-height: 60%; height: 60%; min-width: 60%; width: 60%; } - .quadrants.block2 > * > .block3 { min-height: 40%; height: 40%; min-width: 40%; width: 40%; } - .quadrants.block2 > * > .block4 { min-height: 40%; height: 40%; min-width: 60%; width: 60%; } - /* focus on 3rd block */ - .quadrants.block3 > * > .block1 { min-height: 40%; height: 40%; min-width: 60%; width: 60%; } - .quadrants.block3 > * > .block2 { min-height: 40%; height: 40%; min-width: 40%; width: 40%; } - .quadrants.block3 > * > .block3 { min-height: 60%; height: 60%; min-width: 60%; width: 60%; } - .quadrants.block3 > * > .block4 { min-height: 60%; height: 60%; min-width: 40%; width: 40%; } - /* focus on 4th block */ - .quadrants.block4 > * > .block1 { min-height: 40%; height: 40%; min-width: 40%; width: 40%; } - .quadrants.block4 > * > .block2 { min-height: 40%; height: 40%; min-width: 60%; width: 60%; } - .quadrants.block4 > * > .block3 { min-height: 60%; height: 60%; min-width: 40%; width: 40%; } - .quadrants.block4 > * > .block4 { min-height: 60%; height: 60%; min-width: 60%; width: 60%; } } /* sm */ diff --git a/index.html b/index.html index 2299c2d..105fae4 100644 --- a/index.html +++ b/index.html @@ -54,12 +54,57 @@ -
    • +
  • + +
    +
    +
    + Language +
    + +
    +
    + + Language + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    • @@ -70,14 +115,20 @@
    + + + + + + + + + @@ -197,6 +392,7 @@ + diff --git a/js/codeq/core.js b/js/codeq/core.js index 1685dd7..3dfa7c2 100644 --- a/js/codeq/core.js +++ b/js/codeq/core.js @@ -389,5 +389,7 @@ codeq.setLang(lang || 'en'); // initial language setting // go to login codeq.globalStateMachine.transition('login'); - }); + + //For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself. + $('[data-toggle="popover"]').popover()}); })(); diff --git a/js/codeq/login.js b/js/codeq/login.js index c400f06..f590acb 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -29,6 +29,7 @@ codeq.globalStateMachine.register('login',{ 'enter': function(){ $("#submit").on('click', loginFun); + //$('#modalLogin').modal(); $("#screen_login").css('display', ''); $('#disabled').css('display', 'none'); diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js index 1a7799f..80fd321 100644 --- a/js/codeq/navigation.js +++ b/js/codeq/navigation.js @@ -97,4 +97,13 @@ codeq.globalStateMachine.transition('prolog'); e.preventDefault(); }); + $('#navigation-logout').on('click', function(e){ + codeq.globalStateMachine.transition('login'); + e.preventDefault();//prevent this since we'll trigger a page reload otherwise + }); + $('#navigation-profile').on('click', function(e){ + codeq.globalStateMachine.transition('profile'); + e.preventDefault();//prevent this since we'll trigger a page reload otherwise + }); + })(); \ No newline at end of file diff --git a/js/codeq/statusbar.js b/js/codeq/statusbar.js index 2134b93..56070bd 100644 --- a/js/codeq/statusbar.js +++ b/js/codeq/statusbar.js @@ -6,7 +6,7 @@ (function () { var langs = codeq.supportedLangs, - jqMenu = jqBar.find('.dropdown-menu'), + jqMenu = jqLang.find('.dropdown-menu'), lang, cssClass; for (lang in langs) { if (!langs.hasOwnProperty(lang)) continue; -- cgit v1.2.1