X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fdispy%2Ftheme.php;h=2d423a9280ec5e28547270375d4eb45841da4867;hb=7ceb21385935b777f2aa74e0aab42f0eb981736d;hp=d0f6797cbaa92c617dfc1f55f4b2c02a768b750c;hpb=aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b;p=friendica.git
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index d0f6797cba..2d423a9280 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -2,146 +2,200 @@
/*
* Name: Dispy
- * Description: Dispy, Friendica theme
- * Version: 1.0
- * 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(
- 'extends' => 'dispy',
+ 'family' => 'dispy',
+ 'version' => '1.2.2'
);
-$a->page['htmlhead'] .= <<< EOT
-
+
+EOT;
- // 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'});
- });
+ // custom css
+ if (!is_null($cssFile)) {
+ $a->page['htmlhead'] .= sprintf('', $cssFile);
+ }
-});
-
-EOT;
+ _js_in_foot();
+}
function dispy_community_info() {
+ /** @purpose some sidebar stuff for new users
+ */
$a = get_app();
-
- $fostitJS = "javascript: (function() {
- the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/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['$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);
+ $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'])) {
- dispy_community_info();
+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);
+ }
}