diff --git a/web/yaamp/modules/site/results/found_results.php b/web/yaamp/modules/site/results/found_results.php index 04bceff..9532fca 100644 --- a/web/yaamp/modules/site/results/found_results.php +++ b/web/yaamp/modules/site/results/found_results.php @@ -27,18 +27,29 @@ $criteria->limit = $count; $criteria->order = 't.time DESC'; $db_blocks = getdbolistWith('db_blocks', 'coin', $criteria); -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; +echo << +span.block { padding: 2px; display: inline-block; text-align: center; min-width: 75px; } +span.block.new { color: white; background-color: #ad4ef0; } +span.block.orphan { color: white; background-color: #d9534f; } +span.block.immature { color: white; background-color: #f0ad4e; } +span.block.confirmed { color: white; background-color: #5cb85c; } + + +
NameAmountDifficultyBlockTimeStatus
+ + + + + + + + + + + +EOT; foreach($db_blocks as $db_block) { @@ -82,16 +93,16 @@ foreach($db_blocks as $db_block) echo ""; echo ""; diff --git a/web/yaamp/modules/site/results/user_earning_results.php b/web/yaamp/modules/site/results/user_earning_results.php index 335993f..15bea1c 100644 --- a/web/yaamp/modules/site/results/user_earning_results.php +++ b/web/yaamp/modules/site/results/user_earning_results.php @@ -18,18 +18,29 @@ $count = $count? $count: 50; WriteBoxHeader("Last $count Earnings: $user->username"); $earnings = getdbolist('db_earnings', "userid=$user->id order by create_time desc limit :count", array(':count'=>$count)); -echo "
NameAmountDifficultyBlockTimeStatus
"; if($db_block->category == 'orphan') - echo "Orphan"; + echo 'Orphan'; else if($db_block->category == 'immature') - echo "Immature ($db_block->confirmations)"; + echo 'Immature ('.$db_block->confirmations.')'; else if($db_block->category == 'generate') - echo "Confirmed"; + echo 'Confirmed'; else if($db_block->category == 'new') - echo "New"; + echo 'New'; echo "
"; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; +echo << +span.block { padding: 2px; display: inline-block; text-align: center; min-width: 75px; } +span.block.immature { color: white; background-color: #f0ad4e; } +span.block.exchange { color: white; background-color: #5cb85c; } +span.block.cleared { color: white; background-color: #5cb85c; } + + +
NameAmountPercentmBTCTimeStatus
+ + + + + + + + + + + + +EOT; $showrental = (bool) YAAMP_RENTAL; @@ -81,13 +92,13 @@ foreach($earnings as $earning) echo ""; echo "";
NameAmountPercentmBTCTimeStatus
"; if($earning->status == 0) - echo "Immature ($block->confirmations)"; + echo 'Immature ('.$block->confirmations.')'; else if($earning->status == 1) - echo 'Exchange'; + echo ''.(YAAMP_ALLOW_EXCHANGE ? 'Exchange' : 'Pending').''; else if($earning->status == 2) - echo 'Cleared'; + echo 'Cleared'; echo "