Theme: Minor CSS tweaks.

Ring Groups: Rework forwarding controls - integrate into Dashboard view and Ring Group edit page.

core/user_settings/app_languages.php

@@ -1078,17 +1078,6 @@ $text['header-user_dashboard']['ro'] = "Panou control utilizator";
 $text['header-user_dashboard']['fa'] = "";
 $text['header-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
 
-$text['header-ring_groups']['en-us'] = "Ring Groups";
-$text['header-ring_groups']['es-cl'] = "Grupo de llamado";
-$text['header-ring_groups']['fr-fr'] = "Groupes de Sonnerie";
-$text['header-ring_groups']['pt-pt'] = "Grupos";
-$text['header-ring_groups']['pt-br'] = "Configurações da Conta";
-$text['header-ring_groups']['pl'] = "Grupy odbiorców rozmów";
-$text['header-ring_groups']['sv-se'] = "Ringgrupper";
-$text['header-ring_groups']['uk'] = "Групи";
-$text['header-ring_groups']['de-at'] = "Rufgruppen";
-$text['header-ring_groups']['he'] = "קבוצות חיוג";
-
 $text['header-call_routing']['en-us'] = "Call Routing";
 $text['header-call_routing']['es-cl'] = "Enrutamiento de Llamadas";
 $text['header-call_routing']['pt-pt'] = "Roteamento de Chamadas";
@@ -1293,4 +1282,4 @@ $text['button-view_all']['ro'] = "";
 $text['button-view_all']['de-at'] = "Alle anzeigen";
 $text['button-view_all']['he'] = "הצג הכל";
 
-?>
+?>

core/user_settings/user_dashboard.php

@@ -1186,7 +1186,7 @@ if (!is_array($selected_blocks) || in_array('routing', $selected_blocks) || in_a
 			if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/calls/calls.php")) {
 				if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) {
 					$is_included = "true";
-					echo "<div class='col-xs-12 col-sm-12 col-md-7 col-lg-7' style='margin: 0 0 20px 0;'>\n";
+					echo "<div class='col-xs-12 col-sm-12 col-md-6 col-lg-7' style='margin: 0 0 20px 0;'>\n";
 					echo "	<div style='float: right;'><input id='btn_viewall_callrouting' type='button' class='btn' style='display: none;' value='".$text['button-view_all']."' onclick=\"document.location.href='".PROJECT_PATH."/app/calls/calls.php';\"></div>\n";
 					echo "	<div style='float: left;'><b>".$text['header-call_routing']."</b><br /><br /></div>\n";
 					require_once "app/calls/calls.php";
@@ -1196,7 +1196,6 @@ if (!is_array($selected_blocks) || in_array('routing', $selected_blocks) || in_a
 	}
 
 	if (!is_array($selected_blocks) || in_array('ring_groups', $selected_blocks)) {
-
 		//reload language values
 			$language = new text;
 			$text = $language->get();
@@ -1205,11 +1204,9 @@ if (!is_array($selected_blocks) || in_array('routing', $selected_blocks) || in_a
 			if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/ring_groups/ring_group_forward.php")) {
 				if (permission_exists('ring_group_forward')) {
 					$is_included = "true";
-					echo "<div class='col-xs-12 col-sm-12 col-md-5 col-lg-5' style='margin: 0 0 50px 0;'>\n";
-					echo "	<div style='float: right;'><input id='btn_viewall_ringgroups' type='button' class='btn' style='display: none;' value='".$text['button-view_all']."' onclick=\"document.location.href='".PROJECT_PATH."/app/ring_groups/ring_group_forward.php';\"></div>\n";
-					echo "	<div style='float: left;'><b>".$text['header-ring_groups']."</b><br /><br /></div>\n";
+					echo "<div class='col-xs-12 col-sm-12 col-md-6 col-lg-5' style='margin: 0 0 50px 0;'>\n";
 					require_once "app/ring_groups/ring_group_forward.php";
-					echo "</div>\n";
+					echo "</div>";
 				}
 			}
 	}

themes/default/template.php

@@ -625,7 +625,6 @@
 	input.btn, input.button {
 		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 		padding: 3px 8px 4px 8px;
-		margin-top: -1px;
 		color: #fff;
 		font-weight: bold;
 		cursor: pointer;
@@ -643,6 +642,8 @@
 		text-shadow: 0px 0px 1px rgba(0, 0, 0, 0.85);
 		opacity: 0.9;
 		-moz-opacity: 0.9;
+		height: 27px;
+		margin: 1px;
 		}
 
 	input.btn:hover, input.button:hover, img.list_control_icon:hover,
@@ -662,8 +663,9 @@
 		font-size: 12px;
 		color: #000;
 		text-align: left;
+		height: 27px;
 		padding: 4px 6px;
-		margin: 0 1px 1px 0;
+		margin: 1px;
 		border: 1px solid #c0c0c0;
 		background-color: #fff;
 		box-shadow: 0 0 3px #cddaf0 inset;
@@ -690,6 +692,7 @@
 	select.formfld {
 		height: 27px;
 		padding: 4px;
+		margin: 1px;
 		}
 
 	.formfld_highlight_bad {
@@ -706,10 +709,6 @@
 		box-shadow: 0 0 3px #2fb22f inset;
 		}
 
-	input.txt {
-		width: 98.75%;
-		}
-
 	/* removes spinners (increment/decrement controls) inside input fields */
 	input[type=number] { -moz-appearance: textfield; }
 	::-webkit-inner-spin-button { -webkit-appearance: none; }
@@ -881,7 +880,8 @@
 		}
 
 	.row_style_slim {
-		padding: 0;
+		padding-top: 0;
+		padding-bottom: 0;
 		white-space: nowrap;
 		}