diff options
Diffstat (limited to 'views')
34 files changed, 276 insertions, 248 deletions
diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml index 6c13bfa..1bacc79 100644 --- a/views/admin/form/emailconf.phtml +++ b/views/admin/form/emailconf.phtml @@ -17,7 +17,7 @@ <br />
<div class="wpsg_hinweis">
<strong><?php echo __('Aktueller Anhang', 'wpsg') ?>: </strong><?php echo ((wpsg_isSizedString($this->get_option('wpsg_'.$this->view['field_key'].'_attachfile')))?$this->get_option('wpsg_'.$this->view['field_key'].'_attachfile'):__('keiner', 'wpsg')); ?>
- <?php echo ((wpsg_isSizedString($this->get_option('wpsg_kundenmail_attachfile')))?'<a class="wpsg_icon wpsg_icon_right wpsg_icon_remove" titel="'.__('Datei entfernen', 'wpsg').'" href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction='.$_REQUEST['subaction'].'&cmd=del_attach_file"></a>':''); ?>
+ <?php echo ((wpsg_isSizedString($this->get_option('wpsg_kundenmail_attachfile')))?'<a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" titel="'.__('Datei entfernen', 'wpsg').'" href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction='.$_REQUEST['subaction'].'&cmd=del_attach_file"></a>':''); ?>
</div>
<br />
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 1331419..30e49c8 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -83,14 +83,14 @@ </div>
<div class="wpsg_form_right">
<p><?php echo __("Die Version der Datenbank stimmt nicht mit der installierten Version überein!<br />Bitte klicken Sie auf ", "wpsg").'<a href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=allgemein&do=update&submit=1&noheader=1">'.__("Aktualisieren", "wpsg").'</a> ('.__("Produkte etc. werden dabei nicht gelöscht.", "wpsg"); ?>)</p>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_glyphicon_right glyphicon glyphicon-question-sign"></a>
</div>
<div class="wpsg_clear"></div>
</div>
<?php } else { ?>
<?php wpsg_drawForm_TextStart(); ?>
<?php echo WPSG_VERSION; ?> <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=allgemein&do=update&submit=1&noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_glyphicon_right glyphicon glyphicon-question-sign"></a>
<?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg')); ?>
<?php } ?>
diff --git a/views/mods/mod_deliverynote/order_view_content.phtml b/views/mods/mod_deliverynote/order_view_content.phtml index 0811d5c..8634dbd 100644 --- a/views/mods/mod_deliverynote/order_view_content.phtml +++ b/views/mods/mod_deliverynote/order_view_content.phtml @@ -5,11 +5,8 @@ */
?>
-<div class="postbox" id="wpsg_deliverynote">
- <h3 class="wpsg_handlediv">
- <span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
- <span><?php echo __('Lieferschein', 'wpsg'); ?></span>
- </h3>
+<?php echo wpsg_drawForm_AdminboxStart(__('Lieferscheine', 'wpsg')); ?>
+
<div class="inside">
<?php if (!wpsg_isSizedArray($this->view['wpsg_mod_deliverynote']['arDeliverynotes'])) { ?>
@@ -27,12 +24,12 @@ <?php } ?>
<?php if (wpsg_isSizedArray($this->view['wpsg_mod_deliverynote']['arNoDeliveredProducts'])) { ?>
- <fieldset style="border:1px solid #999999; width:100%;">
- <legend style="margin-left:10px; margin-right:10px;"><?php echo __('Neuer Lieferschein', 'wpsg'); ?></legend>
+ <fieldset>
+ <legend ><?php echo __('Neuer Lieferschein', 'wpsg'); ?></legend>
<form target="_blank" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_deliverynote&cmd=deliverynote&noheader=1&edit_id=<?php echo $this->view['data']['id']; ?>">
- <div style="padding:5px;">
+ <div>
<label style="height:25px; width:240px; float:left; margin-top:10px;">
<input onchange="if (this.checked) jQuery('#wpsg_mod_deliverynote_email').show(); else jQuery('#wpsg_mod_deliverynote_email').hide();" type="checkbox" checked="checked" value="1" name="wpsg_mod_deliverynote_showmail" />
@@ -111,7 +108,8 @@ <?php } ?>
</div>
-</div>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
<script type="text/javascript">/* <![CDATA[ */
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml index 5d1b654..20464a2 100644 --- a/views/mods/mod_deliverynote/settings_edit.phtml +++ b/views/mods/mod_deliverynote/settings_edit.phtml @@ -23,7 +23,7 @@ <?php } else { ?>
<a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
<input type="file" name="wpsg_mod_deliverynote_bp">
<?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = '
<label>
@@ -38,7 +38,7 @@ <?php } else { ?>
<a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
<input type="file" name="wpsg_mod_deliverynote_logo">
<?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = '
<label>
diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml index 0c8447a..293b873 100644 --- a/views/mods/mod_downloadplus/settings_edit.phtml +++ b/views/mods/mod_downloadplus/settings_edit.phtml @@ -54,15 +54,15 @@ <?php echo wpsg_drawForm_TextStart(); ?>
<p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?></p>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
<?php echo wpsg_drawForm_TextEnd(__('Mail für Individualisierungsbericht', 'wpsg'), array('noP' => true)); ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?></p>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
<?php echo wpsg_drawForm_TextEnd(__('Mail für Downloads an Kunden', 'wpsg'), array('noP' => true)); ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgeführt', 'wpsg')); ?></p>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
<?php echo wpsg_drawForm_TextEnd(__('Letzte Ausführung des Crons', 'wpsg'), array('noP' => true)); ?>
</div>
diff --git a/views/mods/mod_ordervars/order_view_sidebar.phtml b/views/mods/mod_ordervars/order_view_sidebar.phtml index 4f11976..2cf8c73 100644 --- a/views/mods/mod_ordervars/order_view_sidebar.phtml +++ b/views/mods/mod_ordervars/order_view_sidebar.phtml @@ -24,7 +24,7 @@ ov_id: '<?php echo $ov['id']; ?>'
},
submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode(wpsg_array_merge((array)$ov['auswahl'], array('not_set' => __('Keine Angabe', 'wpsg')))); ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit(wpsg_array_merge((array)$ov['auswahl'], array('not_set' => __('Keine Angabe', 'wpsg')))); ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
@@ -48,7 +48,7 @@ ov_id: '<?php echo $ov['id']; ?>'
},
submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode(array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg'))); ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit(array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg'))); ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
diff --git a/views/mods/mod_ordervars/ov_list.phtml b/views/mods/mod_ordervars/ov_list.phtml index b8cb5c3..09876ce 100644 --- a/views/mods/mod_ordervars/ov_list.phtml +++ b/views/mods/mod_ordervars/ov_list.phtml @@ -61,7 +61,7 @@ ov_id: '<?php echo $ov['id']; ?>'
},
submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode($this->mod->arTypen); ?>',
+ data: <?php echo wpsg_prepare_for_inlineEdit($this->mod->arTypen); ?>,
type: 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
diff --git a/views/mods/mod_packagetracking/settings_edit.phtml b/views/mods/mod_packagetracking/settings_edit.phtml index 140de2e..5f18be0 100644 --- a/views/mods/mod_packagetracking/settings_edit.phtml +++ b/views/mods/mod_packagetracking/settings_edit.phtml @@ -59,7 +59,7 @@ <div class="title">
<div class="fulltab">
<?php echo __('Anbieter für Paketverfolgung', 'wpsg'); ?>
- <a title="<?php echo __('Neuem Anbieter anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_mod_packagetracking_add();"></a>
+ <a title="<?php echo __('Neuen Anbieter anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_mod_packagetracking_add();"></a>
</div>
</div>
</div>
diff --git a/views/mods/mod_packagetracking/settings_edit_list.phtml b/views/mods/mod_packagetracking/settings_edit_list.phtml index bfb4080..94c2728 100644 --- a/views/mods/mod_packagetracking/settings_edit_list.phtml +++ b/views/mods/mod_packagetracking/settings_edit_list.phtml @@ -17,7 +17,7 @@ <td class="wpsg_label"><?php echo __('ID', 'wpsg'); ?>:</td>
<td class="wpsg_value"><?php echo $p['id']; ?></td>
<td class="wpsg_delcol">
- <a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Anbieter löschen', 'wpsg'); ?>" onclick="return wpsg_mod_packagetracking_delete(<?php echo $p['id']; ?>);"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Anbieter löschen', 'wpsg'); ?>" onclick="return wpsg_mod_packagetracking_delete(<?php echo $p['id']; ?>);"></a>
</td>
</tr>
<tr>
@@ -25,7 +25,7 @@ <td class="wpsg_value wpsg_editable" id="tp_<?php echo $p['id']; ?>_name"><?php echo wpsg_hspc(__($p['name'], 'wpsg')); ?></td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
</td>
</tr>
@@ -34,7 +34,7 @@ <td class="wpsg_value wpsg_editable" id="tp_<?php echo $p['id']; ?>_url"><?php echo $p['url']; ?></td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
<script type="text/javascript">/* <![CDATA[ */
diff --git a/views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml b/views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml index 24da962..82795d2 100644 --- a/views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml +++ b/views/mods/mod_packagetracking/wpsg_mod_versandarten_listrow.phtml @@ -20,7 +20,7 @@ </td>
<td class="wpsg_delcol">
- <a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_versandarten" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_versandarten"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_versandarten" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_versandarten"></a>
<script type="text/javascript">/* <![CDATA[ */ diff --git a/views/mods/mod_productvariants/admin_show.phtml b/views/mods/mod_productvariants/admin_show.phtml index 986c2d5..958c22c 100644 --- a/views/mods/mod_productvariants/admin_show.phtml +++ b/views/mods/mod_productvariants/admin_show.phtml @@ -63,7 +63,7 @@ field: 'type',
field_id: '<?php echo $var['id']; ?>'
},
- data: '<?php echo json_encode(wpsg_mod_productvariants::$arTypeLabel); ?>',
+ data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_mod_productvariants::$arTypeLabel); ?>,
type: 'select'
});
diff --git a/views/mods/mod_productvars/order_view_row.phtml b/views/mods/mod_productvars/order_view_row.phtml index a835fc1..565b4f0 100644 --- a/views/mods/mod_productvars/order_view_row.phtml +++ b/views/mods/mod_productvars/order_view_row.phtml @@ -36,7 +36,7 @@ p_id: '<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>'
},
submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode(wpsg_array_merge((array)$pv['auswahl'], array('not_set' => __('Keine Angabe', 'wpsg')))); ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit(wpsg_array_merge((array)$pv['auswahl'], array('not_set' => __('Keine Angabe', 'wpsg')))); ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
@@ -50,7 +50,7 @@ p_id: '<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>'
},
submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode(array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg'))); ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit(array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg'))); ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
diff --git a/views/mods/mod_productvars/pv_list.phtml b/views/mods/mod_productvars/pv_list.phtml index 3dba9ad..9a16939 100644 --- a/views/mods/mod_productvars/pv_list.phtml +++ b/views/mods/mod_productvars/pv_list.phtml @@ -42,7 +42,7 @@ <td class="wpsg_pflicht"><input type="checkbox" <?php echo (($pv['pflicht'] == '1')?'checked="checked"':''); ?> id="wpsg_pv_pflicht_<?php echo $pv['id']; ?>" /></td>
<td class="wpsg_delcol">
- <a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);"></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);"></a>
<script type="text/javascript">/* <![CDATA[ */
@@ -76,7 +76,7 @@ pv_id: '<?php echo $pv['id']; ?>'
},
submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode($this->mod->arTypen); ?>',
+ data: <?php echo wpsg_prepare_for_inlineEdit($this->mod->arTypen); ?>,
type: 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
diff --git a/views/mods/mod_productvars/settings_edit.phtml b/views/mods/mod_productvars/settings_edit.phtml index b895c5e..607e441 100644 --- a/views/mods/mod_productvars/settings_edit.phtml +++ b/views/mods/mod_productvars/settings_edit.phtml @@ -58,7 +58,7 @@ <div class="title">
<div class="fulltab">
<?php echo __('Produktvariablen', 'wpsg'); ?>
- <a title="<?php echo __('Neue Produktvariable anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addPV();"></a>
+ <a title="<?php echo __('Neue Produktvariable anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addPV();"></a>
</div>
</div>
</div>
diff --git a/views/mods/mod_produktattribute/list.phtml b/views/mods/mod_produktattribute/list.phtml index c0363f3..d8f2657 100644 --- a/views/mods/mod_produktattribute/list.phtml +++ b/views/mods/mod_produktattribute/list.phtml @@ -40,7 +40,7 @@ <span class="glyphicon glyphicon-modal-window"></span>
</a>
- <a id="del_<?php echo $pa['id']; ?>" class="wpsg-glyphlink-td" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);">
+ <a id="del_<?php echo $pa['id']; ?>" class="wpsg-glyphlink-td" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo wpsg_getStr($pv['id']); ?>);">
<span class="glyphicon glyphicon-trash"></span>
</a>
diff --git a/views/mods/mod_rechnungen/foottext_list.phtml b/views/mods/mod_rechnungen/foottext_list.phtml index 90dea61..e614cda 100644 --- a/views/mods/mod_rechnungen/foottext_list.phtml +++ b/views/mods/mod_rechnungen/foottext_list.phtml @@ -22,7 +22,7 @@ <td class="col_standard"><input type="radio" value="<?php echo $key; ?>" <?php echo (($this->get_option('wpsg_rechnungen_foottext_standard') == $key)?'checked="checked"':''); ?> class="wpsg_rechnungen_foottext_standard" name="wpsg_rechnungen_foottext_standard" /></td>
<td class="col_aktion">
- <a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="wpsg_icon wpsg_icon_center wpsg_icon_remove"></a>
+ <a onclick="return wpsg_removeFooter(<?php echo $key; ?>);" title="<?php echo __('Fußtext löschen', 'wpsg'); ?>'" href="#" class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign"></a>
<script type="text/javascript">
diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml index a401317..3ed53c1 100644 --- a/views/mods/mod_rechnungen/settings_edit.phtml +++ b/views/mods/mod_rechnungen/settings_edit.phtml @@ -26,7 +26,7 @@ <?php } else { ?>
<a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
<input type="file" name="wpsg_rechnungen_bp">
<?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
<label>
@@ -41,7 +41,7 @@ <?php } else { ?>
<a href="<?php echo $this->view['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
<input type="file" name="wpsg_rechnungen_logo">
<?php $strSuffix = ''; if ($this->view['logo'] !== false) { $strSuffix = '
<label>
@@ -89,7 +89,7 @@ </td>
<td>
<label><input type="checkbox" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> /> <?php echo __("Aktiv", "wpsg"); ?></label>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
</td>
</tr>
<?php } ?>
diff --git a/views/mods/mod_scaleprice/scaleList.phtml b/views/mods/mod_scaleprice/scaleList.phtml index acd930c..f83067c 100644 --- a/views/mods/mod_scaleprice/scaleList.phtml +++ b/views/mods/mod_scaleprice/scaleList.phtml @@ -21,7 +21,7 @@ <div class="wpsg_form_right">
<div class="wpsg_editable" id="wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_value"><?php echo wpsg_ff($scale['value']); ?></div>
<p class="waehrung"><?php echo $this->get_option('wpsg_currency'); ?></p>
- <a class="wpsg_icon wpsg_icon_right wpsg_icon_remove" href="" onclick="return wpsg_mod_scaleprice_remove(<?php echo $scale['id']; ?>);" title=""></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="" onclick="return wpsg_mod_scaleprice_remove(<?php echo $scale['id']; ?>);" title=""></a>
</div>
<div class="wpsg_clear"></div>
</div>
@@ -78,7 +78,7 @@ <div class="wpsg_form_right">
<input type="text" class="wpsg_mod_scaleprice_value" name="wpsg_mod_scaleprice_value" value="" id="wpsg_mod_scaleprice_value">
<p class="waehrung"><?php echo $this->get_option('wpsg_currency'); ?></p>
- <a class="wpsg_icon wpsg_icon_right wpsg_icon_add" href="" onclick="return wpsg_mod_scaleprice_add();" title=""></a>
+ <a class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" href="" onclick="return wpsg_mod_scaleprice_add();" title=""></a>
</div>
<div class="wpsg_clear"></div>
</div>
\ No newline at end of file diff --git a/views/mods/mod_statistics/chartturnover/all.phtml b/views/mods/mod_statistics/chartturnover/all.phtml index c9e7181..ead62fd 100644 --- a/views/mods/mod_statistics/chartturnover/all.phtml +++ b/views/mods/mod_statistics/chartturnover/all.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -42,7 +43,7 @@ }
$k++;
}
-
+
if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
$chartJS['area']['area'.$i] = '['.implode(',', $chartJS['area']['area'.$i]).']';
}
@@ -79,7 +80,7 @@ jQuery(document).ready(function(){ <?php foreach ($chartJS['area'] as $index => $area) { ?>
var <?php echo $index; ?> = <?php echo $area; ?>;
<?php } ?>
-
+
var chartannualturnoverLine = jQuery.jqplot('chartannualturnover-line', [<?php echo implode(',', array_keys($chartJS['area'])); ?>], {
animate: true,
axesDefaults: {
diff --git a/views/mods/mod_statistics/chartturnover/day.phtml b/views/mods/mod_statistics/chartturnover/day.phtml index 76e259a..a7b5751 100644 --- a/views/mods/mod_statistics/chartturnover/day.phtml +++ b/views/mods/mod_statistics/chartturnover/day.phtml @@ -1,12 +1,18 @@ <?php $this->render(WPSG_PATH_VIEW.'/mods/mod_statistics/simplefilter.phtml'); ?>
<?php
-
+
if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ $cnt = count($this->view['chart']['data']);
+ unset($this->view['chart']['data']['template']);
+ $cnt = count($this->view['chart']['data']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
+ //if (!key_exists('label', $this->view['chart']['data'][$i])) continue;
+ //$lbl = $this->view['chart']['data'][$i]['label'];
+ //if ($lbl == null) continue;
$chartJS['legend'][$i] = "{";
@@ -28,31 +34,31 @@ if (wpsg_isSizedArray($this->view['chart']['data'][$i]))
{
- foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
- {
-
- //immer das Datum vom Rootelement nutzen
- $k = 0 ;
-
- foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
+ foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
{
- if ($j == $k)
- {
- if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date_i18n('H'), 0, 0, date_i18n('m'), date_i18n('d'), date_i18n('Y')))
- {
- $chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
- }
- }
- $k++;
+
+ //immer das Datum vom Rootelement nutzen
+ $k = 0 ;
+
+ foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
+ {
+ if ($j == $k)
+ {
+ if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date_i18n('H'), 0, 0, date_i18n('m'), date_i18n('d'), date_i18n('Y')))
+ {
+ $chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
+ }
+ }
+ $k++;
+ }
+
+ if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
+ $chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
+ }
+
+ $j++;
}
- if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
- $chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
- }
-
- $j++;
- }
-
}
}
@@ -102,7 +108,7 @@ jQuery(document).ready(function(){ tickInterval: '1 hours'
},
yaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['yaxis']['label'])); ?>',
tickOptions: {
formatter: wpsg_statistics_number_format
},
diff --git a/views/mods/mod_statistics/chartturnover/month.phtml b/views/mods/mod_statistics/chartturnover/month.phtml index 5ef077a..d6a9bda 100644 --- a/views/mods/mod_statistics/chartturnover/month.phtml +++ b/views/mods/mod_statistics/chartturnover/month.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -17,7 +18,7 @@ $chartJS['legend'][$i] .= " highlighter: {";
- $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
+ $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".wpsg_getStr($this->view['chart']['data'][$i]['year']).", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
$chartJS['legend'][$i] .= " }";
@@ -73,7 +74,7 @@ jQuery(document).ready(function(){ <?php foreach ($chartJS['area'] as $index => $area) { ?>
var <?php echo $index; ?> = <?php echo $area; ?>;
<?php } ?>
-
+
var chartannualturnoverLine = jQuery.jqplot('chartannualturnover-line', [<?php echo implode(',', array_keys($chartJS['area'])); ?>], {
animate: true,
axesDefaults: {
@@ -89,7 +90,8 @@ jQuery(document).ready(function(){ axes:{
xaxis:{
renderer:jQuery.jqplot.DateAxisRenderer,
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['data'][0]['label'])); ?>',
tickOptions:{formatString:'%d'},
tickInterval: '1 day',
min:'<?php echo date('Y', $this->view['chart']['data'][0]['min']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['min']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['min']); ?>',
diff --git a/views/mods/mod_statistics/chartturnover/quarter.phtml b/views/mods/mod_statistics/chartturnover/quarter.phtml index 36fc4cf..7f18413 100644 --- a/views/mods/mod_statistics/chartturnover/quarter.phtml +++ b/views/mods/mod_statistics/chartturnover/quarter.phtml @@ -5,7 +5,8 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
-
+ unset($this->view['chart']['data']['template']);
+
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -93,7 +94,8 @@ jQuery(document).ready(function(){ },
axes:{
xaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['data'][0]['label'])); ?>',
syncTicks: false,
tickOptions:{formatString:'KW %d'},
ticks: [<?php echo implode(',', $chartJS['ticks']['ticks0']); ?>]
diff --git a/views/mods/mod_statistics/chartturnover/week.phtml b/views/mods/mod_statistics/chartturnover/week.phtml index 57dd4a5..9777326 100644 --- a/views/mods/mod_statistics/chartturnover/week.phtml +++ b/views/mods/mod_statistics/chartturnover/week.phtml @@ -6,6 +6,9 @@ {
$series = '';
+ $cnt = count($this->view['chart']['data']);
+ unset($this->view['chart']['data']['template']);
+ $cnt = count($this->view['chart']['data']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -19,7 +22,7 @@ $chartJS['legend'][$i] .= " highlighter: {";
- $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
+ $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".wpsg_getStr($this->view['chart']['data'][$i]['year']).", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
$chartJS['legend'][$i] .= " }";
@@ -97,7 +100,7 @@ jQuery(document).ready(function(){ max:'<?php echo date('Y', $this->view['chart']['data'][0]['lastdayofweek']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['lastdayofweek']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['lastdayofweek']); ?>'
},
yaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['yaxis']['label'])); ?>',
tickOptions: {
formatter: wpsg_statistics_number_format
},
diff --git a/views/mods/mod_statistics/chartturnover/year.phtml b/views/mods/mod_statistics/chartturnover/year.phtml index 2be39aa..319cc9d 100644 --- a/views/mods/mod_statistics/chartturnover/year.phtml +++ b/views/mods/mod_statistics/chartturnover/year.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -37,7 +38,7 @@ {
if (mktime(0, 0, 0, $record['month'], 1, $record['year']) <= mktime(0, 0, 0, date_i18n('m'), 1, date_i18n('Y')))
{
- $chartJS['area']['area'.$i][] .= "['".$j."', ".wpsg_hspc($record['total'])."]";
+ $chartJS['area']['area'.$i][] = "['".$j."', ".wpsg_hspc($record['total'])."]";
}
$chartJS['ticks']['ticks'.$i][] = '['.$j.', \''.$record['tick'].'\']';
}
@@ -97,7 +98,7 @@ jQuery(document).ready(function(){ xaxis:{
rendererOptions:{tickRenderer:
jQuery.jqplot.CanvasAxisTickRenderer},
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
syncTicks: false,
tickOptions:{formatString:'%d'},
ticks: [<?php echo implode(',', $chartJS['ticks']['ticks0']); ?>]
diff --git a/views/mods/mod_statistics/chartturnoverperhour/all.phtml b/views/mods/mod_statistics/chartturnoverperhour/all.phtml index a7d96c2..30e1499 100644 --- a/views/mods/mod_statistics/chartturnoverperhour/all.phtml +++ b/views/mods/mod_statistics/chartturnoverperhour/all.phtml @@ -4,7 +4,8 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
-
+ unset($this->view['chart']['data']['template']);
+
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
diff --git a/views/mods/mod_statistics/simplefilter.phtml b/views/mods/mod_statistics/simplefilter.phtml index c6edd92..c3906de 100644 --- a/views/mods/mod_statistics/simplefilter.phtml +++ b/views/mods/mod_statistics/simplefilter.phtml @@ -44,7 +44,7 @@ <div style="float:left;" id="filter-standard-wrapper">
<select name="filter[standard]" id="filter-standard" size="1" onchange="<?php if ($_REQUEST['id'] == 0 || $_REQUEST['id'] == 1) { ?>checkForRelated(this);<?php } ?>">
<?php foreach ($this->view['standardFilter'] as $index => $filter) { ?>
- <option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc($filter['name']); ?></option>
+ <option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc(wpsg_getStr($filter['name'])); ?></option>
<?php } ?>
</select>
</div>
diff --git a/views/mods/mod_statistics/statistics.phtml b/views/mods/mod_statistics/statistics.phtml index fc27f1f..a5b7580 100644 --- a/views/mods/mod_statistics/statistics.phtml +++ b/views/mods/mod_statistics/statistics.phtml @@ -46,8 +46,6 @@ var div = jQuery(this).nextAll('div.jqplot-image-container' + btnId).first();
div.children('div.jqplot-image-container-content').empty();
div.children('div.jqplot-image-container-content').append(imgelem);
-
-
jQuery('div.jqplot-image-container' + btnId).dialog( {
'modal': true,
@@ -83,7 +81,7 @@ <ul class="nav navbar-nav">
<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("Statistik", "wpsg"); ?></a></li>
<!--
- <li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+ <li role="presentation" class="wpsg_showhide_filter <?php echo ((wpsg_getInt($this->view['hasFilter']) === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
-->
</ul>
diff --git a/views/mods/mod_targo/order_done.phtml b/views/mods/mod_targo/order_done.phtml index c0b3faf..14d1eee 100644 --- a/views/mods/mod_targo/order_done.phtml +++ b/views/mods/mod_targo/order_done.phtml @@ -1,132 +1,175 @@ -<?php
-
- /**
- * Dieses Template wird nach einer Targo Zahlung angezeigt
- */
-
- if ($this->get_option('wpsg_mod_targo_url_use') == 0)
- {
- $url = $this->get_option('wpsg_mod_targo_url_live');
- }
- else
- {
- $url = $this->get_option('wpsg_mod_targo_url_test');
- }
-?>
-
-<p><?php echo __('Um den Betrag mit einer Finanzierung bei der TARGOBANK zu bezahlen, klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p>
-<p>
-<!--
- <a title="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" href="<?php echo $url; ?>">
- <img src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" align="left" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;">
-
- </a>
--->
-</p>
-
-<form class="wpsg_productform" id="wpsg_produktform" method="post" action="<?php echo $url ?>">
-
-<input type="image" name="image" src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;">
-
-<div style="display:none;">
-<?php $o_id = $this->view['o_id'];
- $k_id = $this->view['k_id'];
- $oOrder = wpsg_order::getInstance($o_id);
- $brutto = $oOrder->getAmount(WPSG_BRUTTO);
- $brutto = wpsg_round($brutto, 2);
- /** @var wpsg_customer */
- $oCustomer = wpsg_customer::getInstance($k_id);
- /*
- $geb1 = $oCustomer->getBirthdate("Y-m-d");
- $geb2 = $oCustomer->getBirthdate();
- $geb3 = $oCustomer->data["geb"];
- $geb4 = wpsg_date("Y-m-d", strtotime($geb3));
- $geb5 = strtotime($geb3);
- $geb6 = strtotime("0000-00-00");
- $geb6 = strtotime("1901-12-13");
- $geb6 = strtotime("1901-12-14");
- */
- $dl = $this->view['targoLink'];
-
- $street = $oOrder-> getInvoiceStreetClear(true);
- $nr = $oOrder-> getInvoiceStreetNr();
-
-?>
-<?php ?>
-<?php
-function toIso($string) {
- return mb_convert_encoding($string, "ISO-8859-1");
-}
-
-?>
-
-<br /><br />
-<b>Obligatorische Daten für Targobank</b><br />
-<input type="text" id="koop_id" name="koop_id" value="<?php echo $this->get_option('wpsg_mod_targo_koop_id');?>" placeholder="koop_id"><br />
-<input type="text" id="SessionID" name="sessionID" value="<?php echo session_id();?>" placeholder="sessionID"><br />
-<input type="text" id="amount" name="amount" value="<?php echo $brutto;?>" placeholder="amount"><br />
-<input type="text" id="dealerID" name="dealerID" value="<?php echo $this->get_option('wpsg_mod_targo_dealerid');?>" placeholder="dealerID"><br />
-<input type="text" id="dealerText" name="dealerText" value="<?php echo $this->view['targoLink'];?>" placeholder="dealerText"><br />
-<input type="text" id="documentno" name="documentno" value="<?php echo $this->view['o_id'];?>" placeholder="documentno"><br />
-
-
-<b>Optionale Daten für Targobank</b><br />
-<input type="text" id="dealerShopURL" name="dealerShopURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerShopURL');?>" placeholder="dealerShopURL"><br />
-<input type="text" id="dealerAbortURL" name="dealerAbortURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerAbortURL');?>" placeholder="dealerAbortURL"><br />
-<input type="text" id="hash" name="hash" value="" placeholder="hash">(hashkey)<br />
-<input type="text" id="" name="" value="" placeholder=""><br />
-
-
-<b>Adressdaten aus Kundendaten</b><br />
-<?php
-$titel = $oCustomer->getTitle();
-$isotitel = '';
-if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel);
-?>
-<input type="text" id="surname" name="gender" value="<?php echo $isotitel;?>" placeholder="titel"><br />
-<input type="text" id="surname" name="surname" value="<?php echo toIso($oCustomer->getName());?>" placeholder="surname"><br />
-<input type="text" id="firstname" name="firstname" value="<?php echo toIso($oCustomer->getFirstname());?>" placeholder="firstname"><br />
-<input type="text" id="street" name="street" value="<?php echo toIso($oOrder->getInvoiceStreetClear(true));?>" placeholder="street"><br />
-<input type="text" id="streetnumber" name="streetnumber" value="<?php echo toIso($oOrder->getInvoiceStreetNr());?>" placeholder="streetnumber"><br />
-<input type="text" id="zip" name="zip" value="<?php echo toIso($oCustomer->getZip());?>" placeholder="zip"><br />
-<input type="text" id="city" name="city" value="<?php echo toIso($oCustomer->getCity());?>" placeholder="city"><br />
-<input type="text" id="telnocode" name="telnocode" value="" placeholder="vorwahl"><br />
-<input type="text" id="telno" name="telno" value="<?php echo toIso($oCustomer->getPhone());?>" placeholder="telno"><br />
-<input type="text" id="birthday" name="birthday" value="<?php
-
- $dt = $oCustomer->getBirthdate("Y-m-d");
-
- if ($oCustomer->geb == '0000-00-00' || strtotime($dt) === false)
- {
-
- echo '';
-
- }
- else
- {
-
- echo $oCustomer->getBirthdate("Y-m-d");
-
- }
-
-?>" placeholder="birthday"><br />
-<input type="text" id="email" name="email" value="<?php echo toIso($oCustomer->getEMail());?>" placeholder="email"><br />
-
-<input type="submit" id="submit" name="submit" value="submit" >
-
-</div>
-</form>
-
-
-<?php if ($this->get_option('wpsg_mod_targo_autostart') == '1') { ?>
-<script type="text/javascript">/* <![CDATA[ */
-
- jQuery(document).ready(function() {
- window.setTimeout(function() {
- //location.href = "<?php echo $url;?>";
- jQuery('#submit').trigger("click");
- }, 1000);
- } );
-
-/* ]]> */</script>
+<?php + + /** + * Dieses Template wird nach einer Targo Zahlung angezeigt + */ + + if ($this->get_option('wpsg_mod_targo_url_use') == 0) + { + $url = $this->get_option('wpsg_mod_targo_url_live'); + } + else + { + $url = $this->get_option('wpsg_mod_targo_url_test'); + } + +?> + +<p><?php echo __('Um den Betrag mit einer Finanzierung bei der TARGOBANK zu bezahlen, klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p> +<p> +<!-- + <a title="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" href="<?php echo $url; ?>"> + <img src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" align="left" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;"> + + </a> +--> +</p> +<script type="text/javascript">document.charset = 'ISO-8859-1';</script> +<form class="wpsg_productform" id="wpsg_produktform" accept-charset="ISO-8859-1" method="post" action="<?php echo $url ?>"> + +<input type="image" name="image" src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;"> + +<div style="display:none;"> +<?php $o_id = $this->view['o_id']; + $k_id = $this->view['k_id']; + $oOrder = wpsg_order::getInstance($o_id); + $brutto = $oOrder->getAmount(WPSG_BRUTTO); + $brutto = wpsg_round($brutto, 2); + /** @var wpsg_customer */ + $oCustomer = wpsg_customer::getInstance($k_id); + /* + $geb1 = $oCustomer->getBirthdate("Y-m-d"); + $geb2 = $oCustomer->getBirthdate(); + $geb3 = $oCustomer->data["geb"]; + $geb4 = wpsg_date("Y-m-d", strtotime($geb3)); + $geb5 = strtotime($geb3); + $geb6 = strtotime("0000-00-00"); + $geb6 = strtotime("1901-12-13"); + $geb6 = strtotime("1901-12-14"); + */ + $dl = $this->view['targoLink']; + + $street = $oOrder-> getInvoiceStreetClear(true); + $nr = $oOrder-> getInvoiceStreetNr(); + +?> +<?php ?> +<?php + +if (method_exists($oCustomer, getTitle)) { + $titel = $oCustomer->getTitle(); +} +else +{ + $titel = $oCustomer->title; +} +$isotitel = ''; +if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel); + +$dt = $oCustomer->getBirthdate("Y-m-d"); + +if ($oCustomer->geb == '0000-00-00' || strtotime($dt) === false) +{ + + $bd = ''; + +} +else +{ + + $bd = $oCustomer->getBirthdate("Y-m-d"); + +} + + +function toIso($string) { + //return mb_convert_encoding($string, "ISO-8859-1"); + return utf8_decode(utf8_encode($string)); +} + +$hash = ''; +$key = '123456'; +$key = $this->get_option('wpsg_mod_targo_hashkey'); +//$param = "amount=5000&koop_id=testidkk89&dealerText=https%3A%2F%2Fwww.targobank.de&documentno=&". +// "dealerShopURL=&dealerAbortURL=&dealerID=123456&birthday=1970-12-31"; + +$arr = Array("koop_id" => $this->get_option('wpsg_mod_targo_koop_id'), + "SessionID" => session_id(), + "amount" => $brutto, + "dealerID" => $this->get_option('wpsg_mod_targo_dealerid'), + "dealerText" => ($this->view['targoLink']), + "documentno" => $this->view['o_id'], + "gender" => $isotitel, + "surname" => toIso($oCustomer->getName()), + "firstname" => toIso($oCustomer->getFirstname()), + "street" => toIso($oOrder->getInvoiceStreetClear(true)), + "streetnumber" => toIso($oOrder->getInvoiceStreetNr()), + "zip" => toIso($oCustomer->getZip()), + "city" => toIso($oCustomer->getCity()), + "telnocode" => '', + "telno" => toIso($oCustomer->getPhone()), + "birthday" => $bd, + "email" => toIso($oCustomer->getEMail()), + "dealerShopURL" => ($this->get_option('wpsg_mod_targo_dealerShopURL')), + "dealerAbortURL" => ($this->get_option('wpsg_mod_targo_dealerAbortURL')) +); + +$param = http_build_query($arr); + + +$hash = hash_hmac( 'sha256', $param, $key); // HMAC-SHA256 + +// Test +//$hash = "85ef6ddce9bbebffa250d6f8183f3f727af5f9fda879b73aa0685eb2d9386e70"; + +?> + +<br /><br /> +<b>Obligatorische Daten für Targobank</b><br /> +<input type="text" id="koop_id" name="koop_id" value="<?php echo $this->get_option('wpsg_mod_targo_koop_id');?>" placeholder="koop_id"><br /> +<input type="text" id="SessionID" name="sessionID" value="<?php echo session_id();?>" placeholder="sessionID"><br /> +<input type="text" id="amount" name="amount" value="<?php echo $brutto;?>" placeholder="amount"><br /> +<input type="text" id="dealerID" name="dealerID" value="<?php echo $this->get_option('wpsg_mod_targo_dealerid');?>" placeholder="dealerID"><br /> +<input type="text" id="dealerText" name="dealerText" value="<?php echo $this->view['targoLink'];?>" placeholder="dealerText"><br /> +<input type="text" id="documentno" name="documentno" value="<?php echo $this->view['o_id'];?>" placeholder="documentno"><br /> + + + + +<b>Adressdaten aus Kundendaten</b><br /> +<input type="text" id="gender" name="gender" value="<?php echo $isotitel;?>" placeholder="titel"><br /> +<input type="text" id="surname" name="surname" value="<?php echo toIso($oCustomer->getName());?>" placeholder="surname"><br /> +<input type="text" id="firstname" name="firstname" value="<?php echo toIso($oCustomer->getFirstname());?>" placeholder="firstname"><br /> +<input type="text" id="street" name="street" value="<?php echo toIso($oOrder->getInvoiceStreetClear(true));?>" placeholder="street"><br /> +<input type="text" id="streetnumber" name="streetnumber" value="<?php echo toIso($oOrder->getInvoiceStreetNr());?>" placeholder="streetnumber"><br /> +<input type="text" id="zip" name="zip" value="<?php echo toIso($oCustomer->getZip());?>" placeholder="zip"><br /> +<input type="text" id="city" name="city" value="<?php echo toIso($oCustomer->getCity());?>" placeholder="city"><br /> +<input type="text" id="telnocode" name="telnocode" value="" placeholder="vorwahl"><br /> +<input type="text" id="telno" name="telno" value="<?php echo toIso($oCustomer->getPhone());?>" placeholder="telno"><br /> +<input type="text" id="birthday" name="birthday" value="<?php echo $bd;?>" placeholder="birthday"><br /> +<input type="text" id="email" name="email" value="<?php echo toIso($oCustomer->getEMail());?>" placeholder="email"><br /> + +<b>Optionale Daten für Targobank</b><br /> +<input type="text" id="dealerShopURL" name="dealerShopURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerShopURL');?>" placeholder="dealerShopURL"><br /> +<input type="text" id="dealerAbortURL" name="dealerAbortURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerAbortURL');?>" placeholder="dealerAbortURL"><br /> +<input type="text" id="hash" name="hash" value="<?php echo $hash;?>" placeholder="hash">(hashkey)<br /> + + +<input type="submit" id="submit" name="submit" value="submit" > + +</div> +</form> + + +<?php if ($this->get_option('wpsg_mod_targo_autostart') == '1') { ?> +<script type="text/javascript">/* <![CDATA[ */ + + jQuery(document).ready(function() { + window.setTimeout(function() { + //location.href = "<?php echo $url;?>"; + jQuery('#submit').trigger("click"); + }, 1000); + } ); + +/* ]]> */</script> <?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_trustedshops/widget_form.phtml b/views/mods/mod_trustedshops/widget_form.phtml index 1688553..8b9ccf5 100644 --- a/views/mods/mod_trustedshops/widget_form.phtml +++ b/views/mods/mod_trustedshops/widget_form.phtml @@ -8,11 +8,11 @@ <label>
<input type="checkbox" value="1" <?php echo (($this->view['wpsg_mod_trustedshops_vote'] == '1')?'checked="checked"':''); ?> name="<?php echo $this->view['widget']->get_field_name('wpsg_mod_trustedshops_vote'); ?>" id="<?php echo $this->view['widget']->get_field_id('wpsg_mod_trustedshops_vote'); ?>" /> <?php echo __('Bewertungen anzeigen', 'wpsg'); ?>
- <a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote"></a><br />
+ <a class="glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote"></a><br />
</label>
<label>
<input type="checkbox" value="1" <?php echo (($this->view['wpsg_mod_trustedshops_badge'] == '1')?'checked="checked"':''); ?> name="<?php echo $this->view['widget']->get_field_name('wpsg_mod_trustedshops_badge'); ?>" id="<?php echo $this->view['widget']->get_field_id('wpsg_mod_trustedshops_badge'); ?>" /> <?php echo __('Badge anzeigen', 'wpsg'); ?>
- <a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_badge" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote"></a><br />
+ <a class="glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_badge" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_trustedshops_vote"></a><br />
</label>
<br />
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml index 2ef1fb2..8d00e48 100644 --- a/views/mods/mod_userpayment/list.phtml +++ b/views/mods/mod_userpayment/list.phtml @@ -64,7 +64,7 @@ zv_id: '<?php echo $zv['id']; ?>'
},
submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode(wpsg_tax_groups()); ?>',
+ data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
type: 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml index 6aeb712..98b80ea 100644 --- a/views/mods/mod_versandarten/list.phtml +++ b/views/mods/mod_versandarten/list.phtml @@ -64,7 +64,7 @@ va_id: '<?php echo $va['id']; ?>'
},
submit : '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode($this->view['arTypen']); ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit($this->view['arTypen']); ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
@@ -77,7 +77,7 @@ va_id: '<?php echo $va['id']; ?>'
},
submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data : '<?php echo json_encode($arVzNamen) ?>',
+ data : <?php echo wpsg_prepare_for_inlineEdit($arVzNamen) ?>,
type : 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
@@ -95,25 +95,13 @@ va_id: '<?php echo $va['id']; ?>'
},
submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '<?php echo json_encode(wpsg_tax_groups()); ?>',
+ data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
type: 'select',
placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
});
- jQuery('#va2_<?php echo $va['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
- submitdata: {
- field: 'mwst_key',
- va_id: '<?php echo $va['id']; ?>'
- },
- submit: '<?php echo __('Speichern', 'wpsg'); ?>',
- data: '{"value":0,"text":"anteilig"},{"value":"a","text":"A"}',
- type: 'select',
- placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
- indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
- tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
- });
jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
@@ -243,21 +231,6 @@ </td>
</tr>
- <tr>
- <td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>
- <td id="va2_<?php echo $va['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php
-
- $tax_groups = wpsg_tax_groups();
- //echo wpsg_hspc($tax_groups[$va['mwst_key']]);
- echo $tax_groups[$va['mwst_key']];
-
- ?></td>
- <td class="wpsg_delcol">
- <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
- </td>
- </tr>
-
-
<?php $this->callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?>
<?php if ($i < sizeof($this->view['data'])) { ?>
diff --git a/views/mods/mod_videodownload/settings_edit.phtml b/views/mods/mod_videodownload/settings_edit.phtml index 2e3e448..2dcd9c8 100644 --- a/views/mods/mod_videodownload/settings_edit.phtml +++ b/views/mods/mod_videodownload/settings_edit.phtml @@ -55,7 +55,7 @@ </div>
<div class="wpsg_form_right">
<p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgeführt', 'wpsg')); ?></p>
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_einstellungen_cron" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_einstellungen_cron"></a>
+ <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_einstellungen_cron"></a>
</div>
<div class="wpsg_clear"></div>
</div>
@@ -127,7 +127,7 @@ </td>
<td>
<label><input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo (($this->view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> /> <?php echo __("Aktiv", "wpsg"); ?></label>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_fieldconfig"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_videodownload_fieldconfig"></a>
</td>
</tr>
<tr>
diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml index 351909e..e4153f6 100644 --- a/views/mods/mod_voucherproduct/settings_edit.phtml +++ b/views/mods/mod_voucherproduct/settings_edit.phtml @@ -33,7 +33,7 @@ <?php } else { ?>
<a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
<?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
<input type="file" name="wpsg_mod_voucherproduct_bp">
</div>
<div class="wpsg_clear"></div>
@@ -46,7 +46,7 @@ </div>
<div class="wpsg_form_right">
<p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a></p>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a></p>
</div>
<div class="wpsg_clear"></div>
</div>
@@ -120,7 +120,7 @@ </td>
<td>
<label><input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['aktiv']))?'checked="checked"':''); ?> /> <?php echo __("Aktiv", "wpsg"); ?></label>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig"></a>
+ <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig"></a>
</td>
</tr>
<tr>
diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml index 76714f0..bc8cf77 100644 --- a/views/mods/mod_wirecard/settings_edit.phtml +++ b/views/mods/mod_wirecard/settings_edit.phtml @@ -26,7 +26,7 @@ <option value="<?php echo $mwst['id']; ?>" <?php echo (($mwst['id'] == $this->get_option('wpsg_mod_wirecard_mwst'))?'selected="selected"':''); ?>><?php echo wpsg_ff($mwst['value']).'%'; ?></option>
<?php } ?>
</select>
- <a href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" class="wpsg_form_help"></a>
+ <a href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" class="glyphicon glyphicon-question-sign"></a>
</div>
<div class="wpsg_clear"></div>
</div>
|