diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php index 8345f737e2..7c70db3bbb 100644 --- a/core/default_settings/app_languages.php +++ b/core/default_settings/app_languages.php @@ -99,6 +99,20 @@ $text['message-copy_failed']['sv-se'] = "Ingen inställning markerad eller ogilt $text['message-copy_failed']['uk'] = ""; $text['message-copy_failed']['de-at'] = "Keine Einstellungen ausgewählt oder ungültige Domain"; +$text['label-top']['en-us'] = "Top"; +$text['label-top']['es-cl'] = "encima"; +$text['label-top']['pt-pt'] = "Topo"; +$text['label-top']['fr-fr'] = "Meilleur"; +$text['label-top']['pt-br'] = "Topo"; +$text['label-top']['pl'] = "Top"; +$text['label-top']['he'] = "עליון"; +$text['label-top']['uk'] = "топ"; +$text['label-top']['sv-se'] = "Topp"; +$text['label-top']['de-at'] = "Oben"; +$text['label-top']['ro'] = "Top"; +$text['label-top']['fa'] = ""; +$text['label-top']['ar-eg'] = "أعلى"; + $text['label-text']['en-us'] = "Text"; $text['label-text']['es-cl'] = "Texto"; $text['label-text']['pt-pt'] = "Texto"; @@ -124,6 +138,34 @@ $text['label-superfine']['sv-se'] = "Superfin"; $text['label-superfine']['uk'] = ""; $text['label-superfine']['de-at'] = "Superfein"; +$text['label-static']['en-us'] = "Static"; +$text['label-static']['es-cl'] = "Estático"; +$text['label-static']['pt-pt'] = "Estático"; +$text['label-static']['fr-fr'] = "Statique"; +$text['label-static']['pt-br'] = "Estático"; +$text['label-static']['pl'] = "Statyczny"; +$text['label-static']['he'] = "סטָטִי"; +$text['label-static']['uk'] = "статичний"; +$text['label-static']['sv-se'] = "Statisk"; +$text['label-static']['de-at'] = "Statisch"; +$text['label-static']['ro'] = "Static"; +$text['label-static']['fa'] = ""; +$text['label-static']['ar-eg'] = "ساكن"; + +$text['label-right']['en-us'] = "Right"; +$text['label-right']['es-cl'] = "Derecha"; +$text['label-right']['pt-pt'] = "Certo"; +$text['label-right']['fr-fr'] = "Droite"; +$text['label-right']['pt-br'] = "Certo"; +$text['label-right']['pl'] = "Dobrze"; +$text['label-right']['he'] = "יָמִינָה"; +$text['label-right']['uk'] = "правий"; +$text['label-right']['sv-se'] = "Höger"; +$text['label-right']['de-at'] = "Recht"; +$text['label-right']['ro'] = "Dreapta"; +$text['label-right']['fa'] = ""; +$text['label-right']['ar-eg'] = "حق"; + $text['label-normal']['en-us'] = "Normal"; $text['label-normal']['es-cl'] = "Normal"; $text['label-normal']['pt-pt'] = "Normal"; @@ -149,6 +191,34 @@ $text['label-none']['ro'] = "Nici unul"; $text['label-none']['fa'] = ""; $text['label-none']['ar-eg'] = "لا شيء"; +$text['label-left']['en-us'] = "Left"; +$text['label-left']['es-cl'] = "Izquierda"; +$text['label-left']['pt-pt'] = "Esquerda"; +$text['label-left']['fr-fr'] = "À gauche"; +$text['label-left']['pt-br'] = "Esquerda"; +$text['label-left']['pl'] = "Lewo"; +$text['label-left']['he'] = "שְׁמֹאל"; +$text['label-left']['uk'] = "лівий"; +$text['label-left']['sv-se'] = "Vänster"; +$text['label-left']['de-at'] = "Links"; +$text['label-left']['ro'] = "Stânga"; +$text['label-left']['fa'] = ""; +$text['label-left']['ar-eg'] = "اليسار"; + +$text['label-inline']['en-us'] = "Inline"; +$text['label-inline']['es-cl'] = "En línea"; +$text['label-inline']['pt-pt'] = "Na linha"; +$text['label-inline']['fr-fr'] = "En ligne"; +$text['label-inline']['pt-br'] = "Na linha"; +$text['label-inline']['pl'] = "inline"; +$text['label-inline']['he'] = "בשורה"; +$text['label-inline']['uk'] = "В лінію"; +$text['label-inline']['sv-se'] = "I kö"; +$text['label-inline']['de-at'] = "In der Reihe"; +$text['label-inline']['ro'] = "In linie"; +$text['label-inline']['fa'] = ""; +$text['label-inline']['ar-eg'] = "في النسق"; + $text['label-image']['en-us'] = "Image"; $text['label-image']['es-cl'] = "Imagen"; $text['label-image']['pt-pt'] = "Imagem"; @@ -163,6 +233,20 @@ $text['label-image']['ro'] = "Imagine"; $text['label-image']['fa'] = ""; $text['label-image']['ar-eg'] = "صورة"; +$text['label-fixed']['en-us'] = "Fixed"; +$text['label-fixed']['es-cl'] = "Fijo"; +$text['label-fixed']['pt-pt'] = "Fixo"; +$text['label-fixed']['fr-fr'] = "Fixé"; +$text['label-fixed']['pt-br'] = "Fixo"; +$text['label-fixed']['pl'] = "Naprawiony"; +$text['label-fixed']['he'] = "קָבוּעַ"; +$text['label-fixed']['uk'] = "фіксований"; +$text['label-fixed']['sv-se'] = "Fast"; +$text['label-fixed']['de-at'] = "fest"; +$text['label-fixed']['ro'] = "Fix"; +$text['label-fixed']['fa'] = ""; +$text['label-fixed']['ar-eg'] = "ثابت"; + $text['label-fine']['en-us'] = "Fine"; $text['label-fine']['es-cl'] = "Fine"; $text['label-fine']['pt-pt'] = "Belas"; @@ -174,6 +258,34 @@ $text['label-fine']['sv-se'] = "Fin"; $text['label-fine']['uk'] = ""; $text['label-fine']['de-at'] = "Fein"; +$text['label-center']['en-us'] = "Center"; +$text['label-center']['es-cl'] = "Centrar"; +$text['label-center']['pt-pt'] = "Centro"; +$text['label-center']['fr-fr'] = "centre"; +$text['label-center']['pt-br'] = "Centro"; +$text['label-center']['pl'] = "Centrum"; +$text['label-center']['he'] = "מֶרְכָּז"; +$text['label-center']['uk'] = "центр"; +$text['label-center']['sv-se'] = "Centrum"; +$text['label-center']['de-at'] = "Center"; +$text['label-center']['ro'] = "Centru"; +$text['label-center']['fa'] = ""; +$text['label-center']['ar-eg'] = "مركز"; + +$text['label-bottom']['en-us'] = "Bottom"; +$text['label-bottom']['es-cl'] = "Fondo"; +$text['label-bottom']['pt-pt'] = "Inferior"; +$text['label-bottom']['fr-fr'] = "Bas"; +$text['label-bottom']['pt-br'] = "Inferior"; +$text['label-bottom']['pl'] = "Dolny"; +$text['label-bottom']['he'] = "תַחתִית"; +$text['label-bottom']['uk'] = "дно"; +$text['label-bottom']['sv-se'] = "Botten"; +$text['label-bottom']['de-at'] = "Boden"; +$text['label-bottom']['ro'] = "Fund"; +$text['label-bottom']['fa'] = ""; +$text['label-bottom']['ar-eg'] = "أسفل"; + $text['label-24-hour']['en-us'] = "24-Hour"; $text['label-24-hour']['es-cl'] = "24 horas"; $text['label-24-hour']['pt-pt'] = "24 horas"; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 5063149294..5a22f3a132 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -503,6 +503,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) { + echo " \n"; + } elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) { + echo " \n"; + } elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) { + echo " \n"; + } elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) { + echo " \n"; + } else { echo " \n"; } diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 41157740d7..63387cc7b3 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -233,8 +233,14 @@ if (sizeof($_REQUEST) > 1) { case '24h': echo " ".$text['label-24-hour']; break; } } - else if ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) { - echo " ".ucwords($row['domain_setting_value']); + else if ( + ( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) || + ( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) || + ( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) || + ( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) || + ( $category == "theme" && $subcategory == "logo_align" && $name == "text" ) + ) { + echo " ".$text['label-'.$row['default_setting_value']]; } else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " ".str_repeat('*', strlen($row['domain_setting_value'])); diff --git a/core/users/app_languages.php b/core/users/app_languages.php index 053f6eb211..d611d07d5c 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -329,6 +329,20 @@ $text['label-user_info']['ro'] = ""; $text['label-user_info']['de-at'] = "Benutzer Information"; $text['label-user_info']['he'] = "פרטי משתמש"; +$text['label-top']['en-us'] = "Top"; +$text['label-top']['es-cl'] = "encima"; +$text['label-top']['pt-pt'] = "Topo"; +$text['label-top']['fr-fr'] = "Meilleur"; +$text['label-top']['pt-br'] = "Topo"; +$text['label-top']['pl'] = "Top"; +$text['label-top']['he'] = "עליון"; +$text['label-top']['uk'] = "топ"; +$text['label-top']['sv-se'] = "Topp"; +$text['label-top']['de-at'] = "Oben"; +$text['label-top']['ro'] = "Top"; +$text['label-top']['fa'] = ""; +$text['label-top']['ar-eg'] = "أعلى"; + $text['label-time_zone']['en-us'] = "Time Zone"; $text['label-time_zone']['es-cl'] = "Zona Horaria"; $text['label-time_zone']['pt-pt'] = "Fuso Horário"; @@ -365,6 +379,34 @@ $text['label-status']['ro'] = "Stare"; $text['label-status']['de-at'] = "Status"; $text['label-status']['he'] = "סטטוס"; +$text['label-static']['en-us'] = "Static"; +$text['label-static']['es-cl'] = "Estático"; +$text['label-static']['pt-pt'] = "Estático"; +$text['label-static']['fr-fr'] = "Statique"; +$text['label-static']['pt-br'] = "Estático"; +$text['label-static']['pl'] = "Statyczny"; +$text['label-static']['he'] = "סטָטִי"; +$text['label-static']['uk'] = "статичний"; +$text['label-static']['sv-se'] = "Statisk"; +$text['label-static']['de-at'] = "Statisch"; +$text['label-static']['ro'] = "Static"; +$text['label-static']['fa'] = ""; +$text['label-static']['ar-eg'] = "ساكن"; + +$text['label-right']['en-us'] = "Right"; +$text['label-right']['es-cl'] = "Derecha"; +$text['label-right']['pt-pt'] = "Certo"; +$text['label-right']['fr-fr'] = "Droite"; +$text['label-right']['pt-br'] = "Certo"; +$text['label-right']['pl'] = "Dobrze"; +$text['label-right']['he'] = "יָמִינָה"; +$text['label-right']['uk'] = "правий"; +$text['label-right']['sv-se'] = "Höger"; +$text['label-right']['de-at'] = "Recht"; +$text['label-right']['ro'] = "Dreapta"; +$text['label-right']['fa'] = ""; +$text['label-right']['ar-eg'] = "حق"; + $text['label-permission_permissions']['en-us'] = "Permissions"; $text['label-permission_permissions']['es-cl'] = "Permisos"; $text['label-permission_permissions']['pt-pt'] = "Permissões"; @@ -412,6 +454,20 @@ $text['label-none']['ro'] = "Nici unul"; $text['label-none']['fa'] = ""; $text['label-none']['ar-eg'] = "لا شيء"; +$text['label-left']['en-us'] = "Left"; +$text['label-left']['es-cl'] = "Izquierda"; +$text['label-left']['pt-pt'] = "Esquerda"; +$text['label-left']['fr-fr'] = "À gauche"; +$text['label-left']['pt-br'] = "Esquerda"; +$text['label-left']['pl'] = "Lewo"; +$text['label-left']['he'] = "שְׁמֹאל"; +$text['label-left']['uk'] = "лівий"; +$text['label-left']['sv-se'] = "Vänster"; +$text['label-left']['de-at'] = "Links"; +$text['label-left']['ro'] = "Stânga"; +$text['label-left']['fa'] = ""; +$text['label-left']['ar-eg'] = "اليسار"; + $text['label-last_name']['en-us'] = "Last Name"; $text['label-last_name']['es-cl'] = "Apellido"; $text['label-last_name']['pt-pt'] = "Último Nome"; @@ -423,6 +479,20 @@ $text['label-last_name']['ro'] = ""; $text['label-last_name']['de-at'] = "Nachname"; $text['label-last_name']['he'] = "שם משפחה"; +$text['label-inline']['en-us'] = "Inline"; +$text['label-inline']['es-cl'] = "En línea"; +$text['label-inline']['pt-pt'] = "Na linha"; +$text['label-inline']['fr-fr'] = "En ligne"; +$text['label-inline']['pt-br'] = "Na linha"; +$text['label-inline']['pl'] = "inline"; +$text['label-inline']['he'] = "בשורה"; +$text['label-inline']['uk'] = "В лінію"; +$text['label-inline']['sv-se'] = "I kö"; +$text['label-inline']['de-at'] = "In der Reihe"; +$text['label-inline']['ro'] = "In linie"; +$text['label-inline']['fa'] = ""; +$text['label-inline']['ar-eg'] = "في النسق"; + $text['label-image']['en-us'] = "Image"; $text['label-image']['es-cl'] = "Imagen"; $text['label-image']['pt-pt'] = "Imagem"; @@ -536,6 +606,20 @@ $text['label-global']['ro'] = ""; $text['label-global']['de-at'] = "Global"; $text['label-global']['he'] = "כללי"; +$text['label-fixed']['en-us'] = "Fixed"; +$text['label-fixed']['es-cl'] = "Fijo"; +$text['label-fixed']['pt-pt'] = "Fixo"; +$text['label-fixed']['fr-fr'] = "Fixé"; +$text['label-fixed']['pt-br'] = "Fixo"; +$text['label-fixed']['pl'] = "Naprawiony"; +$text['label-fixed']['he'] = "קָבוּעַ"; +$text['label-fixed']['uk'] = "фіксований"; +$text['label-fixed']['sv-se'] = "Fast"; +$text['label-fixed']['de-at'] = "fest"; +$text['label-fixed']['ro'] = "Fix"; +$text['label-fixed']['fa'] = ""; +$text['label-fixed']['ar-eg'] = "ثابت"; + $text['label-first_name']['en-us'] = "First Name"; $text['label-first_name']['es-cl'] = "Nombre"; $text['label-first_name']['pt-pt'] = "Primeiro Nome"; @@ -602,6 +686,34 @@ $text['label-company_name']['ro'] = ""; $text['label-company_name']['de-at'] = "Firmenname"; $text['label-company_name']['he'] = "שם חברה"; +$text['label-center']['en-us'] = "Center"; +$text['label-center']['es-cl'] = "Centrar"; +$text['label-center']['pt-pt'] = "Centro"; +$text['label-center']['fr-fr'] = "centre"; +$text['label-center']['pt-br'] = "Centro"; +$text['label-center']['pl'] = "Centrum"; +$text['label-center']['he'] = "מֶרְכָּז"; +$text['label-center']['uk'] = "центр"; +$text['label-center']['sv-se'] = "Centrum"; +$text['label-center']['de-at'] = "Center"; +$text['label-center']['ro'] = "Centru"; +$text['label-center']['fa'] = ""; +$text['label-center']['ar-eg'] = "مركز"; + +$text['label-bottom']['en-us'] = "Bottom"; +$text['label-bottom']['es-cl'] = "Fondo"; +$text['label-bottom']['pt-pt'] = "Inferior"; +$text['label-bottom']['fr-fr'] = "Bas"; +$text['label-bottom']['pt-br'] = "Inferior"; +$text['label-bottom']['pl'] = "Dolny"; +$text['label-bottom']['he'] = "תַחתִית"; +$text['label-bottom']['uk'] = "дно"; +$text['label-bottom']['sv-se'] = "Botten"; +$text['label-bottom']['de-at'] = "Boden"; +$text['label-bottom']['ro'] = "Fund"; +$text['label-bottom']['fa'] = ""; +$text['label-bottom']['ar-eg'] = "أسفل"; + $text['label-api_key']['en-us'] = "API Key"; $text['label-api_key']['es-cl'] = "API Key"; $text['label-api_key']['pt-pt'] = "API Key"; diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php index e5cd12fa46..0ec6e646b0 100644 --- a/core/users/user_setting_edit.php +++ b/core/users/user_setting_edit.php @@ -602,6 +602,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) { + echo " \n"; + } elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) { + echo " \n"; + } + elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) { + echo " \n"; + } else { echo " \n"; } diff --git a/core/users/user_settings.php b/core/users/user_settings.php index 651a21be4f..ec81d880b2 100644 --- a/core/users/user_settings.php +++ b/core/users/user_settings.php @@ -204,8 +204,14 @@ else { case '24h': echo " ".$text['label-24-hour']; break; } } - else if ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) { - echo " ".ucwords($row['user_setting_value']); + else if ( + ( $category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) || + ( $category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) || + ( $category == "theme" && $subcategory == "menu_style" && $name == "text" ) || + ( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) || + ( $category == "theme" && $subcategory == "logo_align" && $name == "text" ) + ) { + echo " ".$text['label-'.$row['default_setting_value']]; } else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") { echo " ".str_repeat('*', strlen($row['user_setting_value'])); diff --git a/themes/default/template.php b/themes/default/template.php index fcccd08774..9fc30a0d00 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -1542,118 +1542,176 @@ echo ""; ?> - db = $db; - $menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; - $menu_array = $menu->menu_array(); - unset($menu); - ?> + //determine menu behavior + switch ($menu_style) { + case 'inline': + $menu_type = 'default'; + $menu_width = 'calc(100% - 40px)'; + $menu_brand = false; + break; + case 'static': + $menu_type = 'static-top'; + $menu_width = 'calc(100% - 40px)'; + $menu_brand = true; + break; + case 'fixed': + default: + $menu_position = ($menu_position != '') ? $menu_position : 'top'; + $menu_type = 'fixed-'.$menu_position; + $menu_width = 'calc(90% - 40px)'; + $menu_brand = true; + } + ?> - + -
+ + + //determine menu configuration + $menu = new menu; + $menu->db = $db; + $menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; + $menu_array = $menu->menu_array(); + unset($menu); + + $menu_style = ($_SESSION['theme']['menu_style']['text'] != '') ? $_SESSION['theme']['menu_style']['text'] : 'fixed'; + $menu_position = ($_SESSION['theme']['menu_position']['text']) ? $_SESSION['theme']['menu_position']['text'] : 'top'; + $open_container = "
"; + + switch ($menu_style) { + case 'inline': + $logo_align = ($_SESSION['theme']['logo_align']['text'] != '') ? $_SESSION['theme']['logo_align']['text'] : 'left'; + echo str_replace("center", $logo_align, $open_container); + if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/resources/install.php") { + $logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/enhanced/images/logo.png"; + echo ""; + } + + show_menu($menu_array, $menu_style, $menu_position); + $body_top_style = "style='padding-top: 0px; margin-top: -8px;'"; + break; + case 'static': + echo $open_container; + show_menu($menu_array, $menu_style, $menu_position); + $body_top_style = "style='padding-top: 10px;'"; + break; + case 'fixed': + show_menu($menu_array, $menu_style, $menu_position); + echo $open_container; + switch ($menu_position) { + case 'bottom': $body_top_style = "style='padding-top: 30px;'"; break; + case 'top': $body_top_style = "style='margin-top: 65px;'"; break; + } + } + ?> + + > -
+