[eGroupWare-svn] r56074 - /trunk/egroupware/api/src/Html/CkEditorConfig.php

Author: hnategh
Date: Fri May  6 16:12:57 2016
New Revision: 56074

URL: http://svn.stylite.de/viewvc/egroupware?rev=56074&view=rev
Log:
Remove unsupported skins from CKEditor

Modified:
    trunk/egroupware/api/src/Html/CkEditorConfig.php

Modified: trunk/egroupware/api/src/Html/CkEditorConfig.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html/CkEditorConfig.php?rev=56074&r1=56073&r2=56074&view=diff
==============================================================================
--- trunk/egroupware/api/src/Html/CkEditorConfig.php (original)
+++ trunk/egroupware/api/src/Html/CkEditorConfig.php Fri May  6 16:12:57 2016
@@ -72,14 +72,6 @@
 		$labels = array(
 			'kama'  => lang('kama theme'),
 			'moono'	=> lang('moono theme (default)'),
-			'moonocolor'	=> lang('moono color theme'),
-			'moono-dark'	=> lang('dark moono theme'),
-			'Moono_blue'	=> lang('blue moono theme'),
-			'bootstrapck'	=> lang('bootstrap theme for ckeditor'),
-			'icy_orange'	=> lang('icy-orange theme for ckeditor'),
-			'office2013'	=> lang('office-2013 theme for ckeditor'),
-			'minimalist'	=> lang('Minimalist theme'),
-			'flat'			=> lang('Flat theme')
 		);
 		$skins = array();
 
@@ -97,6 +89,10 @@
 			}
 		}
 		uasort($skins, 'strcasecmp');
+		
+		// flat skin is reserved for mobile template, although we are not
+		// supporting it on desktop (becuase FF has problem with action icons)
+		if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']);
 
 		// return our default "moono" first
 		return isset($skins['moono']) ? array('moono' => $skins['moono'])+$skins : $skins;
@@ -220,26 +216,16 @@
 					$skin = "kama";
 					//if (EGroupware\Api\Header\UserAgent::type()=='firefox' || EGroupware\Api\Header\UserAgent::type()=='msie') $skin='moonocolor';
 					break;
+				// no longer supported by egw
+				case 'flat':
 				case 'silver':
 				case 'moono-dark':
-					$skin = "moono-dark";
-					break;
 				case 'icy_orange':
-					$skin = "icy_orange";
-					break;
-				case 'bootstrapck': // no longer support by egw
+				case 'bootstrapck':
 				case 'Moono_blue':
 				case 'office2013':
 				case 'office2003':
 				case 'moonocolor':
-					$skin = "moonocolor";
-					break;
-				case 'minimalist':
-					$skin = "minimalist";
-					break;
-				case 'flat':
-					$skin = "flat";
-					break;
 				case 'moono':
 				case 'default':
 				default:
@@ -251,6 +237,7 @@
 			{
 				$skin = "moono"; //this is the basic skin for ckeditor
 			}
+			// Skin used for mobile template
 			self::$skin = \EGroupware\Api\Header\UserAgent::mobile()?'flat':$skin;
 		}
 


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z