Skip to content

Commit

Permalink
Merge branch 'dash30/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ginatrapani
ginatrapani committed Mar 19, 2010
2 parents 9a5d49e + 808cf65 commit b8dfb44
Show file tree
Hide file tree
Showing 5 changed files with 206 additions and 99 deletions.
9 changes: 6 additions & 3 deletions webapp/cssjs/style.css
View file
Expand Up @@ -32,6 +32,9 @@ a:hover {text-decoration : none;color : red;}
==============================*/

/* JQuery UI resets */

.ui-tabs .ui-tabs-panel {padding:0;}

/* added to tab id */
#thinktank-tabs .ui-tabs {-moz-border-radius: 10px;-webkit-border-radius: 10px;margin: 0px;}
#thinktank-tabs .ui-widget {margin-top: 10px;font-size:1em;}
Expand Down Expand Up @@ -106,9 +109,9 @@ text-align: center;
.menu {margin-bottom:30px;}
.menu li {margin-right: 40px;display:inline;padding:4px 10px;}
.menu li a {color:#000}
.menu li:hover{color: #0060e0;cursor: pointer;border-top:4px solid #0060e0;}
.menu li.selected {border-top:4px solid #000;}
.menu li.selected:hover {border-top:4px solid #0060e0;}
.menu li:hover{color: #0060e0;cursor: pointer;border-top:1px solid #0060e0;}
.menu li.selected {border-top:1px solid #000;}
.menu li.selected:hover {border-top:1px solid #0060e0;}


.submenu {padding-left : 20px;}
Expand Down
8 changes: 5 additions & 3 deletions webapp/cssjs/typography.css
View file
Expand Up @@ -19,6 +19,8 @@
.thinktank-canvas h1 {color: #666;font-size:1.6em;font-weight:700;margin:0;padding:0 0 0 35px;}
.thinktank-canvas h4 {color: #000;line-height:1em;font-size:1em;font-weight:700;margin:0;padding:0 0 10px 35px;}
.thinktank-canvas h1.user {margin:0;padding:0;}
.thinktank-canvas h1.post {color:#000;font-size:1em;font-weight:500;margin:0;padding:0;border-top:0px;}
.thinktank-canvas h2.subhead {color:#666;font-size:1.2em;font-weight:500;margin:0;padding:0;border-top:0px;}

/* CONTENT
======================= */
Expand All @@ -33,7 +35,7 @@
.individual-tweet ul {margin:10px 0 0 5px;padding-left:10px;}
.individual-tweet li {font-size: .8em;}

.reply {/*padding-left : 85px;*/border-top: 0px;}
.reply {/*padding-left : 85px;border-top: 0px;*/}

/*
.individual-tweet h3 a {color : #666;}
Expand All @@ -52,8 +54,8 @@
/* FORMS
======================= */

form.tweet-setparent select {width: 350px;}
form.tweet-setparent {font-size: .8em;margin:5px 0;}
form.post-setparent select {width: 350px;}
form.post-setparent {font-size: .8em;margin:5px 0;}

/* IMAGES AND GRAPHICS
======================= */
Expand Down
2 changes: 2 additions & 0 deletions webapp/post/index.php
View file
Expand Up @@ -55,6 +55,8 @@

$s->assign('cfg', $cfg);
$s->assign('instance', $i);
$s->assign('i', $i);

}
# clean up
$db->closeConnection($conn);
Expand Down
2 changes: 1 addition & 1 deletion webapp/templates/_post.otherorphan.tpl
View file
Expand Up @@ -47,7 +47,7 @@
Description: {$t->author->description}
</div>{/if}
<div id="div{$t->post_id}">
<form action="" class="tweet-setparent">
<form action="" class="post-setparent">
<select name="pid{$t->post_id}" id="pid{$t->post_id}" onselect>
<option disabled="disabled">Is in reply to...</option>
<option value="0">No particular tweet (standalone)</option>
Expand Down
284 changes: 192 additions & 92 deletions webapp/templates/post.index.tpl
View file
Expand Up @@ -8,126 +8,226 @@


<ul>
<li><a href="#tweets">Status</a></li>
{if $retweets}<li><a href="#retweets">Retweets</a></li>{/if}
<li><a href="#posts">Post</a></li>
{if $retweets}<li><a href="#forwards">Forwards</a></li>{/if}
{if $likely_orphans}<li><a href="#replies">Likely Replies</a></li>{/if}
{if $replies}<li><a href="#followers">Public/Republishable Replies</a></li>{/if}

</ul>


<div class="section" id="tweets">
<h1>{$tweet->post_text}</h1>
<br /><br />
{foreach from=$replies key=tid item=t}
<div style="padding:5px;background-color:{cycle values="#eeeeee,#ffffff"}">
{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}">
<form action="">
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save as Reply To:" />
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
<option disabled>Set as a reply to:</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}">&nbsp;&nbsp;{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
</form>
</div>

</div>
{/foreach}
<div class="section" id="posts">

<div class="container_24 thinktank-canvas clearfix">

<!--<a {if $instance}href="{$cfg->site_root_path}?u={$instance->twitter_username}">{else}href="#" onClick="history.go(-1)">{/if}&larr; back</a>-->

<div class="clearfix prepend_20 append_20">
<div class="grid_2 prefix_1 alpha">
<img src="{$tweet->author_avatar}" class="avatar2">
</div>
<div class="grid_19 omega">
<h1 class="post">{$tweet->post_text}</h1>
<div class="small gray right">
Post {$tweet->adj_pub_date|relative_datetime} at {$tweet->pub_date} via {$tweet->source}
</div>

</div>
</div>

<div class="grid_1 alpha">&nbsp;</div>
<div class="grid_23 omega">
{if $replies}
<h2 class="subhead">
{if $reply_count eq 1}1 Reply{else}{$reply_count}Replies{/if} ({$private_reply_count} private)</h2>
{/if}
{foreach from=$replies key=tid item=t name=foo}
<div class="clearfix">

{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}" class="grid_22 prefix_10">

<form action="" class="post-setparent">
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
<option disabled>Set as a reply to:</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}">&nbsp;&nbsp;{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save" />
</form>

</div>

</div>
{/foreach}
</div>

</div>
</div>

{if $retweets}
<div class="section" id="retweets">
<h1>{$tweet->post_text}</h1>
<br /><br />
<p>In addition to the original author's followers, this tweet reached {$retweet_reach|number_format} users via retweets.</p>

{foreach from=$retweets key=tid item=t}
<div style="padding:5px;background-color:{cycle values="#eeeeee,#ffffff"}">
{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}">
<form action="">
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save as Reply To:" />
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
<option disabled>Set as a reply to:</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}">&nbsp;&nbsp;{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
</form>
</div>

</div>
{/foreach}
<div class="section" id="forwards">

<div class="container_24 thinktank-canvas clearfix">

<div class="clearfix prepend_20 append_20">

<div class="grid_2 prefix_1 alpha">
<img src="{$tweet->author_avatar}" class="avatar2">
</div>

<div class="grid_12">
<h1 class="post">{$tweet->post_text}</h1>
<div class="small gray right">
Post {$tweet->adj_pub_date|relative_datetime} at {$tweet->pub_date} via {$tweet->source}
</div>
</div>

<div class="grid_7 center big-number omega">
<div class="bl">
<div class="key-stat">
<h1>{$retweet_reach|number_format}</h1>
<h3>retweets to followers</h3>
</div>
</div>
</div>

</div>

<div class="grid_1 alpha">&nbsp;</div>
<div class="grid_23 omega">
<h2 class="subhead">Forwards</h2>

{foreach from=$retweets key=tid item=t name=foo}
<div class="clearfix">
{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}" class="grid_22 prefix_10">
<form action="" class="post-setparent">
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
<option disabled>Set as a reply to:</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}">&nbsp;&nbsp;{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save" />
</form>
</div>

</div>
{/foreach}
</div>

</div>
</div>
{/if}

{if $likely_orphans}
<div class="section" id="replies">

<h1>{$tweet->post_text}</h1>
<br /><br />
<p>Posted right around the time of this update:</p><br /><br />


{foreach from=$likely_orphans key=tid item=t}
<div style="padding:5px;background-color:{cycle values="#eeeeee,#ffffff"}">
{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}">
<form action="">
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save as Reply To:" />
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}" {if $a->post_id eq $tweet->post_id} selected="true" {/if}>{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
</form>
</div>

</div>
{/foreach}
<div class="container_24 thinktank-canvas clearfix">

<div class="clearfix prepend_20 append_20">

<div class="grid_2 prefix_1 alpha">
<img src="{$tweet->author_avatar}" class="avatar2">
</div>

<div class="grid_12">
<h1 class="post">{$tweet->post_text}</h1>
<div class="small gray">
Post {$tweet->adj_pub_date|relative_datetime} at {$tweet->pub_date} via {$tweet->source}
</div>
</div>

<div class="grid_7 center big-number omega">
<div class="bl">
<div class="key-stat">
<h1>{$retweet_reach|number_format}</h1>
<h3>retweets to followers</h3>
</div>
</div>
</div>

</div>


<div class="grid_1 alpha">&nbsp;</div>
<div class="grid_23 omega">

<h2 class="subhead">Possible replies posted near the time of this update</h2>

{foreach from=$likely_orphans key=tid item=t name=foo}
<div class="clearfix">
{include file="_post.other.tpl" t=$t}

<div id="div{$t->post_id}" class="grid_22 prefix_10">
<form action="" class="post-setparent">
<select name="pid{$t->post_id}" id="pid{$t->post_id}">
<option value="0">No Tweet in Particular (Mark as standalone)</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->post_id}" {if $a->post_id eq $tweet->post_id} selected="true" {/if}>{$a->post_text|truncate_for_select}</option>
{/foreach}
</select>
<input type="submit" name="submit" class="button" id="{$t->post_id}" value="Save" />
</form>
</div>

</div>
{/foreach}
</div>

</div>

</div>
{/if}


{if $replies}
<div class="section" id="followers">

<h1>{$tweet->post_text}</h1>
<br /><br />
{foreach from=$replies key=tid item=t}
{if $t->is_protected}Anonymous says {else}<a href="http://twitter.com/{$t->author_username}">{$t->author_username}</a> <a href="http://twitter.com/{$t->author_username}/post/{$t->post_id}">says</a>{/if}, "{$t->post_text|regex_replace:"/^@[a-zA-Z0-9_]+ /":""}"<br /><br />
{/foreach}
<div class="container_24 thinktank-canvas clearfix">

<div class="clearfix prepend_20 append_20">
<div class="grid_2 prefix_1 alpha">
<img src="{$tweet->author_avatar}" class="avatar2">
</div>
<div class="grid_17 omega">
<h1 class="post">{$tweet->post_text}</h1>
<div class="small gray">
{$tweet->adj_pub_date|relative_datetime} via {$tweet->source}
</div>

</div>
</div>

<div class="grid_1 alpha">&nbsp;</div>
<div class="grid_23 omega">
{foreach from=$replies key=tid item=t}
<div class="post">
{if $t->is_protected}
Anonymous
{else}
<a href="http://twitter.com/{$t->author_username}">{$t->author_username}</a> <a href="http://twitter.com/{$t->author_username}/post/{$t->post_id}"></a>
{/if}
says: "{$t->post_text|regex_replace:"/^@[a-zA-Z0-9_]+ /":""}"
</div>
{/foreach}
</div>

</div>

</div>

{/if}

</div>
</div>
</div>




<div role="contentinfo" id="keystats" class="yui-b">

<h2>Tweet Stats</h2>
<ul>
<li>Posted at {$tweet->pub_date}</li>
<li>{$reply_count} total replies</li>
<li>{$private_reply_count} private</li>
<li><a {if $instance}href="{$cfg->site_root_path}?u={$instance->twitter_username}">{else}href="#" onClick="history.go(-1)">{/if}&larr; back</a></li>
</ul>
</div>


<script type="text/javascript">
{literal}
$(function() {
Expand Down

0 comments on commit b8dfb44

Please sign in to comment.