Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1163

Show
Ignore:
Timestamp:
05/22/08 00:13:34 (3 months ago)
Author:
rats
Message:

* Fixed #1273: some HTML fixes in the HTML templates - Part 1
* Fixed #1274: remove Disallow /ispcp/ from robots.txt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1162 r1163  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-05-22 Benedikt Heintel 
     5        - GUI: 
     6                * Fixed #1273: some HTML fixes in the HTML templates - Part 1 
     7                * Fixed #1274: remove Disallow /ispcp/ from robots.txt 
    38 
    492008-05-20 Benedikt Heintel 

  • trunk/docs/Debian/debian-packages-lenny

    r1106 r1163  
    6262php5-gd 
    6363php5-idn 
    64 php5-imap 
    6564php5-mcrypt 
    6665php5-mhash 

  • trunk/gui/admin/edit_reseller.php

    r1157 r1163  
    277277                // Commented out; we cannot calculate how many domains are added: 3 Domains are created by default 
    278278                // but user can delete them and there would be a new inconsitency if so. 
    279                 // TODO: Fix it! 
     279                // todo: Fix it! 
    280280                /* if ($umail_max != $rmail_current && $umail_current > 0) 
    281281                        $err = tr('Inconsistency between current_mail_cnt and actual mail count: %1$d != %2$d', $umail_max, $rmail_current); 
    …… 
    338338                if ($umax != $r && $u > 0) { // ... && $u != unlimited 
    339339                        $err = tr('Reseller data inconsistency!'); //really? 
    340  
    341340                        return; 
    342341                } 
    …… 
    384383} 
    385384 
    386 function check_user_ip_data($reseller_id, $r_ips, $u_ips, &$err) 
    387 { 
     385function check_user_ip_data($reseller_id, $r_ips, $u_ips, &$err) { 
    388386        if ($r_ips == $u_ips) { 
    389387                return; 

  • trunk/gui/admin/index.php

    r1016 r1163  
    6969} 
    7070 
    71 function get_update_infos(&$tpl) { 
     71function get_ispcp_update_infos(&$tpl) { 
    7272        global $cfg; 
    7373 
    …… 
    9797                $tpl->assign(array('UPDATE_MESSAGE' => '')); 
    9898        } 
    99  
     99} 
     100 
     101function get_db_update_infos(&$tpl) { 
    100102        if(checkDatabaseUpdateExists()) { 
    101103                $tpl->assign(array('DATABASE_UPDATE' => '<a href="database_update.php" class=\"link\">' . tr('A database update is available') . '</a>')); 
    102104                $tpl->parse('DATABASE_UPDATE_MESSAGE', 'database_update_message'); 
    103105        } else { 
    104                 $tpl->assign(array('DATABASE_UPDATE_MESSAGE' => '')); 
     106                $tpl->assign(array('DATABASE_UPDATE' => '')); 
    105107        } 
    106108} 
    …… 
    188190get_admin_general_info($tpl, $sql); 
    189191 
    190 get_update_infos($tpl); 
     192get_ispcp_update_infos($tpl); 
     193get_db_update_infos($tpl); 
    191194 
    192195gen_system_message($tpl, $sql); 

  • trunk/gui/robots.txt

    r474 r1163  
    11User-agent: * 
    22Disallow: / 
    3 Disallow: /ispcp/ 

  • trunk/gui/themes/omega_original/admin/add_admin.tpl

    r1076 r1163  
    99</head> 
    1010 
    11 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     11<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    1212<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    1313<tr> 
    …… 
    1919                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    2020            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    21                                 <tr height="95";> 
     21                                <tr height="95"> 
    2222                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    2323                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 

  • trunk/gui/themes/omega_original/admin/add_reseller.tpl

    r1076 r1163  
    99</head> 
    1010 
    11 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     11<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    1212<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    1313<tr> 
    …… 
    1919                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    2020            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    21                                 <tr height="95";> 
     21                                <tr height="95"> 
    2222                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    2323                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 

  • trunk/gui/themes/omega_original/admin/admin_log.tpl

    r1076 r1163  
    99</head> 
    1010 
    11 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     11<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    1212<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    1313<tr> 
    …… 
    1919                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    2020            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    21                                 <tr height="95";> 
     21                                <tr height="95"> 
    2222                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    2323                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 
    …… 
    7171                        </div> 
    7272                        <!-- BDP: clear_log --> 
    73                           <table width="100%" border="00" cellspacing="5" cellpadding="5"> 
     73                          <table width="100%" border="0" cellspacing="5" cellpadding="5"> 
    7474                            <tr> 
    7575                              <td width="80">&nbsp;</td> 

  • trunk/gui/themes/omega_original/admin/ahp.tpl

    r1152 r1163  
    2727 
    2828</head> 
    29 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     29<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    3030<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    3131<tr> 
    …… 
    3737                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    3838            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    39                                 <tr height="95";> 
     39                                <tr height="95"> 
    4040                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    4141                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 

  • trunk/gui/themes/omega_original/admin/change_password.tpl

    r1076 r1163  
    99</head> 
    1010 
    11 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     11<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    1212<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    1313<tr> 
    …… 
    1919                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    2020            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    21                                 <tr height="95";> 
     21                                <tr height="95"> 
    2222                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    2323                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 

  • trunk/gui/themes/omega_original/admin/change_personal.tpl

    r1076 r1163  
    99</head> 
    1010 
    11 <body onLoad="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
     11<body onload="MM_preloadImages('{THEME_COLOR_PATH}/images/icons/database_a.gif','{THEME_COLOR_PATH}/images/icons/hosting_plans_a.gif','{THEME_COLOR_PATH}/images/icons/domains_a.gif','{THEME_COLOR_PATH}/images/icons/general_a.gif' ,'{THEME_COLOR_PATH}/images/icons/manage_users_a.gif','{THEME_COLOR_PATH}/images/icons/webtools_a.gif','{THEME_COLOR_PATH}/images/icons/statistics_a.gif','{THEME_COLOR_PATH}/images/icons/support_a.gif')"> 
    1212<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    1313<tr> 
    …… 
    1919                <td style="width: 195px; vertical-align: top;">{MENU}</td> 
    2020            <td colspan=2 style="vertical-align: top;"><table style="width: 100%; border-collapse: collapse;padding:0;margin:0;"> 
    21                                 <tr height="95";> 
     21                                <tr height="95"> 
    2222                                  <td style="padding-left:30px; width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/middle_bg.jpg);">{MAIN_MENU}</td> 
    2323                                        <td style="padding:0;margin:0;text-align: right; width: 73px;vertical-align: top;"><img src="{THEME_COLOR_PATH}/images/top/middle_right.jpg" border="0"></td> 

  • trunk/gui/themes/omega_original/admin/circular.tpl

    r1076