dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Fix datetimepicker on Time Conditions, CDR, Contact Times, etc.

Browse Source 
Misc: Fix textarea height.
Theme: CSS adjustments to correct misc bugs.
This commit is contained in:
reliberate
2016-04-13 13:23:07 -06:00
parent f0372faed1
commit aeabb4a072
13 changed files with 156 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/call_broadcast/call_broadcast.php
+1 -1
View File
@@ -129,7 +129,7 @@ else {
echo "<tr>\n";
echo "<td colspan='5' align='left'>\n";
echo " <table width='100%' cellpadding='0' cellspacing='0'>\n";
echo " <tr>\n";
echo " <tr class='tr_link_void'>\n";
echo " <td width='33.3%' nowrap>&nbsp;</td>\n";
echo " <td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
echo " <td class='list_control_icons'>";
app/conference_centers/conference_room_edit.php
+3 -7
View File
@@ -676,13 +676,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "<tr>\n";
echo "<td class='vncell' valign='top' nowrap='nowrap' width='30%'>".$text['label-schedule']."</td>\n";
echo "<td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
echo " <div class='row'>\n";
echo " <div class='col-sm-12'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_datetime' id='start_datetime' placeholder='".$text['label-from']."' value='".$start_datetime."'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='stop_datetime' id='stop_datetime' placeholder='".$text['label-to']."' value='".$stop_datetime."'>\n";
echo " </div>\n";
echo " </div>\n";
echo "<td class='vtable' width='70%' align='left' style='position: relative; min-width: 275px;'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_datetime' id='start_datetime' placeholder='".$text['label-from']."' value='".$start_datetime."'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='stop_datetime' id='stop_datetime' placeholder='".$text['label-to']."' value='".$stop_datetime."'>\n";
echo " <br>".$text['description-schedule'];
echo "</td>\n";
echo "</tr>\n";
app/contacts/contact_phone_edit.php
+4 -4
View File
@@ -288,10 +288,10 @@ if (strlen($_GET["contact_uuid"]) > 0) {
echo " ".$text['label-phone_type']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <input type='checkbox' name='phone_type_voice' id='phone_type_voice' value='1' ".(($phone_type_voice) ? "checked='checked'" : null)."><label for='phone_type_voice'>&nbsp;".$text['label-voice']."</label>&nbsp;\n";
echo " <input type='checkbox' name='phone_type_fax' id='phone_type_fax' value='1' ".(($phone_type_fax) ? "checked='checked'" : null)."><label for='phone_type_fax'>&nbsp;".$text['label-fax']."</label>&nbsp;\n";
echo " <input type='checkbox' name='phone_type_video' id='phone_type_video' value='1' ".(($phone_type_video) ? "checked='checked'" : null)."><label for='phone_type_video'>&nbsp;".$text['label-video']."</label>&nbsp;\n";
echo " <input type='checkbox' name='phone_type_text' id='phone_type_text' value='1' ".(($phone_type_text) ? "checked='checked'" : null)."><label for='phone_type_text'>&nbsp;".$text['label-text']."</label>\n";
echo " <label><input type='checkbox' name='phone_type_voice' id='phone_type_voice' value='1' ".(($phone_type_voice) ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
echo " <label><input type='checkbox' name='phone_type_fax' id='phone_type_fax' value='1' ".(($phone_type_fax) ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
echo " <label><input type='checkbox' name='phone_type_video' id='phone_type_video' value='1' ".(($phone_type_video) ? "checked='checked'" : null)."> ".$text['label-video']."</label>&nbsp;\n";
echo " <label><input type='checkbox' name='phone_type_text' id='phone_type_text' value='1' ".(($phone_type_text) ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
echo "<br />\n";
echo $text['description-phone_type']."\n";
echo "</td>\n";
app/contacts/contact_time_edit.php
+4 -8
View File
@@ -199,10 +199,8 @@ else {
echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-time_start']."\n";
echo "</td>\n";
echo "<td width='70%' class='vtable' align='left'>\n";
echo " <div class='row'><div class='col-sm-12'>\n";
echo " <input class='formfld datetimepicker' type='text' name='time_start' id='time_start' style='min-width: 135px; width: 135px;' value='".$time_start."'>\n";
echo " </div></div>\n";
echo "<td width='70%' class='vtable' style='position: relative;' align='left'>\n";
echo " <input class='formfld datetimepicker' type='text' name='time_start' id='time_start' style='min-width: 135px; width: 135px;' value='".$time_start."'>\n";
echo "</td>\n";
echo "</tr>\n";
@@ -210,10 +208,8 @@ else {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " ".$text['label-time_stop']."\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <div class='row'><div class='col-sm-12'>\n";
echo " <input class='formfld datetimepicker' type='text' name='time_stop' id='time_stop' style='min-width: 135px; width: 135px;' value='".$time_stop."'>\n";
echo " </div></div>\n";
echo "<td class='vtable' style='position: relative;' align='left'>\n";
echo " <input class='formfld datetimepicker' type='text' name='time_stop' id='time_stop' style='min-width: 135px; width: 135px;' value='".$time_stop."'>\n";
echo "</td>\n";
echo "</tr>\n";
app/dialplan_inbound/dialplan_inbound_add.php
+21 -22
View File
@@ -717,32 +717,31 @@ $destination = new destinations;
?>
<script type="text/javascript">
<!--
function type_onchange(dialplan_detail_type) {
var field_value = document.getElementById(dialplan_detail_type).value;
if (dialplan_detail_type == "condition_field_1") {
if (field_value == "destination_number") {
document.getElementById("desc_condition_expression_1").innerHTML = "expression: 5551231234";
var field_value = document.getElementById(dialplan_detail_type).value;
if (dialplan_detail_type == "condition_field_1") {
if (field_value == "destination_number") {
document.getElementById("desc_condition_expression_1").innerHTML = "expression: 5551231234";
}
else if (field_value == "zzz") {
document.getElementById("desc_condition_expression_1").innerHTML = "";
}
else {
document.getElementById("desc_condition_expression_1").innerHTML = "";
}
}
else if (field_value == "zzz") {
document.getElementById("desc_condition_expression_1").innerHTML = "";
}
else {
document.getElementById("desc_condition_expression_1").innerHTML = "";
if (dialplan_detail_type == "condition_field_2") {
if (field_value == "destination_number") {
document.getElementById("desc_condition_expression_2").innerHTML = "expression: 5551231234";
}
else if (field_value == "zzz") {
document.getElementById("desc_condition_expression_2").innerHTML = "";
}
else {
document.getElementById("desc_condition_expression_2").innerHTML = "";
}
}
}
if (dialplan_detail_type == "condition_field_2") {
if (field_value == "destination_number") {
document.getElementById("desc_condition_expression_2").innerHTML = "expression: 5551231234";
}
else if (field_value == "zzz") {
document.getElementById("desc_condition_expression_2").innerHTML = "";
}
else {
document.getElementById("desc_condition_expression_2").innerHTML = "";
}
}
-->
</script>
<?php
app/log_viewer/log_viewer.php
+9 -9
View File
@@ -73,16 +73,16 @@ require_once "resources/header.php";
echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
echo " <tr>\n";
echo " <td align=\"left\" valign='middle' width='100%' style='padding-right: 15px;' nowrap>\n";
echo " <td align='left' valign='top' width='100%' style='padding-right: 15px;' nowrap>\n";
echo " <b>".$text['label-log-viewer']."</b><br />\n";
echo " </td>\n";
echo " <td align='right' valign='middle' nowrap>\n";
echo " <form action=\"log_viewer.php\" method=\"POST\">\n";
echo " <label for='filter' style='margin-right: 20px;'>".$text['label-filter']." <input type=\"text\" class=\"formfld\" style=\"width: 150px; text-align: center;\" name=\"filter\" value=\"".$_POST['filter']."\" onclick=\"this.select();\"></label>";
echo " <label for='ln' style='margin-right: 20px;'><input type='checkbox' name='ln' id='ln' value='1' ".(($_POST['ln'] == 1) ? 'checked' : null)."> ".$text['label-line-num']."</label>";
echo " <label for='ord' style='margin-right: 20px;'><input type='checkbox' name='ord' id='ord' value='desc' ".(($_POST['ord'] == 'desc') ? 'checked' : null)."> ".$text['label-sort']."</label>";
echo " Display <input type=\"text\" class=\"formfld\" style=\"width: 50px; text-align: center;\" name=\"fs\" value=\"".$_POST['fs']."\" onclick=\"this.select();\"> ".$text['label-kb']."";
echo " <input type=\"submit\" class=\"btn\" style=\"margin-left: 20px;\" name=\"submit\" value=\"".$text['button-reload']."\">";
echo " <form action='log_viewer.php' method='POST'>\n";
echo " ".$text['label-filter']." <input type='text' name='filter' class='formfld' style='width: 150px; text-align: center; margin-right: 20px;' value=\"".$_POST['filter']."\" onclick='this.select();'>";
echo " <label style='margin-right: 20px; margin-top: 4px;'><input type='checkbox' name='ln' id='ln' value='1' ".(($_POST['ln'] == 1) ? 'checked' : null)."> ".$text['label-line-num']."</label>";
echo " <label style='margin-right: 20px; margin-top: 4px;'><input type='checkbox' name='ord' id='ord' value='desc' ".(($_POST['ord'] == 'desc') ? 'checked' : null)."> ".$text['label-sort']."</label>";
echo " Display <input type='text' class='formfld' style='width: 50px; text-align: center;' name='fs' value=\"".$_POST['fs']."\" onclick='this.select();'> ".$text['label-kb']."";
echo " <input type='submit' class='btn' style='margin-left: 20px;' name='submit' value=\"".$text['button-reload']."\">";
if (permission_exists('log_download')) {
echo " <input type='button' class='btn' value='".$text['button-download']."' onclick=\"document.location.href='log_viewer.php?a=download&t=logs';\" />\n";
}
@@ -161,12 +161,12 @@ if (permission_exists('log_view')) {
}
if (strlen($_REQUEST['filter']) > 0){
$uuid_filter = $_REQUEST['filter'];
echo " <td style=\"text-align: left; color: #FFFFFF;\">".$text['description-filter']." ".$uuid_filter."</td>";
echo " <td style='text-align: left; color: #FFFFFF;'>".$text['description-filter']." ".$uuid_filter."</td>";
}
}
//echo "Log File Size: " . $file_size . " bytes. <br />";
echo " <td style=\"text-align: right;color: #FFFFFF;\">".$text['label-displaying']." ".number_format($user_filesize,0,'.',',')." of ".number_format($file_size,0,'.',',')." ".$text['label-bytes'].". </td>";
echo " <td style='text-align: right;color: #FFFFFF;'>".$text['label-displaying']." ".number_format($user_filesize,0,'.',',')." of ".number_format($file_size,0,'.',',')." ".$text['label-bytes'].". </td>";
echo " </tr>";
echo " </table>";
echo " <hr size='1' style='color: #fff;'>";
app/time_conditions/time_condition_edit.php
+31 -26
View File
@@ -562,7 +562,7 @@ require_once "resources/header.php";
condition_id = Math.floor((Math.random() * 1000) + 1);
html = "<table cellpadding='0' cellspacing='0' border='0' style='margin-top: 3px;' width='100%'>";
html += " <tr>";
html += " <td style='vertical-align: middle; white-space: nowrap;' width='100%' nowrap>";
html += " <td style='vertical-align: middle; min-width: 390px;' width='100%'>";
html += " <select class='formfld' style='width: 120px;' name='variable[" + type + "][" + group_id + "][" + condition_id + "]' id='variable_" + group_id + "_" + condition_id + "' onchange=\"load_value_fields(" + group_id + ", " + condition_id + ", this.options[this.selectedIndex].value);\">";
html += " <option value=''></option>";
<?php
@@ -728,24 +728,27 @@ require_once "resources/header.php";
}
function change_to_input(obj) {
tb = document.createElement('INPUT');
tb = document.createElement('input');
tb.type = 'text';
tb.name = obj.name;
tb.id = obj.id;
tb.className = 'formfld';
tb.setAttribute('style', 'width: 120px; min-width: 120px; max-width: 120px; text-align: center;');
tb.addClass('datetimepicker');
tb_id = obj.id;
tb.className = 'formfld datetimepicker';
tb.setAttribute('style', 'position: relative; width: 120px; min-width: 120px; max-width: 120px; text-align: center;');
obj.parentNode.insertBefore(tb, obj);
obj.parentNode.removeChild(obj);
$('#'+tb_id).wrap("<div style='position: relative; display: inline;'></div>"); //add parent div
$('#'+tb_id).datetimepicker({ format: 'YYYY-MM-DD HH:mm', showTodayButton: true, showClear: true, showClose: true, });
}
function change_to_select(obj) {
sb = document.createElement('SELECT');
sb = document.createElement('select');
sb.name = obj.name;
sb.id = obj.id;
sb.removeClass('datetimepicker');
tb_id = obj.id;
sb.className = 'formfld';
sb.setAttribute('style', 'width: 120px; min-width: 120px; max-width: 120px;');
$('#'+tb_id).unwrap(); //remove parent div
obj.parentNode.insertBefore(sb, obj);
obj.parentNode.removeChild(obj);
}
@@ -848,25 +851,27 @@ function add_custom_condition($destination, $group_id, $dialplan_action = '') {
echo "<td class='vtable' align='left'>\n";
echo " <table border='0' cellpadding='0' cellspacing='0' style='margin: -2px;'>\n";
echo " <tr>\n";
echo " <td class='vtable' style='width: 108px;'>".$text['label-condition']."</td>\n";
echo " <td class='vtable' style='width: 125px;'>".$text['label-condition_value']."</td>\n";
echo " <td class='vtable' style='width: 114px;'>".$text['label-condition_range']."</td>\n";
echo " <td style='text-align: right;'><a href='javascript:void(0);' onclick=\"add_condition(".$group_id.",'custom');\">".$v_link_label_add."</a></td>\n";
echo " <td class='vtable' style='width: 120px;'>".$text['label-condition']."</td>\n";
echo " <td class='vtable' style='width: 135px;'>".$text['label-condition_value']."</td>\n";
echo " <td class='vtable' style='width: 120px;'>".$text['label-condition_range']."</td>\n";
echo " <td style='width: 1px; text-align: right;'><a href='javascript:void(0);' onclick=\"add_condition(".$group_id.",'custom');\">".$v_link_label_add."</a></td>\n";
echo " </tr>\n";
echo " <tr>";
echo " <td colspan='4' style='white-space: nowrap;' id='group_".$group_id."'></td>";
echo " </tr>";
echo " </tr>";
echo " <td colspan='2' class='vtable' style='width: 108px;'>".$text['label-destination']."</td>\n";
//echo " <td colspan='2' class='vtable'>".$text['label-group']."</td>\n";
echo " <td colspan='4' style='min-width: 390px;' id='group_".$group_id."'></td>";
echo " </tr>";
echo " <tr>";
echo " <td colspan='2' style='padding-top: 3px; padding-right: 3px; white-space: nowrap;'>";
echo " <td colspan='4' style='padding-top: 10px; white-space: nowrap;'>";
echo " <table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
echo " <tr>\n";
echo " <td>\n";
//$destination = new destinations;
echo $destination->select('dialplan', 'dialplan_action['.$group_id.']', $dialplan_action);
echo " </td>";
echo " <td colspan='2' style='padding-top: 3px;'><input class='formfld' type='text' name='group_".$group_id."' id='group_".$group_id."' maxlength='255' value=\"".$group_id."\"></td>\n";
echo " </tr>";
echo " </td>\n";
echo " <td width='100%'><input class='formfld' style='margin-left: 5px;' type='text' name='group_".$group_id."' id='group_".$group_id."' maxlength='255' value=\"".$group_id."\"></td>\n";
echo " </tr>";
echo " </table>\n";
echo " </td>\n";
echo " </tr>\n";
echo " </table>";
echo " <br />";
echo " ".$text['description-settings'];
@@ -950,17 +955,17 @@ if ($action == 'update') {
else {
$label_preset_name = ucwords(str_replace(array("-", "_"), " ", $preset_name));
}
echo "<input type='checkbox' name='preset[".$preset_number."]' id='preset_".$preset_number."' value='".$preset_group_id."' onclick=\"alternate_destination_required();\" ".$checked."> <a href='javascript:void(0);' onclick=\"$('#preset_fields_".$preset_group_id."').slideToggle(400);\">".$label_preset_name."</a><br>\n";
echo "<label><input type='checkbox' name='preset[".$preset_number."]' id='preset_".$preset_number."' value='".$preset_group_id."' onclick=\"alternate_destination_required();\" ".$checked."> <a href='javascript:void(0);' onclick=\"$('#preset_fields_".$preset_group_id."').slideToggle(400);\">".$label_preset_name."</a></label><br>\n";
echo "<div id='preset_fields_".$preset_group_id."' style='display: none; margin: 4px 0px 0px 20px;'>";
echo " <table border='0' cellpadding='2' cellspacing='0' style='margin: -2px; margin-bottom: 10px;'>\n";
echo " <tr>\n";
echo " <td class='vtable' style='width: 108px;'>".$text['label-condition']."</td>\n";
echo " <td class='vtable' style='width: 125px;'>".$text['label-condition_value']."</td>\n";
echo " <td class='vtable' style='width: 114px;'>".$text['label-condition_range']."</td>\n";
echo " <td style='text-align: right;'><a href='javascript:void(0);' onclick=\"add_condition(".$preset_group_id.",'preset');\">".$v_link_label_add."</a></td>\n";
echo " <td class='vtable' style='width: 120px;'>".$text['label-condition']."</td>\n";
echo " <td class='vtable' style='width: 135px;'>".$text['label-condition_value']."</td>\n";
echo " <td class='vtable' style='width: 120px;'>".$text['label-condition_range']."</td>\n";
echo " <td style='width: 1px; text-align: right;'><a href='javascript:void(0);' onclick=\"add_condition(".$preset_group_id.",'preset');\">".$v_link_label_add."</a></td>\n";
echo " </tr>\n";
echo " <tr>";
echo " <td colspan='4' style='white-space: nowrap;' id='group_".$preset_group_id."'></td>";
echo " <td colspan='4' style='min-width: 390px;' id='group_".$preset_group_id."'></td>";
echo " </tr>";
echo " <tr>";
echo " <td colspan='4' style='padding-top: 10px;'>";
app/xml_cdr/xml_cdr.php
+3 -7
View File
@@ -233,13 +233,9 @@ else {
echo " <td class='vncell' valign='top' nowrap='nowrap'>\n";
echo " ".$text['label-start_range']."\n";
echo " </td>\n";
echo " <td class='vtable' align='left' style='white-space: nowrap;'>\n";
echo " <div class='row'>\n";
echo " <div class='col-sm-12'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px;' name='start_stamp_begin' placeholder='".$text['label-from']."' value='$start_stamp_begin'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px;' name='start_stamp_end' placeholder='".$text['label-to']."' value='$start_stamp_end'>\n";
echo " </div>\n";
echo " </div>\n";
echo " <td class='vtable' align='left' style='position: relative; min-width: 250px;'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px;' name='start_stamp_begin' placeholder='".$text['label-from']."' value='$start_stamp_begin'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px;' name='start_stamp_end' placeholder='".$text['label-to']."' value='$start_stamp_end'>\n";
echo " </td>\n";
echo " </tr>\n";
echo " <tr>\n";
app/xml_cdr/xml_cdr_extension_summary.php
+4 -8
View File
@@ -229,10 +229,8 @@ require_once "resources/require.php";
echo " <td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
echo " ".$text['label-start_date_time']."\n";
echo " </td>\n";
echo " <td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
echo " <div class='row'><div class='col-sm-12'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='$start_stamp_begin'>\n";
echo " </div></div>\n";
echo " <td class='vtable' width='70%' align='left' style='position: relative; min-width: 135px;'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='$start_stamp_begin'>\n";
echo " </td>\n";
echo " </tr>\n";
echo " </table>\n";
@@ -244,10 +242,8 @@ require_once "resources/require.php";
echo " <td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
echo " ".$text['label-end_date_time']."\n";
echo " </td>\n";
echo " <td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
echo " <div class='row'><div class='col-sm-12'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='$start_stamp_end'>\n";
echo " </div></div>\n";
echo " <td class='vtable' width='70%' align='left' style='position: relative; min-width: 135px;'>\n";
echo " <input type='text' class='formfld datetimepicker' style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='$start_stamp_end'>\n";
echo " </td>\n";
echo " </tr>\n";
echo " </table>\n";