Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1176

Show
Ignore:
Timestamp:
05/28/08 22:35:27 (3 months ago)
Author:
rats
Message:

* Changed Debian INSTALL
* Changed Ubuntu INSTALL
* Updated Debian packages for Lenny
* Updated Ubuntu packages for Hardy Heron
* Fixed #1307: in reseller/change_personal.php {STREET1} and {STREET2} are not set correctly
* Fixed #1308: some umlauf fixes
* Fixed #1310: error in manage_domains.tpl
* Fixed #1311: error in client-functions.php
* Added: Hosting plan level selectable from admin configuration
* Updated reseller Main Menu

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1175 r1176  
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    33 
     42008-05-28 Benedikt Heintel 
     5        - DOCS: 
     6                * Changed Debian INSTALL 
     7                * Changed Ubuntu INSTALL 
     8                * Updated Debian packages for Lenny 
     9                * Updated Ubuntu packages for Hardy Heron 
     10        - GUI: 
     11                * Fixed #1305: some german language updates and typo 
     12                * Fixed #1307: in reseller/change_personal.php {STREET1} and {STREET2} are not set correctly 
     13                * Fixed #1308: some umlauf fixes 
     14                * Fixed #1310: error in manage_domains.tpl 
     15                * Fixed #1311: error in client-functions.php 
     16                * Added: Hosting plan level selectable from admin configuration 
     17                * Updated reseller Main Menu 
     18 
    4192008-05-28 Jochen Manz 
    520        - GUI: 
    621                * Fixed #1303: some css fixes for pma and webmail themes, + fix IE exclusive comment handling in webmail - Part 8 (patch included) 
    722                * Fixed #1304: 'TR_USUALY_NAMED' => tr('(usually named ' . $name . ')') is not translateable 
    8                 * Fixed #1306: gui/client/email_accounts.php produces wrong html code (patch included) 
     23                * Fixed #1306: gui/client/email_accounts.php produces wrong html code 
    924 
    10252008-05-27 Malte Geierhos 
    11         - SETUP  
     26        - SETUP 
    1227                * Fixed #1269: Update doesn't set the new theme as default 
    1328 
    …… 
    2742        - GUI: 
    2843                * Fixed #1288: Some HTML, CSS and JS fixes/polishes - Part 5 
    29                 * Fixed #1290: some widespread html fixes - Part 6 (patch included) 
     44                * Fixed #1290: some widespread html fixes - Part 6 
    3045 
    31462008-05-24 Jochen Manz 

  • trunk/docs/Debian/INSTALL

    r1156 r1176  
    210210 
    211211Q.- How can I prevent websites using more than their bandwidth limit to stop working? 
    212 A.- If you have installed the apache2-mod-cband (available for etch and lenny/sid) 
     212A.- If you have installed the apache2-mod-cband (available for etch) 
    213213     all you need to do is: 
    214214       # a2enmod cband 

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

    r1163 r1176  
    3737libnet-netmask-perl 
    3838libnet-smtp-server-perl 
    39 libperl5.8 
     39libperl5.10 
    4040libsasl2-2 
    4141libsasl2-modules 

  • trunk/docs/Ubuntu/INSTALL

    r1095 r1176  
    3636All 7.04 required packages are listed in ./docs/Ubuntu/ubuntu-packages-feisty 
    3737All 7.10 required packages are listed in ./docs/Ubuntu/ubuntu-packages-gutsy 
     38All 8.04 LTS required packages are listed in ./docs/Ubuntu/ubuntu-packages-hardy 
    3839 
    3940================================================================================ 
    …… 
    6768 
    6869   for Ubuntu 6.06 LTS please use: 
    69         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-edgy` 
     70        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-edgy) 
    7071   for Ubuntu 7.04 please use: 
    71         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-feisty 
     72        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-feisty) 
    7273   for Ubuntu 7.10 please use: 
    73         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-gutsy` 
     74        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-gutsy) 
     75   for Ubuntu 8.04 please use: 
     76        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-hardy) 
    7477 
    7578        (when you get to the courier screen select 'no' to web directories) 
    …… 
    132135 
    133136   for Ubuntu 6.06 LTS please use: 
    134         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-edgy` 
     137        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-edgy) 
    135138   for Ubuntu 7.04 please use: 
    136         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-feisty 
     139        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-feisty) 
    137140   for Ubuntu 7.10 please use: 
    138         # apt-get install `cat ./docs/Ubuntu/ubuntu-packages-gutsy` 
     141        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-gutsy) 
     142   for Ubuntu 8.04 please use: 
     143        # apt-get install $(cat ./docs/Ubuntu/ubuntu-packages-hardy) 
    139144 
    140145        (when you get to the courier screen select 'no' to web directories) 

  • trunk/gui/admin/custom_menus.php

    r1014 r1176  
    5959                                        'LINK' => $menu_link, 
    6060                                        'CONTENT' => ($i % 2 == 0) ? 'content' : 'content2', 
    61                                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     61                                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    6262 
    6363                                        ) 

  • trunk/gui/admin/dhp.php

    r1152 r1176  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2008 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  * @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
     11 * @license 
     12 *  This program is free software; you can redistribute it and/or modify it under 
     13 *  the terms of the MPL General Public License as published by the Free Software 
     14 *  Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *  version. 
     16 *  You should have received a copy of the MPL Mozilla Public License along with 
     17 *  this program; if not, write to the Open Source Initiative (OSI) 
     18 *  http://opensource.org | osi@opensource.org 
     19 */ 
    1920 
    2021require '../include/ispcp-lib.php'; 
    …… 
    3839 
    3940// Check if there is no order for this plan 
    40 $res = exec_query($sql, "SELECT COUNT(id) FROM orders WHERE plan_id=?", array($hpid)); 
     41$res = exec_query($sql, "SELECT COUNT(id) FROM `orders` WHERE `plan_id`=? AND `status`='new'", array($hpid)); 
    4142$data = $res->FetchRow(); 
    4243if ($data['0'] > 0) { 
    …… 
    5253$_SESSION['hp_deleted'] = '_yes_'; 
    5354 
    54 Header("Location: hp.php"); 
    55  
     55header("Location: hp.php"); 
    5656die(); 
    5757 

  • trunk/gui/admin/hp.php

    r1152 r1176  
    6868        'TR_BACK' => tr('Back'), 
    6969        'TR_TITLE_BACK' => tr('Return to previous menu'), 
    70         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete') 
     70        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
    7171)); 
    7272 

  • trunk/gui/admin/settings.php

    r1173 r1176  
    5353        $user_initial_lang                                      = $_POST['def_language']; 
    5454        $support_system                                         = $_POST['support_system']; 
     55        $hosting_plan_level                                     = $_POST['hosting_plan_level']; 
    5556        $domain_rows_per_page                           = clean_input($_POST['domain_rows_per_page']); 
    5657        // change Loglevel to constant: 
    …… 
    9192                setConfig_Value('USER_INITIAL_LANG', $user_initial_lang); 
    9293                setConfig_Value('ISPCP_SUPPORT_SYSTEM', $support_system); 
     94                setConfig_Value('HOSTING_PLANS_LEVEL', $hosting_plan_level); 
    9395                setConfig_Value('DOMAIN_ROWS_PER_PAGE', $domain_rows_per_page); 
    9496                setConfig_Value('LOG_LEVEL', $log_level); 
    …… 
    165167        $tpl->assign('HARD_MAIL_SUSPENSION_ON', ''); 
    166168        $tpl->assign('HARD_MAIL_SUSPENSION_OFF', 'selected="selected"'); 
     169} 
     170 
     171if ($cfg['HOSTING_PLANS_LEVEL'] == "admin") { 
     172        $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', 'selected="selected"'); 
     173        $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', ''); 
     174} else { 
     175        $tpl->assign('HOSTING_PLANS_LEVEL_ADMIN', ''); 
     176        $tpl->assign('HOSTING_PLANS_LEVEL_RESELLER', 'selected="selected"'); 
    167177} 
    168178 
    …… 
    227237                'TR_APPLY_CHANGES' => tr('Apply changes'), 
    228238                'TR_SERVERPORTS' => tr('Server ports'), 
     239                'TR_HOSTING_PLANS_LEVEL' => tr('Hosting plans available for'), 
     240                'TR_ADMIN' => tr('Admin'), 
     241                'TR_RESELLER' => tr('Reseller'), 
    229242                'TR_DOMAIN_ROWS_PER_PAGE' => tr('Domains per page'), 
    230243                'TR_LOG_LEVEL' => tr('Log Level'), 
    …… 
    232245                'TR_E_USER_NOTICE' => tr('Notices, Warnings and Errors'), 
    233246                'TR_E_USER_WARNING' => tr('Warnings and Errors'), 
    234                 'TR_E_USER_ERROR' => tr('Errors'), 
     247                'TR_E_USER_ERROR' => tr('Errors') 
    235248                ) 
    236249        ); 

  • trunk/gui/admin/settings_ports.php

    r1173 r1176  
    274274                'TR_DELETE' => tr('Delete'), 
    275275                'TR_ADD' => tr('Add'), 
    276                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete') 
     276                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) 
    277277                ) 
    278278        ); 

  • trunk/gui/admin/ss_closed.php

    r1157 r1176  
    329329                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    330330                'TR_DELETE'             => tr('Delete'), 
    331                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     331                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    332332                ) 
    333333        ); 

  • trunk/gui/admin/support_system.php

    r1157 r1176  
    324324                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    325325                'TR_DELETE'             => tr('Delete'), 
    326                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     326                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    327327                ) 
    328328        ); 

  • trunk/gui/client/delete_sql_database.php

    r1148 r1176  
    11<?php 
    22/** 
    3  * ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    6  *  @copyright  2006-2008 by ispCP | http://isp-control.net 
    7  *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version     SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
    910 * 
    10  *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
    18  **/ 
    19  
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
     19 */ 
    2020 
    2121require '../include/ispcp-lib.php'; 
    …… 
    2424 
    2525if (isset($_GET['id'])) { 
    26  
    2726    $db_id = $_GET['id']; 
    28  
    2927} else { 
    30  
    3128    user_goto('manage_sql.php'); 
    32  
    3329} 
    3430 

  • trunk/gui/include/admin-functions.php

    r1173 r1176  
    770770                                        'URL_EDIT_USR' => "edit_admin.php?edit_id=" . $rs->fields['domain_admin_id'], 
    771771                                        'TR_MESSAGE_CHANGE_STATUS' => tr('Are you sure you want to change the status of domain account?'), 
    772                                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this account?'), 
     772                                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete this account?', true), 
    773773                                        ) 
    774774                                ); 
    …… 
    796796                        'TR_SEARCH' => tr('Search'), 
    797797                        'TR_CREATED_ON' => tr('Creation date'), 
    798                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     798                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    799799                        'TR_EDIT' => tr("Edit") 
    800800                        ) 

  • trunk/gui/include/client-functions.php

    r1173 r1176  
    830830        } 
    831831        // drop desired database; 
    832         $query = <<<SQL_QUERY 
    833         DROP DATABASE ?; 
    834 SQL_QUERY; 
    835  
    836         $rs = exec_query($sql, $query, array($db_name)); 
     832        $query = "DROP DATABASE IF EXISTS ".$db_name.";"; 
     833 
     834        $rs = exec_query($sql, $query, array()); 
    837835 
    838836        write_log($_SESSION['user_logged'] . ": delete SQL database: " . $db_name); 

  • trunk/gui/include/sql.php

    r1148 r1176  
    33 * ispCP ω (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  * @copyright 2001-2006 by moleSoftware GmbH 
    6  * @copyright   2006-2008 by ispCP | http://isp-control.net 
    7  * @version SVN: $ID$ 
    8  * @link http://isp-control.net 
    9  * @author ispCP Team 
    10  * @license This program is free software; you can redistribute it and/or modify it under 
    11  *    the terms of the MPL General Public License as published by the Free Software 
    12  *    Foundation; either version 1.1 of the License, or (at your option) any later 
    13  *    version. 
    14  *    You should have received a copy of the MPL Mozilla Public License along with 
    15  *    this program; if not, write to the Open Source Initiative (OSI) 
    16  *    http://opensource.org | osi@opensource.org 
     5 * @copyright   2001-2006 by moleSoftware GmbH 
     6 * @copyright   2006-2008 by ispCP | http://isp-control.net 
     7 * @version             SVN: $ID$ 
     8 * @link                http://isp-control.net 
     9 * @author              ispCP Team 
     10 * 
     11 * @license 
     12 *   This program is free software; you can redistribute it and/or modify it under 
     13 *   the terms of the MPL General Public License as published by the Free Software 
     14 *   Foundation; either version 1.1 of the License, or (at your option) any later 
     15 *   version. 
     16 *   You should have received a copy of the MPL Mozilla Public License along with 
     17 *   this program; if not, write to the Open Source Initiative (OSI) 
     18 *   http://opensource.org | osi@opensource.org 
    1719 */ 
    1820 

  • trunk/gui/reseller/dhp.php

    r1011 r1176  
    3434 
    3535// Check if there is no order for this plan 
    36 $res = exec_query($sql, "SELECT COUNT(id) FROM orders WHERE plan_id=?", array($hpid)); 
     36$res = exec_query($sql, "SELECT COUNT(id) FROM `orders` WHERE `plan_id`=? AND `status`='new'", array($hpid)); 
    3737$data = $res->FetchRow(); 
    3838if ($data['0'] > 0) { 

  • trunk/gui/reseller/domain_alias.php

    r1014 r1176  
    7272                        'TR_ACTION' => tr('Action'), 
    7373                        'TR_ADD_ALIAS' => tr('Add alias'), 
    74                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     74                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    7575                ) 
    7676        ); 

  • trunk/gui/reseller/hp.php

    r1152 r1176  
    6363        'TR_BACK' => tr('Back'), 
    6464        'TR_TITLE_BACK' => tr('Return to previous menu'), 
    65         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete') 
     65        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true)  
    6666)); 
    6767 

  • trunk/gui/reseller/orders.php

    r1014 r1176  
    201201                'TR_DETAILS' => tr('Details'), 
    202202                'TR_HP' => tr('Hosting plan'), 
    203                 'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?'), 
     203                'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this order?', true), 
    204204                'TR_ADD' => tr('Add/Details'))); 
    205205 

  • trunk/gui/reseller/ss_closed.php

    r1157 r1176  
    232232                        'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    233233                        'TR_DELETE' => tr('Delete'), 
    234                         'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     234                        'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    235235                ) 
    236236        ); 

  • trunk/gui/reseller/support_system.php

    r1157 r1176  
    274274                'TR_CLOSED_TICKETS' => tr('Closed tickets'), 
    275275                'TR_DELETE' => tr('Delete'), 
    276                 'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete'), 
     276                'TR_MESSAGE_DELETE' => tr('Are you sure you want to delete', true) , 
    277277                ) 
    278278        ); 

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

    r1172 r1176  
    3939                                </tr> 
    4040                                <tr> 
    41                                   <td colspan="3"><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     41                                  <td colspan="3"> 
     42                                   <table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    4243                    <tr> 
    43                       <td align="left" class="title"><table width="100%" cellpadding="5" cellspacing="5"> 
     44                      <td align="left"><table width="100%" cellpadding="5" cellspacing="5"> 
    4445                          <tr> 
    4546                            <td width="25"><img src="{THEME_COLOR_PATH}/images/content/table_icon_serverstatus.png" width="25" height="25"></td> 

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

    r1172 r1176  
    3535                                  <td colspan="3"><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    3636                    <tr> 
    37                       <td align="left" class="title"><table width="100%" cellpadding="5" cellspacing="5"> 
     37                      <td align="left"><table width="100%" cellpadding="5" cellspacing="5"> 
    3838                          <tr> 
    3939                            <td width="25"><img src="{THEME_COLOR_PATH}/images/content/table_icon_serverstatus.png" width="25" height="25"></td> 

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

    r1172 r1176  
    3535                                  <td colspan="3"><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    3636                    <tr> 
    37                       <td align="left" class="title"><table width="100%" cellpadding="5" cellspacing="5"> 
     37                      <td align="left"><table width="100%" cellpadding="5" cellspacing="5"> 
    3838                          <tr> 
    3939                            <td width="25"><img src="{THEME_COLOR_PATH}/images/content/table_icon_serverstatus.png" width="25" height="25"></td> 

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

    r1172 r1176  
    165165                            <tr> 
    166166                              <td>&nbsp;</td> 
     167                              <td class="content2">{TR_HOSTING_PLANS_LEVEL}</td> 
     168                              <td class="content"><select name="hosting_plan_level" id="hosting_plan_level"> 
     169                                  <option value="admin" {HOSTING_PLANS_LEVEL_ADMIN}>{TR_ADMIN}</option> 
     170                                  <option value="reseller" {HOSTING_PLANS_LEVEL_RESELLER}>{TR_RESELLER}</option> 
     171                                </select></td> 
     172                            </tr> 
     173                            <tr> 
     174                              <td>&nbsp;</td> 
    167175                              <td class="content2">{TR_DOMAIN_ROWS_PER_PAGE}</td> 
    168176                              <td class="content"><input name="domain_rows_per_page" type="text" class="textinput" id="domain_rows_per_page" style="width:50px" value="{DOMAIN_ROWS_PER_PAGE}" maxlength="3" /></td> 

  • trunk/gui/themes/omega_original/client/manage_domains.tpl

    r1172 r1176  
    167167            <td class="content3" colspan="2" nowrap="nowrap"><b>{TR_SUB_NAME}</b></td> 
    168168            <td class="content3" nowrap="nowrap"><b>{TR_SUB_MOUNT}</b></td> 
    169             <td class="content3" nowrap="nowrap" align="center"><b>{TR_SUB_S="nowrap"TATUS}</b></td> 
     169            <td class="content3" nowrap="nowrap" align="center"><b>{TR_SUB_STATUS}</b></td> 
    170170            <td class="content3" nowrap="nowrap" align="center"><b>{TR_SUB_ACTION}</b></td> 
    171171          </tr> 

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

    r1172 r1176  
    7676                        <td>&nbsp;</td> 
    7777                        <td class="content2">{TR_STREET_1}</td> 
    78                         <td class="content"><input type="text" name="street1" value="{STREET1}" style="width:210px" class="textinput"></td> 
     78                        <td class="content"><input type="text" name="street1" value="{STREET_1}" style="width:210px" class="textinput"></td> 
    7979                      </tr> 
    8080                      <tr> 
    8181                        <td>&nbsp;</td> 
    8282                        <td class="content2">{TR_STREET_2}</td> 
    83                         <td class="content"><input type="text" name="street2" value="{STREET2}" style="width:210px" class="textinput"></td> 
     83                        <td class="content"><input type="text" name="street2" value="{STREET_2}" style="width:210px" class="textinput"></td> 
    8484                      </tr> 
    8585                      <tr> 

  • trunk/gui/themes/omega_original/reseller/main_menu_general_information.tpl

    r1164 r1176  
    66  </tr><tr> 
    77    <td class="menu"><div align="center"><a href="index.php" class="menu_active" onmouseover="MM_swapImage('general','','{THEME_COLOR_PATH}/images/icons/general_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_GENERAL_INFORMATION}</a></div></td> 
     8  </tr> 
     9</table></td> 
     10    <td width="30">&nbsp;</td> 
     11    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     12<tr> 
     13      <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
     14  </tr><tr> 
     15    <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    816  </tr> 
    917</table></td> 
    …… 
    2230  </tr><tr> 
    2331    <td class="menu"><div align="center"><a href="orders.php" class="menu_active" onmouseover="MM_swapImage('orders','','{THEME_COLOR_PATH}/images/icons/purchasing_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_ORDERS}</a></div></td> 
    24   </tr> 
    25 </table></td> 
    26     <td width="30">&nbsp;</td> 
    27     <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    28 <tr> 
    29       <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
    30   </tr><tr> 
    31     <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    3232  </tr> 
    3333</table></td> 

  • trunk/gui/themes/omega_original/reseller/main_menu_hp.tpl

    r1164 r1176  
    66  </tr><tr> 
    77    <td class="menu"><div align="center"><a href="index.php" class="menu_active" onmouseover="MM_swapImage('general','','{THEME_COLOR_PATH}/images/icons/general_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_GENERAL_INFORMATION}</a></div></td> 
     8  </tr> 
     9</table></td> 
     10    <td width="30">&nbsp;</td> 
     11    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     12<tr> 
     13      <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
     14  </tr><tr> 
     15    <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    816  </tr> 
    917</table></td> 
    …… 
    2230  </tr><tr> 
    2331    <td class="menu"><div align="center"><a href="orders.php" class="menu_active" onmouseover="MM_swapImage('orders','','{THEME_COLOR_PATH}/images/icons/purchasing_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_ORDERS}</a></div></td> 
    24   </tr> 
    25 </table></td> 
    26     <td width="30">&nbsp;</td> 
    27     <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    28 <tr> 
    29       <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
    30   </tr><tr> 
    31     <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    3232  </tr> 
    3333</table></td> 

  • trunk/gui/themes/omega_original/reseller/main_menu_manage_users.tpl

    r1164 r1176  
    66  </tr><tr> 
    77    <td class="menu"><div align="center"><a href="index.php" class="menu_active" onmouseover="MM_swapImage('general','','{THEME_COLOR_PATH}/images/icons/general_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_GENERAL_INFORMATION}</a></div></td> 
     8  </tr> 
     9</table></td> 
     10    <td width="30">&nbsp;</td> 
     11    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     12<tr> 
     13      <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users_a.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
     14  </tr><tr> 
     15    <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    816  </tr> 
    917</table></td> 
    …… 
    2230  </tr><tr> 
    2331    <td class="menu"><div align="center"><a href="orders.php" class="menu_active" onmouseover="MM_swapImage('orders','','{THEME_COLOR_PATH}/images/icons/purchasing_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_ORDERS}</a></div></td> 
    24   </tr> 
    25 </table></td> 
    26     <td width="30">&nbsp;</td> 
    27     <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    28 <tr> 
    29       <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users_a.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
    30   </tr><tr> 
    31     <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    3232  </tr> 
    3333</table></td> 

  • trunk/gui/themes/omega_original/reseller/main_menu_orders.tpl

    r1164 r1176  
    66  </tr><tr> 
    77    <td class="menu"><div align="center"><a href="index.php" class="menu_active" onmouseover="MM_swapImage('general','','{THEME_COLOR_PATH}/images/icons/general_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_GENERAL_INFORMATION}</a></div></td> 
     8  </tr> 
     9</table></td> 
     10    <td width="30">&nbsp;</td> 
     11    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     12<tr> 
     13      <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
     14  </tr><tr> 
     15    <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    816  </tr> 
    917</table></td> 
    …… 
    2230  </tr><tr> 
    2331    <td class="menu"><div align="center"><a href="orders.php" class="menu_active" onmouseover="MM_swapImage('orders','','{THEME_COLOR_PATH}/images/icons/purchasing_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_ORDERS}</a></div></td> 
    24   </tr> 
    25 </table></td> 
    26     <td width="30">&nbsp;</td> 
    27     <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    28 <tr> 
    29       <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
    30   </tr><tr> 
    31     <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    3232  </tr> 
    3333</table></td> 

  • trunk/gui/themes/omega_original/reseller/main_menu_statistics.tpl

    r1164 r1176  
    66  </tr><tr> 
    77    <td class="menu"><div align="center"><a href="index.php" class="menu_active" onmouseover="MM_swapImage('general','','{THEME_COLOR_PATH}/images/icons/general_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_GENERAL_INFORMATION}</a></div></td> 
     8  </tr> 
     9</table></td> 
     10    <td width="30">&nbsp;</td> 
     11    <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
     12<tr> 
     13      <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
     14  </tr><tr> 
     15    <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    816  </tr> 
    917</table></td> 
    …… 
    2230  </tr><tr> 
    2331    <td class="menu"><div align="center"><a href="orders.php" class="menu_active" onmouseover="MM_swapImage('orders','','{THEME_COLOR_PATH}/images/icons/purchasing_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_ORDERS}</a></div></td> 
    24   </tr> 
    25 </table></td> 
    26     <td width="30">&nbsp;</td> 
    27     <td><table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    28 <tr> 
    29       <td class="menu"><div align="center"><a href="users.php" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()"><img src="{THEME_COLOR_PATH}/images/icons/manage_users.gif" name="manage_users" width="47" height="46" border="0" id="manage_users" /></a></div></td> 
    30   </tr><tr> 
    31     <td class="menu"><div align="center"><a href="users.php" class="menu_active" onmouseover="MM_swapImage('manage_users','','{THEME_COLOR_PATH}/images/icons/manage_users_a.gif',1)" onmouseout="MM_swapImgRestore()">{TR_MENU_MANAGE_USERS}</a></div></td> 
    3232  </tr> 
    3333</table></td> 

  • trunk/gui/themes/omega_original/reseller/main_menu_support_system.tpl