From 2d8f1b8de0310d2fe6db6a6e7448e099f9a8a901 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Mon, 20 Jun 2016 11:51:37 +0000
Subject: - Länderverwaltung
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5562 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/emailconf.phtml      |   4 +-
 views/admin/form/emailconf.phtml |  50 +++++----
 views/admin/laender.phtml        | 213 +++++++++++++++++++++++++++++----------
 views/admin/laender_edit.phtml   |  34 ++-----
 4 files changed, 204 insertions(+), 97 deletions(-)

(limited to 'views/admin')

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index 918444f..4e2d9e7 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -18,7 +18,7 @@
 
 
 <div class="wpsg_admin_content form-horizontal">
-	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=extended&noheader=1'); ?>">
+	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf&noheader=1'); ?>">
 	
 		<?php echo wpsg_drawForm_AdminboxStart('Allgemeine Einstellungen', 'wpsg'); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_htmlmail', __('HTML Mails versenden', 'wpsg'), $this->get_option('wpsg_htmlmail')); ?>
@@ -84,7 +84,7 @@
 			
 			wpsg_mail_save_cookie();
 			
-		} ).disableSelection().next().hide();
+		} ).css( { 'cursor': 'pointer' } ).disableSelection().next().hide();
 
 		if (jQuery.cookie('wpsg_mail') != null)
 		{
diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml
index 9ec6b63..6c13bfa 100644
--- a/views/admin/form/emailconf.phtml
+++ b/views/admin/form/emailconf.phtml
@@ -5,7 +5,7 @@
 	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_absender', __('Absender', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_absender')); ?>
 
 	<?php if ($this->view['field_to'] === true) { ?>
-	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_empfaenger', __('Empfänger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$key.'_empfaenger')); ?>
+	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_empfaenger', __('Empfänger', 'wpsg'), $GLOBALS['wpsg_sc']->get_option('wpsg_'.$this->view['field_key'].'_empfaenger')); ?>
 	<?php } ?>
 	
 	<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_cc', __('CC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_cc')); ?>
@@ -21,24 +21,40 @@
 		</div>
 		<br />
 		
-	<?php } ?>	
-	
-	<?php 
-	
-	// RTE
-	ob_start();
-	wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');
-	$rte_content = ob_get_contents();
-	ob_end_clean();
+	<?php } ?>
 
-	?>
-	
-	<div class="wpsg_form_field">
-		<div class="wpsg_form_left"><label><?php echo __('Text unter der E-Mail', 'wpsg'); ?></label></div>
-		<div class="wpsg_form_right"></div><div class="wpsg_clear"></div>
-	</div>
+	<div class="modal fade" tabindex="-1" role="dialog" id="modal<?php echo $this->view['field_key']; ?>">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title"><?php echo __('Text im Footer der Mail bearbeiten', 'wpsg'); ?></h4>
+				</div>
+				<div class="modal-body">
+
+					<?php
+
+						// RTE
+						ob_start();
+						wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');
+						$rte_content = ob_get_contents();
+						ob_end_clean();
+
+						echo $rte_content;
+
+					?>
+
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button>
+				</div>
+			</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
 
-	<?php echo $rte_content; ?>
+	<?php echo wpsg_drawForm_TextStart(); ?>
+	<a href="#" data-toggle="modal" data-target="#modal<?php echo $this->view['field_key']; ?>"><?php echo __('Text anzeigen/bearbeiten', 'wpsg'); ?></a>
+	<?php echo wpsg_drawForm_TextEnd(__('Text unter der E-Mail', 'wpsg')); ?>
 
 	<?php if (wpsg_isSizedString($notice)) { ?>
 
diff --git a/views/admin/laender.phtml b/views/admin/laender.phtml
index ee7fbb0..41c5fdd 100644
--- a/views/admin/laender.phtml
+++ b/views/admin/laender.phtml
@@ -16,68 +16,171 @@
 			
 </div>
 
+<div class="modal fade" id="Modal_wpsg_country_edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title" id="myModalLabel"><?php echo __('Land anlegen/bearbeiten', 'wpsg'); ?></h4>
+			</div>
+			<div class="modal-body">
+
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" onclick="return wpsg_country_save();" data-dismiss="modal"><?php echo __('Speichern und schließen', 'wpsg'); ?></button>
+			</div>
+		</div>
+	</div>
+</div>
+
 <div class="wpsg_admin_content">
 
-	<?php echo wpsg_drawForm_AdminboxStart(__('Länderverwaltung', 'wpsg')); ?>
-	
-	<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
-	<table class="table wpsg_table_country">
-	
-		<tr>
-			<th class="col_name"><?php echo __('Ländername', 'wpsg'); ?></th>
-			<th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>
-			<th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>
-			<th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>
-			<th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>
-			<th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>
-			<th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>
-			<th class="col_action"></th>
-		</tr>
-		
-		<?php foreach ($this->view['data'] as $l) { ?>
-		<tr id="<?php echo $l['id']; ?>">
-			<td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
-			<td class="col_vz">
-				<?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>
-				<?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>
-				<?php } ?>
-			</td>
-			<td class="col_mwstsetting">
-				<?php if ($l['mwst'] == '2') { ?>
-				<?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>
-				<?php } else if ($l['mwst'] == '1') { ?>
-				<?php echo __('keine MwSt.', 'wpsg'); ?>
-				<?php } else { ?>
-				<?php echo __('mit MwSt.', 'wpsg'); ?>
+	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender&noheader=1'); ?>">
+
+		<?php echo wpsg_drawForm_AdminboxStart(__('Länderverwaltung', 'wpsg')); ?>
+
+		<div id="wpsg_country_list">
+
+			<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
+			<table class="table wpsg_table_country">
+
+				<tr>
+					<th class="col_check"><input type="checkbox" onclick="return wpsg_country_check_all();" style="margin-top:-2px;" /></th>
+					<th class="col_name"><?php echo __('Ländername', 'wpsg'); ?></th>
+					<th class="col_vz"><?php echo __('Versandzone', 'wpsg'); ?></th>
+					<th class="col_mwstsetting"><?php echo __('MwSt.', 'wpsg'); ?></th>
+					<th class="col_mwst"><?php echo __('MwSt. A', 'wpsg'); ?></th>
+					<th class="col_mwst"><?php echo __('MwSt. B', 'wpsg'); ?></th>
+					<th class="col_mwst"><?php echo __('MwSt. C', 'wpsg'); ?></th>
+					<th class="col_mwst"><?php echo __('MwSt. D', 'wpsg'); ?></th>
+					<th class="col_action"></th>
+				</tr>
+
+				<?php foreach ($this->view['data'] as $l) { ?>
+				<tr id="<?php echo $l['id']; ?>">
+					<td class="col_check"><input type="checkbox" value="1" name="arDelete[<?php echo $l['id']; ?>]" /></td>
+					<td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
+					<td class="col_vz">
+						<?php if (wpsg_isSizedInt($l['vz']) && wpsg_isSizedString($this->view['vz'][$l['vz']])) { ?>
+						<?php echo wpsg_hspc($this->view['vz'][$l['vz']]); ?>
+						<?php } ?>
+					</td>
+					<td class="col_mwstsetting">
+						<?php if ($l['mwst'] == '2') { ?>
+						<?php echo __('keine MwSt. bei USt.IdNr.', 'wpsg'); ?>
+						<?php } else if ($l['mwst'] == '1') { ?>
+						<?php echo __('keine MwSt.', 'wpsg'); ?>
+						<?php } else { ?>
+						<?php echo __('mit MwSt.', 'wpsg'); ?>
+						<?php } ?>
+					</td>
+					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>
+						<?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>
+					<?php } ?></td>
+					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>
+						<?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>
+					<?php } ?></td>
+					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>
+						<?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>
+					<?php } ?></td>
+					<td class="col_mwst"><?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>
+						<?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>
+					<?php } ?></td>
+					<td class="col_action">
+
+						<a href="#" onclick="return wpsg_country_edit('<?php echo $l['id']; ?>');" class="glyphicon glyphicon-pencil"></a>
+						<a href="#" class="glyphicon glyphicon-trash"></a>
+
+					</td>
+				</tr>
 				<?php } ?>
-			</td>
-			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_a']) != NULL) { ?>
-				<?php echo wpsg_ff(wpsg_tf($l['mwst_a']), '%'); ?>
-			<?php } ?></td>
-			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_b']) != NULL) { ?>
-				<?php echo wpsg_ff(wpsg_tf($l['mwst_b']), '%'); ?>
-			<?php } ?></td>
-			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_c']) != NULL) { ?>
-				<?php echo wpsg_ff(wpsg_tf($l['mwst_c']), '%'); ?>
-			<?php } ?></td>
-			<td class="col_mwst"><?php if (wpsg_tf($l['mwst_d']) != NULL) { ?>
-				<?php echo wpsg_ff(wpsg_tf($l['mwst_d']), '%'); ?>
-			<?php } ?></td>
-			<td class="col_action"></td>
-		</tr>
-		<?php } ?>
-	
-	</table>
-	<?php } else { ?>
-	<p><?php echo __('Noch keine Länder angelegt.', 'wpsg'); ?>
-	<?php } ?>
-	
-	<br /><br />
-	
+
+				<tr>
+
+					<td class="col_check"><span class="glyphicon glyphicon-trash"></span></td>
+					<td colspan="8">
+
+						<input type="submit" name="submit" onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button btn-xs" value="<?php echo __('Markierte Länder löschen', 'wpsg'); ?>" />
+
+					</td>
+
+				</tr>
+
+			</table>
+			<?php } else { ?>
+			<p><?php echo __('Noch keine Länder angelegt.', 'wpsg'); ?></p>
+			<?php } ?>
+
+		</div>
+
+		<br />
+
+	</form>
+
+	<a href="#" onclick="return wpsg_country_add();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Land anlegen.', 'wpsg'); ?></a><br /><br />
 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Versandzonenverwaltung', 'wpsg'); ?></a>
 	
 	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
+	<script type="text/javascript">/* <![CDATA[ */
+
+	    function wpsg_country_check_all() { jQuery('td.col_check input').each(function() { jQuery(this).prop('checked', !jQuery(this).prop('checked')); } ); }
+
+		function wpsg_country_add()
+		{
+
+			jQuery('#Modal_wpsg_country_edit .modal-body').html('<img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" />');
+			jQuery('#Modal_wpsg_country_edit').modal('show');
+
+			jQuery.ajax( {
+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=add&noheader=1',				
+				success: function(data) { jQuery('#Modal_wpsg_country_edit .modal-body').html(data); }
+			} );
+			
+			return false;
+
+		} // function wpsg_country_add()
+
+		function wpsg_country_save()
+		{
+
+			jQuery('#wpsg_country_list').html('<img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" />');
+
+			jQuery.ajax( {
+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=save&noheader=1',
+				data: {
+					form_data: jQuery('#wpsg_land_edit_form_edit').serialize()
+				},
+				success: function(data) {
+
+					jQuery('#wpsg_country_list').html(data);
+
+				}
+			} );
+
+		} // function wpsg_country_save()
+
+		function wpsg_country_edit(land_id)
+		{
+
+			jQuery('#Modal_wpsg_country_edit .modal-body').html('<img src="<?php echo $this->getRessourceURL('gfx/ajax-loader.gif'); ?>" alt="" />');
+			jQuery('#Modal_wpsg_country_edit').modal('show');
+
+			jQuery.ajax( {
+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=edit&noheader=1&land_id' + land_id,
+				success: function(data) { jQuery('#Modal_wpsg_country_edit .modal-body').html(data); }
+			} );
+
+			return false;
+
+		} // function wpsg_country_edit(edit_id)
+
+	/* ]]> */</script>
+
+
+
+
+
 	<div class="wpsg_admin_box">	
 		
 		<h3>
diff --git a/views/admin/laender_edit.phtml b/views/admin/laender_edit.phtml
index 421ed79..8886851 100644
--- a/views/admin/laender_edit.phtml
+++ b/views/admin/laender_edit.phtml
@@ -1,29 +1,17 @@
-<form method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=saveNew&noheader=1" id="<?php echo ((wpsg_isSizedInt($this->view['land']['id']))?'wpsg_land_edit_form_edit':'wpsg_land_edit_form_new'); ?>">
+<form id="wpsg_land_edit_form_edit" class="form-horizontal">
 
-	<?php if (wpsg_isSizedInt($this->view['land']['id'])) $prefix = 'land'; else $prefix = 'newland'; ?>
-
-	<?php echo wpsg_drawForm_Input($prefix.'[name]', __('Ländername', 'wpsg'), wpsg_getStr($this->view['land']['name']), array('help' => 'wpsg_land_name')); ?>
-	<?php echo wpsg_drawForm_Input($prefix.'[kuerzel]', __('Kürzel', 'wpsg'), wpsg_getStr($this->view['land']['kuerzel']), array('help' => 'wpsg_land_kuerzel')); ?>
-	<?php echo wpsg_drawForm_Select($prefix.'[vz]', __('Versandzone', 'wpsg'), $this->view['vz'], wpsg_getStr($this->view['land']['vz']), array('help' => 'wpsg_land_vz')); ?>
-	<?php echo wpsg_drawForm_Select($prefix.'[mwst]', __('MwSt. Grundlage', 'wpsg'), array(
+	<?php echo wpsg_drawForm_Input('country[name]', __('Ländername', 'wpsg'), wpsg_getStr($this->view['land']['name']), array('help' => 'wpsg_land_name')); ?>
+	<?php echo wpsg_drawForm_Input('country[kuerzel]', __('Kürzel', 'wpsg'), wpsg_getStr($this->view['land']['kuerzel']), array('help' => 'wpsg_land_kuerzel')); ?>
+	<?php echo wpsg_drawForm_Select('country[vz]', __('Versandzone', 'wpsg'), $this->view['vz'], wpsg_getStr($this->view['land']['vz']), array('help' => 'wpsg_land_vz')); ?>
+	<?php echo wpsg_drawForm_Select('country[mwst]', __('MwSt. Grundlage', 'wpsg'), array(
 		'0' => __('mit MwSt.', 'wpsg'),
 		'1' => __('keine MwSt.', 'wpsg'),
 		'2' => __('keine MwSt. bei USt.IdNr.', 'wpsg')
 	), wpsg_getStr($this->view['land']['mwst']), array('help' => 'wpsg_land_mwst')); ?>
-	<?php echo wpsg_drawForm_Input($prefix.'[mwst_a]', __('MwSt. Satz A (stark ermäßigter Satz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_a']), array('help' => 'wpsg_land_mwst_a')); ?>
-	<?php echo wpsg_drawForm_Input($prefix.'[mwst_b]', __('MwSt. Satz B (ermäßigter Satz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_b']), array('help' => 'wpsg_land_mwst_b')); ?>
-	<?php echo wpsg_drawForm_Input($prefix.'[mwst_c]', __('MwSt. Satz C (Normalsatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_c']), array('help' => 'wpsg_land_mwst_c')); ?>
-	<?php echo wpsg_drawForm_Input($prefix.'[mwst_d]', __('MwSt. Satz D (Zwischensatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_d']), array('help' => 'wpsg_land_mwst_d')); ?>
-	<?php echo wpsg_drawForm_Checkbox($prefix.'[standard]', __('Standardland', 'wpsg'), wpsg_getStr($this->view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?>
-	
-	<?php if (wpsg_isSizedInt($this->view['land']['id'])) { ?>
-	<input type="hidden" name="<?php echo $prefix; ?>[id]" value="<?php echo wpsg_hspc($this->view['land']['id']); ?>" />
-	<?php } ?>
-	
-	<br />
-	
-	<input class="button" type="submit" onclick="return <?php echo ((wpsg_isSizedInt($this->view['land']['id']))?'wpsg_laender_save();':''); ?>" value="<?php echo __('Speichern', 'wpsg'); ?>" />
-		
-	<br /><br ><hr />
-	
+	<?php echo wpsg_drawForm_Input('country[mwst_a]', __('MwSt. Satz A (stark ermäßigter Satz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_a']), array('help' => 'wpsg_land_mwst_a')); ?>
+	<?php echo wpsg_drawForm_Input('country[mwst_b]', __('MwSt. Satz B (ermäßigter Satz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_b']), array('help' => 'wpsg_land_mwst_b')); ?>
+	<?php echo wpsg_drawForm_Input('country[mwst_c]', __('MwSt. Satz C (Normalsatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_c']), array('help' => 'wpsg_land_mwst_c')); ?>
+	<?php echo wpsg_drawForm_Input('country[mwst_d]', __('MwSt. Satz D (Zwischensatz)', 'wpsg'), wpsg_getStr($this->view['land']['mwst_d']), array('help' => 'wpsg_land_mwst_d')); ?>
+	<?php echo wpsg_drawForm_Checkbox('country[standard]', __('Standardland', 'wpsg'), wpsg_getStr($this->view['land']['standard']), array('disabled' => ((isset($this->view['land']['standard']) && $this->view['land']['standard'] == '1')?true:false), 'help' => 'wpsg_land_standard')); ?>
+
 </form>
\ No newline at end of file
-- 
cgit v1.2.3