Fix emitting the twitter timeline header at the wrong place

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

View file

@ -11,6 +11,9 @@ TODO:
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)
1.61

View file

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

View file

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

View file

@ -4,9 +4,18 @@ if (IN_serendipity !== true) {
}
?>
<ul id="serendipity_admin_tweeter_statuses">
<?php echo $buffer; ?>
</ul>
<?php
if ($GLOBALS['serendipity']['version'][0] == '1') {
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
if ($GLOBALS['serendipity']['version'][0] == '1') {
echo '<div class="tweeter_clearfix"></div>';