* API/CKEditor: introduce new skins/themes

phpgwapi/inc/class.egw_ckeditor_config.inc.php

@@ -56,6 +56,21 @@ class egw_ckeditor_config
 		'px' => 'px: display pixels',
 	);
 
+	/**
+	 * Get available CKEditor Skins
+	 * @return array
+	 */
+	public static function getAvailableCKEditorSkins()
+	{
+		return array(
+			'kama'  => lang('kama theme'),
+			'moono'	=> lang('moono theme (default)'),
+			'moonocolor'	=> lang('moono color theme'),
+			'moono-dark'	=> lang('dark moono theme'),
+			'bootstrapck'	=> lang('bootstrap theme for ckeditor'),
+		);
+	}
+
 	/**
 	 * Get font size from preferences
 	 *
@@ -170,18 +185,24 @@ class egw_ckeditor_config
 			//Convert old fckeditor skin names to new ones
 			switch ($skin)
 			{
-				case 'silver':
-				case 'office2003':
-				case 'moono':
-					$skin = "moono";
-					break;
 				case 'kama':
-				case 'default':
+					$skin = "kama";
+					break;
+				case 'silver':
+				case 'bootstrapck':
+					$skin = "bootstrapck";
+					break;
+				case 'moono-dark':
+					$skin = "moono-dark";
+					break;
+				case 'office2003':
 				case 'moonocolor':
 					$skin = "moonocolor";
 					break;
+				case 'moono':
+				case 'default':
 				default:
-					$skin = "moonocolor";
+					$skin = "moono";
 			}
 
 			//Check whether the skin actually exists, if not, switch to a default

preferences/inc/class.preferences_hooks.inc.php

@@ -67,11 +67,7 @@ class preferences_hooks
 			'br'	=> lang('br')
 		);
 
-		$rich_text_editor_skins = array(
+		$rich_text_editor_skins = egw_ckeditor_config::getAvailableCKEditorSkins();
-			'kama'    => lang ('Default theme'),
-			'moono'	=> lang('Moono theme'),
-			'moonocolor'	=> lang('Moono color theme'),
-		);
 
 		$account_sels = array(
 			'selectbox'     => lang('Selectbox'),

preferences/lang/egw_de.lang

@@ -11,6 +11,7 @@ any listing in egw will show you this number of entries or lines per page.<br>to
 are you sure you want to delete this category ?	preferences	de	Sind sie sicher, dass sie diese Kategorie löschen wollen ?
 automatically start with this font	preferences	de	Startet automatisch mit dieser Schrift
 automatically start with this font size	preferences	de	Startet automatisch mit dieser Schriftgröße
+bootstrap theme for ckeditor	preferences	de	Bootstrap Schema für den CKEditor
 br	preferences	de	br
 change a user password by passing the old and new passwords.  returns true on success, false on failure.	preferences	de	Ändern Sie Ihr Passwort, indem Sie Ihr altes und neues Passwort angeben. Es wird TRUE zurückgegeben für eine erfolgreiche Änderung und FALSE wenn es nicht erfolgreich war.
 change password	preferences	de	Passwort ändern
@@ -22,6 +23,7 @@ charset for the csv export/import	preferences	de	Zeichensatz
 click to select a color	preferences	de	Anklicken um eine Farbe auszuwählen
 color	preferences	de	Farbe
 country	preferences	de	Land
+dark moono theme	preferences	de	Dunkles Moono Schema
 data exchange settings	preferences	de	Einstellungen für den Datenaustausch
 date format	preferences	de	Datumsformat
 default	preferences	de	Vorgabe
@@ -29,7 +31,6 @@ default application	preferences	de	Standard-Anwendung
 default font	preferences	de	Standard-Schrift
 default font size	preferences	de	Standard-Schriftgröße
 default preferences	preferences	de	Voreinstellungen
-default theme	preferences	de	Vorgabe Farbschema
 delete categories	preferences	de	Kategorie löschen
 deny following groups access to acl (grant access)	admin	de	verweigere folgenden Gruppen den Zugriff in den ACL's
 deny following groups access to edit categories	admin	de	verweigere folgenden Gruppen den Zugriff zum Ändern der Kategorien
@@ -72,13 +73,14 @@ images linked to an entry can be displayed as thumbnails.  you can turn this off
 in which country are you. this is used to set certain defaults for you.	preferences	de	In welchen Land befinden Sie sich? Damit werden verschiedene Voreinstellungen für Sie vorgenommen.
 interface/template selection	preferences	de	Auswahl der Benutzeroberfläche
 just clicking on the line, like a checkbox	preferences	de	einfaches anklicken der Zeile, wie eine Checkbox
+kama theme	preferences	de	Kama Farbschema
 language	preferences	de	Sprache
 look & feel	preferences	de	Aussehen und Handhabung
 lowercase letters	preferences	de	Kleinbuchstaben
 max matches per page	preferences	de	maximale Treffer pro Seite
 max number of icons in navbar	preferences	de	Maximale Anzahl von Icons in der Navigationsleiste
-moono color theme	preferences	de	Farbiges Schema (Mono)
+moono color theme	preferences	de	Farbiges Schema (Moono)
-moono theme	preferences	de	Einfarbiges Schema (Mono)
+moono theme (default)	preferences	de	Einfarbiges Schema (Moono)
 no default	preferences	de	Keine Vorgabe
 no user-selection at all	common	de	Überhaupt keine Benutzerauswahl
 note: this feature does *not* change your email password. this will	preferences	de	Anmerkung: Diese Funktion ändert nicht Ihr E-Mail Passwort.
@@ -86,7 +88,6 @@ note: this feature does *not* change your email password. this will need to be d
 notification settings	preferences	de	Einstellungen der Benachrichtigungen
 number format	preferences	de	Format von Zahlen
 numbers	preferences	de	Zahlen
-office 2003 theme	preferences	de	Office 2003
 old password and new password are the same. this is invalid. you must enter a new password	preferences	de	Altes Passwort und Neues Passwort sind gleich. Dies ist ungültig. Sie müssen ein neues Passwort vergeben.
 p: paragraph	preferences	de	p: Absatz
 password changed	preferences	de	Ihr Password wurde geändert
@@ -125,7 +126,6 @@ show navigation bar as	preferences	de	Anzeige der Navigationsleiste
 show number of current users	preferences	de	Anzahl gegenwärtiger Benutzer anzeigen
 show text on navigation icons	preferences	de	Text zu Icons in der Navigationsleiste anzeigen
 show_more_apps	common	de	Mehr Anwendungen anzeigen
-silver theme	preferences	de	Silbern
 special characters	preferences	de	Sonderzeichen
 spellchecker language	addressbook	de	Sprache Rechtschreibprüfung
 text editor settings	preferences	de	Einstellungen des Texteditors

preferences/lang/egw_en.lang

@@ -11,6 +11,7 @@ any listing in egw will show you this number of entries or lines per page.<br>to
 are you sure you want to delete this category ?	preferences	en	Are you sure you want to delete this category ?
 automatically start with this font	preferences	en	Automatically start with this font
 automatically start with this font size	preferences	en	Automatically start with this font size
+bootstrap theme for ckeditor	preferences	en	Bootstrap Theme for CKEditor
 br	preferences	en	br
 change a user password by passing the old and new passwords.  returns true on success, false on failure.	preferences	en	Change a user password by passing the old and new passwords.  Returns TRUE on success, FALSE on failure.
 change password	preferences	en	Change password
@@ -22,6 +23,7 @@ charset for the csv export/import	preferences	en	Character set
 click to select a color	preferences	en	Click to select a color
 color	preferences	en	Color
 country	preferences	en	Country
+dark moono theme	preferences	en	Dark Moono Theme
 data exchange settings	preferences	en	Data exchange settings
 date format	preferences	en	Date format
 default	preferences	en	Default
@@ -29,7 +31,6 @@ default application	preferences	en	Default application
 default font	preferences	en	Default font
 default font size	preferences	en	Default font size
 default preferences	preferences	en	Default preferences
-default theme	preferences	en	Default theme
 delete categories	preferences	en	Delete categories
 deny following groups access to acl (grant access)	admin	en	Deny following groups access to ACL (grant access)
 deny following groups access to edit categories	admin	en	Deny following groups access to edit categories
@@ -72,13 +73,14 @@ images linked to an entry can be displayed as thumbnails.  you can turn this off
 in which country are you. this is used to set certain defaults for you.	preferences	en	Select the country. It sets some defaults e.g. in Calendar.
 interface/template selection	preferences	en	Interface | Template
 just clicking on the line, like a checkbox	preferences	en	just clicking on the line, like a checkbox
+kama theme	preferences	en	Kama theme
 language	preferences	en	Language
 look & feel	preferences	en	Look & feel
 lowercase letters	preferences	en	lowercase letters
 max matches per page	preferences	en	Max matches per page
 max number of icons in navbar	preferences	en	Max number of icons in navigation bar
 moono color theme	preferences	en	Moono color theme
-moono theme	preferences	en	Moono theme
+moono theme (default)	preferences	en	Moono theme (Default)
 no default	preferences	en	No default
 no user-selection at all	common	en	No user selection at all
 note: this feature does *not* change your email password. this will	preferences	en	note: This feature does *not* change your email password. This will
@@ -86,7 +88,6 @@ note: this feature does *not* change your email password. this will need to be d
 notification settings	preferences	en	Notification settings
 number format	preferences	en	Number format
 numbers	preferences	en	numbers
-office 2003 theme	preferences	en	Office 2003 theme
 old password and new password are the same. this is invalid. you must enter a new password	preferences	en	Old password and new password are the same. You must enter a new password!
 p: paragraph	preferences	en	p: Paragraph
 password changed	preferences	en	Password changed.
@@ -125,7 +126,6 @@ show navigation bar as	preferences	en	Show navigation bar as
 show number of current users	preferences	en	Current users
 show text on navigation icons	preferences	en	Show text on navigation icons
 show_more_apps	common	en	Show more applications
-silver theme	preferences	en	Silver theme
 special characters	preferences	en	special characters
 spellchecker language	addressbook	en	Spellchecker language
 text editor settings	preferences	en	Text editor settings