Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

 interface/web/themes/default/templates/main.tpl.htm

@@ -10,19 +10,23 @@
        <!--[if IE 9]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
        <!--[if lte IE 8]><script type="text/javascript" src="themes/default/js/html5shiv.js"></script><![endif]-->
        <!--[if lte IE 7]><link href="themes/default/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
        <link href="themes/default/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css" />
        <link href="themes/default/css/jquery-ui-1.11.1.min.css" rel="stylesheet" type="text/css" />
        <link href="themes/default/css/jquery-ui-1.11.1.structure.min.css" rel="stylesheet" type="text/css" />
        <link href="themes/default/css/jquery-ui-1.11.1.theme.min.css" rel="stylesheet" type="text/css" />
        <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
        <script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
        <script type="text/javascript" src="js/jquery-ui-1.11.1.custom.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
        <script type="text/javascript" src="js/jquery.combobox.js"></script>
        <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <tmpl_loop name="js_d_includes">
            <script type="text/javascript" src="js/js.d/<tmpl_var name='file'>"></script>
        </tmpl_loop>
        <script language="JavaScript" type="text/javascript">
            jQuery(document).ready(function() {
            $(document).ready(function() {
                loadInitContent();
            
            $('form').not('#dummy_login_form').attr('autocomplete','off');
@@ -34,11 +38,7 @@
                    }
                });
                
                jQuery('.subsectiontoggle').live("click", function(){
                    jQuery(this).children().toggleClass('showing').end().next().slideToggle();
                });
                
                jQuery('#globalsearch').ispconfigSearch({
                $('#globalsearch').ispconfigSearch({
                    dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
                    resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
                    noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
@@ -46,7 +46,7 @@
                    searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
                });
                
                jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
                $('.ttip').tipsy({live: true, gravity: 'ne', html: true});
                
                tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled>';
                tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled>';
@@ -54,81 +54,84 @@
                tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
            
            // Store password in browser; works in Firefox, but not Chrome
            $('#username').live("blur", function(){
               if($('#username').val() == '') {
                  return true;
               }
               if($('#dummy_username').val() == '' || $('#dummy_username').val() != $(this).val()){
                  $('#dummy_login').show();
                  $('#dummy_username').attr('value', $(this).val()).trigger('focus').trigger('blur');
                  $('#dummy_login').hide();
               }
               if($('#dummy_username').val() == $(this).val() && $(this).val() != ''){
                  $('#passwort').val($('#dummy_passwort').val());
               } else {
            $(document).on('keyup', '#username', function() {
               $('#username').on("blur", function(){
                  if($('#username').val() == '') {
                     return true;
                  }
                  if($('#dummy_username').val() == '' || $('#dummy_username').val() != $(this).val()){
                     $('#dummy_login').show();
                     $('#dummy_username').attr('value', $(this).val()).trigger('focus').trigger('blur');
                     $('#dummy_login').hide();
                  }
                  if($('#dummy_username').val() == $(this).val() && $(this).val() != ''){
                     $('#passwort').val($('#dummy_passwort').val());
                  } else {
                     $('#passwort').val('');
                  }
                  $('#passwort').focus();
               });
					
               $('#username').on("keyup", function(){
                  $('#dummy_username').val('');
                  $('#dummy_passwort').val('');
                  $('#passwort').val('');
               }
               $('#passwort').focus();
               });
            });
				
            $('#username').live("keyup", function(){
               $('#dummy_username').val('');
               $('#dummy_passwort').val('');
               $('#passwort').val('');
            });

               $(document).on("change", function(event) {
                   var elName = event.target.localName;
                   if ($(".panel #Filter").length > 0 && elName == 'select') {
                       event.preventDefault();
                       $(".panel #Filter").trigger('click');
                   }
                   if(elName == 'select' || elName == 'input' || elName == 'textarea') {
                       if($(event.target).hasClass('no-page-form-change') == false) {
                           // set marker that something was changed
                           pageFormChanged = true;
                       }
                   }
               });

            
            });
            
            
            jQuery(document).bind("change", function(event) {
                var elName = event.target.localName;
                if (jQuery(".panel #Filter").length > 0 && elName == 'select') {
            $(document).bind("keypress", function(event) {
                //Use $ submit with keypress Enter in panel filterbar
                if (event.which == '13' && $(".panel #Filter").length > 0 && $(event.target).hasClass('ui-autocomplete-input') == false ) {
                    event.preventDefault();
                    jQuery(".panel #Filter").trigger('click');
                    $(".panel #Filter").trigger('click');
                }
                if(elName == 'select' || elName == 'input' || elName == 'textarea') {
                    if(jQuery(event.target).hasClass('no-page-form-change') == false) {
                        // set marker that something was changed
                        pageFormChanged = true;
                    }
                //Use $ submit with keypress Enter in forms
                if (event.which == '13' && $(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && $(event.target).is(':input')) {
                    event.preventDefault();
                    $(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
                }
            });
            
            jQuery(document).bind("keypress", function(event) {
                //Use jQuery submit with keypress Enter in panel filterbar
                if (event.which == '13' && jQuery(".panel #Filter").length > 0 && jQuery(event.target).hasClass('ui-autocomplete-input') == false ) {
                    event.preventDefault();
                    jQuery(".panel #Filter").trigger('click');
                }
                //Use jQuery submit with keypress Enter in forms
                if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && jQuery(event.target).is(':input')) {
                    event.preventDefault();
                    jQuery(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
                }
            });
            
            jQuery(document).delegate('.pnl_listarea th', 'click', function(event) {
                if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0 && jQuery(this).hasClass('tbl_col_buttons') == false && jQuery(this).hasClass('tbl_col_limit') == false && jQuery(this).hasClass('tbl_col_nosort') == false) {
            $(document).delegate('.pnl_listarea th', 'click', function(event) {
                if($(this).attr('class').length > 0 && $(".panel #Filter").length > 0 && $(this).hasClass('tbl_col_buttons') == false && $(this).hasClass('tbl_col_limit') == false && $(this).hasClass('tbl_col_nosort') == false) {
                  event.preventDefault();
                  var clickevent = jQuery('#Filter').attr('onclick');
                  var element = jQuery(this).attr('class');
                  var clickevent = $('#Filter').attr('onclick');
                  var element = $(this).attr('class');
                  if(typeof clickevent == 'string') {
                      jQuery('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
                      $('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
                  }
                  jQuery(".panel #Filter").trigger('click');
                  $(".panel #Filter").trigger('click');
                  
                  jQuery("#pageForm").ajaxComplete(function() {
                      if(jQuery("th."+element).css("background-position") == '0px -15px') {
                        if(jQuery("th."+element).css("text-align") == "right") {
                          jQuery("th."+element).css("text-align","left");
                  $("#pageForm").ajaxComplete(function() {
                      if($("th."+element).css("background-position") == '0px -15px') {
                        if($("th."+element).css("text-align") == "right") {
                          $("th."+element).css("text-align","left");
                        } else {
                          jQuery("th."+element).css("text-align","right");
                          $("th."+element).css("text-align","right");
                        }
                      } else {
                        jQuery(".pnl_listarea th").css("text-align","");
                        $(".pnl_listarea th").css("text-align","");
                      }
                      jQuery(".pnl_listarea th").css("background-position","0 0");
                      jQuery("th."+element).css("background-position","0 -15px");
                      $(".pnl_listarea th").css("background-position","0 0");
                      $("th."+element).css("background-position","0 -15px");
                  });
                }
            });