commit cb6674be3149b9efc4d05a6a15a0e0f191a0b3e0
parent 25984cdd2196405711905db6b5bf4cff38aabe46
Author: Jan Dankert <develop@jandankert.de>
Date: Sat, 14 Nov 2020 23:13:46 +0100
Open the QRcode on click (for touch devices).
Diffstat:
6 files changed, 39 insertions(+), 68 deletions(-)
diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js
@@ -3361,18 +3361,22 @@ Openrat.Workbench.afterViewLoadedHandler.add( function(element ) {
$(element).append(wrapper);
- var qrcodetext = $(element).attr('data-qrcode');
+ let qrcodetext = $(element).attr('data-qrcode');
$(wrapper).qrcode( { render : 'div',
text : qrcodetext,
fill : 'currentColor' } );
-
// Title is disturbing the qr-code. Do not inherit it.
wrapper.attr('title','');
+ //wrapper.append('<small>'+qrcodetext+'</small>'); is very wide.
} );
+ $(element).find('.or-info').click( function() {
+ $(this).toggleClass('info--open');
+ });
+
} );
/* Include script: table.js */
Openrat.Workbench.afterViewLoadedHandler.add( function(element ) {
diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js
@@ -1190,6 +1190,6 @@ else if(Notification.permission!=='denied'){Notification.requestPermission(funct
;Openrat.Workbench.afterViewLoadedHandler.add(function(e){Openrat.Workbench.registerOpenClose($(e).find('.or-collapsible.or-group'))});
;
;Openrat.Workbench.afterViewLoadedHandler.add(function(a){$(a).find('.or-act-clickable').orLinkify()});
-;Openrat.Workbench.afterViewLoadedHandler.add(function(r){$(r).find('.or-qrcode').mouseover(function(){let r=this;if($(r).children().length>0)return;let wrapper=$('<div class="or-info-popup"></div>');$(r).append(wrapper);var e=$(r).attr('data-qrcode');$(wrapper).qrcode({render:'div',text:e,fill:'currentColor'});wrapper.attr('title','')})});
+;Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('.or-qrcode').mouseover(function(){let e=this;if($(e).children().length>0)return;let wrapper=$('<div class="or-info-popup"></div>');$(e).append(wrapper);let qrcodetext=$(e).attr('data-qrcode');$(wrapper).qrcode({render:'div',text:qrcodetext,fill:'currentColor'});wrapper.attr('title','')});$(e).find('.or-info').click(function(){$(this).toggleClass('info--open')})});
;Openrat.Workbench.afterViewLoadedHandler.add(function(t){$(t).find('.or-table--sortable > tbody').sortable();$(t).find('.or-table--sortable > tbody').closest('form').submit(function(){var t=[];$(this).find('.or-table--sortable').find('tbody > tr.data').each(function(){let objectid=$(this).data('id');t.push(objectid)});$(this).find('input[name=order]').val(t.join(','))});$(t).find('tr.headline > td > input.checkbox').click(function(){$(this).closest('table').find('tr.or-data > td > input.or-checkbox').attr('checked',Boolean($(this).attr('checked')))});$(t).find('.or-table-filter > input').keyup(function(){let filterExpression=$(this).val().toLowerCase();let table=$(this).parents('.or-table-wrapper').find('table');table.addClass('loader');setTimeout(()=>{table.find('tr:not(.headline)').filter(function(){$(this).toggle($(this).text().toLowerCase().indexOf(filterExpression)>-1)});table.removeClass('loader')},50)});$(t).find('table > tbody > tr.headline > td, table > tbody > tr > th').click(function(){let column=$(this);let table=column.parents('table');table.addClass('loader');let isAscending=!column.hasClass('sort-asc');table.find('tr.headline > td, tr > th').removeClass('sort-asc').removeClass('sort-desc');if(isAscending)column.addClass('sort-asc');else column.addClass('sort-desc');setTimeout(function(){let rows=table.find('tr:gt(0)').toArray().sort(a(column.index()));if(!isAscending){rows=rows.reverse()};for(var t=0;t<rows.length;t++){table.append(rows[t])};table.removeClass('loader')},50)});function a(t){return function(a,l){let valA=e(a,t),valB=e(l,t);return $.isNumeric(valA)&&$.isNumeric(valB)?valA-valB:valA.toString().localeCompare(valB)}};function e(t,e){return $(t).children('td').eq(e).text()}});
;Openrat.Workbench.afterViewLoadedHandler.add(function(e){var o=$(e).find('form'),r=$(e).find('div.or-dropzone-upload > div.input');r.on('dragenter',function(e){e.stopPropagation();e.preventDefault();$(this).css('border','1px dotted gray')});r.on('dragover',function(e){e.stopPropagation();e.preventDefault()});r.on('drop',function(e){$(this).css('border','1px dotted red');e.preventDefault();var r=e.originalEvent.dataTransfer.files;Openrat.Workbench.handleFileUpload(o,r)});$(e).find('input[type=file]').change(function(){var e=$(this).prop('files');Openrat.Workbench.handleFileUpload(o,e)})});Openrat.Workbench.handleFileUpload=function(e,o){for(let i=0,f;f=o[i];i++){let form_data=new FormData();form_data.append('file',f);form_data.append('action','folder');form_data.append('subaction',$(e).data('method'));form_data.append('output','json');form_data.append('token',$(e).find('input[name=token]').val());form_data.append('id',$(e).find('input[name=id]').val());var r=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(r);$(r).show();$.ajax({'type':'POST',url:'./api/',cache:!1,contentType:!1,processData:!1,data:form_data,success:function(o,a,n){$(r).remove();let oform=new Openrat.Form();oform.doResponse(o,a,e)},error:function(o,a,n){$(e).closest('div.content').removeClass('loader');$(r).remove();let msg;try{let error=jQuery.parseJSON(o.responseText);msg=error.error+'/'+error.description+': '+error.reason}catch(t){msg=o.responseText};Openrat.Workbench.notify('Upload error',0,msg)}})}};
diff --git a/modules/cms/ui/themes/default/style/openrat-ui.less b/modules/cms/ui/themes/default/style/openrat-ui.less
@@ -71,37 +71,6 @@ a:hover {
}
-/*
-.or-info {
-
- position: relative;
-
- &:hover {
- .or-info-popup {
- display: block;
- }
- }
-
- &-popup {
- display: none;
- position: absolute;
- top: 0px;
- left: 0px;
- overflow: visible;
- //width: 100%;
- border: 0.5em;
- font-size: 2em;
- .border-radius(0.3em);
- padding: 1.0em;
- //text-align: center;
- z-index: 105;
-
- > div {
- display: inline-block;
- }
- }
-}
-*/
.or {
diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css
@@ -726,37 +726,6 @@ a:hover {
.CodeMirror {
height: auto;
}
-/*
-.or-info {
-
- position: relative;
-
- &:hover {
- .or-info-popup {
- display: block;
- }
- }
-
- &-popup {
- display: none;
- position: absolute;
- top: 0px;
- left: 0px;
- overflow: visible;
- //width: 100%;
- border: 0.5em;
- font-size: 2em;
- .border-radius(0.3em);
- padding: 1.0em;
- //text-align: center;
- z-index: 105;
-
- > div {
- display: inline-block;
- }
- }
-}
-*/
.or {
/* After page loading, all elements are hidden. This class will be removed by javascript. */
}
@@ -810,7 +779,7 @@ legend {
font-weight: bold;
padding: 0 0.5em;
}
-/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAIA%3BAAAM%3BCAAO%3BCAAY%3B%3BAAuBzB%3BCAfQ%2CIAAC%3BEACG%2CSAAS%2CEAAT%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEAEA%3BEACA%3BEACA%3B%3B%3BAAIZ%3BCACE%3B%3BAAWF%3BCACE%3BCACA%3BCACA%3B%3B%3BAAKF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAIF%3BCACE%3B%3B%3BAAMF%3BCACE%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAAqCF%3B%3B%3BAACI%2CGAAC%2COAAU%3BCAEP%3BCACA%3B%3BAAKJ%2CGAAC%3BCACG%3BCACA%2C%2BBAAA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%2CgBAAA%3B%3BAAHJ%2CGAAC%2CSAKK%3BCACE%2CiBAAA%3BCACA%3BCACA%3BCAtGV%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAAyGE%2CGAAC%3BCACG%3B%3BAAKA%2CGAFH%2CUAEI%3BCAEG%3BCACA%3B%3BAAGJ%2CGARH%2CUAQI%3BCACG%3BCACA%3B%3BAAKR%2CGAAC%3BCACG%3B%3BAAGJ%2CGAAC%3BCACG%3B%3BAASR%3BCACI%3BCACA%3BCACA%2CgBAAA%22%7D */
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAIA%3BAAAM%3BCAAO%3BCAAY%3B%3BAAuBzB%3BCAfQ%2CIAAC%3BEACG%2CSAAS%2CEAAT%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEAEA%3BEACA%3BEACA%3B%3B%3BAAIZ%3BCACE%3B%3BAAWF%3BCACE%3BCACA%3BCACA%3B%3B%3BAAKF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAIF%3BCACE%3B%3B%3BAAMF%3BCACE%3B%3BAAMF%3B%3B%3BAACI%2CGAAC%2COAAU%3BCAEP%3BCACA%3B%3BAAKJ%2CGAAC%3BCACG%3BCACA%2C%2BBAAA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%2CgBAAA%3B%3BAAHJ%2CGAAC%2CSAKK%3BCACE%2CiBAAA%3BCACA%3BCACA%3BCAvEV%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAA0EE%2CGAAC%3BCACG%3B%3BAAKA%2CGAFH%2CUAEI%3BCAEG%3BCACA%3B%3BAAGJ%2CGARH%2CUAQI%3BCACG%3BCACA%3B%3BAAKR%2CGAAC%3BCACG%3B%3BAAGJ%2CGAAC%3BCACG%3B%3BAASR%3BCACI%3BCACA%3BCACA%2CgBAAA%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-menu */
/*
OpenRat Content Management System
@@ -875,6 +844,30 @@ Basis-Style for Openrat.
display: block;
}
/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-menu.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAAuCI%2CIAAC%3BCAGG%3BCACA%3B%3B%3BAAUA%3BCAAA%2CIAdH%2CIAUI%3BCAID%2CIAdH%2CIAUa%3BEAEF%3B%3B%3BAAIR%2CIAhBH%2CIAgBI%3BCACG%3B%3BAAGA%2CIApBP%2CIAgBI%2CMAII%2CeAAe%2CGACZ%2CIAAG%3BCACC%3B%3BAANZ%2CIAhBH%2CIAgBI%2CMASG%3BCAEI%3B%3BAAXR%2CIAhBH%2CIAgBI%2CMAcG%3BCACI%3BCAEA%3BCACA%3B%3B%3BAAWA%2CIA7CX%2CIAgBI%2CMAcG%2CiBAeK%3BCACG%3B%3BAAEJ%2CIAhDX%2CIAgBI%2CMAcG%2CiBAkBK%2CUACG%3BCACI%3BCAGA%3BCACA%2CkCAAA%3B%3BAACA%2CIAvDnB%2CIAgBI%2CMAcG%2CiBAkBK%2CUACG%2CMAMK%3BCAEG%3B%3BAAWpB%2CIApEH%2CIAoEI%2CSACG%2C2BACM%3BCACE%22%7D */
+/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-info */
+.or-info {
+ position: relative;
+}
+.or-info:hover .or-info-popup,
+.or-info--open .or-info-popup {
+ display: block;
+}
+.or-info-popup {
+ display: none;
+ position: absolute;
+ top: 1.2em;
+ left: -2em;
+ overflow: visible;
+ border: 0.5em;
+ font-size: 2em;
+ border-radius: 0.3em;
+ padding: 1.0em;
+ z-index: 6;
+}
+.or-info-popup > div {
+ display: inline-block;
+}
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-info.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAEI%2CGAAC%3BCAEG%3B%3BAAEA%2CGAJH%2CKAII%2CMAEG%3BAADJ%2CGALH%2CKAKI%2CMACG%3BCACI%3B%3BAAIR%2CGAXH%2CKAWI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCAEA%3B%3BAAZJ%2CGAXH%2CKAWI%2CMAcK%3BCACE%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-dropdown */
.or-dropdown {
display: none;
diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css
@@ -6,6 +6,7 @@
.or-dialog .or-view{overflow: auto;position: absolute;top: 5%;left: 10%;display: none;width: 80%;height: 80%;z-index: 3;border: 1px solid !important}@media only screen and (max-width: 55rem){.or-dialog .or-view{top: 2.5%;left: 2.5%;width: 95%;height: 95%}}.or-dialog--is-open .or-view{display: block}.or-dialog--is-open .or-dialog-filler{display: block}.or-dialog-filler{position: absolute;display: none;z-index: 2;top: 0;left: 0;height: 100%;width: 100%;opacity: 0.5;filter: blur(10em)}.or-dialog-filler-icon{opacity: 1;font-size: 3em;position: absolute;right: 20px;top: 20px}
html,body{width: 100%;height: 100%}@media only screen and (min-width: 56rem){body:before{content: "";position: fixed;left: 0;right: 0;z-index: -1;width: 100%;height: 100%;display: block;background-size: cover;background-position: center;background-repeat: no-repeat}}.or-editor-toolbar{font-size: 1.5em}iframe{width: 100%;height: 500px;display: block}a:link,a:visited{font-weight: normal;text-decoration: none}a:active,a:hover{font-weight: normal;text-decoration: none}.or-act-clickable{cursor: pointer}.CodeMirror{height: auto}.or-search > .or-input{box-shadow: none !important;background-color: transparent !important}.or--initial-hidden{opacity: 0;transition: opacity ease-in-out}.or-view-flying-button{display: block;bottom: 1em;right: 1em;position: absolute}.or-linklist{display: flex;flex-direction: column;padding: 10% 20%}.or-linklist > .or-linklist-line{border: 1px solid;margin-top: 1em;padding: 1em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}.or-dirty{font-weight: bold}.or-droppable--active{background-color: #2E8B57 !important;cursor: move}.or-droppable--hover{background-color: #00d95a !important;cursor: move}.or--invisible{visibility: hidden}.or--visible{visibility: visible}legend{font-size: 1.1em;font-weight: bold;padding: 0 .5em}
.or-menu{display: flex;justify-content: space-between}@media only screen and (max-width: 55rem){.or-menu-label,.or-menu-dropdown-icon{display: none}}.or-menu-group{display: flex}.or-menu-group:nth-last-child(1) div.dropdown{right: 10px}.or-menu-group .or-image-icon{width: 1.1em}.or-menu-group .or-toolbar-icon{padding: 2px;margin-left: 10px;float: left}.or-menu-group .or-toolbar-icon.or-menu-category{cursor: default}.or-menu-group .or-toolbar-icon.or-search input{border: 0;width: 3em;transition: width .3s ease-in-out}.or-menu-group .or-toolbar-icon.or-search input:focus{width: 8em}.or-menu--is-open .or-menu-category--is-open > .or-dropdown{display: block}
+.or-info{position: relative}.or-info:hover .or-info-popup,.or-info--open .or-info-popup{display: block}.or-info-popup{display: none;position: absolute;top: 1.2em;left: -2em;overflow: visible;border: 0.5em;font-size: 2em;border-radius: 0.3em;padding: 1.0em;z-index: 6}.or-info-popup > div{display: inline-block}
.or-dropdown{display: none;overflow: hidden;z-index: 4;min-width: 17em;position: absolute;padding: .5em 0;font-style: normal;font-weight: normal;text-decoration: none}.or-dropdown--is-open{display: block}.or-dropdown--on-right{right: 1em}.or-dropdown-entry{padding: 0}.or-dropdown-entry > .or-link{display: flex;align-items: center;padding: 0 .5em}.or-dropdown-entry > .or-link *{margin: 0.25em}.or-dropdown-entry > .or-link .or-dropdown-text{flex: 1}.or-dropdown-entry--inactive{opacity: 0.5} > .or-dropdown-text{display: block;margin: 1em}.or-dropdown-divide{height: 1px;width: 100%;margin-top: 0.5em;margin-bottom: 0.5em}
.or-breadcrumb{margin-bottom: 0.1em;margin-top: 0.3em;margin-left: 1.5em;line-height: 1.5em;font-weight: normal;white-space: nowrap}.or-breadcrumb *{display: inline;margin-right: 0.3em}.or-breadcrumb-item{font-size: 1.15em}.or-breadcrumb-item .or-image-icon{margin-right: 0.2em}.or-breadcrumb-item--path{opacity: 0.55}.or-breadcrumb-item--actual{font-size: 1.25em;font-weight: bold}
.or-diff-line{text-align: right}.or-diff-text--old{background-color: #f88989;color: black}.or-diff-text--new{background-color: #7bad7b;color: black}.or-diff-text--notequal{background-color: #cbcb16;color: black}
diff --git a/modules/template_engine/components/html/component_qrcode/qrcode.js b/modules/template_engine/components/html/component_qrcode/qrcode.js
@@ -13,16 +13,20 @@ Openrat.Workbench.afterViewLoadedHandler.add( function(element ) {
$(element).append(wrapper);
- var qrcodetext = $(element).attr('data-qrcode');
+ let qrcodetext = $(element).attr('data-qrcode');
$(wrapper).qrcode( { render : 'div',
text : qrcodetext,
fill : 'currentColor' } );
-
// Title is disturbing the qr-code. Do not inherit it.
wrapper.attr('title','');
+ //wrapper.append('<small>'+qrcodetext+'</small>'); is very wide.
} );
+ $(element).find('.or-info').click( function() {
+ $(this).toggleClass('info--open');
+ });
+
} );
\ No newline at end of file
