Changeset 770

Timestamp:

01/22/2013 03:00:08 AM (4 months ago)

Author:

ofer

Message:

Allow jQueryUI version to be overriden, start of context sensetive help in admin pages

Location:

trunk/WordPress/plugin/transposh

Files:

• js/admin/contexthelp.js (added)
• js/admin/languages.js (modified) (1 diff)
• js/admin/utils.js (modified) (1 diff)
• js/transposh.js (modified) (2 diffs)
• transposh.php (modified) (2 diffs)
• wp/transposh_admin.php (modified) (8 diffs)
• wp/transposh_options.php (modified) (2 diffs)

trunk/WordPress/plugin/transposh/js/admin/languages.js

@@ -1 @@
-/*  Copyright © 2009-2010 Transposh Team (website : http://transposh.org)
+/*  Copyright © 2009-2013 Transposh Team (website : http://transposh.org)
  *
  *      This program is free software; you can redistribute it and/or modify

trunk/WordPress/plugin/transposh/js/admin/utils.js

@@ -1 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-
 (function ($) { // closure
     $(function() {

trunk/WordPress/plugin/transposh/js/transposh.js

@@ -33 +33 @@
     loadingmsn = 0
     ;
-
-    // set base uri for jQueryUI
-    t_jp.jQueryUI = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/';
 
     // This function fixes the page, it gets a token and translation and fixes this,
@@ -348 +345 @@
 
     $(function () {
-            // set a global binglang (if needed)
-            if (t_jp.msn) {
-                t_jp.binglang = t_jp.lang;
-                if (t_jp.binglang === 'zh') {
-                    t_jp.binglang = 'zh-chs';
-                } else if (t_jp.binglang === 'zh-tw') {
-                    t_jp.binglang = 'zh-cht';
-                } else if (t_jp.binglang === 'mw') {
-                    t_jp.binglang = 'mww';
-                }
-            }
-
-            // this is the set_default_language function
-            // attach a function to the set_default_language link if its there
-            $('.' + t_jp_prefix + 'setdeflang').click(function () {
-                $.ajax({
-                    url: t_jp.ajaxurl,
-                    data: {
-                        action: 'tp_cookie'
-                    },
-                    cache: false
-                } );              
-                $('.' + t_jp_prefix + 'setdeflang').hide("slow");
-                return false;
-            });
-
-            // how many phrases are yet untranslated
-            possibly_translateable = $("." + t_jp_prefix + '[data-source=""]').size();
-
-            //now = new Date();
-            // we make sure script sub loaded are cached
-            $.ajaxSetup({
-                cache: true
-            });
-            // was: we'll only auto-translate and load the stuff if we either have more than 5 candidate translations, or more than one at 4am, and this language is supported...
-            // we'll translate if there's any candidate...?
-            if // ((possibly_translateable > 5 || (now.getHours() === 4 && possibly_translateable > 0)) &&
-            (possibly_translateable && !t_jp.noauto && (t_jp.google || t_jp.msn || t_jp.apertium)) {
-                // if we have a progress bar, we need to load the jqueryui before the auto translate, after the google was loaded, otherwise we can just go ahead
-                if (t_jp.progress) {
-                    test_for_jqueryui(function () {
-                        create_progress_bar();
-                        do_auto_translate();
-                    });
-                } else {
+        // set a global binglang (if needed)
+        if (t_jp.msn) {
+            t_jp.binglang = t_jp.lang;
+            if (t_jp.binglang === 'zh') {
+                t_jp.binglang = 'zh-chs';
+            } else if (t_jp.binglang === 'zh-tw') {
+                t_jp.binglang = 'zh-cht';
+            } else if (t_jp.binglang === 'mw') {
+                t_jp.binglang = 'mww';
+            }
+        }
+
+        // this is the set_default_language function
+        // attach a function to the set_default_language link if its there
+        $('.' + t_jp_prefix + 'setdeflang').click(function () {
+            $.ajax({
+                url: t_jp.ajaxurl,
+                data: {
+                    action: 'tp_cookie'
+                },
+                cache: false
+            } );              
+            $('.' + t_jp_prefix + 'setdeflang').hide("slow");
+            return false;
+        });
+
+        // how many phrases are yet untranslated
+        possibly_translateable = $("." + t_jp_prefix + '[data-source=""]').size();
+
+        //now = new Date();
+        // we make sure script sub loaded are cached
+        $.ajaxSetup({
+            cache: true
+        });
+        // was: we'll only auto-translate and load the stuff if we either have more than 5 candidate translations, or more than one at 4am, and this language is supported...
+        // we'll translate if there's any candidate...?
+        if // ((possibly_translateable > 5 || (now.getHours() === 4 && possibly_translateable > 0)) &&
+        (possibly_translateable && !t_jp.noauto && (t_jp.google || t_jp.msn || t_jp.apertium)) {
+            // if we have a progress bar, we need to load the jqueryui before the auto translate, after the google was loaded, otherwise we can just go ahead
+            if (t_jp.progress) {
+                test_for_jqueryui(function () {
+                    create_progress_bar();
                     do_auto_translate();
-                }
-            }
-
-            // this is the part when we have editor support
-            if (t_jp.edit) {
-                $.getScript(t_jp.plugin_url + '/js/transposhedit.js');
-            }
-        });
+                });
+            } else {
+                do_auto_translate();
+            }
+        }
+
+        // this is the part when we have editor support
+        if (t_jp.edit) {
+            $.getScript(t_jp.plugin_url + '/js/transposhedit.js');
+        }
+    });
 }(jQuery)); // end of closure

trunk/WordPress/plugin/transposh/transposh.php

@@ -148 +148 @@
                 tp_logger(preg_replace('|^' . preg_quote(WP_PLUGIN_DIR, '|') . '/|', '', __FILE__), 4); // includes transposh dir and php
 
+            
 // TODO: get_class_methods to replace said mess, other way?
         add_filter('plugin_action_links_' . preg_replace('|^' . preg_quote(WP_PLUGIN_DIR, '|') . '/|', '', __FILE__), array(&$this, 'plugin_action_links'));
@@ -769 +770 @@
         if ($this->options->widget_progressbar || $this->edit_mode) {
             $script_params['theme'] = $this->options->widget_theme;
+            if ($this->options->jqueryui_override) {
+                $script_params['jQueryUI'] = 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->options->jqueryui_override . '/';
+            } else {
+                $script_params['jQueryUI'] = 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/';
+            }
         }
 

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -150 +150 @@
             case "tp_advanced":
                 $this->transposh->options->enable_url_translate = TP_FROM_POST;
+                $this->transposh->options->jqueryui_override = TP_FROM_POST;
                 $this->transposh->options->parser_dont_break_puncts = TP_FROM_POST;
                 $this->transposh->options->parser_dont_break_numbers = TP_FROM_POST;
@@ -260 +261 @@
                 wp_localize_script("transposh_backend", "t_be", $script_params);
         }
+        wp_enqueue_script('transposh_context_help', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/admin/contexthelp.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
         wp_enqueue_style('transposh_admin', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_CSS . '/admin.css'); ///, array('transposh'), TRANSPOSH_PLUGIN_VER, true)
     }
@@ -279 +281 @@
             // retrieve the function output and set it as tab content
             'content' => $this->on_contextual_help()));
+        $screen->add_help_tab(array(
+            'id' => 'keys', // This should be unique for the screen.
+            'title' => __('Engine keys', TRANSPOSH_TEXT_DOMAIN),
+            // retrieve the function output and set it as tab content
+            'content' => __('Will write something about keys...', TRANSPOSH_TEXT_DOMAIN)));
         if ($this->page == 'tp_main') {
             add_screen_option('layout_columns', array('max' => 4, 'default' => 2));
@@ -464 +471 @@
         $this->textinput($this->transposh->options->msn_key_o
                 , array('bingicon.png', __('MSN API key', TRANSPOSH_TEXT_DOMAIN))
-                , __('API Key', TRANSPOSH_TEXT_DOMAIN));
+                , __('API Key', TRANSPOSH_TEXT_DOMAIN), 35, 'keys');
         $this->textinput($this->transposh->options->google_key_o
                 , array('googleicon.png', __('Google API key', TRANSPOSH_TEXT_DOMAIN))
@@ -517 +524 @@
     function tp_advanced() {
         $this->checkbox($this->transposh->options->enable_url_translate_o, __('Enable url translation', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN) . ')', __('Allow translation of permalinks and urls', TRANSPOSH_TEXT_DOMAIN));
-
+        $this->textinput($this->transposh->options->jqueryui_override_o, __('Override jQueryUI version', TRANSPOSH_TEXT_DOMAIN), __('Version', TRANSPOSH_TEXT_DOMAIN));
         $this->section(__('Parser related settings', TRANSPOSH_TEXT_DOMAIN)
                 , __('This is extremely dangerous, will break your current translations, and might cause severe hickups, only proceed if you really know what you are doing.', TRANSPOSH_TEXT_DOMAIN));
@@ -586 +593 @@
 
         $this->sectionstop();
+/*
+        require_once("pomo_upgrader.php");
+
+        $upgrader = new POMO_Upgrader();
+        $upgrader->run(array('package' => 'http://svn.automattic.com/wordpress-i18n/he_IL/tags/3.5/messages/he_IL.mo',
+            'destination' => '/tmp/', //WP_PLUGIN_DIR . '/themes',
+            'clear_destination' => false, //Do not overwrite files.
+            'clear_working' => false));*/
     }
 
@@ -686 +701 @@
     }
 
-    private function header($head) {
+    private function header($head, $help='') {
         if (!isset($head)) return;
+        if ($help) {
+            $help = ' <a class="tp_help" href="#" rel="'.$help.'">[?]</a>';
+        }
         if (is_array($head)) {
-            echo "<h3><img width=\"16\" height=\"16\" src=\"{$this->transposh->transposh_plugin_url}/img/{$head[0]}\"> {$head[1]}</h3>";
+            echo "<h3><img width=\"16\" height=\"16\" src=\"{$this->transposh->transposh_plugin_url}/img/{$head[0]}\"> {$head[1]}$help</h3>";
         } else {
-            echo '<h3>' . $head . '</h3>';
+            echo "<h3> $head $help</h3>";
         }
     }
@@ -724 +742 @@
     }
 
-    private function textinput($tpo, $head, $label, $length = 35) {
-        $this->header($head);
+    private function textinput($tpo, $head, $label, $length = 35, $help='') {
+        $this->header($head, $help);
         echo $label . ': <input type="text" size="' . $length . '" class="regular-text" ' . $tpo->post_value_id_name() . '/>';
     }

trunk/WordPress/plugin/transposh/wp/transposh_options.php

@@ -135 +135 @@
  * @property boolean          $enable_url_translate          Option to enable/disable url translation @since 0.5.3
  * @property transposh_option $enable_url_translate_o
+ * @property string           $jqueryui_override             Option to override the jQueryUI version @since 0.9.1
+ * @property transposh_option $jqueryui_override_o
  * @property boolean          $parser_dont_break_puncts      Option to allow punctuations such as , . ( not to break @since 0.9.0
  * @property transposh_option $parser_dont_break_puncts_o
@@ -244 +246 @@
 
         $this->register_option('enable_url_translate', TP_OPT_BOOLEAN, 0);
+        $this->register_option('jqueryui_override', TP_OPT_STRING);
         $this->register_option('parser_dont_break_puncts', TP_OPT_BOOLEAN, 0);
         $this->register_option('parser_dont_break_numbers', TP_OPT_BOOLEAN, 0);