Changeset 1680 in ExiteCMS

Timestamp:

08/22/08 18:04:09 (3 years ago)

Author:

hverton

Message:

added a dummy hoteditor logo\nfixed a xhtml error in viewthread\nfixed tinymce v3 settings incompatibility

Location:

trunk

Files:

• includes/templates/forum.viewthread.tpl (modified) (2 diffs)
• themes/ExiteCMS/hoteditor/logo.gif (added)
• themes/ExiteCMS/templates/templates/_header.tpl (modified) (5 diffs)

trunk/includes/templates/forum.viewthread.tpl

@@ -265 +265 @@
     <table align='center' cellpadding='0' cellspacing='1' width='100%' class='tbl-border'>
         <tr>
+            {if $settings.hoteditor_enabled == 0 || $userdata.user_hoteditor == 0}
             <td align='center' class='tbl1'>
-            {if $settings.hoteditor_enabled == 0 || $userdata.user_hoteditor == 0}
                 <textarea name='message' cols='80' rows='7' class='textbox' style='width:100%; height:{math equation='x/4' x=$smarty.const.BROWSER_HEIGHT format='%u'}px;'></textarea>
                 <br />
@@ -282 +282 @@
                 <input type='button' value='quote' class='button' style='width:45px;' onclick="addText('message', '[quote]', '[/quote]');" />
             {else}
+            <td align='left' class='tbl1'>
                 <style type='text/css'>@import url({$smarty.const.THEME}hoteditor/style.css);</style>
                 <input type='hidden' id='message' name='message' value='' />

trunk/themes/ExiteCMS/templates/templates/_header.tpl

@@ -46 +46 @@
             theme:'advanced',
             language:'{/literal}{$settings.tinyMCE_locale}{literal}',
-            entities:'60,lt,62,gt',
+            entities:'34,quot,38,amp,60,lt,62,gt',
             document_base_url:'{/literal}{$settings.siteurl}{literal}',
-            relative_urls:'false',
-            convert_newlines_to_brs:'true',
-            force_br_newlines:'true',
+            relative_urls:'true',
+            apply_source_formatting:'false',
+            inline_styles:'true',
+            convert_newlines_to_brs:'false',
+            convert_fonts_to_spans:'true',
+            force_br_newlines:'false',
             force_p_newlines:'false',
+            remove_linebreaks:'true',
+            forced_root_block:'',
+            fix_list_elements:'false',
+            fix_table_elements:'true',
+            fix_nesting:'false',
+            cleanup:'true',
+            cleanup_on_startup:'false',
             plugins : "style,layer,table,save,advhr,advimage,ibrowser,advlink,emotions,iespell,insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
             theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
@@ -67 +77 @@
             invalid_elements:'script,object,applet,iframe',
             extended_valid_elements:'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]'
-            });
-        }
-        function simple() {
-            tinyMCE.init({
-            mode:'textareas',
-            theme:'simple',
-            language:'{/literal}{$settings.locale_code}{literal}',
-            convert_newlines_to_brs:'true',
-            force_br_newlines:'true',
-            force_p_newlines:'false'
             });
         }
@@ -152 +152 @@
     if (document.getElementById("new_posts_header")) {
         if (newmsg > 0) {
-            document.getElementById("new_posts_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}modules/forum_threads_list_panel/new_posts.php'><img src='{/literal}{$smarty.const.THEME}{literal}images/newposts.gif' height='9' alt='{/literal}{$locale.028}{literal}' /></a>";
+            document.getElementById("new_posts_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}modules/forum_threads_list_panel/new_posts.php'><img src='{/literal}{$smarty.const.THEME}{literal}images/newposts.gif' height='9' alt='{/literal}{$locale.028}{literal}' /></a>&nbsp;";
             document.getElementById("new_posts_header").style.display = 'inline';
         } else {
@@ -170 +170 @@
     if (document.getElementById("new_pm_header")) {
         if (newpm > 0) {
-            document.getElementById("new_pm_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}pm.php?action=show_new'><img src='{/literal}{$smarty.const.THEME}{literal}images/newmsgs.gif' height='9' alt='' /></a>";
+            document.getElementById("new_pm_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}pm.php?action=show_new'><img src='{/literal}{$smarty.const.THEME}{literal}images/newmsgs.gif' height='9' alt='' /></a>&nbsp;";
             document.getElementById("new_pm_header").style.display = 'inline';
         } else {
@@ -188 +188 @@
 }
 
-// wait 5 minutes, then check for messages
-msgtimerid = setTimeout("checkMessages()", 300000);
+// wait 15 seconds, then check for messages
+msgtimerid = setTimeout("checkMessages()", 15000);
 
 /* ]]> */