nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

composer is much cooler

Browse source
This commit is contained in:
Maxwell Salzberg 2012-04-26 20:01:46 -07:00
parent c3ef944878
commit fb4ad72378
6 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/forms/post_form.js
View file

@ -13,5 +13,6 @@ app.forms.Post = app.views.Base.extend({
postRenderTemplate : function() { postRenderTemplate : function() {
Mentions.initialize(this.$("textarea.text")); Mentions.initialize(this.$("textarea.text"));
Mentions.fetchContacts(); //mentions should use app.currentUser Mentions.fetchContacts(); //mentions should use app.currentUser
this.$('textarea').autoResize({minHeight: '200', maxHeight:'300', animate: false});
} }
}); });

5
app/assets/stylesheets/new_styles/_base.scss
View file

@ -352,10 +352,7 @@ div[data-template=flow] {
} }
.post-form { .post-form {
margin-top: 10%; margin-top: 2%;
.container{
margin: 0 50px;
}
} }
.flow-controls { .flow-controls {

30
app/assets/stylesheets/new_styles/_composer.scss
View file

@ -1,5 +1,33 @@
.new_photo .photo{ .new_photo .photo{
display: inline; display: inline;
max-width: 200px; max-width: 200px;
max-height: 200px; max-height: 75px;
padding: 2px;
} }
.new_picture{
margin-top: 4%;
}
#photo_upload_button {
position: relative;
margin-top: 9px;
input{
opacity: 0;
position: absolute;
top: 0;
left: 0;
height:100%;
}
}
.photos{
margin-top: 5px;
}
textarea#post_text{
height: 200px;
}

11
app/assets/templates/picture-form.jst.hbs
View file

@ -3,9 +3,10 @@
<div style="margin:0;padding:0;display:inline"> <div style="margin:0;padding:0;display:inline">
<input name="utf8" type="hidden" value="✓"/> <input name="utf8" type="hidden" value="✓"/>
</div> </div>
<label> <div id='photo_upload_button'>
Upload photos (optional) <a class='btn'><i class="icon-camera" style="margin-right:4px;"></i>Add Photos</a>
</label> <input name="photo[user_file]" type="file"/>
<input name="photo[user_file]" type="file"/> <div class="photos well"></div>
<div class="photos"></div> </div>
</form> </form>

24
app/assets/templates/post-form.jst.hbs
View file

@ -1,17 +1,19 @@
<div class="container"> <div class="container">
<div id="new-post" class="row"> <div id="new-post" class="row">
<div class='span8 offset2 new-post-section'> <div class='new-post-section'>
<form class="new-post"> <div class='span5'>
<fieldset> <form class="new-post">
<legend> <fieldset>
New Post <legend>
</legend> Make Something!
<textarea name="text" class="text span8"/> </legend>
<textarea id="text_with_markup" style="display:none;"/> <textarea name="text" id='post_text' class="text span8"/>
</fieldset> <textarea id="text_with_markup" style="display:none;"/>
</form> </fieldset>
</form>
</div>
<div class="new_picture"/> <div class="span3 new_picture"/>
</div> </div>
</div> </div>
</div> </div>

2
app/assets/templates/profile.jst.hbs
View file

@ -14,7 +14,7 @@
<section id="profile-info"/> <section id="profile-info"/>
<div id="composer" style="display:none;"> <div id="composer" style="display:none;">
<iframe src="/posts/new" height=400 width=700 style="border:none;"></iframe> <iframe src="/posts/new" height=500 width=700 style="border:none;"></iframe>
</div> </div>
<section id="profile-controls"> <section id="profile-controls">