commit c8a01c97642fffc07608b6f3729560199fb4c58a parent 00637f85706e5973c0245c676037e1dfdbba0c9f Author: Jan Dankert <develop@jandankert.de> Date: Mon, 8 Mar 2021 15:04:16 +0100 UI Fixes: Table filter should not hide the table header; open actual object in navigation tree; load dialog name from link text. Diffstat:
55 files changed, 233 insertions(+), 194 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.php b/modules/cms/ui/themes/default/html/views/folder/advanced.php @@ -12,7 +12,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('TYPE').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form action="folder" subaction="edit"> <table> - <row class="headline"> + <row header="true"> <column class="help"> <!-- <text value="${message:SELECT}"></text> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.php b/modules/cms/ui/themes/default/html/views/folder/edit.php @@ -94,9 +94,9 @@ </table> </div> </div> - <div class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('folder') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('create') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link or-btn') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-new') ?>"><?php echo O::escapeHtml('') ?></i> + <div class="<?php echo O::escapeHtml('or-act-clickable or-button-knob') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('folder') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('create') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-new') ?>"><?php echo O::escapeHtml('') ?></i> <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -94,9 +94,9 @@ </if> </table> - <part class="act-clickable"> - <link type="dialog" action="folder" subaction="create" class="btn"> - <image action="new"/> + <part class="act-clickable,button-knob"> + <link type="dialog" action="folder" subaction="create"> + <image method="new"/> <text value="${message:add}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/folder/order.php b/modules/cms/ui/themes/default/html/views/folder/order.php @@ -12,7 +12,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table or-table--sortable') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('TYPE').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/folder/order.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/order.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> <table class="table--sortable"> - <row class="headline"> + <row header="true"> <!-- <column class="help"> <text value="${message:FOLDER_ORDER}"/> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.php b/modules/cms/ui/themes/default/html/views/folder/show.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('TYPE').'') ?></span> </th> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column header="true"> <text value="${message:TYPE}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.php b/modules/cms/ui/themes/default/html/views/group/rights.php @@ -26,7 +26,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('USER').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml @@ -13,7 +13,7 @@ </if> <if not="true" empty="${rights}"> <table> - <row class="headline"> + <row header="true"> <column class="help"> <text value="${message:USER}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/edit.php b/modules/cms/ui/themes/default/html/views/grouplist/edit.php @@ -52,15 +52,12 @@ </td> </tr> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-name="<?php echo O::escapeHtml(''.@O::lang('menu_add').'') ?>" name="<?php echo O::escapeHtml(''.@O::lang('menu_add').'') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> + </div> + <div class="<?php echo O::escapeHtml('or-button-knob or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/grouplist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/grouplist/edit.tpl.src.xml @@ -52,14 +52,12 @@ </column> </row> </list> - <row class="data"> - <column class="act-clickable"> - <link type="dialog" subaction="add" name="${message:menu_add}"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + + <part class="button-knob,act-clickable"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> </output> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/edit.php b/modules/cms/ui/themes/default/html/views/languagelist/edit.php @@ -6,15 +6,15 @@ <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> - <td><?php echo O::escapeHtml('') ?> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('NAME').'') ?></span> - </td> - <td><?php echo O::escapeHtml('') ?> + </th> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('LANGUAGE_ISOCODE').'') ?></span> - </td> - <td><?php echo O::escapeHtml('') ?> + </th> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml('') ?></span> - </td> + </th> <td><?php echo O::escapeHtml('') ?></td> </tr> <?php foreach((array)@$el as $list_key=>$list_value) { extract($list_value); ?> @@ -80,15 +80,12 @@ <?php { unset($default_url) ?> <?php } ?> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('3') ?>" class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> + </div> + <div class="<?php echo O::escapeHtml('or-button-knob or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/languagelist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/languagelist/edit.tpl.src.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> <row header="true"> - <column> + <column header="true"> <text value="${message:NAME}"/> </column> - <column> + <column header="true"> <text value="${message:LANGUAGE_ISOCODE}"/> </column> - <column> + <column header="true"> <text value=""/> </column> <column /> @@ -77,14 +77,13 @@ <set var="select_url"/> <set var="default_url"/> </list> - <row class="data"> - <column colspan="3" class="act-clickable"> - <link type="dialog" subaction="add"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + + <part class="button-knob,act-clickable"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> + </output> diff --git a/modules/cms/ui/themes/default/html/views/login/license.php b/modules/cms/ui/themes/default/html/views/login/license.php @@ -93,7 +93,7 @@ <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/login/license.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/license.tpl.src.xml @@ -40,7 +40,7 @@ </group> <group title="${message:LICENSE}"> <table filter="false"> - <row class="headline"> + <row header="true"> <column> <text value="${message:name}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/modellist/edit.php b/modules/cms/ui/themes/default/html/views/modellist/edit.php @@ -6,12 +6,12 @@ <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> - <td><?php echo O::escapeHtml('') ?> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> - </td> - <td><?php echo O::escapeHtml('') ?> + </th> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml('') ?></span> - </td> + </th> <td><?php echo O::escapeHtml('') ?></td> </tr> <?php foreach((array)@$el as $list_key=>$list_value) { extract($list_value); ?> @@ -72,15 +72,12 @@ <?php { unset($default_url) ?> <?php } ?> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>" class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> + </div> + <div class="<?php echo O::escapeHtml('or-button-knob or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/modellist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/modellist/edit.tpl.src.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> <row header="true"> - <column> + <column header="true"> <text value="${message:name}"/> </column> - <column> + <column header="true"> <text value=""/> </column> <column/> @@ -71,14 +71,12 @@ <set var="select_url"/> <set var="default_url"/> </list> - <row class="data"> - <column colspan="2" class="act-clickable"> - <link type="dialog" subaction="add"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + + <part class="button-knob,act-clickable"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> </output> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/edit.php b/modules/cms/ui/themes/default/html/views/pageelement/edit.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('language').'') ?></span> </th> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column header="true"> <text value="${message:language}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.php b/modules/cms/ui/themes/default/html/views/pageelement/history.php @@ -20,7 +20,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td colspan="<?php echo O::escapeHtml('2') ?>" class="<?php echo O::escapeHtml('or-table-column-action') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('COMPARE').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml @@ -6,7 +6,7 @@ <group collapsible="true" title="${message:language}: ${language.name}"> <table> - <row class="headline"> + <row header="true"> <!-- <column class="help"> diff --git a/modules/cms/ui/themes/default/html/views/profile/history.php b/modules/cms/ui/themes/default/html/views/profile/history.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('project').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/profile/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/history.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:project}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/profile/memberships.php b/modules/cms/ui/themes/default/html/views/profile/memberships.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/profile/memberships.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/memberships.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:name}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/project/history.php b/modules/cms/ui/themes/default/html/views/project/history.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/project/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/project/history.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:name}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/edit.php b/modules/cms/ui/themes/default/html/views/projectlist/edit.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <th class="<?php echo O::escapeHtml('or-table-column-auto') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </th> @@ -46,15 +46,12 @@ </td> </tr> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-name="<?php echo O::escapeHtml(''.@O::lang('add').'') ?>" name="<?php echo O::escapeHtml(''.@O::lang('add').'') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> + </div> + <div class="<?php echo O::escapeHtml('or-act-clickable or-button-knob') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/projectlist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/projectlist/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column header="true" class="table-column-auto"> <text value="${message:name}"/> </column> @@ -46,14 +46,13 @@ </column> </row> </list> - <row class="data"> - <column class="act-clickable"> - <link type="dialog" subaction="add" name="${message:add}"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + + <part class="act-clickable,button-knob"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> + </output> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/history.php b/modules/cms/ui/themes/default/html/views/projectlist/history.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('project').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/projectlist/history.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:project}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.php b/modules/cms/ui/themes/default/html/views/template/edit.php @@ -12,7 +12,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <group title="${message:page_pageelements}"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:name}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/templatelist/edit.php b/modules/cms/ui/themes/default/html/views/templatelist/edit.php @@ -12,10 +12,10 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> - <td><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> + <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> - </td> + </th> <td><?php echo O::escapeHtml('') ?></td> </tr> <?php foreach((array)@$templates as $list_key=>$list_value) { extract($list_value); ?> @@ -61,17 +61,14 @@ <td><?php echo O::escapeHtml('') ?></td> </tr> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> </div> + <div class="<?php echo O::escapeHtml('or-button-knob or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> + </div> </div> </section> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/templatelist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/templatelist/edit.tpl.src.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <group title="${message:templates}"> <table> - <row class="headline"> - <column> + <row header="true"> + <column header="true"> <text value="${message:name}"/> </column> <column /> @@ -55,15 +55,13 @@ <column /> </row> </if> - <row class="data"> - <column colspan="1" class="act-clickable"> - <link type="dialog" subaction="add"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + + <part class="button-knob,act-clickable"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> </group> </output> diff --git a/modules/cms/ui/themes/default/html/views/user/history.php b/modules/cms/ui/themes/default/html/views/user/history.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('project').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/user/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/history.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:project}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.php b/modules/cms/ui/themes/default/html/views/user/memberships.php @@ -12,7 +12,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <th class="<?php echo O::escapeHtml('or-table-column-action') ?>"><?php echo O::escapeHtml('') ?></th> <th><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('group').'') ?></span> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/memberships.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> <table> - <row class="headline"> + <row header="true"> <column header="true" class="table-column-action" /> <column header="true"> <text value="${message:group}"/> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.php b/modules/cms/ui/themes/default/html/views/user/rights.php @@ -19,7 +19,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('USER').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml @@ -8,7 +8,7 @@ </if> <if not="true" empty="${rights}"> <table> - <row class="headline"> + <row header="true"> <column class="help"> <text value="${message:USER}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/usergroup/edit.php b/modules/cms/ui/themes/default/html/views/usergroup/edit.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </td> diff --git a/modules/cms/ui/themes/default/html/views/usergroup/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/usergroup/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column> <text value="${message:name}"/> </column> diff --git a/modules/cms/ui/themes/default/html/views/userlist/edit.php b/modules/cms/ui/themes/default/html/views/userlist/edit.php @@ -5,7 +5,7 @@ </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> + <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> <th class="<?php echo O::escapeHtml('or-table-column-auto') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?></i> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> @@ -74,15 +74,12 @@ </td> </tr> <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>" class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-name="<?php echo O::escapeHtml(''.@O::lang('add').'') ?>" name="<?php echo O::escapeHtml(''.@O::lang('add').'') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> - </a> - </td> - <td><?php echo O::escapeHtml('') ?></td> - </tr> </table> </div> + </div> + <div class="<?php echo O::escapeHtml('or-button-knob or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> + <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('add') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('add') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" 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-add') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('add').'') ?></span> + </a> </div> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/userlist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/userlist/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table> - <row class="headline"> + <row header="true"> <column header="true" class="table-column-auto"> <image action="user" /> <text value="${message:name}"/> @@ -76,14 +76,11 @@ </column> </row> </list> - <row class="data"> - <column colspan="2" class="act-clickable"> - <link type="dialog" subaction="add" name="${message:add}"> - <image method="add"/> - <text value="${message:add}"/> - </link> - </column> - <column /> - </row> </table> + <part class="button-knob,act-clickable"> + <link type="dialog" subaction="add"> + <image method="add"/> + <text value="${message:add}"/> + </link> + </part> </output> diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js @@ -286,7 +286,10 @@ jQuery.fn.orLinkify = function( options ) case 'edit': case 'dialog': let dialog = new Openrat.Dialog(); - dialog.start($link.attr('data-name'),$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra') ); + let name = $link.attr('data-name'); + if ( !name ) + name = $link.text(); // get the name from the combined text of all children. + dialog.start(name,$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra') ); break; case 'external': @@ -3138,21 +3141,41 @@ $( function() { // Die Inhalte des Zweiges laden. let loadPromise = $.get(url); - loadPromise.done( function(data) { + /** + * open a object in the navigation tree. + * @param action + * @param id + */ + function openNavTree(action, id) { + let $navControl = $('.or-link[data-action='+action+'][data-id='+id+']').closest('.or-navtree-node'); + if ( $navControl.is( '.or-navtree-node--is-closed' ) ) + $navControl.find('.or-navtree-node-control').click(); + } + + loadPromise.done( function(data) { $('.or-breadcrumb').empty().append( data ).find('.or-act-clickable').orLinkify(); // Open the path in the navigator tree - $('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(); + + openNavTree( action, id ); }); - }).fail(function ( jqXHR, textStatus, errorThrown ) { + $('.or-link--is-active').removeClass('link--is-active'); + + let action = Openrat.Workbench.state.action; + let id = Openrat.Workbench.state.id; + if (!id) id = '0'; + + // Mark the links to the actual object + $('.or-link[data-action=\''+action+'\'][data-id=\''+id+'\']').addClass('link--is-active'); + // Open actual object + openNavTree( action,id ); + + }).fail(function ( jqXHR, textStatus, errorThrown ) { // Ups... aber was können wir hier schon tun, außer hässliche Meldungen anzeigen. console.warn( { message:'Failed to load path', @@ -3819,7 +3842,7 @@ Openrat.Workbench.afterViewLoadedHandler.add( function(element ) { table.addClass('loader'); setTimeout( () => { - table.find('tr:not(.headline)').filter(function () { + table.find('tr:not(.or-table-header)').filter(function () { $(this).toggle($(this).text().toLowerCase().indexOf(filterExpression) > -1) }) table.removeClass('loader'); diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js @@ -117,7 +117,7 @@ else{this.currentItem.show()};if(this.fromOutside&&!e){s.push(function(t){this._ ;jQuery.fn.orSearch=function(t){var e=$.extend({'dropdown':$(),'select':function(e){},'afterSelect':function(){},'onSearchActive':function(){},'onSearchInactive':function(){},'openDropdown':!0,'action':'search','method':'quicksearch','resultEntryClass':'or-dropdown-entry',},t);return $(this).on('input change',function(){let searchInput=$(this);let searchArgument=searchInput.val();let dropdownEl=$(e.dropdown);if(searchArgument.length){e.onSearchActive();$('.or-search').addClass('search--is-active');dropdownEl.addClass('search-result--is-active');$.ajax({'type':'GET',url:'./api/?action='+e.action+'&subaction='+e.method+'&output=json&search='+searchArgument,data:null,success:function(t,n,r){$(dropdownEl).empty();for(id in t.output.result){let result=t.output.result[id];let div=$('<div class="'+e.resultEntryClass+' '+e.resultEntryClass+'--active" title="'+result.desc+'"></div>');div.data('object',{'name':result.name,'action':result.type,'id':result.id});let link=$('<a class="or-link"/>').attr('href',Openrat.Navigator.createShortUrl(result.type,result.id));link.click(function(e){e.preventDefault()});$(link).append('<i class="or-image-icon or-image-icon--action-'+result.type+'" />');$(link).append('<span class="or-dropdown-text">'+result.name+'</span>');$(div).append(link);$(dropdownEl).append(div)};if(t.output.result&&e.openDropdown){$(dropdownEl).addClass('dropdown--is-open')} else{$(dropdownEl).removeClass('dropdown--is-open')};$(dropdownEl).find('.or-search-result-entry').click(function(t){e.select($(this).data('object'));e.afterSelect();searchInput.val('')})}})} else{e.onSearchInactive();$(dropdownEl).empty();dropdownEl.removeClass('search-result--is-active')}})}; -;jQuery.fn.orLinkify=function(t){var a=$.extend({'openAction':function(t,a,e){Openrat.Workbench.openNewAction(t,a,e)}},t);$(this).addClass('linkified');if($(this).is('a'))$(this).click(function(t){t.preventDefault()});else $(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(t){$el=$(this);if($el.is('a'))$link=$el;else $link=$el.find('a').first();let type=$link.attr('data-type');if($link.parent().hasClass('dropdown-entry--inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$link.data('afterSuccess'));let params=jQuery.parseJSON($link.attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':let dialog=new Openrat.Dialog();dialog.start($link.attr('data-name'),$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra'));break;case'external':window.open($link.attr('data-url'),' _blank');break;case'window':window.location.href=Openrat.View.createUrl($link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'));break;case'popup':Openrat.Workbench.popupWindow=window.open($link.attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help($link,$link.attr('data-url'),$link.attr('data-suffix'));break;case'fullscreen':fullscreen($link);break;case'open':a.openAction($link.text().trim(),$link.attr('data-action'),$link.attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$link.html()}})}; +;jQuery.fn.orLinkify=function(t){var a=$.extend({'openAction':function(t,a,e){Openrat.Workbench.openNewAction(t,a,e)}},t);$(this).addClass('linkified');if($(this).is('a'))$(this).click(function(t){t.preventDefault()});else $(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(t){$el=$(this);if($el.is('a'))$link=$el;else $link=$el.find('a').first();let type=$link.attr('data-type');if($link.parent().hasClass('dropdown-entry--inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$link.data('afterSuccess'));let params=jQuery.parseJSON($link.attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':let dialog=new Openrat.Dialog();let name=$link.attr('data-name');if(!name)name=$link.text();dialog.start(name,$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra'));break;case'external':window.open($link.attr('data-url'),' _blank');break;case'window':window.location.href=Openrat.View.createUrl($link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'));break;case'popup':Openrat.Workbench.popupWindow=window.open($link.attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help($link,$link.attr('data-url'),$link.attr('data-suffix'));break;case'fullscreen':fullscreen($link);break;case'open':a.openAction($link.text().trim(),$link.attr('data-action'),$link.attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$link.html()}})}; ;jQuery.fn.orButton=function(t){let settings=$.extend({'selectorForClose':'.or-view'},t);let button=this;$(settings.selectorForClose).click(function(){});return $(this).addClass('button--is-watched').click(function(){$(this).toggleClass('button--is-active')})}; ;jQuery.fn.orTree=function(e){var n=$.extend({'openAction':function(e,n,o){}},e);let registerTreeBranchEvents=function(e){Openrat.Workbench.registerDraggable(e)};$(this).each(function(o,e){$(e).children('.or-navtree-node-control').click(function(){let $node=$(this).parent('.or-navtree-node');if($node.is('.or-navtree-node--is-open')){$node.children('ul').slideUp('fast').remove();$node.removeClass('navtree-node--is-open').addClass('navtree-node--is-closed').find('.or-navtree-tree-icon').removeClass('image-icon--node-open').addClass('image-icon--node-closed')} else{$(e).closest('div.view').addClass('loader');let $link=$node.find('a');let id=$link.data('id');let extraId=$link.data('extra');let loadBranchUrl='./?action=tree&subaction=branch&id='+id+'';if(typeof extraId==='string'){jQuery.each(jQuery.parseJSON(extraId.replace(/'/g,'"')),function(e,n){loadBranchUrl=loadBranchUrl+'&'+e+'='+n})} @@ -1188,13 +1188,13 @@ else{}});$.each(e['errors'],function(e,t){$('.or-input[name='+t+']').addClass('i else{return undefined}})};this.openModalDialog=function(){if($('#dialog').data('action')){let dialog=new Openrat.Dialog();dialog.start('',$('#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));console.debug('ping');pingPromise.fail(function(e,t,i){console.warn({message:'The server ping has failed.',jqXHR:e,status:t,error:i});if($('.or-view--is-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());console.debug('reloading all views');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)};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'))};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.registerDraggable=function(e){$(e).find('.or-draggable').draggable({helper:'clone',opacity:0.7,zIndex:3,distance:10,cursor:'move',revert:'false'})};this.registerDroppable=function(e){$(e).find('.or-droppable-selector').droppable({accept:'.or-draggable',hoverClass:'droppable--hover',activeClass:'droppable--active',drop:function(e,t){let dropped=t.draggable;console.info('dropped:');console.info(dropped);let id=$(dropped).find('.or-link').data('id');let name=$(dropped).find('.or-navtree-text').text();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){console.debug('Navigating to '+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 e(){};e();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(){let notice=new Openrat.Notice();notice.setStatus('info');notice.msg=$(this).text();notice.show();$(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({onSearchActive:function(){$('.or-search').addClass('search--is-active')},onSearchInactive:function(){$('.or-search').removeClass('search--is-active')},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(e,t,n){console.warn({message:'Failed to load path',url:url,jqXHR:e,status:t,error:n})}).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-filtered').removeClass('dropdown-entry--active').addClass('dropdown-entry--inactive');$('.or-workbench-title .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,t){$('.or-workbench-title .or-filtered > .or-link[data-method=\''+t+'\']').parent().addClass('dropdown-entry--active').removeClass('dropdown-entry--inactive')})})};Openrat.Workbench.afterAllViewsLoaded.add(function(){filterMenus()});Openrat.Workbench.afterAllViewsLoaded.add(function(){$('body').removeClass('loader')});Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find('.or-button').orButton()});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,t,n){Openrat.Workbench.openNewAction(e,t,n)}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var t=$(e).closest('section');t.toggleClass('is-empty',$(e).is(':empty'));if(!$(e).is(':empty'))t.slideDown('fast');else t.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-selector-tree-button').click(function(){let $selector=$(this).parent('.or-selector');let $targetElement=$selector.find('.or-act-load-selector-tree');if($selector.hasClass('selector--is-tree-active')){$selector.removeClass('selector--is-tree-active');$targetElement.empty()} -else{$selector.addClass('selector--is-tree-active');var e=this;let id=$(this).data('init-folder-id');let type=id?'folder':'projects';let loadBranchUrl='./?action=tree&subaction=branch&id='+id+'&type='+type;$.get(loadBranchUrl).done(function(e){let $ul=$('<ul class="or-navtree-list" />');$ul.appendTo($targetElement).append(e);$ul.find('li').orTree({'openAction':function(e,t,n){$selector.find('.or-selector-link-value').val(n);$selector.find('.or-selector-link-name').val('').attr('placeholder',e);$selector.removeClass('selector--is-tree-active');$targetElement.empty()}});$ul.find('.or-act-clickable').orLinkify();$ul.find('.or-navtree-node-control').first().click()})}});n(e);$(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-act-selector-search').orSearch({onSearchActive:function(){$(this).parent('or-selector').addClass('selector-search--is-active')},onSearchInactive:function(){$(this).parent('or-selector').removeClass('selector-search--is-active')},dropdown:'.or-act-selector-search-results',resultEntryClass:'or-search-result-entry',select:function(t){$(e).find('.or-selector-link-value').val(t.id);$(e).find('.or-selector-link-name').val(t.name).attr('placeholder',t.name)},afterSelect:function(){$('.or-dropdown.or-act-selector-search-results').empty()}})};function a(e){};o(e);r(e);a(e);function n(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};n(e)}); +;$(function(){$("html").removeClass("nojs");$(".or--initial-hidden").removeClass("-initial-hidden");function e(){};e();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(){let notice=new Openrat.Notice();notice.setStatus("info");notice.msg=$(this).text();notice.show();$(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({onSearchActive:function(){$(".or-search").addClass("search--is-active")},onSearchInactive:function(){$(".or-search").removeClass("search--is-active")},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);function e(e,t){let $navControl=$(".or-link[data-action="+e+"][data-id="+t+"]").closest(".or-navtree-node");if($navControl.is(".or-navtree-node--is-closed"))$navControl.find(".or-navtree-node-control").click()};loadPromise.done(function(t){$(".or-breadcrumb").empty().append(t).find(".or-act-clickable").orLinkify();$(".or-breadcrumb a").each(function(){let action=$(this).data("action");let id=$(this).data("id");e(action,id)});$(".or-link--is-active").removeClass("link--is-active");let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;if(!id)id="0";$(".or-link[data-action='"+action+"'][data-id='"+id+"']").addClass("link--is-active");e(action,id)}).fail(function(e,t,n){console.warn({message:"Failed to load path",url:url,jqXHR:e,status:t,error:n})}).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-filtered").removeClass("dropdown-entry--active").addClass("dropdown-entry--inactive");$(".or-workbench-title .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,t){$(".or-workbench-title .or-filtered > .or-link[data-method='"+t+"']").parent().addClass("dropdown-entry--active").removeClass("dropdown-entry--inactive")})})};Openrat.Workbench.afterAllViewsLoaded.add(function(){filterMenus()});Openrat.Workbench.afterAllViewsLoaded.add(function(){$("body").removeClass("loader")});Openrat.Workbench.afterViewLoadedHandler.add(function(e){$(e).find(".or-button").orButton()});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,t,n){Openrat.Workbench.openNewAction(e,t,n)}});$ul.find(".or-act-clickable").orLinkify();$ul.find(".or-navtree-node-control").first().click()})})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var t=$(e).closest("section");t.toggleClass("is-empty",$(e).is(":empty"));if(!$(e).is(":empty"))t.slideDown("fast");else t.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-selector-tree-button").click(function(){let $selector=$(this).parent(".or-selector");let $targetElement=$selector.find(".or-act-load-selector-tree");if($selector.hasClass("selector--is-tree-active")){$selector.removeClass("selector--is-tree-active");$targetElement.empty()} +else{$selector.addClass("selector--is-tree-active");var e=this;let id=$(this).data("init-folder-id");let type=id?"folder":"projects";let loadBranchUrl="./?action=tree&subaction=branch&id="+id+"&type="+type;$.get(loadBranchUrl).done(function(e){let $ul=$("<ul class=\"or-navtree-list\" />");$ul.appendTo($targetElement).append(e);$ul.find("li").orTree({"openAction":function(e,t,n){$selector.find(".or-selector-link-value").val(n);$selector.find(".or-selector-link-name").val("").attr("placeholder",e);$selector.removeClass("selector--is-tree-active");$targetElement.empty()}});$ul.find(".or-act-clickable").orLinkify();$ul.find(".or-navtree-node-control").first().click()})}});n(e);$(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-act-selector-search").orSearch({onSearchActive:function(){$(this).parent("or-selector").addClass("selector-search--is-active")},onSearchInactive:function(){$(this).parent("or-selector").removeClass("selector-search--is-active")},dropdown:".or-act-selector-search-results",resultEntryClass:"or-search-result-entry",select:function(t){$(e).find(".or-selector-link-value").val(t.id);$(e).find(".or-selector-link-name").val(t.name).attr("placeholder",t.name)},afterSelect:function(){$(".or-dropdown.or-act-selector-search-results").empty()}})};function a(e){};o(e);r(e);a(e);function n(e){Openrat.Workbench.registerDraggable(e);Openrat.Workbench.registerDroppable(e)};n(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'))}); ; ;Openrat.Workbench.afterViewLoadedHandler.add(function(a){$(a).find('.or-act-clickable').orLinkify()}); ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){let createQRCode=function(t,e){let wrapper=$('<div class="or-info-popup or-qrcode-value"></div>');$(wrapper).qrcode({render:'div',text:e,fill:'currentColor'});wrapper.attr('title','');if(e)wrapper.append('<small class="or-qrcode-text">'+e+'</small>');return wrapper};$(e).find('.or-qrcode').click(function(){let $element=$(this);if(!$element.children().length){let qrcodeValue=$(e).attr('data-qrcode');let qrcodeText=$(e).attr('data-qrcode-text');if($element.children().length>0)return;$element.append(createQRCode(qrcodeValue,qrcodeText))};$element.toggleClass('info--open');$element.toggleClass('btn--is-active')})}); -;Openrat.Workbench.afterViewLoadedHandler.add(function(t){let calculateOrderList=function(){let order=[];$(t).find('.or-table--sortable').find('tbody > tr.or-data').each(function(){let objectid=$(this).data('id');order.push(objectid)});$(t).find('input[name=order]').val(order.join(','))};calculateOrderList();$(t).find('.or-table--sortable > tbody').sortable({update:calculateOrderList});$(t).find('tr.headline > td > input.checkbox').click(function(){$(this).closest('table').find('tr.or-data > td > input.or-checkbox').attr('checked',Boolean($(this).attr('checked')))});$(t).find('.or-table-filter > input').keyup(function(){let filterExpression=$(this).val().toLowerCase();let table=$(this).parents('.or-table-wrapper').find('table');table.addClass('loader');setTimeout(()=>{table.find('tr:not(.headline)').filter(function(){$(this).toggle($(this).text().toLowerCase().indexOf(filterExpression)>-1)});table.removeClass('loader')},50)});$(t).find('table > tbody > tr.headline > td, table > tbody > tr > th').click(function(){let column=$(this);let table=column.parents('table');table.addClass('loader');let isAscending=!column.hasClass('sort-asc');table.find('tr.headline > td, tr > th').removeClass('sort-asc').removeClass('sort-desc');if(isAscending)column.addClass('sort-asc');else column.addClass('sort-desc');setTimeout(function(){let rows=table.find('tr:gt(0)').toArray().sort(a(column.index()));if(!isAscending){rows=rows.reverse()};for(var t=0;t<rows.length;t++){table.append(rows[t])};table.removeClass('loader')},50)});function a(t){return function(a,r){let valA=e(a,t),valB=e(r,t);return $.isNumeric(valA)&&$.isNumeric(valB)?valA-valB:valA.toString().localeCompare(valB)}};function e(t,e){return $(t).children('td').eq(e).text()}}); +;Openrat.Workbench.afterViewLoadedHandler.add(function(t){let calculateOrderList=function(){let order=[];$(t).find('.or-table--sortable').find('tbody > tr.or-data').each(function(){let objectid=$(this).data('id');order.push(objectid)});$(t).find('input[name=order]').val(order.join(','))};calculateOrderList();$(t).find('.or-table--sortable > tbody').sortable({update:calculateOrderList});$(t).find('tr.headline > td > input.checkbox').click(function(){$(this).closest('table').find('tr.or-data > td > input.or-checkbox').attr('checked',Boolean($(this).attr('checked')))});$(t).find('.or-table-filter > input').keyup(function(){let filterExpression=$(this).val().toLowerCase();let table=$(this).parents('.or-table-wrapper').find('table');table.addClass('loader');setTimeout(()=>{table.find('tr:not(.or-table-header)').filter(function(){$(this).toggle($(this).text().toLowerCase().indexOf(filterExpression)>-1)});table.removeClass('loader')},50)});$(t).find('table > tbody > tr.headline > td, table > tbody > tr > th').click(function(){let column=$(this);let table=column.parents('table');table.addClass('loader');let isAscending=!column.hasClass('sort-asc');table.find('tr.headline > td, tr > th').removeClass('sort-asc').removeClass('sort-desc');if(isAscending)column.addClass('sort-asc');else column.addClass('sort-desc');setTimeout(function(){let rows=table.find('tr:gt(0)').toArray().sort(a(column.index()));if(!isAscending){rows=rows.reverse()};for(var t=0;t<rows.length;t++){table.append(rows[t])};table.removeClass('loader')},50)});function a(t){return function(a,r){let valA=e(a,t),valB=e(r,t);return $.isNumeric(valA)&&$.isNumeric(valB)?valA-valB:valA.toString().localeCompare(valB)}};function e(t,e){return $(t).children('td').eq(e).text()}}); ;Openrat.Workbench.afterViewLoadedHandler.add(function(e){var t=$(e).find('form'),o=$(e).find('div.or-dropzone-upload > div.input');o.on('dragenter',function(e){e.stopPropagation();e.preventDefault();$(this).css('border','1px dotted gray')});o.on('dragover',function(e){e.stopPropagation();e.preventDefault()});o.on('drop',function(e){$(this).css('border','1px dotted red');e.preventDefault();var o=e.originalEvent.dataTransfer.files;Openrat.Workbench.handleFileUpload(t,o)});$(e).find('input[type=file]').change(function(){var e=$(this).prop('files');Openrat.Workbench.handleFileUpload(t,e)})});Openrat.Workbench.handleFileUpload=function(e,o){for(let i=0,f;f=o[i];i++){let form_data=new FormData();form_data.append('file',f);form_data.append('action','folder');form_data.append('subaction',$(e).data('method'));form_data.append('output','json');form_data.append('token',$(e).find('input[name=token]').val());form_data.append('id',$(e).find('input[name=id]').val());let notice=new Openrat.Notice();notice.setContext('folder',0,'');notice.inProgress();notice.show();$.ajax({'type':'POST',url:'./api/',cache:!1,contentType:!1,processData:!1,data:form_data,success:function(o,t,r){notice.close();let oform=new Openrat.Form();oform.doResponse(o,t,e)},error:function(o,t,r){$(e).closest('div.content').removeClass('loader');notice.close();let msg;console.error(o);try{let error=jQuery.parseJSON(o.responseText);msg=error.error+'/'+error.description+': '+error.reason}catch(n){msg=o.responseText};let notice=new Openrat.Notice();notice.setStatus('error');notice.msg='Upload error: '+msg;notice.show()}})}}; diff --git a/modules/cms/ui/themes/default/script/openrat/common.js b/modules/cms/ui/themes/default/script/openrat/common.js @@ -127,21 +127,41 @@ $( function() { // Die Inhalte des Zweiges laden. let loadPromise = $.get(url); - loadPromise.done( function(data) { + /** + * open a object in the navigation tree. + * @param action + * @param id + */ + function openNavTree(action, id) { + let $navControl = $('.or-link[data-action='+action+'][data-id='+id+']').closest('.or-navtree-node'); + if ( $navControl.is( '.or-navtree-node--is-closed' ) ) + $navControl.find('.or-navtree-node-control').click(); + } + + loadPromise.done( function(data) { $('.or-breadcrumb').empty().append( data ).find('.or-act-clickable').orLinkify(); // Open the path in the navigator tree - $('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(); + + openNavTree( action, id ); }); - }).fail(function ( jqXHR, textStatus, errorThrown ) { + $('.or-link--is-active').removeClass('link--is-active'); + + let action = Openrat.Workbench.state.action; + let id = Openrat.Workbench.state.id; + if (!id) id = '0'; + + // Mark the links to the actual object + $('.or-link[data-action=\''+action+'\'][data-id=\''+id+'\']').addClass('link--is-active'); + // Open actual object + openNavTree( action,id ); + + }).fail(function ( jqXHR, textStatus, errorThrown ) { // Ups... aber was können wir hier schon tun, außer hässliche Meldungen anzeigen. console.warn( { message:'Failed to load path', diff --git a/modules/cms/ui/themes/default/script/plugin/jquery-plugin-orLinkify.js b/modules/cms/ui/themes/default/script/plugin/jquery-plugin-orLinkify.js @@ -69,7 +69,10 @@ jQuery.fn.orLinkify = function( options ) case 'edit': case 'dialog': let dialog = new Openrat.Dialog(); - dialog.start($link.attr('data-name'),$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra') ); + let name = $link.attr('data-name'); + if ( !name ) + name = $link.text(); // get the name from the combined text of all children. + dialog.start(name,$link.attr('data-action'),$link.attr('data-method'),$link.attr('data-id'),$link.attr('data-extra') ); break; case 'external': diff --git a/modules/cms/ui/themes/default/style/openrat-button.less b/modules/cms/ui/themes/default/style/openrat-button.less @@ -3,6 +3,10 @@ .or { &-button { //position: relative; + &-knob { + //border: 1px solid black; + margin: 0.5em; + } // if the button is active, then display the content &--is-active, diff --git a/modules/cms/ui/themes/default/style/openrat-ui.less b/modules/cms/ui/themes/default/style/openrat-ui.less @@ -136,6 +136,15 @@ a:hover { &--visible { visibility: visible; } + + + &-link { + color: inherit; + &--is-active { + font-weight: bold; + } + } + } diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css @@ -65,6 +65,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. .or-button { z-index: 4; } +.or-button-knob { + margin: 0.5em; +} .or-button--is-active .or-button-value, .or-button--active-on-hover:hover .or-button-value { display: initial; @@ -74,7 +77,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. position: absolute; right: 1em; } -/*# 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-button.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAGI%2CGAAC%3BCAmBG%3B%3BAAfA%2CGAJH%2COAII%2CWAEG%3BAADJ%2CGALH%2COAKI%2CiBAAiB%2CMACd%3BCACE%3B%3BAAKN%2CGAZH%2COAYI%3BCACC%3BCACA%3BCACA%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-button.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAGI%2CGAAC%3BCAuBG%3B%3BAArBA%2CGAFH%2COAEI%3BCAEC%3B%3BAAIF%2CGARH%2COAQI%2CWAEG%3BAADJ%2CGATH%2COASI%2CiBAAiB%2CMACd%3BCACE%3B%3BAAKN%2CGAhBH%2COAgBI%3BCACC%3BCACA%3BCACA%22%7D */ /* Include style: /default/style/openrat-collapsible */ .or-collapsible { /* Geschlossen */ @@ -1371,12 +1374,18 @@ a:hover { .or--visible { visibility: visible; } +.or-link { + color: inherit; +} +.or-link--is-active { + font-weight: bold; +} legend { font-size: 1.1em; font-weight: bold; padding: 0 0.5em; } -/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAIA%3BAAAM%3BCAAO%3BCAAY%3B%3BAAuBzB%3BCAfQ%2CIAAC%3BEACG%2CSAAS%2CEAAT%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEAEA%3BEACA%3BEACA%3B%3B%3BAAIZ%3BCACE%3B%3BAAWF%3BCACE%3BCACA%3BCACA%3B%3B%3BAAKF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAIF%3BCACE%3B%3B%3BAAMF%3BCACE%3B%3BAAMF%3B%3B%3BAACI%2CGAAC%2COAAU%3BCAEP%3BCACA%3B%3BAAKJ%2CGAAC%3BCACG%3B%3BAAIJ%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%2CgBAAA%3B%3BAAHJ%2CGAAC%2CSAKK%3BCACE%2CiBAAA%3BCACA%3BCACA%3BCAvEV%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAA0EE%2CGAAC%3BCACG%3B%3BAAKA%2CGAFH%2CUAEI%3BCAEG%3BCACA%3BCACA%3B%3BAAGJ%2CGATH%2CUASI%3BCACG%3BCACA%3BCACA%3B%3BAAKR%2CGAAC%3BCACG%3B%3BAAGJ%2CGAAC%3BCACG%3B%3BAASR%3BCACI%3BCACA%3BCACA%2CgBAAA%22%7D */ +/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAIA%3BAAAM%3BCAAO%3BCAAY%3B%3BAAuBzB%3BCAfQ%2CIAAC%3BEACG%2CSAAS%2CEAAT%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEACA%3BEAEA%3BEACA%3BEACA%3B%3B%3BAAIZ%3BCACE%3B%3BAAWF%3BCACE%3BCACA%3BCACA%3B%3B%3BAAKF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAIF%3BCACE%3B%3B%3BAAMF%3BCACE%3B%3BAAMF%3B%3B%3BAACI%2CGAAC%2COAAU%3BCAEP%3BCACA%3B%3BAAKJ%2CGAAC%3BCACG%3B%3BAAIJ%2CGAAC%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CGAAC%3BCACG%3BCACA%3BCACA%2CgBAAA%3B%3BAAHJ%2CGAAC%2CSAKK%3BCACE%2CiBAAA%3BCACA%3BCACA%3BCAvEV%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAA0EE%2CGAAC%3BCACG%3B%3BAAKA%2CGAFH%2CUAEI%3BCAEG%3BCACA%3BCACA%3B%3BAAGJ%2CGATH%2CUASI%3BCACG%3BCACA%3BCACA%3B%3BAAKR%2CGAAC%3BCACG%3B%3BAAGJ%2CGAAC%3BCACG%3B%3BAAIJ%2CGAAC%3BCACC%3B%3BAACA%2CGAFD%2CKAEE%3BCACC%3B%3BAAWR%3BCACI%3BCACA%3BCACA%2CgBAAA%22%7D */ /* Include style: /default/style/openrat-view */ /* 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 @@ -1,5 +1,5 @@ .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-button{z-index: 4}.or-button--is-active .or-button-value,.or-button--active-on-hover:hover .or-button-value{display: initial}.or-button-value{display: none;position: absolute;right: 1em} +.or-button{z-index: 4}.or-button-knob{margin: 0.5em}.or-button--is-active .or-button-value,.or-button--active-on-hover:hover .or-button-value{display: initial}.or-button-value{display: none;position: absolute;right: 1em} .or-collapsible .or-collapsible-act-switch{cursor: pointer}.or-collapsible .or-collapsible-value{display: block;transform-origin: top}.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{transform: scaleY(0);opacity: 0;max-height: 0;overflow: hidden}.or-collapsible--is-open .or-collapsible-value{transform: scaleY(1)}.or-collapsible--is-open .or-collapsible--on-closed{display: none}.or-collapsible--is-open .or-collapsible--on-open{display: inline} .or-dialog{position: absolute;z-index: 2;top: 0;left: 0;width: 100%;display: none;height: 100%;flex-direction: row}.or-dialog--is-open{display: flex}.or-dialog-filler{height: 100%;width: 12em;opacity: 0.6;filter: blur(10em)}@media only screen and (max-width: 55rem){.or-dialog-filler{width: 0}}.or-dialog-filler-icon{opacity: 1;font-size: 3em;position: absolute;right: 20px;top: 20px}.or-dialog-content{flex: 1;overflow: auto;height: 100%;z-index: 3}.or-dialog-content .or-view{height: 100%} .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} @@ -17,7 +17,7 @@ .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} .or-selector-tree{display: none}.or-selector-search{display: none}.or-selector--is-tree-active .or-selector-tree{display: block}.or-selector--is-search-active .or-selector-search{display: block} -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}.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: #3c8b2e !important;cursor: move;z-index: 3}.or-droppable--hover{background-color: #08f169 !important;cursor: move;z-index: 3}.or--invisible{visibility: hidden}.or--visible{visibility: visible}legend{font-size: 1.1em;font-weight: bold;padding: 0 .5em} +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}.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: #3c8b2e !important;cursor: move;z-index: 3}.or-droppable--hover{background-color: #08f169 !important;cursor: move;z-index: 3}.or--invisible{visibility: hidden}.or--visible{visibility: visible}.or-link{color: inherit}.or-link--is-active{font-weight: bold}legend{font-size: 1.1em;font-weight: bold;padding: 0 .5em} .or-view{padding: 0.5em}.or-view-header{font-size: 1.2em} .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}} .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} diff --git a/modules/template_engine/components/html/component_table/table.js b/modules/template_engine/components/html/component_table/table.js @@ -36,7 +36,7 @@ Openrat.Workbench.afterViewLoadedHandler.add( function(element ) { table.addClass('loader'); setTimeout( () => { - table.find('tr:not(.headline)').filter(function () { + table.find('tr:not(.or-table-header)').filter(function () { $(this).toggle($(this).text().toLowerCase().indexOf(filterExpression) > -1) }) table.removeClass('loader');