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, 277 deletions

diff --git a/view/theme/diabook/diabook-blue/style.php b/view/theme/diabook/diabook-blue/style.php
deleted file mode 100644
index c6b467999..000000000
--- a/view/theme/diabook/diabook-blue/style.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-	$line_height=false;
-	$diabook_font_size=false;
-	$resolution=false;
-	$site_line_height = get_config("diabook-blue","line_height");
-	$site_diabook_font_size = get_config("diabook-blue", "font_size" );
-	$site_resolution = get_config("diabook-blue", "resolution" );
-	
-	
-	if (local_user()) {
-		$line_height = get_pconfig(local_user(), "diabook-blue","line_height");
-		$diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size");
-		$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
-	}
-	
-	if ($line_height===false) $line_height=$site_line_height;
-	if ($line_height===false) $line_height="1.3";
-	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
-	if ($diabook_font_size===false) $diabook_font_size="13";
-	if ($resolution===false) $resolution=$site_resolution;
-	if ($resolution===false) $resolution="normal";
-	
-	
-	if($resolution == "normal") {	
-	if (file_exists("$THEMEPATH/style.css")){
-		echo file_get_contents("$THEMEPATH/style.css");
-	}
-
-   if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}	
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
-	
-	if($resolution == "wide") {	
-	if (file_exists("$THEMEPATH/style-wide.css")){
-		echo file_get_contents("$THEMEPATH/style-wide.css");
-	}
-	if($diabook_font_size == "15"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 15px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 15px;
-  					}
-		";
-	}
-	if($diabook_font_size == "14"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 14px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 14px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "13"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 13px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 13px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12.5px;
-  					}
-		";
-	}
-	if($diabook_font_size == "12"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					font-size: 12px;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
-  					font-size: 12px;
-  					}
-		";
-	}
-	if($line_height == "1.5"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.5;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.5;
-  					}
-		";
-	}	
-	if($line_height == "1.4"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.4;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.4;
-  					}
-		";
-	}
-	if($line_height == "1.3"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.3;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.3;
-  					}
-		";
-	}
-	if($line_height == "1.2"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.2;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.2;
-  					}
-		";
-	}
-	if($line_height == "1.1"){
-		echo "
-			.wall-item-container .wall-item-content {
-  					line-height: 1.1;
-  					}
-  					
-			.wall-item-photo-container .wall-item-content {
- 					line-height: 1.1;
-  					}
-		";
-	}
-	}
\ No newline at end of file