Commit 20d6fe61 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/raos_work' into crose_work

parents a5f5ef69 fdb1502d
......@@ -5,18 +5,23 @@ Version: see `extension/ext_emconf.php`
Installation
------------
* Take care that the `php5-mysqlnd` driver is installed:
* The following functions are used and are only available with the native driver:
* Ubuntu < 16.04: Take care that the `php5-mysqlnd` driver is installed:
* See also: http://dev.mysql.com/downloads/connector/php-mysqlnd/
* If there is a error message "Call to undefined method mysqli_stmt::get_result()", `php5-mysqlnd` is not installed or not active.
* The following functions are used and are only available with the native driver:
```bash
mysqli::get_result (important),
mysqli::fetch_all (nice to have)
* See also: http://dev.mysql.com/downloads/connector/php-mysqlnd/
* If there is a error message "Call to undefined method mysqli_stmt::get_result()", `php5-mysqlnd` is not installed or not active.
```
* Ubuntu:
* Ubuntu:
sudo apt-get install php5-mysqlnd
sudo php5enmod mysqlnd
sudo service apache2 restart
```bash
sudo apt-get install php5-mysqlnd
sudo php5enmod mysqlnd
sudo service apache2 restart
```
* Install extension as regular.
* In `typo3conf/ext/qfq` rename `config.examle.ini` to `config.ini`.
......@@ -26,6 +31,8 @@ Installation
Bootstrap: include by TypoScript
---------
```script
page.includeCSS {
file1 = typo3conf/ext/qfq/Resources/Public/Css/bootstrap.min.css
......@@ -42,7 +49,7 @@ page.includeJS {
file3 = typo3conf/ext/qfq/Resources/Public/JavaScript/jqx-all.js
file4 = typo3conf/ext/qfq/Resources/Public/JavaScript/qfq-min.js
}
```
Usage
-----
......
......@@ -34,9 +34,10 @@ var QfqNS = QfqNS || {};
* Messages may have different background colors (severity levels), controlled by the `type` property. Possible
* values are
*
* * `"success"`
* * `"info"`
* * `"warning"`
* * `"error"`
* * `"error"`, `"danger"`
*
* The values are translated into Bootstrap `alert-*` classes internally.
*
......@@ -69,11 +70,13 @@ var QfqNS = QfqNS || {};
*
* For compatibility reasons, the old constructor signature is still supported but deprecated
*
* var alert = new QfqNS.Alert(message, type, buttons)
* var alert = new QfqNS.Alert(message, type, buttons)
*
* @param {object} options option object having following properties
* @param {object} options option object has following properties
* @param {string} options.message message to be displayed
* @param {string} [options.type] type of message, can be `"info"`, `"warning"`, or `"error"`. Default is `"info"`.
* @param {number} [options.timeout] timeout in milliseconds. If timeout is less than or equal to 0, the alert
* won't timeout and stay open until dismissed by the user. Default `0`.
* @param {boolean} [options.modal] whether or not alert is modal, i.e. prevent clicks anywhere but the dialog.
* Default is `false`.
* @param {object[]} options.buttons what buttons to display on alert. If empty array is provided, no buttons are
......@@ -155,13 +158,16 @@ var QfqNS = QfqNS || {};
switch (this.messageType) {
case "warning":
return "alert-warning";
case "danger":
case "error":
return "alert-danger";
case "info":
return "alert-info";
case "success":
return "alert-success";
/* jshint -W086 */
default:
n.Log.warning("Message type '" + this.messageType + "' unknown. Use default type.");
case "info":
return "alert-success";
/* jshint +W086 */
}
};
......
......@@ -48,7 +48,11 @@ QfqNS.Helper = QfqNS.Helper || {};
var source = JSON.parse($sourceScript.text());
$container.jqxComboBox({source: source});
$container.jqxComboBox({
source: source,
displayMember: "text",
valueMember: "value"
});
// Our code creates a hidden input element for each jqxwidget as sibling of the widget. We do this,
// because jqxwidget don't create named input elements, and thus the value would not be sent to the
......
/**
* @author Rafael Ostertag <rafael.ostertag@math.uzh.ch>
*/
/* global $ */
/**
* Qfq Namespace
*
* @namespace QfqNS
*/
var QfqNS = QfqNS || {};
/**
* Qfq Helper Namespace
*
* @namespace QfqNS.Helper
*/
QfqNS.Helper = QfqNS.Helper || {};
(function (n) {
'use strict';
/**
* @function
* @name QfqNS.Helper.jqxEditor
*/
var jqxEditor = function () {
var index;
var $containers = $("textarea.jqw-editor");
$containers.each(function (index, object) {
(function ($container) {
$container.jqxEditor();
})($(object));
});
};
n.jqxEditor = jqxEditor;
})(QfqNS.Helper);
\ No newline at end of file
......@@ -86,6 +86,7 @@ var QfqNS = QfqNS || {};
n.Helper.jqxDateTimeInput();
// Initialize jqxComboBox elements.
n.Helper.jqxComboBox();
n.Helper.jqxEditor();
};
n.QfqForm.prototype.on = n.EventEmitter.onMixin;
......
......@@ -344,7 +344,7 @@
</div>
<div class="col-md-6">
<textarea id="notes-editor" class="jqw-editor"
data-control-name="notesField">
data-control-name="notesField" name="notesField">
</textarea>
</div>
......@@ -841,9 +841,9 @@
<script type="application/jqw-combobox-source" id="combobox1_source">
[
"item 1",
"item 2",
"item 3"
{ "value": 1, "text": "item 1" },
{ "value": 2, "text": "item 2" },
{ "value": 3, "text": "item 3" }
]
</script>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment