Prechádzať zdrojové kódy

Merge pull request #3 from fusionpbx/master

Merge from master
Mafoo 9 rokov pred
rodič
commit
aae78c94d3

+ 3 - 0
core/databases/app_defaults.php

@@ -131,6 +131,9 @@ if ($domains_processed == 1) {
 			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
 				$tmp .= correct_path("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
 			}
+			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
+				$tmp .= correct_path("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
+			}
 			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
 				$tmp .= correct_path("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
 			}

+ 2 - 2
themes/enhanced/template.php

@@ -251,7 +251,7 @@ form {
 	margin: 0;
 	}
 
-input.btn, input.button {
+input.btn, input.button, button {
 	font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 	padding: 2px 6px 3px 6px;
 	color: #fff;
@@ -273,7 +273,7 @@ input.btn, input.button {
 	-moz-opacity: 0.9;
 	}
 
-input.btn:hover, input.button:hover, img.list_control_icon:hover {
+input.btn:hover, input.button:hover, img.list_control_icon:hover, button:hover {
 	box-shadow: 0 0 5px #cddaf0;
 	-webkit-box-shadow: 0 0 5px #cddaf0;
 	-moz-box-shadow: 0 0 5px #cddaf0;