Commit 71d74e36 authored by Carsten  Rose's avatar Carsten Rose

Merge branch 'develop' into 'master'

Develop

See merge request !265
parents c73df4a2 d821333a
Pipeline #3466 passed with stages
in 3 minutes and 40 seconds
......@@ -52,9 +52,11 @@ composer.lock
/extension/Documentation/html
/extension/Resources/Public/Css
/extension/Resources/Public/fonts
/extension/Resources/Public/webfonts
/extension/Resources/Public/JavaScript
/extension/Tests/selenium/tmp
/fonts
/webfonts
/js
/node_modules
/packages
......
......@@ -44,30 +44,28 @@ Quick Form Query Extension
**TYPO3**
The content of this document is related to TYPO3 CMS,
a GNU/GPL CMS/Framework available from `typo3.org
<https://typo3.org/>`_ .
The content of this document is related to TYPO3 CMS,
a GNU/GPL CMS/Framework available from `typo3.org
<https://typo3.org/>`_ .
**About this manual:**
This manual is a reference. Some basic examples are at the end.
This manual is a reference. Some basic examples are at the end.
**Community documentation:**
This document is *not* official TYPO3 documentation.
This document is *not* official TYPO3 documentation.
It is maintained as part of a third party extension.
It is maintained as part of a third party extension.
If you find an error or something is missing, please report
an `issue <https://project.math.uzh.ch/projects/qfq>`_
If you find an error or something is missing, please report
an `issue <https://project.math.uzh.ch/projects/qfq>`_
**Extension Manual**
This documentation is for the TYPO3 extension **qfq**.
This documentation is for the TYPO3 extension **qfq**.
**Sitemap:**
:ref:`sitemap`
:ref:`sitemap`
.. toctree::
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -5,6 +5,7 @@ module.exports = function (grunt) {
var typo3_css = 'extension/Resources/Public/Css/';
var typo3_js = 'extension/Resources/Public/JavaScript/';
var typo3_fonts = 'extension/Resources/Public/fonts/';
var typo3_webfonts = 'extension/Resources/Public/webfonts/';
var js_sources = [
'javascript/src/Helper/*.js',
'javascript/src/Element/*.js',
......@@ -463,17 +464,20 @@ module.exports = function (grunt) {
fontAwesome: {
files: [
{
cwd: 'node_modules/font-awesome/css/',
cwd: 'node_modules/@fortawesome/fontawesome-free/css/',
src: [
'font-awesome.min.css'
'all.min.css'
],
dest: typo3_css,
filter: 'isFile',
expand: true,
flatten: true
flatten: true,
rename: function(dest, src) {
return dest + src.replace('all','font-awesome');
}
},
{
cwd: 'node_modules/font-awesome/css/',
cwd: 'node_modules/@fortawesome/fontawesome-free/css/',
src: [
'font-awesome.min.css'
],
......@@ -483,21 +487,21 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'node_modules/font-awesome/fonts/',
cwd: 'node_modules/@fortawesome/fontawesome-free/webfonts',
expand: true,
src: [
'*'
],
dest: typo3_fonts,
dest: typo3_webfonts,
flatten: true
},
{
cwd: 'node_modules/font-awesome/fonts/',
cwd: 'node_modules/@fortawesome/fontawesome-free/webfonts',
expand: true,
src: [
'*'
],
dest: 'fonts/',
dest: 'webfonts/',
flatten: true
}
]
......
###
###
#
# GETFUNCTIONSHASH() is used for checking whether this file has been played properly in DatabaseUpdate.php
#
......@@ -128,12 +129,122 @@ END;
#
DROP FUNCTION IF EXISTS QDATE_FORMAT;
CREATE FUNCTION `QDATE_FORMAT`(ts DATETIME)
RETURNS TEXT
DETERMINISTIC
SQL SECURITY INVOKER
RETURNS TEXT
DETERMINISTIC
SQL SECURITY INVOKER
BEGIN
DECLARE output TEXT;
SET output = IF(ts = 0, '-', DATE_FORMAT(ts, "%d.%m.%Y %H:%i"));
RETURN output;
DECLARE output TEXT;
SET output = IF(ts = 0, '-', DATE_FORMAT(ts, "%d.%m.%Y %H:%i"));
RETURN output;
END;
###
#
# QSLUGIFY(string)
#
/*
The MIT License (MIT)
Copyright (c) 2014 jose reis<jose.reis@artbit.pt>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Credits:
- http://stackoverflow.com/questions/5409831/mysql-stored-function-to-create-a-slug
*/
DROP FUNCTION IF EXISTS `QSLUGIFY`;
CREATE FUNCTION `QSLUGIFY`(dirty_string varchar(255)) RETURNS varchar(255) CHARSET utf8
DETERMINISTIC
BEGIN
DECLARE x, y , z , k INT;
DECLARE temp_string, new_string, accents, noAccents VARCHAR(255);
DECLARE is_allowed BOOL;
DECLARE c, check_char VARCHAR(1);
-- IF NULL DO NOT PROCEED
If dirty_string IS NULL Then
return dirty_string;
End If;
set temp_string = LOWER(dirty_string);
-- REPLACE ACCENTS
-- WITH CAPS
-- set accents = 'ŠšŽžÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖØÙÚÛÜÝŸÞàáâãäåæçèéêëìíîïñòóôõöøùúûüýÿþƒ';
-- set noAccents = 'SsZzAAAAAAACEEEEIIIINOOOOOOUUUUYYBaaaaaaaceeeeiiiinoooooouuuuyybf';
-- ONLY SMALL CAPS
set accents = 'šžàáâãäåæçèéêëìíîïñòóôõöøùúûüýÿþƒ';
set noAccents = 'szaaaaaaaceeeeiiiinoooooouuuuyybf';
set k = CHAR_LENGTH(accents);
while k > 0
do
set temp_string = REPLACE(temp_string, SUBSTRING(accents, k, 1), SUBSTRING(noAccents, k, 1));
set k = k - 1;
end while;
-- CONVERT & TO EMPTY SPACE
Set temp_string = REPLACE(temp_string, '&', '');
-- REPLACE ALL UNWANTED CHARS
Select temp_string REGEXP ('[^a-z0-9\-]+') into x;
If x = 1 then
set z = 1;
set k = CHAR_LENGTH(temp_string);
While z <= k
Do
Set c = SUBSTRING(temp_string, z, 1);
Set is_allowed = FALSE;
If !((ascii(c) = 45) or (ascii(c) >= 48 and ascii(c) <= 57) or
(ascii(c) >= 97 and ascii(c) <= 122)) Then
Set temp_string = REPLACE(temp_string, c, '-');
End If;
set z = z + 1;
End While;
End If;
Select temp_string REGEXP ("^-|-$|'") into x;
If x = 1 Then
Set temp_string = Replace(temp_string, "'", '');
Set z = CHAR_LENGTH(temp_string);
Set y = CHAR_LENGTH(temp_string);
Dash_check:
While z > 1
Do
If STRCMP(SUBSTRING(temp_string, -1, 1), '-') = 0 Then
Set temp_string = SUBSTRING(temp_string, 1, y - 1);
Set y = y - 1;
Else
Leave Dash_check;
End If;
Set z = z - 1;
End While;
End If;
Repeat
Select temp_string REGEXP ("--") into x;
If x = 1 Then
Set temp_string = REPLACE(temp_string, "--", "-");
End If;
Until x <> 1 End Repeat;
If LOCATE('-', temp_string) = 1 Then
Set temp_string = SUBSTRING(temp_string, 2);
End If;
Return temp_string;
END;
......@@ -566,6 +566,15 @@ select.qfq-locked:invalid {
// Fabric Plugin classes
.qfq-fabric-fullscreen {
position: absolute;
top: 0;
left: 0;
z-index: 200;
width: 100vw;
height: 100vh;
}
.qfq-fabric-bar {
position: -webkit-sticky;
position: sticky;
......
......@@ -2,13 +2,13 @@
"name": "qfq",
"version": "1.0.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
"bootlint": "^0.14.2",
"bootstrap": "^3.3.6",
"bootstrap-validator": "^0.11.5",
"chart.js": "^2.1.2",
"codemirror": "^5.24.0",
"corejs-typeahead": "^1.1.1",
"font-awesome": "^4.7.0",
"codemirror": "^5.53.2",
"corejs-typeahead": "^1.3.1",
"fullcalendar": "^3.10.1",
"grunt": "^1.0.4",
"grunt-concat-in-order": "^0.2.6",
......@@ -21,14 +21,14 @@
"grunt-contrib-watch": "^1.0.0",
"jquery": "latest",
"jqwidgets-framework": "4.2.1",
"jsdoc": "^3.4.0",
"jsdoc": "^3.6.4",
"mocha": "^3.2.0",
"moment": "^2.24.0",
"popper.js": "^1.14.3",
"selenium-webdriver": "^3.3.0",
"should": "^11.2.1",
"tablesorter": "^2.31.0",
"tinymce": "^4.4.3",
"tinymce": "^4.9.10",
"wolfy87-eventemitter": "^4.3.0"
},
"devDependencies": {},
......@@ -37,4 +37,4 @@
},
"license": "ISC",
"repository": "https://git.math.uzh.ch/typo3/qfq"
}
\ No newline at end of file
}
Markdown is supported
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