From 5ac6f54927a539d92f16202d0372f6796a746864 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Fri, 28 Aug 2015 11:13:27 +0200 Subject: [PATCH] Some changing in forms --- controllers/feedback/views/index.jade | 1 + controllers/intro/views/index.jade | 2 +- controllers/prototype/views/prototype.jade | 2 +- controllers/prototype/views/user_study.jade | 18 +++++++++++------- js/Makefile | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/controllers/feedback/views/index.jade b/controllers/feedback/views/index.jade index fd194e8..6494b91 100644 --- a/controllers/feedback/views/index.jade +++ b/controllers/feedback/views/index.jade @@ -36,6 +36,7 @@ block content +question(4, "Did the recommendations help you to browse the scene ?") +question(5, "Do you think recommendations can be helpful ?") +question(6, "Which recommendation style do you prefer and why ?") + +question(7, "Did you enjoy this ?") //-label(for='input1') Did you have trouble to find the coins during the first step ? //-input#input1.form-control(name="input1", type="text", placeholder='Id') diff --git a/controllers/intro/views/index.jade b/controllers/intro/views/index.jade index 59ae013..e8d45a2 100644 --- a/controllers/intro/views/index.jade +++ b/controllers/intro/views/index.jade @@ -7,7 +7,7 @@ block content li Enter some personal information that we will use for statistics purposes li Complete a tutorial to learn how to use the 3D navigation interface li Play a game in which you have to find coins hidden in a 3D world. You need to play the game in 3 different scenes. - li Complete a short questionnary to give us feedback on the 3D navigation interface + li Complete a short questionnaire to give us feedback on the 3D navigation interface h2#start block extrajs diff --git a/controllers/prototype/views/prototype.jade b/controllers/prototype/views/prototype.jade index 305182f..87353ff 100644 --- a/controllers/prototype/views/prototype.jade +++ b/controllers/prototype/views/prototype.jade @@ -4,7 +4,7 @@ block title title #{title} - Prototype block extrajs - script(src="/static/js/l3dp.min.js") + script(src="/static/js/raphael.min.js") block configjs block mainjs script document.getElementById('music').volume = 0.5; diff --git a/controllers/prototype/views/user_study.jade b/controllers/prototype/views/user_study.jade index aa6eb53..b0772c3 100644 --- a/controllers/prototype/views/user_study.jade +++ b/controllers/prototype/views/user_study.jade @@ -42,8 +42,9 @@ block content .form-group label(for='sel1') How old are you ? select.form-control#sel1(name="inputAge") - option(value='-20') Less than 20 - option(value='20-25') Between 20 and 25 + option(value='-15') Less than 15 + option(value='15-20') Between 15 and 18 + option(value='18-25') Between 18 and 25 option(value='25-30') Between 25 and 30 option(value='30-35') Between 30 and 35 option(value='35-40') Between 35 and 40 @@ -53,11 +54,6 @@ block content option(value='55-60') Between 55 and 60 option(value='60-') More than 60 - label(for='3dgames', style={'margin-right':'10px'}) Rate your 3D game skills - span.glyphicon.glyphicon-question-sign(type='button', data-toggle='tooltip', data-placement='top', title='1 star if you never played any 3D games, 5 stars if you are used to 3D video games.') - - input#3dgames(type='number', class='rating', min='0', max='5', step='1', default='3', name='input3dskills') - .form-group label(for='se21', style={'margin-right':'10px'}) When is the last time you played a 3D video game ? span.glyphicon.glyphicon-question-sign(type='button', data-toggle='tooltip', data-placement='top', title='Any game will count (PC or console, old or recent)') @@ -67,7 +63,15 @@ block content option(value='1') This year option(value='0') I never played a 3D video game + label(for='3dgames', style={'margin-right':'10px'}) Rate your 3D game skills + ul + li 1 star if you never play video games + li 2 stars if you rarely play games + li 3 stars if you are used to play console (PlayStation, Xbox, Nintendo, portable devices included) + li 4 stars if you are used to play first-person-view games + li 5 stars if you are good at first-person-view games + input#3dgames(type='number', class='rating', min='0', max='5', step='1', default='3', name='input3dskills') button.btn.btn-lg.btn-primary.btn-block(type='submit') Sign in diff --git a/js/Makefile b/js/Makefile index 8db62da..c167e0c 100644 --- a/js/Makefile +++ b/js/Makefile @@ -6,7 +6,7 @@ else CLOSURE=../utils/simple-compiler/compiler.sh endif -all: L3D L3DP Socket Three Stats Bouncing Multisphere StreamingSimulator PrototypeReplay PrototypeInteractive Tutorial TestList CoinCreator CoinViewer CoinChecker StarRating +all: L3D L3DP Socket Three Stats Bouncing Multisphere StreamingSimulator PrototypeReplay PrototypeInteractive Tutorial TestList CoinCreator CoinViewer CoinChecker StarRating JustGage StarRating: cp star-rating.min.js ../static/js/