X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fdispy%2Ftheme.php;h=2d423a9280ec5e28547270375d4eb45841da4867;hb=2abbd1dc19680fcfc00c841b6a73a97a297055b9;hp=125910593ad53d5a6f6a3d4e840d9b5d7071181c;hpb=97715c73fcb5b6de582f7165f70526acaf24bc86;p=friendica.git
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 125910593a..2d423a9280 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
* Maintainer: Simon
* Screenshot: Screenshot
*/
+/* 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'
);
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;
- js_in_foot();
+ // custom css
+ if (!is_null($cssFile)) {
+ $a->page['htmlhead'] .= sprintf('', $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 = "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();}})()";
-
- $aside['$fpostitJS'] = $fpostitJS;
$tpl = file_get_contents(dirname(__file__) . '/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 = file_get_contents(dirname(__file__) . '/bottom.tpl');
- return $a->page['bottom'] = replace_macros($tpl, $bottom);
+ return $a->page['bottom'] = replace_macros($tpl, $bottom);
+ }
}