Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as © by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:

1 files changed, 0 insertions, 84 deletions

diff --git a/view/theme/diabook/diabook-pink/config.php b/view/theme/diabook/diabook-pink/config.php
deleted file mode 100644
index 0083a4df7..000000000
--- a/view/theme/diabook/diabook-pink/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Theme settings
- */
-
-
-
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
-	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
-	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
-	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_post(&$a){
-	if(! local_user())
-		return;
-	
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
-	}
-}
-
-
-function theme_admin(&$a){
-	$font_size = get_config('diabook-aerith', 'font_size' );
-	$line_height = get_config('diabook-aerith', 'line_height' );
-	$resolution = get_config('diabook-aerith', 'resolution' );
-	
-	return diabook_form($a,$font_size, $line_height,$resolution);
-}
-
-function theme_admin_post(&$a){
-	if (isset($_POST['diabook-aerith-settings-submit'])){
-		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
-		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
-		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
-	}
-}
-
-
-function diabook_form(&$a, $font_size, $line_height, $resolution){
-	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
-	);
-	
-	$font_sizes = array(
-		'13'=>'13',
-		"---"=>"---",
-		"15"=>"15",
-		'14'=>'14',
-		'13.5'=>'13.5',		
-		'12.5'=>'12.5',
-		'12'=>'12',
-		);
-	$resolutions = array(
-		'normal'=>'normal',
-		'wide'=>'wide',		
-		);
-	
-	
-	
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
-	$o .= replace_macros($t, array(
-		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
-		'$title' => t("Theme settings"),
-		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
-		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
-		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
-	));
-	return $o;
-}