Merge branch 'mv-channel-list-to-table'

admin/css/lbry-admin.css

@@ -86,3 +86,38 @@
 .lbry-meta-bx-content-last {
   padding: .2em .8em 1em .1em;
 }
+
+table.lbry-channel-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-family: Georgia;
+}
+
+.lbry-channel-table th, .lbry-channel-table td {
+  padding: .4em 1.6em;
+  border: 2px solid #fff;
+  background: #fbd7b4;
+  font-size: 1em;
+}
+.lbry-channel-table thead th {
+  padding: .5em 2em;
+  background: #f69546;
+  text-align: left;
+  font-weight: normal;
+  font-size: 1.2em;
+  color: #fff;
+}
+.lbry-channel-table tbody tr:nth-child(odd) *:nth-child(even), .lbry-channel-table tbody tr:nth-child(even) *:nth-child(odd) {
+  background: #f3eddd;
+}
+.lbry-channel-table tfoot th {
+  padding: .5em 2em;
+  background: #f69546;
+  text-align: left;
+  font-weight: normal;
+  font-size: .9em;
+  color: #fff;
+}
+.lbry-channel-table tr *:nth-child(3), .lbry-channel-table tr *:nth-child(4) {
+  /* text-align: right; */
+}

classes/LBRY_Admin.php

@@ -254,10 +254,18 @@ class LBRY_Admin
     public function available_channels_callback()
     {
         $channel_list = LBRY()->daemon->channel_list();
-
         if ( $channel_list ) { ?>
-            <ul class="lbry-channel-list">
+          <table class="lbry-channel-table">
-                <?php foreach ( $channel_list as $channel ) {
+            <thead>
+                <tr>
+                    <th>Channel</th>
+                    <th>LBRY URL</th>
+                    <th>Posts</th>
+                    <th colspan="2">Supports</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ( $channel_list as $channel ):
                 $claim_id = $channel->claim_id;
                 $results = LBRY()->daemon->claim_search( $claim_id );
                 $lbry_url = $results->items[0]->canonical_url;
@@ -265,6 +273,7 @@ class LBRY_Admin
                     $open_url = str_replace( 'lbry://', 'open.lbry.com/', $lbry_url );
                 }
                 $support_amount = $results->items[0]->meta->support_amount;
+                $claims_published = $results->items[0]->meta->claims_in_channel;
                 if ( ( $support_amount < 0.001 ) ) {
                     ( $support_amount = '0' );
                 } elseif ( ( $support_amount < 0.01 ) && ( $support_amount >= 0.001 ) ) {
@@ -277,16 +286,24 @@ class LBRY_Admin
                     ( $support_amount = number_format( intval( $support_amount ) ) );
                 }
                 $init_bid = $results->items[0]->amount; ?>          
-                    <li><a href="<?php echo esc_url( $open_url, 'lbrypress' ); ?>"><?php esc_html_e( $channel->name, 'lbrypress' ) ?></a> <?php esc_html_e( $lbry_url, 'lbrypress'); ?> <span title="Initial Bid Amount: <?php esc_html_e( $init_bid, 'lbrypress' ); ?>"><img src="<?php echo esc_url( plugin_dir_url( LBRY_PLUGIN_FILE ) . 'admin/images/lbc.png' ) ?>" class="icon icon-lbc bid-icon-lbc channel-bid-icon-lbc"><?php esc_html_e( $support_amount, 'lbrypress' ); ?></span></li>
+                <tr>
-                    
+                <td><a href="<?php echo esc_url( $open_url, 'lbrypress' ); ?>"><?php esc_html_e( $channel->name, 'lbrypress' ); ?></a></td>
-                <?php } ?>
+                <td><?php esc_html_e( $lbry_url, 'lbrypress' ); ?></td>
-            </ul>
+                <td><?php esc_html_e( $claims_published, 'lbrypress' ); ?></td>
+                <td><span title="Initial Bid Amount: <?php esc_html_e( $init_bid, 'lbrypress' ); ?>"><img src="<?php echo esc_url( plugin_dir_url( LBRY_PLUGIN_FILE ) . 'admin/images/lbc.png' ) ?>" class="icon icon-lbc bid-icon-lbc channel-bid-icon-lbc"><?php esc_html_e( $support_amount, 'lbrypress' ); ?></span></td>
+                <td><a href="#">Add</a></td>
+                </tr>
+          <?php endforeach; ?>
+            </tbody>
+            <tfoot>
+                <tr><th colspan="5">LBRYPress</th></tr>
+            </tfoot>
+         </table>
        <?php } else { ?>
          <p>Looks like you haven't added any channels yet, feel free to do so below:</p>
      <?php }
     }
 
-
     /**
     * Section info for the Speech Channel Section
     */
@@ -533,13 +550,15 @@ class LBRY_Admin
     {
         // See if we've checked in the past two hours
         if ( ! get_transient( 'lbry_wallet_check' ) ) {
-            $balance = LBRY()->daemon->wallet_balance();
+            $result = LBRY()->daemon->wallet_balance();
+            $balance = $result->result->available;
+            $site_url = get_site_url();
             if ( $balance < get_option( LBRY_SETTINGS )[LBRY_LBC_PUBLISH] * 20 ) {
                 // If LBRY Balance is low, send email, but only once per day
                 if ( ! get_transient( 'lbry_wallet_warning_email' ) ) {
                     $email = get_option( 'admin_email' );
                     $subject = 'Your LBRYPress Wallet Balance is Low!';
-                    $message = 'Your LBRY Wallet for your WordPress installation at ' . site_url() . ' is running very low.\r\n\r\nYou currently have ' . $balance . ' LBC left in your wallet. In order to keep publishing to the LBRY network, please add some LBC to your account.';
+                    $message = 'Your LBRY Wallet for your WordPress installation at ' . esc_html_e( $site_url ) . ' is running very low.\r\n\r\nYou currently have ' . esc_html_e( $balance ) . ' LBC left in your wallet. In order to keep publishing to the LBRY network, please add some LBC to your account.';
                     wp_mail( $email, $subject, $message );
                     set_transient( 'lbry_wallet_warning_email', true, DAY_IN_SECONDS );
                 }