Changeset 1073916

Timestamp:

01/23/2015 07:35:30 AM (11 years ago)

Author:

chsxf

Message:

[Working Draft] Syncing with qTranslate X 2.9.2

• Improved visual integration
• Added « Disable CSS in head » setting from mqTranslate
• Fixed minor bugs

Location:

mqtranslate/trunk

Files:

• mqtranslate.css (modified) (1 diff)
• mqtranslate.js (modified) (3 diffs)
• mqtranslate_configuration.php (modified) (3 diffs)
• mqtranslate_core.php (modified) (4 diffs)
• mqtranslate_frontend.php (modified) (2 diffs)
• mqtranslate_xhaleera_addons.php (modified) (2 diffs)

mqtranslate/trunk/mqtranslate.css

@@ -6 +6 @@
 .qtrans-lang-switch
 {
-    border: 1px solid  #ccc;
-    background-image: linear-gradient(to top,#e5e5e5,#f4f4f4);
-    padding: 3px 8px;
-    margin-right: 4px;
-    cursor: default;
+    padding: 3px 8px 5px 8px;
+    margin: 6px 4px 0 4px;
     display: inline-block;
-}
-
-.qtrans-lang-switch.active
-{
-    border-color: #888;
-    background-image: none;
-    background-color: #bbb;
-    color: #555;
+    cursor: pointer;
 }
 

mqtranslate/trunk/mqtranslate.js

@@ -660 +660 @@
     }
 
-    var langSwitchWrap=qtrans_ce('ul', {className: 'qtrans-lang-switch-wrap'});
+    var langSwitchWrap=qtrans_ce('ul', {className: 'qtrans-lang-switch-wrap wp-ui-primary'});
     {
         //var header=w.getElementsByTagName('h2')[0];
@@ -689 +689 @@
         }
         if (activeLanguage)
-        {
-            tabSwitches[activeLanguage].classList.remove('active');
-        }
+            tabSwitches[activeLanguage].classList.remove('wp-ui-highlight');
         activeLanguage=tabSwitch.lang;
-        tabSwitch.classList.add('active');
+        tabSwitch.classList.add('wp-ui-highlight');
         for(var i=0; i<onTabSwitch.length; ++i)
         {
@@ -710 +708 @@
         tabSwitches[lang]=tabSwitch;
         if ( activeLanguage == lang )
-            tabSwitch.classList.add('active');
+            tabSwitch.classList.add('wp-ui-highlight');
     }
     this.getActiveLanguage=function()

mqtranslate/trunk/mqtranslate_configuration.php

@@ -284 +284 @@
             break;
         case QT_BOOLEAN:
-            if (isset($_POST[$var])) {
-                if (empty($q_config[$var]) == empty($_POST[$var]))
-                    return false;
-                $q_config[$var] = !empty($_POST[$var]);
+            $val = (isset($_POST[$var]) && !empty($_POST[$var]));
+            if (!empty($q_config[$var]) != $val)
+            {
+                $q_config[$var] = $val;
                 update_option('mqtranslate_'.$var, empty($q_config[$var]) ? '0' : '1');
                 return true;
@@ -350 +350 @@
 
 function qtrans_admin_section_start($section, $nm) {
+    do_action("qtranslate_configuration_before-{$nm}");
     echo '<h3>'.$section.'<span id="qtrans-show-'.$nm.'"> ( <a name="qtranslate_'.$nm.'_settings" href="#" onclick="return qtrans_toggleShowHide(\'qtranslate-admin-'.$nm.'\');">'.__('Show', 'mqtranslate').' / '.__('Hide', 'mqtranslate').'</a> )</span></h3>';
 }
@@ -361 +362 @@
 </script>
 <?php
+    do_action("qtranslate_configuration_after-{$nm}");
 }
 

mqtranslate/trunk/mqtranslate_core.php

@@ -325 +325 @@
     global $q_config;
     $val = get_option('mqtranslate_'.$nm);
-    if($val==='0') $q_config[$nm] = false;
-    elseif($val==='1') $q_config[$nm] = true;
+    $q_config[$nm] = ($val === '1');
 }
 
@@ -347 +346 @@
     $url_mode = get_option('mqtranslate_url_mode');
     $term_name = get_option('mqtranslate_term_name');
+    
     $allowed_custom_post_types = get_option('mqtranslate_allowed_custom_post_types');
-    $disable_header_css = get_option('mqtranslate_disable_header_css');
     $disable_client_cookies = get_option('mqtranslate_disable_client_cookies');
     $use_secure_cookie = get_option('mqtranslate_use_secure_cookie');
@@ -384 +383 @@
     qtrans_load_option_bool('show_displayed_language_prefix');
     qtrans_load_option_bool('auto_update_mo');
-    qtrans_load_option_bool('hide_default_language');   
-    
-    $disable_header_css = qtrans_validateBool($disable_header_css, $q_config['disable_header_css']);
+    qtrans_load_option_bool('hide_default_language');
+
+    qtrans_load_option_bool('disable_header_css');
+    
     $disable_client_cookies = qtrans_validateBool($disable_client_cookies, $q_config['disable_client_cookies']);
     $use_secure_cookie = qtrans_validateBool($use_secure_cookie, $q_config['use_secure_cookie']);
@@ -423 +423 @@
     $q_config['url_mode'] = $url_mode;
     $q_config['term_name'] = $term_name;
+    
     $q_config['allowed_custom_post_types'] = $allowed_custom_post_types;
-    $q_config['disable_header_css'] = $disable_header_css;
     $q_config['disable_client_cookies'] = $disable_client_cookies;
     $q_config['use_secure_cookie'] = $use_secure_cookie;

mqtranslate/trunk/mqtranslate_frontend.php

@@ -5 +5 @@
 {
     global $q_config;
-    echo '<style type="text/css">'.PHP_EOL;
-    foreach($q_config['enabled_languages'] as $lang) 
-        echo '.qtrans_flag_'.$lang.' {background-image: url('.trailingslashit(WP_CONTENT_URL).$q_config['flag_location'].$q_config['flag'][$lang].'); background-repeat: no-repeat;}'.PHP_EOL;
+    
+    if ($q_config['disable_header_css'])
+        return;
+?>
+<style type="text/css">
+/* <![CDATA[ */
+<?php foreach($q_config['enabled_languages'] as $lang) : ?>
+.qtrans_flag_<?= $lang ?> {
+    background-image: url('<?= trailingslashit(WP_CONTENT_URL).$q_config['flag_location'].$q_config['flag'][$lang] ?>');
+    background-repeat: no-repeat;
+}
+<?php 
+    endforeach;
     do_action('qtrans_head_add_css');
-    echo '</style>'.PHP_EOL;
+?>
+/* ]]> */
+</style>
+<?php
 }
 
 function qtrans_head(){
     global $q_config;
+?>
+<?php
     echo "\n<meta http-equiv=\"Content-Language\" content=\"".str_replace('_','-',$q_config['locale'][$q_config['language']])."\" />\n";
     qtrans_add_lang_icons_css();
@@ -105 +120 @@
 add_filter( 'wp_get_nav_menu_items',  'qtrans_get_nav_menu_items', 0, 3 );
 
-function qtrans_add_lang_icons ()
-{
-    global $q_config;
-    echo "<style>\n";
-    foreach($q_config['enabled_languages'] as $lang) 
-    {
-        echo '.qtrans-flag-'.$lang.' {background-image: url('.trailingslashit(WP_CONTENT_URL).$q_config['flag_location'].$q_config['flag'][$lang]."); background-repeat: no-repeat;}\n";
-    }
-    echo "</style>\n";
-}
-add_filter('wp_head', 'qtrans_add_lang_icons');
-
 function qtrans_get_attachment_image_attributes($attr, $attachment, $size)
 {

mqtranslate/trunk/mqtranslate_xhaleera_addons.php

@@ -240 +240 @@
     global $q_config;
 ?>
-    <?php qtrans_admin_section_start(__('mqTranslate Team Settings', 'mqtranslate'), 'team'); ?>
+    <?php qtrans_admin_section_start(__('Team Settings', 'mqtranslate'), 'team'); ?>
     <table class="form-table" id="qtranslate-admin-team" style="display: none">
             <tr>
@@ -276 +276 @@
 add_action('post_updated',                  'mqtrans_postUpdated', 10, 3);
 
-add_action('qtranslate_configuration',      'mqtrans_team_options', 9);
+add_action('qtranslate_configuration_after-general',        'mqtrans_team_options', 9);
 add_action('qtranslate_loadConfig',         'mqtrans_load_team_options');
 add_action('qtranslate_saveConfig',         'mqtrans_save_team_options');