Browse Source

Enhance: Default Theme - enable menu style and positioning options.

reliberate 9 năm trước cách đây
mục cha
commit
b2961a94bd

+ 112 - 0
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";

+ 26 - 0
core/default_settings/default_setting_edit.php

@@ -503,6 +503,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='true' ".(($default_setting_value == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='image' ".(($default_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
@@ -510,6 +516,26 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($default_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) {
+		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='fixed' ".(($default_setting_value == "fixed") ? "selected='selected'" : null).">".$text['label-fixed']."</option>\n";
+		echo "    	<option value='static' ".(($default_setting_value == "static") ? "selected='selected'" : null).">".$text['label-static']."</option>\n";
+		echo "    	<option value='inline' ".(($default_setting_value == "inline") ? "selected='selected'" : null).">".$text['label-inline']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) {
+		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='top' ".(($default_setting_value == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
+		echo "    	<option value='bottom' ".(($default_setting_value == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) {
+		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='left' ".(($default_setting_value == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";
+		echo "    	<option value='center' ".(($default_setting_value == "center") ? "selected='selected'" : null).">".$text['label-center']."</option>\n";
+		echo "    	<option value='right' ".(($default_setting_value == "right") ? "selected='selected'" : null).">".$text['label-right']."</option>\n";
+		echo "    </select>\n";
+	}
 	elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";

+ 8 - 2
core/default_settings/default_settings.php

@@ -404,8 +404,14 @@ else {
 					case '24h': echo "		".$text['label-24-hour']; break;
 				}
 			}
-			else if ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) {
-				echo "		".ucwords($row['default_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['default_setting_value']));

+ 112 - 0
core/domain_settings/app_languages.php

@@ -60,6 +60,20 @@ $text['message-delete_failed']['sv-se'] = "Ingen Inställning Markerad";
 $text['message-delete_failed']['uk'] = "Налаштування не вказано";
 $text['message-delete_failed']['de-at'] = "Keine Einstellungen ausgewählt";
 
+$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-tools']['en-us'] = "Tools";
 $text['label-tools']['es-cl'] = "Herramientas";
 $text['label-tools']['pt-pt'] = "Ferramentas";
@@ -84,6 +98,34 @@ $text['label-text']['ro'] = "Text";
 $text['label-text']['fa'] = "";
 $text['label-text']['ar-eg'] = "نص";
 
+$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-parent_domain']['en-us'] = "Parent Domain";
 $text['label-parent_domain']['es-cl'] = "Dominio de los Padres";
 $text['label-parent_domain']['pt-pt'] = "Domínio Parent";
@@ -118,6 +160,34 @@ $text['label-manage']['sv-se'] = "Hantera";
 $text['label-manage']['uk'] = "Керувати";
 $text['label-manage']['de-at'] = "Verwalten";
 
+$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";
@@ -132,6 +202,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-domain']['en-us'] = "Domain";
 $text['label-domain']['es-cl'] = "Dominio";
 $text['label-domain']['pt-pt'] = "Domínio";
@@ -142,6 +226,34 @@ $text['label-domain']['sv-se'] = "Domän";
 $text['label-domain']['uk'] = "Домен";
 $text['label-domain']['de-at'] = "Domain";
 
+$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";

+ 26 - 0
core/domain_settings/domain_setting_edit.php

@@ -600,6 +600,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='true' ".(($row['domain_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) {
 		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
 		echo "    	<option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
@@ -607,6 +613,26 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) {
+		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='fixed' ".(($row['domain_setting_value'] == "fixed") ? "selected='selected'" : null).">".$text['label-fixed']."</option>\n";
+		echo "    	<option value='static' ".(($row['domain_setting_value'] == "static") ? "selected='selected'" : null).">".$text['label-static']."</option>\n";
+		echo "    	<option value='inline' ".(($row['domain_setting_value'] == "inline") ? "selected='selected'" : null).">".$text['label-inline']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) {
+		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='top' ".(($row['domain_setting_value'] == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
+		echo "    	<option value='bottom' ".(($row['domain_setting_value'] == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) {
+		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='left' ".(($row['domain_setting_value'] == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";
+		echo "    	<option value='center' ".(($row['domain_setting_value'] == "center") ? "selected='selected'" : null).">".$text['label-center']."</option>\n";
+		echo "    	<option value='right' ".(($row['domain_setting_value'] == "right") ? "selected='selected'" : null).">".$text['label-right']."</option>\n";
+		echo "    </select>\n";
+	}
 	else {
 		echo "	<input class='formfld' type='text' id='domain_setting_value' name='domain_setting_value' value=\"".$row['domain_setting_value']."\">\n";
 	}

+ 8 - 2
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']));

+ 112 - 0
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";

+ 26 - 0
core/users/user_setting_edit.php

@@ -602,6 +602,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='false' ".(($row['user_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_sub_icons" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='true' ".(($row['user_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($row['user_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "theme" && $subcategory == "menu_brand_type" && $name == "text" ) {
 		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
 		echo "    	<option value='image' ".(($row['user_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
@@ -609,6 +615,26 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($row['user_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_style" && $name == "text" ) {
+		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='fixed' ".(($row['user_setting_value'] == "fixed") ? "selected='selected'" : null).">".$text['label-fixed']."</option>\n";
+		echo "    	<option value='static' ".(($row['user_setting_value'] == "static") ? "selected='selected'" : null).">".$text['label-static']."</option>\n";
+		echo "    	<option value='inline' ".(($row['user_setting_value'] == "inline") ? "selected='selected'" : null).">".$text['label-inline']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) {
+		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='top' ".(($row['user_setting_value'] == "top") ? "selected='selected'" : null).">".$text['label-top']."</option>\n";
+		echo "    	<option value='bottom' ".(($row['user_setting_value'] == "bottom") ? "selected='selected'" : null).">".$text['label-bottom']."</option>\n";
+		echo "    </select>\n";
+	}
+	elseif ($category == "theme" && $subcategory == "logo_align" && $name == "text" ) {
+		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='left' ".(($row['user_setting_value'] == "left") ? "selected='selected'" : null).">".$text['label-left']."</option>\n";
+		echo "    	<option value='center' ".(($row['user_setting_value'] == "center") ? "selected='selected'" : null).">".$text['label-center']."</option>\n";
+		echo "    	<option value='right' ".(($row['user_setting_value'] == "right") ? "selected='selected'" : null).">".$text['label-right']."</option>\n";
+		echo "    </select>\n";
+	}
 	else {
 		echo "	<input class='formfld' type='text' id='user_setting_value' name='user_setting_value' maxlength='255' value=\"".$row['user_setting_value']."\">\n";
 	}

+ 8 - 2
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']));

+ 156 - 98
themes/default/template.php

@@ -1542,118 +1542,176 @@
 	echo "</div>";
 	?>
 
-	<?php if (!$default_login) {
+	<?php
 
-		//*************** BOOTSTRAP MENU ********************************
+	if (!$default_login) {
 
-		//retrieve menu array from database
-		$menu = new menu;
-		$menu->db = $db;
-		$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
-		$menu_array = $menu->menu_array();
-		unset($menu);
-		?>
+		//*************** BOOTSTRAP MENU ********************************
+		function show_menu($menu_array, $menu_style, $menu_position) {
+
+			//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;
+				}
+			?>
 
-		<nav class="navbar navbar-inverse navbar-fixed-top">
-			<div class="container-fluid" style='width: 90%; padding: 0;'>
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
-						<span class="sr-only">Toggle navigation</span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</button>
-					<?php
-					//define menu brand link
-						if (strlen(PROJECT_PATH) > 0) {
-							$menu_brand_link = PROJECT_PATH;
-						}
-						else if (!$default_login) {
-							$menu_brand_link = '/';
-						}
-					//define menu brand mark
-						$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? $_SESSION['theme']['menu_brand_text']['text'] : "FusionPBX";
-						if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
-							$menu_brand_image = (isset($_SESSION['theme']['menu_brand_image']['text'])) ? $_SESSION['theme']['menu_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_header.png";
-							echo "<img class='pull-left hidden-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\">";
-							echo "<img class='pull-left visible-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\" style='margin-left: 21px;'>";
-						}
-						else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
-							echo "<div class='pull-left'><a class='navbar-brand' href=\"".$menu_brand_link."\">".$menu_brand_text."</a></div>\n";
-						}
-					//domain name/selector
-						if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-							echo "<ul class='nav navbar-nav pull-right visible-xs'>\n";
-							echo "<li><a href='#' style='padding: 8px 4px 6px 0;' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".$_SESSION['domain_name']."</a></li>\n";
-							echo "</ul>\n";
-						}
-					?>
-				</div>
-				<div class="collapse navbar-collapse" id="main_navbar">
-					<ul class="nav navbar-nav">
+			<nav class="navbar navbar-inverse navbar-<?php echo $menu_type; ?>">
+				<div class="container-fluid" style='width: <?php echo $menu_width; ?>; padding: 0;'>
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
+							<span class="sr-only">Toggle navigation</span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+						</button>
 						<?php
-						foreach ($menu_array as $index_main => $menu_parent) {
-							$submenu = false;
-							if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
-								$mod_li = "class='dropdown' ";
-								$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
-								$submenu = true;
-							}
-							$mod_a_2 = ($menu_parent['menu_item_link'] != '') ? $menu_parent['menu_item_link'] : '#';
-							$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
-							switch ($menu_parent['menu_item_title']) {
-								case "Home": $glyph = 'home'; break;
-								case "Accounts": $glyph = 'user'; break;
-								case "Dialplan": $glyph = 'transfer'; break;
-								case "Apps": $glyph = 'send'; break;
-								case "Status": $glyph = 'equalizer'; break;
-								case "Advanced": $glyph = 'cog'; break;
-							}
-							echo "<li ".$mod_li.">\n";
-							echo "<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3."><span class='glyphicon glyphicon-".$glyph."' title=\"".$menu_parent['menu_language_title']."\"></span><span class='hidden-sm'>".$menu_parent['menu_language_title'].$mod_title."</span></a>\n";
-							if ($submenu) {
-								echo "<ul class='dropdown-menu'>\n";
-								foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
-									$mod_a_2 = ($menu_sub['menu_item_link'] != '') ? $menu_sub['menu_item_link'] : '#';
-									$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
-									if ($_SESSION['theme']['menu_sub_icons']) {
-										$mod_nw = ($menu_sub['menu_item_category'] == 'external') ? "<span class='glyphicon glyphicon-new-window'></span>" : null;
-										switch ($menu_sub['menu_item_title']) {
-											case 'Logout': $mod_icon = "<span class='glyphicon glyphicon-log-out'></span>"; break;
-											default: $mod_icon = null;
-										}
-									}
-									echo "<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).$menu_sub['menu_language_title'].$mod_icon.$mod_nw."</a></li>\n";
+						if ($menu_brand) {
+							//define menu brand link
+								if (strlen(PROJECT_PATH) > 0) {
+									$menu_brand_link = PROJECT_PATH;
+								}
+								else if (!$default_login) {
+									$menu_brand_link = '/';
+								}
+							//define menu brand mark
+								$menu_brand_text = ($_SESSION['theme']['menu_brand_text']['text'] != '') ? $_SESSION['theme']['menu_brand_text']['text'] : "FusionPBX";
+								if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+									$menu_brand_image = (isset($_SESSION['theme']['menu_brand_image']['text'])) ? $_SESSION['theme']['menu_brand_image']['text'] : PROJECT_PATH."/themes/default/images/logo_header.png";
+									echo "<img class='pull-left hidden-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\">";
+									echo "<img class='pull-left visible-xs navbar-logo' src='".$menu_brand_image."' title=\"".$menu_brand_text."\" onclick=\"document.location.href='".$menu_brand_link."';\" style='margin-left: 21px;'>";
+								}
+								else if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') {
+									echo "<div class='pull-left'><a class='navbar-brand' href=\"".$menu_brand_link."\">".$menu_brand_text."</a></div>\n";
 								}
-								echo "</ul>\n";
-							}
-							echo "</li>\n";
 						}
-						?>
-					</ul>
-					<ul class="nav navbar-nav navbar-right">
-						<?php
 						//domain name/selector
 							if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-								echo "<li class='hidden-xs'><a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".$_SESSION['domain_name']."</a></li>";
-							}
-						//logout icon
-							if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
-								$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
-								echo "<li class='hidden-xs'><a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a></li>";
-								unset($username_full);
+								echo "<ul class='nav navbar-nav pull-right visible-xs'>\n";
+								echo "<li><a href='#' style='padding: 8px 4px 6px 0;' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".$_SESSION['domain_name']."</a></li>\n";
+								echo "</ul>\n";
 							}
 						?>
-					</ul>
+					</div>
+					<div class="collapse navbar-collapse" id="main_navbar">
+						<ul class="nav navbar-nav">
+							<?php
+							foreach ($menu_array as $index_main => $menu_parent) {
+								$submenu = false;
+								if (is_array($menu_parent['menu_items']) && sizeof($menu_parent['menu_items']) > 0) {
+									$mod_li = "class='dropdown' ";
+									$mod_a_1 = "class='dropdown-toggle text-left' data-toggle='dropdown' ";
+									$submenu = true;
+								}
+								$mod_a_2 = ($menu_parent['menu_item_link'] != '') ? $menu_parent['menu_item_link'] : '#';
+								$mod_a_3 = ($menu_parent['menu_item_category'] == 'external') ? "target='_blank' " : null;
+								switch ($menu_parent['menu_item_title']) {
+									case "Home": $glyph = 'home'; break;
+									case "Accounts": $glyph = 'user'; break;
+									case "Dialplan": $glyph = 'transfer'; break;
+									case "Apps": $glyph = 'send'; break;
+									case "Status": $glyph = 'equalizer'; break;
+									case "Advanced": $glyph = 'cog'; break;
+								}
+								echo "<li ".$mod_li.">\n";
+								echo "<a ".$mod_a_1." href='".$mod_a_2."' ".$mod_a_3."><span class='glyphicon glyphicon-".$glyph."' title=\"".$menu_parent['menu_language_title']."\"></span><span class='hidden-sm'>".$menu_parent['menu_language_title'].$mod_title."</span></a>\n";
+								if ($submenu) {
+									echo "<ul class='dropdown-menu'>\n";
+									foreach ($menu_parent['menu_items'] as $index_sub => $menu_sub) {
+										$mod_a_2 = ($menu_sub['menu_item_link'] != '') ? $menu_sub['menu_item_link'] : '#';
+										$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
+										if ($_SESSION['theme']['menu_sub_icons']) {
+											$mod_nw = ($menu_sub['menu_item_category'] == 'external') ? "<span class='glyphicon glyphicon-new-window'></span>" : null;
+											switch ($menu_sub['menu_item_title']) {
+												case 'Logout': $mod_icon = "<span class='glyphicon glyphicon-log-out'></span>"; break;
+												default: $mod_icon = null;
+											}
+										}
+										echo "<li><a href='".$mod_a_2."' ".$mod_a_3.">".(($_SESSION['theme']['menu_sub_icons']) ? "<span class='glyphicon glyphicon-minus visible-xs pull-left' style='margin: 4px 10px 0 25px;'></span>" : null).$menu_sub['menu_language_title'].$mod_icon.$mod_nw."</a></li>\n";
+									}
+									echo "</ul>\n";
+								}
+								echo "</li>\n";
+							}
+							?>
+						</ul>
+						<ul class="nav navbar-nav navbar-right">
+							<?php
+							//domain name/selector
+								if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
+									echo "<li class='hidden-xs'><a href='#' class='domain_selector_domain' title='".$text['theme-label-open_selector']."'>".$_SESSION['domain_name']."</a></li>";
+								}
+							//logout icon
+								if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
+									$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
+									echo "<li class='hidden-xs'><a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."')\"><span class='glyphicon glyphicon-log-out'></span></a></li>";
+									unset($username_full);
+								}
+							?>
+						</ul>
+					</div>
 				</div>
-			</div>
-		</nav>
+			</nav>
+
+			<?php
+		}
+
+
+		//determine menu configuration
+			$menu = new menu;
+			$menu->db = $db;
+			$menu->menu_uuid = $_SESSION['domain']['menu']['uuid'];
+			$menu_array = $menu->menu_array();
+			unset($menu);
 
-		<div class="container-fluid" style='width: 90%; padding: 0;' align='center'>
+			$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 = "<div class='container-fluid' style='width: 90%; padding: 0;' align='center'>";
+
+			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 "<a href='".((PROJECT_PATH != '') ? PROJECT_PATH : '/')."'><img src='".$logo."' style='padding: 15px 20px;'></a>";
+					}
+
+					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;
+					}
+			}
+			?>
 
-			<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+			<table width='100%' border='0' cellpadding='0' cellspacing='0' <?php echo $body_top_style; ?>>
 				<tr>
-					<td align='left' valign='top' style='padding-top: 65px;'>
+					<td align='left' valign='top'>
 						<table border='0' cellpadding='0' cellspacing='0' width='100%'>
 							<tr>
 								<td width='100%' style='padding-right: 15px;' align='right' valign='middle'>