From 4c39517d0a3cd3b28a9e757cbb40e38f406a93a8 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 10 Oct 2014 16:01:14 -0400 Subject: thumbs --- public/assets/stylesheets/app.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index bc1bdb1..5c96a8a 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -332,7 +332,7 @@ iframe.embed { .projectList a { - padding: 4%; + margin: 4%; display: inline-block; } .projectList .room { -- cgit v1.2.3-70-g09d2 From 211da757666a6f9ee89160472e363bcf4732d1c9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 10 Oct 2014 16:48:26 -0400 Subject: show max 6 projects at a time --- public/assets/javascripts/ui/editor/MediaUpload.js | 1 + public/assets/stylesheets/app.css | 6 +++++- server/lib/api/projects.js | 4 ++-- views/home.ejs | 2 -- views/profile.ejs | 2 -- views/projects/list-projects.ejs | 7 ++++++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js index 3f425c3..bab4679 100644 --- a/public/assets/javascripts/ui/editor/MediaUpload.js +++ b/public/assets/javascripts/ui/editor/MediaUpload.js @@ -56,6 +56,7 @@ var MediaUpload = UploadView.extend({ console.log(media) this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia) this.parent.mediaViewer.$deleteMedia.show() + this.parent.mediaViewer.$noMedia.hide() }, beforeUpload: function(){ diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index fc7512a..c90dad4 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -406,6 +406,8 @@ iframe.embed { } .page .viewMore { + clear: both; float: none; + margin: 20px auto; text-decoration: none; font-size: 22px; display: block; @@ -1252,7 +1254,9 @@ border-left: 1px solid black; .myMedia.inactive { opacity:0; } - +.noMedia { + margin: 40px; +} .foundMedia { position:absolute; top:0; diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index c04f4f6..47e0458 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -67,6 +67,8 @@ var projects = { return docs.create(req, res) } + var data = util.cleanQuery(req.body) + if (req.files.thumbnail) { upload.put("projects", req.files.thumbnail, { unacceptable: function(err){ @@ -86,8 +88,6 @@ var projects = { Project.findOne({ _id: _id }, function(err, doc){ if (err || ! doc) { return res.json({ error: err }) } - var data = util.cleanQuery(req.body) - // data.user_id = req.user._id data.name = util.sanitize(data.name) if (data.name != doc.name) { diff --git a/views/home.ejs b/views/home.ejs index 16b00e7..8910070 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -65,8 +65,6 @@ [[ include projects/list-projects ]] - View More - [[ include partials/confirm-modal ]] [[ include projects/layouts-modal ]] [[ include partials/sign-in ]] diff --git a/views/profile.ejs b/views/profile.ejs index 2909fb8..1be0702 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -49,8 +49,6 @@

[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]

[[ include projects/list-projects ]] - - view more [[ } else { ]]

Welcome to VVALLS

diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 9dbd7d2..eb66449 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -3,7 +3,7 @@
[[ projects.forEach(function(project, i) { ]] - + [[ if (i > 5) { return } ]] [[ if (String(user._id) == String(project.user_id)) { ]] [[ } else { ]] @@ -30,6 +30,11 @@ [[ }) ]] + + [[ if (projects.length > 6) { ]] + view more + [[ } ]] +
[[ } ]] -- cgit v1.2.3-70-g09d2 From 433f56b6da8b9d5d42ebca566b22191e834eda66 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 10 Oct 2014 17:07:36 -0400 Subject: default patterns --- public/assets/img/offbeatrepeat.jpg | Bin 0 -> 33207 bytes public/assets/img/plainpattern.png | Bin 0 -> 39676 bytes public/assets/img/plainpattern2.png | Bin 0 -> 4898 bytes public/assets/img/plainpattern3.png | Bin 0 -> 27441 bytes views/controls/editor/wallpaper.ejs | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 public/assets/img/offbeatrepeat.jpg create mode 100644 public/assets/img/plainpattern.png create mode 100644 public/assets/img/plainpattern2.png create mode 100644 public/assets/img/plainpattern3.png diff --git a/public/assets/img/offbeatrepeat.jpg b/public/assets/img/offbeatrepeat.jpg new file mode 100644 index 0000000..4fa90c7 Binary files /dev/null and b/public/assets/img/offbeatrepeat.jpg differ diff --git a/public/assets/img/plainpattern.png b/public/assets/img/plainpattern.png new file mode 100644 index 0000000..1c4f12c Binary files /dev/null and b/public/assets/img/plainpattern.png differ diff --git a/public/assets/img/plainpattern2.png b/public/assets/img/plainpattern2.png new file mode 100644 index 0000000..10d57a5 Binary files /dev/null and b/public/assets/img/plainpattern2.png differ diff --git a/public/assets/img/plainpattern3.png b/public/assets/img/plainpattern3.png new file mode 100644 index 0000000..3048665 Binary files /dev/null and b/public/assets/img/plainpattern3.png differ diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index d54b9c1..ac025b5 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -4,10 +4,10 @@ Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> - - - - + + + +
-- cgit v1.2.3-70-g09d2 From ee322b213e68800e2f322fb527cc1b18cec01da3 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 10 Oct 2014 18:07:51 -0400 Subject: icon --- public/assets/stylesheets/app.css | 2 +- views/controls/editor/toolbar.ejs | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 6248af7..047a559 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -331,7 +331,7 @@ iframe.embed { } -.projectList a { +.projectList .projectItem { margin: 4%; display: inline-block; } diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index c914970..85800f8 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -4,6 +4,10 @@ data-role='open-media-viewer' data-info="add media" class="ion-ios7-photos-outline"> +