diff --git a/webapp/cssjs/style.css b/webapp/cssjs/style.css index 78234d3d86..d62c6bd987 100644 --- a/webapp/cssjs/style.css +++ b/webapp/cssjs/style.css @@ -12,7 +12,7 @@ a img {border:none;} html { background: #EEEEEA; -font-family: Candara, "Helvetica Neue", Helvetica, Arial, sans-serif; +font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } #hd, #ft {padding : 20px 20px 20px 0px;} @@ -123,15 +123,7 @@ visibility:visible; -.reply-count { -font-size: 3em; -background-color: #222; -} -.reply-count a:link, .reply-count a:visited { -color: #FFF; -padding: 0 10px; -text-decoration: underline; -} + .individual-tweet:hover h4, individual-tweet:hover form { visibility: visible; color : #666; @@ -156,9 +148,9 @@ font-size:1.2em; } .pic { float: right; -margin-left: 10px; +margin: 10px 0 10px 10px; border: 1px solid #CCC; -padding: 5px; +padding: 5px 5px 0px 5px; } .error { background-color:#FF8080; @@ -184,9 +176,11 @@ font-weight:bold; #app-title {float:left;margin-bottom:20px;} #app-title h1 {font-size: 50px;letter-spacing: -.08em;margin:0;padding:0;line-height:.8em;} #app-title h2 {font-size: 19px;color: #0060e0;margin:0;padding:0 0 0 10px;line-height:.8em;} +#app-title a:hover h1 {color: #000;} .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;} .bt {border-top: 1px solid #CCC;} .br {border-right: 1px solid #CCC;} @@ -263,7 +257,7 @@ top: -20px; .key-stat h1 {font-size: 1.7em;font-weight:700;letter-spacing:-4px} .key-stat h3 {font-size: .8;font-weight:500;} - +/* numbers */ .big-number { color: #000; font-size: 1.7em; @@ -278,9 +272,26 @@ margin: 0; } .big-number h3 { color: #666; +font-size: .8em; } +.reply-count { +font-size: 24px; +font-weight: bold; +background-color: #222; +padding: 10px; +display:block; +margin-top:2px; +text-align:center; +line-height: 1.8em; +} +.reply-count a:link, .reply-count a:visited { +color: #FFF; +text-decoration: underline; +} + + .tweet { -font-size: 2em; +font-size: 1.6em; /* knocked down from 2em */ line-height: 1.1em; } diff --git a/webapp/templates/_status.mine.tpl b/webapp/templates/_status.mine.tpl index 73cc0bf2af..fab8d16025 100644 --- a/webapp/templates/_status.mine.tpl +++ b/webapp/templates/_status.mine.tpl @@ -5,8 +5,8 @@
date
post
-
replies
-
retweets
+
replies
+
retweets
{/if} @@ -26,14 +26,14 @@

{$t->tweet_html|link_usernames} {if $t->in_reply_to_status_id}[in reply to]{/if}

- {if $t->link->expanded_url}{/if} + {if $t->link->expanded_url}{/if} {if $t->location}
[location: {$t->location}]{/if} -
+
{if $t->mention_count_cache > 0}{$t->mention_count_cache}{else} {/if}
-
+
{if $t->retweet_count_cache > 0}{$t->retweet_count_cache}{else} {/if}
diff --git a/webapp/templates/_status.otherorphan.tpl b/webapp/templates/_status.otherorphan.tpl index 990fa8bbf6..9add356c34 100644 --- a/webapp/templates/_status.otherorphan.tpl +++ b/webapp/templates/_status.otherorphan.tpl @@ -1,11 +1,11 @@ {if $smarty.foreach.foo.first} -
-
 
-
name
-
followers
+
+
 
+
name
+
followers
date
-
post
-
+
post
+
{/if}
@@ -21,32 +21,28 @@
{$t->adj_pub_date|relative_datetime}
- +
- +
{if $t->link->is_image}{/if} - +

{$t->tweet_html|regex_replace:"/^@[a-zA-Z0-9_]+/":""|link_usernames}{if $t->in_reply_to_status_id} in reply to {/if}

- + {if $t->link->expanded_url}{$t->link->title}{/if} - + {if $t->author->location}
Location: {$t->author->location}
{/if} {if $t->author->description}
Description: {$t->author->description}
{/if} - + + {$a->status_id} +
- + {include file='_status.selectparent.tpl' t=$t all_tweets=$all_tweets tweet=$t->in_reply_to_status_id|tweet_from_id}
- +
diff --git a/webapp/templates/_status.public.tpl b/webapp/templates/_status.public.tpl index 4291de62be..d91ddcd85a 100644 --- a/webapp/templates/_status.public.tpl +++ b/webapp/templates/_status.public.tpl @@ -30,10 +30,10 @@ {if $t->author->location}
Location: {$t->author->location}
{/if}
- {if $t->mention_count_cache > 0}{$t->mention_count_cache}{else} {/if} + {if $t->mention_count_cache > 0}
{$t->mention_count_cache}
{else} {/if}
- {if $t->retweet_count_cache > 0}{$t->retweet_count_cache}{else} {/if} + {if $t->retweet_count_cache > 0}
{$t->retweet_count_cache}
{else} {/if}
diff --git a/webapp/templates/_status.qa.tpl b/webapp/templates/_status.qa.tpl index 7611e452e9..02ee50a737 100644 --- a/webapp/templates/_status.qa.tpl +++ b/webapp/templates/_status.qa.tpl @@ -16,7 +16,8 @@ {if $r.questioner eq $instance->twitter_username}You{else}{$r.questioner}{/if}
- {$t->follower_count|number_format} + {$t->follower_count|number_format}??? +
{$r->question_adj_pub_date|relative_datetime} @@ -37,7 +38,7 @@
{if $r.answerer eq $instance->twitter_username}You{else}{$r.answerer}{/if}
-
  +
 ???
{$r.answer_adj_pub_date|relative_datetime} diff --git a/webapp/templates/public.tpl b/webapp/templates/public.tpl index 534b67204c..e69de29bb2 100644 --- a/webapp/templates/public.tpl +++ b/webapp/templates/public.tpl @@ -1,106 +0,0 @@ - - - - ThinkTank Public Timeline - - - - - - - - - - - -{include file="_header.login.tpl" mode="public"} - -
-
- -
- - {if $tweet and ($replies OR $retweets) } - -
- -
- -
- {if $retweets}
{else}
{/if} - - {$tweet->tweet_html|link_usernames_to_twitter} -
({$tweet->author_username}, - {$tweet->pub_date|relative_datetime})
-
- {if $retweets} -
-
-
-

{$rtreach|number_format}

-

retweets to followers

-
-
-
- {/if} -
- - {if $replies} -
- {foreach from=$replies key=tid item=t name=foo} - {include file="_status.public.tpl" t=$t} - {/foreach} -
- {/if} - {if $retweets} -
- - {foreach from=$retweets key=tid item=t name=foo} - {include file="_status.public.tpl" t=$t} - {/foreach} -
- {/if} - - - {else} - -
- -
- - {/if} - - {if $header}

{$header}

{/if} - {if $description}

{$description}

{/if} - - {if $tweets} - {foreach from=$tweets key=tid item=t name=foo} - {include file="_status.public.tpl" t=$t} - {/foreach} - {/if} - -
- -
-
- - - - - -
- - - \ No newline at end of file diff --git a/webapp/templates/status.index.tpl b/webapp/templates/status.index.tpl old mode 100644 new mode 100755 index 1537bd5e6d..272f04f0f8 --- a/webapp/templates/status.index.tpl +++ b/webapp/templates/status.index.tpl @@ -6,37 +6,47 @@
- - - -
-

{$tweet->tweet_text}

-

- {foreach from=$replies key=tid item=t} -
- {include file="_status.other.tpl" t=$t} - -
-
- - -
-
- -
- {/foreach} + + +
+
+
+
+
+ +
+
+ {$tweet->tweet_text} + +
({$tweet->author_username}, + {$tweet->pub_date|relative_datetime})
+
+ +
+ + {foreach from=$replies key=tid item=t name=foo} +
+ {include file="_status.other.tpl" t=$t} + +
+
+ + {include file='_status.selectparent.tpl' t=$t all_tweets=$all_tweets tweet=$tweet} +
+
+ +
+ {/foreach} + +
+
+
{if $retweets} @@ -58,10 +68,10 @@ {foreach from=$all_tweets key=aid item=a} {/foreach} - +
- +
{/foreach}
@@ -81,7 +91,7 @@
- +
- +
{/foreach}
@@ -131,35 +141,35 @@ {literal} $(function() { //begin reply assignment actions - $(".button").click(function() { - // validate and process form here + $(".button").click(function() { + // validate and process form here var element = $(this); var Id = element.attr("id"); - + var oid = Id; var pid = $("select#pid"+Id+" option:selected").val(); var u = '{/literal}{$instance->twitter_username}{literal}'; - + var t = 'status.index.tpl'; var ck = '{/literal}{$tweet->status_id}{literal}'; - var dataString = 'u='+ u + '&pid=' + pid + '&oid[]=' + oid + '&t=' + t + '&ck=' + ck; - //alert (dataString);return false; - $.ajax({ - type: "GET", - url: "{/literal}{$cfg->site_root_path}{literal}status/mark-parent.php", - data: dataString, - success: function() { - $('#div'+Id).html("
"); - $('#message'+Id).html("

Saved!

") - .hide() - .fadeIn(1500, function() { - $('#message'+Id); - }); - } - }); - return false; - }); - }); + var dataString = 'u='+ u + '&pid=' + pid + '&oid[]=' + oid + '&t=' + t + '&ck=' + ck; + //alert (dataString);return false; + $.ajax({ + type: "GET", + url: "{/literal}{$cfg->site_root_path}{literal}status/mark-parent.php", + data: dataString, + success: function() { + $('#div'+Id).html("
"); + $('#message'+Id).html("

Saved!

") + .hide() + .fadeIn(1500, function() { + $('#message'+Id); + }); + } + }); + return false; + }); + }); {/literal} diff --git a/webapp/templates/user.index.tpl b/webapp/templates/user.index.tpl index f711115be7..e1d43af530 100644 --- a/webapp/templates/user.index.tpl +++ b/webapp/templates/user.index.tpl @@ -34,7 +34,9 @@
- {$profile->user_name} averages {$profile->avg_tweets_per_day} updates per day since joining {$profile->joined|relative_datetime} on {$profile->joined|date_format:"%D"} + Joined {$profile->joined|relative_datetime} on {$profile->joined|date_format:"%D"} + + {if $profile->avg_tweets_per_day} | Averages {$profile->avg_tweets_per_day} updates per day.{/if}
{if count($sources > 0)} @@ -43,16 +45,18 @@ {if $smarty.foreach.foo.last}
{else} | {/if} {/foreach} {/if} - ThankTank last updated {$profile->user_name} {$profile->last_updated|relative_datetime}
+ ThankTank last updated @{$profile->user_name} {$profile->last_updated|relative_datetime}
-
+
-

@{$profile->user_name}

+
+
+

@{$profile->user_name}

- {if $profile->description}
{$profile->description}{/if} + {if $profile->description}{$profile->description}{/if} {if $profile->tweet_count > 0}
Last post {$profile->last_post|relative_datetime} @@ -97,7 +101,7 @@
- Follower data not yet available in ThinkTank. + Detailed data about the {$profile->follower_count|number_format} followers not yet available in ThinkTank.
@@ -109,7 +113,7 @@
- Friend data not yet available in ThinkTank. + Detailed data about the {$profile->friend_count|number_format} friends not yet available in ThinkTank.