Changeset 1695 in ExiteCMS


Ignore:
Timestamp:
08/26/08 08:23:05 (3 years ago)
Author:
hverton
Message:

missed for some reason in the last commits?!

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/includes/core_functions.php

    r1681 r1695  
    213213 
    214214// check for upgrades in progress. 
    215 if (!eregi("upgrade.php", $_SERVER['PHP_SELF'])) { 
     215// when a form has been posted, skip this and finish the POST! 
     216if (count($_POST)==0 && !eregi("upgrade.php", $_SERVER['PHP_SELF'])) { 
    216217 
    217218    include PATH_ADMIN."upgrade.php"; 
    … …  
    636637    $text = preg_replace('#\r\n\[\*\]#si', '<li>', $text); 
    637638 
     639    // bbcode tables 
     640    $text = preg_replace('#\[table\]#si', '<table align="left" valign="top" class="tbl-border">', $text); 
     641    $text = preg_replace('#\[\/table\]#si', '</table>', $text); 
     642    $text = preg_replace('#\[td\]#si', '<td class="tbl1">', $text); 
     643    $text = preg_replace('#\[\/td\]#si', '</td>', $text); 
     644    $text = preg_replace('#\[tr\]#si', '<tr>', $text); 
     645    $text = preg_replace('#\[\/tr\]#si', '</tr>', $text); 
     646 
    638647    //get rid of line breaks after a list item, for better formatting 
    639648    $text=str_replace("</li><br />","</li>",$text); 
    … …  
    693702    } 
    694703 
    695     // quote    & code blocks 
     704    // quote & code blocks 
    696705    $text = preg_replace('#\[quote=([\r\n]*)(.*?)\]#si', '<b>\2 '.$locale['199'].':</b><br />[quote]', $text); 
    697706    $qcount = substr_count(strtolower($text), "[quote]"); $ccount = substr_count(strtolower($text), "[code]"); 

  • trunk/themes/ExiteCMS/exitecms.css

    r1659 r1695  
    4747 
    4848                        /* column definitions (left, center, right) */ 
    49 .side-border-left       { padding:0px 5px 0px 0px; } 
     49.side-border-left       { text-align:left; padding:0px 5px 0px 0px; } 
    5050.main-bg                { color:#444; padding:0px 0px 5px 0px; } 
    51 .side-border-right      { padding:0px 0px 0px 5px; } 
     51.side-border-right      { text-align:left; padding:0px 0px 0px 5px; } 
    5252 
    5353                        /* panels in the center column */ 
    54 .main-body              { color:#444; background-color:#fff; padding:4px 4px 6px 4px; margin:0px; } 
     54.main-body              { text-align:left; color:#444; background-color:#fff; padding:4px 4px 6px 4px; margin:0px; } 
    5555 
    5656                        /* panels in the left & right columns (with and without padding, p.e. for images) */ 

  • trunk/themes/ExiteCMS/templates/templates/_closetable_x.tpl

    r908 r1695  
    1515{*                                                                         *} 
    1616{***************************************************************************} 
    17                         </div> 
    1817                    </td> 
    1918                </tr> 

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

    r1680 r1695  
    149149function checkMessages() { 
    150150    // check for new forum messages 
    151     var newmsg = AjaxCall("includes/ajax.response.php?request=posts"); 
    152     if (document.getElementById("new_posts_header")) { 
     151    var newmsg = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=posts"); 
     152    if (newmsg != null && document.getElementById("new_posts_header")) { 
    153153        if (newmsg > 0) { 
    154154            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;"; 
    155             document.getElementById("new_posts_header").style.display = 'inline'; 
    156         } else { 
    157             document.getElementById("new_posts_header").style.display = 'none'; 
    158         } 
    159     } 
    160     if (document.getElementById("new_posts_panel")) { 
     155        } else { 
     156            document.getElementById("new_posts_header").innerHTML = ""; 
     157        } 
     158    } 
     159    if (newmsg != null && document.getElementById("new_posts_panel")) { 
    161160        if (newmsg > 0) { 
    162             document.getElementById("new_posts_panel_value").innerHTML = AjaxCall("includes/ajax.response.php?request=posts&parms=text"); 
     161            document.getElementById("new_posts_panel_value").innerHTML = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=posts&parms=text"); 
    163162            document.getElementById("new_posts_panel").style.display = 'inline'; 
    164163        } else { 
    … …  
    167166    } 
    168167    // check for new pm messages 
    169     var newpm = AjaxCall("includes/ajax.response.php?request=pm"); 
    170     if (document.getElementById("new_pm_header")) { 
     168    var newpm = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=pm"); 
     169    if (newpm != null && document.getElementById("new_pm_header")) { 
    171170        if (newpm > 0) { 
    172171            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;"; 
    173             document.getElementById("new_pm_header").style.display = 'inline'; 
    174         } else { 
    175             document.getElementById("new_pm_header").style.display = 'none'; 
    176         } 
    177     } 
    178     if (document.getElementById("new_pm_panel")) { 
     172        } else { 
     173            document.getElementById("new_pm_header").innerHTML = ""; 
     174        } 
     175    } 
     176    if (newpm != null && document.getElementById("new_pm_panel")) { 
    179177        if (newpm > 0) { 
    180             document.getElementById("new_pm_panel_value").innerHTML = AjaxCall("includes/ajax.response.php?request=pm&parms=text"); 
     178            document.getElementById("new_pm_panel_value").innerHTML = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=pm&parms=text"); 
    181179            document.getElementById("new_pm_panel").style.display = 'inline'; 
    182180        } else { 
    … …  
    187185    msgtimerid = setTimeout("checkMessages()", 300000); 
    188186} 
    189  
     187{/literal} 
     188{if iMEMBER} 
    190189// wait 15 seconds, then check for messages 
    191190msgtimerid = setTimeout("checkMessages()", 15000); 
    192  
     191{/if} 
    193192/* ]]> */ 
    194 </script>{/literal} 
     193</script> 
    195194<table align='center' cellspacing='0' cellpadding='0' width='{$smarty.const.THEME_WIDTH}' class='main-bg'> 
    196195    <tr> 
    … …  
    227226                    <td class='headermenu'> 
    228227                        <a href='.' onclick='fontGroter(-0.1); return false' title='Decrease font-size'><img src='{$smarty.const.THEME}images/minus.gif' alt='' border='0' /></a><a href='.' onclick='fontReset(0.7); return false' title='Restore default font-sizes'><img src='{$smarty.const.THEME}images/reset.gif' hspace='2' alt='' border='0' /></a><a href='.' onclick='fontGroter(0.1); return false' title='Increase font-size'><img src='{$smarty.const.THEME}images/plus.gif' alt='' border='0' /></a> 
    229                         <div id='new_posts_header' style='display:{if $new_posts}inline{else}none{/if};'>{if $new_posts}<a href='{$smarty.const.BASEDIR}modules/forum_threads_list_panel/new_posts.php'><img src='{$smarty.const.THEME}images/newposts.gif' height='9' alt='{$locale.028}' /></a>{/if}</div> 
    230                         <div id='new_pm_header' style='display:none;'>[placeholder for new pm image and link]</div> 
     228                        <div id='new_posts_header' style='display:inline;'> 
     229                            {if $new_posts} 
     230                                <a href='{$smarty.const.BASEDIR}modules/forum_threads_list_panel/new_posts.php'><img src='{$smarty.const.THEME}images/newposts.gif' height='9' alt='{$locale.028}' /></a> 
     231                            {/if} 
     232                        </div> 
     233                        <div id='new_pm_header' style='display:inline;'> 
     234                        </div> 
    231235                        {section name=index loop=$headermenu} 
    232236                            {if $smarty.section.index.first} &nbsp;{else} &middot;{/if} <a href='{$headermenu[index].link_url}' {if $headermenu[index].link_window == 1}target='_blank' {/if}><span class='headermenuitem'>{$headermenu[index].link_name}</span></a> 

  • trunk/themes/ExiteCMS/templates/templates/_opentable.tpl

    r932 r1695  
    2424            <table cellpadding='0' cellspacing='0' width='100%'> 
    2525                <tr> 
    26                     <td class='cap-main'>{$title|default:"&nbsp;"}</td> 
     26                    <td class='cap-main'> 
     27                        <div style='display:inline; position:relative; float:right;margin-top:2px;'> 
     28                            <img src='{$smarty.const.THEME}images/panel_{if $_state == 1}on{else}off{/if}.gif' name='b_{$_name}' alt='' onclick="javascript:flipBox('{$_name}')" /> 
     29                        </div> 
     30                        {$title|default:"&nbsp;"} 
     31                    </td> 
    2732                </tr> 
    28             </table> 
    29         </td> 
    30     </tr> 
    31     <tr> 
    32         <td> 
    33             <table width='100%' cellpadding='0' cellspacing='0'> 
    3433                <tr> 
    3534                    <td class='{$style|default:"main-body"}'> 
     35                        <div id='box_{$_name}' {if $_state == 0}{else}style='display:none'{/if}> 

  • trunk/themes/ExiteCMS/templates/templates/_opentable_x.tpl

    r1068 r1695  
    2525                <tr> 
    2626                    <td class='cap-main'> 
    27                         <div style='display:inline; position:relative; float:right;margin-top:2px;'> 
    28                             <img src='{$smarty.const.THEME}images/panel_{if $_state == 1}on{else}off{/if}.gif' name='b_{$_name}' alt='' onclick="javascript:flipBox('{$_name}')" /> 
    29                         </div> 
    3027                        {$title|default:"&nbsp;"} 
    3128                    </td> 
    … …  
    3330                <tr> 
    3431                    <td class='{$style|default:"main-body"}'> 
    35                         <div id='box_{$_name}' {if $_state == 0}{else}style='display:none'{/if}> 
Note: See TracChangeset for help on using the changeset viewer.