aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php3
-rw-r--r--images/icons.pngbin8875 -> 9382 bytes
-rw-r--r--include/main.js24
-rw-r--r--view/theme/duepuntozero/style.css12
-rw-r--r--view/theme/loozah/style.css10
5 files changed, 33 insertions, 16 deletions
diff --git a/boot.php b/boot.php
index 3ca083901..a67b96a08 100644
--- 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 6effd9aa2..9bf6cf627 100644
--- a/images/icons.png
+++ b/images/icons.png
Binary files differ
diff --git a/include/main.js b/include/main.js
index 0d68c2b2b..34045f57f 100644
--- 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 58cf8646c..2aa0eb2e9 100644
--- 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 7c9697b4d..0f9e1e956 100644
--- 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;