commit c7d1dbe64f0a36e18f3b543cff8d44f53c34c4eb
parent 39fe39e6a2f9f4e1813e59404ef3a4ecbcd2b72e
Author: Jan Dankert <develop@jandankert.de>
Date: Tue, 9 Feb 2021 19:37:04 +0100
Removing sidebar buttons (all related actions are available via a shortcut icon in the title bar)
Diffstat:
8 files changed, 65 insertions(+), 38 deletions(-)
diff --git a/modules/cms/action/profile/ProfileAvailableAction.class.php b/modules/cms/action/profile/ProfileAvailableAction.class.php
@@ -16,6 +16,7 @@ class ProfileAvailableAction extends ProfileAction implements Method {
$viewMethods = array_filter( [
// All UI-related methods (reachable via dropdown menus)
'pub',
+ 'info',
'prop',
'history',
'rights',
diff --git a/modules/cms/ui/themes/default/html/views/index/show.php b/modules/cms/ui/themes/default/html/views/index/show.php
@@ -35,14 +35,6 @@
<div class="<?php echo O::escapeHtml('or-collapsible-value or-view or-act-view-loader or-closable') ?>" data-method="<?php echo O::escapeHtml(''.@$mainMethodName.'') ?>"><?php echo O::escapeHtml('') ?></div>
</section>
</main>
- <div class="<?php echo O::escapeHtml('or-sidebar or-view') ?>"><?php echo O::escapeHtml('') ?>
- <?php foreach((array)['preview','info','rights'] as $list_key=>$method) { ?>
- <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml(''.@$method.'') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml(''.@$method.'') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\''.@$method.'\'}') ?>" href="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-link or-btn or-btn--is-active or-sidebar-button or-filtered') ?>"><?php echo O::escapeHtml('') ?>
- <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-'.@$method.'') ?>"><?php echo O::escapeHtml('') ?></i>
- <span class="<?php echo O::escapeHtml('or-sidebar-button-text') ?>"><?php echo O::escapeHtml(''.@O::lang('METHOD_'.@$method.'').'') ?></span>
- </a>
- <?php } ?>
- </div>
<div id="<?php echo O::escapeHtml('dialog') ?>" class="<?php echo O::escapeHtml('or-dialog or-dialog--is-closed') ?>" data-action="<?php echo O::escapeHtml(''.@$dialogAction.'') ?>" data-method="<?php echo O::escapeHtml(''.@$dialogMethod.'') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-view or-round-corners') ?>"><?php echo O::escapeHtml('') ?></div>
<div class="<?php echo O::escapeHtml('or-dialog-filler') ?>"><?php echo O::escapeHtml('') ?>
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
@@ -67,16 +67,16 @@
</main>
- <or:part class="sidebar,view">
+<!-- these views have shortcuts in the title bar <or:part class="sidebar,view">
<or:list items="preview,info,rights" value="method">
- <or:link class="btn,btn--is-active,sidebar-button,filtered" subaction="${method}" type="dialog">
+ <or:link class="btn,btn--is-active,sidebar-button,filtered" subaction="${method}" type="dialog">
<or:image method="${method}" />
<or:text class="sidebar-button-text" value="${message:METHOD_${method}}"/>
</or:link>
</or:list>
- </or:part>
+ </or:part>-->
<!-- Modal dialog -->
diff --git a/modules/cms/ui/themes/default/html/views/title/show.php b/modules/cms/ui/themes/default/html/views/title/show.php
@@ -198,6 +198,13 @@
<i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--dropdown or-menu-dropdown-icon') ?>"><?php echo O::escapeHtml('') ?></i>
<div class="<?php echo O::escapeHtml('or-dropdown') ?>"><?php echo O::escapeHtml('') ?>
<div class="<?php echo O::escapeHtml('or-dropdown-entry or-act-clickable or-filtered') ?>"><?php echo O::escapeHtml('') ?>
+ <a title="<?php echo O::escapeHtml(''.@O::lang('menu_info_desc').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('info') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('info') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'info\'}') ?>" href="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?>
+ <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-info') ?>"><?php echo O::escapeHtml('') ?></i>
+ <span class="<?php echo O::escapeHtml('or-dropdown-text') ?>"><?php echo O::escapeHtml(''.@O::lang('menu_info').'') ?></span>
+ <span class="<?php echo O::escapeHtml('or-dropdown-key or-link-keystroke') ?>"><?php echo O::escapeHtml(''.O::config(['ui','keybinding','method','info']).'') ?></span>
+ </a>
+ </div>
+ <div class="<?php echo O::escapeHtml('or-dropdown-entry or-act-clickable or-filtered') ?>"><?php echo O::escapeHtml('') ?>
<a title="<?php echo O::escapeHtml(''.@O::lang('menu_prop_desc').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('prop') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'prop\'}') ?>" href="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?>
<i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-prop') ?>"><?php echo O::escapeHtml('') ?></i>
<span class="<?php echo O::escapeHtml('or-dropdown-text') ?>"><?php echo O::escapeHtml(''.@O::lang('menu_prop').'') ?></span>
diff --git a/modules/cms/ui/themes/default/html/views/title/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/title/show.tpl.src.xml
@@ -602,6 +602,14 @@
<part class="dropdown">
<part
class="dropdown-entry,act-clickable,filtered">
+ <link type="dialog" title="${message:menu_info_desc}" subaction="info">
+ <image method="info"/>
+ <text class="dropdown-text" value="${message:menu_info}"/>
+ <text class="dropdown-key,link-keystroke" value="${config:ui/keybinding/method/info}"/>
+ </link>
+ </part>
+ <part
+ class="dropdown-entry,act-clickable,filtered">
<link type="dialog" title="${message:menu_prop_desc}" subaction="prop">
<image method="prop"/>
<text class="dropdown-text" value="${message:menu_prop}"/>
diff --git a/modules/cms/ui/themes/default/style/openrat-sidebar.less b/modules/cms/ui/themes/default/style/openrat-sidebar.less
@@ -29,6 +29,7 @@ Basis-Style for Openrat.
+/*
.or {
&-sidebar {
@@ -70,3 +71,4 @@ Basis-Style for Openrat.
}
}
+*/
diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css
@@ -812,33 +812,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Basis-Style for Openrat.
*/
/* Usage to this variable is safe to be removed */
-.or-sidebar {
- position: fixed;
- top: 10em;
- right: 0;
- z-index: 1;
- display: flex;
- flex-direction: column;
-}
-@media only screen and (max-width: 55rem) {
- .or-sidebar {
- display: none;
- }
-}
-.or-sidebar-button {
- margin-left: auto;
- margin-right: 0;
- width: 2em;
- overflow: hidden;
- right: 0;
- transition: width 0.2s ease-in-out;
- margin-bottom: 2em;
- white-space: nowrap;
-}
-.or-sidebar-button:hover {
- width: 9em;
+/*
+.or {
+ &-sidebar {
+
+ @media @smartphones {
+ display: none;
+ }
+
+ position: fixed;
+ top: 10em;
+ right: 0;
+ z-index: 1;
+ display: flex;
+ flex-direction: column;
+
+ &-button {
+ margin-left: auto;
+ margin-right: 0;
+
+ width: 2em;
+ overflow: hidden;
+ right: 0;
+ transition: width 0.2s ease-in-out;
+ margin-bottom: 2em;
+ white-space: nowrap;
+
+ //&-text {
+ // display: none;
+ //}
+
+ &:hover {
+ width:9em;
+
+ //.or-sidebar-button-text {
+ // display: inline;
+ //}
+ }
+
+ }
+
+ }
}
-/*# 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-sidebar.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%3BAAgCI%2CGAAC%3BCAMC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAALA%3BCAAA%2CGAND%3BEAGG%3B%3B%3BAAUF%2CGAbD%2CQAaE%3BCACC%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%2CkCAAA%3BCACA%3BCACA%3B%3BAAMA%2CGA5BH%2CQAaE%2COAeE%3BCACC%22%7D */
+*/
+/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%22%7D */
/* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-menu */
/*
OpenRat Content Management System
diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css
@@ -5,7 +5,7 @@
@font-face{font-family: 'Oxygen';font-style: normal;font-weight: 400;src: local('Oxygen Regular'), local('Oxygen-Regular'), url('../font/oxygen-v7-latin-regular.woff') format('woff2'), url('../font/oxygen-v7-latin-regular.woff') format('woff')}@font-face{font-family: 'Source Code Pro';font-style: normal;font-weight: 400;src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../font/source-code-pro-v8-latin-regular.woff2') format('woff2'), url('../font/source-code-pro-v8-latin-regular.woff') format('woff')}@font-face{font-family: 'Material Icons';font-style: normal;font-weight: 400;src: local('Material Icons'), local('MaterialIcons-Regular'), url('../font/MaterialIcons-Regular.woff2') format('woff2'), url('../font/MaterialIcons-Regular.woff') format('woff')}
.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-sidebar{position: fixed;top: 10em;right: 0;z-index: 1;display: flex;flex-direction: column}@media only screen and (max-width: 55rem){.or-sidebar{display: none}}.or-sidebar-button{margin-left: auto;margin-right: 0;width: 2em;overflow: hidden;right: 0;transition: width .2s ease-in-out;margin-bottom: 2em;white-space: nowrap}.or-sidebar-button:hover{width: 9em}
+
.or-menu{display: flex;justify-content: space-between}@media only screen and (max-width: 55rem){.or-menu-shortcut{display: none}}@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.or-dropdown{right: 10px}.or-menu-group .or-image-icon{width: 1.1em}.or-menu-group .or-toolbar-icon{padding: 2px;margin-left: 10px}.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--open-on-hover: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}@media only screen and (max-width: 55rem){.or-dropdown-key{display: none}}.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}
