diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php index b3b0a55710..1835c988cd 100644 --- a/core/default_settings/app_languages.php +++ b/core/default_settings/app_languages.php @@ -661,6 +661,26 @@ $text['label-messages']['ru-ru'] = ""; $text['label-messages']['sv-se'] = ""; $text['label-messages']['uk-ua'] = ""; +$text['label-image_text']['en-us'] = "Image & Text"; +$text['label-image_text']['ar-eg'] = ""; +$text['label-image_text']['de-at'] = ""; +$text['label-image_text']['de-ch'] = ""; +$text['label-image_text']['de-de'] = ""; +$text['label-image_text']['es-cl'] = ""; +$text['label-image_text']['es-mx'] = ""; +$text['label-image_text']['fr-ca'] = ""; +$text['label-image_text']['fr-fr'] = ""; +$text['label-image_text']['he-il'] = ""; +$text['label-image_text']['it-it'] = ""; +$text['label-image_text']['nl-nl'] = ""; +$text['label-image_text']['pl-pl'] = ""; +$text['label-image_text']['pt-br'] = ""; +$text['label-image_text']['pt-pt'] = ""; +$text['label-image_text']['ro-ro'] = ""; +$text['label-image_text']['ru-ru'] = ""; +$text['label-image_text']['sv-se'] = ""; +$text['label-image_text']['uk-ua'] = ""; + $text['header-default_settings']['en-us'] = "Default Settings"; $text['header-default_settings']['ar-eg'] = ""; $text['header-default_settings']['de-at'] = "Standard Einstellungen"; //copied from de-de diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index d9d66d9e65..e39c024231 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -534,6 +534,7 @@ echo " \n"; } diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index b95bc0f39f..b2321574ff 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -72,7 +72,9 @@ echo " ".$text['header-user_dashboard']."
"; echo " \n"; echo " \n"; - echo " ".$text['label-welcome']." ".$_SESSION["username"].""; + if ($_SESSION['theme']['menu_style']['text'] != 'side') { + echo " ".$text['label-welcome']." ".$_SESSION["username"].""; + } echo " \n"; echo " \n"; echo " \n"; diff --git a/themes/default/app_languages.php b/themes/default/app_languages.php index 867c1608a1..e9d5e535e0 100644 --- a/themes/default/app_languages.php +++ b/themes/default/app_languages.php @@ -106,7 +106,6 @@ $text['theme-button-close']['sv-se'] = "Stänga"; $text['theme-button-close']['uk-ua'] = "Близько"; $text['theme-button-close']['tr-tr'] = "Kapat"; - $text['theme-label-search']['en-us'] = "Search..."; $text['theme-label-search']['ar-eg'] = ""; $text['theme-label-search']['de-at'] = "Suchen..."; //copied from de-de @@ -170,4 +169,46 @@ $text['theme-label-all_rights_reserved']['sv-se'] = "All rights reserved."; $text['theme-label-all_rights_reserved']['uk-ua'] = ""; $text['theme-label-all_rights_reserved']['tr-tr'] = "Tüm hakları saklıdır."; -?> +$text['theme-label-user']['en-us'] = "User"; +$text['theme-label-user']['ar-eg'] = ""; +$text['theme-label-user']['de-at'] = "Benutzer"; //copied from de-de +$text['theme-label-user']['de-ch'] = "Benutzer"; //copied from de-de +$text['theme-label-user']['de-de'] = "Benutzer"; +$text['theme-label-user']['es-cl'] = "Usuario"; +$text['theme-label-user']['es-mx'] = "Usuario"; //copied from es-cl +$text['theme-label-user']['fr-ca'] = "Utilisateur"; //copied from fr-fr +$text['theme-label-user']['fr-fr'] = "Utilisateur"; +$text['theme-label-user']['he-il'] = ""; +$text['theme-label-user']['it-it'] = "Utente"; +$text['theme-label-user']['nl-nl'] = ""; +$text['theme-label-user']['pl-pl'] = "Użytkownicy"; +$text['theme-label-user']['pt-br'] = "Usuário"; +$text['theme-label-user']['pt-pt'] = "Utilizadore"; +$text['theme-label-user']['ro-ro'] = ""; +$text['theme-label-user']['ru-ru'] = "Пользователь"; +$text['theme-label-user']['sv-se'] = "Användare"; +$text['theme-label-user']['uk-ua'] = "Користувачі"; +$text['theme-label-user']['tr-tr'] = "Користувачі"; + +$text['theme-label-domain']['en-us'] = "Domain"; +$text['theme-label-domain']['ar-eg'] = "النطاق"; +$text['theme-label-domain']['de-at'] = "Domäne"; //copied from de-de +$text['theme-label-domain']['de-ch'] = "Domäne"; //copied from de-de +$text['theme-label-domain']['de-de'] = "Domäne"; +$text['theme-label-domain']['es-cl'] = "Dominio"; +$text['theme-label-domain']['es-mx'] = "Dominio"; //copied from es-cl +$text['theme-label-domain']['fr-ca'] = "Domaine"; //copied from fr-fr +$text['theme-label-domain']['fr-fr'] = "Domaine"; +$text['theme-label-domain']['he-il'] = "דומיין"; +$text['theme-label-domain']['it-it'] = "Dominio"; +$text['theme-label-domain']['nl-nl'] = ""; +$text['theme-label-domain']['pl-pl'] = "Domena"; +$text['theme-label-domain']['pt-br'] = "Dominio"; +$text['theme-label-domain']['pt-pt'] = "Domínio"; +$text['theme-label-domain']['ro-ro'] = "Domeniu"; +$text['theme-label-domain']['ru-ru'] = "Домен"; +$text['theme-label-domain']['sv-se'] = "Domän"; +$text['theme-label-domain']['uk-ua'] = "Домен"; +$text['theme-label-domain']['tr-tr'] = "Alan Adı"; + +?> \ No newline at end of file diff --git a/themes/default/css.php b/themes/default/css.php index c9aa771a34..792bc049ee 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -387,6 +387,13 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; text-decoration: none; } + a#header_domain_selector_domain:hover, + a#header_domain_selector_domain:focus, + a#header_domain_selector_domain:active { + text-decoration: none; + cursor: pointer; + } + /* logout icon */ a.logout_icon { display: inline-block; @@ -396,6 +403,15 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; margin-left: 10px; } + a#header_logout_icon { + display: inline-block; + font-size: 11pt; + padding-left: 5px; + padding-right: 5px; + margin-left: 5px; + margin-right: 5px; + } + a.logout_icon:hover, a.logout_icon:focus, a.logout_icon:active { @@ -433,7 +449,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; position: fixed; top: 0; left: 0; - width: 225px; + width: px; height: 100%; overflow: auto; @@ -490,7 +506,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; width: auto; max-height: 30px; max-width: 185px; - margin-right: 10px; + margin-right: 5px; } /* menu brand text */ @@ -502,6 +518,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; .menu_brand_text:hover { color: ; + text-decoration: none; } a.menu_side_item_main { @@ -543,6 +560,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; text-decoration: none; } + a.menu_side_toggle { + padding: 10px; + cursor: pointer; + } /* BUTTONS ********************************************************************/ @@ -882,6 +903,12 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; } } + div#content_header { + padding: 10px; + margin-top: 5px; + height: 40px; + } + /* GENERAL ELEMENTS *****************************************************************/ img { diff --git a/themes/default/template.php b/themes/default/template.php index dd9b6b32d5..7f9feebd62 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -89,6 +89,38 @@ } } + //toggle side menu visibility (if enabled) + var menu_side_state = 'contracted'; + function menu_side_contract() { + $('.menu_side_sub').slideUp(180); + + $('.menu_brand_text').hide(); + + $('.menu_side_item_title').hide(); + $('#menu_brand_image').animate({ width: '20px', 'margin-left': '-2px' }, 250); + $('#menu_side_container').animate({ width: 'px' }, 250); + $('#content_container').animate({ width: $(window).width() - }, 250, function() { + menu_side_state = 'contracted'; + }); + $('.menu_side_contract').hide(); + $('.menu_side_expand').show(); + } + + function menu_side_expand() { + $('#menu_brand_image').animate({ width: '30px', 'margin-left': '0' }, 250); + $('#menu_side_container').animate({ width: 'px' }, 250); + $('#content_container').animate({ width: $(window).width() - }, 250, function() { + + $('.menu_brand_text').fadeIn(180); + + $('.menu_side_item_title').fadeIn(180); + menu_side_state = 'expanded'; + }); + $('.menu_side_expand').hide(); + $('.menu_side_contract').show(); + } + + $(document).ready(function() { @@ -105,6 +137,7 @@ //domain selector controls $(".domain_selector_domain").click(function() { show_domains(); }); + $("#header_domain_selector_domain").click(function() { show_domains(); }); $("#domains_hide").click(function() { hide_domains(); }); function show_domains() { @@ -222,6 +255,18 @@ }); + + //create resizeEnd event + $(window).resize(function() { + if (this.resizeTO) { clearTimeout(this.resizeTO); } + this.resizeTO = setTimeout(function() { $(this).trigger('resizeEnd'); }, 180); + }); + //side menu: adjust content container width after window resize + $(window).on('resizeEnd', function() { + $('#content_container').animate({ width: $(window).width() - $('#menu_side_container').width() }, 200); + }); + + }); //audio playback functions @@ -365,11 +410,11 @@ // qr code container for contacts - echo ""; + echo "\n"; if (!$default_login) { @@ -533,13 +578,12 @@ $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'; $logo_style = ($_SESSION['theme']['logo_style']['text'] != '') ? $_SESSION['theme']['logo_style']['text'] : ''; - echo str_replace("center", $logo_align, $open_container); + echo "
\n"; if ($_SERVER['PHP_SELF'] != PROJECT_PATH."/core/install/install.php") { $logo = ($_SESSION['theme']['logo']['text'] != '') ? $_SESSION['theme']['logo']['text'] : PROJECT_PATH."/themes/default/images/logo.png"; echo ""; @@ -548,74 +592,104 @@ show_menu($menu_array, $menu_style, $menu_position); break; case 'static': - echo $open_container; + echo "
\n"; show_menu($menu_array, $menu_style, $menu_position); break; case 'fixed': show_menu($menu_array, $menu_style, $menu_position); - echo $open_container; + echo "
\n"; break; case 'side': - echo "