Merge branch 'aarons-master'

mncaudill · Sep 6, 2012 · 74d7bb6 · 74d7bb6
2 parents e21167b + 674c743
commit 74d7bb6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/www/templates/page_user_atlas.txt b/www/templates/page_user_atlas.txt
@@ -1,4 +1,4 @@
-{capture assign="page_title"}{$owner.username} | atlas of desire | {$str_status}{if $woeid} | {$venues.0.locality.name|escape}{/if}{/capture}
+{capture assign="page_title"}{if $str_status=='meh'}{$owner.username} | atlas of meh{if $woeid} | {$venues.0.locality.name|escape}{/if}{else}{$owner.username} | atlas of desire | {$str_status}{if $woeid} | {$venues.0.locality.name|escape}{/if}{/if}{/capture}
 {include file="inc_head.txt"}
 
 {if $venues|@count}

diff --git a/www/templates/page_user_atlas_nearby.txt b/www/templates/page_user_atlas_nearby.txt
@@ -1,4 +1,4 @@
-{capture assign="page_title"}{$owner.username} | atlas of desire | {$str_status} | nearby here{if $latitude and $longitude} | {$latitude|escape}, {$longitude|escape}{/if}{/capture}
+{capture assign="page_title"}{if $str_status=='meh'}{$owner.username} | atlas of meh | nearby here{if $latitude and $longitude} | {$latitude|escape}, {$longitude|escape}{/if}{else}{$owner.username} | atlas of desire | {$str_status} | nearby here{if $latitude and $longitude} | {$latitude|escape}, {$longitude|escape}{/if}{/if}{/capture}
 {include file="inc_head.txt"}
 
 {if $latitude and $longitude}

diff --git a/www/test.php b/www/test.php