Embed Vvalls

+ +

+ This code generates an iframe which will embed this room in your website or blog. +

+ + + dimensions: x + mute + + +

Terms

Privacy

[[ include controls/reader/about-room ]] [[ include controls/reader/media-player ]] + [[ include controls/reader/embed ]]

Date: Fri, 21 Nov 2014 16:50:08 -0500 Subject: fixing bugs --- public/assets/stylesheets/app.css | 49 ++++++++++++++++++++------------------- views/editor.ejs | 1 + views/reader.ejs | 1 + 3 files changed, 27 insertions(+), 24 deletions(-) (limited to 'views/reader.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 5891ad6..b4b07b5 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -3089,31 +3089,40 @@ a[data-role="forgot-password"] { .aboutRoom { display:none; } + .mx-scene{ + display:none; + } .mobile #scene:after{ - content: "Hello friend! For best viewing we suggest flipping your device sideways and spinning around in circles :)"; + content: "To view this room, flip your device sideways and spin around in circles :)"; z-index: 3; position: fixed; display: inline-block; - background: white; - width: 90%; - top: 50px; - left: 10px; + width: 300px; + top: 80px; + left: 6px; font-size: 27px; font-weight: 300; line-height: 50px; + border-top: 1px solid; border-bottom: 1px solid; - padding-bottom: 20px; + padding: 20px 0; + background-color:rgba(255,255,255,0.7); } +} +#threesixty { + display:none; + width:80px; + z-index: 3; + position: fixed; + bottom: 0; + right: 0; + pointer-events:none; } @media screen and (orientation:landscape) { - .mobile #scene:after{ - content:url(/assets/img/360.png); - z-index: 3; - position: fixed; - bottom: -3px; - right: -3px; + #threesixty { + display:inline; } } @@ -3131,12 +3140,8 @@ a[data-role="forgot-password"] { .hero{ height: 500pt; } - .mobile #scene:after{ - content:url(/assets/img/360.png); - z-index: 3; - position: fixed; - bottom: -3px; - right: -3px; + #threesixty { + display:inline; } #keyhint { display:none; @@ -3151,12 +3156,8 @@ a[data-role="forgot-password"] { .hero{ height: 500pt; } - .mobile #scene:after{ - content:url(/assets/img/360.png); - z-index: 3; - position: fixed; - bottom: -3px; - right: -3px; + #threesixty { + display:inline; } #keyhint { display:none; diff --git a/views/editor.ejs b/views/editor.ejs index efc4b9d..656615c 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -35,6 +35,7 @@ +

diff --git a/views/reader.ejs b/views/reader.ejs index 09b702e..363015b 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -28,6 +28,7 @@ [[ include projects/layouts-modal ]] [[ include partials/sign-in ]]

[[ include partials/scripts ]] -- cgit v1.2.3-70-g09d2 From 23a4b54b995c1c07fcde48eadae90454bfaf212e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 21 Nov 2014 17:15:23 -0500 Subject: fix player --- public/assets/javascripts/app.js | 3 +- public/assets/javascripts/ui/site/HomeView.js | 3 +- public/assets/stylesheets/app.css | 43 +++++++++++++++------------ views/home.ejs | 1 + views/reader.ejs | 5 ++-- 5 files changed, 31 insertions(+), 24 deletions(-) (limited to 'views/reader.ejs') diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 5620cdc..01a2e54 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -1,10 +1,9 @@ if (is_mobile) { - // window.location.href = "mobile.html" $("html").addClass("mobile"); } else if ($.browser.msie || ! has3d()) { - // window.location.href = "error.html" + $("html").addClass("fallback"); } else { $("html").addClass("desktop"); diff --git a/public/assets/javascripts/ui/site/HomeView.js b/public/assets/javascripts/ui/site/HomeView.js index 404a491..a04bac1 100644 --- a/public/assets/javascripts/ui/site/HomeView.js +++ b/public/assets/javascripts/ui/site/HomeView.js @@ -7,7 +7,8 @@ var HomeView = View.extend({ load: function() { this.projectList = new ProjectList () - var player = $f( okplayer ) + var iframe = $("#okplayer")[0] + var player = $f( iframe ) player.addEvent('ready', function(){ player.addEvent('play', function(){ player.api('setVolume', 1.0) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index b4b07b5..4676eea 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1279,22 +1279,24 @@ border-left: 1px solid black; background: black; } .animate { - -webkit-transition:all 0.2s ease-in-out; - transform:translateY(-100%); + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + -webkit-transform: translateY(-100%); + transform: translateY(-100%); } .mediaDrawer { - -webkit-transform:translateY(-100%); - transform:translateY(-100%); - background:white; - text-align:center; + -webkit-transform: translateY(-100%); + transform: translateY(-100%); + background: white; + text-align: center; overflow-x: hidden; } .editing .mediaDrawer { background:rgba(255,255,255,0.95); } .mediaDrawer.active { - -webkit-transform:translateY(0%); - transform:translateY(0%); + -webkit-transform: translateY(0%); + transform: translateY(0%); } .mediaDrawer.table, .mediaDrawer.error, .mediaDrawer.signin, .mediaDrawer.signup, @@ -1375,7 +1377,7 @@ border-left: 1px solid black; cursor:text; } -.fileUpload{ +.fileUpload { position: fixed; width: 400px; text-align: center; @@ -1389,14 +1391,14 @@ border-left: 1px solid black; -webkit-transform: translateY(-1000%); -webkit-transition: -webkit-transform 0.6s ease-in-out; transform: translateY(-1000%); - transition: -webkit-transform 0.6s ease-in-out; + transition: transform 0.6s ease-in-out; border: 1px solid; box-shadow: -3px 3px black; } .fileUpload.active { - -webkit-transform:translateY(0%); - transform:translateY(0%); + -webkit-transform: translateY(0%); + transform: translateY(0%); } .fileUpload .ion-ios7-upload-outline { @@ -1594,12 +1596,12 @@ border-left: 1px solid black; -moz-user-select: none; user-select: none; } -#minimap.hide{ +#minimap.hide { -webkit-transform: translateY(155px); transform: translateY(155px); } -#minimap.hide canvas{ - opacity:0; +#minimap.hide canvas { + opacity: 0; } #minimap canvas { display: block; @@ -1621,9 +1623,9 @@ border-left: 1px solid black; } .reader #minimap.active { - -webkit-transform:translateX(0px); - -moz-transform:translateX(0px); - transform:translateX(0px); + -webkit-transform: translateX(0px); + -moz-transform: translateX(0px); + transform: translateX(0px); left: auto; } @@ -2547,11 +2549,14 @@ form li textarea { } #fixed_close { display: none; + -webkit-transform: translateY(-200px) translateZ(0); transform: translateY(-200px) translateZ(0); } #fixed_close.active { - animation:0.2s transform linear 1s; + -webkit-transition: 0.2s -webkit-transform linear 1s; + transition: 0.2s transform linear 1s; display: block; + -webkit-transform: translateY(0px) translateZ(0); transform: translateY(0px) translateZ(0); } diff --git a/views/home.ejs b/views/home.ejs index 2c9c204..36fc2fc 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -82,6 +82,7 @@

+ [[ include partials/scripts ]] diff --git a/views/reader.ejs b/views/reader.ejs index 363015b..6c9856a 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -27,8 +27,9 @@ [[ include partials/confirm-modal ]] [[ include projects/layouts-modal ]] [[ include partials/sign-in ]] -

+ +

[[ include partials/scripts ]] -- cgit v1.2.3-70-g09d2 From 9c6f8f8568d20d75eb22955dbf2752ea777e59f8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 7 Jan 2015 14:34:41 -0500 Subject: stub in brochure page --- public/assets/stylesheets/app.css | 14 +++++++ server/lib/schemas/Plan.js | 6 +++ server/lib/schemas/Subscription.js | 2 +- server/lib/views/index.js | 5 +++ server/lib/views/subscription.js | 1 - views/about/_blank.ejs | 2 +- views/about/about.ejs | 16 +------- views/about/brochure.ejs | 79 ++++++++++++++++++++++++++++++++++++++ views/about/howto.ejs | 2 +- views/builder.ejs | 2 +- views/docs.ejs | 2 +- views/editor.ejs | 2 +- views/home.ejs | 2 +- views/modal.ejs | 2 +- views/profile.ejs | 2 +- views/reader.ejs | 2 +- views/staff/_header.ejs | 2 +- 17 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 views/about/brochure.ejs (limited to 'views/reader.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index aecd6be..0463e26 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -673,7 +673,21 @@ iframe.embed { font-weight: 300; } +.aboutintro { + text-align: center; + line-height: 43px; + font-size: 24px; + padding: 5% 0; + font-weight: 300; +} +.aboutintro .inner { + max-width: 800px; + margin: 0 auto; + text-align: center; +} + /* PROFILE PAGE */ + .profilePic { background-size: cover; background-position: center; diff --git a/server/lib/schemas/Plan.js b/server/lib/schemas/Plan.js index 3e74997..1057bb2 100644 --- a/server/lib/schemas/Plan.js +++ b/server/lib/schemas/Plan.js @@ -13,6 +13,12 @@ var PlanSchema = new mongoose.Schema({ monthly_price: { type: Number }, yearly_price: { type: Number }, + basic_layout_monthly_price: { type: Number }, + basic_layout_yearly_price: { type: Number }, + + pro_layout_monthly_price: { type: Number }, + pro_layout_yearly_price: { type: Number }, + basic_layout_limit: { type: Number }, pro_layout_limit: { type: Number }, diff --git a/server/lib/schemas/Subscription.js b/server/lib/schemas/Subscription.js index 8d0b10e..8315009 100644 --- a/server/lib/schemas/Subscription.js +++ b/server/lib/schemas/Subscription.js @@ -15,7 +15,7 @@ var SubscriptionSchema = new mongoose.Schema({ plans: [{ tier: { type: String }, monthly: { type: Boolean }, - }] + }], created_at: { type: Date, default: Date.now }, updated_at: { type: Date, default: Date.now }, diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 3326499..5f9088b 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,6 +111,11 @@ var views = module.exports = { res.render('about/' + name) return } + if (name == "brochure") { + // TODO: fetch plans + res.render('about/' + name) + return + } if (name == "about" || name == "index") { res.render('about/' + name) return diff --git a/server/lib/views/subscription.js b/server/lib/views/subscription.js index 77db1a0..ba54bb4 100644 --- a/server/lib/views/subscription.js +++ b/server/lib/views/subscription.js @@ -12,7 +12,6 @@ var subscription = module.exports = { fields: { user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip", - project: "_id name slug user_id privacy created_at updated_at", }, defaults: { diff --git a/views/about/_blank.ejs b/views/about/_blank.ejs index 0e9ea7e..3c23fa7 100644 --- a/views/about/_blank.ejs +++ b/views/about/_blank.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include ../partials/meta ]] diff --git a/views/about/about.ejs b/views/about/about.ejs index dd536be..2aec982 100644 --- a/views/about/about.ejs +++ b/views/about/about.ejs @@ -1,7 +1,7 @@ - vvalls + About VValls [[ include ../partials/meta ]] @@ -50,17 +50,3 @@ [[ include ../partials/scripts ]] - \ No newline at end of file diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs new file mode 100644 index 0000000..00083cf --- /dev/null +++ b/views/about/brochure.ejs @@ -0,0 +1,79 @@ + + + + VValls Subscriptions + [[ include ../partials/meta ]] + + +

+ [[ include ../partials/header ]] + +

Subscriptions

+ +

+ Want to get more out of VValls? Consider becoming a subscription user. +

+ +

[[- plans.free.name ]]

One exhibition with pre-designed template floor plan +

+ +

[[- plans.premium.name ]]

$[[- plans.premium.monthly_price ]]/mo or $[[- plans.premium.yearly_price ]]/year +
[[- plans.premium.stock_layout_project_limit ]] exhibitions included with pre-designed template floor plans +
Each new basic floor plan costs $[[- plans.premium.basic_layout_monthly_price ]]/mo + or $[[- plans.premium.basic_layout_yearly_price ]]/year, minimum 3 months +
Each new basic floor plan can have up to [[- plans.premium.basic_layout_project_limit ]] exhibitions +
VValls logo appears when embedding an exhibition on a web page +

+ +

[[- plans.pro.name ]]

$[[- plans.pro.monthly_price ]]/mo or $[[- plans.pro.yearly_price ]]/year +
Comes with [[- plans.premium.pro_layout_limit ]] pro floor plan and [[- plans.premium.pro_layout_project_limit ]] exhibitions +
Each new pro floor plan costs $[[- plans.pro.pro_layout_monthly_price ]]/mo + or $[[- plans.pro.pro_layout_yearly_price ]]/year, minimum 3 months +
Each new pro floor plan can have up to [[- plans.pro.pro_layout_project_limit ]] exhibitions +
Includes planning for 3D objects in the room +
No VValls logo on embed +

+ +

+ Buying any extra floor plan unlocks collaboration. Invite an artist or curator to work on the exhibition with you. +

+ +

+ Basic Floor plan: Rectangle-based design of any dimension. +

+ +

+ Pro Floor plan: Trace an arbitrary floorplan. +

+ + +

Custom

+ We offer many types of customizations and white-label options for business and educational uses. + Contact us for more information +

+ + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +

+ +[[ include ../partials/scripts ]] + diff --git a/views/about/howto.ejs b/views/about/howto.ejs index 5278a40..914c3b3 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -1,7 +1,7 @@ - vvalls + How to Use VValls [[ include ../partials/meta ]] diff --git a/views/builder.ejs b/views/builder.ejs index afb8c66..0ba4238 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/docs.ejs b/views/docs.ejs index b3ead82..a1f081f 100644 --- a/views/docs.ejs +++ b/views/docs.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/editor.ejs b/views/editor.ejs index 656615c..74e4d6d 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/home.ejs b/views/home.ejs index 36fc2fc..ffb0976 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/modal.ejs b/views/modal.ejs index 7ca869c..732953d 100644 --- a/views/modal.ejs +++ b/views/modal.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/profile.ejs b/views/profile.ejs index a62652c..88af6b0 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -1,7 +1,7 @@ - vvalls + VValls | [[- profile.displayName ]] [[ include partials/meta ]] diff --git a/views/reader.ejs b/views/reader.ejs index 6c9856a..7035356 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -1,7 +1,7 @@ - vvalls + VValls [[ include partials/meta ]] diff --git a/views/staff/_header.ejs b/views/staff/_header.ejs index 3bbf4f1..a73c12e 100644 --- a/views/staff/_header.ejs +++ b/views/staff/_header.ejs @@ -1,7 +1,7 @@ - vvalls | staff + VValls | staff [[ include ../partials/meta ]] -- cgit v1.2.3-70-g09d2