From fee031e2968c140df18b7b7bfdcb13ce8db71937 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 26 Jan 2014 08:28:25 +0000
Subject: [PATCH] Synchronisation mit APLAWS tree r 2679.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2500 8810af33-2d31-482b-a856-94f89814c4df
---
 .../config/fckconfig_glossaryitem.js          | 64 +++++++++----------
 .../ui/OrganizationPropertyForm.java          |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ccm-cms-types-glossaryitem/web/assets/fckeditor/config/fckconfig_glossaryitem.js b/ccm-cms-types-glossaryitem/web/assets/fckeditor/config/fckconfig_glossaryitem.js
index 42f2219fe..c33cc84cd 100644
--- a/ccm-cms-types-glossaryitem/web/assets/fckeditor/config/fckconfig_glossaryitem.js
+++ b/ccm-cms-types-glossaryitem/web/assets/fckeditor/config/fckconfig_glossaryitem.js
@@ -1,32 +1,32 @@
-/*
- * FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
- * 
- * Custom amendments for Forum application.
- */
-FCKConfig.FillEmptyBlocks	= false ;
-
-FCKConfig.ToolbarSets["Basic"] = [
-	['Source','-','Preview','-'],
-	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-	['Cut','Copy','Paste','PasteText','PasteWord','-','Print'],
-    	'/',
-	['OrderedList','UnorderedList','-','Outdent','Indent'],			
-	['Link','Unlink'],
-	['Undo','Redo','-','SelectAll'],	
-	['TextColor','BGColor'],
-	['Rule','SpecialChar','Smiley'],
-	'/',
-	['FontFormat','FontName','FontSize']		
-] ;
-
-//only licenced for private use
-//FCKConfig.SpellChecker			= 'ieSpell' ;	// 'ieSpell' | 'SpellerPages'
-//FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ;
-
-FCKConfig.LinkUpload = false ;
-FCKConfig.LinkBrowser = false ; // forum - don't allow users to browse content centre or server file system
-FCKConfig.ImageBrowser = false ;
-FCKConfig.FlashBrowser = false ;
-
-FCKConfig.SmileyImages	= ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ;
+/*
+ * FCKeditor - The text editor for internet
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
+ * 
+ * Custom amendments for Forum application.
+ */
+FCKConfig.FillEmptyBlocks	= false ;
+
+FCKConfig.ToolbarSets["Basic"] = [
+	['Source','-','Preview','-'],
+	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
+	['Cut','Copy','Paste','PasteText','PasteWord','-','Print'],
+    	'/',
+	['OrderedList','UnorderedList','-','Outdent','Indent'],			
+	['Link','Unlink'],
+	['Undo','Redo','-','SelectAll'],	
+	['TextColor','BGColor'],
+	['Rule','SpecialChar','Smiley'],
+	'/',
+	['FontFormat','FontName','FontSize']		
+] ;
+
+//only licenced for private use
+//FCKConfig.SpellChecker			= 'ieSpell' ;	// 'ieSpell' | 'SpellerPages'
+//FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ;
+
+FCKConfig.LinkUpload = false ;
+FCKConfig.LinkBrowser = false ; // forum - don't allow users to browse content centre or server file system
+FCKConfig.ImageBrowser = false ;
+FCKConfig.FlashBrowser = false ;
+
+FCKConfig.SmileyImages	= ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ;
diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
index 7227d062d..c16ef4663 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java
@@ -73,7 +73,7 @@ public class OrganizationPropertyForm
         super( ID, itemModel );
         m_step = step;
         addSubmissionListener(this);
-    }   
+    }
 
     /**
      * Adds widgets to the form.