- scrigo.js.php: implemented combobox/load indicator check in PHP instead o...

ftimme

2012-11-30 63dc346628968a716df6d0e0a3ab41544d604a4c

- scrigo.js.php: implemented combobox/load indicator check in PHP instead of JavaScript.

 interface/web/admin/lib/lang/de_system_config.lng

@@ -43,4 +43,5 @@
$wb['smtp_crypt_txt'] = 'SSL/TLS verschlüsselte Verbindung für SMTP';
$wb['use_combobox_txt'] = 'jQuery UI Combobox benutzen';
$wb['use_loadindicator_txt'] = 'Laden-Grafik anzeigen';
$wb['f5_to_reload_js_txt'] = 'Wenn Sie den Wert ändern, müssen Sie F5 drücken, damit der Browser die JavaScript-Libraries neu lädt, oder Ihren Browser-Cache leeren.';
?>

 interface/web/admin/lib/lang/en_system_config.lng

@@ -44,4 +44,5 @@
$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
$wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
$wb['use_loadindicator_txt'] = 'Use Load Indicator';
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
?>

 interface/web/admin/templates/system_config_misc_edit.htm

@@ -36,13 +36,13 @@
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='use_loadindicator_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='use_loadindicator'}
                    {tmpl_var name='use_loadindicator'}<br/>{tmpl_var name='f5_to_reload_js_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='use_combobox_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='use_combobox'}
                    {tmpl_var name='use_combobox'}<br/>{tmpl_var name='f5_to_reload_js_txt'}
                </div>
            </div>
            <div class="ctrlHolder">

 interface/web/js/scrigo.js.php

@@ -1,8 +1,12 @@
<?php
    session_start();
    include('../../lib/config.inc.php');
    require_once('../../lib/app.inc.php');
    $lang = (isset($_SESSION['s']['language']) && $_SESSION['s']['language'] != '')?$_SESSION['s']['language']:'en';
    include_once(ISPC_ROOT_PATH.'/web/strengthmeter/lib/lang/'.$lang.'_strengthmeter.lng');
	
    $app->uses('ini_parser,getconf');
    $server_config_array = $app->getconf->get_global_config();
?>
var pageFormChanged = false;
var tabChangeWarningTxt = '';
@@ -24,8 +28,9 @@
}

function showLoadIndicator() {
    jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {type : "get_use_loadindicator"}, function(data) {
        if(data.useloadindicator == "y"){
<?php
if($server_config_array['misc']['use_loadindicator'] == 'y'){
?>
            requestsRunning += 1;
    
            if(requestsRunning < 2) {
@@ -46,8 +51,9 @@
                    if(requestsRunning < 1) $(this).fadeOut('fast', function() { $(this).hide();});
                });
            }
<?php
        }
    });
?>
}

function hideLoadIndicator() {
@@ -59,11 +65,13 @@
}

function onAfterContentLoad() {
    jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {type : "get_use_combobox"}, function(data) {
        if(data.usecombobox == "y"){
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
            $('#pageContent').find("select").combobox();
<?php
        }
    });
?>
}

function loadContentRefresh(pagename) {