use icon for language selector instead of hotkey

diff --git a/boot.php b/boot.php
index 3ca0839011d9ea7dcf4717afa25201286a507a74..a67b96a085ca114371e66237144e96062f764a61 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1001' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1002' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1060      );
 
@@ -2766,6 +2766,7 @@ function unamp($s) {
 if(! function_exists('lang_selector')) {
 function lang_selector() {
        global $lang;
+       $o .= '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
        $o .= '<div id="language-selector" style="display: none;" >';
        $o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >';
        $langs = glob('view/*/strings.php');

diff --git a/images/icons.png b/images/icons.png
index 6effd9aa2369d0cc452d4540c1166aeb0269d6bf..9bf6cf6277b92d85afc46ac34f5ce408d297372f 100644 (file)
Binary files a/images/icons.png and b/images/icons.png differ

diff --git a/include/main.js b/include/main.js
index 0d68c2b2b30177a2e28d8c71b0d3cc7b28a27453..34045f57f2b47b5f8e259f51db4a5f343d73ab44 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -47,18 +47,18 @@
                                        $('#pause').html('');
                                }
                        }
-                       // F8 - show/hide language selector
-                       if(event.keyCode == '119') {
-                               if(langSelect) {
-                                       langSelect = false;
-                                       $('#language-selector').hide();
-                               }
-                               else {
-                                       langSelect = true;
-                                       $('#language-selector').show();
-                               }
-                       }               
-
+//                     // F8 - show/hide language selector
+//                     if(event.keyCode == '119') {
+//                             if(langSelect) {
+//                                     langSelect = false;
+//                                     $('#language-selector').hide();
+//                             }
+//                             else {
+//                                     langSelect = true;
+//                                     $('#language-selector').show();
+//                             }
+//                     }               
+//
 // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
 // update: incompatible usage of onKeyDown vs onKeyPress
 //                     if(event.keyCode == '36' && event.shiftKey == true) {

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 58cf8646c8c7f88f6a3216aca026eb255d18f90b..2aa0eb2e924e354885daf068c9a014bcb314e8a5 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2298,8 +2298,8 @@ a.mail-list-link {
 
 #language-selector {
        position: absolute;
-       top: 0;
-       left: 0;
+       top: 0px;
+       left: 16px;
 }
 
 #group-members {
@@ -2403,6 +2403,13 @@ a.mail-list-link {
        margin: 5px 0px 0px 0px;
 }
 
+#lang-select-icon {
+       cursor: pointer;
+       position: absolute;
+       left: 0px;
+       top: 0px;
+}
+
 
 /**
  * ICONS
@@ -2439,6 +2446,7 @@ a.mail-list-link {
 .video { background-position: -48px -32px;}
 .youtube { background-position: -64px -32px;}
 .attach { background-position: -80px -32px; }
+.language { background-position: -96px -32px; }
 
 
 .attachtype {

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 7c9697b4d4d3d8e381102681e1b048420c4f8fd2..0f9e1e956b617529544158d667fad0eb36603827 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2319,7 +2319,7 @@ a.mail-list-link {
 #language-selector {
        position: absolute;
        top: 0;
-       left: 0;
+       left: 16px;
 }
 
 
@@ -2419,6 +2419,13 @@ a.mail-list-link {
        margin: 5px 0px 0px 0px;
 }
 
+#lang-select-icon {
+       cursor: pointer;
+       position: absolute;
+       left: 0px;
+       top: 0px;
+}
+
 /**
  * ICONS
  */
@@ -2454,6 +2461,7 @@ a.mail-list-link {
 .video { background-position: -48px -32px;}
 .youtube { background-position: -64px -32px;}
 .attach { background-position: -80px -32px; }
+.language { background-position: -96px -32px; }
 
 .attachtype {
        display: block; width: 20px; height: 23px;