devol
/
fediembedi-wordpress-widget-embed-fediverso
mirror of https://git.feneas.org/mediaformat/fediembedi
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed a few regressions

This commit is contained in:
Django Doucet 2020-01-15 23:08:53 -05:00
parent 74c6fd0a31
commit 39266ca51b
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fediembedi-settings-form.tpl.php
View File

@ -13,8 +13,8 @@ define("FEDI_CONNECTED",isset($account) && $account !== null);
<div style="display:<?php echo !FEDI_CONNECTED ? "block":"none"?>"> <div style="display:<?php echo !FEDI_CONNECTED ? "block":"none"?>">
<input type="text" class="widefat instance_url" id="instance" name="instance" size="80" value="<?php esc_url_raw( $instance, 'https' ); ?>" list="mInstances"> <input type="text" class="widefat instance_url" id="instance" name="instance" size="80" value="<?php esc_url_raw( $instance, 'https' ); ?>" list="mInstances">
<select class="widefat instance_type" id="instance_type" name="instance_type" value="<?php sanitize_key( $instance_type ); ?>"> <select class="widefat instance_type" id="instance_type" name="instance_type" value="<?php sanitize_key( $instance_type ); ?>">
<option value="mastodon">Mastodon/Pleroma</option> <option value="Mastodon">Mastodon/Pleroma</option>
<option value="pixelfed">Pixelfed</option> <option value="Pixelfed">Pixelfed</option>
</select> </select>
<input class="button button-primary" type="submit" value="<?php esc_attr_e( 'Connect to your instance', 'fediembedi' ); ?>" name="save" id="save"> <input class="button button-primary" type="submit" value="<?php esc_attr_e( 'Connect to your instance', 'fediembedi' ); ?>" name="save" id="save">
<br><small><?php _e( 'The currently supported software are Mastodon, Pleroma, Pixelfed.', 'fediembedi' ); ?></small><br> <br><small><?php _e( 'The currently supported software are Mastodon, Pleroma, Pixelfed.', 'fediembedi' ); ?></small><br>

3
fediembedi.php
View File

@ -108,7 +108,7 @@ class FediConfig
break; break;
case 'Pixelfed': case 'Pixelfed':
wp_enqueue_style( 'bootstrap', plugin_dir_url( __FILE__ ) . 'assets/bootstrap/css/bootstrap.min.css', array(), '4.4.1' ); wp_enqueue_style( 'bootstrap', plugin_dir_url( __FILE__ ) . 'assets/bootstrap/css/bootstrap.min.css', array(), '4.4.1' );
wp_enqueue_style( 'pixelfed', plugin_dir_url( __FILE__ ) . 'assets/pixelfed.css', array(), filemtime(plugin_dir_path( __FILE__ ) . 'pixelfed/pixelfed.css') ); wp_enqueue_style( 'pixelfed', plugin_dir_url( __FILE__ ) . 'assets/pixelfed.css', array(), filemtime(plugin_dir_path( __FILE__ ) . 'assets/pixelfed.css') );
//https://css-tricks.com/lozad-js-performant-lazy-loading-images/ lazyloading for background images //https://css-tricks.com/lozad-js-performant-lazy-loading-images/ lazyloading for background images
break; break;
default: default:
@ -167,7 +167,6 @@ class FediConfig
$client = new \FediClient($instance); $client = new \FediClient($instance);
$redirect_url = get_admin_url(); $redirect_url = get_admin_url();
$instance_type = get_option('fediembedi-instance-type');
switch ($instance_type) { switch ($instance_type) {
case 'Mastodon': case 'Mastodon':
$auth_url = $client->register_app($redirect_url); $auth_url = $client->register_app($redirect_url);

2
templates/fediembedi-mastodon.tpl.php → templates/mastodon.tpl.php
View File

@ -15,7 +15,7 @@
</a> </a>
<div class="spacer"></div> <div class="spacer"></div>
<div class="account__header__tabs__buttons"> <div class="account__header__tabs__buttons">
<a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi')</a> <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi'); ?></a>
</div> </div>
</div> </div>
<div class="account__header__tabs__name"> <div class="account__header__tabs__name">

4
templates/fediembedi-peertube.tpl.php → templates/peertube.tpl.php
View File

@ -1,4 +1,4 @@
<!-- mastodon --> <!-- peertube -->
<div class="scrollable" style="height: <?php echo $height; ?>;"> <div class="scrollable" style="height: <?php echo $height; ?>;">
<div role="feed"> <div role="feed">
<?php if($show_header): ?> <?php if($show_header): ?>
@ -15,7 +15,7 @@
</a> </a>
<div class="spacer"></div> <div class="spacer"></div>
<div class="account__header__tabs__buttons"> <div class="account__header__tabs__buttons">
<a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi')</a> <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi'); ?></a>
</div> </div>
</div> </div>
<div class="account__header__tabs__name"> <div class="account__header__tabs__name">

0
templates/fediembedi-pixelfed.tpl.php → templates/pixelfed.tpl.php
View File