composer is much cooler
This commit is contained in:
parent
c3ef944878
commit
fb4ad72378
6 changed files with 51 additions and 22 deletions
|
|
@ -13,5 +13,6 @@ app.forms.Post = app.views.Base.extend({
|
|||
postRenderTemplate : function() {
|
||||
Mentions.initialize(this.$("textarea.text"));
|
||||
Mentions.fetchContacts(); //mentions should use app.currentUser
|
||||
this.$('textarea').autoResize({minHeight: '200', maxHeight:'300', animate: false});
|
||||
}
|
||||
});
|
||||
|
|
@ -352,10 +352,7 @@ div[data-template=flow] {
|
|||
}
|
||||
|
||||
.post-form {
|
||||
margin-top: 10%;
|
||||
.container{
|
||||
margin: 0 50px;
|
||||
}
|
||||
margin-top: 2%;
|
||||
}
|
||||
|
||||
.flow-controls {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,33 @@
|
|||
.new_photo .photo{
|
||||
display: inline;
|
||||
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;
|
||||
}
|
||||
|
|
@ -3,9 +3,10 @@
|
|||
<div style="margin:0;padding:0;display:inline">
|
||||
<input name="utf8" type="hidden" value="✓"/>
|
||||
</div>
|
||||
<label>
|
||||
Upload photos (optional)
|
||||
</label>
|
||||
<input name="photo[user_file]" type="file"/>
|
||||
<div class="photos"></div>
|
||||
<div id='photo_upload_button'>
|
||||
<a class='btn'><i class="icon-camera" style="margin-right:4px;"></i>Add Photos</a>
|
||||
<input name="photo[user_file]" type="file"/>
|
||||
<div class="photos well"></div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
<div class="container">
|
||||
<div id="new-post" class="row">
|
||||
<div class='span8 offset2 new-post-section'>
|
||||
<form class="new-post">
|
||||
<fieldset>
|
||||
<legend>
|
||||
New Post
|
||||
</legend>
|
||||
<textarea name="text" class="text span8"/>
|
||||
<textarea id="text_with_markup" style="display:none;"/>
|
||||
</fieldset>
|
||||
</form>
|
||||
<div class='new-post-section'>
|
||||
<div class='span5'>
|
||||
<form class="new-post">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Make Something!
|
||||
</legend>
|
||||
<textarea name="text" id='post_text' class="text span8"/>
|
||||
<textarea id="text_with_markup" style="display:none;"/>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="new_picture"/>
|
||||
<div class="span3 new_picture"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<section id="profile-info"/>
|
||||
|
||||
<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>
|
||||
|
||||
<section id="profile-controls">
|
||||
|
|
|
|||
Loading…
Reference in a new issue