Changeset 674 for trunk

Timestamp:

11/26/2011 09:27:16 PM (6 months ago)

Author:

ofer

Message:

Support multiple instances of transposh widget, even a few with different appearnce on same page, and title is editable too! Widgets also no longer post to the site to change language but use javascript direct href manipulation to acheive same goal, code has been significantly simplified all in all.

Location:

trunk/WordPress/plugin/transposh

Files:

• core/constants.php (modified) (3 diffs)
• js/transposh.js (modified) (2 diffs)
• transposh.php (modified) (1 diff)
• widgets/default/tpw_default.php (modified) (1 diff)
• widgets/dropdown/tpw_image_dropdown.js (modified) (1 diff)
• widgets/dropdown/tpw_image_dropdown.php (modified) (1 diff)
• widgets/flags/tpw_flags.php (modified) (1 diff)
• widgets/flags/tpw_flags_css.php (modified) (1 diff)
• widgets/flagslist/tpw_list_with_flags.php (modified) (1 diff)
• widgets/flagslist/tpw_list_with_flags_css.php (modified) (1 diff)
• wp/transposh_admin.php (modified) (14 diffs)
• wp/transposh_options.php (modified) (6 diffs)
• wp/transposh_widget.php (modified) (10 diffs)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -21 +21 @@
 define('TP_ENABLE_CACHE', TRUE);
 //What is the cache items TTL
-define('TP_CACHE_TTL', 3600*24);
+define('TP_CACHE_TTL', 3600 * 24);
 //Constants for memcached
 define('TP_MEMCACHED_SRV', '127.0.0.1');
@@ -128 +128 @@
     // a bit tricky, but we'll see - starting with just esperanto
     public static $apertium_languages = array('eo');
-
     // Array for holding po domains we have problems with
     public static $ignored_po_domains = array('MailPress');
+    // Array holding list of jQueryUI themes
+    public static $jqueryui_themes = array('base', 'black-tie', 'blitzer', 'cupertino', 'dark-hive', 'dot-luv', 'eggplant', 'excite-bike', 'flick',
+        'hot-sneaks', 'humanity', 'le-frog', 'mint-choc', 'overcast', 'pepper-grinder', 'redmond', 'smoothness', 'south-street',
+        'start', 'sunny', 'swanky-purse', 'trontastic', 'ui-darkness', 'ui-lightness', 'vader');
 
 }
@@ -140 +143 @@
 define('TRANSPOSH_PLUGIN_VER', '%VERSION%');
 
+//Current jQuery UI
 define('JQUERYUI_VER', '1.8.16');
 

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

@@ -358 +358 @@
             // 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 () {
+            $('.' + t_jp_prefix + 'setdeflang').click(function () {
                 $.ajax({
                     url: t_jp.ajaxurl,
@@ -366 +366 @@
                     cache: false
                 } );              
-                $(this).hide("slow");
+                $('.' + t_jp_prefix + 'setdeflang').hide("slow");
                 return false;
             });

trunk/WordPress/plugin/transposh/transposh.php

@@ -768 +768 @@
     function add_rel_alternate() {
         if (is_404()) return;
-        $widget_args = $this->widget->create_widget_args(true, $this->get_clean_url());
+        $widget_args = $this->widget->create_widget_args($this->get_clean_url());
         logger($widget_args, 4);
         foreach ($widget_args as $lang) {

trunk/WordPress/plugin/transposh/widgets/default/tpw_default.php

@@ -34 +34 @@
  * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
  */
-function tp_widget_do($args) {
-    echo '<span class="' . NO_TRANSLATE_CLASS . '">'; // wrapping in no_translate to avoid translation of this list
-    echo '<select name="lang" id="lang" onchange="Javascript:this.form.submit();">'; // this is a select box which posts on change
-    echo '<option value="none">[Language]</option>';
-    foreach ($args as $langrecord) {
-        $is_selected = $langrecord['active'] ? " selected=\"selected\"" : "";
-        echo "<option value=\"{$langrecord['isocode']}\"{$is_selected}>{$langrecord['langorig']}</option>";
+class tpw_default extends transposh_base_widget {
+
+    static function tp_widget_do($args) {
+        echo '<span class="' . NO_TRANSLATE_CLASS . '">'; // wrapping in no_translate to avoid translation of this list
+
+        echo '<select name="lang" id="lang" onchange="document.location.href=this.options[this.selectedIndex].value;">'; // this is a select box which posts on change
+        echo '<option value="none">[Language]</option>';
+        foreach ($args as $langrecord) {
+            $is_selected = $langrecord['active'] ? " selected=\"selected\"" : "";
+            echo "<option value=\"{$langrecord['url']}\"{$is_selected}>{$langrecord['langorig']}</option>";
+        }
+        echo "</select><br/>";
+
+        echo "</span>";
     }
-    echo "</select><br/>";
-    echo "</span>";
+
 }
+
 ?>

trunk/WordPress/plugin/transposh/widgets/dropdown/tpw_image_dropdown.js

@@ -4 +4 @@
 
     $(document).ready(function() {
-        $(".dropdown dt a").click(function() {
-            $(".dropdown dd ul").toggle();
-        });
+        $(".dropdown dt a").click(function() {
+            $(".dropdown dd ul").toggle();
+            return false;
+        });
 
-        $(".dropdown dd ul li a").click(function() {
-            var text = $(this).html();
-            $(".dropdown dt a span").html(text);
-            $(".dropdown dd ul").hide();
-            //$()
-            $("form #lang").val( getSelectedValue("tp_dropdown"));
-            $("#tp_form").submit();
-        });
+        $(".dropdown dd ul li a").click(function() {
+            var text = $(this).html();
+            $(".dropdown dt a span").html(text);
+            $(".dropdown dd ul").hide();
 
-        function getSelectedValue(id) {
-            return $("#" + id).find("dt a span.value").html();
-        }
+            document.location.href=getSelectedValue("tp_dropdown");
+            return false;
+        });
 
-        $(document).bind('click', function(e) {
-            var $clicked = $(e.target);
-            if (! $clicked.parents().hasClass("dropdown"))
-                $(".dropdown dd ul").hide();
-        });
+        function getSelectedValue(id) {
+            return $("#" + id).find("dt a span.value").html();
+        }
+
+        $(document).bind('click', function(e) {
+            var $clicked = $(e.target);
+            if (! $clicked.parents().hasClass("dropdown"))
+                $(".dropdown dd ul").hide();
+        });
     });
 }(jQuery)); // end of closure

trunk/WordPress/plugin/transposh/widgets/dropdown/tpw_image_dropdown.php

@@ -22 +22 @@
  */
 
-/**
- * This function makes sure that the jquery dependency will be met
- * @global transposh_plugin $my_transposh_plugin
- */
-function tp_widget_js() {
-    global $my_transposh_plugin;
-    wp_enqueue_script("transposh_widget", "{$my_transposh_plugin->transposh_plugin_url}/widgets/{$my_transposh_plugin->widget->base_widget_file_name}.js", array('jquery'), TRANSPOSH_PLUGIN_VER);
+class tpw_image_dropdown extends transposh_base_widget {
+
+    /**
+     * This function makes sure that the jquery dependency will be met
+     * @global transposh_plugin $my_transposh_plugin
+     */
+    static function tp_widget_js($file, $dir, $url) {
+        wp_enqueue_script("transposh_widget", "$url/widgets/dropdown/tpw_image_dropdown.js", array('jquery'), TRANSPOSH_PLUGIN_VER);
+    }
+
+    /**
+     * This function does the actual HTML for the widget
+     * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
+     */
+    static function tp_widget_do($args) {
+        global $my_transposh_plugin;
+        // we calculate the plugin path part, so we can link the images there
+        $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
+
+        // we use this hidden field to later post the value
+        echo '<input type="hidden" name="lang" id="lang" value=""/>';
+
+        echo '<dl id="tp_dropdown" class="dropdown">';
+        echo '<dt><a href="#"><span>' . __('Select language') . '</span></a></dt><dd><ul class="' . NO_TRANSLATE_CLASS . '">';
+        foreach ($args as $langrecord) {
+            $is_selected = $langrecord['active'] ? " selected=\"selected\"" : "";
+            echo '<li><a href="#"><img class="flag" src="' . "$plugpath/img/flags/{$langrecord['flag']}" . '.png" alt="' . $langrecord['langorig'] . '"/> ' . $langrecord['langorig'] . '<span class="value">' . $langrecord['url'] . '</span></a></li>';
+        }
+
+        echo '</ul></dd></dl>';
+    }
+
 }
 
-/**
- * This function does the actual HTML for the widget
- * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
- */
-function tp_widget_do($args) {
-    global $my_transposh_plugin;
-    // we calculate the plugin path part, so we can link the images there
-    $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
-
-    // we use this hidden field to later post the value
-    echo '<input type="hidden" name="lang" id="lang" value=""/>';
-
-    echo '<span class="' . NO_TRANSLATE_CLASS . '">';
-    echo '<dl id="tp_dropdown" class="dropdown">';
-    echo '<dt><a href="#"><span>Select language</span></a></dt><dd><ul>';
-
-    foreach ($args as $langrecord) {
-        $is_selected = $langrecord['active'] ? " selected=\"selected\"" : "";
-        echo '<li><a href="#"><img class="flag" src="' . "$plugpath/img/flags/{$langrecord['flag']}" . '.png" alt="' . $langrecord['langorig'] . '"/> ' . $langrecord['langorig'] . '<span class="value">' . $langrecord['isocode'] . '</span></a></li>';
-    }
-
-    echo '</ul></dd></dl>';
-    echo '</span>';
-}
 ?>

trunk/WordPress/plugin/transposh/widgets/flags/tpw_flags.php

@@ -26 +26 @@
  * @return boolean
  */
-function tp_widget_needs_post_url() {
-    return true;
+class tpw_flags extends transposh_base_widget {
+
+    static function tp_widget_needs_post_url() {
+        return true;
+    }
+
+    /**
+     * Creates the list of flags
+     * @global transposh_plugin $my_transposh_plugin
+     * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
+     */
+    static function tp_widget_do($args) {
+        global $my_transposh_plugin;
+        // we calculate the plugin path part, so we can link the images there
+        $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
+
+        echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
+        foreach ($args as $langrecord) {
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
+            transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) .
+            "</a>";
+        }
+        echo "</div>";
+    }
+
 }
 
-/**
- * Creates the list of flags
- * @global transposh_plugin $my_transposh_plugin
- * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
- */
-function tp_widget_do($args) {
-    global $my_transposh_plugin;
-    // we calculate the plugin path part, so we can link the images there
-    $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
-
-    echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
-    foreach ($args as $langrecord) {
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) .
-        "</a>";
-    }
-    echo "</div>";
-}
 ?>

trunk/WordPress/plugin/transposh/widgets/flags/tpw_flags_css.php

@@ -22 +22 @@
  */
 
-/**
- * This function allows the widget to tell the invoker if it needs to calculate different urls per language, here it is needed
- * @return boolean
- */
-function tp_widget_needs_post_url() {
-    return true;
+class tpw_flags_css extends transposh_base_widget {
+
+    /**
+     * Creates the list of flags (with css)
+     * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
+     */
+    static function tp_widget_do($args) {
+        echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
+        foreach ($args as $langrecord) {
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
+            transposh_utils::display_flag("", $langrecord['flag'], $langrecord['langorig'], true) .
+            "</a>";
+        }
+        echo "</div>";
+    }
+
 }
 
-/**
- * Creates the list of flags (with css)
- * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
- */
-function tp_widget_do($args) {
-    echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
-    foreach ($args as $langrecord) {
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        transposh_utils::display_flag("", $langrecord['flag'], $langrecord['langorig'], true) .
-        "</a>";
-    }
-    echo "</div>";
-}
 ?>

trunk/WordPress/plugin/transposh/widgets/flagslist/tpw_list_with_flags.php

@@ -22 +22 @@
  */
 
-/**
- * This function allows the widget to tell the invoker if it needs to calculate different urls per language
- * @return boolean
- */
-function tp_widget_needs_post_url() {
-    return true;
+class tpw_list_with_flags extends transposh_base_widget {
+
+    /**
+     * Instructs usage of a different .css file
+     * @global transposh_plugin $my_transposh_plugin
+     */
+    static function tp_widget_css($file, $dir, $url) {
+        wp_enqueue_style("flags/tpw_flags", "$url/widgets/flags/tpw_flags.css", array(), TRANSPOSH_PLUGIN_VER);
+    }
+
+    /**
+     * Creates the list of flags - followed by a language name link
+     * @global transposh_plugin $my_transposh_plugin
+     * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
+     */
+    static function tp_widget_do($args) {
+        global $my_transposh_plugin;
+        // we calculate the plugin path part, so we can link the images there
+        $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
+
+        echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
+        foreach ($args as $langrecord) {
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
+            transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) . "</a>";
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
+        }
+        echo "</div>";
+    }
+
 }
 
-/**
- * Instructs usage of a different .css file
- * @global transposh_plugin $my_transposh_plugin
- */
-function tp_widget_css() {
-    global $my_transposh_plugin;
-    wp_enqueue_style("transposh_widget", "{$my_transposh_plugin->transposh_plugin_url}/widgets/flags/tpw_flags.css", array(), TRANSPOSH_PLUGIN_VER);
-}
-
-/**
- * Creates the list of flags - followed by a language name link
- * @global transposh_plugin $my_transposh_plugin
- * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
- */
-function tp_widget_do($args) {
-    global $my_transposh_plugin;
-    // we calculate the plugin path part, so we can link the images there
-    $plugpath = parse_url($my_transposh_plugin->transposh_plugin_url, PHP_URL_PATH);
-
-    echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
-    foreach ($args as $langrecord) {
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        transposh_utils::display_flag("$plugpath/img/flags", $langrecord['flag'], $langrecord['langorig'], false) . "</a>";
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
-    }
-    echo "</div>";
-}
 ?>

trunk/WordPress/plugin/transposh/widgets/flagslist/tpw_list_with_flags_css.php

@@ -22 +22 @@
  */
 
-/**
- * This function allows the widget to tell the invoker if it needs to calculate different urls per language
- * @return boolean
- */
-function tp_widget_needs_post_url() {
-    return true;
+class tpw_list_with_flags_css extends transposh_base_widget {
+
+    /**
+     * Instructs usage of a different .css file
+     * @global transposh_plugin $my_transposh_plugin
+     */
+    static function tp_widget_css($file, $dir, $url) {
+        wp_enqueue_style("flags/tpw_flags_css", "$url/widgets/flags/tpw_flags_css.css", array(), TRANSPOSH_PLUGIN_VER);
+    }
+
+    /**
+     * Creates the list of flags (using css sprites) - followed by a language name link
+     * @global transposh_plugin $my_transposh_plugin
+     * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
+     */
+    static function tp_widget_do($args) {
+        echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
+        foreach ($args as $langrecord) {
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
+            transposh_utils::display_flag('', $langrecord['flag'], $langrecord['langorig'], true) . '</a>';
+            echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
+        }
+        echo "</div>";
+    }
+
 }
 
-/**
- * Instructs usage of a different .css file
- * @global transposh_plugin $my_transposh_plugin
- */
-function tp_widget_css() {
-    global $my_transposh_plugin;
-    wp_enqueue_style("transposh_widget", "{$my_transposh_plugin->transposh_plugin_url}/widgets/flags/tpw_flags_css.css", array(), TRANSPOSH_PLUGIN_VER);
-}
-
-/**
- * Creates the list of flags (using css sprites) - followed by a language name link
- * @global transposh_plugin $my_transposh_plugin
- * @param array $args - http://trac.transposh.org/wiki/WidgetWritingGuide#functiontp_widgets_doargs
- */
-function tp_widget_do($args) {
-    echo "<div class=\"" . NO_TRANSLATE_CLASS . " transposh_flags\" >";
-    foreach ($args as $langrecord) {
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' .
-        transposh_utils::display_flag('', $langrecord['flag'], $langrecord['langorig'], true) . '</a>';
-        echo "<a href=\"{$langrecord['url']}\"" . ($langrecord['active'] ? ' class="tr_active"' : '' ) . '>' . "{$langrecord['langorig']}</a><br/>";
-    }
-    echo "</div>";
-}
 ?>

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

@@ -130 +130 @@
         $this->transposh->options->set_google_key($_POST[GOOGLE_TRANSLATE_KEY]);
         $this->transposh->options->set_transposh_key($_POST[TRANSPOSH_KEY]);
+        // frontend stuff
+        $this->transposh->options->set_widget_progressbar($_POST[WIDGET_PROGRESSBAR]);
+        $this->transposh->options->set_widget_allow_set_default_language($_POST[WIDGET_ALLOW_SET_DEFLANG]);
+        $this->transposh->options->set_widget_remove_logo($_POST[WIDGET_REMOVE_LOGO_FOR_AD]);
+        $this->transposh->options->set_widget_theme($_POST[WIDGET_THEME]);
 
         // handle change of schedule for backup to daily
@@ -196 +201 @@
         //add several metaboxes now, all metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
         add_meta_box('transposh-sidebox-about', __('About this plugin', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_sidebox_about_content'), $this->pagehook, 'side', 'core');
-        add_meta_box('transposh-sidebox-widget', __('Widget settings', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_sidebox_widget_content'), $this->pagehook, 'side', 'core');
         add_meta_box('transposh-sidebox-news', __('Plugin news', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_sidebox_news_content'), $this->pagehook, 'side', 'core');
         add_meta_box('transposh-sidebox-stats', __('Plugin stats', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_sidebox_stats_content'), $this->pagehook, 'side', 'core');
@@ -203 +207 @@
         add_meta_box('transposh-contentbox-translation', __('Translation settings', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_contentbox_translation_content'), $this->pagehook, 'normal', 'core');
         add_meta_box('transposh-contentbox-autotranslation', __('Automatic translation settings', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_contentbox_auto_translation_content'), $this->pagehook, 'normal', 'core');
+        add_meta_box('transposh-contentbox-frontend', __('Frontend settings', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_contentbox_frontend_content'), $this->pagehook, 'normal', 'core');
         add_meta_box('transposh-contentbox-general', __('Generic settings', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_contentbox_generic_content'), $this->pagehook, 'normal', 'core');
         add_meta_box('transposh-contentbox-database', __('Database maintenance', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_contentbox_database_content'), $this->pagehook, 'normal', 'core');
@@ -302 +307 @@
         // donate with PayPal
         echo '</ul>';
-    }
-
-    function on_sidebox_widget_content($data) {
-        $this->transposh->widget->transposh_widget_control();
     }
 
@@ -423 +424 @@
     }
 
+    private function checkbox($id, $value, $head, $text) {
+        echo '<h4>' . $head . '</h4>';
+        echo '<input type="checkbox" value="1" name="' . $id . '" ' . $this->checked($value) . '/> ' . $text;
+    }
+
     function on_contentbox_translation_content($data) {
         /*
@@ -440 +446 @@
          * Disabled by default.
          */
-        echo '<h4>' . __('Enable default language translation', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_DEFAULT_TRANSLATE . '" ' . $this->checked($this->transposh->options->get_enable_default_translate()) . '/> ' .
-        __('Allow translation of default language - useful for sites with more than one major language', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_DEFAULT_TRANSLATE, $this->transposh->options->get_enable_default_translate(), __('Enable default language translation', TRANSPOSH_TEXT_DOMAIN), __('Allow translation of default language - useful for sites with more than one major language', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -449 +453 @@
          * @since 0.3.6
          */
-        echo '<h4>' . __('Enable search in translated languages', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_SEARCH_TRANSLATE . '" ' . $this->checked($this->transposh->options->get_enable_search_translate()) . '/> ' .
-        __('Allow search of translated languages (and the original language)', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_SEARCH_TRANSLATE, $this->transposh->options->get_enable_search_translate(), __('Enable search in translated languages', TRANSPOSH_TEXT_DOMAIN), __('Allow search of translated languages (and the original language)', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -458 +460 @@
          * @since 0.5.3
          */
-        echo '<h4>' . __('Enable url translation', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN) . ')</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_URL_TRANSLATE . '" ' . $this->checked($this->transposh->options->get_enable_url_translate()) . '/> ' .
-        __('Allow translation of permalinks and urls', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_URL_TRANSLATE, $this->transposh->options->get_enable_url_translate(), __('Enable url translation', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN), __('Allow translation of permalinks and urls', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -467 +467 @@
          * @since 0.6.4
          */
-        echo '<h4>' . __('Enable gettext integration', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN) . ')</h4>';
-        echo '<input type="checkbox" value="1" name="' . TRANSPOSH_GETTEXT_INTEGRATION . '" ' . $this->checked($this->transposh->options->get_transposh_gettext_integration()) . '/> ' .
-        __('Enable integration of Transposh with existing gettext interface (.po/.mo files)', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(TRANSPOSH_GETTEXT_INTEGRATION, $this->transposh->options->get_transposh_gettext_integration(), __('Enable gettext integration', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN), __('Enable integration of Transposh with existing gettext interface (.po/.mo files)', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -476 +474 @@
          * @since 0.7.5
          */
-        echo '<h4>' . __('Enable override for default locale', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . TRANSPOSH_DEFAULT_LOCALE_OVERRIDE . '" ' . $this->checked($this->transposh->options->get_transposh_default_locale_override()) . '/> ' .
-        __('Enable overriding the default locale that is set in WP_LANG on default languages pages (such as untranslated pages and admin pages)', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(TRANSPOSH_DEFAULT_LOCALE_OVERRIDE, $this->transposh->options->get_transposh_default_locale_override(), __('Enable override for default locale', TRANSPOSH_TEXT_DOMAIN), __('Enable overriding the default locale that is set in WP_LANG on default languages pages (such as untranslated pages and admin pages)', TRANSPOSH_TEXT_DOMAIN));
     }
 
@@ -487 +483 @@
          * Enabled by default.
          */
-        echo '<h4>' . __('Enable automatic translation', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_AUTO_TRANSLATE . '" ' . $this->checked($this->transposh->options->get_enable_auto_translate()) . '/> ' .
-        __('Allow automatic translation of pages', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_AUTO_TRANSLATE, $this->transposh->options->get_enable_auto_translate(), __('Enable automatic translation', TRANSPOSH_TEXT_DOMAIN), __('Allow automatic translation of pages', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -495 +489 @@
          * Disabled by default.
          *  @since 0.3.5 */
-        echo '<h4>' . __('Enable automatic translation after posting', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_AUTO_POST_TRANSLATE . '" ' . $this->checked($this->transposh->options->get_enable_auto_post_translate()) . '/> ' .
-        __('Do automatic translation immediately after a post has been published', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_AUTO_POST_TRANSLATE, $this->transposh->options->get_enable_auto_post_translate(), __('Enable automatic translation after posting', TRANSPOSH_TEXT_DOMAIN), __('Do automatic translation immediately after a post has been published', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -523 +515 @@
     }
 
+    function on_contentbox_frontend_content($data) {
+        $this->checkbox(WIDGET_PROGRESSBAR, $this->transposh->options->get_widget_progressbar(), __('Show progress bar', TRANSPOSH_TEXT_DOMAIN), __('Show progress bar when a client triggers automatic translation', TRANSPOSH_TEXT_DOMAIN));
+
+        $this->checkbox(WIDGET_ALLOW_SET_DEFLANG, $this->transposh->options->get_widget_allow_set_default_language(), __('Allow user to set current language as default', TRANSPOSH_TEXT_DOMAIN), __('Widget will allow setting this language as user default', TRANSPOSH_TEXT_DOMAIN));
+
+        $this->checkbox(WIDGET_REMOVE_LOGO_FOR_AD, $this->transposh->options->get_widget_remove_logo(), __('Remove transposh logo (see <a href="http://transposh.org/logoterms">terms</a>)', TRANSPOSH_TEXT_DOMAIN), __('Transposh logo will not appear on widget', TRANSPOSH_TEXT_DOMAIN));
+
+        echo '<h4>' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
+        echo '<label for="' . WIDGET_THEME . '">' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) .
+        '<select id="transposh-style" name="' . WIDGET_THEME . '">';
+        foreach (transposh_consts::$jqueryui_themes as $theme) {
+            $selected = ($this->transposh->options->get_widget_theme() == $theme) ? ' selected="selected"' : '';
+            echo "<option value=\"$theme\"$selected>{$theme}</option>";
+        }
+        echo '</select>' .
+        '</label>';
+    }
+
     function on_contentbox_generic_content($data) {
         /*
@@ -528 +538 @@
          * When disabled only parameters will be used to identify the current language.
          */
-        echo '<h4>' . __('Rewrite URLs', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_PERMALINKS . '" ' . $this->checked($this->transposh->options->get_enable_permalinks()) . '/> ' .
-        __('Rewrite URLs to be search engine friendly, ' .
-                'e.g.  (http://transposh.org/<strong>en</strong>). ' .
-                'Requires that permalinks will be enabled.', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_PERMALINKS, $this->transposh->options->get_enable_permalinks(), __('Rewrite URLs', TRANSPOSH_TEXT_DOMAIN), __('Rewrite URLs to be search engine friendly, ' .
+                        'e.g.  (http://transposh.org/<strong>en</strong>). ' .
+                        'Requires that permalinks will be enabled.', TRANSPOSH_TEXT_DOMAIN));
 
         /*
          * Insert the option to enable/disable pushing of scripts to footer.
-         * Works on wordpress 2.8 and up
-         */
-        if (floatval($GLOBALS['wp_version']) >= 2.8) {
-            echo '<h4>' . __('Add scripts to footer', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-            echo '<input type="checkbox" value="1" name="' . ENABLE_FOOTER_SCRIPTS . '" ' . $this->checked($this->transposh->options->get_enable_footer_scripts()) . '/> ' .
-            __('Push transposh scripts to footer of page instead of header, makes pages load faster. ' .
-                    'Requires that your theme should have proper footer support.', TRANSPOSH_TEXT_DOMAIN);
-        }
+         * Works on wordpress 2.8 and up (but we no longer care...)
+         */
+        $this->checkbox(ENABLE_FOOTER_SCRIPTS, $this->transposh->options->get_enable_footer_scripts(), __('Add scripts to footer', TRANSPOSH_TEXT_DOMAIN), __('Push transposh scripts to footer of page instead of header, makes pages load faster. ' .
+                        'Requires that your theme should have proper footer support.', TRANSPOSH_TEXT_DOMAIN));
 
         /**
          * Insert the option to enable/disable language auto-detection
          * @since 0.3.8 */
-        echo '<h4>' . __('Auto detect language for users', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . ENABLE_DETECT_LANG_AND_REDIRECT . '" ' . $this->checked($this->transposh->options->get_enable_detect_language()) . '/> ' .
-        __('This enables auto detection of language used by the user as defined in the ACCEPT_LANGUAGES they send. ' .
-                'This will redirect the first page accessed in the session to the same page with the detected language.', TRANSPOSH_TEXT_DOMAIN);
+        $this->checkbox(ENABLE_DETECT_LANG_AND_REDIRECT, $this->transposh->options->get_enable_detect_language(), __('Auto detect language for users', TRANSPOSH_TEXT_DOMAIN), __('This enables auto detection of language used by the user as defined in the ACCEPT_LANGUAGES they send. ' .
+                        'This will redirect the first page accessed in the session to the same page with the detected language.', TRANSPOSH_TEXT_DOMAIN));
 
         /**
          * Insert the option to enable/disable statics collection
-         * @since 0.3.8 */
-        echo '<h4>' . __('Allow collecting usage statistics', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
-        echo '<input type="checkbox" value="1" name="' . TRANSPOSH_COLLECT_STATS . '" ' . $this->checked($this->transposh->options->get_transposh_collect_stats()) . '/> ' .
-        __('This option enables collection of statistics by transposh that will be used to improve the product. ', TRANSPOSH_TEXT_DOMAIN);
+         * @since 0.7.6 */
+        $this->checkbox(TRANSPOSH_COLLECT_STATS, $this->transposh->options->get_transposh_collect_stats(), __('Allow collecting usage statistics', TRANSPOSH_TEXT_DOMAIN), __('This option enables collection of statistics by transposh that will be used to improve the product. ', TRANSPOSH_TEXT_DOMAIN));
 
         /* WIP2

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

@@ -23 +23 @@
 //Option to enable/disable msn translation
 define('OLD_ENABLE_MSN_TRANSLATE', 'enable_msntranslate');
+//Option defining transposh widget file used @since 0.5.6
+define('OLD_WIDGET_FILE', 'widget_file'); //unset!!!
 //Option to store the msn API key
 define('MSN_TRANSLATE_KEY', 'msn_key');
@@ -61 +63 @@
 //Option defining the default language
 define('DEFAULT_LANG', 'default_language');
-//Option defining transposh widget file used @since 0.5.6
-define('WIDGET_FILE', 'widget_file');
 //Option allowing progress bar display
 define('WIDGET_PROGRESSBAR', 'widget_progressbar');
@@ -84 +84 @@
     /** @var array storing all our options */
     private $options = array();
+
     /** @var boolean set to true if any option was changed */
     private $changed = false;
@@ -184 +185 @@
 
     /**
-     * return file name of the widget used
-     * @since 0.5.6
-     * @return string
-     */
-    function get_widget_file() {
-        return $this->options[WIDGET_FILE];
-    }
-
-    /**
      * return theme
      * @since 0.7.0
@@ -331 +323 @@
 
     /**
-     * Set the widget file used
-     * @since 0.5.6
-     * @param string $val
-     */
-    function set_widget_file($val) {
-        $this->set_value($val, $this->options[WIDGET_FILE]);
-    }
-
-    /**
      * Set the widget theme
      * @since 0.7.0
@@ -388 +371 @@
     }
 
-      function set_msn_key($val) {
+    function set_msn_key($val) {
         $this->set_value($val, $this->options[MSN_TRANSLATE_KEY]);
     }
 
-          function set_google_key($val) {
+    function set_google_key($val) {
         $this->set_value($val, $this->options[GOOGLE_TRANSLATE_KEY]);
     }

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

@@ -13 +13 @@
 
 /*
- * Provides the sidebar widget for selecting a language and switching between edit/view
+ * Provides the sidebar widget instance for selecting a language and switching between edit/view
  * mode.
  */
 
-//Define widget file prefix
+//Define subwidget files prefix
 define('TRANSPOSH_WIDGET_PREFIX', 'tpw_');
 
-//class that reperesent the complete plugin
-class transposh_plugin_widget {
+/**
+ * Class for subwidgets to inherit from
+ */
+class transposh_base_widget {
+
+    /**
+     * Function that performs the actual subwidget rendering
+     */
+    static function tp_widget_do() {
+        echo "you should override this function in your widget";
+    }
+
+    /**
+     * Attempts inclusion of css needed for the subwidget
+     * @param string $file
+     * @param string $plugin_dir
+     * @param string $plugin_url 
+     */
+    static function tp_widget_css($file, $plugin_dir, $plugin_url) {
+        $basefile = substr($file, 0, -4);
+        $widget_css = TRANSPOSH_DIR_WIDGETS . '/' . $basefile . ".css";
+        if (file_exists($plugin_dir . $widget_css)) {
+            wp_enqueue_style($basefile, $plugin_url . '/' . $widget_css, '', TRANSPOSH_PLUGIN_VER);
+        }
+    }
+
+    /**
+     * Attempts inclusion of javascript needed for the subwidget
+     * @param string $file
+     * @param string $plugin_dir
+     * @param string $plugin_url 
+     */
+    static function tp_widget_js($file, $plugin_dir, $plugin_url) {
+        $basefile = substr($file, 0, -4);
+        $widget_js = TRANSPOSH_DIR_WIDGETS . '/' . $basefile . ".js";
+        if (file_exists($plugin_dir . $widget_js)) {
+            wp_enqueue_script('transposh_widget', $plugin_url . '/' . $widget_js, '', TRANSPOSH_PLUGIN_VER);
+        }
+    }
+
+}
+
+// END class
+//class that reperesent the complete widget
+class transposh_plugin_widget extends WP_Widget {
 
     /** @var transposh_plugin Container class */
     private $transposh;
-    /** @var string Contains the name of the used widget file */
-    public $base_widget_file_name;
-
-    //constructor of class, PHP4 compatible construction for backward compatibility
-    function transposh_plugin_widget(&$transposh) {
-        //Register callback for WordPress events
-        $this->transposh = &$transposh;
-        add_action('init', array(&$this, 'init_transposh'), 1);
-        add_action('widgets_init', array(&$this, 'transposh_widget_init'));
-    }
-
-    /**
-     * Intercept init calls to see if it was posted by the widget.
-     */
-    function init_transposh() {
-        if (isset($_POST['transposh_widget_posted'])) {
-            logger("Enter", 4);
-
-            $ref = getenv('HTTP_REFERER');
-            $lang = $_POST[LANG_PARAM];
-            if ($lang == '') {
-                $lang = transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->transposh->home_url);
-            }
-            if ($lang == $this->transposh->options->get_default_language() || $lang == "none")
-                    $lang = '';
-            logger("Widget referrer: $ref, lang: $lang", 4);
-
-            // first, we might need to get the original url back
-            if ($this->transposh->options->get_enable_url_translate()) {
-                $ref = transposh_utils::get_original_url($ref, $this->transposh->home_url, transposh_utils::get_language_from_url($ref, $this->transposh->home_url), array($this->transposh->database, 'fetch_original'));
-            }
-
-            //remove existing language settings.
-            $ref = transposh_utils::cleanup_url($ref, $this->transposh->home_url);
-            logger("cleaned referrer: $ref, lang: $lang", 4);
-
-            if ($lang && $this->transposh->options->get_enable_url_translate()) {
-                // and then, we might have to translate it
-                $ref = transposh_utils::translate_url($ref, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
-                $ref = transposh_utils::urlencode($ref);
-                logger("translated to referrer: $ref, lang: $lang", 3);
-            }
-            $ref = transposh_utils::rewrite_url_lang_param($ref, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $lang, $_POST[EDIT_PARAM]);
-
-            logger("Widget redirect url: $ref", 3);
-
-            $this->transposh->tp_redirect($ref);
-            exit;
-        }
-    }
-
-    /**
-     * Register the widget.
-     */
-    function transposh_widget_init() {
-        logger('Enter', 4);
-        if (!function_exists('register_sidebar_widget')) {
-            return;
-        }
-
-        // Register widget
-        wp_register_sidebar_widget('Transposh', __('Transposh', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'transposh_widget'), array('description' => __('Transposh language selection widget', TRANSPOSH_TEXT_DOMAIN)));
-
-        // Register widget control
-        wp_register_widget_control('Transposh', __('Transposh', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'transposh_widget_control'));
-
-        // Register callback for widget's css and js
-        add_action('wp_print_styles', array(&$this, 'add_transposh_widget_css'));
-        add_action('wp_print_scripts', array(&$this, 'add_transposh_widget_js'));
-    }
-
-    /**
-     * Loads the widget code
-     */
-    function load_widget() {
-        // avoid dual loadings
-        if ($this->base_widget_file_name) return;
-
-        $file = $this->transposh->options->get_widget_file();
+
+    /** @staticvar boolean Contains the fact that this is our first run */
+    static $first_init = true;
+
+    /** @staticvar int Counts call to the widget do to generate unique IDs */
+    static $draw_calls = '';
+
+    function transposh_plugin_widget() {
+        // We get the transposh details from the global variable
+        $this->transposh = &$GLOBALS['my_transposh_plugin'];
+
+        // Widget control defenitions
+        $widget_ops = array('classname' => 'widget_transposh', 'description' => __('Transposh language selection widget', TRANSPOSH_TEXT_DOMAIN));
+        $control_ops = array('width' => 200, 'height' => 300);
+        $this->WP_Widget('transposh', __('Transposh'), $widget_ops, $control_ops);
+
+        // We only need to add those actions once, makes life simpler
+        if (is_active_widget(false, false, $this->id_base) && self::$first_init) {
+            self::$first_init = false;
+            add_action('widgets_init', create_function('', 'register_widget("transposh_plugin_widget");'));
+            add_action('wp_print_styles', array(&$this, 'add_transposh_widget_css'));
+            add_action('wp_print_scripts', array(&$this, 'add_transposh_widget_js'));
+        }
+    }
+
+    /**
+     * Saves the widgets settings. (override of wp_widget)
+     */
+    function update($new_instance, $old_instance) {
+        $instance = $old_instance;
+        logger($instance);
+        logger($new_instance);
+        $instance['title'] = strip_tags(stripslashes($new_instance['title']));
+        $instance['widget_file'] = strip_tags(stripslashes($new_instance['widget_file']));
+        return $instance;
+    }
+
+    /**
+     * Creates the edit form for the widget. (override of wp_widget)
+     *
+     */
+    function form($instance) {
+        // Defaults
+        $instance = wp_parse_args((array) $instance, array('title' => 'Translation'));
+
+        // Output the options - title first
+        $title = htmlspecialchars($instance['title']);
+
+        echo '<p><label for="' . $this->get_field_name('title') . '">' . __('Title:') . ' <input class="widefat" id="' . $this->get_field_id('title') . '" name="' . $this->get_field_name('title') . '" type="text" value="' . $title . '" /></label></p>';
+
+        // Followed by subwisgets selection
+        $widgets = $this->get_widgets();
+
+        echo '<p><label for="' . $this->get_field_name('widget_file') . '">' . __('Style:', TRANSPOSH_TEXT_DOMAIN) .
+        '<select id="' . $this->get_field_id('widget_file') . '" name="' . $this->get_field_name('widget_file') . '">';
+        foreach ($widgets as $file => $widget) {
+            logger($widget, 4);
+            $selected = ($instance['widget_file'] == $file) ? ' selected="selected"' : '';
+            echo "<option value=\"$file\"$selected>{$widget['Name']}</option>";
+        }
+        echo '</select>' .
+        '</label></p>'
+        ;
+    }
+
+    /**
+     * Loads the subwidget class code
+     */
+    function load_widget($file) {
         $widget_src = $this->transposh->transposh_plugin_dir . TRANSPOSH_DIR_WIDGETS . '/' . $file;
         if ($file && file_exists($widget_src)) {
@@ -111 +144 @@
             include_once $this->transposh->transposh_plugin_dir . TRANSPOSH_DIR_WIDGETS . '/' . $file;
         }
-        $this->base_widget_file_name = substr($file, 0, -4);
+        return substr($file, strpos($file, '/') + 1, -4);
     }
 
@@ -117 +150 @@
      * Add custom css, i.e. transposh_widget.css, flags now override widget
      */
-    function add_transposh_widget_css() { //TODO ! goway
-        $this->load_widget();
-
-        if (function_exists('tp_widget_css')) {
-            tp_widget_css();
-        } else {
-            $widget_css = TRANSPOSH_DIR_WIDGETS . '/' . $this->base_widget_file_name . ".css";
-            if (file_exists($this->transposh->transposh_plugin_dir . $widget_css)) {
-                wp_enqueue_style('transposh_widget', $this->transposh->transposh_plugin_url . '/' . $widget_css, '', TRANSPOSH_PLUGIN_VER);
-            }
-        }
-
+    function add_transposh_widget_css() {
+        // first we discover all active widgets of ours, and aggregate the files
+        $settings = $this->get_settings();
+        foreach ($settings as $key => $value) {
+            if (is_active_widget(false, $this->id_base . '-' . $key, $this->id_base)) {
+                $activewidgets[$value['widget_file']] = true;
+            }
+        }
+
+        // we than load the classes and perform the css queueing
+        foreach ($activewidgets as $key => $v) {
+            $class = $this->load_widget($key);
+            $class::tp_widget_css($key, $this->transposh->transposh_plugin_dir, $this->transposh->transposh_plugin_url);
+        }
         logger('Added transposh_widget_css', 4);
     }
 
     /**
-     * Add custom css, i.e. transposh_widget.css, flags now override widget
-     */
-    function add_transposh_widget_js() { //TODO ! goway
-        $this->load_widget();
-
-        if (function_exists('tp_widget_js')) {
-            tp_widget_js();
-        } else {
-            $widget_js = TRANSPOSH_DIR_WIDGETS . '/' . $this->base_widget_file_name . ".js";
-            if (file_exists($this->transposh->transposh_plugin_dir . $widget_js)) {
-                wp_enqueue_script('transposh_widget', $this->transposh->transposh_plugin_url . '/' . $widget_js, '', TRANSPOSH_PLUGIN_VER);
-            }
+     * Add custom js, i.e. transposh_widget.js
+     */
+    function add_transposh_widget_js() {
+        $settings = $this->get_settings();
+        foreach ($settings as $key => $value) {
+            if (is_active_widget(false, $this->id_base . '-' . $key, $this->id_base)) {
+                $activewidgets[$value['widget_file']] = true;
+            }
+        }
+
+        // we than load the classes and perform the css queueing
+        foreach ($activewidgets as $key => $v) {
+            $class = $this->load_widget($key);
+            $class::tp_widget_js($key, $this->transposh->transposh_plugin_dir, $this->transposh->transposh_plugin_url);
         }
         logger('Added transposh_widget_js', 4);
     }
 
-    function create_widget_args($calc_url, $clean_page_url) {
+    /**
+     * Calculate arguments needed by subwidgets
+     * @param string $clean_page_url
+     * @return array
+     */
+    function create_widget_args($clean_page_url) {
+        // only calculate urls once even for multiple instances
+        static $widget_args;
+        if (is_array($widget_args)) return $widget_args;
         $widget_args = array();
         $page_url = '';
         if (is_404()) {
-            $clean_page_url = transposh_utils::cleanup_url($this->transposh->home_url,$this->transposh->home_url,true);
+            $clean_page_url = transposh_utils::cleanup_url($this->transposh->home_url, $this->transposh->home_url, true);
         }
         // loop on the languages
@@ -163 +208 @@
                     ($this->transposh->options->is_editable_language($code) && $this->transposh->is_translator()) ||
                     ($this->transposh->options->is_default_language($code))) {
-                if ($calc_url) {
-                    if ($this->transposh->options->get_enable_url_translate() && !$this->transposh->options->is_default_language($code)) {
-                        $page_url = transposh_utils::translate_url($clean_page_url, '', $code, array(&$this->transposh->database, 'fetch_translation'));
-                    } else {
-                        $page_url = $clean_page_url;
-                    }
-                    // clean $code in default lanaguge
-                    $page_url = transposh_utils::rewrite_url_lang_param($page_url, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $this->transposh->options->is_default_language($code) ? '' : $code, $this->transposh->edit_mode);
+                // now we alway do this... maybe cache this to APC/Memcache
+                if ($this->transposh->options->get_enable_url_translate() && !$this->transposh->options->is_default_language($code)) {
+                    $page_url = transposh_utils::translate_url($clean_page_url, '', $code, array(&$this->transposh->database, 'fetch_translation'));
+                } else {
+                    $page_url = $clean_page_url;
                 }
+                // clean $code in default lanaguge
+                $page_url = transposh_utils::rewrite_url_lang_param($page_url, $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $this->transposh->options->is_default_language($code) ? '' : $code, $this->transposh->edit_mode);
                 $widget_args[] = array(
                     'lang' => $langname,
@@ -188 +232 @@
      * @param array $args Contains such as $before_widget, $after_widget, $before_title, $after_title, etc
      */
-    function transposh_widget($args) {
-        $this->load_widget();
-
-        // hmmm, this should actually prepare all vars needed, include the correct widget and send the vars to that function,
-        $calc_url = false; // By default, avoid calculating the urls
-        if (function_exists('tp_widget_needs_post_url'))
-                $calc_url = tp_widget_needs_post_url();
-
-        $clean_page = $this->transposh->get_clean_url();
-
-        logger("WIDGET: clean page url: $clean_page", 4);
-
-        $widget_args = $this->create_widget_args($calc_url, $clean_page);
-        // at this point the widget args are ready
-
-        logger('Enter widget', 4);
-
+    function widget($args, $instance) {
         // extract args given by wordpress
         extract($args);
         logger($args, 4);
 
+        // we load the class needed and get its base name for later
+        $class = $this->load_widget($instance['widget_file']);
+
+        $clean_page = $this->transposh->get_clean_url();
+
+        logger("WIDGET: clean page url: $clean_page", 4);
+
+        $widget_args = $this->create_widget_args($clean_page);
+        // at this point the widget args are ready
+
+        logger('Enter widget', 4);
+
         // widget default title
-        echo $before_widget . $before_title . __('Translation', TRANSPOSH_TEXT_DOMAIN) . $after_title;
-
-        // the widget is inside a form used for posting a language change or edit request
-        echo '<form id="tp_form" action="' . $clean_page . '" method="post">';
+        //echo $before_widget . $before_title . __('Translation', TRANSPOSH_TEXT_DOMAIN) . $after_title; - hmm? po/mo?
+        echo $before_widget;
+        if ($instance['title']) {
+            echo $before_title . __($instance['title'], TRANSPOSH_TEXT_DOMAIN) . $after_title;
+        }
 
         // actually run the external widget code
-        tp_widget_do($widget_args);
+        $class::tp_widget_do($widget_args);
 
         //at least one language showing - add the edit box if applicable
@@ -223 +264 @@
             if ($this->transposh->options->get_widget_allow_set_default_language()) {
                 If ((isset($_COOKIE['TR_LNG']) && $_COOKIE['TR_LNG'] != $this->transposh->target_language) || (!isset($_COOKIE['TR_LNG']) && !$this->transposh->options->is_default_language($this->transposh->target_language))) {
-                    echo '<a id="' . SPAN_PREFIX . 'setdeflang" onClick="return false;" href="' . admin_url('admin-ajax.php') . '?action=tp_cookie_bck">' . __('Set as default language', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
+                    echo '<a id="' . SPAN_PREFIX . 'setdeflang' . self::$draw_calls . '" class="' . SPAN_PREFIX . 'setdeflang' . '" onClick="return false;" href="' . admin_url('admin-ajax.php') . '?action=tp_cookie_bck">' . __('Set as default language', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
                 }
             }
             // add the edit checkbox only for translators for languages marked as editable
+            $ref = transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->transposh->home_url, $this->transposh->enable_permalinks_rewrite, $this->transposh->target_language, !$this->transposh->edit_mode);
             if ($this->transposh->is_editing_permitted()) {
                 echo '<input type="checkbox" name="' . EDIT_PARAM . '" value="1" ' .
-                ($this->transposh->edit_mode ? 'checked="checked"' : '') .
-                ' onclick="this.form.submit();"/>&nbsp;Edit Translation';
-            }
-
-            echo '<input type="hidden" name="transposh_widget_posted" value="1"/>';
+                ($this->transposh->edit_mode ? 'checked="checked" ' : '') .
+                ' onclick="document.location.href=\'' . $ref . '\';"/>&nbsp;Edit Translation';
+            }
         } else {
             //no languages configured - error message
             echo '<p>No languages available for display. Check the Transposh settings (Admin).</p>';
         }
-
-        echo "</form>";
 
         // Now this is a comment for those wishing to remove our logo (tplogo.png) and link (transposh.org) from the widget
@@ -278 +316 @@
         }
 
-        echo '<div id="' . SPAN_PREFIX . 'credit">';
+        echo '<div id="' . SPAN_PREFIX . 'credit' . self::$draw_calls . '">';
         if (!$this->transposh->options->get_widget_remove_logo()) {
             echo 'by <a href="http://tran' . 'sposh.org/' . $extralang . '"><img height="16" width="16" src="' .
@@ -285 +323 @@
         echo '</div>';
         echo $after_widget;
-    }
-
-    function transposh_widget_post($save = true) {
-        logger($_POST);
-        logger('handled widget post');
-        $this->transposh->options->set_widget_file($_POST[WIDGET_FILE]);
-        $this->transposh->options->set_widget_progressbar($_POST[WIDGET_PROGRESSBAR]);
-        $this->transposh->options->set_widget_allow_set_default_language($_POST[WIDGET_ALLOW_SET_DEFLANG]);
-        $this->transposh->options->set_widget_remove_logo($_POST[WIDGET_REMOVE_LOGO_FOR_AD]);
-        $this->transposh->options->set_widget_theme($_POST[WIDGET_THEME]);
-        if ($save) $this->transposh->options->update_options();
-        // Avoid coming here twice...
-        unset($_POST['transposh-submit']);
+        // increase the number of calls for unique IDs
+        self::$draw_calls++;
     }
 
@@ -353 +380 @@
     }
 
-    /**
-     * This is the widget control, allowing the selection of presentation type.
-     */
-    function transposh_widget_control() {
-        if (isset($_POST['transposh-submit'])) $this->transposh_widget_post();
-        $themes = array('base', 'black-tie', 'blitzer', 'cupertino', 'dark-hive', 'dot-luv', 'eggplant', 'excite-bike', 'flick',
-            'hot-sneaks', 'humanity', 'le-frog', 'mint-choc', 'overcast', 'pepper-grinder', 'redmond', 'smoothness', 'south-street',
-            'start', 'sunny', 'swanky-purse', 'trontastic', 'ui-darkness', 'ui-lightness', 'vader');
-
-        $widgets = $this->get_widgets();
-
-        echo '<p><label for="' . WIDGET_FILE . '">' . __('Style:', TRANSPOSH_TEXT_DOMAIN) . '<br/>' .
-        '<select id="transposh-style" name="' . WIDGET_FILE . '">';
-        foreach ($widgets as $file => $widget) {
-            logger($widget, 4);
-            $selected = ($this->transposh->options->get_widget_file() == $file) ? ' selected="selected"' : '';
-            echo "<option value=\"$file\"$selected>{$widget['Name']}</option>";
-        }
-        echo '</select>' .
-        '</label></p>' .
-        '<p><label for="transposh-progress">' . __('Effects:', TRANSPOSH_TEXT_DOMAIN) . '</label><br/>' .
-        '<input type="checkbox" id="' . WIDGET_PROGRESSBAR . '" name="' . WIDGET_PROGRESSBAR . '"' . ($this->transposh->options->get_widget_progressbar() ? ' checked="checked"' : '') . '/>' .
-        '<span style="border-bottom: 1px dotted #333; cursor: help; margin-left: 4px" title="' . esc_attr__('Show progress bar when a client triggers automatic translation', TRANSPOSH_TEXT_DOMAIN) . '">' . __('Show progress bar', TRANSPOSH_TEXT_DOMAIN) . '</span><br/>' .
-        '<input type="checkbox" id="' . WIDGET_ALLOW_SET_DEFLANG . '" name="' . WIDGET_ALLOW_SET_DEFLANG . '"' . ($this->transposh->options->get_widget_allow_set_default_language() ? ' checked="checked"' : '') . '/>' .
-        '<span style="border-bottom: 1px dotted #333; cursor: help; margin-left: 4px" title="' . esc_attr__('Widget will allow setting this language as user default', TRANSPOSH_TEXT_DOMAIN) . '">' . __('Allow user to set current language as default', TRANSPOSH_TEXT_DOMAIN) . '</span><br/>' .
-        '<input type="checkbox" id="' . WIDGET_REMOVE_LOGO_FOR_AD . '" name="' . WIDGET_REMOVE_LOGO_FOR_AD . '"' . ($this->transposh->options->get_widget_remove_logo() ? ' checked="checked"' : '') . '/>' .
-        '<span style="border-bottom: 1px dotted #333; cursor: help; margin-left: 4px" title="' . esc_attr__('Transposh logo will not appear on widget', TRANSPOSH_TEXT_DOMAIN) . '">' . __('Remove transposh logo (see <a href="http://transposh.org/logoterms">terms</a>)', TRANSPOSH_TEXT_DOMAIN) . '</span><br/>' .
-        '</p>';
-
-        echo '<p><label for="' . WIDGET_THEME . '">' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) . '<br/>' .
-        '<select id="transposh-style" name="' . WIDGET_THEME . '">';
-        foreach ($themes as $theme) {
-            $selected = ($this->transposh->options->get_widget_theme() == $theme) ? ' selected="selected"' : '';
-            echo "<option value=\"$theme\"$selected>{$theme}</option>";
-        }
-        echo '</select>' .
-        '</label></p>' .
-        '<input type="hidden" name="transposh-submit" id="transposh-submit" value="1"/>';
-    }
-
 }
 
@@ -399 +386 @@
  * @param array $args Not needed
  */
-function transposh_widget($args = array()) {
-    $GLOBALS['my_transposh_plugin']->widget->transposh_widget($args);
+function transposh_widget($args = array(), $instance= array('title' => 'Translation')) {
+    $GLOBALS['my_transposh_plugin']->widget->transposh_widget($args, $instance);
 }