From 0b70e394a70a5b30c75134ea637ee73b57c69811 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Wed, 3 Jun 2015 15:34:20 +0200 Subject: [PATCH] Buttons below window --- controllers/prototype/views/prototype.jade | 57 ++++++++++++---------- js/prototype/ButtonManager.js | 8 +-- js/prototype/main.js | 4 +- views/main.jade | 27 +++++----- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/controllers/prototype/views/prototype.jade b/controllers/prototype/views/prototype.jade index 55facdd..6d2b1c7 100644 --- a/controllers/prototype/views/prototype.jade +++ b/controllers/prototype/views/prototype.jade @@ -16,31 +16,34 @@ block content #main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'}) block description #alert-placeholder - - block fullscreen - button#full.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen - button#reset.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera - - button#undo.btn.btn-default(style={'margin-right': '10px', 'margin-bottom': '10px'}) - span.glyphicon.glyphicon-triangle-left('aria-hidden'="true") - - button#redo.btn.btn-default(style={'margin-right': '10px', 'margin-bottom':'10px'}) - span.glyphicon.glyphicon-triangle-right('aria-hidden'="true") - - input#fullarrow(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}) - label(for="fullarrow" style={'margin-right':'10px'}) Full arrow - - input#collisions(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}, checked) - label(for="collisions" style={'margin-right':'10px'}) Collisions - - input#showarrows(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}, checked) - label(for="showarrows" style={'margin-right':'10px'}) Show arrows - - input#recommendation(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}) - label(for="recommendation" style={'margin-right':'10px'}) Fixed prev - - audio#music(controls, volume=0.5) - source(src="/static/data/music/bobomb.ogg") - source(src="/static/data/music/bobomb.mp3") - + div(style="margin:5px") #container(style={'padding': '0px', 'margin': '0px'}, tabindex="1") + + nav.navbar.navbar-default.navbar-fixed-bottom + .container + block fullscreen + button#full.btn.btn-primary.navbar-btn(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen + button#reset.btn.btn-primary.navbar-btn(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera + + button#undo.btn.btn-default.navbar-btn(style={'margin-right': '10px', 'margin-bottom': '10px'}) + span.glyphicon.glyphicon-triangle-left('aria-hidden'="true") + + button#redo.btn.btn-default.navbar-btn(style={'margin-right': '10px', 'margin-bottom':'10px'}) + span.glyphicon.glyphicon-triangle-right('aria-hidden'="true") + + input#fullarrow(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}) + label(for="fullarrow" style={'margin-right':'10px'}) Full arrow + + input#collisions(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}, checked) + label(for="collisions" style={'margin-right':'10px'}) Collisions + + input#showarrows(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}, checked) + label(for="showarrows" style={'margin-right':'10px'}) Show arrows + + input#recommendation(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}) + label(for="recommendation" style={'margin-right':'10px'}) Fixed prev + + audio#music(controls, volume=0.5) + source(src="/static/data/music/bobomb.ogg") + source(src="/static/data/music/bobomb.mp3") + diff --git a/js/prototype/ButtonManager.js b/js/prototype/ButtonManager.js index c716832..3e0f759 100644 --- a/js/prototype/ButtonManager.js +++ b/js/prototype/ButtonManager.js @@ -49,15 +49,15 @@ var ButtonManager = function(cameras, previewer) { ButtonManager.prototype.updateElements = function() { // Update icon if (!this.cameras.mainCamera().undoable()) { - this.undoElement.className = "btn btn-default"; + this.undoElement.className = "btn btn-default navbar-btn"; } else { - this.undoElement.className = "btn btn-primary"; + this.undoElement.className = "btn btn-primary navbar-btn"; } if (!this.cameras.mainCamera().redoable()) { - this.redoElement.className = "btn btn-default"; + this.redoElement.className = "btn btn-default navbar-btn"; } else { - this.redoElement.className = "btn btn-primary"; + this.redoElement.className = "btn btn-primary navbar-btn"; } } diff --git a/js/prototype/main.js b/js/prototype/main.js index ff26161..3f29c5f 100644 --- a/js/prototype/main.js +++ b/js/prototype/main.js @@ -78,9 +78,9 @@ function init() { // Initialize pointer camera var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container); - // cameras = initBobomb(camera1, scene, static_path, coins); + cameras = initBobomb(camera1, scene, static_path, coins); // cameras = initWhomp(camera1, scene, static_path, coins); - cameras = initMountain(camera1, scene, static_path, coins); + // cameras = initMountain(camera1, scene, static_path, coins); // Add listeners initListeners(); diff --git a/views/main.jade b/views/main.jade index db564a2..acfbe5f 100644 --- a/views/main.jade +++ b/views/main.jade @@ -46,20 +46,19 @@ html(lang='fr') li a(href="#{urls.stream}") Streaming simulator - ul.nav.navbar-nav.navbar-right.navbar-form - div.form-group(style={'margin-left': '5px'}) - a.btn.btn-default.btn-sm(type="button", href="https://github.com/tforgione/3dinterface") - img(src="/static/GitHub-Mark/PNG/GitHub-Mark-32px.png", width="17px") - span(style={'margin-left':'5px'}) Github Repo - div.form-group(style={'margin-left': '5px'}) - a.btn.btn-default.btn-sm(type="button", href="https://github.com/tforgione/3dinterface/wiki") - span.glyphicon.glyphicon-book(aria-hidden=true) - span(style={'margin-left':'5px'}) Github wiki - div.form-group(style={'margin-left': '5px'}) - a(href="mailto:thomas.forgione@gmail.com") - button.btn.btn-default.btn-sm(type="button") - span.glyphicon.glyphicon-envelope(aria-hidden=true) - span(style={'margin-left':'5px'}) Contact + ul.navbar-nav.navbar-right + a.btn.btn-default.navbar-btn(type="button", href="https://github.com/tforgione/3dinterface", style={margin: "0px 5px"}) + img(src="/static/GitHub-Mark/PNG/GitHub-Mark-32px.png", width="17px") + span(style={'margin-left':'5px'}) Github Repo + a.btn.btn-default.navbar-btn(type="button", href="https://github.com/tforgione/3dinterface/wiki", style={margin: "0px 5px"}) + span.glyphicon.glyphicon-book(aria-hidden=true, style={"margin-right":"10px"}) + span Github wiki + + a.btn.btn-default.navbar-btn(type="button", href="mailto:thomas.forgione@gmail.com", style={'margin-right': "10px", 'margin-left': '5px'}) + span.glyphicon.glyphicon-envelope(aria-hidden=true) + span(style={'margin-left':'5px'}) Contact + + div section#main-section.container if alertCookie