- Sicherung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5266 0d5edaf7-2b12-4e95-93f4-047927463d4b

6 files changed, 41 insertions, 25 deletions

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
new file mode 100644
index 0000000..9c08291
--- /dev/null
+++ b/views/admin/form/checkbox.phtml
@@ -0,0 +1,18 @@
+<div class="form-group">

+

+	<div class="col-sm-offset-6 col-sm-6">

+		

+		<div class="checkbox">

+			<label>

+			

+				<input type="hidden" name="<?php echo $this->view['field_name']; ?>" value="0" />

+				<input type="checkbox" name="<?php echo $this->view['field_name']; ?>" value="1" <?php echo (($this->view['field_checked'] > 0)?'checked="checked"':''); ?> />

+				

+				<?php echo $this->view['field_label']; ?>

+				

+			</label>

+		</div>

+		

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index a2abe45..c1213d2 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -3,7 +3,7 @@
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>

 	

 	<div class="col-sm-6">

-		<input type="text" class="form-control" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />

+		<input type="text" class="form-control" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />

 	</div>

 	

 </div>
\ No newline at end of file
diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
new file mode 100644
index 0000000..70e040c
--- /dev/null
+++ b/views/admin/form/select.phtml
@@ -0,0 +1,15 @@
+<div class="form-group">

+

+	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>

+	

+	<div class="col-sm-6">

+		

+		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>">

+			<?php foreach ($this->view['field_values'] as $k => $v) { ?>

+			<option <?php echo (($k == $this->view['field_value'])?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($k); ?>"><?php echo wpsg_hspc($v); ?></option>

+			<?php } ?>

+		</select>

+	

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index 2000e28..5633453 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -9,7 +9,7 @@
 

 <div class="wpsg_admin" id="wpsg-bs">

 

-	<nav class="navbar navbar-default navbar-admin">

+	<nav class="navbar navbar-default navbar-admin navbar-fixed-top">

 		<div class="container-fluid">

 			<div class="navbar-header">

 				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>

diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml
index bb9579f..e65a944 100644
--- a/views/admin/konfiguration.phtml
+++ b/views/admin/konfiguration.phtml
@@ -94,32 +94,13 @@
 		<?php } ?>

 		<br />

 		

-		<div class="wpsg_form_field">

-			<div class="wpsg_form_left">

-				<?php echo __("Währung", "wpsg"); ?>:

-			</div>

-			<div class="wpsg_form_right">

-				<input type="text" value="<?php echo wpsg_hspc($this->get_option('wpsg_currency')); ?>" name="wpsg_currency" />

-				<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=Einstellungen_Allgemein_Waehrung" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=Einstellungen_Allgemein_Waehrung" class="wpsg_form_help"></a>				

-			</div>

-			<div class="wpsg_clear"></div>

-		</div>	

-

+		<?php echo wpsg_drawForm_Input('wpsg_currency', __('Währung', 'wpsg'), $this->get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?>

+		

 		<?php if (wpsg_isSizedArray($this->view['arLanguages'])) { ?>

 		<?php echo wpsg_drawForm_Select('wpsg_backend_language', __('Standardsprache (Backend)', 'wpsg'), $this->view['arLanguages'], $this->get_option('wpsg_backend_language'), array('help' => 'Einstellungen_Allgemein_Standardsprachebackend')); ?>

 		<?php } ?>

 					

-		<div class="wpsg_form_field">

-			<div class="wpsg_form_left">

-				<?php echo __('Produkte pro Seite', 'wpsg'); ?>:				

-			</div>

-			<div class="wpsg_form_right">

-				<input type="text" value="<?php echo wpsg_hspc($this->get_option('wpsg_produkte_perpage')); ?>" name="wpsg_produkte_perpage" />

-				<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=ProduktePerPage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=ProduktePerPage" class="wpsg_form_help"></a>				

-			</div>

-			<div class="wpsg_clear"></div>

-		</div>

-		

+		<?php echo wpsg_drawForm_Input('wpsg_produkte_perpage', __('Produkte pro Seite', 'wpsg'), $this->get_option('wpsg_produkte_perpage'), array('help' => 'ProduktePerPage')); ?>

 		<?php echo wpsg_drawForm_Input('wpsg_order_perpage', __('Bestellungen pro Seite', 'wpsg'), $this->get_option('wpsg_order_perpage')); ?>

 		<?php echo wpsg_drawForm_Checkbox('wpsg_showincompleteorder', __('Unvollständige Best. in Bestellverwaltung anzeigen', 'wpsg'), $this->get_option('wpsg_showincompleteorder')); ?>

 		<?php echo wpsg_drawForm_Checkbox('wpsg_emptyorder_clear', wpsg_translate(__('Bestellungen für 0 #1# direkt abschließen', 'wpsg'), $this->get_option('wpsg_currency')), $this->get_option('wpsg_emptyorder_clear')); ?>

diff --git a/views/css/admin.css b/views/css/admin.css
index 6a68f0c..9ab33ce 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -244,8 +244,10 @@ table.wpsg_admin_laender_list tr.even td {}
 .wpsg_admin_vz_list .col_aktion .wpsg_icon_remove { float:right; }

 .wpsg_admin_vz_list .col_aktion { width:75px; }

 .wpsg_admin_vz_list .col_innereu { text-align:center; width:75px; }

-.navbar-admin { margin-top:-5px; margin-bottom:20px; }

+.navbar-admin { left:180px; top:32px; margin-top:-5px; margin-bottom:20px; margin-left:-25px; }

+.navbar-admin .navbar-brand { padding-left:-10px; text-align:center; width:240px; }

 .navbar-nav li { margin-bottom:0px; }

+.wpsg_admin { padding-top:75px; }

 .wpsg_admin_submenu .list-group-item { padding-top:3px; padding-bottom:3px; }

 .wpsg_admin_submenu .list-group-head { background-color:#E1E1E1 !important; padding-top:10px; padding-bottom:10px; } 

 .wpsg_admin_content { margin-left:15px; }