From 0b4165493558a7084dab057c1c2784c7b4872332 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 31 Mar 2012 11:09:57 +0200 Subject: bug-fixes in diabook-derivates --- view/theme/diabook-red/theme.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/theme/diabook-red/theme.php') diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index df941197a..0229b1bae 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -15,7 +15,7 @@ $cssFile = null; /** * prints last community activity */ -function diabook_blue_community_info(){ +function diabook_red_community_info(){ $a = get_app(); //right_aside at networkpages @@ -234,7 +234,7 @@ if ($a->argv[0] === "network" && local_user()){ if($ccCookie != "8") { // COMMUNITY - diabook_blue_community_info(); + diabook_red_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css"; @@ -247,7 +247,7 @@ if ($a->argv[0] === "network" && local_user()){ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ if($ccCookie != "8") { // COMMUNITY - diabook_blue_community_info(); + diabook_red_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css"; @@ -256,7 +256,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ // custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); +//if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -- cgit v1.2.3 From 893ece90664588e61584b479ca7af0021ca1df83 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 31 Mar 2012 11:50:33 +0200 Subject: bug fix in diabook-aerith and -red --- view/theme/diabook-red/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/diabook-red/theme.php') diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 0229b1bae..3ce8e24c8 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -256,7 +256,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ // custom css -//if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); +if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); //load jquery.cookie.js $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -- cgit v1.2.3 From 13ded12ffb73a9c9ef2e94500e74f6f30481a0c8 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 31 Mar 2012 16:58:02 +0200 Subject: move the common tabs to right_aside in diabook-derivates --- view/theme/diabook-red/theme.php | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'view/theme/diabook-red/theme.php') diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 3ce8e24c8..6b8d6b6d4 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -255,6 +255,54 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } +//tabs at right_aside on settings page +if ($a->argv[0] === "settings"){ + + $tabs = array( + array( + 'label' => t('Account settings'), + 'url' => $a->get_baseurl(true).'/settings', + 'sel' => (($a->argc == 1)?'active':''), + ), + array( + 'label' => t('Display settings'), + 'url' => $a->get_baseurl(true).'/settings/display', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), + ), + + array( + 'label' => t('Connector settings'), + 'url' => $a->get_baseurl(true).'/settings/connectors', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), + ), + array( + 'label' => t('Plugin settings'), + 'url' => $a->get_baseurl(true).'/settings/addon', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), + ), + array( + 'label' => t('Connections'), + 'url' => $a->get_baseurl(true) . '/settings/oauth', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), + ), + array( + 'label' => t('Export personal data'), + 'url' => $a->get_baseurl(true) . '/uexport', + 'sel' => '' + ) + ); + $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; + $a->page['right_aside'] = replace_macros($tabtpl, array( + '$tabs' => $tabs, + )); + + + // CUSTOM CSS + $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css"; + +} + + // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); -- cgit v1.2.3 From 36545e554bd051f602c270569a20eddf432555f0 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 31 Mar 2012 18:42:11 +0200 Subject: diabook-themes: move "common tabs" to left side on settings page --- view/theme/diabook-red/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/diabook-red/theme.php') diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 6b8d6b6d4..ba5a69d25 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -292,7 +292,7 @@ if ($a->argv[0] === "settings"){ ) ); $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; - $a->page['right_aside'] = replace_macros($tabtpl, array( + $a->page['aside'] = replace_macros($tabtpl, array( '$tabs' => $tabs, )); -- cgit v1.2.3