Merge remote branch 'upstream/master'

1 files changed, 54 insertions, 16 deletions

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index b72de51e5..deedc86f7 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,30 +2,59 @@
 
 /*
  * 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'
 );
 
 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'); },
@@ -139,10 +168,17 @@ function dispy_init(&$a) {
 	</script>
 EOT;
 
-	js_in_foot();
+    // 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;
@@ -151,13 +187,15 @@ function dispy_community_info() {
 	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-function js_in_foot() {
-	/** @purpose insert stuff in bottom of page
-	 */
-	$a = get_app();
-	$baseurl = $a->get_baseurl($ssl_state);
-	$bottom['$baseurl'] = $baseurl;
-	$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+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 = file_get_contents(dirname(__file__) . '/bottom.tpl');
 
-	return $a->page['bottom'] = replace_macros($tpl, $bottom);
+		return $a->page['bottom'] = replace_macros($tpl, $bottom);
+	}
 }