* I've always hated Flitter... I thought it looked *really* bad. Now …

…it only looks quite bad. Plenty of changes. (flitter/*)

@ Flitter divs are now shown below the first post in a page, which, granted, isn't very helpful on page 2 and beyond, but it's easier said than done. Also, more importantly, this demonstrates how to render a template layer through a hook, rather than skeleton injection. See in Flitter-Main.php.

Signed-off-by: Nao <nao@wedge>

flitter/Flitter-Admin.english.php

@@ -18,7 +18,5 @@
 $txt['flitter_showgoogle'] = 'Show the +1 button';
 
 $txt['flitter_position'] = 'Where to display the different buttons?';
-$txt['flitter_position_topic'] = 'Above the topic';
+$txt['flitter_position_topic'] = 'Below the first post';
 $txt['flitter_position_sidebar'] = 'In the sidebar';
-
-?>

flitter/Flitter-Admin.german.php

@@ -18,7 +18,5 @@
 $txt['flitter_showgoogle'] = 'Zeige den +1 Button';
 
 $txt['flitter_position'] = 'Wo sollen die unterschiedlichen Buttons angezeigt werden?';
-$txt['flitter_position_topic'] = 'Über dem Thema';
+$txt['flitter_position_topic'] = 'Unter dem Thema';
 $txt['flitter_position_sidebar'] = 'In der Sidebar';
-
-?>

flitter/Flitter-Admin.php

@@ -12,7 +12,7 @@ function flitter_admin()
 		'label' => 'Flitter',
 		'function' => 'ModifyFlitterSettings',
 		'icon' => 'mgallery.png',
-		'bigicon' => $context['plugins_url']['Arantor:Flitter'] . '/flitter.png',
+		'bigicon' => $context['plugins_url']['Wedge:Flitter'] . '/flitter.png',
 	);
 }
 
@@ -21,7 +21,7 @@ function ModifyFlitterSettings($return_config = false)
 	global $txt, $context, $settings;
 
 	loadSource('ManageServer');
-	loadPluginLanguage('Arantor:Flitter', 'Flitter-Admin');
+	loadPluginLanguage('Wedge:Flitter', 'Flitter-Admin');
 
 	if (empty($settings['allow_guestAccess']))
 		$config_vars = array(
@@ -62,5 +62,3 @@ function ModifyFlitterSettings($return_config = false)
 	wetem::load('show_settings');
 	prepareDBSettingContext($config_vars);
 }
-
-?>

flitter/Flitter-Main.php

@@ -10,32 +10,35 @@ function flitter_main()
 	if (empty($settings['flitter_showfb']) && empty($settings['flitter_showtwitter']) && empty($settings['flitter_showgoogle']))
 		return;
 
-	loadPluginTemplate('Arantor:Flitter', 'Flitter-Main');
+	loadPluginTemplate('Wedge:Flitter', 'Flitter-Main');
 
 	$lang = isset(we::$user['language']) ? we::$user['language'] : $language;
 	switch ($lang)
 	{
 		case 'french':
-			$txt['flitter_share'] = 'Réseaux sociaux';
+			$txt['flitter_share'] = 'Partager';
+			break;
+		case 'german':
+			$txt['flitter_share'] = 'Share';
 			break;
 		case 'english':
 		default:
 			$txt['flitter_share'] = 'Share Topic';
 			break;
 	}
 
-	$dest = 'flitter_sidebar';
 	if (!empty($settings['flitter_position']) && $settings['flitter_position'] == 'sidebar')
-		wetem::add('sidebar', array($dest => array()));
+	{
+		wetem::add('sidebar', array('flitter_sidebar' => array()));
+		foreach (array('fb', 'twitter', 'google') as $service)
+			if (!empty($settings['flitter_show' . $service]))
+				wetem::add('flitter_sidebar', 'flitter_' . $service);
+	}
 	else
 	{
-		$dest = 'flitter_topic';
-		wetem::after('title_upper', array($dest => array()));
+		wetem::add_hook('first_post_done', array('flitter_topic' => array()));
+		foreach (array('fb', 'twitter', 'google') as $service)
+			if (!empty($settings['flitter_show' . $service]))
+				wetem::$hooks->add('flitter_topic', 'flitter_' . $service);
 	}
-
-	foreach (array('fb', 'twitter', 'google') as $service)
-		if (!empty($settings['flitter_show' . $service]))
-			wetem::add($dest, 'flitter_' . $service);
 }
-
-?>

flitter/Flitter-Main.template.php

@@ -5,7 +5,9 @@
 
 function template_flitter_topic_before()
 {
-	add_css('#flitter, #flitter > div { display: inline-block; height: 33px; vertical-align: middle }');
+	add_css('
+#flitter { height: 30px; padding: 3px 0 0; text-align: right }
+#flitter > div { display: inline-block; vertical-align: middle !important; }');
 
 	echo '
 		<div id="flitter">';
@@ -21,7 +23,9 @@ function template_flitter_sidebar_before()
 {
 	global $txt;
 
-	add_css('#flitter, #flitter > div { display: inline-block; height: 33px; vertical-align: middle }');
+	add_css('
+#flitter { height: 30px; padding: 3px 0 0 }
+#flitter > div { display: inline-block; vertical-align: middle !important; }');
 
 	echo '
 	<section>
@@ -80,4 +84,3 @@ function template_flitter_google()
 		var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(po, s);
 	})();');
 }
-?>

flitter/plugin-info.xml

@@ -1,19 +1,16 @@
 <?xml version="1.0" standalone="yes" ?>
-<plugin id="Arantor:Flitter">
+<plugin id="Wedge:Flitter">
 	<name>Flitter</name>
-	<author>Arantor</author>
+	<author>Wedge Team</author>
 	<description>Adds Facebook, Twitter and Google +1 buttons to your forum threads.</description>
 	<version>1.0</version>
 	<settings>
 		<setting name="flitter_position" default="topic" />
-
 		<setting name="flitter_showfb" default="" />
-
 		<setting name="flitter_showtwitter" default="" />
 		<setting name="flitter_twitter_via" default="" />
 		<setting name="flitter_twitter_related" default="" />
 		<setting name="flitter_twitter_related_desc" default="" />
-
 		<setting name="flitter_showgoogle" default="" />
 	</settings>
 	<hooks>