X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fdispy%2Ftheme.php;h=a1de5498e6ea68e3fd3d1c244a9c6929ff878ce2;hb=6a2bd8b29fa8e7e4e70fc392a6c073ea3b518625;hp=edc9b9548f756389075f9d69cd509a5bcd9d9ef8;hpb=31b1d353b251d61397b6b18b7d5d2e21c8d7ac64;p=friendica.git

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index edc9b9548f..a1de5498e6 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,30 +2,60 @@
 
 /*
  * Name: Dispy
- * Description: Dispy, Friendica theme
- * Version: 1.1
- * Author: unknown
+ * Description: Dispy family (light, dark): Sleek and Functional Themes 
+ * Version: 1.2.1
+ * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+/* If you borrow any of these functions, make sure to
+ * RENAME your functions, otherwise both themes get conflicts,
+ * and the friendica instance will get HTTP 500 errors.
+ * To paraphrase Mike: "Might wish to wrap
+ * function_name with "if(! function_exists('function_name')) ... "
+ * or rename to prefix1_function_name (prefix2_function_name), etc.
+ */
+
 $a = get_app();
 $a->theme_info = array(
-	'name' => 'dispy',
-	'version' => '1.1'
+    'family' => 'dispy',
+	'version' => '1.2.2'
 );
+set_template_engine($a, 'smarty3');
 
 function dispy_init(&$a) {
 
-	// aside on profile page
+    /** @purpose set some theme defaults
+    */
+    $cssFile = null;
+    $colour = get_pconfig(local_user(), "dispy", "colour");
+	$baseurl = $a->get_baseurl($ssl_state);
+
+    if ($colour === false) { $colour = "light"; }
+    if ($colour == "light") {
+		$colour_path = "/light/";
+		require_once ('light/theme.php');
+	}
+    if ($colour == "dark") {
+		$colour_path = "/dark/";
+		require_once ('dark/theme.php');
+	}
+
+    /** @purpose aside on profile page
+    */
 	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
 		dispy_community_info();
 	}
 
 	$a->page['htmlhead'] .= <<<EOT
+	<script type="text/javascript" src="$baseurl/view/theme/dispy/js/modernizr.custom.2.5.3.min.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function() {
-		$('.group-edit-icon').hover(
+		// Select all links with lightbox class
+		$("a.lightbox").fancybox();
+
+    	$('.group-edit-icon').hover(
 			function() {
 				$(this).addClass('icon');
 				$(this).removeClass('iconspacer'); },
@@ -76,7 +106,7 @@ function dispy_init(&$a) {
 		// click outside notifications menu closes it
 		$('html').click(function() {
 			$('#nav-notifications-linkmenu').removeClass('selected');
-			document.getElementById("nav-notifications-menu").style.display = "none";
+			$('#nav-notifications-menu').css({display: 'none'});
 		});
 
 		$('#nav-notifications-linkmenu').click(function(event) {
@@ -85,7 +115,7 @@ function dispy_init(&$a) {
 		// click outside profiles menu closes it
 		$('html').click(function() {
 			$('#profiles-menu-trigger').removeClass('selected');
-			document.getElementById("profiles-menu").style.display = "none";
+			$('#profiles-menu').css({display: 'none'});
 		});
 
 		$('#profiles-menu').click(function(event) {
@@ -138,33 +168,35 @@ function dispy_init(&$a) {
 	});
 	</script>
 EOT;
+
+    // custom css
+    if (!is_null($cssFile)) {
+        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+    }
+
+	_js_in_foot();
 }
 
 function dispy_community_info() {
+    /** @purpose some sidebar stuff for new users
+    */
 	$a = get_app();
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $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));
-		a_funct = function() {
-			if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
-				location.href = the_url;
-			}
-			if (/Firefox/.test(navigator.userAgent)) {
-				setTimeout(a_funct, 0)
-			} else {
-				a_funct();
-			}
-		})();
-FPI;
-
-	$aside['$fpostitJS'] = $fpostitJS;
-	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	$tpl = get_markup_template('communityhome.tpl');
 	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
+if(! function_exists('_js_in_foot')) {
+	function _js_in_foot() {
+		/** @purpose insert stuff in bottom of page
+		*/
+		$a = get_app();
+		$baseurl = $a->get_baseurl($ssl_state);
+		$bottom['$baseurl'] = $baseurl;
+		$tpl = get_markup_template('bottom.tpl');
+
+		return $a->page['bottom'] = replace_macros($tpl, $bottom);
+	}
+}