From b9656cbe2379183c4f0130206a396ed1ee2aec75 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 24 Apr 2014 11:49:11 +0200 Subject: [PATCH 01/12] Delegations: Now the menu of the settings appears at the delegations settings --- mod/delegate.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/delegate.php b/mod/delegate.php index 8c50318590..dd9caba252 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -117,6 +117,9 @@ function delegate_content(&$a) { if(! in_array($rr['uid'],$uids)) $potentials[] = $rr; + require_once("mod/settings.php"); + settings_init($a); + $o = replace_macros(get_markup_template('delegate.tpl'),array( '$header' => t('Delegate Page Management'), '$base' => $a->get_baseurl(), @@ -136,4 +139,4 @@ function delegate_content(&$a) { return $o; -} \ No newline at end of file +} From 9ae9b66328e24475766c2998a45ab6b32c68ea08 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 24 Apr 2014 11:58:04 +0200 Subject: [PATCH 02/12] Export personal data: Now the settings menu on the left side is taken from the settings module. --- mod/uexport.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/mod/uexport.php b/mod/uexport.php index bad924d8e8..a44620a976 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -3,19 +3,23 @@ function uexport_init(&$a){ if(! local_user()) killme(); - + + require_once("mod/settings.php"); + settings_init($a); + +/* $tabs = array( array( 'label' => t('Account settings'), 'url' => $a->get_baseurl(true).'/settings', 'selected' => '', - ), + ), array( 'label' => t('Display settings'), 'url' => $a->get_baseurl(true).'/settings/display', 'selected' =>'', - ), - + ), + array( 'label' => t('Connector settings'), 'url' => $a->get_baseurl(true).'/settings/connectors', @@ -42,17 +46,18 @@ function uexport_init(&$a){ 'selected' => '' ) ); - + $tabtpl = get_markup_template("generic_links_widget.tpl"); $a->page['aside'] = replace_macros($tabtpl, array( '$title' => t('Settings'), '$class' => 'settings-widget', '$items' => $tabs, )); +*/ } function uexport_content(&$a){ - + if ($a->argc > 1) { header("Content-type: application/json"); header('Content-Disposition: attachment; filename="'.$a->user['nickname'].'.'.$a->argv[1].'"'); @@ -73,15 +78,15 @@ function uexport_content(&$a){ array('/uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')), ); call_hooks('uexport_options', $options); - + $tpl = get_markup_template("uexport.tpl"); return replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), '$title' => t('Export personal data'), '$options' => $options )); - - + + } function _uexport_multirow($query) { @@ -117,7 +122,7 @@ function uexport_account($a){ $user = _uexport_row( sprintf( "SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval(local_user()) ) ); - + $contact = _uexport_multirow( sprintf( "SELECT * FROM `contact` WHERE `uid` = %d ",intval(local_user()) ) ); @@ -139,7 +144,7 @@ function uexport_account($a){ $group = _uexport_multirow( sprintf( "SELECT * FROM `group` WHERE uid = %d",intval(local_user()) ) ); - + $group_member = _uexport_multirow( sprintf( "SELECT * FROM `group_member` WHERE uid = %d",intval(local_user()) ) ); @@ -195,4 +200,4 @@ function uexport_all(&$a) { echo json_encode($output)."\n"; } -} \ No newline at end of file +} From 2e7549c945e4657caae68101e2595f342d390973 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 24 Apr 2014 12:14:45 +0200 Subject: [PATCH 03/12] Show preview of the correct theme, not the mobile theme. --- view/templates/field_themeselect.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index cde744594b..4736235815 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -3,12 +3,12 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} - + {{if $field.5}}{{/if}}
{{$field.3}} -
+ {{if $field.5}}
{{/if}}
From 59c9a9adae49df60db0375a549ee999dc2214bbe Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 24 Apr 2014 12:18:51 +0200 Subject: [PATCH 04/12] OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed --- view/templates/settings_oauth_edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/settings_oauth_edit.tpl b/view/templates/settings_oauth_edit.tpl index e3960bf75f..0b55b6b268 100644 --- a/view/templates/settings_oauth_edit.tpl +++ b/view/templates/settings_oauth_edit.tpl @@ -16,7 +16,7 @@
- +
From ec1f07d5b7459d354351646f0691ef70e09a0551 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 24 Apr 2014 12:39:27 +0200 Subject: [PATCH 05/12] =?UTF-8?q?Only=20show=20the=20preview=20button=20wh?= =?UTF-8?q?en=20it=20is=20activated/Men=C3=BC=20arrangement=20changed=20fo?= =?UTF-8?q?r=20settings=20menu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/templates/comment_item.tpl | 2 +- view/templates/jot.tpl | 2 +- view/theme/vier/templates/comment_item.tpl | 2 +- view/theme/vier/templates/nav.tpl | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl index caf98168d0..8cc524283e 100644 --- a/view/templates/comment_item.tpl +++ b/view/templates/comment_item.tpl @@ -34,7 +34,7 @@
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl index bd9902159c..efa00ce20c 100644 --- a/view/templates/jot.tpl +++ b/view/templates/jot.tpl @@ -59,7 +59,7 @@ {{$bang}} - {{$preview}} + {{if $preview}}{{$preview}}{{/if}}
diff --git a/view/theme/vier/templates/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl index b683f12424..557996ba92 100644 --- a/view/theme/vier/templates/comment_item.tpl +++ b/view/theme/vier/templates/comment_item.tpl @@ -46,7 +46,7 @@ - {{$preview}} + {{if $preview}}{{$preview}}{{/if}} diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index fb3483d446..9254bbccc6 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -42,12 +42,12 @@