commit 1f51014ede711cad3f15e6c7fa60bb47a3b45350
parent e042cb7b20cf6fb85d9c78c947fbfc4f954903fc
Author: Jan Dankert <develop@jandankert.de>
Date: Mon, 15 Feb 2021 00:47:53 +0100
Fix: Displaying global search results instead of navigation.
Diffstat:
10 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/index/show.php b/modules/cms/ui/themes/default/html/views/index/show.php
@@ -16,7 +16,7 @@
<body><?php echo O::escapeHtml('') ?>
<div id="<?php echo O::escapeHtml('workbench') ?>" class="<?php echo O::escapeHtml('or-workbench or--initial-hidden') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-workbench-navigation') ?>"><?php echo O::escapeHtml('') ?>
- <div class="<?php echo O::escapeHtml('or-workbench-screen or-workbench-navigation-content') ?>"><?php echo O::escapeHtml('') ?>
+ <div class="<?php echo O::escapeHtml('or-workbench-screen or-workbench-navigation-content or-search') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-workbench-title or-workbench-search') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-menu') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-menu-group') ?>"><?php echo O::escapeHtml('') ?>
@@ -26,18 +26,18 @@
<div class="<?php echo O::escapeHtml('or-toolbar-icon or-act-navigation-close or--visible-on-mobile') ?>"><?php echo O::escapeHtml('') ?>
<i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--menu-close') ?>"><?php echo O::escapeHtml('') ?></i>
</div>
- <div class="<?php echo O::escapeHtml('or-toolbar-icon or-search') ?>"><?php echo O::escapeHtml('') ?>
+ <div class="<?php echo O::escapeHtml('or-toolbar-icon or-search-input') ?>"><?php echo O::escapeHtml('') ?>
<i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-search') ?>"><?php echo O::escapeHtml('') ?></i>
<input name="<?php echo O::escapeHtml('text') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('search').'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$text.'') ?>" class="<?php echo O::escapeHtml('or-title-input or-input') ?>" /><?php echo O::escapeHtml('') ?>
- <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-delete or-act-search-delete or-act-show-on-search-active') ?>"><?php echo O::escapeHtml('') ?></i>
- <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--dropdown or-menu-dropdown-icon or-act-show-on-search-active') ?>"><?php echo O::escapeHtml('') ?></i>
+ <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-delete or-act-search-delete or-search--on-active') ?>"><?php echo O::escapeHtml('') ?></i>
+ <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--dropdown or-menu-dropdown-icon or-search--on-active') ?>"><?php echo O::escapeHtml('') ?></i>
</div>
</div>
</div>
</div>
<nav class="<?php echo O::escapeHtml('or-workbench-navigation-container or-navigation or-workbench-content') ?>"><?php echo O::escapeHtml('') ?>
- <div class="<?php echo O::escapeHtml('or-view or-act-view-static or-navigation-content') ?>" data-action="<?php echo O::escapeHtml('tree') ?>" data-method="<?php echo O::escapeHtml('show') ?>"><?php echo O::escapeHtml('') ?></div>
- <div class="<?php echo O::escapeHtml('or-search-result or-act-search-result') ?>"><?php echo O::escapeHtml('') ?></div>
+ <div class="<?php echo O::escapeHtml('or-view or-act-view-static or-navigation-content or-search--on-inactive') ?>" data-action="<?php echo O::escapeHtml('tree') ?>" data-method="<?php echo O::escapeHtml('show') ?>"><?php echo O::escapeHtml('') ?></div>
+ <div class="<?php echo O::escapeHtml('or-search-result or-search--on-active or-act-search-result') ?>"><?php echo O::escapeHtml('') ?></div>
</nav>
</div>
<div class="<?php echo O::escapeHtml('or-workbench-navigation-filler or-act-navigation-close') ?>"><?php echo O::escapeHtml('') ?></div>
diff --git a/modules/cms/ui/themes/default/html/views/index/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/index/show.tpl.src.xml
@@ -29,7 +29,7 @@
<!-- Navigation -->
<div class="or-workbench-navigation">
- <div class="or-workbench-screen or-workbench-navigation-content">
+ <div class="or-workbench-screen or-workbench-navigation-content or-search">
<or:part class="workbench-title,workbench-search">
<or:part class="menu">
@@ -48,11 +48,11 @@
<image class="" menu="menu"/>
</or:part>-->
- <or:part class="toolbar-icon,search">
+ <or:part class="toolbar-icon,search-input">
<or:image method="search"/>
<or:input class="title-input" name="text" hint="${message:search}"/>
- <or:image method="delete" class="act-search-delete,act-show-on-search-active" />
- <or:image class="menu-dropdown-icon,act-show-on-search-active" symbol="dropdown"/>
+ <or:image method="delete" class="act-search-delete,search--on-active" />
+ <or:image class="menu-dropdown-icon,search--on-active" symbol="dropdown"/>
</or:part>
</or:part>
@@ -62,9 +62,8 @@
<nav class="or-workbench-navigation-container or-navigation or-workbench-content">
- <div class="or-view or-act-view-static or-navigation-content" data-action="tree" data-method="show" />
- <!--<div class="or-navigation-filler"></div>-->
- <div class="or-search-result or-act-search-result"></div>
+ <div class="or-view or-act-view-static or-navigation-content or-search--on-inactive" data-action="tree" data-method="show" />
+ <div class="or-search-result or-search--on-active or-act-search-result"></div>
</nav>
</div>
diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js
@@ -2786,7 +2786,7 @@ $( function() {
let registerGlobalSearch = function() {
- $('.or-search .or-input').orSearch( {
+ $('.or-search-input .or-input').orSearch( {
dropdown : '.or-act-search-result',
resultEntryClass: 'or-search-result-entry',
//openDropdown: true, // the dropdown is automatically opened by the menu.
diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js
@@ -1185,7 +1185,7 @@ else{}})};let timeoutMinutes=5;window.setInterval(ping,timeoutMinutes*60*1000)};
else if(Notification.permission==='granted'){let notification=new Notification(e)}
else if(Notification.permission!=='denied'){Notification.requestPermission(function(t){if(t==='granted'){let notification=new Notification(e)}})}};this.notify=function(t,i,o,n,a,log=null,notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(a);let notice=$('<div class="or-notice or-notice--'+n+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log)$(toolbar).append('<i class="or-act-notice-full or-image-icon or-image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-image-icon or-image-icon--menu-close or-act-notice-close"></i>');$(notice).append(toolbar);if(o)$(notice).append('<div class="or-notice-name"><a class="or-act-clickable" href="'+Openrat.Navigator.createShortUrl(t,i)+'" data-type="open" data-action="'+t+'" data-id="'+i+'"><i class="or-notice-action-full or-image-icon or-image-icon--action-'+t+'"></i> '+o+'</a></div>');$(notice).append('<div class="or-notice-text">'+e(a)+'</div>');if(log)$(notice).append('<div class="or-notice-log"><pre>'+e(log)+'</pre></div>');$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-act-notice-full').click(function(){$(notice).toggleClass('notice--is-full')});$(notice).find('.or-act-notice-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(n=='ok')timeout=3;if(n=='info')timeout=10;if(n=='warning')timeout=15;if(n=='error')timeout=20;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.dataChangedHandler=$.Callbacks();this.dataChangedHandler.add(function(){if(Openrat.Workbench.popupWindow)Openrat.Workbench.popupWindow.location.reload()});this.afterViewLoadedHandler=$.Callbacks();this.setApplicationTitle=function(e){if(e)$('head > title').text(e+' - '+$('head > title').data('default'));else $('head > title').text($('head > title').data('default'))};var e=function(e){return String(e).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"')};this.registerOpenClose=function(e){$(e).children('.or-collapsible-act-switch').click(function(){$(this).closest('.or-collapsible').toggleClass('collapsible--is-open').toggleClass('collapsible--is-closed')})};this.openNewAction=function(e,t,i){$('.or-workbench-navigation').removeClass('workbench-navigation--is-open');Openrat.Workbench.setApplicationTitle(e);Openrat.Navigator.navigateToNew({'action':t,'id':i})};this.startDialog=function(e,t,i,o,n){if(!t)t=Openrat.Workbench.state.action;if(!o)o=Openrat.Workbench.state.id;let view=new Openrat.View(t,i,o,n);view.before=function(){$('.or-dialog-content .or-view').html('<div class="header"><img class="or-icon" title="" src="./themes/default/images/icon/'+i+'.png" />'+e+'</div>');$('.or-dialog-content .or-view').data('id',o);$('.or-dialog').removeClass('dialog--is-closed').addClass('dialog--is-open');$('.or-dialog-content .or-act-dialog-name').html(e);let view=this;this.escapeKeyClosingHandler=function(e){if(e.keyCode==27){view.close();$(document).off('keyup')}};$(document).keyup(this.escapeKeyClosingHandler);$('.or-dialog-filler,.or-act-dialog-close').click(function(e){e.preventDefault();view.close()})};view.close=function(){let isDirty=$('.or-view--is-dirty').length;if(isDirty){let exit=window.confirm(Openrat.Workbench.language.UNSAVED_CHANGES_CONFIRM);if(!exit)return};if($('.or-dialog').hasClass('or-dialog--modal'))return;$('.or-dialog-content .or-view.or-view--is-dirty').removeClass('view--is-dirty');$('.or-dialog-content .or-view').html('');$('.or-dialog').removeClass('dialog--is-open').addClass('dialog--is-closed');$(document).unbind('keyup',this.escapeKeyClosingHandler)};return view.start($('.or-dialog-content .or-view'))};this.registerDraggable=function(e){$(e).find('.or-draggable').draggable({helper:'clone',opacity:0.7,zIndex:2,distance:10,cursor:'move',revert:'false'})};this.registerDroppable=function(e){$(e).find('.or-droppable').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let id=dropped.data('id');let name=dropped.data('name');if(!name)name=id;$(this).find('.or-selector-link-value').val(id);$(this).find('.or-selector-link-name').val(name).attr('placeholder',name)}})}};
;Openrat.Navigator=new function(){'use strict';this.navigateTo=function(t){Openrat.Workbench.loadNewActionState(t)};this.navigateToNew=function(t){this.navigateTo(t);window.history.pushState(t,t.name,this.createShortUrl(t.action,t.id))};this.toActualHistory=function(t){window.history.replaceState(t,t.name,this.createShortUrl(t.action,t.id))};this.createShortUrl=function(t,i){return'./#/'+t+(i?'/'+i:'')}};
-;$(function(){$('html').removeClass('nojs');$('.or--initial-hidden').removeClass('-initial-hidden');function n(){};n();window.onpopstate=function(e){Openrat.Navigator.navigateTo(e.state)};Openrat.Workbench.initialize();Openrat.Workbench.reloadAll();let registerWorkbenchGlobalEvents=function(){$('.keystroke').each(function(){let keystrokeElement=$(this);let keystroke=keystrokeElement.text();if(keystroke.length==0)return;let keyaction=function(){keystrokeElement.click()};$(document).bind('keydown',keystroke,keyaction)})};$('.or-act-initial-notice').each(function(){Openrat.Workbench.notify('',0,'','info',$(this).text());$(this).remove()});registerWorkbenchGlobalEvents();let closeMenu=function(){$('body').click(function(){$('.or-menu').removeClass('menu--is-open')})};closeMenu();let closeMobileNavigation=function(){$('.or-act-navigation-close').click(function(){$('.or-workbench-navigation').removeClass('workbench-navigation--is-open');$('.or-workbench').removeClass('workbench--navigation-is-open')})};closeMobileNavigation();let closeDesktopNavigation=function(){$('.or-workbench-title .or-act-nav-small').click(function(){$('.or-workbench').addClass('workbench--navigation-is-small');$('.or-workbench-navigation').addClass('workbench-navigation--is-small')})};closeDesktopNavigation();let registerGlobalSearch=function(){$('.or-search .or-input').orSearch({dropdown:'.or-act-search-result',resultEntryClass:'or-search-result-entry',select:function(e){Openrat.Workbench.openNewAction(e.name,e.action,e.id)},afterSelect:function(){}});$('.or-search .or-act-search-delete').click(function(){$('.or-search .or-title-input').val('').change()})};registerGlobalSearch();Openrat.Workbench.afterNewActionHandler.add(function(){$('.or-sidebar').find('.or-sidebar-button').orLinkify()});Openrat.Workbench.afterNewActionHandler.add(function(){let url=Openrat.View.createUrl('tree','path',Openrat.Workbench.state.id,{'type':Openrat.Workbench.state.action});let loadPromise=$.get(url);loadPromise.done(function(e){$('.or-breadcrumb').empty().append(e).find('.or-act-clickable').orLinkify();$('nav .or-navtree-node').removeClass('or-navtree-node--selected');$('.or-breadcrumb a').each(function(){let action=$(this).data('action');let id=$(this).data('id');let $navControl=$('nav .or-navtree-node[data-type='+action+'][data-id='+id+'].or-navtree-node--is-closed .or-navtree-node-control');$navControl.click()})}).fail(function(n,t,o){console.warn({message:'Failed to load path',url:url,error:e,status:t,o})}).always(function(){})});Openrat.Workbench.afterNewActionHandler.fire()});let filterMenus=function(){let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;$('.or-workbench-title .or-dropdown-entry.or-act-clickable').addClass('dropdown-entry--active');$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered').removeClass('dropdown-entry--active').addClass('dropdown-entry--inactive');$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered .or-link').attr('data-id',id);let url=Openrat.View.createUrl('profile','available',id,{'queryaction':action},!0);let promise=$.getJSON(url);promise.done(function(e){jQuery.each(e.output.views,function(e,n){$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered > .or-link[data-method=\''+n+'\']').parent().addClass('dropdown-entry--active').removeClass('dropdown-entry--inactive')})})};Openrat.Workbench.afterAllViewsLoaded.add(function(){filterMenus()});Openrat.Workbench.afterViewLoadedHandler.add(function(e){if(Openrat.Workbench.popupWindow)$(e).find('a[data-type=\'popup\']').each(function(){Openrat.Workbench.popupWindow.location.href=$(this).attr('data-url')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('.or-input--password').dblclick(function(){$(this).toggleAttr('type','text','password')});$(e).find('.or-act-make-visible').click(function(){$(this).toggleClass('btn--is-active');$(this).parent().children('input').toggleAttr('type','text','password')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){e.find('.or-act-load-nav-tree').each(function(){let type=$(this).data('type')||'root';let loadBranchUrl='./?action=tree&subaction=branch&id=0&type='+type;let $targetElement=$(this);$.get(loadBranchUrl).done(function(e){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($targetElement.empty()).append(e);$ul.find('li').orTree({'openAction':function(e,n,t){Openrat.Workbench.openNewAction(e,n,t)}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var n=$(e).closest('section');n.toggleClass('is-empty',$(e).is(':empty'));if(!$(e).is(':empty'))n.slideDown('fast');else n.slideUp('fast');$(e).find('.or-act-nav-open-close').click(function(){$('.or-workbench').toggleClass('workbench--navigation-is-open');$('.or-workbench-navigation').toggleClass('workbench-navigation--is-open')});$(e).find('.or-act-nav-small').click(function(){$('.or-workbench').addClass('workbench--navigation-is-small');$('.or-workbench-navigation').addClass('workbench-navigation--is-small')});$(e).find('.or-act-nav-wide').click(function(){$('.or-workbench').removeClass('workbench--navigation-is-small');$('.or-workbench-navigation').removeClass('workbench-navigation--is-small')});$(e).find('.or-act-load-selector-tree').each(function(){var n=this;let id=$(this).data('init-folder-id');let type=id?'folder':'projects';let loadBranchUrl='./?action=tree&subaction=branch&id='+id+'&type='+type;let $targetElement=$(this);$.get(loadBranchUrl).done(function(n){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($targetElement.empty()).append(n);$ul.find('li').orTree({'openAction':function(n,t,o){e.find('.or-selector-link-value').val(o);e.find('.or-selector-link-name').val('').attr('placeholder',n)}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})});t(e);$(e).find('.or-input').change(function(){$(this).closest('.or-view').addClass('view--is-dirty')});$(e).find('.or-theme-chooser').change(function(){Openrat.Workbench.setUserStyle(this.value)});function o(e){$(e).find('.or-menu-category').click(function(e){e.stopPropagation();$(this).parents('.or-menu').toggleClass('menu--is-open')});$(e).find('.or-menu-category').mouseover(function(){$(this).parents('.or-menu').find('.or-menu-category').removeClass('menu-category--is-open');$(this).addClass('menu-category--is-open')})};function r(e){$(e).find('.or-selector .or-selector-link-name').orSearch({dropdown:'.or-dropdown.or-act-selector-search-results',resultEntryClass:'or-search-result-entry',select:function(n){$(e).find('.or-selector-link-value').val(n.id);$(e).find('.or-selector-link-name').val(n.name).attr('placeholder',n.name)},afterSelect:function(){$('.or-dropdown.or-act-selector-search-results').empty()}})};function a(e){};o(e);r(e);a(e);function t(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};t(e)});
+;$(function(){$('html').removeClass('nojs');$('.or--initial-hidden').removeClass('-initial-hidden');function n(){};n();window.onpopstate=function(e){Openrat.Navigator.navigateTo(e.state)};Openrat.Workbench.initialize();Openrat.Workbench.reloadAll();let registerWorkbenchGlobalEvents=function(){$('.keystroke').each(function(){let keystrokeElement=$(this);let keystroke=keystrokeElement.text();if(keystroke.length==0)return;let keyaction=function(){keystrokeElement.click()};$(document).bind('keydown',keystroke,keyaction)})};$('.or-act-initial-notice').each(function(){Openrat.Workbench.notify('',0,'','info',$(this).text());$(this).remove()});registerWorkbenchGlobalEvents();let closeMenu=function(){$('body').click(function(){$('.or-menu').removeClass('menu--is-open')})};closeMenu();let closeMobileNavigation=function(){$('.or-act-navigation-close').click(function(){$('.or-workbench-navigation').removeClass('workbench-navigation--is-open');$('.or-workbench').removeClass('workbench--navigation-is-open')})};closeMobileNavigation();let closeDesktopNavigation=function(){$('.or-workbench-title .or-act-nav-small').click(function(){$('.or-workbench').addClass('workbench--navigation-is-small');$('.or-workbench-navigation').addClass('workbench-navigation--is-small')})};closeDesktopNavigation();let registerGlobalSearch=function(){$('.or-search-input .or-input').orSearch({dropdown:'.or-act-search-result',resultEntryClass:'or-search-result-entry',select:function(e){Openrat.Workbench.openNewAction(e.name,e.action,e.id)},afterSelect:function(){}});$('.or-search .or-act-search-delete').click(function(){$('.or-search .or-title-input').val('').change()})};registerGlobalSearch();Openrat.Workbench.afterNewActionHandler.add(function(){$('.or-sidebar').find('.or-sidebar-button').orLinkify()});Openrat.Workbench.afterNewActionHandler.add(function(){let url=Openrat.View.createUrl('tree','path',Openrat.Workbench.state.id,{'type':Openrat.Workbench.state.action});let loadPromise=$.get(url);loadPromise.done(function(e){$('.or-breadcrumb').empty().append(e).find('.or-act-clickable').orLinkify();$('nav .or-navtree-node').removeClass('or-navtree-node--selected');$('.or-breadcrumb a').each(function(){let action=$(this).data('action');let id=$(this).data('id');let $navControl=$('nav .or-navtree-node[data-type='+action+'][data-id='+id+'].or-navtree-node--is-closed .or-navtree-node-control');$navControl.click()})}).fail(function(n,t,o){console.warn({message:'Failed to load path',url:url,error:e,status:t,o})}).always(function(){})});Openrat.Workbench.afterNewActionHandler.fire()});let filterMenus=function(){let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;$('.or-workbench-title .or-dropdown-entry.or-act-clickable').addClass('dropdown-entry--active');$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered').removeClass('dropdown-entry--active').addClass('dropdown-entry--inactive');$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered .or-link').attr('data-id',id);let url=Openrat.View.createUrl('profile','available',id,{'queryaction':action},!0);let promise=$.getJSON(url);promise.done(function(e){jQuery.each(e.output.views,function(e,n){$('.or-workbench-title .or-dropdown-entry.or-act-clickable.or-filtered > .or-link[data-method=\''+n+'\']').parent().addClass('dropdown-entry--active').removeClass('dropdown-entry--inactive')})})};Openrat.Workbench.afterAllViewsLoaded.add(function(){filterMenus()});Openrat.Workbench.afterViewLoadedHandler.add(function(e){if(Openrat.Workbench.popupWindow)$(e).find('a[data-type=\'popup\']').each(function(){Openrat.Workbench.popupWindow.location.href=$(this).attr('data-url')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('.or-input--password').dblclick(function(){$(this).toggleAttr('type','text','password')});$(e).find('.or-act-make-visible').click(function(){$(this).toggleClass('btn--is-active');$(this).parent().children('input').toggleAttr('type','text','password')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){e.find('.or-act-load-nav-tree').each(function(){let type=$(this).data('type')||'root';let loadBranchUrl='./?action=tree&subaction=branch&id=0&type='+type;let $targetElement=$(this);$.get(loadBranchUrl).done(function(e){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($targetElement.empty()).append(e);$ul.find('li').orTree({'openAction':function(e,n,t){Openrat.Workbench.openNewAction(e,n,t)}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var n=$(e).closest('section');n.toggleClass('is-empty',$(e).is(':empty'));if(!$(e).is(':empty'))n.slideDown('fast');else n.slideUp('fast');$(e).find('.or-act-nav-open-close').click(function(){$('.or-workbench').toggleClass('workbench--navigation-is-open');$('.or-workbench-navigation').toggleClass('workbench-navigation--is-open')});$(e).find('.or-act-nav-small').click(function(){$('.or-workbench').addClass('workbench--navigation-is-small');$('.or-workbench-navigation').addClass('workbench-navigation--is-small')});$(e).find('.or-act-nav-wide').click(function(){$('.or-workbench').removeClass('workbench--navigation-is-small');$('.or-workbench-navigation').removeClass('workbench-navigation--is-small')});$(e).find('.or-act-load-selector-tree').each(function(){var n=this;let id=$(this).data('init-folder-id');let type=id?'folder':'projects';let loadBranchUrl='./?action=tree&subaction=branch&id='+id+'&type='+type;let $targetElement=$(this);$.get(loadBranchUrl).done(function(n){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($targetElement.empty()).append(n);$ul.find('li').orTree({'openAction':function(n,t,o){e.find('.or-selector-link-value').val(o);e.find('.or-selector-link-name').val('').attr('placeholder',n)}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})});t(e);$(e).find('.or-input').change(function(){$(this).closest('.or-view').addClass('view--is-dirty')});$(e).find('.or-theme-chooser').change(function(){Openrat.Workbench.setUserStyle(this.value)});function o(e){$(e).find('.or-menu-category').click(function(e){e.stopPropagation();$(this).parents('.or-menu').toggleClass('menu--is-open')});$(e).find('.or-menu-category').mouseover(function(){$(this).parents('.or-menu').find('.or-menu-category').removeClass('menu-category--is-open');$(this).addClass('menu-category--is-open')})};function r(e){$(e).find('.or-selector .or-selector-link-name').orSearch({dropdown:'.or-dropdown.or-act-selector-search-results',resultEntryClass:'or-search-result-entry',select:function(n){$(e).find('.or-selector-link-value').val(n.id);$(e).find('.or-selector-link-name').val(n.name).attr('placeholder',n.name)},afterSelect:function(){$('.or-dropdown.or-act-selector-search-results').empty()}})};function a(e){};o(e);r(e);a(e);function t(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};t(e)});
;Openrat.Workbench.afterViewLoadedHandler.add(function(e){});
;Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('textarea').orAutoheight();$(e).find('textarea.or-editor.or-code-editor').each(function(){let mode=$(this).data('mode');let mimetype=$(this).data('mimetype');if(mimetype.length>0)mode=mimetype;let textareaEl=this;let editor=CodeMirror.fromTextArea(textareaEl,{lineNumbers:!0,viewportMargin:Infinity,mode:mode});editor.on('change',function(){let newValue=editor.getValue();$(textareaEl).val(newValue)});$(editor.getWrapperElement()).droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let pos=editor.getCursor();editor.setSelection(pos,pos);let insertText=dropped.data('id');let toInsert=''+insertText;editor.replaceSelection(toInsert)}})});$(e).find('textarea.or-editor.or-markdown-editor').each(function(){let textarea=this;let toolbar=[{name:'bold',action:SimpleMDE.toggleBold,className:'image-icon image-icon--editor-bold',title:'Bold',},{name:'italic',action:SimpleMDE.toggleItalic,className:'image-icon image-icon--editor-italic',title:'Italic',},{name:'heading',action:SimpleMDE.toggleHeadingBigger,className:'image-icon image-icon--editor-headline',title:'Headline',},'|',{name:'quote',action:SimpleMDE.toggleBlockquote,className:'image-icon image-icon--editor-quote',title:'Quote',},{name:'code',action:SimpleMDE.toggleCodeBlock,className:'image-icon image-icon--editor-code',title:'Code',},'|',{name:'generic list',action:SimpleMDE.toggleUnorderedList,className:'image-icon image-icon--editor-unnumberedlist',title:'Unnumbered list',},{name:'numbered list',action:SimpleMDE.toggleOrderedList,className:'image-icon image-icon--editor-numberedlist',title:'Numbered list',},'|',{name:'table',action:SimpleMDE.drawTable,className:'image-icon image-icon--editor-table',title:'Table',},{name:'horizontalrule',action:SimpleMDE.drawHorizontalRule,className:'image-icon image-icon--editor-horizontalrule',title:'Horizontal rule',},'|',{name:'undo',action:SimpleMDE.undo,className:'image-icon image-icon--editor-undo',title:'Undo',},{name:'redo',action:SimpleMDE.redo,className:'image-icon image-icon--editor-redo',title:'Redo',},'|',{name:'link',action:SimpleMDE.drawLink,className:'image-icon image-icon--editor-link',title:'Link',},{name:'image',action:SimpleMDE.drawImage,className:'image-icon image-icon--editor-image',title:'Image',},'|',{name:'guide',action:'https://simplemde.com/markdown-guide',className:'image-icon image-icon--editor-help',title:'Howto markdown',},];let mde=new SimpleMDE({element:$(this)[0],toolbar:toolbar,autoDownloadFontAwesome:!1});let codemirror=mde.codemirror;$(codemirror.getWrapperElement()).droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let insertText='';let id=dropped.data('id');let url='__OID__'+id+'__';if(dropped.data('type')=='image')insertText='';else insertText='['+id+']('+url+')';let pos=codemirror.getCursor();codemirror.setSelection(pos,pos);codemirror.replaceSelection(insertText)}});codemirror.on('change',function(){let newValue=codemirror.getValue();$(textarea).val(newValue)})});$(e).find('textarea.or-editor.or-html-editor').each(function(){let textarea=this;$.trumbowyg.svgPath='./modules/editor/trumbowyg/ui/icons.svg';$(textarea).trumbowyg();$(textarea).closest('form').find('.trumbowyg-editor').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let id=dropped.data('id');let url='./?_='+dropped.data('type')+'-'+id+'&subaction=show&embed=1&__OID__'+id+'__='+id;let insertText='';if(dropped.data('type')=='image')insertText='<img src="'+url+'" alt="" />';else insertText='<a href="'+url+'" />'+id+'</a>';$(textarea).trumbowyg('execCmd',{cmd:'insertHTML',param:insertText,forceCss:!1,})}})})});
;Openrat.Workbench.afterViewLoadedHandler.add(function(e){Openrat.Workbench.registerOpenClose($(e).find('.or-collapsible.or-group'))});
diff --git a/modules/cms/ui/themes/default/script/openrat/common.js b/modules/cms/ui/themes/default/script/openrat/common.js
@@ -84,7 +84,7 @@ $( function() {
let registerGlobalSearch = function() {
- $('.or-search .or-input').orSearch( {
+ $('.or-search-input .or-input').orSearch( {
dropdown : '.or-act-search-result',
resultEntryClass: 'or-search-result-entry',
//openDropdown: true, // the dropdown is automatically opened by the menu.
diff --git a/modules/cms/ui/themes/default/style/openrat-form.less b/modules/cms/ui/themes/default/style/openrat-form.less
@@ -81,7 +81,7 @@
&-input {
width: 85%;
- border: 1px solid #ccc;
+ border: 1px solid;
border-radius: 4px;
box-sizing: border-box;
resize: vertical;
diff --git a/modules/cms/ui/themes/default/style/openrat-search.less b/modules/cms/ui/themes/default/style/openrat-search.less
@@ -1,16 +1,32 @@
.or {
&-search {
- border-bottom: 0.1em solid;
- .or-act-show-on-search-active {
+ &--on-active {
display: none;
}
+ &--on-inactive {
+ display: inline;
+ }
+ &-input {
+ border-bottom: 0.1em solid;
+ .or-input {
+ border: 0;
+ box-shadow: 0 0 0 !important;
+ border-radius: 0;
+ width: 8em;
+ }
+ }
&--is-active {
- .or-act-show-on-search-active {
- display: inline;
+ .or-search {
+ &--on-active {
+ display: inline;
+ }
+ &--on-inactive {
+ display: none;
+ }
}
}
@@ -18,20 +34,11 @@
&-result {
display: none;
- position: absolute;
- width:100%;
- height:100%;
- top: 0;
- left: 0;
padding: 1em;
&-entry {
padding-top:0.2em;
}
-
- &--is-active {
- display: block;
- }
}
}
diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css
@@ -1192,7 +1192,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
.or-input {
width: 85%;
- border: 1px solid #ccc;
+ border: 1px solid;
border-radius: 4px;
box-sizing: border-box;
resize: vertical;
@@ -1239,7 +1239,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
min-width: 0;
}
}
-/*# 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-form.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAWA%3B%3B%3BAAEI%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CGANH%2CKAMI%3BCACG%3B%3BAAGJ%2CGAVH%2CKAUI%3BCACG%3BCACA%3B%3BAAKJ%2CGAjBH%2CKAiBI%3BCACG%3BCACA%3B%3BAAFJ%2CGAjBH%2CKAiBI%2CIAIG%3BCACI%3B%3BAALR%2CGAjBH%2CKAiBI%2CIAQG%3BCACI%3B%3BAAYR%3BCAAA%2CGAtCH%2CKAiBI%3BEAcO%3B%3BCAOR%2CGAtCH%2CKAiBI%2CIAgBO%3BCAKR%2CGAtCH%2CKAiBI%2CIAiBO%3BEACI%3B%3B%3BAAMZ%2CGAzCH%2CKAyCI%3BCAEG%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAaR%3BCAAA%2CGAjEC%2CKA2DO%3BEACI%3B%3B%3BAAQZ%2CGAAC%3BCACG%3BCACA%2CsBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CGAVH%2CMAUI%3BCACG%3B%3BAAGJ%2CGAdH%2CMAcI%3BAAAY%2CGAdhB%2CMAciB%3BCACV%2CaAAa%2CiDAAb%3B%3BAAQR%2CGAAC%3BCACG%3BCACA%2CyBAAA%3BCAvGJ%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAsGI%3B%3BAAEA%2CGANH%2CIAMI%3BCACG%2CgBAAA%3BCACA%3BCACA%3BCA9GR%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAAkHI%3BCAAA%2CGAhBH%2CIAMI%3BEAOO%2CgBAAA%3BEACA%3B%3B%3BAAIR%2CGAlBH%2CIAkBI%3BCACG%3B%3BAAOJ%3BCAAA%2CGA1BH%2CIAsBI%3BEAEO%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-form.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAWA%3B%3B%3BAAEI%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CGANH%2CKAMI%3BCACG%3B%3BAAGJ%2CGAVH%2CKAUI%3BCACG%3BCACA%3B%3BAAKJ%2CGAjBH%2CKAiBI%3BCACG%3BCACA%3B%3BAAFJ%2CGAjBH%2CKAiBI%2CIAIG%3BCACI%3B%3BAALR%2CGAjBH%2CKAiBI%2CIAQG%3BCACI%3B%3BAAYR%3BCAAA%2CGAtCH%2CKAiBI%3BEAcO%3B%3BCAOR%2CGAtCH%2CKAiBI%2CIAgBO%3BCAKR%2CGAtCH%2CKAiBI%2CIAiBO%3BEACI%3B%3B%3BAAMZ%2CGAzCH%2CKAyCI%3BCAEG%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAaR%3BCAAA%2CGAjEC%2CKA2DO%3BEACI%3B%3B%3BAAQZ%2CGAAC%3BCACG%3BCACA%2CiBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CGAVH%2CMAUI%3BCACG%3B%3BAAGJ%2CGAdH%2CMAcI%3BAAAY%2CGAdhB%2CMAciB%3BCACV%2CaAAa%2CiDAAb%3B%3BAAQR%2CGAAC%3BCACG%3BCACA%2CyBAAA%3BCAvGJ%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAsGI%3B%3BAAEA%2CGANH%2CIAMI%3BCACG%2CgBAAA%3BCACA%3BCACA%3BCA9GR%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAAkHI%3BCAAA%2CGAhBH%2CIAMI%3BEAOO%2CgBAAA%3BEACA%3B%3B%3BAAIR%2CGAlBH%2CIAkBI%3BCACG%3B%3BAAOJ%3BCAAA%2CGA1BH%2CIAsBI%3BEAEO%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-nojs */
.or-nojs-text {
display: block;
@@ -1600,31 +1600,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
/*# 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-workbench.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%3BAAoCA%3B%3B%3BAAEI%2CGAAC%3BCAEG%3BCACA%3BCACA%3BCACA%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%3B%3BAAEA%2CGAPH%2CUAOI%3BCAEC%3B%3BAAIF%2CGAbH%2CUAaI%3B%3BCAEC%3BCACA%3BCACA%3B%3B%3B%3B%3B%3BAAJF%2CGAbH%2CUAaI%2COAeG%3BCAGA%3BCACA%3B%3BAAQJ%2CGAxCH%2CUAwCI%3BCACC%3B%3BAAGF%2CGA5CH%2CUA4CI%3BCACG%3BCACA%3BCACA%3BCACA%3BCACA%3BCAGA%3B%3BAARJ%2CGA5CH%2CUA4CI%2CMAUG%2CcAEI%3BCACI%3B%3BAAOJ%3BCAAA%2CGAhEX%2CUA4CI%2CMAUG%2CcAMI%2CKAAI%3BCAIJ%2CGAhEX%2CUA4CI%2CMAUG%2CcAMgB%3BEAEJ%3B%3B%3BAAQhB%2CGAtEH%2CUAsEI%3BCACG%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAA%2BDJ%2CGAtIH%2CUAsII%3BCACG%3B%3BAAGJ%2CGA1IH%2CUA0II%3BCACG%3B%3BAAGJ%2CGA9IH%2CUA8II%2CqBACG%3BCACI%3B%3BAAFR%2CGA9IH%2CUA8II%2CqBAKG%3BCACI%3B%3BAAIR%2CGAxJH%2CUAwJI%3BCAEG%3BCACA%3BCACA%3B%3BAAEA%2CGA9JP%2CUAwJI%2CWAMI%3BCAEC%3B%3BAAIF%3BCAAA%2CGApKP%2CUAwJI%2CWAMI%3BEAIG%3B%3B%3BAAGJ%2CGArKP%2CUAwJI%2CWAaI%3BCACC%3BCACA%3B%3BAAGF%2CGA1KP%2CUAwJI%2CWAkBI%3BCAEG%3BCACA%3BCAOA%3BCACA%3B%3BAASN%2CGA9LL%2CUAwJI%2CWAsCE%3BCACK%3B%3BAADN%2CGA9LL%2CUAwJI%2CWAsCE%2CUAOK%3BCAEI%3BCACA%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3B%3BAAVV%2CGA9LL%2CUAwJI%2CWAsCE%2CUAOK%2CmCAKI%3BCACE%3B%3BAAbZ%2CGA9LL%2CUAwJI%2CWAsCE%2CUA6BK%3BCACI%3B%3BAAkCR%3BCAAA%2CGA9PP%2CUAwJI%3BEA0EO%3B%3BCA4BJ%2CGA9PP%2CUAwJI%2CWA4EO%3B%3B%3B%3B%3B%3BCAQA%2CGA5OX%2CUAwJI%2CWAoFQ%3BEASC%3BEACA%3BEACA%3BEACA%3BEACA%3B%3BCAbF%2CGA5OX%2CUAwJI%2CWAoFQ%2CSAEC%3BEACE%3B%3BCAHJ%2CGA5OX%2CUAwJI%2CWAoFQ%2CSAKC%3BEACE%3B%3B%3BAAiBR%3BCAAA%2CGAnQP%2CUAwJI%3BEAuGO%3B%3B%3BAAvGR%2CGAxJH%2CUAwJI%2CWA2GG%3BCACI%3B%3BAAOZ%2CGAAC%3BCACG%3B%3BAAKJ%3BCAAA%2CGANC%3BEAGO%3B%3B%3BAASR%3BCAAA%2CGALC%3BEAGO%3B%3B%3BAAIR%2CGAAC%3BCACG%3B%3BAAIJ%3BCAAA%2CGALC%3BEAGO%3B%3B%3BAAIR%2CGAAC%3BCACG%3B%3BAAIJ%3BCAAA%2CGALC%3BEAGO%3B%3B%3BAAmBR%2CGAAC%3BCAEG%2C%2BCAAA%3BCACA%2CgCAAA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAkBR%3BCALI%3BEACI%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-search */
-.or-search {
+.or-search--on-active {
+ display: none;
+}
+.or-search--on-inactive {
+ display: inline;
+}
+.or-search-input {
border-bottom: 0.1em solid;
}
-.or-search .or-act-show-on-search-active {
- display: none;
+.or-search-input .or-input {
+ border: 0;
+ box-shadow: 0 0 0 !important;
+ border-radius: 0;
+ width: 8em;
}
-.or-search--is-active .or-act-show-on-search-active {
+.or-search--is-active .or-search--on-active {
display: inline;
}
+.or-search--is-active .or-search--on-inactive {
+ display: none;
+}
.or-search-result {
display: none;
- position: absolute;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
padding: 1em;
}
.or-search-result-entry {
padding-top: 0.2em;
}
-.or-search-result--is-active {
- 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-search.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AACE%2CGAAC%3BCAEC%2C0BAAA%3B%3BAAFF%2CGAAC%2COAIC%3BCACE%3B%3BAAGF%2CGARD%2COAQE%2CWAEC%3BCACE%3B%3BAAMJ%2CGAjBD%2COAiBE%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAEA%2CGA1BH%2COAiBE%2COASE%3BCACC%3B%3BAAGF%2CGA9BH%2COAiBE%2COAaE%3BCACC%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-search.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAII%2CGAHD%2COAGE%3BCACC%3B%3BAAEF%2CGAND%2COAME%3BCACC%3B%3BAAGF%2CGAVD%2COAUE%3BCACC%2C0BAAA%3B%3BAADF%2CGAVD%2COAUE%2CMAEC%3BCACE%3BCACA%2C4BAAA%3BCACA%3BCACA%3B%3BAAMA%2CGAtBL%2COAmBE%2CWAEC%2CWACG%3BCACC%3B%3BAAEF%2CGAzBL%2COAmBE%2CWAEC%2CWAIG%3BCACC%3B%3BAAON%2CGAjCD%2COAiCE%3BCACC%3BCACA%3B%3BAAEA%2CGArCH%2COAiCE%2COAIE%3BCACC%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/../../../template_engine/components/html/component_editor/editor */
.editor__text-editor {
width: 100%;
diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css
@@ -12,12 +12,12 @@ html,body{width: 100%;height: 100%}@media only screen and (min-width: 56rem){bod
.or-breadcrumb{margin-left: 1.5em;margin-right: 0.5em}.or-breadcrumb > *{vertical-align: middle;display: inline;margin-right: 0.3em}@media only screen and (min-width: 100rem){.or-breadcrumb-parent{display: none}}.or-breadcrumb-path{display: none}@media only screen and (min-width: 100rem){.or-breadcrumb-path{display: inline}}.or-breadcrumb-text{font-weight: bold;width: 12em;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;display: inline-block}@media only screen and (max-width: 55rem){.or-breadcrumb-text{width: 5.5em}}
.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}
.or-collapsible{display: flex;flex-direction: column}.or-collapsible .or-collapsible-act-switch{cursor: pointer}.or-collapsible > .or-collapsible-value{flex: 1;display: block}.or-collapsible > .or-collapsible-title{padding-bottom: 0.1em}.or-collapsible--is-closed > * > .or-collapsible--on-closed{display: inline}.or-collapsible--is-closed > * > .or-collapsible--on-open{display: none}.or-collapsible--is-closed > .or-collapsible-value{opacity: 0;max-height: 0;overflow: hidden}.or-collapsible--is-open > .or-collapsible-value{height: auto}.or-collapsible--is-open > * > .or-collapsible--on-closed{display: none}.or-collapsible--is-open > * > .or-collapsible--on-open{display: inline}
-.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form-headline{height: 2em}.or-form-content{flex-grow: 1;padding-bottom: 6em}.or-form-row{display: flex;align-items: center}.or-form-row .or-form-label{width: 25%}.or-form-row .or-form-input{width: 75%}@media only screen and (max-width: 65rem){.or-form-row{flex-direction: column}.or-form-row .or-form-label,.or-form-row .or-form-input{width: 100%}}.or-form-actionbar{height: 3em;position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}@media only screen and (max-width: 65rem){.or-form .or-act-form-apply{display: none}}.or-input{width: 85%;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;resize: vertical;padding: 2px;margin: 0;outline: none}.or-input--name{font-weight: bold}.or-input--filename,.or-input--extension{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}.or-btn{padding: 0.2em;border: 1px solid #000;border-radius: .1em;-moz-border-radius: .1em;-webkit-border-radius: .1em;-khtml-border-radius: .1em;cursor: pointer}.or-btn--control{padding: 1em 2em;margin-left: 1.5em;min-width: 14em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}@media only screen and (max-width: 65rem){.or-btn--control{padding: 1em 1em;min-width: 5em}}.or-btn--primary{font-weight: bold}@media only screen and (max-width: 65rem){.or-btn--secondary{min-width: 0}}
+.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form-headline{height: 2em}.or-form-content{flex-grow: 1;padding-bottom: 6em}.or-form-row{display: flex;align-items: center}.or-form-row .or-form-label{width: 25%}.or-form-row .or-form-input{width: 75%}@media only screen and (max-width: 65rem){.or-form-row{flex-direction: column}.or-form-row .or-form-label,.or-form-row .or-form-input{width: 100%}}.or-form-actionbar{height: 3em;position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}@media only screen and (max-width: 65rem){.or-form .or-act-form-apply{display: none}}.or-input{width: 85%;border: 1px solid;border-radius: 4px;box-sizing: border-box;resize: vertical;padding: 2px;margin: 0;outline: none}.or-input--name{font-weight: bold}.or-input--filename,.or-input--extension{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}.or-btn{padding: 0.2em;border: 1px solid #000;border-radius: .1em;-moz-border-radius: .1em;-webkit-border-radius: .1em;-khtml-border-radius: .1em;cursor: pointer}.or-btn--control{padding: 1em 2em;margin-left: 1.5em;min-width: 14em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}@media only screen and (max-width: 65rem){.or-btn--control{padding: 1em 1em;min-width: 5em}}.or-btn--primary{font-weight: bold}@media only screen and (max-width: 65rem){.or-btn--secondary{min-width: 0}}
.or-nojs-text{display: block}.or-visible-for-nojs{display: none}
.or-navigation--is-open{display: flex;flex-direction: row}.or-navigation-filler{height: 100%;width: 12em;opacity: 0.8;filter: blur(10em)}@media only screen and (max-width: 55rem){.or-navigation-filler{width: 0}}.or-navigation-filler-icon{opacity: 1;font-size: 3em;position: absolute;right: 20px;top: 20px}.or-navigation-content{flex: 1;height: 100%;z-index: 3}.or-navigation-content .or-view{height: 100%}.or-navtree-node{margin: 0;padding: .1em 0;line-height: 18px;font-weight: normal;white-space: nowrap}@media only screen and (max-width: 55rem){.or-navtree-node{padding: .2em 0}}.or-navtree-node--selected{font-weight: bold}.or-navtree-node--selected > div > a{font-weight: bold}.or-navtree-node-control{width: 18px;min-width: 18px;height: 18px;float: left;cursor: pointer}.or-navtree-list{list-style-type: none;margin: 0;padding: 0}.or-navtree-list ul{margin-left: 18px}
.or-fieldset{border: 0;display: flex;flex-direction: row;align-items: start;margin-top: 1em}.or-fieldset-label{flex: 1;font-size: 1em;text-align: right;padding-right: 1em;font-weight: normal}.or-fieldset-value{flex: 3}.or-fieldset-value > *{display: block;padding: 0.8em}@media only screen and (max-width: 65rem){.or-fieldset{flex-direction: column}.or-fieldset-label{flex: 1;width: 100%;text-align: left}.or-fieldset-value{flex: 1;width: 100%}}
.or-workbench{width: 100%;height: 100%;display: flex;flex-direction: row}.or-workbench--visible-on-dialog-open{z-index: 3}.or-workbench-screen{display: flex;flex-direction: column;position: relative}.or-workbench-screen > *{overflow-y: auto;overflow-x: hidden}.or-workbench-main{flex: 1}.or-workbench-title{height: 3.0rem;max-height: 3.0rem;min-height: 3.0rem;overflow: hidden;padding: 0.5em;font-size: 1.2em}.or-workbench-title .toolbar-icon .arrow-down{display: inline}@media only screen and (max-width: 55rem){.or-workbench-title .toolbar-icon span.label,.or-workbench-title .toolbar-icon .arrow-down{display: none}}.or-workbench-content{flex: 1}.or-workbench--visible-on-small{display: none}.or-workbench--visible-on-wide{display: block}.or-workbench--navigation-is-small .or-workbench--visible-on-wide{display: none}.or-workbench--navigation-is-small .or-workbench--visible-on-small{display: block}.or-workbench-navigation{display: flex;flex-direction: row;width: 30em}.or-workbench-navigation-content{flex: 1}@media only screen and (max-width: 55rem){.or-workbench-navigation-content{flex: none}}.or-workbench-navigation-filler{flex: 0;opacity: 0.6}.or-workbench-navigation-container{width: 100%;position: relative;padding: 0.7em;overflow-x: hidden}.or-workbench-navigation--is-small{width: 0}.or-workbench-navigation--is-small .or-workbench-navigation-container{width: 0;overflow-y: hidden}.or-workbench-navigation--is-small .or-workbench-navigation-container .or-navtree{opacity: 0.2}.or-workbench-navigation--is-small .or-navtree{opacity: 0}@media only screen and (max-width: 55rem){.or-workbench-navigation{width: 0}.or-workbench-navigation--is-open{position: fixed;width: 100%;z-index: 1;opacity: 1;height: 100%}.or-workbench-navigation--is-open .or-workbench-navigation-content{width: 90%}.or-workbench-navigation--is-open .or-workbench-navigation-filler{flex: 1}}@media only screen and (min-width: 75rem){.or-workbench-navigation{overflow-y: auto}}.or-workbench-navigation .or-view{height: 100%}.or--visible-on-mobile{display: none}@media only screen and (max-width: 55rem){.or--visible-on-mobile{display: inline}}@media only screen and (max-width: 55rem){.or--visible-on-desktop{display: none}}.or-toggle-nav-small{display: inline}@media only screen and (max-width: 55rem){.or-toggle-nav-small{display: none}}.or-toggle-nav-open-close{display: none}@media only screen and (max-width: 55rem){.or-toggle-nav-open-close{display: inline}}.or-loader{background: url(../images/loader.gif) no-repeat;background-position: center, top;height: 30px;opacity: 0.5;cursor: wait;pointer-events: none}@media only screen and (max-width: 55rem){html{font-size: 1.1em}}
-.or-search{border-bottom: .1em solid}.or-search .or-act-show-on-search-active{display: none}.or-search--is-active .or-act-show-on-search-active{display: inline}.or-search-result{display: none;position: absolute;width: 100%;height: 100%;top: 0;left: 0;padding: 1em}.or-search-result-entry{padding-top: 0.2em}.or-search-result--is-active{display: block}
+.or-search--on-active{display: none}.or-search--on-inactive{display: inline}.or-search-input{border-bottom: .1em solid}.or-search-input .or-input{border: 0;box-shadow: 0 0 0 !important;border-radius: 0;width: 8em}.or-search--is-active .or-search--on-active{display: inline}.or-search--is-active .or-search--on-inactive{display: none}.or-search-result{display: none;padding: 1em}.or-search-result-entry{padding-top: 0.2em}
.editor__text-editor{width: 100%;height: 300px}textarea.editor__code-editor{display: none}div.editor__code-editor{position: absolute;height: 500px;width: 100%;font-size: 14px;z-index: 256}textarea.editor__text-editor,textarea.editor__wiki-editor,textarea.editor__html-editor{width: 100%}a.editorlink:active,a.editorlink:hover{font-weight: normal;text-decoration: none}a.editorlink:link,a.editorlink:visited{font-weight: normal;text-decoration: none}
.or-group{margin: 2em 0}.or-group-title{font-size: 1.1em;font-weight: normal;border-bottom: 1px solid}
diff --git a/modules/cms/ui/themes/default/style/theme/openrat-theme.less b/modules/cms/ui/themes/default/style/theme/openrat-theme.less
@@ -213,10 +213,12 @@ html.or-theme-@{cms-theme-id} {
}
&-search {
- border-color: @cms-nav-background-color;
+ &-input {
+ border-color: @cms-nav-background-color;
+ }
&-result {
- background-color: @cms-nav-background-color;
+ //background-color: @cms-nav-background-color;
}
}
@@ -243,14 +245,14 @@ html.or-theme-@{cms-theme-id} {
&-input {
background-color: @cms-main-title-background-color;
color: @cms-main-title-text-color;
- border: 1px solid mix(@cms-main-title-text-color, @cms-main-title-background-color);
+ border-color: mix(@cms-main-title-text-color, @cms-main-title-background-color);
.box-shadow(0px, 0px, 3px, @cms-main-title-text-color);
- border-bottom: 1px solid @cms-main-text-color;
+ border-bottom-color: @cms-main-text-color;
&:focus {
}
- border-color: @cms-main-title-text-color;
+ //border-color: @cms-main-title-text-color;
&--error {
border-bottom: 1px dotted @cms-main-text-color ! important;
