From 0d1bd292fe2e71132b6dc721851a646ecbd254ca Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 10 Oct 2018 12:36:47 +0200 Subject: [PATCH 1/6] Claim LBRY link and Thumbnail --- src/Template/Main/claims.ctp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp index f2ec67a..bb88925 100644 --- a/src/Template/Main/claims.ctp +++ b/src/Template/Main/claims.ctp @@ -40,13 +40,10 @@ $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow']; $autoThumbText = ''; -$link = $claim->Name; $rawLink = $claim->Name; if (isset($claim->Publisher->Name)) { - $link = urlencode($claim->Publisher->Name) . '/' . $link; $rawLink = $claim->Publisher->Name . '/' . $rawLink; } -$link = 'lbry://' . $link; $rawLink = 'lbry://' . $rawLink; if ($claim->ClaimType == 1) { $autoThumbText = strtoupper(substr($claim->Name, 1, min( strlen($claim->Name), 10 ))); } else { $str = str_replace(' ', '', (strlen(trim($claim->Title)) > 0) ? $claim->Title : $claim->Name); @@ -81,7 +78,7 @@ if (strlen(trim($desc)) == 0) {
IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?> - +
@@ -144,7 +141,7 @@ if (strlen(trim($desc)) == 0) {
Language)) > 0 ? ($claim->Language == 'en' ? 'English' : '') : 'Unspecified' ?>
- Open in LBRY + Open in LBRY
@@ -165,13 +162,10 @@ if (strlen(trim($desc)) == 0) { } $autoThumbText = ''; - $link = $claim->Name; $rawLink = $claim->Name; if (isset($claim->Publisher->Name)) { - $link = urlencode($claim->Publisher->Name) . '/' . $link; $rawLink = $claim->Publisher->Name . '/' . $rawLink; } - $link = 'lbry://' . $link; $rawLink = 'lbry://' . $rawLink; $cost = ''; if (isset($claim->Price) && $claim->Price > 0) { @@ -216,7 +210,7 @@ if (strlen(trim($desc)) == 0) {
IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?> - +
@@ -224,7 +218,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
+
Description)) > 0 ? $claim->Description : 'No description available' ?>
@@ -291,13 +285,10 @@ if (strlen(trim($desc)) == 0) { $row++; } $autoThumbText = ''; - $link = $claim->Name; $rawLink = $claim->Name; if (isset($claim->Publisher->Name)) { - $link = urlencode($claim->Publisher->Name) . '/' . $link; $rawLink = $claim->Publisher->Name . '/' . $rawLink; } - $link = 'lbry://' . $link; $rawLink = 'lbry://' . $rawLink; $cost = ''; if (isset($claim->Price) && $claim->Price > 0) { @@ -342,7 +333,7 @@ if (strlen(trim($desc)) == 0) {
IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?> - +
@@ -350,7 +341,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
+
Description)) > 0 ? $claim->Description : 'No description available' ?>
-- 2.45.2 From 1505548a3a14f388b7afe8c620ccfd0532095f7f Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 10 Oct 2018 13:25:48 +0200 Subject: [PATCH 2/6] Added getLink function to Model --- src/Model/Entity/Claim.php | 9 ++++++++- src/Template/Main/claims.ctp | 21 +++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php index 8faa889..3a2659f 100644 --- a/src/Model/Entity/Claim.php +++ b/src/Model/Entity/Claim.php @@ -5,7 +5,14 @@ namespace App\Model\Entity; use Cake\ORM\Entity; class Claim extends Entity { - + function getLink() { + $link = $this->Name; + if (isset($this->Publisher->Name)) { + $link = $this->Publisher->Name . '/' . $link; + } + $link = 'lbry://' . $link; + return $link; + } } ?> \ No newline at end of file diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp index bb88925..f7d0414 100644 --- a/src/Template/Main/claims.ctp +++ b/src/Template/Main/claims.ctp @@ -40,11 +40,6 @@ $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow']; $autoThumbText = ''; -$rawLink = $claim->Name; -if (isset($claim->Publisher->Name)) { - $rawLink = $claim->Publisher->Name . '/' . $rawLink; -} -$rawLink = 'lbry://' . $rawLink; if ($claim->ClaimType == 1) { $autoThumbText = strtoupper(substr($claim->Name, 1, min( strlen($claim->Name), 10 ))); } else { $str = str_replace(' ', '', (strlen(trim($claim->Title)) > 0) ? $claim->Title : $claim->Name); $autoThumbText = strtoupper(mb_substr($str, 0, min( strlen($str), 10 ))); @@ -141,7 +136,7 @@ if (strlen(trim($desc)) == 0) {
Language)) > 0 ? ($claim->Language == 'en' ? 'English' : '') : 'Unspecified' ?>
- Open in LBRY + Open in LBRY
@@ -162,11 +157,6 @@ if (strlen(trim($desc)) == 0) { } $autoThumbText = ''; - $rawLink = $claim->Name; - if (isset($claim->Publisher->Name)) { - $rawLink = $claim->Publisher->Name . '/' . $rawLink; - } - $rawLink = 'lbry://' . $rawLink; $cost = ''; if (isset($claim->Price) && $claim->Price > 0) { $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC'; @@ -218,7 +208,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
+
getLink() ?>
Description)) > 0 ? $claim->Description : 'No description available' ?>
@@ -285,11 +275,6 @@ if (strlen(trim($desc)) == 0) { $row++; } $autoThumbText = ''; - $rawLink = $claim->Name; - if (isset($claim->Publisher->Name)) { - $rawLink = $claim->Publisher->Name . '/' . $rawLink; - } - $rawLink = 'lbry://' . $rawLink; $cost = ''; if (isset($claim->Price) && $claim->Price > 0) { $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC'; @@ -341,7 +326,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
+
getLink() ?>
Description)) > 0 ? $claim->Description : 'No description available' ?>
-- 2.45.2 From 69734f2addadb07491dc1792b0387ecdc81cd625 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 10 Oct 2018 14:40:42 +0200 Subject: [PATCH 3/6] Changed getLink function name --- src/Model/Entity/Claim.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php index 3a2659f..e2d3cb7 100644 --- a/src/Model/Entity/Claim.php +++ b/src/Model/Entity/Claim.php @@ -5,7 +5,7 @@ namespace App\Model\Entity; use Cake\ORM\Entity; class Claim extends Entity { - function getLink() { + function getLbryLink() { $link = $this->Name; if (isset($this->Publisher->Name)) { $link = $this->Publisher->Name . '/' . $link; -- 2.45.2 From 1a082dc79479c51d5175e8a9b84a6ac137a94378 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 10 Oct 2018 14:41:45 +0200 Subject: [PATCH 4/6] Changed getLink function name --- src/Template/Main/claims.ctp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp index f7d0414..0507716 100644 --- a/src/Template/Main/claims.ctp +++ b/src/Template/Main/claims.ctp @@ -136,7 +136,7 @@ if (strlen(trim($desc)) == 0) {
Language)) > 0 ? ($claim->Language == 'en' ? 'English' : '') : 'Unspecified' ?>
- Open in LBRY + Open in LBRY
@@ -208,7 +208,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
getLink() ?>
+
getLbryLink() ?>
Description)) > 0 ? $claim->Description : 'No description available' ?>
@@ -326,7 +326,7 @@ if (strlen(trim($desc)) == 0) {
ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : 'No Title') ?>
-
getLink() ?>
+
getLbryLink() ?>
Description)) > 0 ? $claim->Description : 'No description available' ?>
-- 2.45.2 From c09da8ade8587406cbb76f02040d3d0afdde5360 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Wed, 10 Oct 2018 14:47:17 +0200 Subject: [PATCH 5/6] Added claim link to transaction --- src/Controller/MainController.php | 4 ++++ src/Model/Entity/Claim.php | 5 +++++ src/Template/Main/tx.ctp | 6 +++--- webroot/css/main.css | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index 5ac133c..9c532d0 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -452,6 +452,8 @@ class MainController extends AppController { $this->loadModel('Transactions'); $this->loadModel('Inputs'); $this->loadModel('Outputs'); + $this->loadModel('Claims'); + $sourceAddress = $this->request->query('address'); $tx = $this->Transactions->find()->select( @@ -475,6 +477,8 @@ class MainController extends AppController { $outputs[$i]->IsClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'CLAIM') > -1); $outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'SUPPORT_CLAIM') > -1); $outputs[$i]->IsUpdateClaim = (strpos($outputs[$i]->ScriptPubKeyAsm, 'UPDATE_CLAIM') > -1); + $claim = $this->Claims->find()->where(['TransactionHash' => $tx->Hash, 'Vout' => $outputs[$i]->Vout])->first(); + $outputs[$i]->Claim = $claim; } $totalIn = 0; diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php index e2d3cb7..52fe0a4 100644 --- a/src/Model/Entity/Claim.php +++ b/src/Model/Entity/Claim.php @@ -13,6 +13,11 @@ class Claim extends Entity { $link = 'lbry://' . $link; return $link; } + + function getExplorerLink() { + $link = '/claims/' . $this->ClaimId; + return $link; + } } ?> \ No newline at end of file diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp index 59805b0..000115d 100644 --- a/src/Template/Main/tx.ctp +++ b/src/Template/Main/tx.ctp @@ -136,9 +136,9 @@ foreach ($outputs as $out): ?>
- IsSupportClaim): ?>
SUPPORT
- IsUpdateClaim): ?>
UPDATE
- IsClaim): ?>
CLAIM
+ IsSupportClaim): ?>
SUPPORT
+ IsUpdateClaim): ?>
UPDATE
+ IsClaim): ?>
CLAIM
diff --git a/webroot/css/main.css b/webroot/css/main.css index 9510485..684b350 100644 --- a/webroot/css/main.css +++ b/webroot/css/main.css @@ -252,6 +252,7 @@ footer .content .page-time { position: absolute; right: 12px; bottom: 0px; paddi .tx-details-layout .outputs .output .labels .support { background: #ffeb3b } .tx-details-layout .outputs .output .labels .update { background: #ea80fc } .tx-details-layout .outputs .output .labels .claim { background: #76ff03 } +.tx-details-layout .outputs .output .view-claim { text-decoration: none; color: black } .tx-details-layout .inputs .input .value, .tx-details-layout .outputs .output .value { font-weight: normal } .tx-details-layout .inputs .input.is-source, .tx-details-layout .outputs .output.is-source { border-right-width: 18px; border-right-color: #1e88e5; background: #e3f2fd } .tx-details-layout .inputs .input.highlighted, .tx-details-layout .outputs .output.highlighted { background: #f1f8e9 } -- 2.45.2 From 07a0d0c0fe2f316fa7c625b234e41f97131ac2e1 Mon Sep 17 00:00:00 2001 From: marcdeb1 Date: Thu, 11 Oct 2018 07:20:53 +0200 Subject: [PATCH 6/6] Added 'View' link next to Claim label --- src/Template/Main/tx.ctp | 7 ++++--- webroot/css/main.css | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp index 000115d..f6019ca 100644 --- a/src/Template/Main/tx.ctp +++ b/src/Template/Main/tx.ctp @@ -136,9 +136,10 @@ foreach ($outputs as $out): ?>
- IsSupportClaim): ?>
SUPPORT
- IsUpdateClaim): ?>
UPDATE
- IsClaim): ?>
CLAIM
+ IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim): ?>View + IsSupportClaim): ?>
SUPPORT
+ IsUpdateClaim): ?>
UPDATE
+ IsClaim): ?>
CLAIM
diff --git a/webroot/css/main.css b/webroot/css/main.css index 684b350..88c9ad7 100644 --- a/webroot/css/main.css +++ b/webroot/css/main.css @@ -252,7 +252,7 @@ footer .content .page-time { position: absolute; right: 12px; bottom: 0px; paddi .tx-details-layout .outputs .output .labels .support { background: #ffeb3b } .tx-details-layout .outputs .output .labels .update { background: #ea80fc } .tx-details-layout .outputs .output .labels .claim { background: #76ff03 } -.tx-details-layout .outputs .output .view-claim { text-decoration: none; color: black } +.tx-details-layout .outputs .output .view-claim { font-size: 80%; } .tx-details-layout .inputs .input .value, .tx-details-layout .outputs .output .value { font-weight: normal } .tx-details-layout .inputs .input.is-source, .tx-details-layout .outputs .output.is-source { border-right-width: 18px; border-right-color: #1e88e5; background: #e3f2fd } .tx-details-layout .inputs .input.highlighted, .tx-details-layout .outputs .output.highlighted { background: #f1f8e9 } -- 2.45.2