aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-26 15:33:34 -0700
committerfriendica <info@friendica.com>2012-04-26 15:33:34 -0700
commit3ee998dbaf83e92dd1ceaee4d35ca942210c5e24 (patch)
tree733a6785377d17dc8d05d5e17e724738789c5329
parent552895001c5b0a43b3e37e8dbdedda718dd882c6 (diff)
parent328568943e3b6f3157db71a6e8561cb22c363b03 (diff)
downloadvolse-hubzilla-3ee998dbaf83e92dd1ceaee4d35ca942210c5e24.tar.gz
volse-hubzilla-3ee998dbaf83e92dd1ceaee4d35ca942210c5e24.tar.bz2
volse-hubzilla-3ee998dbaf83e92dd1ceaee4d35ca942210c5e24.zip
Merge pull request #267 from tomtom84/master
add link "remove account" to /mod/settings.php
-rw-r--r--mod/settings.php5
-rwxr-xr-xview/theme/diabook/theme.php7
2 files changed, 11 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 8c8b3062d..3072d3d65 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -75,6 +75,11 @@ EOT;
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
+ ),
+ array(
+ 'label' => t('Remove account'),
+ 'url' => $a->get_baseurl(true) . '/removeme',
+ 'selected' => ''
)
);
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 073e270ef..c45db9884 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -14,12 +14,17 @@ $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
$cssFile = null;
+
$resolution=false;
$resolution = get_pconfig(local_user(), "diabook", "resolution");
if ($resolution===false) $resolution="normal";
+
$color = false;
-$color = get_pconfig(local_user(), "diabook", "color");
+$site_color = get_config("diabook", "color" );
+if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
+if ($color===false) $color=$site_color;
if ($color===false) $color="diabook";
+
if ($color=="diabook") $color_path = "/";
if ($color=="aerith") $color_path = "/diabook-aerith/";
if ($color=="blue") $color_path = "/diabook-blue/";