Fax Server: Added ability to select an existing Contact as the fax Recipient.
Updated jquery.autosize.input.js to latest version.
This commit is contained in:
Nate Jones
parent
4070aa19cf
commit
7000e201f6
|
|
@ -258,7 +258,7 @@
|
|||
$text['label-file']['pt-pt'] = "Ficheiro não encontrado.";
|
||||
$text['label-file']['fr-fr'] = "Fichier non trové";
|
||||
|
||||
$text['description-2']['en-us'] = "To send a fax, upload a <strong>PDF</strong> or <strong>TIF</strong> file.";
|
||||
$text['description-2']['en-us'] = "To send a fax, upload a <strong>PDF</strong> or <strong>TIF</strong> (requires LibreOffice) file.";
|
||||
$text['description-2']['es-cl'] = "Para enviar un fax puede subir un archivo .tif o si ghost script está instalado entonces también puede enviar un fax subiendo un archivo PDF.";
|
||||
$text['description-2']['pt-pt'] = "Para enviar um fax pode carregar um ficheiro .tif ou, se o ghost script tiver sido instalado, enviar um fax, carregando um ficheiro .pdf.";
|
||||
$text['description-2']['fr-fr'] = "Pour envoyer un fax, vous pouvez télécharger un fichier <b>TIF</b>. Si ghost script a été installé, vous pouvez également utiliser un fichier <b>PDF</b>.";
|
||||
|
|
|
|||
|
|
@ -654,7 +654,78 @@ else {
|
|||
echo " ".$text['label-fax-recipient']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <input type='text' name='fax_recipient' class='formfld' style='' value=''>\n";
|
||||
|
||||
//javascript to toggle input/select boxes
|
||||
echo "<script type='text/javascript'>";
|
||||
echo " function toggle(field) {";
|
||||
echo " if (field == 'to') {";
|
||||
echo " document.getElementById('fax_recipient_select').selectedIndex = 0;";
|
||||
echo " $('#fax_recipient_select').toggle();";
|
||||
echo " $('#fax_recipient').toggle();";
|
||||
echo " if ($('#fax_recipient').is(':visible')) { $('#fax_recipient').focus(); } else { $('#fax_recipient_select').focus(); }";
|
||||
echo " }";
|
||||
echo " }";
|
||||
echo "</script>";
|
||||
?>
|
||||
<script>
|
||||
function contact_load(obj_sel) {
|
||||
obj_sel.style.display='none';
|
||||
document.getElementById('fax_recipient').style.display='';
|
||||
var selected_option_value = obj_sel.options[obj_sel.selectedIndex].value;
|
||||
var selected_option_values = selected_option_value.split('|', 2);
|
||||
document.getElementById('fax_recipient').value = selected_option_values[1];
|
||||
document.getElementById('fax_number').value = selected_option_values[0];
|
||||
$("#fax_recipient").css({width: '50%'});
|
||||
$("#fax_number").css({width: '120px'});
|
||||
}
|
||||
</script>
|
||||
<?
|
||||
echo " <select class='formfld' style='display: none;' id='fax_recipient_select' onchange='contact_load(this);'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
$sql = "select ";
|
||||
$sql .= "c.contact_organization, ";
|
||||
$sql .= "c.contact_name_given, ";
|
||||
$sql .= "c.contact_name_family, ";
|
||||
$sql .= "c.contact_nickname, ";
|
||||
$sql .= "cp.phone_number ";
|
||||
$sql .= "from ";
|
||||
$sql .= "v_contacts as c, ";
|
||||
$sql .= "v_contact_phones as cp ";
|
||||
$sql .= "where ";
|
||||
$sql .= "c.contact_uuid = cp.contact_uuid and ";
|
||||
$sql .= "c.domain_uuid = '".$_SESSION['domain_uuid']."' and ";
|
||||
$sql .= "cp.domain_uuid = '".$_SESSION['domain_uuid']."' and ";
|
||||
$sql .= "cp.phone_type = 'fax' and ";
|
||||
$sql .= "cp.phone_number is not null and ";
|
||||
$sql .= "cp.phone_number <> '' ";
|
||||
$sql .= "order by ";
|
||||
$sql .= "c.contact_organization asc, ";
|
||||
$sql .= "c.contact_name_given asc, ";
|
||||
$sql .= "c.contact_name_family asc ";
|
||||
echo $sql;
|
||||
$prep_statement = $db->prepare(check_sql($sql));
|
||||
$prep_statement -> execute();
|
||||
$result_e = $prep_statement -> fetchAll(PDO::FETCH_NAMED);
|
||||
foreach ($result_e as &$row) {
|
||||
if ($row['contact_organization'] != '') {
|
||||
$contact_option_label = $row['contact_organization'];
|
||||
}
|
||||
if ($row['contact_name_given'] != '' || $row['contact_name_family'] != '' || $row['contact_nickname'] != '') {
|
||||
$contact_option_label .= ($row['contact_organization'] != '') ? "," : null;
|
||||
$contact_option_label .= ($row['contact_name_given'] != '') ? " ".$row['contact_name_given'] : null;
|
||||
$contact_option_label .= ($row['contact_name_family'] != '') ? " ".$row['contact_name_family'] : null;
|
||||
$contact_option_label .= ($row['contact_nickname'] != '') ? " (".$row['contact_nickname'].")" : null;
|
||||
}
|
||||
$contact_option_value_recipient = $contact_option_label;
|
||||
$contact_option_value_faxnumber = $row['phone_number'];
|
||||
$contact_option_label .= ": ".format_phone($row['phone_number']);
|
||||
echo " <option value=\"".$contact_option_value_faxnumber."|".$contact_option_value_recipient."\">".$contact_option_label."</option>\n";
|
||||
unset($contact_option_label);
|
||||
}
|
||||
unset ($prep_statement);
|
||||
echo " </select>\n";
|
||||
echo " <input type='text' name='fax_recipient' id='fax_recipient' class='formfld' style='' value=''>\n";
|
||||
echo " <input type='button' id='btn_toggle_recipient' class='btn' name='' alt='".$text['button-back']."' value='◁' onclick=\"toggle('to');\">\n";
|
||||
echo " <br />\n";
|
||||
echo " ".$text['description-fax-recipient']."\n";
|
||||
echo "</td>\n";
|
||||
|
|
@ -665,7 +736,7 @@ else {
|
|||
echo " ".$text['label-fax-number']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <input type='text' name='fax_number' class='formfld' style='' value=''>\n";
|
||||
echo " <input type='text' name='fax_number' id='fax_number' class='formfld' style='' value=''>\n";
|
||||
echo " <br />\n";
|
||||
echo " ".$text['description-fax-number']."\n";
|
||||
echo "</td>\n";
|
||||
|
|
|
|||
|
|
@ -1,110 +1,118 @@
|
|||
// source: https://github.com/MartinF/jQuery.Autosize.Input
|
||||
|
||||
var Plugins;
|
||||
(function (Plugins) {
|
||||
var AutosizeInputOptions = (function () {
|
||||
function AutosizeInputOptions(space) {
|
||||
if (typeof space === "undefined") { space = 30; }
|
||||
this.space = space;
|
||||
}
|
||||
return AutosizeInputOptions;
|
||||
})();
|
||||
Plugins.AutosizeInputOptions = AutosizeInputOptions;
|
||||
|
||||
var AutosizeInput = (function () {
|
||||
function AutosizeInput(input, options) {
|
||||
var _this = this;
|
||||
this._input = $(input);
|
||||
this._options = options;
|
||||
this._options = $.extend({}, AutosizeInput.getDefaultOptions(), options);
|
||||
|
||||
// Init mirror
|
||||
this._mirror = $('<span style="position:absolute; top:-999px; left:0; white-space:pre;"/>');
|
||||
$.each([
|
||||
'fontFamily',
|
||||
'fontSize',
|
||||
'fontWeight',
|
||||
'fontStyle',
|
||||
'letterSpacing',
|
||||
'textTransform',
|
||||
'wordSpacing',
|
||||
'textIndent'
|
||||
], function (i, val) {
|
||||
|
||||
// Copy to mirror
|
||||
$.each(['fontFamily', 'fontSize', 'fontWeight', 'fontStyle', 'letterSpacing', 'textTransform', 'wordSpacing', 'textIndent'], function (i, val) {
|
||||
_this._mirror[0].style[val] = _this._input.css(val);
|
||||
});
|
||||
$("body").append(this._mirror);
|
||||
this._input.bind("keydown input", function (e) {
|
||||
|
||||
// Bind events - change update paste click mousedown mouseup focus blur
|
||||
// IE 9 need keydown to keep updating while deleting (keeping backspace in - else it will first update when backspace is released)
|
||||
// IE 9 need keyup incase text is selected and backspace/deleted is hit - keydown is to early
|
||||
// How to fix problem with hitting the delete "X" in the box - but not updating!? mouseup is apparently to early
|
||||
// Could bind separatly and set timer
|
||||
// Add so it automatically updates if value of input is changed http://stackoverflow.com/a/1848414/58524
|
||||
this._input.on("keydown keyup input propertychange change", function (e) {
|
||||
_this.update();
|
||||
});
|
||||
|
||||
// Update
|
||||
(function () {
|
||||
_this.update();
|
||||
})();
|
||||
}
|
||||
Object.defineProperty(AutosizeInput.prototype, "options", {
|
||||
get: function () {
|
||||
AutosizeInput.prototype.getOptions = function () {
|
||||
return this._options;
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: true
|
||||
});
|
||||
Object.defineProperty(AutosizeInput, "instanceKey", {
|
||||
get: function () {
|
||||
return "autosizeInputInstance";
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: true
|
||||
});
|
||||
};
|
||||
|
||||
AutosizeInput.prototype.update = function () {
|
||||
var value = this._input.val();
|
||||
if(!value) {
|
||||
value = this._input.attr("placeholder");
|
||||
}
|
||||
if(value === this._mirror.text()) {
|
||||
var value = this._input.val() || "";
|
||||
|
||||
if (value === this._mirror.text()) {
|
||||
// Nothing have changed - skip
|
||||
return;
|
||||
}
|
||||
|
||||
// Update mirror
|
||||
this._mirror.text(value);
|
||||
|
||||
// Calculate the width
|
||||
var newWidth = this._mirror.width() + this._options.space;
|
||||
|
||||
// Update the width
|
||||
this._input.width(newWidth);
|
||||
};
|
||||
|
||||
AutosizeInput.getDefaultOptions = function () {
|
||||
return this._defaultOptions;
|
||||
};
|
||||
|
||||
AutosizeInput.getInstanceKey = function () {
|
||||
// Use camelcase because .data()['autosize-input-instance'] will not work
|
||||
return "autosizeInputInstance";
|
||||
};
|
||||
AutosizeInput._defaultOptions = new AutosizeInputOptions();
|
||||
return AutosizeInput;
|
||||
})();
|
||||
Plugins.AutosizeInput = AutosizeInput;
|
||||
var AutosizeInputOptions = (function () {
|
||||
function AutosizeInputOptions(space) {
|
||||
if (typeof space === "undefined") { space = 30; }
|
||||
this._space = space;
|
||||
}
|
||||
Object.defineProperty(AutosizeInputOptions.prototype, "space", {
|
||||
get: function () {
|
||||
return this._space;
|
||||
},
|
||||
set: function (value) {
|
||||
this._space = value;
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: true
|
||||
});
|
||||
return AutosizeInputOptions;
|
||||
})();
|
||||
Plugins.AutosizeInputOptions = AutosizeInputOptions;
|
||||
|
||||
// jQuery Plugin
|
||||
(function ($) {
|
||||
var pluginDataAttributeName = "autosize-input";
|
||||
var validTypes = [
|
||||
"text",
|
||||
"password",
|
||||
"search",
|
||||
"url",
|
||||
"tel",
|
||||
"email"
|
||||
];
|
||||
var validTypes = ["text", "password", "search", "url", "tel", "email", "number"];
|
||||
|
||||
// jQuery Plugin
|
||||
$.fn.autosizeInput = function (options) {
|
||||
return this.each(function () {
|
||||
if(!(this.tagName == "INPUT" && $.inArray(this.type, validTypes) > -1)) {
|
||||
// Make sure it is only applied to input elements of valid type
|
||||
// Or let it be the responsibility of the programmer to only select and apply to valid elements?
|
||||
if (!(this.tagName == "INPUT" && $.inArray(this.type, validTypes) > -1)) {
|
||||
// Skip - if not input and of valid type
|
||||
return;
|
||||
}
|
||||
|
||||
var $this = $(this);
|
||||
if(!$this.data(Plugins.AutosizeInput.instanceKey)) {
|
||||
if(options == undefined) {
|
||||
var options = $this.data(pluginDataAttributeName);
|
||||
if(!(options && typeof options == 'object')) {
|
||||
options = new AutosizeInputOptions();
|
||||
|
||||
if (!$this.data(Plugins.AutosizeInput.getInstanceKey())) {
|
||||
// If instance not already created and attached
|
||||
if (options == undefined) {
|
||||
// Try get options from attribute
|
||||
options = $this.data(pluginDataAttributeName);
|
||||
}
|
||||
}
|
||||
$this.data(Plugins.AutosizeInput.instanceKey, new Plugins.AutosizeInput(this, options));
|
||||
|
||||
// Create and attach instance
|
||||
$this.data(Plugins.AutosizeInput.getInstanceKey(), new Plugins.AutosizeInput(this, options));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// On Document Ready
|
||||
$(function () {
|
||||
// Instantiate for all with data-provide=autosize-input attribute
|
||||
$("input[data-" + pluginDataAttributeName + "]").autosizeInput();
|
||||
});
|
||||
// Alternative to use On Document Ready and creating the instance immediately
|
||||
//$(document).on('focus.autosize-input', 'input[data-autosize-input]', function (e)
|
||||
//{
|
||||
// $(this).autosizeInput();
|
||||
//});
|
||||
})(jQuery);
|
||||
})(Plugins || (Plugins = {}));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue