tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Buttons below window

This commit is contained in:
Thomas FORGIONE 2015-06-03 15:34:20 +02:00
parent 59988b1c8b
commit 0b70e394a7
4 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/prototype/views/prototype.jade
View File

@ -16,15 +16,19 @@ block content
#main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'}) #main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'})
block description block description
#alert-placeholder #alert-placeholder
div(style="margin:5px")
#container(style={'padding': '0px', 'margin': '0px'}, tabindex="1")
nav.navbar.navbar-default.navbar-fixed-bottom
.container
block fullscreen block fullscreen
button#full.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen button#full.btn.btn-primary.navbar-btn(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen
button#reset.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera button#reset.btn.btn-primary.navbar-btn(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera
button#undo.btn.btn-default(style={'margin-right': '10px', 'margin-bottom': '10px'}) button#undo.btn.btn-default.navbar-btn(style={'margin-right': '10px', 'margin-bottom': '10px'})
span.glyphicon.glyphicon-triangle-left('aria-hidden'="true") span.glyphicon.glyphicon-triangle-left('aria-hidden'="true")
button#redo.btn.btn-default(style={'margin-right': '10px', 'margin-bottom':'10px'}) button#redo.btn.btn-default.navbar-btn(style={'margin-right': '10px', 'margin-bottom':'10px'})
span.glyphicon.glyphicon-triangle-right('aria-hidden'="true") span.glyphicon.glyphicon-triangle-right('aria-hidden'="true")
input#fullarrow(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'}) input#fullarrow(type="checkbox", style={'margin-right': '10px', 'margin-bottom': '10px'})
@ -43,4 +47,3 @@ block content
source(src="/static/data/music/bobomb.ogg") source(src="/static/data/music/bobomb.ogg")
source(src="/static/data/music/bobomb.mp3") source(src="/static/data/music/bobomb.mp3")
#container(style={'padding': '0px', 'margin': '0px'}, tabindex="1")

8
js/prototype/ButtonManager.js vendored
View File

@ -49,15 +49,15 @@ var ButtonManager = function(cameras, previewer) {
ButtonManager.prototype.updateElements = function() { ButtonManager.prototype.updateElements = function() {
// Update icon // Update icon
if (!this.cameras.mainCamera().undoable()) { if (!this.cameras.mainCamera().undoable()) {
this.undoElement.className = "btn btn-default"; this.undoElement.className = "btn btn-default navbar-btn";
} else { } else {
this.undoElement.className = "btn btn-primary"; this.undoElement.className = "btn btn-primary navbar-btn";
} }
if (!this.cameras.mainCamera().redoable()) { if (!this.cameras.mainCamera().redoable()) {
this.redoElement.className = "btn btn-default"; this.redoElement.className = "btn btn-default navbar-btn";
} else { } else {
this.redoElement.className = "btn btn-primary"; this.redoElement.className = "btn btn-primary navbar-btn";
} }
} }

4
js/prototype/main.js vendored
View File

@ -78,9 +78,9 @@ function init() {
// Initialize pointer camera // Initialize pointer camera
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container); 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 = initWhomp(camera1, scene, static_path, coins);
cameras = initMountain(camera1, scene, static_path, coins); // cameras = initMountain(camera1, scene, static_path, coins);
// Add listeners // Add listeners
initListeners(); initListeners();

19
views/main.jade
View File

@ -46,21 +46,20 @@ html(lang='fr')
li li
a(href="#{urls.stream}") Streaming simulator a(href="#{urls.stream}") Streaming simulator
ul.nav.navbar-nav.navbar-right.navbar-form ul.navbar-nav.navbar-right
div.form-group(style={'margin-left': '5px'}) a.btn.btn-default.navbar-btn(type="button", href="https://github.com/tforgione/3dinterface", style={margin: "0px 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") img(src="/static/GitHub-Mark/PNG/GitHub-Mark-32px.png", width="17px")
span(style={'margin-left':'5px'}) Github Repo span(style={'margin-left':'5px'}) Github Repo
div.form-group(style={'margin-left': '5px'}) a.btn.btn-default.navbar-btn(type="button", href="https://github.com/tforgione/3dinterface/wiki", style={margin: "0px 5px"})
a.btn.btn-default.btn-sm(type="button", href="https://github.com/tforgione/3dinterface/wiki") span.glyphicon.glyphicon-book(aria-hidden=true, style={"margin-right":"10px"})
span.glyphicon.glyphicon-book(aria-hidden=true) span Github wiki
span(style={'margin-left':'5px'}) Github wiki
div.form-group(style={'margin-left': '5px'}) a.btn.btn-default.navbar-btn(type="button", href="mailto:thomas.forgione@gmail.com", style={'margin-right': "10px", '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.glyphicon.glyphicon-envelope(aria-hidden=true)
span(style={'margin-left':'5px'}) Contact span(style={'margin-left':'5px'}) Contact
div
section#main-section.container section#main-section.container
if alertCookie if alertCookie
.alert.alert-warning.alert-dismissible(role="alert", style={'margin-top':'20px'}) .alert.alert-warning.alert-dismissible(role="alert", style={'margin-top':'20px'})