Skip to content

Commit

Permalink
Merge pull request #4 from bugfix/sw-5042-remove-force-modifier to ma…
Browse files Browse the repository at this point in the history 
…ster

* commit '07b8d188bd9feb34fe05a389ea618a6ac78ec0c0':
  SW-5042 - Remove "force" modifier in smarty namespace blocks
  • Loading branch information
@MarcelSchmaeing
MarcelSchmaeing committed Jan 22, 2013
2 parents e0ee454 + 07b8d18 commit ee3f0d8
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
10 changes: 5 additions & 5 deletions templates/_default/frontend/checkout/shipping_costs.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2 class="headingbox largesize">{se name="ShippingHeader"}{/se}</h2>

<form id="recalcShipping" method="POST" action="{url action='calculateShippingCosts' sTargetAction=$sTargetAction}">
<form id="recalcShipping" method="POST" action="{url action='calculateShippingCosts' sTargetAction=$sTargetAction}">

{* Delivery country *}
{block name='frontend_checkout_shipping_costs_country'}
Expand All @@ -20,10 +20,10 @@
{if $country.states}
<div {if $country.id != $sCountry.id}class="hidden"{/if}>
<p></p>
<p><label for="country_{$country.id}_states">{se name='RegisterBillingLabelState' force}Bundesstaat:{/se} </label></p>
<p><label for="country_{$country.id}_states">{se name='RegisterBillingLabelState'}Bundesstaat:{/se} </label></p>

<select {if $country.id != $sCountry.id}disabled="disabled"{/if} name="sState" id="country_{$country.id}_states" class="auto_submit text">
<option value="" selected="selected">{s name='StateSelection' force}Bitte wählen:{/s}</option>
<option value="" selected="selected">{s name='StateSelection'}Bitte wählen:{/s}</option>
{foreach from=$country.states item=state}
<option value="{$state.id}" {if $state.id eq $sState.id}selected="selected"{/if}>{$state.name}</option>
{/foreach}
Expand All @@ -40,7 +40,7 @@
<p>
<label for="basket_payment_list">{se name="ShippingLabelPayment"}{/se}</label>
</p>

{foreach from=$sPayments item=payment}
<div id="basket_payment_list">
<input id="basket_payment{$payment.id}" type="radio" name="sPayment" value="{$payment.id}" {if $payment.id eq $sPayment.id}checked="checked"{/if} class="auto_submit" />
Expand Down Expand Up @@ -74,4 +74,4 @@
{$sDispatch.description}
</p>
</div>
{/if}
{/if}
22 changes: 11 additions & 11 deletions templates/_default/frontend/register/billing_fieldset.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<div class="company_informations">
<h2 class="headingbox_dark largesize">{s name='RegisterHeaderCompany'}{/s}</h2>

{* Company *}
{block name='frontend_register_billing_fieldset_input_company'}
<div>
<label for="register_billing_company">{se name='RegisterLabelCompany'}{/se}:</label>
<input name="register[billing][company]" type="text" id="register_billing_company" value="{$form_data.company|escape}" class="text company required {if $error_flags.company}instyle_error{/if}" />
</div>
{/block}

{* Department *}
{block name='frontend_register_billing_fieldset_input_department'}
<div>
<label for="register_billing_department" class="normal">{se name='RegisterLabelDepartment'}{/se}:</label>
<input name="register[billing][department]" type="text" id="register_billing_department" value="{$form_data.department|escape}" class="text" />
</div>
{/block}

{* UST Id *}
{block name='frontend_register_billing_fieldset_input_ustid'}
{block name='frontend_register_billing_fieldset_input_ustid'}
<div>
<label for="register_billing_ustid" class="normal">{se name='RegisterLabelTaxId'}{/se}:</label>
<input name="register[billing][ustid]" type="text" id="register_billing_ustid" value="{$form_data.ustid|escape}" class="text {if $error_flags.ustid}instyle_error{/if}" />
Expand All @@ -28,7 +28,7 @@

<div class="shipping_address">
<h2 class="headingbox_dark largesize">{s name='RegisterBillingHeadline'}{/s}</h2>

{* Street *}
{block name='frontend_register_billing_fieldset_input_street'}
<div>
Expand All @@ -37,7 +37,7 @@
<input name="register[billing][streetnumber]" type="text" id="streetnumber" value="{$form_data.streetnumber|escape}" maxlength="5" class="number streetnumber required text{if $error_flags.streetnumber} instyle_error{/if}" />
</div>
{/block}

{* Zip + City *}
{block name='frontend_register_billing_fieldset_input_zip_and_city'}
<div>
Expand All @@ -46,9 +46,9 @@
<input name="register[billing][city]" type="text" id="city" value="{$form_data.city|escape}" size="25" class="city required text{if $error_flags.city} instyle_error{/if}" />
</div>
{/block}

{* Country *}
{block name='frontend_register_billing_fieldset_input_country'}
{block name='frontend_register_billing_fieldset_input_country'}
<div>
<label for="country">{se name='RegisterBillingLabelCountry'}{/se} </label>
<select name="register[billing][country]" id="country" class="text required {if $error_flags.country}instyle_error{/if}">
Expand All @@ -68,7 +68,7 @@
{foreach $country_list as $country}
{if $country.states}
<div class="selection{if $country.id != $form_data.country} hidden{/if}">
<label for="country_{$country.id}_states">{se name='RegisterBillingLabelState' force}Bundesstaat:{/se} </label>
<label for="country_{$country.id}_states">{se name='RegisterBillingLabelState'}Bundesstaat:{/se} </label>
<select {if $country.id != $form_data.country}disabled="disabled"{/if} name="register[billing][country_state_{$country.id}]" id="country_{$country.id}_states" class="text {if $country.force_state_in_registration}required{/if} {if $error_flags.stateID}instyle_error{/if}">
<option value="" selected="selected">{s name='RegisterBillingLabelSelect'}{/s}</option>
{assign var="stateID" value="country_state_`$country.id`"}
Expand All @@ -81,7 +81,7 @@
{/foreach}
</div>
{/block}

{* Alternative *}
{block name='frontend_register_billing_fieldset_different_shipping'}
{if !$update}
Expand All @@ -91,4 +91,4 @@
</div>
{/if}
{/block}
</div>
</div>
22 changes: 11 additions & 11 deletions templates/_default/frontend/register/shipping_fieldset.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,44 @@
<div>
<label for="salutation2">{se name='RegisterShippingLabelSalutation'}{/se}</label>
<select name="register[shipping][salutation]" id="salutation2" class="normal {if $error_flags.salutation}instyle_error{/if}">
<option value="mr" {if $form_data.salutation eq "mr"}selected="selected"{/if}>Herr</option>
<option value="ms" {if $form_data.salutation eq "ms"}selected="selected"{/if}>Frau</option>
<option value="mr" {if $form_data.salutation eq "mr"}selected="selected"{/if}>Herr</option>
<option value="ms" {if $form_data.salutation eq "ms"}selected="selected"{/if}>Frau</option>
</select>
</div>
{/block}

{* Company *}
{block name="frontend_register_shipping_fieldset_input_company"}
<div>
<label for="company2" class="normal">{se name='RegisterShippingLabelCompany'}{/se}</label>
<input name="register[shipping][company]" type="text" id="company2" value="{$form_data.company|escape}" class="text {if $error_flags.company}instyle_error{/if}" />
</div>
{/block}

{* Department *}
{block name='frontend_register_shipping_fieldset_input_department'}
<div>
<label for="department2" class="normal">{se name='RegisterShippingLabelDepartment'}{/se}</label>
<input name="register[shipping][department]" type="text" id="department2" value="{$form_data.department|escape}" class="text" />
</div>
{/block}

{* Firstname *}
{block name='frontend_register_shipping_fieldset_input_firstname'}
<div>
<label for="firstname2">{se name='RegisterShippingLabelFirstname'}{/se}</label>
<input name="register[shipping][firstname]" type="text" id="firstname2" value="{$form_data.firstname|escape}" class="text required {if $error_flags.firstname}instyle_error{/if}" />
</div>
{/block}

{* Lastname *}
{block name='frontend_register_shipping_fieldset_input_lastname'}
<div>
<label for="lastname2">{se name='RegisterShippingLabelLastname'}{/se}</label>
<input name="register[shipping][lastname]" type="text" id="lastname2" value="{$form_data.lastname|escape}" class="text required {if $error_flags.lastname}instyle_error{/if}" />
</div>
{/block}

{* Street *}
{block name='frontend_register_shipping_fieldset_input_street'}
<div>
Expand All @@ -52,7 +52,7 @@
<input name="register[shipping][streetnumber]" type="text" id="streetnumber2" value="{$form_data.streetnumber|escape}" maxlength="5" class="number text required {if $error_flags.streetnumber}instyle_error{/if}" />
</div>
{/block}

{* Zip + City *}
{block name='frontend_register_shipping_fieldset_input_zip_and_city'}
<div>
Expand All @@ -61,7 +61,7 @@
<input name="register[shipping][city]" type="text" id="city2" value="{$form_data.city|escape}" size="25" class="city text required {if $error_flags.city}instyle_error{/if}" />
</div>
{/block}

{* Country *}
{if {config name=CountryShipping}}
{block name='frontend_register_shipping_fieldset_input_country'}
Expand All @@ -85,7 +85,7 @@
{foreach $country_list as $country}
{if $country.states}
<div class="selection{if $country.id != $form_data.country} hidden{/if}">
<label for="country_{$country.id}_states">{se name='RegisterShippingLabelState' force}Bundesstaat:{/se} </label>
<label for="country_{$country.id}_states">{se name='RegisterShippingLabelState'}Bundesstaat:{/se} </label>
<select {if $country.id != $form_data.country}disabled="disabled"{/if} name="register[shipping][country_shipping_state_{$country.id}]" id="country_{$country.id}_states" class="text {if $country.force_state_in_registration}required{/if} {if $error_flags.stateID}instyle_error{/if}">
<option value="" selected="selected">{s name='RegisterShippingLabelSelect'}{/s}</option>
{assign var="stateID" value="country_shipping_state_`$country.id`"}
Expand All @@ -98,4 +98,4 @@
{/foreach}
</div>
{/block}
</div>
</div>

0 comments on commit ee3f0d8

Please sign in to comment.