From 8c640b179e3050c4a2c02340ec25ccb1aefdc8b6 Mon Sep 17 00:00:00 2001 From: Dennis Collinson <dennis.collective@gmail.com> Date: Thu, 22 Mar 2012 12:22:07 -0700 Subject: [PATCH] showing photos in framer --- features/trumpeter.feature | 1 + public/javascripts/app/forms/post_form.js | 1 + public/stylesheets/sass/new-templates.scss | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/features/trumpeter.feature b/features/trumpeter.feature index c29f3b7a6c..06c9f72c3d 100644 --- a/features/trumpeter.feature +++ b/features/trumpeter.feature @@ -44,6 +44,7 @@ Feature: Creating a new post And I upload a fixture picture with filename "button.gif" And I start the framing process Then I should see "This is hella customized" in the framer preview +# And I should see the image "button.gif" When I select the template "note" Then I should see an "note" framer preview When I finalize my frame diff --git a/public/javascripts/app/forms/post_form.js b/public/javascripts/app/forms/post_form.js index 275af46d98..9acc56ab4d 100644 --- a/public/javascripts/app/forms/post_form.js +++ b/public/javascripts/app/forms/post_form.js @@ -29,6 +29,7 @@ app.forms.Post = app.forms.Base.extend({ this.model.set(_.inject(this.formAttrs, setValueFromField, {})) //pass collections across this.model.photos = this.pictureForm.photos + this.model.set({"photos": this.model.photos.toJSON() }) function setValueFromField(memo, attribute, selector){ var selectors = form.find(selector); diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss index 4b2bfdfd8f..3c7c22d7dd 100644 --- a/public/stylesheets/sass/new-templates.scss +++ b/public/stylesheets/sass/new-templates.scss @@ -226,7 +226,7 @@ $pane-width: 420px; .photo-fill { @include background-cover(); - + z-index : -5000; //so the framer controls don't get lost position: absolute; top: 0; left: 0; @@ -250,6 +250,7 @@ $pane-width: 420px; } .rich-media { + z-index : -5000; //so the framer controls don't get lost position: absolute; height: 100%; width: 100%; -- GitLab