diff --git a/src/mibew/libs/chat.php b/src/mibew/libs/chat.php index 2c17b741..851ed3a3 100644 --- a/src/mibew/libs/chat.php +++ b/src/mibew/libs/chat.php @@ -427,7 +427,7 @@ function setup_chatview(Thread $thread) { = $style_config['mail']['window_params']; // Load core style options - $style_config = get_core_style_config(get_operator_pages_style()); + $style_config = get_core_style_config(get_page_style()); $data['chat']['windowsParams']['history'] = $style_config['history']['window_params']; diff --git a/src/mibew/libs/classes/settings.php b/src/mibew/libs/classes/settings.php index 4f34f1ff..8b104128 100644 --- a/src/mibew/libs/classes/settings.php +++ b/src/mibew/libs/classes/settings.php @@ -67,7 +67,7 @@ Class Settings { 'usernamepattern' => '{name}', 'chat_style' => 'default', 'invitationstyle' => 'default', - 'operator_pages_style' => 'default', + 'page_style' => 'default', 'chattitle' => 'Live Support', 'geolink' => 'http://api.hostip.info/get_html.php?ip={ip}', 'geolinkparams' => 'width=440,height=100,toolbar=0,scrollbars=0,location=0,status=1,menubar=0,resizable=1', diff --git a/src/mibew/libs/common/configurations.php b/src/mibew/libs/common/configurations.php index 36c7268d..49f2862f 100644 --- a/src/mibew/libs/common/configurations.php +++ b/src/mibew/libs/common/configurations.php @@ -39,7 +39,7 @@ function get_core_style_config($style) { $base_path = realpath(dirname(dirname(dirname(__FILE__)))); // Load config - $config = read_config_file($base_path.'/styles/operator_pages/' . $style . '/config.ini'); + $config = read_config_file($base_path.'/styles/pages/' . $style . '/config.ini'); // Set default values $config = ($config === false) ? array() : $config; diff --git a/src/mibew/libs/common/request.php b/src/mibew/libs/common/request.php index a2075ff2..8d654527 100644 --- a/src/mibew/libs/common/request.php +++ b/src/mibew/libs/common/request.php @@ -81,8 +81,8 @@ function is_secure_request() * * @return string */ -function get_operator_pages_style() { - return Settings::get('operator_pages_style'); +function get_page_style() { + return Settings::get('page_style'); } ?> \ No newline at end of file diff --git a/src/mibew/libs/settings.php b/src/mibew/libs/settings.php index c0831111..8a5d4ef0 100644 --- a/src/mibew/libs/settings.php +++ b/src/mibew/libs/settings.php @@ -22,7 +22,7 @@ function setup_settings_tabs($active) getlocal("page_settings.tab.main") => $active != 0 ? "$mibewroot/operator/settings.php" : "", getlocal("page_settings.tab.features") => $active != 1 ? "$mibewroot/operator/features.php" : "", getlocal("page_settings.tab.performance") => $active != 2 ? "$mibewroot/operator/performance.php" : "", - getlocal("page_settings.tab.operator_pages_themes") => $active != 3 ? "$mibewroot/operator/operator_pages_themes.php" : "", + getlocal("page_settings.tab.page_themes") => $active != 3 ? "$mibewroot/operator/page_themes.php" : "", getlocal("page_settings.tab.themes") => $active != 4 ? "$mibewroot/operator/themes.php" : "", ); if (Settings::get('enabletracking')) { diff --git a/src/mibew/libs/view.php b/src/mibew/libs/view.php index f4d0faad..f458b1cd 100644 --- a/src/mibew/libs/view.php +++ b/src/mibew/libs/view.php @@ -22,11 +22,11 @@ require_once(dirname(__FILE__).'/common/request.php'); /** * Renders a view for an operator page * - * All views are stored in "styles/operator_pages/" folders. + * All views are stored in "styles/pages/" folders. * * $view_name param should include neither full view's path nor its extension. * Just view name. For example, to render and output - * "styles/operator_pages/default/agents.php" view one should use "agents" as + * "styles/pages/default/agents.php" view one should use "agents" as * the view name. * * @param string $view_name Name of the view to render. @@ -45,7 +45,7 @@ function render_view($view_name, $style_name = NULL) { // Settings classes. Just use "default" style for installation pages. $style_name = 'default'; } else { - $style_name = get_operator_pages_style(); + $style_name = get_page_style(); } } @@ -55,7 +55,7 @@ function render_view($view_name, $style_name = NULL) { // Build full view name. Remove '\' and '/' characters form the specified // view name $full_view_name = dirname(dirname(__FILE__)) . - '/styles/operator_pages/' . $style_name . '/views/' . + '/styles/pages/' . $style_name . '/views/' . str_replace("/\\", '', $view_name) . '.php'; // Load and execute the view diff --git a/src/mibew/locales/en/properties b/src/mibew/locales/en/properties index fc6351c2..a76c06eb 100644 --- a/src/mibew/locales/en/properties +++ b/src/mibew/locales/en/properties @@ -417,8 +417,8 @@ page_search.type.visitor=by visitor page_settings.intro=Specify options affecting chat window and common system behavior. page_settings.tab.features=Optional Services page_settings.tab.main=General +page_settings.tab.page_themes=Operator pages themes preview page_settings.tab.performance=Performance -page_settings.tab.operator_pages_themes=Operator pages themes preview page_settings.tab.themes=Chat themes preview page_settings.tab.invitationthemes=Invitation themes preview pending.errors.network=Network problems detected. Please refresh the page. @@ -560,8 +560,8 @@ settings.onehostconnections.description=0 allows any number of connections settings.onehostconnections=Max number of threads from one address settings.onlinetimeout.description=Set the number of seconds to show an operator as online. Default is 30 seconds. settings.onlinetimeout=Operator online time threshold -settings.operator_pages_style.description=A preview for each style is available here -settings.operator_pages_style=Select a style for your operator pages +settings.page_style.description=A preview for each style is available here +settings.page_style=Select a style for your operator pages settings.popup_notification.description=Small dialog appears to attract your attention. settings.popup_notification=Enable "Popup dialog notification of the new visitor". settings.saved=Changes saved diff --git a/src/mibew/operator/operator_pages_themes.php b/src/mibew/operator/page_themes.php similarity index 93% rename from src/mibew/operator/operator_pages_themes.php rename to src/mibew/operator/page_themes.php index 613dd457..5a0ae425 100644 --- a/src/mibew/operator/operator_pages_themes.php +++ b/src/mibew/operator/page_themes.php @@ -23,7 +23,7 @@ require_once(dirname(dirname(__FILE__)).'/libs/view.php'); $operator = check_login(); -$stylelist = get_style_list(dirname(dirname(__FILE__)).'/styles/operator_pages'); +$stylelist = get_style_list(dirname(dirname(__FILE__)).'/styles/pages'); $preview = verifyparam("preview", "/^\w+$/", "default"); if (!in_array($preview, $stylelist)) { @@ -37,7 +37,7 @@ $screenshots = array(); foreach($style_config['screenshots'] as $name => $desc) { $screenshots[] = array( 'name' => $name, - 'file' => $mibewroot . '/styles/operator_pages/' . $preview + 'file' => $mibewroot . '/styles/pages/' . $preview . '/screenshots/' . $name . '.png', 'description' => $desc ); @@ -49,6 +49,6 @@ $page['screenshotsList'] = $screenshots; prepare_menu($operator); setup_settings_tabs(3); -render_view('operator_pages_themes'); +render_view('page_themes'); ?> \ No newline at end of file diff --git a/src/mibew/operator/settings.php b/src/mibew/operator/settings.php index ce0d31c6..523c1671 100644 --- a/src/mibew/operator/settings.php +++ b/src/mibew/operator/settings.php @@ -33,7 +33,7 @@ $page = array('agentId' => ''); $errors = array(); $stylelist = ChatStyle::availableStyles(); -$operator_pages_style_list = get_style_list(dirname(dirname(__FILE__)).'/styles/operator_pages'); +$page_style_list = get_style_list(dirname(dirname(__FILE__)).'/styles/pages'); $options = array( 'email', @@ -41,7 +41,7 @@ $options = array( 'logo', 'hosturl', 'usernamepattern', - 'operator_pages_style', + 'page_style', 'chat_style', 'chattitle', 'geolink', @@ -77,9 +77,9 @@ if (isset($_POST['email']) && isset($_POST['title']) && isset($_POST['logo'])) { $params['chat_style'] = $stylelist[0]; } - $params['operator_pages_style'] = verifyparam("operator_pages_style", "/^\w+$/", $params['operator_pages_style']); - if (!in_array($params['operator_pages_style'], $operator_pages_style_list)) { - $params['operator_pages_style'] = $operator_pages_style_list[0]; + $params['page_style'] = verifyparam("page_style", "/^\w+$/", $params['page_style']); + if (!in_array($params['page_style'], $page_style_list)) { + $params['page_style'] = $page_style_list[0]; } if (Settings::get('enabletracking')) { @@ -122,8 +122,8 @@ $page['formhosturl'] = topage($params['hosturl']); $page['formgeolink'] = topage($params['geolink']); $page['formgeolinkparams'] = topage($params['geolinkparams']); $page['formusernamepattern'] = topage($params['usernamepattern']); -$page['formoperatorpagesstyle'] = $params['operator_pages_style']; -$page['availableOperatorPagesStyles'] = $operator_pages_style_list; +$page['formpagestyle'] = $params['page_style']; +$page['availablePageStyles'] = $page_style_list; $page['formchatstyle'] = $params['chat_style']; $page['formchattitle'] = topage($params['chattitle']); $page['formsendmessagekey'] = $params['sendmessagekey']; diff --git a/src/mibew/operator/users.php b/src/mibew/operator/users.php index af4023a6..3b377b14 100644 --- a/src/mibew/operator/users.php +++ b/src/mibew/operator/users.php @@ -49,7 +49,7 @@ $style_config = $chat_style->configurations(); $page['chatStyles.chatWindowParams'] = $style_config['chat']['window_params']; // Load core style options -$style_config = get_core_style_config(get_operator_pages_style()); +$style_config = get_core_style_config(get_page_style()); $page['coreStyles.threadTag'] = $style_config['users']['thread_tag']; $page['coreStyles.visitorTag'] = $style_config['users']['visitor_tag']; $page['coreStyles.trackedUserWindowParams'] = $style_config['tracked']['user_window_params']; diff --git a/src/mibew/styles/operator_pages/default/config.ini b/src/mibew/styles/pages/default/config.ini similarity index 100% rename from src/mibew/styles/operator_pages/default/config.ini rename to src/mibew/styles/pages/default/config.ini diff --git a/src/mibew/styles/operator_pages/default/css/default.css b/src/mibew/styles/pages/default/css/default.css similarity index 100% rename from src/mibew/styles/operator_pages/default/css/default.css rename to src/mibew/styles/pages/default/css/default.css diff --git a/src/mibew/styles/operator_pages/default/css/default_ie.css b/src/mibew/styles/pages/default/css/default_ie.css similarity index 100% rename from src/mibew/styles/operator_pages/default/css/default_ie.css rename to src/mibew/styles/pages/default/css/default_ie.css diff --git a/src/mibew/styles/operator_pages/default/images/ban.gif b/src/mibew/styles/pages/default/images/ban.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/ban.gif rename to src/mibew/styles/pages/default/images/ban.gif diff --git a/src/mibew/styles/operator_pages/default/images/blank.html b/src/mibew/styles/pages/default/images/blank.html similarity index 100% rename from src/mibew/styles/operator_pages/default/images/blank.html rename to src/mibew/styles/pages/default/images/blank.html diff --git a/src/mibew/styles/operator_pages/default/images/buttons/createagent.gif b/src/mibew/styles/pages/default/images/buttons/createagent.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/buttons/createagent.gif rename to src/mibew/styles/pages/default/images/buttons/createagent.gif diff --git a/src/mibew/styles/operator_pages/default/images/buttons/createban.gif b/src/mibew/styles/pages/default/images/buttons/createban.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/buttons/createban.gif rename to src/mibew/styles/pages/default/images/buttons/createban.gif diff --git a/src/mibew/styles/operator_pages/default/images/buttons/createdep.gif b/src/mibew/styles/pages/default/images/buttons/createdep.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/buttons/createdep.gif rename to src/mibew/styles/pages/default/images/buttons/createdep.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/blocked.gif b/src/mibew/styles/pages/default/images/dash/blocked.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/blocked.gif rename to src/mibew/styles/pages/default/images/dash/blocked.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/canned.gif b/src/mibew/styles/pages/default/images/dash/canned.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/canned.gif rename to src/mibew/styles/pages/default/images/dash/canned.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/close.gif b/src/mibew/styles/pages/default/images/dash/close.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/close.gif rename to src/mibew/styles/pages/default/images/dash/close.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/dep.gif b/src/mibew/styles/pages/default/images/dash/dep.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/dep.gif rename to src/mibew/styles/pages/default/images/dash/dep.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/exit.gif b/src/mibew/styles/pages/default/images/dash/exit.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/exit.gif rename to src/mibew/styles/pages/default/images/dash/exit.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/getcode.gif b/src/mibew/styles/pages/default/images/dash/getcode.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/getcode.gif rename to src/mibew/styles/pages/default/images/dash/getcode.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/history.gif b/src/mibew/styles/pages/default/images/dash/history.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/history.gif rename to src/mibew/styles/pages/default/images/dash/history.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/locale.gif b/src/mibew/styles/pages/default/images/dash/locale.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/locale.gif rename to src/mibew/styles/pages/default/images/dash/locale.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/operators.gif b/src/mibew/styles/pages/default/images/dash/operators.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/operators.gif rename to src/mibew/styles/pages/default/images/dash/operators.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/profile.gif b/src/mibew/styles/pages/default/images/dash/profile.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/profile.gif rename to src/mibew/styles/pages/default/images/dash/profile.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/readme.txt b/src/mibew/styles/pages/default/images/dash/readme.txt similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/readme.txt rename to src/mibew/styles/pages/default/images/dash/readme.txt diff --git a/src/mibew/styles/operator_pages/default/images/dash/settings.gif b/src/mibew/styles/pages/default/images/dash/settings.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/settings.gif rename to src/mibew/styles/pages/default/images/dash/settings.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/stat.gif b/src/mibew/styles/pages/default/images/dash/stat.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/stat.gif rename to src/mibew/styles/pages/default/images/dash/stat.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/updates.gif b/src/mibew/styles/pages/default/images/dash/updates.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/updates.gif rename to src/mibew/styles/pages/default/images/dash/updates.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/visitors.gif b/src/mibew/styles/pages/default/images/dash/visitors.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/visitors.gif rename to src/mibew/styles/pages/default/images/dash/visitors.gif diff --git a/src/mibew/styles/operator_pages/default/images/dash/warn.gif b/src/mibew/styles/pages/default/images/dash/warn.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/dash/warn.gif rename to src/mibew/styles/pages/default/images/dash/warn.gif diff --git a/src/mibew/styles/operator_pages/default/images/favicon.ico b/src/mibew/styles/pages/default/images/favicon.ico similarity index 100% rename from src/mibew/styles/operator_pages/default/images/favicon.ico rename to src/mibew/styles/pages/default/images/favicon.ico diff --git a/src/mibew/styles/operator_pages/default/images/footer.gif b/src/mibew/styles/pages/default/images/footer.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/footer.gif rename to src/mibew/styles/pages/default/images/footer.gif diff --git a/src/mibew/styles/operator_pages/default/images/formline.gif b/src/mibew/styles/pages/default/images/formline.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/formline.gif rename to src/mibew/styles/pages/default/images/formline.gif diff --git a/src/mibew/styles/operator_pages/default/images/free.gif b/src/mibew/styles/pages/default/images/free.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/free.gif rename to src/mibew/styles/pages/default/images/free.gif diff --git a/src/mibew/styles/operator_pages/default/images/graydot.gif b/src/mibew/styles/pages/default/images/graydot.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/graydot.gif rename to src/mibew/styles/pages/default/images/graydot.gif diff --git a/src/mibew/styles/operator_pages/default/images/header.gif b/src/mibew/styles/pages/default/images/header.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/header.gif rename to src/mibew/styles/pages/default/images/header.gif diff --git a/src/mibew/styles/operator_pages/default/images/icon_err.gif b/src/mibew/styles/pages/default/images/icon_err.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/icon_err.gif rename to src/mibew/styles/pages/default/images/icon_err.gif diff --git a/src/mibew/styles/operator_pages/default/images/li.gif b/src/mibew/styles/pages/default/images/li.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/li.gif rename to src/mibew/styles/pages/default/images/li.gif diff --git a/src/mibew/styles/operator_pages/default/images/lidiv.gif b/src/mibew/styles/pages/default/images/lidiv.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/lidiv.gif rename to src/mibew/styles/pages/default/images/lidiv.gif diff --git a/src/mibew/styles/operator_pages/default/images/loginbg.gif b/src/mibew/styles/pages/default/images/loginbg.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/loginbg.gif rename to src/mibew/styles/pages/default/images/loginbg.gif diff --git a/src/mibew/styles/operator_pages/default/images/logincrnlb.gif b/src/mibew/styles/pages/default/images/logincrnlb.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/logincrnlb.gif rename to src/mibew/styles/pages/default/images/logincrnlb.gif diff --git a/src/mibew/styles/operator_pages/default/images/logincrnlt.gif b/src/mibew/styles/pages/default/images/logincrnlt.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/logincrnlt.gif rename to src/mibew/styles/pages/default/images/logincrnlt.gif diff --git a/src/mibew/styles/operator_pages/default/images/logincrnrb.gif b/src/mibew/styles/pages/default/images/logincrnrb.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/logincrnrb.gif rename to src/mibew/styles/pages/default/images/logincrnrb.gif diff --git a/src/mibew/styles/operator_pages/default/images/logincrnrt.gif b/src/mibew/styles/pages/default/images/logincrnrt.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/logincrnrt.gif rename to src/mibew/styles/pages/default/images/logincrnrt.gif diff --git a/src/mibew/styles/operator_pages/default/images/logo.png b/src/mibew/styles/pages/default/images/logo.png similarity index 100% rename from src/mibew/styles/operator_pages/default/images/logo.png rename to src/mibew/styles/pages/default/images/logo.png diff --git a/src/mibew/styles/operator_pages/default/images/mibewlogo.gif b/src/mibew/styles/pages/default/images/mibewlogo.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/mibewlogo.gif rename to src/mibew/styles/pages/default/images/mibewlogo.gif diff --git a/src/mibew/styles/operator_pages/default/images/nextpage.gif b/src/mibew/styles/pages/default/images/nextpage.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/nextpage.gif rename to src/mibew/styles/pages/default/images/nextpage.gif diff --git a/src/mibew/styles/operator_pages/default/images/opaway.gif b/src/mibew/styles/pages/default/images/opaway.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/opaway.gif rename to src/mibew/styles/pages/default/images/opaway.gif diff --git a/src/mibew/styles/operator_pages/default/images/oponline.gif b/src/mibew/styles/pages/default/images/oponline.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/oponline.gif rename to src/mibew/styles/pages/default/images/oponline.gif diff --git a/src/mibew/styles/operator_pages/default/images/prevpage.gif b/src/mibew/styles/pages/default/images/prevpage.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/prevpage.gif rename to src/mibew/styles/pages/default/images/prevpage.gif diff --git a/src/mibew/styles/operator_pages/default/images/subitem.gif b/src/mibew/styles/pages/default/images/subitem.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/subitem.gif rename to src/mibew/styles/pages/default/images/subitem.gif diff --git a/src/mibew/styles/operator_pages/default/images/subitem_rtl.gif b/src/mibew/styles/pages/default/images/subitem_rtl.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/subitem_rtl.gif rename to src/mibew/styles/pages/default/images/subitem_rtl.gif diff --git a/src/mibew/styles/operator_pages/default/images/submit.gif b/src/mibew/styles/pages/default/images/submit.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/submit.gif rename to src/mibew/styles/pages/default/images/submit.gif diff --git a/src/mibew/styles/operator_pages/default/images/submitbg.gif b/src/mibew/styles/pages/default/images/submitbg.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/submitbg.gif rename to src/mibew/styles/pages/default/images/submitbg.gif diff --git a/src/mibew/styles/operator_pages/default/images/submitrest.gif b/src/mibew/styles/pages/default/images/submitrest.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/submitrest.gif rename to src/mibew/styles/pages/default/images/submitrest.gif diff --git a/src/mibew/styles/operator_pages/default/images/tablediv3.gif b/src/mibew/styles/pages/default/images/tablediv3.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tablediv3.gif rename to src/mibew/styles/pages/default/images/tablediv3.gif diff --git a/src/mibew/styles/operator_pages/default/images/tbliclogin.gif b/src/mibew/styles/pages/default/images/tbliclogin.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tbliclogin.gif rename to src/mibew/styles/pages/default/images/tbliclogin.gif diff --git a/src/mibew/styles/operator_pages/default/images/tbliclread.gif b/src/mibew/styles/pages/default/images/tbliclread.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tbliclread.gif rename to src/mibew/styles/pages/default/images/tbliclread.gif diff --git a/src/mibew/styles/operator_pages/default/images/tbliclspeak.gif b/src/mibew/styles/pages/default/images/tbliclspeak.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tbliclspeak.gif rename to src/mibew/styles/pages/default/images/tbliclspeak.gif diff --git a/src/mibew/styles/operator_pages/default/images/tblictrack.gif b/src/mibew/styles/pages/default/images/tblictrack.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tblictrack.gif rename to src/mibew/styles/pages/default/images/tblictrack.gif diff --git a/src/mibew/styles/operator_pages/default/images/tblicusers.gif b/src/mibew/styles/pages/default/images/tblicusers.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tblicusers.gif rename to src/mibew/styles/pages/default/images/tblicusers.gif diff --git a/src/mibew/styles/operator_pages/default/images/tblicusers2.gif b/src/mibew/styles/pages/default/images/tblicusers2.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tblicusers2.gif rename to src/mibew/styles/pages/default/images/tblicusers2.gif diff --git a/src/mibew/styles/operator_pages/default/images/tblicusers3.gif b/src/mibew/styles/pages/default/images/tblicusers3.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tblicusers3.gif rename to src/mibew/styles/pages/default/images/tblicusers3.gif diff --git a/src/mibew/styles/operator_pages/default/images/tbllabyel.gif b/src/mibew/styles/pages/default/images/tbllabyel.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/tbllabyel.gif rename to src/mibew/styles/pages/default/images/tbllabyel.gif diff --git a/src/mibew/styles/operator_pages/default/images/topdiv.gif b/src/mibew/styles/pages/default/images/topdiv.gif similarity index 100% rename from src/mibew/styles/operator_pages/default/images/topdiv.gif rename to src/mibew/styles/pages/default/images/topdiv.gif diff --git a/src/mibew/styles/operator_pages/default/screenshots/home.png b/src/mibew/styles/pages/default/screenshots/home.png similarity index 100% rename from src/mibew/styles/operator_pages/default/screenshots/home.png rename to src/mibew/styles/pages/default/screenshots/home.png diff --git a/src/mibew/styles/operator_pages/default/views/.htaccess b/src/mibew/styles/pages/default/views/.htaccess similarity index 100% rename from src/mibew/styles/operator_pages/default/views/.htaccess rename to src/mibew/styles/pages/default/views/.htaccess diff --git a/src/mibew/styles/operator_pages/default/views/agent.php b/src/mibew/styles/pages/default/views/agent.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/agent.php rename to src/mibew/styles/pages/default/views/agent.php diff --git a/src/mibew/styles/operator_pages/default/views/agents.php b/src/mibew/styles/pages/default/views/agents.php similarity index 97% rename from src/mibew/styles/operator_pages/default/views/agents.php rename to src/mibew/styles/pages/default/views/agents.php index 68edee99..ad322a4e 100644 --- a/src/mibew/styles/operator_pages/default/views/agents.php +++ b/src/mibew/styles/pages/default/views/agents.php @@ -63,7 +63,7 @@ require_once(dirname(__FILE__).'/inc_errors.php');
- + "> diff --git a/src/mibew/styles/operator_pages/default/views/avatar.php b/src/mibew/styles/pages/default/views/avatar.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/avatar.php rename to src/mibew/styles/pages/default/views/avatar.php diff --git a/src/mibew/styles/operator_pages/default/views/ban.php b/src/mibew/styles/pages/default/views/ban.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/ban.php rename to src/mibew/styles/pages/default/views/ban.php diff --git a/src/mibew/styles/operator_pages/default/views/blocked_visitors.php b/src/mibew/styles/pages/default/views/blocked_visitors.php similarity index 96% rename from src/mibew/styles/operator_pages/default/views/blocked_visitors.php rename to src/mibew/styles/pages/default/views/blocked_visitors.php index 01e55f15..3717e500 100644 --- a/src/mibew/styles/operator_pages/default/views/blocked_visitors.php +++ b/src/mibew/styles/pages/default/views/blocked_visitors.php @@ -36,7 +36,7 @@ require_once(dirname(__FILE__).'/inc_errors.php'); ?> diff --git a/src/mibew/styles/operator_pages/default/views/canned.php b/src/mibew/styles/pages/default/views/canned.php similarity index 97% rename from src/mibew/styles/operator_pages/default/views/canned.php rename to src/mibew/styles/pages/default/views/canned.php index 7f48ccd8..a2ad0348 100644 --- a/src/mibew/styles/operator_pages/default/views/canned.php +++ b/src/mibew/styles/pages/default/views/canned.php @@ -57,7 +57,7 @@ require_once(dirname(__FILE__).'/inc_errors.php');
- + &group=" target="_blank" onclick="this.newWindow = window.open('/operator/cannededit.php?lang=&group=', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"> diff --git a/src/mibew/styles/operator_pages/default/views/cannededit.php b/src/mibew/styles/pages/default/views/cannededit.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/cannededit.php rename to src/mibew/styles/pages/default/views/cannededit.php diff --git a/src/mibew/styles/operator_pages/default/views/confirm.php b/src/mibew/styles/pages/default/views/confirm.php similarity index 74% rename from src/mibew/styles/operator_pages/default/views/confirm.php rename to src/mibew/styles/pages/default/views/confirm.php index 1786447d..ba311f5e 100644 --- a/src/mibew/styles/operator_pages/default/views/confirm.php +++ b/src/mibew/styles/pages/default/views/confirm.php @@ -29,20 +29,20 @@ function tpl_content() { global $page, $mibewroot;
+ +
- -
+ +
- -

diff --git a/src/mibew/styles/operator_pages/default/views/features.php b/src/mibew/styles/pages/default/views/features.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/features.php rename to src/mibew/styles/pages/default/views/features.php diff --git a/src/mibew/styles/operator_pages/default/views/gen_button.php b/src/mibew/styles/pages/default/views/gen_button.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/gen_button.php rename to src/mibew/styles/pages/default/views/gen_button.php diff --git a/src/mibew/styles/operator_pages/default/views/group.php b/src/mibew/styles/pages/default/views/group.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/group.php rename to src/mibew/styles/pages/default/views/group.php diff --git a/src/mibew/styles/operator_pages/default/views/groupmembers.php b/src/mibew/styles/pages/default/views/groupmembers.php similarity index 100% rename from src/mibew/styles/operator_pages/default/views/groupmembers.php rename to src/mibew/styles/pages/default/views/groupmembers.php diff --git a/src/mibew/styles/operator_pages/default/views/groups.php b/src/mibew/styles/pages/default/views/groups.php similarity index 97% rename from src/mibew/styles/operator_pages/default/views/groups.php rename to src/mibew/styles/pages/default/views/groups.php index 9f19b645..e7cb267d 100644 --- a/src/mibew/styles/operator_pages/default/views/groups.php +++ b/src/mibew/styles/pages/default/views/groups.php @@ -63,7 +63,7 @@ require_once(dirname(__FILE__).'/inc_errors.php');
- + "> diff --git a/src/mibew/styles/operator_pages/default/views/inc_errors.php b/src/mibew/styles/pages/default/views/inc_errors.php similarity index 85% rename from src/mibew/styles/operator_pages/default/views/inc_errors.php rename to src/mibew/styles/pages/default/views/inc_errors.php index c95ac9dd..3391a153 100644 --- a/src/mibew/styles/operator_pages/default/views/inc_errors.php +++ b/src/mibew/styles/pages/default/views/inc_errors.php @@ -17,7 +17,7 @@ if( isset($errors) && count($errors) > 0 ) { ?>
- + dir="rtl"> - + - - - + + style="min-width: 400px;">
" class="l">