From aeabb4a072bfe94aaac779bfbe8b530ce610098f Mon Sep 17 00:00:00 2001 From: reliberate Date: Wed, 13 Apr 2016 13:23:07 -0600 Subject: [PATCH] Misc: Fix datetimepicker on Time Conditions, CDR, Contact Times, etc. Misc: Fix textarea height. Theme: CSS adjustments to correct misc bugs. --- app/call_broadcast/call_broadcast.php | 2 +- .../conference_room_edit.php | 10 +-- app/contacts/contact_phone_edit.php | 8 +-- app/contacts/contact_time_edit.php | 12 ++-- app/dialplan_inbound/dialplan_inbound_add.php | 43 ++++++------ app/log_viewer/log_viewer.php | 18 ++--- app/time_conditions/time_condition_edit.php | 57 ++++++++-------- app/xml_cdr/xml_cdr.php | 10 +-- app/xml_cdr/xml_cdr_extension_summary.php | 12 ++-- .../page_parts/install_config_database.php | 6 +- core/upgrade/index.php | 55 ++++++---------- core/users/group_permissions.php | 10 +-- themes/default/template.php | 66 ++++++++++++++----- 13 files changed, 156 insertions(+), 153 deletions(-) diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 1dc1b9ea7e..6be09870d1 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -129,7 +129,7 @@ else { echo "\n"; echo "\n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "\n"; - echo "\n"; echo "\n"; diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index ce05e03975..8b0bb08c75 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -288,10 +288,10 @@ if (strlen($_GET["contact_uuid"]) > 0) { echo " ".$text['label-phone_type']."\n"; echo "\n"; echo "\n"; diff --git a/app/contacts/contact_time_edit.php b/app/contacts/contact_time_edit.php index 93b71136b4..8731175d0e 100644 --- a/app/contacts/contact_time_edit.php +++ b/app/contacts/contact_time_edit.php @@ -199,10 +199,8 @@ else { echo "\n"; - echo "\n"; echo "\n"; @@ -210,10 +208,8 @@ else { echo "\n"; - echo "\n"; echo "\n"; diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index c74c5bbedf..8f95ad77bb 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -717,32 +717,31 @@ $destination = new destinations; ?> \n"; echo " \n"; -echo " \n"; echo " "; + echo " "; } } //echo "Log File Size: " . $file_size . " bytes.
"; - echo " "; + echo " "; echo " "; echo "
 $paging_controls"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 782cf5f2c4..ea5fcbdcfd 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -676,13 +676,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
".$text['label-schedule']."\n"; - echo "
\n"; - echo "
\n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo "
\n"; + echo "		\n"; + echo " \n"; + echo " \n"; echo "
".$text['description-schedule']; echo "
\n"; - echo "  \n"; - echo "  \n"; - echo "  \n"; - echo " \n"; + echo "  \n"; + echo "  \n"; + echo "  \n"; + echo " \n"; echo "
\n"; echo $text['description-phone_type']."\n"; echo "		\n"; echo " ".$text['label-time_start']."\n"; echo "\n"; - echo "
\n"; - echo " \n"; - echo "
\n"; + echo "		\n"; + echo " \n"; echo "
\n"; echo " ".$text['label-time_stop']."\n"; echo "\n"; - echo "
\n"; - echo " \n"; - echo "
\n"; + echo "		\n"; + echo " \n"; echo "
\n"; +echo " \n"; echo " ".$text['label-log-viewer']."
\n"; echo " 		\n"; -echo "
\n"; -echo " "; -echo " "; -echo " "; -echo " Display ".$text['label-kb'].""; -echo " "; +echo " \n"; +echo " ".$text['label-filter']." "; +echo " "; +echo " "; +echo " Display ".$text['label-kb'].""; +echo " "; if (permission_exists('log_download')) { echo " \n"; } @@ -161,12 +161,12 @@ if (permission_exists('log_view')) { } if (strlen($_REQUEST['filter']) > 0){ $uuid_filter = $_REQUEST['filter']; - echo "
".$text['description-filter']." ".$uuid_filter."".$text['description-filter']." ".$uuid_filter."".$text['label-displaying']." ".number_format($user_filesize,0,'.',',')." of ".number_format($file_size,0,'.',',')." ".$text['label-bytes'].". ".$text['label-displaying']." ".number_format($user_filesize,0,'.',',')." of ".number_format($file_size,0,'.',',')." ".$text['label-bytes'].".
"; echo "
"; diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php index 4a27b5490c..cfc49de505 100644 --- a/app/time_conditions/time_condition_edit.php +++ b/app/time_conditions/time_condition_edit.php @@ -562,7 +562,7 @@ require_once "resources/header.php"; condition_id = Math.floor((Math.random() * 1000) + 1); html = ""; html += " "; - html += " \n"; - echo " \n"; echo " \n"; echo "
"; + html += " "; html += " \n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " "; - echo " "; - echo " "; - echo " "; - echo " \n"; - //echo " \n"; + echo " "; echo " "; echo " "; - echo " \n"; + echo " \n"; echo "
".$text['label-condition']."".$text['label-condition_value']."".$text['label-condition_range']."".$v_link_label_add."".$text['label-condition']."".$text['label-condition_value']."".$text['label-condition_range']."".$v_link_label_add."
".$text['label-destination']."".$text['label-group']."
"; + echo " "; + echo " \n"; + echo " \n"; + echo " "; - echo " \n"; - echo " "; + echo " \n"; + echo " \n"; + echo " "; + echo "
\n"; //$destination = new destinations; echo $destination->select('dialplan', 'dialplan_action['.$group_id.']', $dialplan_action); - echo "
\n"; + echo "
"; echo "
"; echo " ".$text['description-settings']; @@ -950,17 +955,17 @@ if ($action == 'update') { else { $label_preset_name = ucwords(str_replace(array("-", "_"), " ", $preset_name)); } - echo " ".$label_preset_name."
\n"; + echo "
\n"; echo "		\n"; echo " ".$text['label-end_date_time']."\n"; echo " \n"; - echo "
\n"; - echo " \n"; - echo "
\n"; + echo " 		\n"; + echo " \n"; echo "
\n"; diff --git a/core/install/resources/page_parts/install_config_database.php b/core/install/resources/page_parts/install_config_database.php index 1c89150c95..e6797197a7 100644 --- a/core/install/resources/page_parts/install_config_database.php +++ b/core/install/resources/page_parts/install_config_database.php @@ -143,8 +143,7 @@ echo "\n"; echo "\n"; if($db_create=='1') { $checked = "checked='checked'"; } else { $checked = ''; } - echo "  "; - echo "Create the database\n"; + echo " \n"; echo "
\n"; echo "Choose whether to create the database\n"; echo "\n"; @@ -240,8 +239,7 @@ echo "\n"; echo "\n"; if($db_create=='1') { $checked = "checked='checked'"; } else { $checked = ''; } - echo "  "; - echo "Create the database\n"; + echo " \n"; echo "\n"; echo "\n"; diff --git a/core/upgrade/index.php b/core/upgrade/index.php index 7f14dcda17..a359821c00 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -149,10 +149,7 @@ if (permission_exists("upgrade_source") && !is_dir("/usr/share/examples/fusionpb echo " ".$text['label-upgrade_source']; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -165,10 +162,7 @@ if (permission_exists("upgrade_schema")) { echo " ".$text['label-upgrade_schema']; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -180,10 +174,7 @@ if (permission_exists("upgrade_schema")) { echo " ".$text['label-upgrade_data_types']; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -197,10 +188,7 @@ if (permission_exists("upgrade_apps")) { echo " ".$text['label-upgrade_apps']; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -213,22 +201,20 @@ if (permission_exists("menu_restore")) { echo " ".$text['label-upgrade_menu']; echo " \n"; echo " \n"; - echo " "; - echo " "; - echo "
"; - echo " "; - echo "
"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -241,10 +227,7 @@ if (permission_exists("group_edit")) { echo " ".$text['label-upgrade_permissions']; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index b1f6d45e0e..30380294e0 100644 --- a/core/users/group_permissions.php +++ b/core/users/group_permissions.php @@ -382,17 +382,17 @@ require_once "resources/require.php"; echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; foreach ($app['permissions'] as $permission_index => $row) { $checked = ($permissions_db_checklist[$row['name']] == "true") ? "checked='checked'" : null; echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo "\n"; $c = ($c == 0) ? 1 : 0; diff --git a/themes/default/template.php b/themes/default/template.php index 7f8c5f3fdc..4c8ed6e89c 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -742,7 +742,7 @@ #main_content { padding: 8px; - } + } } /* GENERAL ELEMENTS *****************************************************************/ @@ -781,10 +781,16 @@ :-ms-input-placeholder { color: } /* ie 10+ */ ::placeholder { color: } /* official standard */ - input.txt, - textarea.txt, select.txt, - .formfld { + textarea.txt, + input[type=text].txt, + input[type=number].txt, + input[type=password].txt, + select.formfld, + textarea.formfld, + input[type=text].formfld, + input[type=number].formfld, + input[type=password].formfld { font-family: ; font-size: ; color: ; @@ -821,8 +827,14 @@ vertical-align: middle; } - input.txt, - .formfld { + textarea.txt, + input[type=text].txt, + input[type=number].txt, + input[type=password].txt, + textarea.formfld, + input[type=text].formfld, + input[type=number].formfld, + input[type=password].formfld { transition: width 0.25s; -moz-transition: width 0.25s; -webkit-transition: width 0.25s; @@ -834,13 +846,25 @@ padding: 4px 2px; } - input.txt:hover, - .formfld:hover { + textarea.txt:hover, + input[type=text].txt:hover, + input[type=number].txt:hover, + input[type=password].txt:hover, + textarea.formfld:hover, + input[type=text].formfld:hover, + input[type=number].formfld:hover, + input[type=password].formfld:hover { border-color: ; } - input.txt:focus, - .formfld:focus { + textarea.txt:focus, + input[type=text].txt:focus, + input[type=number].txt:focus, + input[type=password].txt:focus, + textarea.formfld:focus, + input[type=text].formfld:focus, + input[type=number].formfld:focus, + input[type=password].formfld:focus { border-color: ; /* first clear */ -webkit-box-shadow: none; @@ -984,11 +1008,22 @@ display: inline; } + textarea { + min-height: 75px; + } + label { font-weight: normal; vertical-align: middle; } + label input[type=checkbox], + label input[type=radio] { + vertical-align: -2px; + margin: 0; + padding: 0; + } + span.playback_progress_bar { background-color: #c43e42; height: 1px; @@ -1728,7 +1763,6 @@ //hide message bar on hover $("#message_text").mouseover(function() { $(this).hide(); $("#message_container").hide(); }); - 1) { ?> @@ -1771,7 +1805,6 @@ } ?> - //link table rows (except the last - the list_control_icons cell) on a table with a class of 'tr_hover', according to the href attribute of the tag $('.tr_hover tr').each(function(i,e) { $(e).children('td:not(.list_control_icon,.list_control_icons,.tr_link_void)').click(function() { @@ -1780,15 +1813,16 @@ }); }); - //apply the auto-size jquery script to all text inputs - $("input.txt, textarea.txt, .formfld").autosizeInput(); - + $("input[type=text].txt,input[type=number].txt,input[type=password].txt,input[type=text].formfld,input[type=number].formfld,input[type=password].formfld").not('.datetimepicker').autosizeInput(); //apply bootstrap-datetime plugin $(function() { $('.datetimepicker').datetimepicker({ - format: 'YYYY-MM-DD HH:mm' + format: 'YYYY-MM-DD HH:mm', + showTodayButton: true, + showClear: true, + showClose: true, }); });
".$text['label-permission_permissions']."".$text['label-permission_description']."".$text['label-permission_permissions']."".$text['label-permission_description']."
".$row['name']."".$row['description']." ".$row['name']."".$row['description']."