{$CONST.CATEGORIES_ON_ARCHIVE_DESC}
+{$CONST.CATEGORIES_ON_ARCHIVE_DESC}
{/if} \ No newline at end of file diff --git a/templates/timeline/archive_freetag.tpl b/templates/timeline/archive_freetag.tpl index 1f93f738..fb981b6f 100644 --- a/templates/timeline/archive_freetag.tpl +++ b/templates/timeline/archive_freetag.tpl @@ -6,5 +6,5 @@ {/foreach} {else} -{$CONST.TAGS_ON_ARCHIVE_DESC}
+{$CONST.TAGS_ON_ARCHIVE_DESC}
{/if} \ No newline at end of file diff --git a/templates/timeline/comments.tpl b/templates/timeline/comments.tpl index e3de3cd8..502b0f37 100644 --- a/templates/timeline/comments.tpl +++ b/templates/timeline/comments.tpl @@ -38,11 +38,11 @@ diff --git a/templates/timeline/config.inc.php b/templates/timeline/config.inc.php index 5177e2f2..0f9b512d 100644 --- a/templates/timeline/config.inc.php +++ b/templates/timeline/config.inc.php @@ -253,30 +253,42 @@ for ($i = 0; $i < $template_loaded_config['social_icons_amount']; $i++) { 'name' => SOCIAL_NETWORK_SERVICE . ' #' .($i+1), 'type' => 'select', 'default' => 'RSS', - 'select_values' => array('Amazon' => 'Amazon', - 'Digg' => 'Digg', - 'Dribbble' => 'Dribbble', - 'Dropbox' => 'Dropbox', - 'Facebook' => 'Facebook', - 'Flickr' => 'Flickr', - 'Github' => 'Github', - 'Google' => 'Google', - 'Google Plus' => 'Google Plus', - 'Instagram' => 'Instagram', - 'LastFM' => 'LastFM', - 'Linkedin' => 'Linkedin', - 'Paypal' => 'Paypal', - 'Pinterest' => 'Pinterest', - 'RSS' => 'RSS', - 'Skype' => 'Skype', - 'Reddit' => 'Reddit', - 'Stumbleupon' => 'Stumbleupon', - 'Tumblr' => 'Tumblr', - 'Twitter' => 'Twitter', - 'Vimeo' => 'Vimeo', - 'Vine' => 'Vine', - 'Xing' => 'Xing', - 'YouTube' => 'YouTube') + 'select_values' => array('Amazon' => 'Amazon', + 'Amazon Pay' => 'Amazon Pay', + 'Apple Pay' => 'Apple Pay', + 'Comment' => 'Comment', + 'Diaspora' => 'Diaspora', + 'Digg' => 'Digg', + 'Dribbble' => 'Dribbble', + 'Dropbox' => 'Dropbox', + 'Email' => 'Email', + 'Etsy' => 'Etsy', + 'Facebook' => 'Facebook', + 'Facebook-Messenger' => 'Facebook-Messenger', + 'Flickr' => 'Flickr', + 'Github' => 'Github', + 'Google' => 'Google', + 'Home' => 'Home', + 'Instagram' => 'Instagram', + 'LastFM' => 'LastFM', + 'Linkedin' => 'Linkedin', + 'Mastodon' => 'Mastodon', + 'Mix' => 'Mix', + 'Mobile' => 'Mobile', + 'Patreon' => 'Patreon', + 'Paypal' => 'Paypal', + 'Pinterest' => 'Pinterest', + 'Reddit' => 'Reddit', + 'RSS' => 'RSS', + 'Skype' => 'Skype', + 'Snapchat' => 'Snapchat', + 'StackOverflow' => 'StackOverflow', + 'Tumblr' => 'Tumblr', + 'Twitter' => 'Twitter', + 'Vimeo' => 'Vimeo', + 'Vine' => 'Vine', + 'Xing' => 'Xing', + 'YouTube' => 'YouTube') ); $template_config[] = array( 'var' => 'social_icon' . $i . 'url', @@ -292,7 +304,7 @@ for ($i = 0; $i < $template_loaded_config['social_icons_amount']; $i++) { $serendipity['smarty']->assign_by_ref('socialicons', $socialicons); function getIcon($service) { - $icons = array('Amazon' => 'fa-amazon', 'Digg' => 'fa-digg', 'Dribbble' => 'fa-dribbble', 'Dropbox' => 'fa-dropbox', 'Facebook' => 'fa-facebook', 'Flickr' => 'fa-flickr', 'Github' => 'fa-github', 'Google' =>'fa-google', 'Google Plus' => 'fa-google-plus', 'Instagram' => 'fa-instagram', 'LastFM' => 'fa-lastfm', 'Linkedin' => 'fa-linkedin', 'Paypal' => 'fa-paypal', 'Pinterest' => 'fa-pinterest', 'RSS' => 'fa-rss', 'Skype' => 'fa-skype', 'Reddit' => 'fa-reddit', 'Stumbleupon' => 'fa-stumbleupon', 'Tumblr' => 'fa-tumblr', 'Twitter' => 'fa-twitter', 'Vimeo' => 'fa-vimeo', 'Vine' => 'fa-vine', 'Xing' => 'fa-xing', 'YouTube' => 'fa-youtube',); + $icons = array('Amazon' => 'fab fa-amazon', 'Amazon Pay' =>'fab fa-amazon-pay', 'Apple Pay' => 'fab fa-apple-pay', 'Comment' => 'fas fa-comment', 'Diaspora' =>'fab fa-diaspora', 'Digg' => 'fab fa-digg', 'Dribbble' => 'fab fa-dribbble', 'Dropbox' => 'fab fa-dropbox', 'Email' => 'far fa-envelope', 'Etsy' =>'fab fa-etsy', 'Facebook' => 'fab fa-facebook', 'Facebook-Messenger' => 'fab fa-facebook-messenger', 'Flickr' => 'fab fa-flickr', 'Github' => 'fab fa-github', 'Google' =>'fab fa-google', 'Home' => 'fas fa-home', 'Instagram' => 'fab fa-instagram', 'LastFM' => 'fab fa-lastfm', 'Linkedin' => 'fab fa-linkedin', 'Mastodon' => 'fab fa-mastodon', 'Mix' => 'fab fa-mix', 'Mobile' => 'fas fa-mobile-alt', 'Patreon' => 'fab fa-patreon', 'Paypal' => 'fab fa-paypal', 'Pinterest' => 'fab fa-pinterest', 'Reddit' => 'fab fa-reddit', 'RSS' => 'fas fa-rss', 'Skype' => 'fab fa-skype', 'Snapchat' => 'fab fa-snapchat', 'StackOverflow' => 'fab fa-stack-overflow', 'Tumblr' => 'fab fa-tumblr', 'Twitter' => 'fab fa-twitter', 'Vimeo' => 'fab fa-vimeo', 'Vine' => 'fab fa-vine', 'Xing' => 'fab fa-xing', 'YouTube' => 'fab fa-youtube',); return $icons[$service]; } diff --git a/templates/timeline/content.tpl b/templates/timeline/content.tpl index 9529aed9..7e5699e9 100644 --- a/templates/timeline/content.tpl +++ b/templates/timeline/content.tpl @@ -7,7 +7,7 @@{$content_message}
+{$content_message}
{$content_message}
+{$content_message}
{$CONST.POSTED_BY} - {$CONST.ON} - {if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if} + {$CONST.ON} + {if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}
{$entry.body} {if $entry.has_extended and not $is_single_entry and not $entry.is_extended} - + {/if}{$CONST.POSTED_BY} - {$CONST.ON} - {if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if} - {if $entry.is_entry_owner and not $is_preview}{$CONST.EDIT_ENTRY}{/if} + {$CONST.ON} + {if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if} + {if $entry.is_entry_owner and not $is_preview}{$CONST.EDIT_ENTRY}{/if}
{if $is_preview} {append var='entry' value=$smarty.session.save_entry_POST.properties index='properties'}{* gives us access to entry properties in preview *} @@ -107,14 +107,14 @@