changed handlebars "avatar" helper to "personImage"; added home button to interaction pane (only when sneaky -- needs further investigating on getting it showing up when the interaction pane is invoked); minor css tweaks.

This commit is contained in:
danielgrippi 2012-02-26 21:17:20 -08:00
parent 98a834884f
commit 896c098a07
13 changed files with 69 additions and 25 deletions

View file

@ -14,7 +14,7 @@ Handlebars.registerHelper('linkToPerson', function(context, block) {
return html return html
}) })
Handlebars.registerHelper('avatar', function(person, size, imageClass) { Handlebars.registerHelper('personImage', function(person, size, imageClass) {
size = (typeof(size) != "string" ? "small" : size); size = (typeof(size) != "string" ? "small" : size);
imageClass = (typeof(imageClass) != "string" ? size : imageClass); imageClass = (typeof(imageClass) != "string" ? size : imageClass);

View file

@ -15,7 +15,7 @@
<div class="media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}"> <div class="media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}">
{{#with current_user}} {{#with current_user}}
<a href="/people/{{guid}}" class="img"> <a href="/people/{{guid}}" class="img">
{{{avatar this}}} {{{personImage this}}}
</a> </a>
{{/with}} {{/with}}

View file

@ -7,9 +7,9 @@
{{/if}} {{/if}}
<div class="img"> <div class="img">
<a href="/people/{{author.guid}}"> {{#linkToPerson author}}
<img src="{{author.avatar.small}}" class="avatar smaller" /> {{{personImage this "small" "small"}}}
</a> {{/linkToPerson}}
</div> </div>
<div class="bd"> <div class="bd">

View file

@ -1,6 +1,6 @@
<div class="img"> <div class="img">
{{#linkToPerson author}} {{#linkToPerson author}}
{{{avatar this "small"}}} {{{personImage this "small"}}}
{{/linkToPerson}} {{/linkToPerson}}
</div> </div>

View file

@ -1,6 +1,6 @@
<div class="img"> <div class="img">
{{#linkToPerson author}} {{#linkToPerson author}}
{{{avatar this "small"}}} {{{personImage this "small" "small"}}}
{{/linkToPerson}} {{/linkToPerson}}
</div> </div>

View file

@ -34,15 +34,19 @@
<!-- this acts as a dock underlay --> <!-- this acts as a dock underlay -->
<div id="post-info-sneaky" class="passive"> <div id="post-info-sneaky" class="passive">
<a href="#" rel="invoke-interaction-pane"> <div id="post-info-container-sneaky">
<div id="post-info-container-sneaky"> <a href="#" rel="invoke-interaction-pane" class="invoker">
<img src="/images/up-tick-inset.png" class="info-tick"/> <img src="/images/up-tick-inset.png" class="info-tick"/>
</div> <a href="/" title="Home" class="home-button">
</a> <i class="icon-home icon-white"></i>
</a>
</a>
</div>
</div> </div>
<!-- this closes an open interaction pane --> <!-- this closes an open interaction pane -->
<div id="close-reactions-pane-container"> <div id="close-reactions-pane-container">
<a href="#" id="close-reactions-pane" rel="hide-interaction-pane"> </a> <a href="#" id="close-reactions-pane" rel="hide-interaction-pane">
</a>
</div> </div>

View file

@ -2,7 +2,6 @@
<div id="post-info" style="display:none;"> <div id="post-info" style="display:none;">
<div id="post-info-container"> <div id="post-info-container">
<img src="/images/down-tick-inset.png" class="info-tick"/> <img src="/images/down-tick-inset.png" class="info-tick"/>
<div id="post-reactions"> </div> <div id="post-reactions"> </div>

View file

@ -2,7 +2,6 @@
<form class="form-inline"> <form class="form-inline">
<textarea class="new-comment-text" id="new-comment-text" placeholder="Comment"></textarea> <textarea class="new-comment-text" id="new-comment-text" placeholder="Comment"></textarea>
<button type="submit" class="btn btn-small"> <button type="submit" class="btn btn-small">
<i class="icon-comment"></i>
Comment Comment
</button> </button>
</form> </form>

View file

@ -7,7 +7,7 @@
<div class="bd"> <div class="bd">
{{#each likes}} {{#each likes}}
{{#linkToPerson author}} {{#linkToPerson author}}
{{{avatar this "small" "micro"}}} {{{personImage this "small" "micro"}}}
{{/linkToPerson}} {{/linkToPerson}}
{{/each}} {{/each}}
</div> </div>
@ -24,7 +24,7 @@
<div class="bd"> <div class="bd">
{{#each participations}} {{#each participations}}
{{#linkToPerson author}} {{#linkToPerson author}}
{{{avatar this "small" "micro"}}} {{{personImage this "small" "micro"}}}
{{/linkToPerson}} {{/linkToPerson}}
{{/each}} {{/each}}
</div> </div>
@ -41,7 +41,7 @@
<div class="bd"> <div class="bd">
{{#each reshares}} {{#each reshares}}
{{#linkToPerson author}} {{#linkToPerson author}}
{{{avatar this "small" "micro"}}} {{{personImage this "small" "micro"}}}
{{/linkToPerson}} {{/linkToPerson}}
{{/each}} {{/each}}
</div> </div>

View file

@ -19,7 +19,7 @@
{{#with author}} {{#with author}}
<a href="/people/{{guid}}" class="img"> <a href="/people/{{guid}}" class="img">
{{{avatar this}}} {{{personImage this}}}
</a> </a>
{{/with}} {{/with}}

View file

@ -14,7 +14,7 @@ app.views.PostViewerFeedback = app.views.Feedback.extend({
"click *[rel='hide-interaction-pane']" : "hidePane" "click *[rel='hide-interaction-pane']" : "hidePane"
}, },
tooltipSelector : ".label", tooltipSelector : ".label, .home-button",
postRenderTemplate : function() { postRenderTemplate : function() {
this.sneakyVisiblity() this.sneakyVisiblity()

View file

@ -30,15 +30,26 @@ app.views.PostViewerInteractions = app.views.Base.extend({
togglePane : function(evt) { togglePane : function(evt) {
if(evt) { evt.preventDefault() } if(evt) { evt.preventDefault() }
this.$("#post-info").slideToggle(300) this.$("#post-info").slideToggle(300)
this.$("#post-info-sneaky").toggleClass('passive')
this.removeTooltips() this.removeTooltips()
}, },
invokePane : function() { invokePane : function() {
if(!this.$("#post-info").is(":visible")) { this.togglePane() } if(!this.$("#post-info").is(":visible")) {
this.$("#post-info-sneaky").addClass("passive")
this.togglePane()
}
}, },
hidePane : function() { hidePane : function() {
if(this.$("#post-info").is(":visible")) { this.togglePane() } if(this.$("#post-info").is(":visible")) {
/* it takes about 400ms for the pane to hide. we need to keep
* the sneaky hidden until the slide is complete */
setTimeout(function(){
this.$("#post-info-sneaky").removeClass("passive")
}, 400)
this.togglePane()
}
} }
}) })

View file

@ -424,9 +424,17 @@ body.idle {
top: 1px solid #111; top: 1px solid #111;
} }
.img {
margin-right: 5px;
}
i {
margin-top: 1px;
}
.avatar { .avatar {
@include border-radius(); @include border-radius();
margin-right: 2px; margin-right: 0;
} }
} }
@ -452,7 +460,7 @@ body.idle {
textarea{ textarea{
height: 18px; height: 18px;
width: 300px; width: 318px;
} }
form { form {
@ -488,6 +496,30 @@ body.idle {
} }
} }
.home-button {
@include transition(opacity, 0.3s);
@include opacity(0.6);
position: absolute;
left: 2px;
top: 4px;
padding: 4px 6px;
&:hover {
@include opacity(1);
}
}
.invoker {
display: block;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
#post-feedback:hover { #post-feedback:hover {
#post-info-sneaky:not(.passive) { #post-info-sneaky:not(.passive) {
@include opacity(1); @include opacity(1);
@ -495,7 +527,6 @@ body.idle {
} }
} }
.post-comment { .post-comment {
-moz-box-shadow: 0 1px 2px -2px #999; -moz-box-shadow: 0 1px 2px -2px #999;
-webkit-box-shadow: 0 1px 2px -2px #999; -webkit-box-shadow: 0 1px 2px -2px #999;