extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Import/Export: Fix some style issues

Browse Source 
- missing import/export icons in defininition list
- preview looks weird in import & export dialogs
- [object] instead of index in mapping list
This commit is contained in:
nathan 2022-10-26 09:57:34 -06:00
parent 005aaa0ea2
commit 64fd769586
9 changed files with 210 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/templates/default/etemplate2.css
View File

@ -2143,6 +2143,7 @@ lion-validation-feedback[type] {
border-color: #9ea930; border-color: #9ea930;
background-image: url(images/tick.png); background-image: url(images/tick.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain;
padding-left: 20px; padding-left: 20px;
white-space: nowrap; white-space: nowrap;
} }

4
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -399,8 +399,8 @@ use EGroupware\Api\Etemplate;
if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields']))) if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
{ {
$message[] = lang("Column mismatch. Expected %1 columns, your file has %2.", $message[] = lang("Column mismatch. Expected %1 columns, your file has %2.",
count($options['field_mapping']), count($options['csv_fields']),
count($data) count($data)
); );
$ok = false; $ok = false;
} }

29
importexport/js/app.ts
View File

@ -100,35 +100,44 @@ class ImportExportApp extends EgwApp
export_preview(event, widget) export_preview(event, widget)
{ {
var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode()); var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode());
jQuery('.content',preview).empty() // TD gets the class too
preview.parent().show();
jQuery('.content', preview).empty()
.append('<div class="loading" style="width:100%;height:100%"></div>'); .append('<div class="loading" style="width:100%;height:100%"></div>');
preview preview
.show(100, jQuery.proxy(function() { .show(100, jQuery.proxy(function()
{
widget.clicked = true; widget.clicked = true;
widget.getInstanceManager().submit(false, true); widget.getInstanceManager().submit(false, true);
widget.clicked = false; widget.clicked = false;
},this)); }, this));
return false; return false;
} }
import_preview(event, widget) import_preview(event, widget)
{ {
var test = widget.getRoot().getWidgetById('dry-run'); var test = widget.getRoot().getWidgetById('dry-run');
if(test.getValue() == test.options.unselected_value) return true; if(test.getValue() == test.options.unselected_value)
{
return true;
}
// Show preview // Show preview
var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode()); var preview = jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode());
jQuery('.content',preview).empty(); // TD gets the class too
preview.parent().show();
jQuery('.content', preview).empty();
preview preview
.addClass('loading') .addClass('loading')
.show(100, jQuery.proxy(function() { .show(100, jQuery.proxy(function()
{
widget.clicked = true; widget.clicked = true;
widget.getInstanceManager().submit(false, true); widget.getInstanceManager().submit(false, true);
widget.clicked = false; widget.clicked = false;
jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode()) jQuery(widget.getRoot().getWidgetById('preview_box').getDOMNode())
.removeClass('loading'); .removeClass('loading');
},this)); }, this));
return false; return false;
} }

48
importexport/templates/default/app.css
View File

@ -1,38 +1,36 @@
div.preview { .preview {
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
width: 97%; width: 97%;
height: 95%; height: 95%;
overflow: hidden; overflow: hidden;
background-color: white; background-color: white;
z-index: 999; z-index: 999;
display: none; display: none;
border: 1px solid black; border: 1px solid black;
margin: 1.5%; margin: 1.5%;
} }
div.preview .content { .preview .content {
overflow: auto; overflow: auto;
max-height: 99%; max-height: 99%;
display: block; display: block;
} }
.preview_box .header, .preview .header { .preview_box .header, .preview .header {
font-size: 150%; font-size: 150%;
margin-bottom: 5px; margin-bottom: 5px;
padding: 5px; padding: 5px;
border-bottom: 1px outset; border-bottom: 1px outset;
} }
.preview tr{ .preview tr{
vertical-align: top; vertical-align: top;
} }
.preview div[id$='buttons'] { .preview [id$='buttons'] {
position: absolute; margin-left: 50%;
bottom: 0px;
width: 100%;
margin-left: 50%;
} }
.wizard_content > div > table { .wizard_content > div > table {

19
importexport/templates/default/definition_index.xet
View File

@ -21,14 +21,17 @@
<nextmatch-accountfilter empty_label="Owner" id="owner"/> <nextmatch-accountfilter empty_label="Owner" id="owner"/>
</row> </row>
<row class="row $row_cont[class]"> <row class="row $row_cont[class]">
<image src="${row}[type]" no_lang="1" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.${row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[definition_id]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" class="lr_padding button"/> <image src="${row_cont[type]}" no_lang="1"
<description id="${row}[name]" no_lang="1" class="lr_padding"/> onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_${row_cont[type]}_ui.${row_cont[type]}_dialog&amp;appname=${row_cont[application]}&amp;definition=${row_cont[definition_id]}'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"
<description id="${row}[application]" class="lr_padding"/> class="lr_padding button"/>
<listbox type="select-account" id="${row}[allowed_users]" no_lang="1" readonly="true" rows="5" empty_label='Private' class="lr_padding"/> <description id="${row}[name]" no_lang="1" class="lr_padding"/>
<menulist> <description id="${row}[application]" class="lr_padding"/>
<menupopup type="select-account" id="${row}[owner]" readonly="true"/> <listbox type="select-account" id="${row}[allowed_users]" no_lang="1" readonly="true" rows="5"
</menulist> empty_label='Private' class="lr_padding"/>
</row> <menulist>
<menupopup type="select-account" id="${row}[owner]" readonly="true"/>
</menulist>
</row>
</rows> </rows>
</grid> </grid>
<styles> <styles>

183
importexport/templates/default/export_dialog.xet
View File

@ -3,55 +3,56 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="importexport.export_dialog.general_tab_content" template="" lang="" group="0" version=""> <template id="importexport.export_dialog.general_tab_content" template="" lang="" group="0" version="">
<grid> <grid width="100%">
<columns> <columns>
<column/> <column/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row> <row>
<description span="all"/> <description span="all"/>
</row> </row>
<row class="select_appname "> <row class="select_appname ">
<description value="Select application"/> <description value="Select application"/>
<menulist> <menulist>
<menupopup id="appname" no_lang="1" onchange="1"/> <menupopup id="appname" no_lang="1" onchange="1"/>
</menulist> </menulist>
</row> </row>
<row class="select_definition"> <row class="select_definition">
<description value="Select definition"/> <description value="Select definition"/>
<menulist> <menulist>
<menupopup id="definition" no_lang="1" onchange="widget.getInstanceManager().postSubmit(); return false;"/> <menupopup id="definition" no_lang="1"
</menulist> onchange="widget.getInstanceManager().postSubmit(); return false;"/>
</row> </menulist>
<row class="select_plugin"> </row>
<description value="Select plugin"/> <row class="select_plugin">
<menulist> <description value="Select plugin"/>
<menupopup id="plugin" no_lang="1" onchange="1"/> <menulist>
</menulist> <menupopup id="plugin" no_lang="1" onchange="1"/>
</row> </menulist>
<row> </row>
<box id="plugin_description" span="all"> <row>
<description id="description" no_lang="1" span="all"/> <box id="plugin_description" span="all">
</box> <description id="description" no_lang="1" span="all"/>
</row> </box>
</rows> </row>
</grid> </rows>
</template> </grid>
<template id="importexport.export_dialog.general_tab" template="" lang="" group="0" version=""> </template>
<grid height="200px"> <template id="importexport.export_dialog.general_tab" template="" lang="" group="0" version="">
<columns> <grid height="200px" width="100%">
<column/> <columns>
<column/> <column/>
</columns> <column/>
<rows> </columns>
<row valign="top"> <rows>
<image src="export"/> <row valign="top">
<template id="importexport.export_dialog.general_tab_content"/> <image src="export"/>
</row> <template id="importexport.export_dialog.general_tab_content"/>
</rows> </row>
</grid> </rows>
</template> </grid>
</template>
<template id="importexport.export_dialog.selection_tab" template="" lang="" group="0" version=""> <template id="importexport.export_dialog.selection_tab" template="" lang="" group="0" version="">
<grid width="100%" height="200px"> <grid width="100%" height="200px">
<columns> <columns>
@ -136,45 +137,48 @@
<columns> <columns>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row> <row>
<description id="msg"/> <description id="msg"/>
</row> </row>
<row> <row>
<tabbox id="general_tab|selection_tab|options_tab"> <tabbox id="general_tab|selection_tab|options_tab">
<tabs> <tabs>
<tab id="general_tab" label="General"/> <tab id="general_tab" label="General"/>
<tab id="selection_tab" label="Selection"/> <tab id="selection_tab" label="Selection"/>
<tab id="options_tab" label="Options"/> <tab id="options_tab" label="Options"/>
</tabs> </tabs>
<tabpanels> <tabpanels>
<template id="importexport.export_dialog.general_tab"/> <template id="importexport.export_dialog.general_tab"/>
<template id="importexport.export_dialog.selection_tab"/> <template id="importexport.export_dialog.selection_tab"/>
<template id="importexport.export_dialog.options_tab"/> <template id="importexport.export_dialog.options_tab"/>
</tabpanels> </tabpanels>
</tabbox> </tabbox>
</row> </row>
<row class="save_definition dialog-operators high"> <row class="save_definition dialog-operators high">
<checkbox label="Save as definition" id="save_as_definition"/> <checkbox label="Save as definition" id="save_as_definition"/>
</row> </row>
<row class="dialog-footer-toolbar"> <row class="dialog-footer-toolbar">
<hbox span="all"> <hbox span="all">
<hbox> <hbox>
<button label="Export" id="export" image="export" background_image="1"/> <button label="Export" id="export" image="export" background_image="1"/>
<button label="Preview" id="preview" onclick="app.importexport.export_preview" image="prieview" background_image="1"/> <button label="Preview" id="preview" onclick="app.importexport.export_preview"
</hbox> image="prieview" background_image="1"/>
<button class="cancel" align="right" label="Cancel" id="cancel" onclick="window.close(); return false;" image="cancel" background_image="1"/> </hbox>
</hbox> <button class="cancel" align="right" label="Cancel" id="cancel"
</row> onclick="window.close(); return false;" image="cancel" background_image="1"/>
<row> </hbox>
<box id="preview_box" span="all" class="preview_box"> </row>
<html id="preview-box" class="content"/> <row>
<box align="center" id="preview-box-buttons" class="preview-box-buttons"> <vbox id="preview_box" span="all" class="preview">
<button align="center" label="OK" onclick="jQuery(this).parents('div.preview_box').css('display','none'); return false;"/> <html id="preview-box" class="content"/>
</box> <box align="center" id="preview-box-buttons" class="preview-box-buttons">
</box> <button align="center" label="OK"
</row> onclick="jQuery(this).parents('.preview').css('display','none'); return false;"/>
</rows> </box>
</vbox>
</row>
</rows>
</grid> </grid>
<styles> <styles>
div.preview_box { div.preview_box {
@ -203,9 +207,6 @@
overflow: auto; overflow: auto;
} }
.preview-box-buttons { .preview-box-buttons {
position: absolute;
bottom: 0px;
width: 100%;
margin-left: 50%; margin-left: 50%;
} }
</styles> </styles>

73
importexport/templates/default/import_dialog.xet
View File

@ -22,42 +22,43 @@
</grid> </grid>
</template> </template>
<template id="importexport.import_dialog" template="" lang="" group="0" version="1.9.005"> <template id="importexport.import_dialog" template="" lang="" group="0" version="1.9.005">
<grid> <grid width="100%">
<columns> <columns>
<column/> <column/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row disabled="!@message"> <row disabled="!@message">
<html id="message" span="all" class="message"/> <html id="message" span="all" class="message"/>
<description/> <description/>
</row> </row>
<row> <row>
<description value="Application"/> <description value="Application"/>
<menulist> <menulist>
<menupopup id="appname" onchange="1"/> <menupopup id="appname" onchange="1"/>
</menulist> </menulist>
</row> </row>
<row> <row>
<description value="Import definition"/> <description value="Import definition"/>
<menulist> <menulist>
<menupopup id="definition" onchange="1"/> <menupopup id="definition" onchange="1"/>
</menulist> </menulist>
</row> </row>
<row> <row>
<description value="Please select file to import"/> <description value="Please select file to import"/>
<file id="file" accept="@file_type"/> <file id="file" accept="@file_type"/>
</row> </row>
<row disabled="!@plugin_options_template"> <row disabled="!@plugin_options_template">
<template template="@plugin_options_template"/> <template template="@plugin_options_template"/>
</row> </row>
<row> <row>
<box id="preview_box" span="all" class="preview"> <vbox id="preview_box" span="all" class="preview">
<html id="preview" class="content"/> <html id="preview" class="content"/>
<box align="center" id="buttons"> <box align="center" id="buttons">
<buttononly align="center" label="OK" onclick="jQuery(this).parents('div.preview').css('display','none'); return false;"/> <buttononly align="center" label="OK"
</box> onclick="jQuery(this).parents('.preview').css('display','none'); return false;"/>
</box> </box>
</vbox>
<description/> <description/>
</row> </row>
<row> <row>

44
importexport/templates/default/wizard_basic_import_csv.fieldmapping.xet
View File

@ -13,28 +13,28 @@
</row> </row>
<row> <row>
<grid overflow="auto" id="mapping"> <grid overflow="auto" id="mapping">
<columns> <columns>
<column width="4ex"/> <column width="4ex"/>
<column/> <column/>
<column/> <column/>
<column/> <column/>
<column/> <column/>
</columns> </columns>
<rows> <rows>
<row class="th"> <row class="th">
<description/> <description/>
<description value="CSV Field"/> <description value="CSV Field"/>
<description value="Target Field"/> <description value="Target Field"/>
<description value="Translation"/> <description value="Translation"/>
</row> </row>
<row> <row>
<description id="$row_cont[index]" value="$row_cont[index]" no_lang="1"/> <description value="$row_cont[index]" no_lang="1"/>
<description value="$row_cont[title]" no_lang="1"/> <description value="$row_cont[title]" no_lang="1"/>
<listbox id="{$row}[field]" no_lang="1"/> <listbox id="{$row}[field]" no_lang="1"/>
<textbox id="{$row}[conversion]"/> <textbox id="{$row}[conversion]"/>
</row> </row>
</rows> </rows>
</grid> </grid>
</row> </row>
</rows> </rows>
</grid> </grid>

9
importexport/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package projectmanager * @package projectmanager
* @version $Id$ * @version $Id$
*/ */
div.preview { .preview {
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -24,7 +24,7 @@ div.preview {
border: 1px solid black; border: 1px solid black;
margin: 1.5%; margin: 1.5%;
} }
div.preview .content { .preview .content {
overflow: auto; overflow: auto;
max-height: 99%; max-height: 99%;
display: block; display: block;
@ -39,10 +39,7 @@ div.preview .content {
.preview tr { .preview tr {
vertical-align: top; vertical-align: top;
} }
.preview div[id$='buttons'] { .preview [id$='buttons'] {
position: absolute;
bottom: 0px;
width: 100%;
margin-left: 50%; margin-left: 50%;
} }
.wizard_content > div > table { .wizard_content > div > table {