Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

core/databases/databases.php

@@ -76,7 +76,7 @@ else {
 		}
 
 	//prepare to page the results
-		$rows_per_page = 150;
+		$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 		$param = "";
 		$page = $_GET['page'];
 		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }

core/default_settings/app_defaults.php

@@ -50,6 +50,13 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_description'] = 'outbound,loopback,lcr';
 		$x++;
+		$array[$x]['default_setting_category'] = 'domain';
+		$array[$x]['default_setting_subcategory'] = 'paging';
+		$array[$x]['default_setting_name'] = 'numeric';
+		$array[$x]['default_setting_value'] = '100';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the maximum number of records displayed per page. (Default: 50)';
+		$x++;
 		$array[$x]['default_setting_category'] = 'security';
 		$array[$x]['default_setting_subcategory'] = 'password_length';
 		$array[$x]['default_setting_name'] = 'var';

core/default_settings/default_setting_edit.php

@@ -445,36 +445,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='default_setting_value' name='default_setting_value' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='255' value=\"".$default_setting_value."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='default_setting_value' name='default_setting_value' value=\"".$default_setting_value."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {

core/default_settings/default_settings.php

@@ -417,6 +417,14 @@ else {
 				echo "		".str_repeat('*', strlen($row['default_setting_value']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['default_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['default_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['default_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['default_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['default_setting_value']);
 			}
 			echo "		&nbsp;\n";

core/domain_settings/domain_setting_edit.php

@@ -542,36 +542,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='domain_setting_value' name='domain_setting_value' maxlength='255' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" value=\"".$row['domain_setting_value']."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='domain_setting_value' name='domain_setting_value' value=\"".$row['domain_setting_value']."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {

core/domain_settings/domain_settings.php

@@ -115,7 +115,7 @@ if (sizeof($_REQUEST) > 1) {
 	}
 
 //prepare to page the results
-	$rows_per_page = 200;
+	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 200;
 	$param = "";
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
@@ -240,12 +240,20 @@ if (sizeof($_REQUEST) > 1) {
 				( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
 				) {
-				echo "		".$text['label-'.$row['default_setting_value']];
+				echo "		".$text['label-'.$row['domain_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']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['domain_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['domain_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['domain_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['domain_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['domain_setting_value']);
 			}
 			echo "		&nbsp;\n";

core/domain_settings/domains.php

@@ -132,7 +132,7 @@ require_once "resources/check_auth.php";
 	}
 
 //prepare to page the results
-	$rows_per_page = 100;
+	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = "";
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }

core/menu/menu.php

@@ -75,7 +75,7 @@ else {
 		}
 
 	//prepare to page the results
-		$rows_per_page = 150;
+		$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 		$param = "";
 		$page = $_GET['page'];
 		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }

core/users/user_setting_edit.php

@@ -544,36 +544,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='user_setting_value' name='user_setting_value' maxlength='255' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" value=\"".$row['user_setting_value']."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='user_setting_value' name='user_setting_value' value=\"".$row['user_setting_value']."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {

core/users/user_settings.php

@@ -82,7 +82,7 @@ else {
 	}
 
 //prepare to page the results
-	$rows_per_page = 200;
+	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 100;
 	$param = "";
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
@@ -211,12 +211,20 @@ else {
 				( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
 				) {
-				echo "		".$text['label-'.$row['default_setting_value']];
+				echo "		".$text['label-'.$row['user_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']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['user_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['user_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['user_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['user_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['user_setting_value']);
 			}
 			echo "		&nbsp;\n";

core/users/users.php

@@ -103,7 +103,7 @@ else {
 		}
 	}
 	unset ($prep_statement, $result, $sql);
-	$rows_per_page = 200;
+	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = "search=".$search_value;
 	if (permission_exists('user_all') && $_GET['showall'] == 'true') {
 		$param .= "&showall=true";

resources/paging.php

@@ -27,7 +27,7 @@
 function paging($num_rows, $param, $rows_per_page, $mini = false) {
 
 	if (strlen($rows_per_page)==0) {
-		$rows_per_page = "5"; //default number of rows per page
+		$rows_per_page = 50; //default number of rows per page
 	}
 
 

themes/default/app_defaults.php

@@ -302,6 +302,147 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '#69e5ff';
 		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the hover text color (and opacity) of sub menu items.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the font of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '15px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#952424';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the font of body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of the body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#5f5f5f';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of the body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'text_link_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#004083';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the link color (and opacity) of text links outside tables.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'text_link_color_hover';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#5082ca';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the hover color (and opacity) of text links outside tables.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text font of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text size of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#3164ad';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'none';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#a4aebf';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom border color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text font of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text size of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#000';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_dark';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#e5e9f0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the darker background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_medium';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#f0f2f6';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the medium background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_light';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#fff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the lighter background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#c5d1e5';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom border (dividing line) color (and opacity) of table data rows.';
+
 
 	//get an array of the default settings
 		$sql = "select * from v_default_settings ";

themes/default/config.php

@@ -1,12 +1,12 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<img src='".PROJECT_PATH."/themes/default/images/icon_edit.png' class='list_control_icon'>";
-	$v_link_label_add = "<img src='".PROJECT_PATH."/themes/default/images/icon_add.png' class='list_control_icon'>";
-	$v_link_label_delete = "<img src='".PROJECT_PATH."/themes/default/images/icon_delete.png' class='list_control_icon'>";
-	$v_link_label_view = "<img src='".PROJECT_PATH."/themes/default/images/icon_view.png' class='list_control_icon'>";
-	$v_link_label_play = "<img src='".PROJECT_PATH."/themes/default/images/icon_play.png' class='list_control_icon'>";
-	$v_link_label_pause = "<img src='".PROJECT_PATH."/themes/default/images/icon_pause.png' class='list_control_icon'>";
-	$v_link_label_download = "<img src='".PROJECT_PATH."/themes/default/images/icon_download.png' class='list_control_icon'>";
+	$v_link_label_edit = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-pencil'></span></button>";
+	$v_link_label_add = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-plus'></span></button>";
+	$v_link_label_delete = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-remove'></span></button>";
+	$v_link_label_view = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-eye-open'></span></button>";
+	$v_link_label_play = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-play'></span></button>";
+	$v_link_label_pause = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-pause'></span></button>";
+	$v_link_label_download = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-cloud-download'></span></button>";
 
 ?>

themes/default/template.php

@@ -154,6 +154,11 @@
 
 <style type='text/css'>
 
+	html {
+		height: 100%;
+		width: 100%;
+		}
+
 	body {
 		z-index: 1;
 		position: absolute;
@@ -177,6 +182,10 @@
 		?>
 		background-repeat: no-repeat;
 		background-attachment: fixed;
+		webkit-background-size:cover;
+		-moz-background-size:cover;
+		-o-background-size:cover;
+		background-size:cover;
 		}
 
 	div#footer {
@@ -201,7 +210,7 @@
 		color: <?php echo ($_SESSION['theme']['footer_color']['text'] != '') ? $_SESSION['theme']['footer_color']['text'] : 'rgba(255,255,255,0.3)'; ?>;
 		}
 
-/* BOOTSTRAP MENU: BEGIN ******************************************************************/
+/* MENU: BEGIN ******************************************************************/
 
 	/* main menu container */
 	.navbar {
@@ -232,6 +241,7 @@
 	/* menu brand text */
 	.navbar-header > div > a.navbar-brand {
 		color: <?php echo ($_SESSION['theme']['menu_brand_text_color']['text'] != '') ? $_SESSION['theme']['menu_brand_text_color']['text'] : 'rgba(255,255,255,0.80)'; ?>;
+		white-space: nowrap;
 		}
 
 	.navbar-header > div > a.navbar-brand:hover {
@@ -371,6 +381,78 @@
 		cursor: pointer;
 		}
 
+/* BUTTONS ********************************************************************/
+
+	/* default buttons */
+	button.btn-default {
+		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+		padding: 4px 8px;
+		color: #fff;
+		font-weight: bold;
+		font-size: 8pt;
+		border: 1px solid #26242a;
+		background: #3e3e3e;
+		background-image: -moz-linear-gradient(top, #000 25%, #3e3e3e 64%);
+		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #000), color-stop(0.64, #3e3e3e));
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+		-khtml-border-radius: 3px;
+		border-radius: 3px;
+		text-align: center;
+		text-transform: uppercase;
+		text-shadow: 0px 0px 1px rgba(0,0,0,0.9);
+		opacity: 0.9;
+		-moz-opacity: 0.9;
+		}
+
+	button.btn-default:hover, .btn-default:active, .btn-default:focus {
+		cursor: pointer;
+		color: #fff;
+		border: 1px solid #26242a;
+		box-shadow: 0 0 5px #cddaf0;
+		-webkit-box-shadow: 0 0 5px #cddaf0;
+		-moz-box-shadow: 0 0 5px #cddaf0;
+		opacity: 1.0;
+		-moz-opacity: 1.0;
+		}
+
+	/* control icons */
+	button.list_control_icon,
+	button.list_control_icon_disabled {
+		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
+		padding: 2px;
+		color: #fff;
+		font-weight: normal;
+		font-size: 10.5pt;
+		width: 24px;
+		height: 24px;
+		margin: 1px;
+		border: 1px solid #26242a;
+		background: #3e3e3e;
+		background-image: -moz-linear-gradient(top, #000 25%, #3e3e3e 64%);
+		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #000), color-stop(0.64, #3e3e3e));
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+		-khtml-border-radius: 3px;
+		border-radius: 3px;
+		text-align: center;
+		text-shadow: 0px 0px 1px rgba(0,0,0,1.0);
+		opacity: 0.3;
+		-moz-opacity: 0.3;
+		}
+
+	button.list_control_icon:hover, button.list_control_icon:active, button.list_control_icon:focus {
+		cursor: pointer;
+		color: #fff;
+		border: 1px solid #26242a;
+		box-shadow: 0 0 5px #cddaf0;
+		-webkit-box-shadow: 0 0 5px #cddaf0;
+		-moz-box-shadow: 0 0 5px #cddaf0;
+		opacity: 1.0;
+		-moz-opacity: 1.0;
+		}
+
+
 /* DOMAIN SELECTOR ***********************************************************/
 
 	#domains_container {
@@ -492,99 +574,54 @@
 		text-align: left;
 		}
 
-/* GENERAL ELEMENTS *****************************************************************/
-
-	img {
-		border: none;
-		}
-
-	a {
-		color: #004083;
-		width: 100%;
-		}
-
-	a:hover {
-		color: #5082ca;
+	/* default body padding */
+	.container-fluid {
+		width: 90%;
 		}
 
-	.title {
-		color: #952424;
-		font-size: 15px;
-		font-family: arial;
-		font-weight: bold
-		}
+	/* maximize viewport usage on xs displays */
+	@media(min-width: 0px) and (max-width: 767px) {
+		.container-fluid {
+			width: 100%;
+			}
 
-	b {
-		color: #952424;
-		font-size: 15px;
-		font-family: arial;
+		#main_content {
+			padding: 8px;
 		}
-
-	th {
-		border-bottom: 1px solid #a4aebf;
-		text-align: left;
-		color: #3164AD;
-		font-size: 12px;
-		font-family: arial;
-		padding-top: 4px;
-		padding-bottom: 4px;
-		padding-right: 7px;
-		padding-left: 0;
 		}
 
-	th a:link{ color:#3164AD; text-decoration: none; }
-	th a:visited{ color:#3164AD; }
-	th a:hover{ color:#5082ca; text-decoration: underline; }
-	th a:active{ color:#3164AD; }
-
-	td {
-		color: #5f5f5f;
-		font-size: 12px;
-		font-family: arial;
-		}
+/* GENERAL ELEMENTS *****************************************************************/
 
-	td.list_control_icons {
-		/* multiple icons exist (horizontally) */
-		padding: none;
-		padding-left: 2px;
-		width: 50px;
-		text-align: right;
-		vertical-align: top;
-		white-space: nowrap;
+	img {
+		border: none;
 		}
 
-	td.list_control_icon {
-		/* a single icon exists */
-		padding: none;
-		padding-left: 3px;
-		width: 25px;
-		text-align: right;
-		vertical-align: top;
-		white-space: nowrap;
+	.title, b {
+		color: <?php echo ($_SESSION['theme']['heading_text_color']['text'] != '') ? $_SESSION['theme']['heading_text_color']['text'] : '#952424'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['heading_text_size']['text'] != '') ? $_SESSION['theme']['heading_text_size']['text'] : '15px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['heading_text_font']['text'] != '') ? $_SESSION['theme']['heading_text_font']['text'] : 'arial'; ?>;
+		font-weight: bold
 		}
 
-	img.list_control_icon {
-		margin: 2px;
-		width: 21px;
-		height: 21px;
-		border: none;
-		opacity: 0.4;
-		-moz-opacity: 0.4;
+	a {
+		color: <?php echo ($_SESSION['theme']['text_link_color']['text'] != '') ? $_SESSION['theme']['text_link_color']['text'] : '#004083'; ?>;
+		width: 100%;
 		}
 
-	img.list_control_icon_disabled {
-		margin: 2px;
-		width: 21px;
-		height: 21px;
-		border: none;
-		opacity: 0.4;
-		-moz-opacity: 0.4;
+	a:hover {
+		color: <?php echo ($_SESSION['theme']['text_link_color_hover']['text'] != '') ? $_SESSION['theme']['text_link_color_hover']['text'] : '#5082ca'; ?>;
 		}
 
 	form {
 		margin: 0;
 		}
 
+	.frm {
+		border: solid 1px #ccc;
+		color: #666;
+		background-color: #EFEFEF;
+		}
+
 	input.btn, input.button {
 		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 		padding: 3px 8px 4px 8px;
@@ -685,6 +722,7 @@
 
 	input.fileinput {
 		padding: 1px;
+		display: inline;
 		}
 
 	label {
@@ -692,8 +730,68 @@
 		vertical-align: middle;
 		}
 
+	span.playback_progress_bar {
+		background-color: #c43e42;
+		height: 1px;
+		display: block;
+		}
+
 /* TABLES *****************************************************************/
 
+	th {
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_heading_border_color']['text'] != '') ? $_SESSION['theme']['table_heading_border_color']['text'] : '#a4aebf'; ?>;
+		text-align: left;
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_heading_background_color']['text'] != '') ? $_SESSION['theme']['table_heading_background_color']['text'] : 'none'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['table_heading_text_size']['text'] != '') ? $_SESSION['theme']['table_heading_text_size']['text'] : '12px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_heading_text_font']['text'] != '') ? $_SESSION['theme']['table_heading_text_font']['text'] : 'arial'; ?>;
+		padding: 4px 7px 4px 0;
+		padding: 4px 7px;
+		}
+
+	th a, th a:visited, th a:active {
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		text-decoration: none;
+		}
+
+	th a:hover {
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		text-decoration: underline;
+		}
+
+	td {
+		color: <?php echo ($_SESSION['theme']['body_text_color']['text'] != '') ? $_SESSION['theme']['body_text_color']['text'] : '#5f5f5f'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['body_text_size']['text'] != '') ? $_SESSION['theme']['body_text_size']['text'] : '12px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['body_text_font']['text'] != '') ? $_SESSION['theme']['body_text_font']['text'] : 'arial'; ?>;
+		}
+
+	table.tr_hover tr {
+		cursor: default;
+		}
+
+	table.tr_hover tr:hover td,
+	table.tr_hover tr:hover td a {
+		color: <?php echo ($_SESSION['theme']['text_link_color_hover']['text'] != '') ? $_SESSION['theme']['text_link_color_hover']['text'] : '#5082ca'; ?>;
+		}
+
+	td.list_control_icons {
+		width: 52px;
+		padding: none;
+		padding-left: 2px;
+		text-align: right;
+		vertical-align: top;
+		white-space: nowrap;
+		}
+
+	td.list_control_icon {
+		width: 26px;
+		padding: none;
+		padding-left: 2px;
+		text-align: right;
+		vertical-align: top;
+		white-space: nowrap;
+		}
+
 	.vncell {
 		border-bottom: 1px solid #fff;
 		background-color: #e5e9f0;
@@ -762,143 +860,41 @@
 		height: 33px;
 		}
 
-	.listbg {
-		border-bottom: 1px solid #a4aebf;
-		font-size: 11px;
-		background-color: #990000;
-		color: #000;
-		padding: 4px 16px 4px 6px;
-		}
-
-	table.tr_hover tr {
-		background-color: transparent;
-		cursor: default;
-		}
-
-	table.tr_hover tr:hover td,
-	table.tr_hover tr:hover td a {
-		color: #5082ca;
-		}
-
 	.row_style0 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #e5e9f0;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_dark']['text'] != '') ? $_SESSION['theme']['table_row_background_color_dark']['text'] : '#e5e9f0'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
 	.row_style1 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #fff;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_light']['text'] != '') ? $_SESSION['theme']['table_row_background_color_light']['text'] : '#fff'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
-	.row_style2 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #fff;
-		color: #000;
-		text-align: center;
-		padding: 0 1px 0 1px;
-		width: 51px;
+	.row_style_slim {
+		padding: 0;
 		white-space: nowrap;
 		}
 
-	.row_style_hor_mir_grad {
-		background: -moz-linear-gradient(left, #e5e9f0 0%, #fff 25%, #fff 75%, #e5e9f0 100%);
-		background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e5e9f0), color-stop(25%,#fff), color-stop(75%,#fff), color-stop(100%,#e5e9f0));
-		background: -webkit-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: -o-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: -ms-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: linear-gradient(to right, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e9f0', endColorstr='#e5e9f0',GradientType=1 );
-		}
-
 	.row_stylebg {
-		border-bottom: 1px solid #b9c5d8;
-		background-color: #f0f2f6;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>; /* #b9c5d8 */
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_medium']['text'] != '') ? $_SESSION['theme']['table_row_background_color_medium']['text'] : '#f0f2f6'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
-	table th {
-		padding:4px 7px
-		}
-
-	table tr.even td {
-		background:#eee;
-		background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
-		border-bottom: 1px solid #a4aebf;
-		color: #333333;
-		}
-
-	table tr.odd td {
-		border-bottom: 1px solid #a4aebf;
-		color: #000000;
-		}
-
-	table tr:first-child th:first-child {
-		-moz-border-radius-topleft:7px;
-		-webkit-border-top-left-radius:7px;
-		border-top-left-radius:7px;
-		}
-
-	table tr:first-child th:last-of-type {
-		-moz-border-radius-topright:7px;
-		-webkit-border-top-right-radius:7px;
-		border-top-right-radius:7px;
-		}
-
-	table tr:nth-last-child(-5) td:first-of-type {
-		-moz-border-radius-bottomleft:7px;
-		-webkit-border-bottom-left-radius:7px;
-		border-bottom-left-radius:7px;
-		}
-
-	table tr:nth-last-child(-5) td:first-of-type {
-		-moz-border-radius-topleft:7px;
-		-webkit-border-top-left-radius:7px;
-		border-bottom-top-radius:7px;
-		}
-
-	.border {
-		border: solid 1px #a4aebf;
-		}
-
-	.frm {
-		border: solid 1px #ccc;
-		color: #666;
-		background-color: #EFEFEF;
-		}
-
-	.smalltext {
-		color: #bbb;
-		font-size: 11px;
-		font-family: arial;
-		}
-
-	fieldset {
-		padding: 8px;
-		text-align: left;
-		border: 1px solid #aeb7c6;
-		border-radius: 3px;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-		margin: 0;
-		}
-
-	legend {
-		font-size: 13px;
-		font-family: arial;
-		font-weight: bold;
-		color: #3164ad;
-		padding-bottom: 8px;
-		padding-right: 2px;
-		}
-
 /* RESPONSE MESSAGES *******************************************************/
 
 	#message_container {
@@ -956,7 +952,7 @@
 		color: <?php echo $_SESSION['theme']['message_alert_color']['text']; ?>;
 		}
 
-/* OPERATOR PANEL: BEGIN ********************************************************/
+/* OPERATOR PANEL ****************************************************************/
 
 	div.op_ext {
 		float: left;
@@ -1103,15 +1099,7 @@
 		border: 1px solid #5d5f5a;
 		}
 
-/* OPERATOR PANEL: END *******************************************************/
-
-	span.playback_progress_bar {
-		background-color: #c43e42;
-		height: 1px;
-		display: inline-block;
-		}
-
-/* USER DASHBOARD: BEGIN *****************************************************/
+/* USER DASHBOARD ****************************************************************/
 
 	/* login message */
 	div.login_message {
@@ -1412,47 +1400,6 @@
 			$("input.txt, textarea.txt, .formfld").autosizeInput();
 
 
-		//audio playback functions
-			img_play = new Image();	img_play.src = "<?php echo PROJECT_PATH; ?>/themes/default/images/icon_play.png";
-			img_pause = new Image(); img_pause.src = "<?php echo PROJECT_PATH; ?>/themes/default/images/icon_pause.png";
-
-			var recording_audio;
-
-			function recording_play(recording_id) {
-				if (document.getElementById('recording_progress_bar_'+recording_id)) {
-					document.getElementById('recording_progress_bar_'+recording_id).style.display='';
-				}
-				recording_audio = document.getElementById('recording_audio_'+recording_id)
-
-				if (recording_audio.paused) {
-					recording_audio.volume = 1;
-					recording_audio.play();
-					document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo str_replace("class='list_control_icon'", "class='list_control_icon' style='opacity: 1;'", $v_link_label_pause); ?>";
-				}
-				else {
-					recording_audio.pause();
-					document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
-				}
-			}
-
-			function recording_reset(recording_id) {
-				if (document.getElementById('recording_progress_bar_'+recording_id)) {
-					document.getElementById('recording_progress_bar_'+recording_id).style.display='none';
-				}
-				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
-			}
-
-			function update_progress(recording_id) {
-				recording_audio = document.getElementById('recording_audio_'+recording_id);
-				var recording_progress = document.getElementById('recording_progress_'+recording_id);
-				var value = 0;
-				if (recording_audio.currentTime > 0) {
-					value = (100 / recording_audio.duration) * recording_audio.currentTime;
-				}
-				recording_progress.style.width = value + "%";
-			}
-
-
 		//apply bootstrap-datetime plugin
 			$(function() {
 				$('.datetimepicker').datetimepicker({
@@ -1482,6 +1429,46 @@
 
 	});
 
+	//audio playback functions
+		img_play = new Image();	img_play.src = "<?php echo PROJECT_PATH; ?>/themes/default/images/icon_play.png";
+		img_pause = new Image(); img_pause.src = "<?php echo PROJECT_PATH; ?>/themes/default/images/icon_pause.png";
+
+		var recording_audio;
+
+		function recording_play(recording_id) {
+			if (document.getElementById('recording_progress_bar_'+recording_id)) {
+				document.getElementById('recording_progress_bar_'+recording_id).style.display='';
+			}
+			recording_audio = document.getElementById('recording_audio_'+recording_id)
+
+			if (recording_audio.paused) {
+				recording_audio.volume = 1;
+				recording_audio.play();
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo str_replace("class='list_control_icon'", "class='list_control_icon' style='opacity: 1;'", $v_link_label_pause); ?>";
+			}
+			else {
+				recording_audio.pause();
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+			}
+		}
+
+		function recording_reset(recording_id) {
+			if (document.getElementById('recording_progress_bar_'+recording_id)) {
+				document.getElementById('recording_progress_bar_'+recording_id).style.display='none';
+			}
+			document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+		}
+
+		function update_progress(recording_id) {
+			recording_audio = document.getElementById('recording_audio_'+recording_id);
+			var recording_progress = document.getElementById('recording_progress_'+recording_id);
+			var value = 0;
+			if (recording_audio.currentTime > 0) {
+				value = (100 / recording_audio.duration) * recording_audio.currentTime;
+			}
+			recording_progress.style.width = value + "%";
+		}
+
 </script>
 
 <!--{head}-->
@@ -1617,12 +1604,12 @@
 								}
 							//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') {
+								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' || $_SESSION['theme']['menu_brand_type']['text'] == '') {
+								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";
 								}
 						}
@@ -1659,7 +1646,15 @@
 								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_2 = $menu_sub['menu_item_link'];
+										if($mod_a_2 == ''){
+											$mod_a_2 = '#';
+										}
+										else if (($menu_sub['menu_item_category'] == 'internal') ||
+											(($menu_sub['menu_item_category'] == 'external') && substr($mod_a_2, 0,1) == "/"))
+										{
+											$mod_a_2 = PROJECT_PATH . $mod_a_2;
+										}
 										$mod_a_3 = ($menu_sub['menu_item_category'] == 'external') ? "target='_blank' " : null;
 										if ($_SESSION['theme']['menu_sub_icons']['boolean'] == 'true') {
 											$mod_nw = ($menu_sub['menu_item_category'] == 'external') ? "<span class='glyphicon glyphicon-new-window'></span>" : null;
@@ -1707,7 +1702,7 @@
 
 			$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'>";
+			$open_container = "<div class='container-fluid' style='padding: 0;' align='center'>";
 
 			switch ($menu_style) {
 				case 'inline':