From d40d06b8fb8bdf23d5f8a9bc03f6b6a11fa60dca Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Sun, 16 Mar 2014 01:51:08 +0100 Subject: [PATCH] feedback to headerMenu headerMenu to brick-file --- includes/user.class.php | 2 +- localization/locale_dede.php | 3 ++- localization/locale_enus.php | 3 ++- localization/locale_eses.php | 3 ++- localization/locale_frfr.php | 3 ++- localization/locale_ruru.php | 3 ++- static/js/basic.js | 2 +- static/js/global.js | 5 +++++ template/bricks/headerMenu.tpl | 4 ++++ template/header.tpl | 4 +--- template/main.tpl | 4 +--- 11 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 template/bricks/headerMenu.tpl diff --git a/includes/user.class.php b/includes/user.class.php index 1c9122f5..c6b11b03 100644 --- a/includes/user.class.php +++ b/includes/user.class.php @@ -262,7 +262,7 @@ class User 'name' => self::$displayName ? self::$displayName : '', 'perms' => self::$perms ? self::$perms : 0, 'roles' => self::$groups ? self::$groups : 0, - 'cookies' => [] + 'cookies' => '[]' ); if (self::$id > 0) diff --git a/localization/locale_dede.php b/localization/locale_dede.php index 7d91467f..5c1ba5ff 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -20,10 +20,11 @@ $lang = array( 'help' => "Hilfe", 'name' => "Name", 'link' => "Link", - 'signIn' => "Anmelden", + 'signIn' => "Anmelden / Registrieren", 'jsError' => "Stelle bitte sicher, dass JavaScript aktiviert ist.", 'searchButton' => "Suche", 'language' => "Sprache", + 'feedback' => "Rückmeldung", 'numSQL' => "Anzahl an MySQL-Queries", 'timeSQL' => "Zeit für MySQL-Queries", 'noJScript' => "Diese Seite macht ausgiebigen Gebrauch von JavaScript.
Bitte aktiviert JavaScript in Eurem Browser.", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index cad1a3d8..07b773a5 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -15,10 +15,11 @@ $lang = array( 'help' => "Help", 'name' => "name", 'link' => "Link", - 'signIn' => "Sign in", + 'signIn' => "Log in / Register", 'jsError' => "Please make sure you have javascript enabled.", 'searchButton' => "Search", 'language' => "Language", + 'feedback' => "Feedback", 'numSQL' => "Number of MySQL queries", 'timeSQL' => "Time of MySQL queries", 'noJScript' => "This site makes extensive use of JavaScript.
Please enable JavaScript in your browser.", diff --git a/localization/locale_eses.php b/localization/locale_eses.php index c8288a7b..cd9546a0 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -20,10 +20,11 @@ $lang = array( 'help' => "Ayuda", 'name' => "nombre", 'link' => "Enlace", - 'signIn' => "Iniciar sesión", + 'signIn' => "Iniciar sesión / Registrarse", 'jsError' => "Por favor, asegúrese de que ha habilitado javascript.", 'searchButton' => "búsqueda", 'language' => "lengua", + 'feedback' => "Feedback", 'numSQL' => "Número de consultas de MySQL", 'timeSQL' => "El tiempo para las consultas de MySQL", 'noJScript' => "Este sitio hace uso intenso de JavaScript.
Por favor habilita JavaScript en tu navegador.", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 77965656..0ba7154b 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -20,10 +20,11 @@ $lang = array( 'help' => "Aide", 'name' => "nom", 'link' => "Lien", - 'signIn' => "S'enregistrer", + 'signIn' => "Se connecter / S'inscrire", 'jsError' => "S'il vous plait, assurez vous d'avoir le javascript autorisé.", 'searchButton' => "Rechercher", 'language' => "Langue", + 'feedback' => "Feedback", 'numSQL' => "Nombre de requêtes SQL", 'timeSQL' => "Temps d'exécution des requêtes SQL", 'noJScript' => "Ce site requiert JavaScript pour fonctionner.
Veuillez activer JavaScript dans votre navigateur.", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 7d6c9230..6e3345a6 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -20,10 +20,11 @@ $lang = array( 'help' => "Справка", 'name' => "название", 'link' => "Ссылка", - 'signIn' => "Войти", + 'signIn' => "Вход / Регистрация", 'jsError' => "Для работы этого сайта необходим JavaScript.", 'searchButton' => "Искать", 'language' => "Язык", + 'feedback' => "Отзыв", 'numSQL' => "Количество MySQL запросов", 'timeSQL' => "Время выполнения MySQL запросов", 'noJScript' => "Данный сайт активно использует технологию JavaScript.
Пожалуйста, Включите JavaScript в вашем браузере.", diff --git a/static/js/basic.js b/static/js/basic.js index 4cdb1b50..99717db3 100644 --- a/static/js/basic.js +++ b/static/js/basic.js @@ -42,7 +42,7 @@ $WH.$E = function (e) { $WH.$A = function (a) { var r = []; - for (var i = 0, len = c.length; i < len; ++i) { + for (var i = 0, len = a.length; i < len; ++i) { r.push(a[i]); } diff --git a/static/js/global.js b/static/js/global.js index e0a6f5ac..51aad29b 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -524,6 +524,11 @@ function g_initHeaderMenus() { } Menu.add(c, menu); } + + $('#toplinks-feedback').attr('href', 'javascript:;').click(function() + { + ContactTool.show(); + }); } function g_initPath(q, f) { var h = mn_path, diff --git a/template/bricks/headerMenu.tpl b/template/bricks/headerMenu.tpl new file mode 100644 index 00000000..ca8833d5 --- /dev/null +++ b/template/bricks/headerMenu.tpl @@ -0,0 +1,4 @@ +{if $user.id}{$lang.profiles}|{$user.name}{else}{$lang.signIn}{/if} +|{$lang.feedback} +|{$lang.language} ▼ + diff --git a/template/header.tpl b/template/header.tpl index d417dd59..bebb0057 100644 --- a/template/header.tpl +++ b/template/header.tpl @@ -18,9 +18,7 @@
- {if $user.id}{$lang.profiles}|{$user.name}{else}{$lang.signIn}{/if} - |{$lang.language} ▼ - +{include file="bricks/headerMenu.tpl"}
diff --git a/template/main.tpl b/template/main.tpl index 8140c559..c4de86cc 100644 --- a/template/main.tpl +++ b/template/main.tpl @@ -42,9 +42,7 @@ {/if}