commit 12f438d60d0cdd3db8ecde2c91028b13c78e5efe
parent f84af6f067e2efa3740e50c5751058cb40f190c8
Author: Jan Dankert <develop@jandankert.de>
Date: Fri, 27 Nov 2020 20:14:22 +0100
Fix: Mark input fields on input error.
Diffstat:
8 files changed, 35 insertions(+), 118 deletions(-)
diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js
@@ -1875,7 +1875,7 @@ Openrat.Form = function() {
// Alle vorhandenen Error-Marker entfernen.
// Falls wieder ein Fehler auftritt, werden diese erneut gesetzt.
- $(this.element).find('.or-input.or-error').removeClass('error');
+ $(this.element).find('.or-input--error').removeClass('input--error');
let params = $(this.element).serializeArray();
let data = {};
@@ -2027,7 +2027,7 @@ Openrat.Form = function() {
// Validation error should mark the input field.
$.each(data['errors'], function(idx,value) {
- $('.or-input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open');
+ $('.or-input[name='+value+']').addClass('input--error').parent().addClass('input--error').parents('.or-group').removeClass('closed').addClass('show').addClass('open');
});
// Jetzt das erhaltene Dokument auswerten.
diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js
@@ -1173,11 +1173,11 @@ jQuery.trumbowyg={langs:{en:{viewHTML:"View HTML",undo:"Undo",redo:"Redo",format
;Openrat.View=function(e,t,i,r){this.action=e;this.method=t;this.id=i;this.params=r;this.before=function(){};this.start=function(e){this.before();this.element=e;return this.loadView()};this.afterLoad=function(){};this.close=function(){};function n(e){Openrat.Workbench.afterViewLoadedHandler.fire(e)};this.loadView=function(){let url=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!1);let element=this.element;let view=this;let loadViewHtmlPromise=$.ajax(url);$(this.element).addClass('loader');loadViewHtmlPromise.done(function(e,t){if(!e)e='';$(element).html(e).removeClass('loader');$(element).find('form').each(function(){let form=new Openrat.Form();form.close=function(){view.close()};form.forwardTo=function(e,t,i,r){view.action=e;view.method=t;view.id=i;view.params=r;view.loadView()};form.initOnElement(this)});n(element)});loadViewHtmlPromise.fail(function(e,t,i){$(element).html('');Openrat.Workbench.notify('',0,'','error','Server Error',['Server Error while requesting url '+url,t])});let apiUrl=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!0);return loadViewHtmlPromise};Openrat.View.createUrl=function(e,subaction,i,extraid={},api=!1){let url='./';if(api)url+='api/';url+='?';if(e)url+='&action='+e;if(subaction)url+='&subaction='+subaction;if(i)url+='&id='+i;if(typeof extraid==='string'){extraid=extraid.replace(/'/g,'"');let extraObject=jQuery.parseJSON(extraid);jQuery.each(extraObject,function(e,t){url=url+'&'+e+'='+t})}
else if(typeof extraid==='object'){jQuery.each(extraid,function(e,t){url=url+'&'+e+'='+t})}
else{};return url}};
-;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-act-form-cancel').click(function(){form.cancel()});$(e).find('.or-act-form-reset').click(function(){form.rollback()});$(e).find('.or-act-form-apply').click(function(){form.submit(modes.keepOpen)});$(e).find('.or-act-form-save').click(function(){form.submit()});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,o,r){};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="or-notice or-notice--info"><div class="or-text or-loader"></div></div>');$('.or-notices').prepend(status);$(status).show();$(this.element).find('.or-input.or-error').removeClass('error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()}
+;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-act-form-cancel').click(function(){form.cancel()});$(e).find('.or-act-form-reset').click(function(){form.rollback()});$(e).find('.or-act-form-apply').click(function(){form.submit(modes.keepOpen)});$(e).find('.or-act-form-save').click(function(){form.submit()});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,o,r){};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="or-notice or-notice--info"><div class="or-text or-loader"></div></div>');$('.or-notices').prepend(status);$(status).show();$(this.element).find('.or-input--error').removeClass('input--error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()}
else{let url='./api/';this.setLoadStatus(!0);url+='';data.output='json';if(e==modes.closeAfterSubmit)this.close();let form=this;$.ajax({'type':'POST',url:url,data:data,success:function(t,o,r){form.setLoadStatus(!1);$(status).remove();form.doResponse(t,o,form.element,function(){$(form.element).closest('.or-view.or-view--is-dirty').removeClass('view--is-dirty');let afterSuccess=$(form.element).data('afterSuccess');let forwardTo=$(form.element).data('forwardTo');let async=$(form.element).data('async');if(afterSuccess=='forward')e=modes.keepOpen;if(e==modes.closeAfterSuccess){form.close();$(form.element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}
else if(afterSuccess=='forward'){if(forwardTo)form.forwardTo(data.action,forwardTo,data.id,[])}}
else{if(async);else Openrat.Workbench.reloadViews()}})},error:function(e,t,o){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('',0,'','error',error.error,[error.description])}catch(r){let msg=e.responseText;Openrat.Workbench.notify('',0,'','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,o,onSuccess=$.noop){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(o).data('async');Openrat.Workbench.notify(e.type,e.id,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){onSuccess();Openrat.Workbench.dataChangedHandler.fire()}
-else{}});$.each(e['errors'],function(e,t){$('.or-input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open')})}};
+else{}});$.each(e['errors'],function(e,t){$('.or-input[name='+t+']').addClass('input--error').parent().addClass('input--error').parents('.or-group').removeClass('closed').addClass('show').addClass('open')})}};
;Openrat.Workbench=new function(){'use strict';this.state={action:'',id:0,extra:{}};this.popupWindow=null;this.initialize=function(){this.initializePingTimer();this.initializeDirtyWarning();this.initializeState();this.openModalDialog();Openrat.Workbench.registerOpenClose($('.or-collapsible'))};this.initializeDirtyWarning=function(){window.addEventListener('beforeunload',function(e){if($('.or-view--is-dirty').length>0){e.preventDefault();return'Unsaved content will be lost.'}
else{return undefined}})};this.openModalDialog=function(){if($('#dialog').data('action')){this.startDialog('',$('#dialog').data('action'),$('#dialog').data('action'),0,{})}};this.initializeState=function(){let parts=window.location.hash.split('/');let state={action:'index',id:0};if(parts.length>=2)state.action=parts[1].toLowerCase();if(parts.length>=3)state.id=parts[2].replace(/[^0-9_]/gim,'');Openrat.Workbench.state=state;Openrat.Navigator.toActualHistory(state)};this.initializePingTimer=function(){let ping=function(){let pingPromise=$.getJSON(Openrat.View.createUrl('profile','ping',0,{},!0));pingPromise.fail(function(){console.warn('The server ping has failed.');if($('.view.dirty').length>0){window.alert('The server session is lost, please save your data.')}
else{}})};let timeoutMinutes=5;window.setInterval(ping,timeoutMinutes*60*1000)};this.loadNewActionState=function(e){Openrat.Workbench.state=e;Openrat.Workbench.loadNewAction(e.action,e.id,e.data);this.afterNewActionHandler.fire()};this.afterNewActionHandler=$.Callbacks();this.afterAllViewsLoaded=$.Callbacks();this.loadNewAction=function(e,t,i){this.reloadViews()};this.reloadViews=function(){$('.or-workbench-section--is-closed .or-act-view-loader').empty();let promise=Openrat.Workbench.loadViews($('.or-workbench .or-act-view-loader'));promise.done(function(){Openrat.Workbench.afterAllViewsLoaded.fire()});return promise};this.reloadAll=function(){let promise=Openrat.Workbench.loadViews($('.or-act-view-loader,.or-act-view-static').empty());promise.done(function(){Openrat.Workbench.afterAllViewsLoaded.fire()});this.loadUserStyle();this.loadLanguage();this.loadUISettings();return promise};this.loadUserStyle=function(){let url=Openrat.View.createUrl('profile','userinfo',0,{},!0);$.getJSON(url,function(e){let style=e.output['style'];Openrat.Workbench.setUserStyle(style);let color=e.output['theme-color'];Openrat.Workbench.setThemeColor(color)})};this.settings={};this.language={};this.loadLanguage=function(){let url=Openrat.View.createUrl('profile','language',0,{},!0);$.getJSON(url,function(e){Openrat.Workbench.language=e.output.language})};this.loadUISettings=function(){let url=Openrat.View.createUrl('profile','uisettings',0,{},!0);$.getJSON(url,function(e){Openrat.Workbench.settings=e.output.settings.settings})};this.loadViews=function(e){let promises=[];e.each(function(e){let $targetDOMElement=$(this);promises.push(Openrat.Workbench.loadNewActionIntoElement($targetDOMElement))});return $.when.apply($,promises)};this.loadNewActionIntoElement=function(e){let action;if(e.is('.or-act-view-static'))action=e.attr('data-action');else action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;let params=Openrat.Workbench.state.extra;let method=e.data('method');let view=new Openrat.View(action,method,id,params);return view.start(e)};this.setUserStyle=function(e){var t=$('html'),i=t.attr('class').split(/\s+/);$.each(i,function(e,i){if(i.startsWith('or-theme-')){t.removeClass(i.substring(3))}});t.addClass('theme-'+e.toLowerCase())};this.setThemeColor=function(e){$('#theme-color').attr('content',e)};let notifyBrowser=function(e){if(!('Notification' in window)){return}
diff --git a/modules/cms/ui/themes/default/script/openrat/form.js b/modules/cms/ui/themes/default/script/openrat/form.js
@@ -102,7 +102,7 @@ Openrat.Form = function() {
// Alle vorhandenen Error-Marker entfernen.
// Falls wieder ein Fehler auftritt, werden diese erneut gesetzt.
- $(this.element).find('.or-input.or-error').removeClass('error');
+ $(this.element).find('.or-input--error').removeClass('input--error');
let params = $(this.element).serializeArray();
let data = {};
@@ -254,7 +254,7 @@ Openrat.Form = function() {
// Validation error should mark the input field.
$.each(data['errors'], function(idx,value) {
- $('.or-input[name='+value+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open');
+ $('.or-input[name='+value+']').addClass('input--error').parent().addClass('input--error').parents('.or-group').removeClass('closed').addClass('show').addClass('open');
});
// Jetzt das erhaltene Dokument auswerten.
diff --git a/modules/cms/ui/themes/default/style/openrat-notices.less b/modules/cms/ui/themes/default/style/openrat-notices.less
@@ -9,23 +9,23 @@
}
.or- {
- ¬ices {
-
- display: block;
- position: fixed;
- bottom: 40px;
- right: 40px;
- width: 25em;
- z-index: 5;
- }
¬ice {
border: 2px solid @color-overridden-by-theme;
padding: 1.1em;
- margin: 5px;
+ margin: 0.5em;
position: relative;
- .border-radius(5px);
+ .border-radius(1em);
+
+ &s {
+ display: block;
+ position: fixed;
+ bottom: 4em;
+ right: 4em;
+ width: 25em;
+ z-index: 5;
+ }
&-toolbar {
float: right;
diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css
@@ -1,23 +1,23 @@
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-notices */
/* Usage to this variable is safe to be removed */
+.or-notice {
+ border: 2px solid #000000;
+ padding: 1.1em;
+ margin: 0.5em;
+ position: relative;
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ -khtml-border-radius: 1em;
+}
.or-notices {
display: block;
position: fixed;
- bottom: 40px;
- right: 40px;
+ bottom: 4em;
+ right: 4em;
width: 25em;
z-index: 5;
}
-.or-notice {
- border: 2px solid #000000;
- padding: 1.1em;
- margin: 5px;
- position: relative;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- -khtml-border-radius: 5px;
-}
.or-notice-toolbar {
float: right;
margin: 0 0.2em;
@@ -66,7 +66,7 @@
overflow: auto;
font-family: 'Source Code Pro', Monospace, Monospaced, Courier;
}
-/*# 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-notices.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAWI%2CIAAC%3BCAEG%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIAAC%3BCACG%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCArBJ%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3B%3BAAsBI%2CIARH%2CMAQI%3BCACG%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIAhBH%2CMAgBI%2CMACG%3BCACI%3B%3BAAIR%2CIAtBH%2CMAsBI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAARJ%2CIAtBH%2CMAsBI%2CSAUG%3BCACI%3B%3BAAKR%2CIAtCH%2CMAsCI%2CMAEG%2CIAAG%3BCACC%3B%3BAAIR%2CIA7CH%2CMA6CI%3BCACG%3B%3BAAGJ%2CIAjDH%2CMAiDI%3BCACG%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIA9DH%2CMA8DI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%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-notices.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAYI%2CIAAC%3BCACG%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCAZJ%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3B%3BAAaI%2CIARH%2CMAQI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIAjBH%2CMAiBI%3BCACG%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIAzBH%2CMAyBI%2CMACG%3BCACI%3B%3BAAIR%2CIA%5C%2FBH%2CMA%2BBI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAARJ%2CIA%5C%2FBH%2CMA%2BBI%2CSAUG%3BCACI%3B%3BAAKR%2CIA%5C%2FCH%2CMA%2BCI%2CMAEG%2CIAAG%3BCACC%3B%3BAAIR%2CIAtDH%2CMAsDI%3BCACG%3B%3BAAGJ%2CIA1DH%2CMA0DI%3BCACG%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CIAvEH%2CMAuEI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-normalize */
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
/* Customized for OR-CMS */
@@ -1475,10 +1475,7 @@ a.editorlink:visited {
overflow: auto;
border: 2px;
width: 100%;
- /* Notizen */
- /* Kalender */
/* Hilfe-Texte */
- /* Logo */
}
.or-table-area {
/* Responsive Tables */
@@ -1537,35 +1534,6 @@ a.editorlink:visited {
font-style: normal;
font-weight: bold;
}
-.or-table td.or-notice {
- margin: 0px;
- padding: 5%;
- text-align: center;
-}
-.or-table.or-notice {
- width: 100%;
- border: 1px solid;
- border-spacing: 0px;
-}
-.or-table.or-notice th {
- padding: 2px;
- white-space: nowrap;
- border-bottom: 1px solid #000000;
- font-weight: normal;
- text-align: left;
-}
-.or-table.or-notice tr.or-warning {
- margin: 0px;
- padding: 0px;
-}
-.or-table.or-calendar {
- table-layout: fixed;
- border-collapse: collapse;
- text-align: center;
-}
-.or-table.or-calendar td {
- border: 1px dotted;
-}
.or-table td:hover > div.or-onrowvisible {
visibility: visible;
}
@@ -1578,14 +1546,10 @@ a.editorlink:visited {
*/
font-style: normal;
}
-.or-table td.or-logo {
- padding: 10px;
- margin: 0px;
-}
.or-table-sort-value {
display: none;
}
-/*# 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%2Ftemplate_engine%5C%2Fcomponents%5C%2Fhtml%5C%2Fcomponent_table%5C%2Ftable.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAWI%2CGAAC%3BCAEG%3BCACA%3BCACA%3B%3B%3B%3B%3B%3BAAEA%2CGANH%2CMAMI%3B%3B%3BAAQD%2CmBALwC%3BCAKxC%2CGAdH%2CMAMI%3BEAKO%3B%3B%3BAAKR%2CGAhBH%2CMAgBI%3BCACG%3BCACA%3B%3BAAEA%2CGApBP%2CMAgBI%2COAII%3BCA5BT%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCA2BY%3BCACA%3BCACA%2CyBAAA%3BCACA%3B%3BAAzBZ%2CGAAC%2CMA6BG%2CGAAE%2CYAAe%3BAA7BrB%2CGAAC%2CMA%2BBG%3BCACI%3B%3BAAhCR%2CGAAC%2CMAmCG%2CGAAK%3BCAED%3BCACA%3B%3BAAEA%2CGAxCP%2CMAmCG%2CGAAK%2CKAKA%2CYAAe%2COAAI%2CWAAW%3BCAC3B%2CSAAS%2CQAAT%3B%3BAAEJ%2CGA3CP%2CMAmCG%2CGAAK%2CKAQA%2CaAAgB%2COAAI%2CWAAW%3BCAC5B%2CSAAS%2CQAAT%3B%3BAA5CZ%2CGAAC%2CMAgDG%2CGAAE%2CQAAW%3BCACT%3B%3BAAjDR%2CGAAC%2CMAoDG%2CGAAK%3BCACD%3BCACA%3BCACA%3BCACA%3B%3BAAxDR%2CGAAC%2CMA2DG%2CGAAE%3BCACE%3BCACA%3B%3BAA7DR%2CGAAC%2CMA%2BDG%2CGAAE%3BCACE%3BCACA%3B%3BAAjER%2CGAAC%2CMAmEG%2CGAAE%3BCACE%3BCACA%3B%3BAArER%2CGAAC%2CMAwEG%2CGAAE%3BCACE%3BCACA%3BCACA%3B%3BAAGJ%2CGA9EH%2CMA8EI%3BCACG%3BCACA%2CiBAAA%3BCACA%3B%3BAAHJ%2CGA9EH%2CMA8EI%2CUAIG%3BCACI%3BCACA%3BCACA%2CgCAAA%3BCACA%3BCACA%3B%3BAATR%2CGA9EH%2CMA8EI%2CUAeG%2CGAAE%3BCACE%3BCACA%3B%3BAAKR%2CGApGH%2CMAoGI%3BCACG%3BCACA%3BCACA%3B%3BAAHJ%2CGApGH%2CMAoGI%2CYAKG%3BCACI%2CkBAAA%3B%3BAA1GZ%2CGAAC%2CMA8GG%2CGAAE%2CMAAS%2CMAAG%3BCACV%3B%3BAA%5C%2FGR%2CGAAC%2CMAmHG%2CGAAG%2CGAAE%3BCACD%3B%3BAApHR%2CGAAC%2CMAuHG%2CGAAE%2CYAAa%2CGAAE%3B%3B%3B%3BCAIb%3B%3BAA3HR%2CGAAC%2CMAgIG%2CGAAE%3BCACE%3BCACA%3B%3BAAMJ%2CGAxIH%2CMAwII%3BCACG%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%2Ftemplate_engine%5C%2Fcomponents%5C%2Fhtml%5C%2Fcomponent_table%5C%2Ftable.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAWI%2CGAAC%3BCAEG%3BCACA%3BCACA%3B%3B%3BAAEA%2CGANH%2CMAMI%3B%3B%3BAAQD%2CmBALwC%3BCAKxC%2CGAdH%2CMAMI%3BEAKO%3B%3B%3BAAKR%2CGAhBH%2CMAgBI%3BCACG%3BCACA%3B%3BAAEA%2CGApBP%2CMAgBI%2COAII%3BCA5BT%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCA2BY%3BCACA%3BCACA%2CyBAAA%3BCACA%3B%3BAAzBZ%2CGAAC%2CMA6BG%2CGAAE%2CYAAe%3BAA7BrB%2CGAAC%2CMA%2BBG%3BCACI%3B%3BAAhCR%2CGAAC%2CMAmCG%2CGAAK%3BCAED%3BCACA%3B%3BAAEA%2CGAxCP%2CMAmCG%2CGAAK%2CKAKA%2CYAAe%2COAAI%2CWAAW%3BCAC3B%2CSAAS%2CQAAT%3B%3BAAEJ%2CGA3CP%2CMAmCG%2CGAAK%2CKAQA%2CaAAgB%2COAAI%2CWAAW%3BCAC5B%2CSAAS%2CQAAT%3B%3BAA5CZ%2CGAAC%2CMAgDG%2CGAAE%2CQAAW%3BCACT%3B%3BAAjDR%2CGAAC%2CMAoDG%2CGAAK%3BCACD%3BCACA%3BCACA%3BCACA%3B%3BAAxDR%2CGAAC%2CMA2DG%2CGAAE%3BCACE%3BCACA%3B%3BAA7DR%2CGAAC%2CMA%2BDG%2CGAAE%3BCACE%3BCACA%3B%3BAAjER%2CGAAC%2CMAmEG%2CGAAE%3BCACE%3BCACA%3B%3BAArER%2CGAAC%2CMAwEG%2CGAAE%2CMAAS%2CMAAG%3BCACV%3B%3BAAzER%2CGAAC%2CMA6EG%2CGAAG%2CGAAE%3BCACD%3B%3BAA9ER%2CGAAC%2CMAiFG%2CGAAE%2CYAAa%2CGAAE%3B%3B%3B%3BCAIb%3B%3BAAIJ%2CGAzFH%2CMAyFI%3BCACG%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/../../../template_engine/components/html/component_upload/upload */
div.or-dropzone-upload > div.input {
width: 100%;
diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css
@@ -1,4 +1,4 @@
-.or-notices{display: block;position: fixed;bottom: 40px;right: 40px;width: 25em;z-index: 5}.or-notice{border: 2px solid #000;padding: 1.1em;margin: 5px;position: relative;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px}.or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}.or-notice:hover .or-notice-toolbar{color: black}.or-notice--is-full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 6}.or-notice--is-full .or-notice-log{display: block}.or-notice-error div.text{font-weight: bold}.or-notice-text{font-size: 1.1em}.or-notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}.or-notice-log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}
+.or-notice{border: 2px solid #000;padding: 1.1em;margin: 0.5em;position: relative;border-radius: 1em;-moz-border-radius: 1em;-webkit-border-radius: 1em;-khtml-border-radius: 1em}.or-notices{display: block;position: fixed;bottom: 4em;right: 4em;width: 25em;z-index: 5}.or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}.or-notice:hover .or-notice-toolbar{color: black}.or-notice--is-full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 6}.or-notice--is-full .or-notice-log{display: block}.or-notice-error div.text{font-weight: bold}.or-notice-text{font-size: 1.1em}.or-notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}.or-notice-log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family: 'Oxygen', 'Roboto', -apple-system, BlinkMacSystemFont, "Segoe UI", "Open Sans", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;font-size: 0.9em;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%}body{margin: 0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display: block}audio,canvas,progress,video{display: inline-block;vertical-align: baseline}audio:not([controls]){display: none;height: 0}[hidden],template{display: none}a{background: transparent}a:active,a:hover{outline: 0}abbr[title]{border-bottom: 1px dotted}b,strong{font-weight: bold}dfn{font-style: italic}h1{font-size: 1.2em;margin: .67em 0}mark{background: #ff0;color: #000}small{font-size: 80%}sub,sup{font-size: 75%;line-height: 0;position: relative;vertical-align: baseline}sup{top: -0.5em}sub{bottom: -0.25em}img{border: 0}svg:not(:root){overflow: hidden}figure{margin: 1em 40px}hr{-moz-box-sizing: content-box;box-sizing: content-box;height: 0}pre{overflow: auto}code,kbd,pre,samp{font-family: 'Source Code Pro', monospace, monospace;font-size: 1em}button,input,optgroup,select,textarea{color: inherit;background-color: inherit;font: inherit;margin: 0}button{overflow: visible}button,select{text-transform: none}button,html input[type="button"]{-webkit-appearance: button;cursor: pointer}button[disabled],html input[disabled]{cursor: default}button input::-moz-focus-inner{border: 0;padding: 0}input{line-height: normal}input[type="reset"],input[type="submit"]{-webkit-appearance: button;cursor: pointer}input[type="checkbox"],input[type="radio"]{box-sizing: border-box;padding: 0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height: auto}input[type="search"]{-webkit-appearance: textfield;-moz-box-sizing: content-box;-webkit-box-sizing: content-box;box-sizing: content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance: none}fieldset{border: 1px solid #c0c0c0;margin: 0 2px;padding: .35em .625em .75em}legend{border: 0;padding: 0}textarea{overflow: auto}optgroup{font-weight: bold}table{border-collapse: collapse;border-spacing: 0}td,th{padding: 0;text-align: left}*,::before,::after{box-sizing: border-box}
.or-image--preview{max-width: 100%;overflow: auto}.or-image-icon{font-family: 'Material Icons';font-weight: normal;font-style: normal;display: inline-block;text-transform: none;letter-spacing: normal;word-wrap: normal;white-space: nowrap;direction: ltr;font-feature-settings: 'liga'}.or-image-icon--action-el_text:after{content: "spellcheck"}.or-image-icon--action-el_longtext:after{content: "view_headline"}.or-image-icon--action-el_select:after{content: "list"}.or-image-icon--action-el_number:after{content: "looks_one"}.or-image-icon--action-el_link:after{content: "call_made"}.or-image-icon--action-el_date:after{content: "date_range"}.or-image-icon--action-el_insert:after{content: "keyboard_return"}.or-image-icon--action-el_copy:after{content: "flip_to_back"}.or-image-icon--action-el_linkinfo:after{content: "info"}.or-image-icon--action-el_linkdate:after{content: "info"}.or-image-icon--action-el_code:after{content: "code"}.or-image-icon--action-el_dynamic:after{content: "play_circle_outline"}.or-image-icon--action-el_info:after{content: "info"}.or-image-icon--action-el_infodate:after{content: "info"}.or-image-icon--action-el_checkbox:after{content: "check_box"}.or-image-icon--action-image:after{content: "image"}.or-image-icon--action-link:after{content: "call_made"}.or-image-icon--action-url:after{content: "link"}.or-image-icon--action-alias:after{content: "bookmark_border"}.or-image-icon--action-text:after{content: "text_format"}.or-image-icon--action-page:after{content: "insert_drive_file"}.or-image-icon--action-file:after{content: "save"}.or-image-icon--action-modellist:after{content: "device_hub"}.or-image-icon--action-model:after{content: "device_hub"}.or-image-icon--action-folder:after{content: "folder_open"}.or-image-icon--action-languagelist:after{content: "language"}.or-image-icon--action-language:after{content: "language"}.or-image-icon--action-template:after{content: "receipt"}.or-image-icon--action-templatelist:after{content: "receipt"}.or-image-icon--action-grouplist:after{content: "group"}.or-image-icon--action-group:after{content: "group"}.or-image-icon--action-userlist:after{content: "person"}.or-image-icon--action-user:after{content: "person"}.or-image-icon--action-profile:after{content: "person_pin"}.or-image-icon--action-configuration:after{content: "settings"}.or-image-icon--action-projectlist:after{content: "account_balance"}.or-image-icon--action-project:after{content: "account_balance"}.or-image-icon--action-macro:after{content: "data_usage"}.or-image-icon--action-membership{content: "card_membership"}.or-image-icon--method-settings:after{content: "settings"}.or-image-icon--method-password:after{content: "lock"}.or-image-icon--method-publish:after{content: "cloud_upload"}.or-image-icon--method-show:after{content: "slideshow"}.or-image-icon--method-src:after{content: "code"}.or-image-icon--method-acl:after{content: "https"}.or-image-icon--method-rights:after{content: "https"}.or-image-icon--method-archive:after{content: "schedule"}.or-image-icon--method-mail:after{content: "mail"}.or-image-icon--method-search:after{content: "search"}.or-image-icon--method-add:after{content: "add_box"}.or-image-icon--method-preview:after{content: "desktop_windows"}.or-image-icon--method-edit:after{content: "spellcheck"}.or-image-icon--method-info:after{content: "info"}.or-image-icon--method-restore:after{content: "restore"}.or-image-icon--method-release:after{content: "check_circle"}.or-image-icon--status-released:after{content: "verified_user"}.or-image-icon--status-active:after{content: "grade"}.or-image-icon--menu-close:after{content: "close"}.or-image-icon--menu-fullscreen:after{content: "fullscreen"}.or-image-icon--menu-edit:after{content: "description"}.or-image-icon--menu-extra:after{content: "build"}.or-image-icon--menu-menu:after{content: "menu"}.or-image-icon--menu-minimize:after{content: "compare_arrows"}.or-image-icon--menu-qrcode:after{content: "phone_android"}.or-image-icon--node-open:after{content: "expand_more"}.or-image-icon--node-closed:after{content: "chevron_right"}.or-image-icon--dropdown:after{content: "arrow_drop_down"}.or-image-icon--database:after{content: "storage"}.or-image-icon--arrow-left:after{content: "chevron_left"}.or-image-icon--arrow-right:after{content: "chevron_right"}.or-image-icon--form-ok:after{content: "done"}.or-image-icon--form-apply:after{content: "done"}.or-image-icon--form-cancel:after{content: "clear"}.or-image-icon--editor-bold:after{content: "format_bold"}.or-image-icon--editor-italic:after{content: "format_italic"}.or-image-icon--editor-headline:after{content: "format_size"}.or-image-icon--editor-help:after{content: "help_outline"}.or-image-icon--editor-fullscreen:after{content: "fullscreen"}.or-image-icon--editor-quote:after{content: "format_quote"}.or-image-icon--editor-unnumberedlist:after{content: "format_list_bulleted"}.or-image-icon--editor-numberedlist:after{content: "format_list_numbered"}.or-image-icon--editor-preview:after{content: "desktop_windows"}.or-image-icon--editor-sidebyside:after{content: "flip"}.or-image-icon--editor-link:after{content: "link"}.or-image-icon--editor-image:after{content: "image"}.or-image-icon--editor-undo:after{content: "undo"}.or-image-icon--editor-redo:after{content: "redo"}.or-image-icon--editor-code:after{content: "code"}.or-image-icon--editor-horizontalrule:after{content: "remove"}.or-image-icon--editor-table:after{content: "view_comfy"}
.or-view-header{font-size: 1.2em}.or-act-view-loader{padding: 0.5em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}
@@ -20,7 +20,7 @@ html,body{width: 100%;height: 100%}@media only screen and (min-width: 56rem){bod
.or-group{margin: 2em 0}.or-group-title{font-size: 1.1em;font-weight: normal;border-bottom: 1px solid}
.or-logo{display: flex}.or-logo-icon{width: 1em;height: 1em;font-size: 4.8em;padding-top: 0.3em}.or-logo-description{flex: 1}.or-logo-headline{font-weight: normal;font-size: 2em}.or-logo-text{font-size: 1.3em}
-.or-table{overflow: auto;border: 2px;width: 100%}@media screen and (max-width: 40em){.or-table-area{overflow-x: auto}}.or-table-filter{width: 100%;text-align: right}.or-table-filter-input{border-radius: 3px;-moz-border-radius: 3px;-webkit-border-radius: 3px;-khtml-border-radius: 3px;padding: 0.5em;margin: 1em;border: 1px solid #000;width: 7.5em}.or-table tr.or-headline > td,.or-table tr{padding: 0.3em}.or-table tr > th{padding: 3px;font-weight: bold}.or-table tr > th.or-sort-asc > span:last-child:after{content: " \2193"}.or-table tr > th.or-sort-desc > span:last-child:after{content: " \2191"}.or-table tr.or-data > td{padding: 3px}.or-table tr > td{white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 0}.or-table td.or-readonly{font-style: italic;font-weight: normal}.or-table td.or-default{font-style: normal;font-weight: normal}.or-table td.or-changed{font-style: normal;font-weight: bold}.or-table td.or-notice{margin: 0px;padding: 5%;text-align: center}.or-table.or-notice{width: 100%;border: 1px solid;border-spacing: 0px}.or-table.or-notice th{padding: 2px;white-space: nowrap;border-bottom: 1px solid #000;font-weight: normal;text-align: left}.or-table.or-notice tr.or-warning{margin: 0px;padding: 0px}.or-table.or-calendar{table-layout: fixed;border-collapse: collapse;text-align: center}.or-table.or-calendar td{border: 1px dotted}.or-table td:hover > div.or-onrowvisible{visibility: visible}.or-table tr td.or-help{font-style: italic}.or-table tr.or-headline td.or-help{font-style: normal}.or-table td.or-logo{padding: 10px;margin: 0px}.or-table-sort-value{display: none}
+.or-table{overflow: auto;border: 2px;width: 100%}@media screen and (max-width: 40em){.or-table-area{overflow-x: auto}}.or-table-filter{width: 100%;text-align: right}.or-table-filter-input{border-radius: 3px;-moz-border-radius: 3px;-webkit-border-radius: 3px;-khtml-border-radius: 3px;padding: 0.5em;margin: 1em;border: 1px solid #000;width: 7.5em}.or-table tr.or-headline > td,.or-table tr{padding: 0.3em}.or-table tr > th{padding: 3px;font-weight: bold}.or-table tr > th.or-sort-asc > span:last-child:after{content: " \2193"}.or-table tr > th.or-sort-desc > span:last-child:after{content: " \2191"}.or-table tr.or-data > td{padding: 3px}.or-table tr > td{white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 0}.or-table td.or-readonly{font-style: italic;font-weight: normal}.or-table td.or-default{font-style: normal;font-weight: normal}.or-table td.or-changed{font-style: normal;font-weight: bold}.or-table td:hover > div.or-onrowvisible{visibility: visible}.or-table tr td.or-help{font-style: italic}.or-table tr.or-headline td.or-help{font-style: normal}.or-table-sort-value{display: none}
div.or-dropzone-upload > div.input{width: 100%;height: 100px;border: 1px dotted}
/**
* simplemde v1.11.2
diff --git a/modules/cms/ui/themes/default/style/theme/openrat-theme.less b/modules/cms/ui/themes/default/style/theme/openrat-theme.less
@@ -196,9 +196,9 @@ html.or-theme-@{cms-theme-id} {
border-color: @cms-title-text-color;
- &.error {
+ &--error {
border-bottom: 1px dotted @cms-text-color ! important;
- border: 1px solid red ! important;
+ border: 1px solid @notice-error-color ! important;
}
diff --git a/modules/template_engine/components/html/component_table/table.less b/modules/template_engine/components/html/component_table/table.less
@@ -80,44 +80,6 @@
font-style: normal;
font-weight: bold;
}
- /* Notizen */
- td.or-notice {
- margin: 0px;
- padding: 5%;
- text-align: center;
- }
-
- &.or-notice {
- width: 100%;
- border: 1px solid;
- border-spacing: 0px;
- th {
- padding: 2px;
- white-space: nowrap;
- border-bottom: 1px solid @color-overridden-by-theme;
- font-weight: normal;
- text-align: left;
- }
-
- tr.or-error {
- }
-
- tr.or-warning {
- margin: 0px;
- padding: 0px;
- }
- }
-
- /* Kalender */
- &.or-calendar {
- table-layout: fixed;
- border-collapse: collapse;
- text-align: center;
-
- td {
- border: 1px dotted;
- }
- }
td:hover > div.or-onrowvisible {
visibility: visible;
@@ -136,15 +98,6 @@
}
- /* Logo */
- td.or-logo {
- padding: 10px;
- margin: 0px;
- }
-
-
-
-
&-sort-value {
display: none;
}
