Index: /views/admin/form/input.phtml =================================================================== --- /views/admin/form/input.phtml (revision 5398) +++ /views/admin/form/input.phtml (revision 5401) @@ -1,3 +1,3 @@ -
+
@@ -7,4 +7,6 @@
+ +
Index: /views/admin/konfiguration.phtml =================================================================== --- /views/admin/konfiguration.phtml (revision 5398) +++ /views/admin/konfiguration.phtml (revision 5401) @@ -20,100 +20,107 @@
- hasMod('wpsg_mod_core')) { ?> - - arLizenz['l'] == 0) { ?> -
-
- : +
+
+

+
+
+ hasMod('wpsg_mod_core')) { ?> + + arLizenz['l'] == 0) { ?> +
+
+ : +
+
+ getDemoDays() < 0) { ?> +

getDemoDays())); ?>

+ +

getDemoDays()); ?>

+ + +
+
+
+ + + arLizenz['l']) + { + + case '1': $strText = __('Light Version', 'wpsg'); break; + case '2': $strText = __('Pro Version', 'wpsg'); break; + case '3': $strText = __('Enterprise Version', 'wpsg'); break; + default: die(); + + } + + echo wpsg_drawForm_Text(__('Lizenzstatus', 'wpsg'), $strText); + + ?> + + +
+
 
+
+ Weitere Funktionen in der Vollversion.
[ Vollversion kaufen ] [ Weitere Infos ]', 'wpsg'), + 'http://shop.maennchen1.de/produkte/wpshopgermany-lizenzkey/', + 'http://wpshopgermany.de/' + ); ?> +
+
+
+ + + get_option("wpsg_version_installed", true) != WPSG_VERSION) { ?> +
+
+ : +
+
+

Bitte klicken Sie auf ", "wpsg").''.__("Aktualisieren", "wpsg").' ('.__("Produkte etc. werden dabei nicht gelöscht.", "wpsg"); ?>)

+ +
+
-
- getDemoDays() < 0) { ?> -

getDemoDays())); ?>

- -

getDemoDays()); ?>

- - -
-
-
- - - arLizenz['l']) - { - - case '1': $strText = __('Light Version', 'wpsg'); break; - case '2': $strText = __('Pro Version', 'wpsg'); break; - case '3': $strText = __('Enterprise Version', 'wpsg'); break; - default: die(); - - } + + +   + + + - echo wpsg_drawForm_Text(__('Lizenzstatus', 'wpsg'), $strText); - - ?> - - -
-
 
-
- Weitere Funktionen in der Vollversion.
[ Vollversion kaufen ] [ Weitere Infos ]', 'wpsg'), - 'http://shop.maennchen1.de/produkte/wpshopgermany-lizenzkey/', - 'http://wpshopgermany.de/' - ); ?> + get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?> + + view['arLanguages'])) { ?> + view['arLanguages'], $this->get_option('wpsg_backend_language'), array('help' => 'Einstellungen_Allgemein_Standardsprachebackend')); ?> + + + get_option('wpsg_produkte_perpage'), array('help' => 'ProduktePerPage')); ?> + get_option('wpsg_order_perpage')); ?> + get_option('wpsg_showincompleteorder')); ?> + get_option('wpsg_currency')), $this->get_option('wpsg_emptyorder_clear')); ?> + __('Auf Seite bleiben', 'wpsg'), + '1' => __('Zum Warenkorb leiten', 'wpsg'), + '2' => __('Warenkorb im Fenster anzeigen', 'wpsg'), + '3' => __('Lightbox Meldung', 'wpsg') + ), $this->get_option('wpsg_afterinsert')); ?> + get_option('wpsg_skip_checkout2')); ?> + __('In Session belassen', 'wpsg'), + '1' => __('Löschen', 'wpsg') + ), $this->get_option('wpsg_afterorder')); ?> + get_option('wpsg_format_knr'), array('help' => 'Formatierung_Kundennummer')); ?> + __('Numerisch', 'wpsg'), '1' => __('Alphabetisch', 'wpsg')), $this->get_option('wpsg_order_knr')); ?> + get_option('wpsg_customer_start')); ?> + get_option('wpsg_format_onr'), array('help' => 'Formatierung_Bestellnummer')); ?> + get_option('wpsg_order_start')); ?>
-
-
- - - get_option("wpsg_version_installed", true) != WPSG_VERSION) { ?> -
-
- : -
-
-

Bitte klicken Sie auf ", "wpsg").''.__("Aktualisieren", "wpsg").' ('.__("Produkte etc. werden dabei nicht gelöscht.", "wpsg"); ?>)

- -
-
-
- - -   - - - - - get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?> - - view['arLanguages'])) { ?> - view['arLanguages'], $this->get_option('wpsg_backend_language'), array('help' => 'Einstellungen_Allgemein_Standardsprachebackend')); ?> - - - get_option('wpsg_produkte_perpage'), array('help' => 'ProduktePerPage')); ?> - get_option('wpsg_order_perpage')); ?> - get_option('wpsg_showincompleteorder')); ?> - get_option('wpsg_currency')), $this->get_option('wpsg_emptyorder_clear')); ?> - __('Auf Seite bleiben', 'wpsg'), - '1' => __('Zum Warenkorb leiten', 'wpsg'), - '2' => __('Warenkorb im Fenster anzeigen', 'wpsg'), - '3' => __('Lightbox Meldung', 'wpsg') - ), $this->get_option('wpsg_afterinsert')); ?> - get_option('wpsg_skip_checkout2')); ?> - __('In Session belassen', 'wpsg'), - '1' => __('Löschen', 'wpsg') - ), $this->get_option('wpsg_afterorder')); ?> - get_option('wpsg_format_knr'), array('help' => 'Formatierung_Kundennummer')); ?> - __('Numerisch', 'wpsg'), '1' => __('Alphabetisch', 'wpsg')), $this->get_option('wpsg_order_knr')); ?> - get_option('wpsg_customer_start')); ?> - get_option('wpsg_format_onr'), array('help' => 'Formatierung_Bestellnummer')); ?> - get_option('wpsg_order_start')); ?> - - + /* ]]> */ Index: /views/admin/shopdata.phtml =================================================================== --- /views/admin/shopdata.phtml (revision 5398) +++ /views/admin/shopdata.phtml (revision 5401) @@ -5,56 +5,74 @@ */ -?> +?> +
- -
-
-
+ +
+ + view['arSubAction'] as $k => $v) { ?> + +
- -
    - view['arSubAction'] as $k => $v) { ?> -
    • - -
-
+
- get_option('wpsg_shopdata_name'), array('help' => 'wpsg_shopdata_name')); ?> - get_option('wpsg_shopdata_owner'), array('help' => 'wpsg_shopdata_owner')); ?> - get_option('wpsg_shopdata_tel'), array('help' => 'wpsg_shopdata_tel')); ?> - get_option('wpsg_shopdata_fax'), array('help' => 'wpsg_shopdata_fax')); ?> - get_option('wpsg_shopdata_email'), array('help' => 'wpsg_shopdata_email')); ?> - get_option('wpsg_shopdata_taxnr'), array('help' => 'wpsg_shopdata_taxnr')); ?> - get_option('wpsg_shopdata_ustidnr'), array('help' => 'wpsg_shopdata_ustidnr')); ?> +
+
+

+
+
+ get_option('wpsg_shopdata_name'), array('help' => 'wpsg_shopdata_name')); ?> + get_option('wpsg_shopdata_owner'), array('help' => 'wpsg_shopdata_owner')); ?> + get_option('wpsg_shopdata_tel'), array('help' => 'wpsg_shopdata_tel')); ?> + get_option('wpsg_shopdata_fax'), array('help' => 'wpsg_shopdata_fax')); ?> + get_option('wpsg_shopdata_email'), array('help' => 'wpsg_shopdata_email')); ?> + get_option('wpsg_shopdata_taxnr'), array('help' => 'wpsg_shopdata_taxnr')); ?> + get_option('wpsg_shopdata_ustidnr'), array('help' => 'wpsg_shopdata_ustidnr')); ?> +
+
-

+
+
+

+
+
- get_option('wpsg_shopdata_street'), array('help' => 'wpsg_shopdata_street')); ?> - get_option('wpsg_shopdata_zip'), array('help' => 'wpsg_shopdata_zip')); ?> - get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?> + get_option('wpsg_shopdata_street'), array('help' => 'wpsg_shopdata_street')); ?> + get_option('wpsg_shopdata_zip'), array('help' => 'wpsg_shopdata_zip')); ?> + get_option('wpsg_shopdata_city'), array('help' => 'wpsg_shopdata_city')); ?> + +
+
-

+
+
+

+
+
- get_option('wpsg_shopdata_bank_name'), array('help' => 'wpsg_shopdata_bank_name')); ?> - get_option('wpsg_shopdata_bank_owner'), array('help' => 'wpsg_shopdata_bank_owner')); ?> - get_option('wpsg_shopdata_bank_iban'), array('help' => 'wpsg_shopdata_bank_iban')); ?> - get_option('wpsg_shopdata_bank_bic'), array('help' => 'wpsg_shopdata_bank_bic')); ?> + get_option('wpsg_shopdata_bank_name'), array('help' => 'wpsg_shopdata_bank_name')); ?> + get_option('wpsg_shopdata_bank_owner'), array('help' => 'wpsg_shopdata_bank_owner')); ?> + get_option('wpsg_shopdata_bank_iban'), array('help' => 'wpsg_shopdata_bank_iban')); ?> + get_option('wpsg_shopdata_bank_bic'), array('help' => 'wpsg_shopdata_bank_bic')); ?> + +
+

+ +
- - Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5398) +++ /views/css/admin.css (revision 5401) @@ -14,4 +14,6 @@ #wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; } #wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; } +#wpsg-bs .has-feedback label ~ .form-control-feedback { top:-1px; } +#wpsg-bs .has-feedback input[type="text"] { margin-right:20px; } /* Bootstrap Formulare im alten Teil */ @@ -44,4 +46,5 @@ .wpsg_admin_content { padding-left:20px; width:800px; float:left; } .wpsg_admin_content h3 { margin-top:0px; margin-bottom:25px; } +.wpsg_admin_content h3.panel-title { margin-bottom:0px; } .wpsg_admin_submenu .list-group-item { padding:5px 10px; } .wpsg_admin .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; }