diff --git a/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl b/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl
new file mode 100644
index 0000000..a1e3579
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/documents/index.tpl
@@ -0,0 +1,365 @@
+
+
+
+
+ {$Containers.Logo.value}
+
+
+
+ {block name="document_index_head_bottom_wrapper"}
+
+ {block name="document_index_head_bottom"}
+
{s name="DocumentIndexInvoiceNumber"}Rechnung Nr. {$Document.id}{/s}
+ {s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
+ {/block}
+
+ {/block}
+
+
+ {block name="document_index_table_header"}
+
+
+
+ {block name="document_index_table_head_pos"}
+
+ {s name="DocumentIndexHeadPosition"}{/s}
+
+ {/block}
+ {block name="document_index_table_head_nr"}
+
+ {s name="DocumentIndexHeadArticleID"}{/s}
+
+ {/block}
+ {block name="document_index_table_head_name"}
+
+ {s name="DocumentIndexHeadName"}{/s}
+
+ {/block}
+ {block name="document_index_table_head_quantity"}
+
+ {s name="DocumentIndexHeadQuantity"}{/s}
+
+ {/block}
+ {block name="document_index_table_head_tax"}
+ {if $Document.netto != true}
+
+ {s name="DocumentIndexHeadTax"}{/s}
+
+ {/if}
+ {/block}
+ {block name="document_index_table_head_price"}
+ {if $Document.netto != true && $Document.nettoPositions != true}
+
+ {s name="DocumentIndexHeadPrice"}{/s}
+
+
+ {s name="DocumentIndexHeadAmount"}{/s}
+
+ {else}
+
+ {s name="DocumentIndexHeadNet"}{/s}
+
+
+ {s name="DocumentIndexHeadNetAmount"}{/s}
+
+ {/if}
+ {/block}
+
+ {/block}
+ {foreach from=$positions item=position key=number}
+ {block name="document_index_table_each"}
+
+ {block name="document_index_table_pos"}
+
+ {$number+1}
+
+ {/block}
+ {block name="document_index_table_nr"}
+
+ {$position.articleordernumber|truncate:14:""}
+
+ {/block}
+ {block name="document_index_table_name"}
+
+ {if $position.name == 'Versandkosten'}
+ {s name="DocumentIndexPositionNameShippingCosts"}{$position.name}{/s}
+ {else}
+ {s name="DocumentIndexPositionNameDefault"}{$position.name|nl2br|wordwrap:65:"
+ {/block}
+ {block name="document_index_table_quantity"}
+
+ {$position.quantity}
+
+ {/block}
+ {block name="document_index_table_tax"}
+ {if $Document.netto != true}
+
+ {$position.tax} %
+
+ {/if}
+ {/block}
+ {block name="document_index_table_price"}
+ {if $Document.netto != true && $Document.nettoPositions != true}
+
+ {$position.price|currency}
+
+
+ {$position.amount|currency}
+
+ {else}
+
+ {$position.netto|currency}
+
+
+ {$position.amount_netto|currency}
+
+ {/if}
+ {/block}
+
+ {/block}
+ {/foreach}
+
+
+
+
+
+
+ {s name="DocumentIndexTotalNet"}{/s}
+ {$Order._amountNetto|currency}
+
+ {if $Document.netto == false}
+ {foreach from=$Order._tax key=key item=tax}
+
+ {s name="DocumentIndexTax"}zzgl. {$key|tax}{/s}
+ {$tax|currency}
+
+ {/foreach}
+ {/if}
+ {if $Document.netto == false}
+
+ {s name="DocumentIndexTotal"}{/s} {$Order._amount|currency}
+ {else}
+
+ {s name="DocumentIndexTotal"}{/s} {$Order._amountNetto|currency}
+ {/if}
+
+
+
+ {block name="document_index_info_comment"}
+ {if $Document.comment}
+
+ {$Document.comment|replace:"€":"€"}
+
+ {/if}
+ {/block}
+ {block name="document_index_info_net"}
+ {if $Document.netto == true}
+
{s name="DocumentIndexAdviceNet"}{/s}
+ {/if}
+
{s name="DocumentIndexSelectedPayment"}{/s} {$Order._payment.description}
+ {/block}
+ {block name="document_index_info_voucher"}
+ {if $Document.voucher}
+
+ {s name="DocumentIndexVoucher"}
+ Für den nächsten Einkauf schenken wir Ihnen einen {$Document.voucher.value} {$Document.voucher.prefix} Gutschein
+ mit dem Code "{$Document.voucher.code}".
+ {/if}
+ {/block}
+ {block name="document_index_info_ordercomment"}
+ {if $Order._order.customercomment}
+
+ {s name="DocumentIndexComment"}{/s}
+ {$Order._order.customercomment|replace:"€":"€"}
+
+ {/if}
+ {/block}
+ {block name="document_index_info_dispatch"}
+ {if $Order._dispatch.name}
+
+ {s name="DocumentIndexSelectedDispatch"}{/s}
+ {$Order._dispatch.name}
+
+ {/if}
+ {/block}
+
+ {$Containers.Content_Info.value}
+ {block name="document_index_info_currency"}
+ {if $Order._currency.factor != 1}{s name="DocumentIndexCurrency"}
+
Euro Umrechnungsfaktor: {$Order._currency.factor|replace:".":","}
+ {/s}
+ {/if}
+ {/block}
+
{s name="DocumentIndexCreditNumber"}{/s} {$Document.id}
+ {s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
+{/block}
+{block name="document_index_head_right"}
+ {$smarty.block.parent}
+ {if $Document.bid}{s name="DocumentIndexInvoiceID"}{/s} {$Document.bid}{s name="DocumentIndexShippingNumber"}{/s} {$Document.id}
+ {s name="DocumentIndexPageCounter"}{/s}
+{/block}
+{block name="document_index_selectAdress"}
+ {assign var="address" value="shipping"}
+{/block}
+{block name="document_index_table_each"}{if $position.modus == 0 || $position.modus == 1}{$smarty.block.parent}{/if}{/block}
+{block name="document_index_head_right"}
+ {$smarty.block.parent}
+ {if $Document.bid}{s name="DocumentIndexInvoiceID"}{/s} {$Document.bid}
+ {($position.price*-1)|currency}
+
+
+ {($position.amount*-1)|currency}
+
+ {else}
+
+ {($position.netto*-1)|currency}
+
+
+ {($position.amount_netto*-1)|currency}
+
+ {/if}
+{/block}
+{block name="document_index_amount"}
+
+
+
+
+ {s name="DocumentIndexTotalNet"}{/s}
+ -{$Order._amountNetto|currency}
+
+ {if $Document.netto == false}
+ {foreach from=$Order._tax key=key item=tax}
+
+ {s name="DocumentIndexTax"}{/s}
+ -{$tax|currency}
+
+ {/foreach}
+ {/if}
+ {if $Document.netto == false}
+
+ {s name="DocumentIndexTotal"}{/s} -{$Order._amount|currency}
+ {else}
+
+ {s name="DocumentIndexTotal"}{/s} -{$Order._amountNetto|currency}
+ {/if}
+
+
+
{s name="DocumentIndexCancelationNumber"}{/s}
+ {s name="DocumentIndexPageCounter"}{/s}
+{/block}
\ No newline at end of file
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
new file mode 100644
index 0000000..d359ae7
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/_includes/privacy.tpl
@@ -0,0 +1,16 @@
+{block name="frontend_data_protection_information"}
+
+ {if {config name=ACTDPRCHECK} && !$hideCheckbox}
+ {block name="frontend_data_protection_information_checkbox"}
+
+
+ {/block}
+ {elseif {config name=ACTDPRTEXT}}
+ {block name="frontend_data_protection_information_text"}
+ {s name="PrivacyText" namespace="frontend/index/privacy"}{/s}
+ {/block}
+ {/if}
+
+{/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
index b7790d4..3950e35 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/blog/comment/form.tpl
@@ -111,6 +111,13 @@
{/block}
+ {* Data protection information *}
+ {block name='frontend_forms_form_elements_form_privacy'}
+ {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+ {include file="frontend/_includes/privacy.tpl"}
+ {/if}
+ {/block}
+
{* Submit button *}
{block name='frontend_blog_comments_input_submit'}
{/block}
+ {* Data protection information *}
+ {block name='frontend_forms_form_elements_form_privacy'}
+ {if {config name=ACTDPRTEXT} || {config name=ACTDPRCHECK}}
+ {include file="frontend/_includes/privacy.tpl"}
+ {/if}
+ {/block}
+
{* Review actions *}
{block name='frontend_detail_comment_input_actions'}
@@ -146,4 +153,4 @@
{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
index e775f2d..127a25f 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/detail/tabs/description.tpl
@@ -37,6 +37,14 @@
{/block}
+{* Supplier *}
+{block name='frontend_detail_description_supplier'}
+ {if $sArticle.supplierDescription}
+ {s name="DetailDescriptionSupplier"}{/s} "{$sArticle.supplierName}"
+ {$sArticle.supplierDescription}
+ {/if}
+{/block}
+
{* Links *}
{block name='frontend_detail_description_links'}
{if $sArticle.sLinks}
@@ -59,14 +67,6 @@
{/if}
{/block}
-{* Supplier *}
-{block name='frontend_detail_description_supplier'}
- {if $sArticle.supplierDescription}
- {s name="DetailDescriptionSupplier"}{/s} "{$sArticle.supplierName}"
- {$sArticle.supplierDescription}
- {/if}
-{/block}
-
{* Downloads *}
{block name='frontend_detail_description_downloads'}
{if $sArticle.sDownloads}
@@ -93,4 +93,4 @@
{/block}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
index 29b6b3f..1489c09 100644
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/forms/form-elements.tpl
@@ -3,30 +3,11 @@
{block name='frontend_forms_form_elements'}
{capture name="formlabel"}
+ action="{url action='index' id=$id}" enctype="multipart/form-data">
- {if $sSupport.sErrors.v}
- {foreach from=$sSupport.sErrors.v key=sKey item=sError}
- {if $sKey !=0&&$sSupport.sElements.$sError.error_msg}
- {/if}
-
{block name='frontend_forms_form_elements_form_builder'}
{foreach from=$sSupport.sElements item=sElement key=sKey}
@@ -35,7 +16,7 @@
{$field = $sSupport.sFields[$sKey]|replace:'{literal}':''|replace:'{/literal}':''|replace:'%*%':"{s name='RequiredField' namespace='frontend/register/index'}{/s}"}
{if !$sSupport.sFields[$sKey]|strstr:"type=\"checkbox"}
-
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
index 35eff42..0f64b48 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
@@ -121,26 +121,28 @@
{* Skip login *}
{if !$update}
{block name='frontend_register_personal_fieldset_skip_login'}
- {if ($showNoAccount || $form_data.accountmode) && !$sEsd && !$form_data.sValidation && !{config name=NoAccountDisable}}
+
-{/block}
\ No newline at end of file
+{/block}
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl
new file mode 100644
index 0000000..fc2c3de
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/entry.tpl
@@ -0,0 +1,4 @@
+
+ {link file=$sitemap->getFilename() fullPath}
+ {$sitemap->getCreated()->format('Y-m-d')}
+
diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl
new file mode 100644
index 0000000..06edfe5
--- /dev/null
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/sitemap_index_xml/index.tpl
@@ -0,0 +1,10 @@
+
+
+{strip}
+ {block name="frontend_sitemap_index_xml_index"}
+ {foreach $sitemaps as $sitemap}
+ {include file="frontend/sitemap_index_xml/entry.tpl" sitemap=$sitemap}
+ {/foreach}
+ {/block}
+{/strip}
+