diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
index 7b65e095b27389a4a52c25803bef400d174d37b0..ccb798b4543b61d0290804d2370677cfc3444b66 100644
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -1,6 +1,6 @@
(function(){
- var textFormatter = function textFormatter(model) {
- var text = model.get("text");
+ //make it so I take text and mentions rather than the modelapp.helpers.textFormatter(
+ var textFormatter = function textFormatter(text, model) {
var mentions = model.get("mentioned_people");
return textFormatter.mentionify(
diff --git a/app/assets/javascripts/app/views/comment_view.js b/app/assets/javascripts/app/views/comment_view.js
index 3145346fdd7f96904ea81de9922c35c3c7a298f1..6281a72178330cb0e17fb5103c1637fcc7b2ca0d 100644
--- a/app/assets/javascripts/app/views/comment_view.js
+++ b/app/assets/javascripts/app/views/comment_view.js
@@ -14,7 +14,7 @@ app.views.Comment = app.views.Content.extend({
presenter : function() {
return _.extend(this.defaultPresenter(), {
canRemove: this.canRemove(),
- text : app.helpers.textFormatter(this.model)
+ text : app.helpers.textFormatter(this.model.get("text"), this.model)
})
},
diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js
index d6c7aa22642d09b90a9fd3ef23ede1b4fa6fe012..695987f04398514115eef2981839cc6e97fc491d 100644
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -8,7 +8,7 @@ app.views.Content = app.views.StreamObject.extend({
presenter : function(){
return _.extend(this.defaultPresenter(), {
- text : app.helpers.textFormatter(this.model),
+ text : app.helpers.textFormatter(this.model.get("text"), this.model),
o_embed_html : this.embedHTML(),
largePhoto : this.largePhoto(),
smallPhotos : this.smallPhotos()
diff --git a/app/assets/javascripts/app/views/post/mood_view.js b/app/assets/javascripts/app/views/post/mood_view.js
index 5fe33359fc0a3c8c515e5234163c53a6828bff88..988ec3f77f7bac14864ec85c4693ef53d4f03fde 100644
--- a/app/assets/javascripts/app/views/post/mood_view.js
+++ b/app/assets/javascripts/app/views/post/mood_view.js
@@ -12,8 +12,8 @@ app.views.Post.Mood = app.views.Post.extend({
presenter : function(){
var model = this.model
return _.extend(this.defaultPresenter(), {
- headline : model.headline(),
- body : model.body()
+ headline : $(app.helpers.textFormatter(model.headline(), model)).html(),
+ body : app.helpers.textFormatter(model.body(), model)
})
},
diff --git a/app/assets/javascripts/app/views/post_view.js b/app/assets/javascripts/app/views/post_view.js
index 42cc20efae9a7656d5f82747d5f16a971635a8c8..d7703e6278c32231f366eb58a343d21c9a5e2948 100644
--- a/app/assets/javascripts/app/views/post_view.js
+++ b/app/assets/javascripts/app/views/post_view.js
@@ -5,7 +5,7 @@ app.views.Post = app.views.StreamObject.extend({
return _.extend(this.defaultPresenter(), {
authorIsCurrentUser : this.authorIsCurrentUser(),
showPost : this.showPost(),
- text : app.helpers.textFormatter(this.model)
+ text : app.helpers.textFormatter(this.model.get("text"), this.model)
})
},
@@ -23,10 +23,10 @@ app.views.Post = app.views.StreamObject.extend({
//translate obsolete template names to the new Moods, should be removed when template picker comes cliente side.
var map = {
- 'status-with-photo-backdrop' : 'Wallpaper',
- 'status' : 'Day',
- 'note' : 'Newspaper',
- 'photo-backdrop' : 'Day'
+ 'status-with-photo-backdrop' : 'Wallpaper', //equivalent
+ 'status' : 'Day', //equivalent
+ 'note' : 'Newspaper', //equivalent
+ 'photo-backdrop' : 'Day' //that theme was bad
}
frameName = map[frameName] || frameName
@@ -50,6 +50,7 @@ app.views.Post = app.views.StreamObject.extend({
});
app.views.Post.Legacy = app.views.Post.extend({
+ tagName : "article",
initialize : function(options) {
this.templateName = options.templateName || this.templateName
}
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index f405f1b54bf79ed05dc7e85ec1046bf2af5ddabd..b5c97d471c088760a751a26b573b52194633ee47 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -7,39 +7,13 @@
.icon-green { background-image: image_url("img/glyphicons-halflings-green.png"); }
.icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); }
-/* styles */
-.multi-photo {
- display: table;
-
- p {
- @include media-text();
- }
-
- .img-bounding-box {
- display: table-cell;
- text-align: center;
- vertical-align: middle;
-
- padding: 20px;
- height: 400px;
- width: 300px;
- }
-
- img {
- @include photo-shadow();
-
- max-width: 100%;
- max-height: 100%;
- }
-}
-
.photoset {
@include center(horizontal);
width: 100%;
}
.rich-media {
- z-index : -5000; //so the framer controls don't get lost
+ //z-index : -5000; //so the framer controls don't get lost
position: absolute;
height: 100%;
width: 100%;
@@ -181,8 +155,13 @@ article { //mood posts
$big-text-size : 3em;
$medium-text-size : 2em;
$small-text-size: 1.5em;
+ width: 960px;
+ margin: 0 auto;
@include centered-frame();
+ .container {
+ padding: 70px 0;
+ }
header, header p{
//big text
@@ -191,10 +170,12 @@ article { //mood posts
}
section.body{
- font-size: $small-text-size;
+ p { font-size: $small-text-size;}
&.short_body{
- font-size: $medium-text-size;
+ p{
+ font-size: $medium-text-size;
+ }
}
}
@@ -204,17 +185,58 @@ article { //mood posts
}
&.newspaper {
- text-align: left;
@include newspaper-type();
- width: 960px;
+
+ text-align: left;
+
+ .container {
+ width: 600px;
+ }
+
.photo_viewer {
- float: left;
+ float: right;
+ margin-left: 20px;
+ max-width: 320px;
+ }
+
+ header {
+ margin-bottom: 1em;
+ line-height: 1em;
+ }
+
+ .body p {
+ @include newspaper-type();
+ font-size: 1.2em;
+ line-height: 1.7em;
+ margin-bottom: 1.2em;
}
}
&.wallpaper{
color : #fff;
}
+
+ &.multi-photo {
+ p {
+ @include media-text();
+ }
+
+ .img-bounding-box {
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+
+ padding: 20px;
+ height: 400px;
+ width: 300px;
+ }
+
+ img {
+ @include photo-shadow();
+ max-width: 100%;
+ max-height: 100%;
+ }
+ }
}
.status-with-photo-backdrop {
@@ -284,6 +306,7 @@ $bring-dark-accent-forward-color: #DDD;
.framer-controls {
@include info-container-base();
+ z-index: 999;
position: fixed;
width: 100%;
diff --git a/app/assets/stylesheets/new_styles/_new_mixins.scss b/app/assets/stylesheets/new_styles/_new_mixins.scss
index 3013b1b7c007381094cf17525817b439100d7265..5d35698c1cb656e24f8c65639e49cf1d37749867 100644
--- a/app/assets/stylesheets/new_styles/_new_mixins.scss
+++ b/app/assets/stylesheets/new_styles/_new_mixins.scss
@@ -81,8 +81,6 @@ $night-text-color : #999;
@mixin newspaper-type() {
font-family: Palatino, times, georgia, serif;
- margin-bottom: 1em;
- padding: 0 5%;
}
@mixin centered-frame(){
diff --git a/app/assets/templates/mood.jst.hbs b/app/assets/templates/mood.jst.hbs
index 4c977ded4e70096155cfd686f240adbeeae23b1b..446a14502e5395513993f7146bc436b2859e4cd6 100644
--- a/app/assets/templates/mood.jst.hbs
+++ b/app/assets/templates/mood.jst.hbs
@@ -1,3 +1,5 @@
-<header>{{headline}}</header>
-<section class="photo_viewer"></section>
-<section class="body">{{{body}}}</section>
+<div class="container">
+ <header>{{{headline}}}</header>
+ <section class="photo_viewer"></section>
+ <section class="body">{{{body}}}</section>
+</div>
\ No newline at end of file
diff --git a/app/assets/templates/post-form.jst.hbs b/app/assets/templates/post-form.jst.hbs
index e9f0ee4b608d895d57976bdf86b3ab50c1a31767..5fd9b6df88890583506da4d8003ca4be783d7ce5 100644
--- a/app/assets/templates/post-form.jst.hbs
+++ b/app/assets/templates/post-form.jst.hbs
@@ -1,6 +1,5 @@
<div class='row'>
<div class='span8 offset2 new-post-section'>
-
<div class="new_picture"/>
<form class="new-post">
@@ -16,8 +15,6 @@
<div class="aspect_selector"></div>
<div class="service_selector"></div>
-
- <input type="submit" class="btn-primary" value="Share" />
</fieldset>
</form>
</div>
diff --git a/app/assets/templates/post-new.jst.hbs b/app/assets/templates/post-new.jst.hbs
index ab2b6264ae430eff37f7ce88db9af14ded5adfda..38b9c3209a988fbf8403eb4c03a8881cc6480beb 100644
--- a/app/assets/templates/post-new.jst.hbs
+++ b/app/assets/templates/post-new.jst.hbs
@@ -1,4 +1,9 @@
+<div class="framer-controls">
+ <div class="controls">
+ <button class="btn-primary next">Next</button>
+ </div>
+</div>
+
<div class="container">
<div id="new-post"></div>
- <button class="btn-primary next">Next</button>
</div>
diff --git a/app/assets/templates/wallpaper-mood.jst.hbs b/app/assets/templates/wallpaper-mood.jst.hbs
index 5a99bd8e8e69acf291f56d59ca97325cd511c944..02caa049ed166f1775c994224cb80d87695a5642 100644
--- a/app/assets/templates/wallpaper-mood.jst.hbs
+++ b/app/assets/templates/wallpaper-mood.jst.hbs
@@ -1,8 +1,8 @@
<div class="photo-fill" data-img-src="{{backgroundUrl}}" style="background-image: url({{backgroundUrl}})">
<div class="darken">
<div class="darken-content">
- <header>{{headline}}</header>
- <section class="body">{{body}}</section>
+ <header>{{{headline}}}</header>
+ <section class="body">{{{body}}}</section>
</div>
</div>
</div>
diff --git a/spec/javascripts/app/helpers/text_formatter_spec.js b/spec/javascripts/app/helpers/text_formatter_spec.js
index 3751301478951e392e6ae1168f0fc96b706f7e20..947d11c1ca3d0b777329083e80af364d0dbf8cf0 100644
--- a/spec/javascripts/app/helpers/text_formatter_spec.js
+++ b/spec/javascripts/app/helpers/text_formatter_spec.js
@@ -11,7 +11,7 @@ describe("app.helpers.textFormatter", function(){
spyOn(app.helpers.textFormatter, "hashtagify")
spyOn(app.helpers.textFormatter, "markdownify")
- app.helpers.textFormatter(this.statusMessage)
+ app.helpers.textFormatter(this.statusMessage.get("text"), this.statusMessage)
expect(app.helpers.textFormatter.mentionify).toHaveBeenCalled()
expect(app.helpers.textFormatter.hashtagify).toHaveBeenCalled()
expect(app.helpers.textFormatter.markdownify).toHaveBeenCalled()
diff --git a/spec/javascripts/app/pages/framer_spec.js b/spec/javascripts/app/pages/framer_spec.js
index 9b309fa7cdb02ae24de427b174cefb15832bd525..519679a9acbaf81edc1df34577f4711fc8dacf15 100644
--- a/spec/javascripts/app/pages/framer_spec.js
+++ b/spec/javascripts/app/pages/framer_spec.js
@@ -26,10 +26,7 @@ describe("app.pages.Framer", function(){
it("navigates on save", function(){
spyOn(app.router, "navigate")
- this.page.model.set({id : 22})
this.page.model.trigger("sync")
-
- console.log(app.router.navigate)
expect(app.router.navigate).toHaveBeenCalled()
})
});
diff --git a/spec/javascripts/app/views/aspects_dropdown_view_spec.js b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
index 59117cae83edcc660670dea300dc25060107f3ce..f3e470375a612b262bd04b1e72d7a2fc08ac0879 100644
--- a/spec/javascripts/app/views/aspects_dropdown_view_spec.js
+++ b/spec/javascripts/app/views/aspects_dropdown_view_spec.js
@@ -62,9 +62,7 @@ describe("app.views.AspectsDropdown", function(){
describe("selecting An Aspect", function(){
beforeEach(function(){
-
this.link = this.view.$("a:contains('lovers')")
- console.log(app.currentUser.get("aspects"), $("a:contains('lovers')", this.view.el))
this.link.click()
})