From 1a5382bd8186a4a41eb3d7ff032d7f34784ac61e Mon Sep 17 00:00:00 2001 From: hartmut Date: Wed, 21 Dec 2016 15:13:25 +0000 Subject: Korrektur Notizen und Warnungen git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5997 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/input.phtml | 8 +- views/css/admin.css | 37 +- views/mods/mod_deliverynote/settings_edit.phtml | 14 +- .../mod_discount/produkt_addedit_sidebar.phtml | 6 +- views/mods/mod_downloadplus/filelist.phtml | 5 +- .../mods/mod_downloadprodukte/order_view_row.phtml | 2 +- .../produkt_addedit_sidebar.phtml | 2 +- .../mod_downloadprodukte/produkt_edit_list.phtml | 8 +- views/mods/mod_ordercondition/list.phtml | 4 +- .../mod_productvars/produkt_addedit_sidebar.phtml | 6 +- views/mods/mod_productvars/pv_list.phtml | 7 +- views/mods/mod_productvars/settings_edit.phtml | 7 +- views/mods/mod_rechnungen/foottext_list.phtml | 14 +- views/mods/mod_rechnungen/settings_edit.phtml | 15 +- views/mods/mod_spconditions/conditionList.phtml | 6 +- .../chartsalestopaymentmethod/all.phtml | 17 +- .../mod_statistics/charttopsellertosales/all.phtml | 12 +- views/mods/mod_statistics/simplefilter.phtml | 2 + views/mods/mod_stock/settings_edit.phtml | 25 +- views/mods/mod_trustedshops/settings_edit.phtml | 3 +- views/mods/mod_userpayment/list.phtml | 259 ++++++-------- views/mods/mod_userpayment/settings_edit.phtml | 6 +- views/mods/mod_versandarten/list.phtml | 393 +++++++++------------ views/mods/mod_versandarten/settings_edit.phtml | 3 +- views/mods/mod_voucherproduct/settings_edit.phtml | 59 ++-- views/mods/mod_wirecard/settings_edit.phtml | 17 +- 26 files changed, 453 insertions(+), 484 deletions(-) diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index 82ea89e..83f0646 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -36,7 +36,13 @@ /> view['field_config']['help'])) { ?> - + view['field_config']['rAlign'])) { ?> + + + + diff --git a/views/css/admin.css b/views/css/admin.css index 3135c1e..4f1b6fc 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -51,6 +51,7 @@ /* Allgemeine Klassen */ .wpsg_grey { color:#999999; } +.wpsg_editable { line-height:125%; } /* Tabellensortierung */ .wpsg-table-order .wpsg_order { position:relative; } @@ -241,4 +242,38 @@ /* Modul Downloadplus */ .wpsg_mod_downloadplus_fieldtable { font-size:12px; } .wpsg_mod_downloadplus_fieldtable .col_x, -.wpsg_mod_downloadplus_fieldtable .col_y { width:50px; } \ No newline at end of file +.wpsg_mod_downloadplus_fieldtable .col_y { width:50px; } + +/* Produktvariablen */ +.wpsg_pv_table { width:100%; } +.wpsg_pv_table tr td { vertical-align:top; } +.wpsg_pv_table .wpsg_id { width:20px; text-align:left; cursor:move; } +.wpsg_pv_table .wpsg_delcol { width:24px; text-align:center; } +.wpsg_pv_table .wpsg_typ { width:100px; text-align:left; } +.wpsg_pv_table .wpsg_pflicht { width:100px; text-align:center; } +.wpsg_pv_table .wpsg_label { text-align:left; } + +/* Bestellvariablen */ +.wpsg_ov_table { width:100%; } +.wpsg_ov_table .wpsg_id { width:20px; text-align:left; } +.wpsg_ov_table .wpsg_delcol { width:24px; text-align:center; } +.wpsg_ov_table .wpsg_typ { width:100px; text-align:left; } +.wpsg_ov_table .wpsg_pflicht { width:100px; text-align:center; } +.wpsg_ov_table .wpsg_label { text-align:left; } + +/* Statistikmodul */ +.wpsg_mod_statistics_totals_row { width:100%; } +.wpsg_mod_statistics_totals_block { float:left; width:auto; text-align:center; font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; } +.wpsg_mod_statistics_totals_block .number { font-size:18px; color:#21759B; display:block; padding-bottom:10px; padding-top:5px; } +.wpsg_mod_statistics_totals_block .label { font-size:16px; color:#8F8F8F; display:block; padding-bottom:5px; } +.wpsg_mod_statistics_totals_block .label a { color:#8F8F8F; border-bottom:1px solid #ECECEC; padding-left:10px; padding-right:15px; padding-bottom:5px; } +.subsubsub #table-data .th-right span { float:right; } +.subsubsub #table-data .td-right { text-align:right; } + +/* Download plus */ +.wpsg_mod_downloadplus_order_view_filelist { width:100%; } +.wpsg_mod_downloadplus_order_view_filelist .col_file { text-align:left; } +.wpsg_mod_downloadplus_order_view_filelist .col_status { text-align:left; width:200px; } +.wpsg_mod_downloadplus_order_view_filelist .col_counter { text-align:center; width:100px;} +.wpsg_mod_downloadplus_order_view_filelist .col_action { text-align:left; width:100px;} +.wpsg_mod_downloadplus_order_view_filelist .row_raid td { color:red; } diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml index 20464a2..edb8b19 100644 --- a/views/mods/mod_deliverynote/settings_edit.phtml +++ b/views/mods/mod_deliverynote/settings_edit.phtml @@ -23,14 +23,15 @@ - + view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = ' '; - } ?> - true, 'help' => 'wpsg_mod_deliverynote_bp')); ?> + echo __($strSuffix); + } ?> + true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?> view['wpsg_mod_deliverynote']['logo'] === false) { ?> @@ -38,14 +39,15 @@ - + view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = ' '; + echo __($strSuffix); } ?> - true, 'help' => 'wpsg_mod_deliverynote_logo')); ?> + true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
@@ -102,7 +104,7 @@

- +

diff --git a/views/mods/mod_discount/produkt_addedit_sidebar.phtml b/views/mods/mod_discount/produkt_addedit_sidebar.phtml index 5902ba8..7d6d4b7 100644 --- a/views/mods/mod_discount/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_discount/produkt_addedit_sidebar.phtml @@ -13,9 +13,9 @@
view['wpsg_mod_discount']['data'][0]); ?> - view['wpsg_mod_discount']['data'][1])); ?> - view['wpsg_mod_discount']['data'][2])); ?> - view['wpsg_mod_discount']['data'][3])); ?> + view['wpsg_mod_discount']['data'][1]))); ?> + view['wpsg_mod_discount']['data'][2]))); ?> + view['wpsg_mod_discount']['data'][3]))); ?> diff --git a/views/mods/mod_downloadplus/filelist.phtml b/views/mods/mod_downloadplus/filelist.phtml index 6b43615..b151177 100644 --- a/views/mods/mod_downloadplus/filelist.phtml +++ b/views/mods/mod_downloadplus/filelist.phtml @@ -11,9 +11,10 @@ diff --git a/views/mods/mod_downloadprodukte/order_view_row.phtml b/views/mods/mod_downloadprodukte/order_view_row.phtml index 7ccebd4..887bb69 100644 --- a/views/mods/mod_downloadprodukte/order_view_row.phtml +++ b/views/mods/mod_downloadprodukte/order_view_row.phtml @@ -5,7 +5,7 @@ */ ?> - + : view['wpsg_mod_downloadprodukte']['arFiles'] as $file) { ?> diff --git a/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml b/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml index 63726c6..947be7d 100644 --- a/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_downloadprodukte/produkt_addedit_sidebar.phtml @@ -73,7 +73,7 @@
-
+
view['prodFiles']; ?>
get_option('wpsg_classicupload') == '1') { ?> diff --git a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml index 926ebd4..4ccf430 100644 --- a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml +++ b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml @@ -7,15 +7,15 @@ ?> view['prodFiles']) && wpsg_isSizedInt($_REQUEST['edit_id'])) { ?>
    -view['prodFiles'] as $file) { ?> + view['prodFiles'] as $file) { ?>
  • - + () -
    +
    • - +

diff --git a/views/mods/mod_ordercondition/list.phtml b/views/mods/mod_ordercondition/list.phtml index d2abc92..00eabc0 100644 --- a/views/mods/mod_ordercondition/list.phtml +++ b/views/mods/mod_ordercondition/list.phtml @@ -106,8 +106,8 @@ +

+ view['data'])) { ?>
- - callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?> - view['data'])) { ?> -
- - - + \ No newline at end of file diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml index 9553eee..adae7d5 100644 --- a/views/mods/mod_versandarten/settings_edit.phtml +++ b/views/mods/mod_versandarten/settings_edit.phtml @@ -89,12 +89,13 @@
-
mod->va_list(); ?>
+ + Neue Versandart anlegen diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml index e4153f6..79b8528 100644 --- a/views/mods/mod_voucherproduct/settings_edit.phtml +++ b/views/mods/mod_voucherproduct/settings_edit.phtml @@ -18,39 +18,32 @@
-
-
-
- view['bp']) && $this->view['bp'] !== false) { ?> - - -
-
- view['bp']) || $this->view['bp'] === false) { ?> -

- - - - - -
-
-
- get_option('wpsg_voucherproduct_width'), array ('help' => 'wpsg_voucherproduct_width')); ?> - get_option('wpsg_voucherproduct_height'), array ('help' => 'wpsg_voucherproduct_height')); ?> -
-
- -
-
-

hier konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?> -

-
-
-
- + + + view['bp'] === false) { ?> +

+ + + + + + view['bp'] !== false) { $strSuffix = ' + '; + echo __($strSuffix); + } ?> + true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?> + + get_option('wpsg_voucherproduct_width'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_width')); ?> + get_option('wpsg_voucherproduct_height'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_height')); ?> + + + hier konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?> + + + true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?> +
diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml index bc8cf77..fa32f33 100644 --- a/views/mods/mod_wirecard/settings_edit.phtml +++ b/views/mods/mod_wirecard/settings_edit.phtml @@ -15,21 +15,8 @@ get_option('wpsg_mod_wirecard_secret'), array('help' => 'wpsg_mod_wirecard_secret')); ?>
get_option('wpsg_mod_wirecard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?> -
-
- -
-
- - -
-
-
+get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_mod_wirecard_mwst')); ?> + get_option('wpsg_mod_wirecard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?> __('Euro', 'wpsg'), -- cgit v1.2.3