Changeset 838 in ExiteCMS


Ignore:
Timestamp:
09/25/07 22:15:58 (4 years ago)
Author:
hverton
Message:

minor bugfixes

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/administration/downloads.php

    r834 r838  
    207207    $variables['download_filesize'] = $download_filesize; 
    208208    $variables['barmsg'] = $barmsg; 
    209     $variables['bartitle'] = $bartitle; 
     209    $variables['bar_title'] = $bar_title; 
    210210 
    211211} else { 

  • trunk/includes/Smarty-2.6.18/custom-plugins/function.buttonlink.php

    r835 r838  
    5757    } 
    5858     
    59     return "<input type='button' class='button' value='$name' ".($title?"title='$title' ":"")."onClick='".($script ? $link : ($new ? "window.open(\"$link\");'" : "window.location=\"$link\";'"))." />"; 
     59    return "<input type='button' class='button' value='$name' ".($title?"title='$title' ":"")."onClick='".($script ? ($link."'") : ($new ? "window.open(\"$link\");'" : "window.location=\"$link\";'"))." />"; 
    6060} 
    6161 

  • trunk/locale/English/admin/redirects.php

    r814 r838  
    3030$locale['488'] = "Are you sure you want to delete this redirect URL?"; 
    3131$locale['489'] = "Requested url_id is missing. Maybe it was deleted by someone else?"; 
    32 $locale['490'] = "If checked, 'Request URL' is used to match, 'Redirect URL' to convert the URL"; 
     32$locale['490'] = "If checked, the first field is used to match, the second to convert the URL"; 
    3333?> 

  • trunk/modules/main_menu_panel/module_installer.php

    r834 r838  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • trunk/modules/user_info_panel/module_installer.php

    r834 r838  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • trunk/modules/user_info_panel/templates/modules.user_info_panel.tpl

    r801 r838  
    4040        <div style='text-align:center'> 
    4141            <a href='{$smarty.const.MODULES}forum_threads_list_panel/new_posts.php' class='side'><b>{$new_post_msg|string_format:$locale.090}{if $new_post_msg == 1}{$locale.088}{else}{$locale.089}{/if}</b></a> 
    42             <br /><br /> 
    43             <a href='{$smarty.const.MODULES}forum_threads_list_panel/new_posts.php?markasread={$user_id}'><img src='{$smarty.const.THEME}forum/markread.gif' alt=''  /></a> 
     42            <br /> 
     43            {buttonlink name=$locale.091 link=$smarty.const.MODULES|cat:"forum_threads_list_panel/new_posts.php?markasread="|cat:$user_id} 
    4444        </div> 
    4545    {/if} 

  • trunk/modules/welcome_message_panel/module_installer.php

    r834 r838  
    1212| the included gpl.txt file or visit http://gnu.org  | 
    1313+----------------------------------------------------*/ 
    14 if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('IN_FUSION')) fallback(BASEDIR."index.php"); 
     14if (!checkrights("I") || !defined("iAUTH") || $aid != iAUTH || !defined('ExiteCMS_INIT')) fallback(BASEDIR."index.php"); 
    1515 
    1616/*---------------------------------------------------+ 

  • trunk/themes/PLiTheme/styles.css

    r802 r838  
    1515form                { margin:0px; } 
    1616 
    17 .button             { font:0.9em Arial,Sans-Serif; Sans-Serif; font-weight: bold; color:#606060; background-color:#e0e0e0; border-top:1px #fff solid; border-left:1px #fff solid; border-bottom:1px #666 solid; border-right:1px #666 solid; cursor:pointer; padding: 1px 2px; background:url(/themes/PLiTheme/images/buttonbg.jpg) repeat-x left top; } 
     17.button             { font:0.9em Arial,Sans-Serif; Sans-Serif; font-weight: bold; color:#606060; background-color:#e0e0e0; border-top:1px #ddd solid; border-left:1px #ddd solid; border-bottom:1px #666 solid; border-right:1px #666 solid; cursor:pointer; margin-top:2px; padding: 1px 2px; background:url(/themes/PLiTheme/images/buttonbg.jpg) repeat-x left top; } 
    1818.textbox            { font:1em Verdana, Arial,Sans-Serif; color:#000; background-color:#eee; border:1px #666 solid; } 
    1919 

  • trunk/themes/PLiTheme/templates/source/admin.forum_polls.tpl

    r745 r838  
    7070                </td> 
    7171                <td class='tbl1'> 
    72                     <a href='javascript:void(0)' onClick="fp_show('creation')">{$locale.FPM_027}</a> 
     72                    {buttonlink name=$locale.FPM_027 link="fp_show(\"creation\")" script="yes"} 
    7373                </td> 
    7474            </tr> 
    … …  
    111111                </td> 
    112112                <td class='tbl1'> 
    113                     <a href='javascript:void(0)' onClick="fp_show('voting')">{$locale.FPM_028}</a> 
     113                    {buttonlink name=$locale.FPM_028 link="fp_show(\"voting\")" script="yes"} 
    114114                </td> 
    115115            </tr> 

  • trunk/themes/PLiTheme/templates/source/admin.images.tpl

    r835 r838  
    6565            </td> 
    6666            <td align='center' width='50' class='{cycle values='tbl1,tbl2'}' style='white-space:nowrap'> 
    67                 {buttonlink name=$locale.461 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;ifolder="|cat:$ifolder|cat:"&amp;view="|cat:$image}&nbsp; 
    68                 {buttonlink name=$locale.462 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;ifolder="|cat:$ifolder|cat:"&amp;del="|cat:$image} 
     67                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;ifolder={$ifolder}&amp;view={$image}'><img src='{$smarty.const.THEME}images/image_view.gif' alt='{$locale.461}' title='{$locale.461}'></a>&nbsp; 
     68                <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;ifolder={$ifolder}&amp;del={$image}'><img src='{$smarty.const.THEME}images/image_delete.gif' alt='{$locale.462}' title='{$locale.462}'></a> 
    6969            </td> 
    7070        </tr> 

  • trunk/themes/PLiTheme/templates/source/admin.redirects.tpl

    r814 r838  
    3434            </td> 
    3535        </tr> 
    36         <tr> 
     36{*      <tr> 
     37            <td width='175' class='tbl'> 
     38                {$locale.426}: 
     39            </td> 
     40            <td class='tbl'> 
     41                <input type='checkbox' name='url_regex' value='1'{if $url_regex} checked{/if} />&nbsp; <span class='small2'>{$locale.490}</span> 
     42            </td> 
     43        </tr> 
     44*}      <tr> 
    3745            <td width='175' class='tbl'> 
    3846                {$locale.422}: 
    … …  
    4048            <td class='tbl'> 
    4149                <input type='checkbox' name='url_redirect' value='1'{if $url_redirect} checked{/if} /> 
    42             </td> 
    43         </tr> 
    44         <tr> 
    45             <td width='175' class='tbl'> 
    46                 {$locale.426}: 
    47             </td> 
    48             <td class='tbl'> 
    49                 <input type='checkbox' name='url_regex' value='1'{if $url_regex} checked{/if} />&nbsp; <span class='small2'>{$locale.490}</span> 
    5050            </td> 
    5151        </tr> 

  • trunk/themes/PLiTheme/templates/source/main.pm.options.tpl

    r835 r838  
    7575            </td> 
    7676        </tr> 
     77 
     78{* FUTURE EXTENSION: AUTO ARCHIVE HASN'T BEEN ACTIVATED YET 
     79 
    7780        <tr> 
    7881            <td align='right' class='tbl1' width='70%'> 
    … …  
    8083            </td> 
    8184            <td class='tbl1' width='30%'> 
    82                 <select name='pm_auto_archive' class='textbox'> 
     85                <select disabled readonly name='pm_auto_archive' class='textbox'> 
    8386                    {if $global_options.pmconfig_auto_archive == '0'}<option value='0' {if $user_options.pmconfig_auto_archive == "0"} selected{/if}>{$locale.636}</option>{/if} 
    8487                    {if $global_options.pmconfig_auto_archive == '0' || $global_options.pmconfig_auto_archive >= '30'}<option value='30' {if $user_options.pmconfig_auto_archive == "30"} selected{/if}>&nbsp; 30 {$locale.637}</option>{/if} 
    … …  
    97100            </td> 
    98101        </tr> 
     102*} 
    99103        <tr> 
    100104            <td align='right' class='tbl1' width='70%'> 
Note: See TracChangeset for help on using the changeset viewer.