Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:sunsnow/thebis_20120419

  • Loading branch information...
commit 8f47d2390c8e60a1bbed9b91fdd7502bce18ccfd 2 parents 8e94659 + 1d9ebfd
@sunsnow authored
View
41 app/design/frontend/default/thebis/template/onestepcheckout/onestepcheckout/login.phtml
@@ -1,13 +1,14 @@
<div class="onestepcheckout-login onestepcheckout-formpopup" id="onestepcheckout-login">
<div class="page-title">
- <h1><?php echo $this->__('LOGIN'); ?></h1>
- </div>
- <div style="float:left;width:100%;">
- <div class="step-subtitle left"><?php echo $this->__('Please login with your email address and password.');?></div>
+ <h3 style="float:left;"><?php echo $this->__('Login'); ?></h3>
<div class="close-box right">
- <p class="right"><a href="" onclick="javascript:TINY.box.hide();return false">Close</a></p>
+ <p class="right"><a href="" onclick="javascript:TINY.box.hide();return false">Sluiten</a></p>
</div>
</div>
+<div id="wrapper_login">
+ <div style="float:left;width:100%;">
+ <div class="step-subtitle left"><?php echo $this->__('Hieronder kunt u inloggen met uw gebruikersnaam en wachtwoord.');?></div>
+ </div>
<div id="onestepcheckout-login-loading" style="display: none;" class="loading-ajax">&nbsp;</div>
<div id="onestepcheckout-login-error-message" style="display:none;"></div>
<form action="<?php echo $this->getUrl('customer/account/loginPost');?>" method="post" id="onestepcheckout-login-form">
@@ -15,14 +16,14 @@
<ul>
<li>
<div class="input-field">
- <label><?php echo $this->__('Email Address');?><span class="required">*</span></label>
+ <label><?php echo $this->__('Emailadres');?><span class="required">*</span></label>
<div class="clear"></div>
<input type="text" name="osclogin[email_address]" id="osclogin:email_address" class="input-text required-entry validate-email" value=""/>
</div>
</li>
<li>
<div class="input-field">
- <label><?php echo $this->__('Password');?><span class="required">*</span></label>
+ <label><?php echo $this->__('Wachtwoord');?><span class="required">*</span></label>
<div class="clear"></div>
<input type="password" name="osclogin[password]" id="osclogin:password" class="input-text required-entry validate-password" value=""/>
</div>
@@ -30,34 +31,37 @@
</ul>
</div>
<div class="login-button">
- <p class="left"><a href="" onclick="showPasswordForm();return false;">Forgotten Password?</a></p>
+ <p class="left"><a href="" onclick="showPasswordForm();return false;">Wachtwoord vergeten?</a></p>
<p class="right">
- <button type="button" class="button" title="<?php echo $this->__('Login') ?>" name="button-login" id="osc-button-login" onclick="submitLoginForm(); return false;"><span><span><?php echo $this->__('Login') ?></span></span></button>
+ <button type="button" class="button" title="<?php echo $this->__('Login') ?>" name="button-login" id="osc-button-login" onclick="submitLoginForm(); return false;"><?php echo $this->__('Login') ?></button>
</p>
</div>
</form>
</div>
+</div>
<!-- Forgot password field-->
<div class="onestepcheckout-forgot-password onestepcheckout-formpopup" id="onestepcheckout-forgot-password" style="display:none;">
<div class="page-title">
- <h1><?php echo $this->__('Forgot Your Password?') ?></h1>
- </div>
- <div style="float:left;width:100%;">
+ <h3 style="float:left;"><?php echo $this->__('Uw wachtwoord vergeten?') ?></h3>
<div class="close-box right">
- <div class="right"><a href="" onclick="javascript:TINY.box.hide();return false">Close</a></div>
+ <p class="right"><a href="" onclick="javascript:TINY.box.hide();return false">Sluiten</a></p>
</div>
+ </div>
+<div id="wrapper_login">
+ <div style="float:left;width:100%;">
+
<div class="clear"></div>
- <div class="step-subtitle left"><?php echo $this->__("Please enter your email below and we will send you a new password.");?></div>
+ <div class="step-subtitle left"><?php echo $this->__("Vul uw emailadres hieronder in en wij sturen u een nieuw wachtwoord.");?></div>
<div id="onestepcheckout-password-loading" style="display: none;" class="loading-ajax">&nbsp;</div>
<div id="onestepcheckout-password-error-message" style="display:none;"></div>
- <div id="onestepcheckout-password-success-message" style="display:none;">A new password has been sent to your email address. Click the link below to return to login.</div>
+ <div id="onestepcheckout-password-success-message" style="display:none;">Een nieuw wachtwoord is naar uw Emailadres verstuurd. Klik op de onderstaande link om terug te keren naar de login pagina.</div>
<form action="" method="post" id="osc-forgotpassword-form">
<div class="login-fields">
<ul>
<li>
<div class="input-text">
- <label><?php echo $this->__('Email Address');?><span class="required">*</span></label>
+ <label><?php echo $this->__('Emailadres');?><span class="required">*</span></label>
<div class="clear"></div>
<input type="text" name="email" alt="email" id="forgotpassword_email_address" class="input-text required-entry validate-email" value="<?php echo $this->htmlEscape($this->getEmailValue()) ?>" />
</div>
@@ -65,8 +69,9 @@
</ul>
</div>
<div class="login-button">
- <p class="back-link left"><a href="" onclick="showloginform();return false;"><small>&laquo; </small><?php echo $this->__('Back to Login') ?></a></p>
- <p class="right"><button type="button" class="button" title="<?php echo $this->__('Send Password') ?>" onclick="retrievePassword(); return false;"><span><span><?php echo $this->__('Send Password') ?></span></span></button></p>
+ <p class="back-link left"><a href="" onclick="showloginform();return false;"><small>&laquo; </small><?php echo $this->__('Terug naar Login') ?></a></p>
+ <p class="right"><button type="button" class="button" title="<?php echo $this->__('Verzenden') ?>" onclick="retrievePassword(); return false;"><?php echo $this->__('Verzenden') ?></button></p>
</div>
</form>
+</div>
</div>
View
BIN  skin/frontend/base/default/images/onestepcheckout/bg_titlebar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
81 skin/frontend/default/thebis/css/magestore/onestepcheckout.css
@@ -26,7 +26,84 @@
font-size:15px;
}
/* Style Onestepcheckout Form Popup */
- .onestepcheckout-formpopup .page-title{text-align:left;}
+ .onestepcheckout-formpopup .page-title{
+ float:left;
+ width:386px;
+ height:26px;
+ color:#fff;
+ margin-bottom:18px;
+ padding:10px 0 0 14px;
+ background-image: url('../../images/onestepcheckout/bg_titlebar.png');
+ background-repeat:repeat-x;
+}
+
+.close-box,
+.close-box a:link,.close-box a:visited,.close-box a:active{
+ float:right;
+ color:#fff;
+ padding-right:5px;
+}
+
+.step-subtitle{
+ margin-bottom:24px;
+}
+
+#wrapper_login{
+ margin-left:11px;
+}
+
+form#onestepcheckout-login-form,
+form#osc-forgotpassword-form{
+ line-height:20px;
+}
+
+form#onestepcheckout-login-form a,
+form#osc-forgotpassword-form a{
+ color:#1D789A;
+ margin-bottom:18px;
+}
+
+form#onestepcheckout-login-form span,
+form#osc-forgotpassword-form span{
+ color:#FF6704;
+}
+
+form#onestepcheckout-login-form input,
+#osc-forgotpassword-form input{
+ border:1px solid #B2DCED;
+ height:22px;
+ margin-bottom:6px;
+ width:222px;
+}
+
+#osc-button-login,
+.login-button .button{
+ float:left;
+ margin-top:20px;
+ font-size:15px;
+ color:#fff;
+ width:110px;
+ height:27px;
+ background-image: url('../../images/onestepcheckout/bg_button_kassa.png');
+ background-repeat:repeat-x;
+ cursor:pointer;
+ clear:both;
+}
+
+#onestepcheckout-login-form .login-button #osc-button-login span,
+#osc-forgotpassword-form .login-button .button span{
+ color:#fff;
+}
+
+#onestepcheckout-login-form .login-button #osc-button-login:hover,
+#osc-forgotpassword-form .login-button .button:hover{
+ background:#fff;
+ color:#ff6d07;
+ border:1px solid #ff6d07;
+}
+
+
+
.onestepcheckout-formpopup .page-title h1{color:#F18200;font-size:16px;font-weight:bold;}
.onestepcheckout-formpopup .login-fields{}
.onestepcheckout-formpopup .login-fields ul li{margin-bottom:3px;float:left;width:100%;text-align:left;}
@@ -364,4 +441,4 @@ tr.last {
}
table#checkout-review-table.data-table {
margin-right:10px;
-}
+}
View
4 skin/frontend/default/thebis/css/magestore/tinybox.css
@@ -1,5 +1,5 @@
#testdiv {width:600px; margin:0 auto; border:1px solid #ccc; padding:20px 25px; background:#fff}
-#tinybox {position:absolute; display:none; padding:10px; background:#fff url(../../images/onestepcheckout/preload.gif) no-repeat 50% 50%; border:10px solid #e3e3e3; z-index:2000}
+#tinybox {position:absolute; display:none; width:414px; background:#fff url(../../images/onestepcheckout/preload.gif) no-repeat 50% 50%; z-index:2000; font-size:12px;}
#tinymask {position:absolute; display:none; top:0; left:0; height:100%; width:100%; background:#000; z-index:1500}
-#tinycontent {background:#fff}
+#tinycontent {background:#fff; height:290px;}
View
BIN  skin/frontend/default/thebis/images/onestepcheckout/bg_button_kassa.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  skin/frontend/default/thebis/images/onestepcheckout/bg_titlebar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.