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/theme.php | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'view/theme/diabook/theme.php') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index cdac4019c..08bdfaf89 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -262,6 +262,53 @@ 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/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/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/diabook/theme.php') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 08bdfaf89..6973951a0 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -299,7 +299,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 From 15ba0ef5d0bbfed0174c9b9360ebf6f912c90e80 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 13:12:15 +0200 Subject: various bugfixes and css-fixes --- view/theme/diabook/theme.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook/theme.php') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6973951a0..88944322e 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -7,6 +7,9 @@ * Author: */ +$a->theme_info = array( + 'extends' => 'duepuntozero', +); //change css on network and profilepages $cssFile = null; @@ -276,7 +279,10 @@ if ($a->argv[0] === "settings"){ 'url' => $a->get_baseurl(true).'/settings/display', 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), ), - + array( + 'label' => t('Edit/Manage Profiles'), + 'url' => $a->get_baseurl(true).'/profiles', + ), array( 'label' => t('Connector settings'), 'url' => $a->get_baseurl(true).'/settings/connectors', -- cgit v1.2.3 From f075e977fe60b5ce4544ceb0ea8bfcf2f108c31f Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 1 Apr 2012 18:12:20 +0200 Subject: add new messages-layout in diabook --- view/theme/diabook/theme.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'view/theme/diabook/theme.php') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 88944322e..6ac64beda 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -7,9 +7,7 @@ * Author: */ -$a->theme_info = array( - 'extends' => 'duepuntozero', -); + //change css on network and profilepages $cssFile = null; @@ -320,7 +318,7 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); //js scripts -- cgit v1.2.3 From 23dc376364b7d8f8e27e3493fe3edbf5cf768a35 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 01:29:20 +0200 Subject: diabook-themes: add link to global dir in "find friends" at right_aside --- view/theme/diabook/theme.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook/theme.php') diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6ac64beda..d6ee57316 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); -- cgit v1.2.3