Merge "Enable fullscreen button in tinymce (bug #530656)"

htdocs/lib/web.php

@@ -110,7 +110,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
 
                 $adv_buttons = array(
                     "undo,redo,separator,bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,code,fullscreen",
-                    "bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,image,spellchecker,cleanup,separator,link,unlink,separator,code",
+                    "bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,image,spellchecker,cleanup,separator,link,unlink,separator,code,fullscreen",
                     "undo,redo,separator,bullist,numlist,separator,tablecontrols,separator,cut,copy,paste,pasteword",
                     "fontselect,separator,fontsizeselect,separator,formatselect",
                 );
@@ -123,7 +123,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
                     $tinymce_config = <<<EOF
     mode: "none",
     theme: "advanced",
-    plugins: "table,emotions,spellchecker,inlinepopups,paste",
+    plugins: "table,emotions,spellchecker,inlinepopups,paste,fullscreen",
     theme_advanced_buttons1 : "{$adv_buttons[1]}",
     theme_advanced_buttons2 : "{$adv_buttons[2]}",
     theme_advanced_buttons3 : "{$adv_buttons[3]}",
@@ -146,7 +146,7 @@ EOF;
     fullscreen_new_window: true,
     fullscreen_settings: {
         theme: "advanced",
-        plugins: "table,emotions,iespell,inlinepopups,paste",
+        plugins: "table,emotions,iespell,inlinepopups,paste,fullscreen",
         theme_advanced_buttons1 : "{$adv_buttons[1]}",
         theme_advanced_buttons2 : "{$adv_buttons[2]}",
         theme_advanced_buttons3 : "{$adv_buttons[3]}"