qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix emitting the twitter timeline header at the wrong place

Browse source 
This was included in the ul, which doesn't make sense. Includes a
necessary CSS fix and makes the markup for that header easier to
adapt to 2.x markup.
This commit is contained in:
Matthias Mees 2014-05-24 13:56:11 +02:00
parent 2aab75080d
commit 3f41d21f6d
4 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
serendipity_plugin_twitter/ChangeLog
View file

@ -11,6 +11,9 @@ TODO:
1.62 1.62
-------------------------- --------------------------
* Emit the twitter timeline header at the proper place in the markup,
including a CSS fix and making it more flexible for markup changes
in 2.x (yellowled)
* Fixed a markup bug for twitter timeline (yellowled) * Fixed a markup bug for twitter timeline (yellowled)
1.61 1.61

4
serendipity_plugin_twitter/serendipity_event_twitter.php
View file

@ -2112,9 +2112,9 @@ a.twitter_update_time {
else { else {
if ($account_type == "twitter"){ if ($account_type == "twitter"){
if ($_POST['tweeter_timeline']){ if ($_POST['tweeter_timeline']){
$buffer .= "<h2>".PLUGIN_EVENT_TWITTER_TIMELINE.": ".$_POST['tweeter_timeline']."</h2>"; $buffer_header = PLUGIN_EVENT_TWITTER_TIMELINE.": ".$_POST['tweeter_timeline'];
} else { } else {
$buffer .= "<h2>".PLUGIN_EVENT_TWITTER_TIMELINE.": ".$this->get_config('tweeter_timeline')."</h2>"; $buffer_header = PLUGIN_EVENT_TWITTER_TIMELINE.": ".$this->get_config('tweeter_timeline');
} }
} }

8
serendipity_plugin_twitter/tweeter/serendipity_event_twitter_tweeter.css
View file

@ -1,4 +1,4 @@
/* /*
* You may copy this in your templates root path and edit it * You may copy this in your templates root path and edit it
* *
*/ */
@ -12,8 +12,12 @@
display:inline; display:inline;
} }
.serendipity_admin_tweeter_header,
#serendipity_admin_tweeter_statuses {
clear:both;
}
#serendipity_admin_tweeter_statuses { #serendipity_admin_tweeter_statuses {
clear:both;
width:400px; width:400px;
margin:0; margin:0;
padding:0; padding:0;

15
serendipity_plugin_twitter/tweeter/tweeter_history.inc.php
View file

@ -4,9 +4,18 @@ if (IN_serendipity !== true) {
} }
?> ?>
<ul id="serendipity_admin_tweeter_statuses"> <?php
<?php echo $buffer; ?> if ($GLOBALS['serendipity']['version'][0] == '1') {
</ul> echo '<h2 class="serendipity_admin_tweeter_header">' . $buffer_header . '</h2>';
} else {
echo '<h3 class="serendipity_admin_tweeter_header">' . $buffer_header . '</h3>';
}
?>
<ul id="serendipity_admin_tweeter_statuses">
<?php echo $buffer; ?>
</ul>
<?php <?php
if ($GLOBALS['serendipity']['version'][0] == '1') { if ($GLOBALS['serendipity']['version'][0] == '1') {
echo '<div class="tweeter_clearfix"></div>'; echo '<div class="tweeter_clearfix"></div>';