X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdispy%2Ftheme.php;h=a3b6b7f6eabd0c68370fffff65a6e75501b2a2e2;hb=5068563cf5bc67ab6d6dcc406998fa8ffa651b82;hp=1598220b87c9084e517a52fbbe7f77e38c468db6;hpb=17aba3033ff050a031ae578f0351db3da29ecbb7;p=friendica.git

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 1598220b87..a3b6b7f6ea 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,26 +2,35 @@
 
 /*
  * Name: Dispy
- * Description: <p style="white-space:pre;">            Dispy: Light, Spartan, Sleek, and Functional<br />            Dispy Dark: Dark, Spartan, Sleek, and Functional</p>
- * Version: 1.2
+ * 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>
  */
 
-$a = get_app();
-$a->theme_info = array(
-    'family' => 'dispy',
-	'version' => '1.2'
-);
+/* 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.
+ */
 
 function dispy_init(&$a) {
 
+	$a->theme_info = array(
+		'family' => 'dispy',
+		'version' => '1.2.2'
+	);
+	set_template_engine($a, 'smarty3');
+
     /** @purpose set some theme defaults
     */
     $cssFile = null;
-    $colour = false;
     $colour = get_pconfig(local_user(), "dispy", "colour");
+	$baseurl = $a->get_baseurl($ssl_state);
+
     if ($colour === false) { $colour = "light"; }
     if ($colour == "light") {
 		$colour_path = "/light/";
@@ -39,9 +48,13 @@ function dispy_init(&$a) {
 	}
 
 	$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").colorbox({maxHeight:"90%"});
+
+    	$('.group-edit-icon').hover(
 			function() {
 				$(this).addClass('icon');
 				$(this).removeClass('iconspacer'); },
@@ -160,7 +173,7 @@ EOT;
         $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
     }
 
-	js_in_foot();
+	_js_in_foot();
 }
 
 function dispy_community_info() {
@@ -170,17 +183,19 @@ function dispy_community_info() {
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
-	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	$tpl = get_markup_template('communityhome.tpl');
 	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 = get_markup_template('bottom.tpl');
 
-	return $a->page['bottom'] = replace_macros($tpl, $bottom);
+		return $a->page['bottom'] = replace_macros($tpl, $bottom);
+	}
 }