-- cgit v1.2.3-70-g09d2 From 17fabffafc8e0f9723db6e19ae2ff14012c56a63 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 12:10:05 -0500 Subject: surface avatar --- public/assets/stylesheets/app.css | 13 +++++++++++-- server/lib/views/index.js | 1 + views/controls/reader/about-room.ejs | 8 +++++++- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'views') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e6b5570..cb58ef6 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2542,12 +2542,21 @@ a[data-role="forgot-password"] { .aboutRoom.vvbox .txt { padding: 5px 0 3px 0; } - -.aboutRoom h1 a{ +.aboutRoom h1 a { text-decoration: none; font-style: italic; font-weight:500; } +.aboutRoom .profilePic { + width: 34px; + height: 34px; + float: none; + display: inline-block; + vertical-align: middle; +} +.aboutRoom .authorName { + vertical-align: middle; +} .desktop .aboutRoom h1 a:hover { text-decoration:underline; diff --git a/server/lib/views/index.js b/server/lib/views/index.js index e37a01d..6e3b449 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -68,6 +68,7 @@ var views = module.exports = { date: moment(req.project.updated_at).format("M/DD/YYYY"), author: user.displayName, authorlink: "/profile/" + user.username, + authorpic: user.photo, canEdit: req.isOwner || req.isCollaborator, editlink: "/project/" + req.project.slug + "/edit", noui: !! (req.query.noui === '1'), diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 2bd3f0c..974fe0f 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -1,6 +1,12 @@

- [[- name ]], + [[- name ]] +
+ [[ if (authorpic) { ]] +
+ [[ } else { ]] + + [[ } ]] [[- author ]]

[[ if (description) { ]] -- cgit v1.2.3-70-g09d2 From a1860ea42334447f49649a3491bad605237a23d5 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 12:48:53 -0500 Subject: randomize button on media drawer (unstyled) --- .../javascripts/rectangles/engine/scenery/randomize.js | 16 +++++++++------- public/assets/javascripts/ui/editor/MediaViewer.js | 10 ++++++++-- views/controls/editor/media-drawer.ejs | 1 + 3 files changed, 18 insertions(+), 9 deletions(-) (limited to 'views') diff --git a/public/assets/javascripts/rectangles/engine/scenery/randomize.js b/public/assets/javascripts/rectangles/engine/scenery/randomize.js index e6d662a..1c2eb56 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/randomize.js +++ b/public/assets/javascripts/rectangles/engine/scenery/randomize.js @@ -3,8 +3,7 @@ var media_objs = $(".mediaContainer").toArray().map(function(el){ return $(el).data("media") }) - var walls = [] - Scenery.randomize.add( media_objs, walls ) + Scenery.randomize.add( media_objs ) */ Scenery.randomize = {}; @@ -34,8 +33,9 @@ Scenery.randomize.get_dimensions = function (media_objs){ // Returns a lookup of walls to use, keyed by wall ID. Scenery.randomize.get_empty_walls = function(wall_list){ // get a list of all walls - var walls = {} - (wall_list || Walls).forEach(function(wall){ + var walls = {}; + + (wall_list || Walls.list).forEach(function(wall){ walls[wall.id] = wall }) @@ -57,6 +57,7 @@ Scenery.randomize.get_empty_walls = function(wall_list){ // Randomly place a set of media objects on empty walls. // Only one object per wall will be added. +// Optionally takes a list of walls to use. Scenery.randomize.add = function (media_objs, wall_list) { var media_list = Scenery.randomize.get_dimensions(media_objs) var walls = Scenery.randomize.get_empty_walls(wall_list) @@ -66,11 +67,12 @@ Scenery.randomize.add = function (media_objs, wall_list) { // randomize walls shuffle(wall_ids) + shuffle(media_list) // assign each of the media to the walls, until we run out of either - media_list.all(function(media){ + media_list.some(function(media){ // bail if we're out of walls - if (wall_ids.length == 0) { return false } + if (wall_ids.length == 0) { return true } var i, fits = -1 @@ -96,6 +98,6 @@ Scenery.randomize.add = function (media_objs, wall_list) { // artwork won't fit anywhere?? } - return true + return false }) } \ No newline at end of file diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index dd17613..9593ab7 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -13,6 +13,7 @@ var MediaViewer = ModalView.extend({ 'click .foundToggle': "foundToggle", 'click .userToggle': "userToggle", 'click #deleteMedia': "deleteArmed", + 'click #randomize': "randomize", 'click .mediaContainer': "pick", 'click .viewMore': "load", }, @@ -119,10 +120,15 @@ var MediaViewer = ModalView.extend({ }, randomize: function(){ - var media_data = $(".mediaContainer").toArray().map(function(el){ + var $divs = this.$myMediaContainer.find(".mediaContainer").toArray() + if ($divs.length < 3) { + $divs = $divs.concat( this.$foundMediaContainer.find(".mediaContainer").toArray() ) + } + var media_objs = $divs.map(function(el){ return $(el).data("media") }) - Scenery.randomize( media_data ) + Scenery.randomize.add( media_objs ) + this.hide() }, populate: function(data){ diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 3e64cc3..5846bf4 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -14,6 +14,7 @@ -->

Randomize

You have no media yet. Upload some!

-- cgit v1.2.3-70-g09d2 From 8e6693f0b98733b7958a33948e8705c42f35c571 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 16:00:01 -0500 Subject: randomize button, minimap in a weird place --- public/assets/stylesheets/app.css | 18 ++++++++++++++++++ views/reader.ejs | 4 +--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'views') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index cb58ef6..bf76a71 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1574,6 +1574,9 @@ border-left: 1px solid black; -webkit-transition:opacity 0.3s ease-in-out; transition:opacity 0.3s ease-in-out; } +.reader #minimap { + left: 210px; +} /* WALLPAPER PICKER */ @@ -2168,6 +2171,21 @@ input[type="range"]::-webkit-slider-thumb { margin-top:5px; width: 100%; } +#randomize { + background: white; + display: inline-block; + color: black; + text-decoration:none; + border:1px solid black; + text-align: center; + font-size: 13px; + padding: 3px; + cursor: pointer; +} +#randomize:hover { + color: white; + background: black; +} .warn { background:red; display: inline-block; diff --git a/views/reader.ejs b/views/reader.ejs index b9b53d2..09b702e 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -4,7 +4,7 @@ vvalls [[ include partials/meta ]] - +

@@ -18,11 +18,9 @@ [[ include controls/reader/embed ]]

[[ } ]] -- cgit v1.2.3-70-g09d2 From b9cf4175a3882415824f707a5431222e352658b2 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 16:42:30 -0500 Subject: cancel scenery for text --- public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 1 + public/assets/javascripts/ui/editor/TextEditor.js | 5 +++++ views/controls/editor/toolbar.ejs | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'views') diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index f6cc8e4..8ca00d3 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -5,6 +5,7 @@ var Scenery = new function(){ base.list = {} base.nextMedia = null + base.nextWallpaper = null base.mouse = new mouse ({ use_offset: false, mousedownUsesCapture: true }) diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js index 51077af..33b5386 100644 --- a/public/assets/javascripts/ui/editor/TextEditor.js +++ b/public/assets/javascripts/ui/editor/TextEditor.js @@ -25,6 +25,11 @@ var TextEditor = FormView.extend({ this.$fontSize = this.$("[name=font-size]") this.$textBody = this.$("[name=text-body]") this.$textAlign = this.$("[name=text-align]") + + app.on("cancel-scenery", function(){ + this.createMode(true) + $("body").toggleClass("addText", false) + }.bind(this)) }, toggle: function(state){ diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 7b08db6..23d5eb4 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -32,11 +32,13 @@ data-role='toggle-color-control' data-info="edit room colors" class="ion-ios7-sunny-outline"> -

- [[- name ]], + [[- name ]] + + [[ if (authorpic) { ]] + + [[ } else { ]] + + [[ } ]] [[- author ]]

Randomize

- [[- name ]], + [[- name ]] +
+ [[ if (authorpic) { ]] +
+ [[ } else { ]] + + [[ } ]] [[- author ]]