aaah, nice asides ;). we'll be updating these soon

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

1 files changed, 120 insertions, 118 deletions

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index e1dc8ba0c..c9028b9a9 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -3,126 +3,135 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a = get_app();
 $a->theme_info = array(
-	'extends' => 'dispy-dark',
+	'name' => 'dispy-dark',
+	'version' => '1.1'
 );
 
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
-    $('.group-edit-icon').hover(
-        function() {
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
-
-        function() {
-            $(this).removeClass('icon');
-            $(this).addClass('iconspacer'); }
-    );
-
-    $('.sidebar-group-element').hover(
-        function() {
-            id = $(this).attr('id');
-            $('#edit-' + id).addClass('icon');
-            $('#edit-' + id).removeClass('iconspacer'); },
-
-        function() {
-            id = $(this).attr('id');
-            $('#edit-' + id).removeClass('icon');
-            $('#edit-' + id).addClass('iconspacer'); }
-    );
-
-    $('.savedsearchdrop').hover(
-        function() {
-            $(this).addClass('drop');
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
-
-        function() {
-            $(this).removeClass('drop');
-            $(this).removeClass('icon');
-            $(this).addClass('iconspacer'); }
-    );
-
-    $('.savedsearchterm').hover(
-        function() {
-            id = $(this).attr('id');
-            $('#drop-' + id).addClass('icon');
-            $('#drop-' + id).addClass('drophide');
-            $('#drop-' + id).removeClass('iconspacer'); },
-
-        function() {
-            id = $(this).attr('id');
-            $('#drop-' + id).removeClass('icon');
-            $('#drop-' + id).removeClass('drophide');
-            $('#drop-' + id).addClass('iconspacer'); }
-        );
-
-	// click outside notifications menu closes it
-	$('html').click(function() {
-		$('#nav-notifications-linkmenu').removeClass('selected');
-		document.getElementById("nav-notifications-menu").style.display = "none";
-	});
-
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
-
-	$('#profiles-menu').click(function(event) {
-		event.stopPropagation();
-	});
+function dispy_dark_init(&$a) {
+
+	// aside on profile page
+	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+		dispy_dark_community_info();
+	}
+
+	$a->page['htmlhead'] .= <<<EOT
+	<script type="text/javascript">
+	$(document).ready(function() {
+		$('.group-edit-icon').hover(
+			function() {
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
+
+			function() {
+				$(this).removeClass('icon');
+				$(this).addClass('iconspacer'); }
+		);
+
+		$('.sidebar-group-element').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#edit-' + id).addClass('icon');
+				$('#edit-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#edit-' + id).removeClass('icon');
+				$('#edit-' + id).addClass('iconspacer'); }
+		);
+
+		$('.savedsearchdrop').hover(
+			function() {
+				$(this).addClass('drop');
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
+
+			function() {
+				$(this).removeClass('drop');
+				$(this).removeClass('icon');
+				$(this).addClass('iconspacer'); }
+		);
+
+		$('.savedsearchterm').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).addClass('icon');
+				$('#drop-' + id).addClass('drophide');
+				$('#drop-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).removeClass('icon');
+				$('#drop-' + id).removeClass('drophide');
+				$('#drop-' + id).addClass('iconspacer'); }
+			);
+
+		// click outside notifications menu closes it
+		$('html').click(function() {
+			$('#nav-notifications-linkmenu').removeClass('selected');
+			document.getElementById("nav-notifications-menu").style.display = "none";
+		});
+
+		$('#nav-notifications-linkmenu').click(function(event) {
+			event.stopPropagation();
+		});
+		// click outside profiles menu closes it
+		$('html').click(function() {
+			$('#profiles-menu-trigger').removeClass('selected');
+			document.getElementById("profiles-menu").style.display = "none";
+		});
+
+		$('#profiles-menu').click(function(event) {
+			event.stopPropagation();
+		});
+
+		// main function in toolbar functioning
+		function toggleToolbar() {
+			if ( $('#nav-floater').is(':visible') ) {
+				$('#nav-floater').slideUp('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-210px -60px' 
+				});
+				$('.search-box').slideUp('fast');
+			} else {
+				$('#nav-floater').slideDown('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-190px -60px'
+				});
+				$('.search-box').slideDown('fast');
+			}
+		};
+		// our trigger for the toolbar button
+		$('.floaterflip').click(function() {
+			toggleToolbar();
+			return false;
+		});
+
+		// (attempt) to change the text colour in a top post
+		$('#profile-jot-text').focusin(function() {
+			$(this).css({color: '#eec'});
+		});
 
-	// main function in toolbar functioning
-    function toggleToolbar() {
-        if ( $('#nav-floater').is(':visible') ) {
-            $('#nav-floater').slideUp('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-210px -60px' 
-            });
-			$('.search-box').slideUp('fast');
-        } else {
-            $('#nav-floater').slideDown('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-190px -60px'
-            });
-			$('.search-box').slideDown('fast');
-        }
-    };
-	// our trigger for the toolbar button
-    $('.floaterflip').click(function() {
-        toggleToolbar();
-        return false;
-    });
-
-	// (attempt) to change the text colour in a top post
-	$('#profile-jot-text').focusin(function() {
-		$(this).css({color: '#eec'});
 	});
-
-});
-</script>
+	</script>
 EOT;
+}
 
-function dispydark_community_info() {
+function dispy_dark_community_info() {
 	$a = get_app();
+	$url = $a->get_baseurl($ssl_state);
+	$aside['$url'] = $url;
 
-	$aside['$lastusers_title'] = t('Last users');
-    $aside['$lastusers_items'] = array();
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
-
-	$fostitJS = "javascript: (function() {
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
+	$fpostitJS = <<<FPI
+		javascript: (function() {
+		the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
 		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
 		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
 		document.getSelection() : document.selection.createRange().text));
@@ -135,18 +144,11 @@ function dispydark_community_info() {
 			} else {
 				a_funct();
 			}
-		})();";
+		})();
+FPI;
 
-	$aside['$fostitJS'] = $fostitJS;
-	$url = $a->get_baseurl($ssl_state);
-	$aside['$url'] = $url;
-
-    $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
+	$aside['$fpostitJS'] = $fpostitJS;
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-	dispydark_community_info();
-//}
-