Skip to content

Commit 3ff1cdb

Browse files
nicomolletnicomollet
committed
Fix "Theme My Login" plugin Compatibility
1 parent 7ebef1c commit 3ff1cdb

18 files changed

+4942
-3974
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
* Find an Events plugin
55
* WooCommerce compatibility
66

7+
8+
9+
### 0.1.5: September 24nd, 2014
10+
* Fix "Theme My Login" plugin Compatibility
11+
712
### 0.1.4: July 22nd, 2014
813
* Upgrade Boostrap to v3.2.0
914
* Adding Boostrap Sass and Grunt support (see readme for installation)

‎css/application.css

+12-3
Original file line numberDiff line numberDiff line change
@@ -6780,6 +6780,12 @@ iframe {
67806780
margin-left: 0;
67816781
width: 100%;
67826782
}
6783+
.in-frame #content {
6784+
padding: 0;
6785+
}
6786+
.in-frame .gform_footer {
6787+
margin-bottom: 0;
6788+
}
67836789

67846790
#modal-frame {
67856791
width: 100%;
@@ -6908,23 +6914,26 @@ a.edit-post:after {
69086914
width: 75%;
69096915
}
69106916
}
6911-
.form-horizontal .help-block, .form-horizontal .form-actions {
6917+
.form-horizontal .help-block, .form-horizontal .form-actions, .form-horizontal .form-input-offset {
69126918
position: relative;
69136919
min-height: 1px;
69146920
padding-left: 15px;
69156921
padding-right: 15px;
69166922
}
69176923
@media (min-width: 768px) {
6918-
.form-horizontal .help-block, .form-horizontal .form-actions {
6924+
.form-horizontal .help-block, .form-horizontal .form-actions, .form-horizontal .form-input-offset {
69196925
float: left;
69206926
width: 75%;
69216927
}
69226928
}
69236929
@media (min-width: 768px) {
6924-
.form-horizontal .help-block, .form-horizontal .form-actions {
6930+
.form-horizontal .help-block, .form-horizontal .form-actions, .form-horizontal .form-input-offset {
69256931
margin-left: 25%;
69266932
}
69276933
}
6934+
.form-horizontal .form-input-offset .checkbox {
6935+
margin-left: 20px;
6936+
}
69286937

69296938
/* hide the honeypot field ------------------------------------------------------*/
69306939
/*

‎css/application.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎form-login.php

+25-17
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,34 @@
1313
<form name="form-login" id="form-login<?php $template->the_instance(); ?>" action="<?php $template->the_action_url('login'); ?>" method="post" class="form form-horizontal form-login">
1414

1515
<div class="form-group">
16-
<label class="control-label" for="userlogin<?php $template->the_instance(); ?>"><?php _e('Username', 'stormbringer') ?></label>
16+
<label class="control-label" for="userlogin<?php $template->the_instance(); ?>"><?php _e('Nom d\'utilisateur', 'stormbringer') ?></label>
1717

18-
<div class="form-field">
19-
<input placeholder="<?php _e('Username', 'stormbringer') ?>" type="text" name="log" id="userlogin<?php $template->the_instance(); ?>" class="form-control" value="<?php $template->the_posted_value('log'); ?>"/>
18+
<div class="form-input">
19+
<input placeholder="<?php _e('Nom d\'utilisateur', 'stormbringer') ?>" type="text" name="log" id="userlogin<?php $template->the_instance(); ?>" class="form-control" value="<?php $template->the_posted_value('log'); ?>"/>
2020
</div>
2121
</div>
2222

2323
<div class="form-group">
24-
<label class="control-label" for="userpass-<?php $template->the_instance(); ?>"><?php _e('Password', 'stormbringer') ?></label>
24+
<label class="control-label" for="userpass-<?php $template->the_instance(); ?>"><?php _e('Mot de passe', 'stormbringer') ?></label>
2525

26-
<div class="form-field">
27-
<input placeholder="<?php _e('Password', 'stormbringer') ?>" type="password" name="pwd" id="userpass<?php $template->the_instance(); ?>" class="form-control" value=""/>
26+
<div class="form-input">
27+
<input placeholder="<?php _e('Mot de passe', 'stormbringer') ?>" type="password" name="pwd" id="userpass<?php $template->the_instance(); ?>" class="form-control" value=""/>
2828
</div>
29+
<?php
30+
if ($this->options['show_pass_link']):?>
31+
<div class="help-block"><small>
32+
<?php
33+
printf('<a href="%s">%s</a>', $this->get_action_url('lostpassword'), $this->get_title('lostpassword'));
34+
?></small>
35+
</div>
36+
<?php endif; ?>
2937
</div>
3038

3139

3240
<div class="form-group">
33-
<div class="form-field">
41+
<div class="form-input form-input-offset">
3442
<label class="checkbox">
35-
<input name="rememberme" type="checkbox" id="rememberme<?php $template->the_instance(); ?>" value="forever"/> <?php _e('Remember Me', 'stormbringer'); ?>
43+
<input name="rememberme" type="checkbox" id="rememberme<?php $template->the_instance(); ?>" value="forever"/> <?php _e('Se souvenir de moi', 'stormbringer'); ?>
3644
</label>
3745
</div>
3846
</div>
@@ -42,15 +50,15 @@
4250
do_action_ref_array('tml_login_form', array(&$template)); // TML hook
4351
?>
4452

45-
<div class="form-group form-actions">
46-
<input class="btn btn-primary" type="submit" name="form-submit" id="form-submit<?php $template->the_instance(); ?>" value="<?php _e('Log In', 'stormbringer'); ?>"/>
47-
<?php
48-
if ($this->options['show_pass_link'])
49-
printf('<a href="%s">%s</a>', $this->get_action_url('lostpassword'), $this->get_title('lostpassword'));
50-
?>
51-
<input type="hidden" name="redirect_to" value="<?php $template->the_redirect_url('login'); ?>"/>
52-
<input type="hidden" name="testcookie" value="1"/>
53-
<input type="hidden" name="instance" value="<?php $template->the_instance(); ?>"/>
53+
<div class="form-group">
54+
<div class="form-actions">
55+
<input class="btn btn-primary" type="submit" name="form-submit" id="form-submit<?php $template->the_instance(); ?>" value="<?php _e('Se connecter', 'stormbringer'); ?>"/>
56+
57+
<input type="hidden" name="redirect_to" value="<?php $template->the_redirect_url('login'); ?>"/>
58+
<input type="hidden" name="testcookie" value="1"/>
59+
<input type="hidden" name="instance" value="<?php $template->the_instance(); ?>"/>
60+
61+
</div>
5462
</div>
5563

5664
<div class="movetomodal-footer">

‎form-lostpassword.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
<form name="form-lostpassword" id="form-lostpassword<?php $template->the_instance(); ?>" action="<?php $template->the_action_url('lostpassword'); ?>" method="post" class="form-horizontal form-lostpassword">
1414

1515
<div class="form-group">
16-
<label class="control-label" for="userlogin<?php $template->the_instance(); ?>"><?php _e('Username or E-mail:', 'stormbringer') ?></label>
16+
<label class="control-label" for="userlogin<?php $template->the_instance(); ?>"><?php _e('Nom d\'utilisateur ou e-mail', 'stormbringer') ?></label>
1717

18-
<div class="controls">
19-
<input placeholder="<?php _e('Username or E-mail:', 'stormbringer') ?>" type="text" name="user_login" id="userlogin<?php $template->the_instance(); ?>" class="input-small" value="<?php $template->the_posted_value('user_login'); ?>"/>
18+
<div class="form-input">
19+
<input placeholder="<?php _e('Nom d\'utilisateur ou e-mail', 'stormbringer') ?>" type="text" name="user_login" id="userlogin<?php $template->the_instance(); ?>" class="form-control" value="<?php $template->the_posted_value('user_login'); ?>"/>
2020
</div>
2121
</div>
2222

2323
<?php
2424
do_action('lostpassword_form'); // Wordpress hook
2525
do_action_ref_array('tml_lostpassword_form', array(&$template)); // TML hook
2626
?>
27-
28-
<div class="form-actions">
29-
<input class="btn btn-primary" type="submit" name="form-submit" id="form-submit<?php $template->the_instance(); ?>" value="<?php _e('Get New Password', 'stormbringer'); ?>"/>
30-
<input type="hidden" name="redirect_to" value="<?php $template->the_redirect_url('lostpassword'); ?>"/>
31-
<input type="hidden" name="instance" value="<?php $template->the_instance(); ?>"/>
32-
</div>
33-
27+
<div class="form-group">
28+
<div class="form-actions">
29+
<input class="btn btn-primary" type="submit" name="form-submit" id="form-submit<?php $template->the_instance(); ?>" value="<?php _e('Obtenir un nouveau mot de passe', 'stormbringer'); ?>"/>
30+
<input type="hidden" name="redirect_to" value="<?php $template->the_redirect_url('lostpassword'); ?>"/>
31+
<input type="hidden" name="instance" value="<?php $template->the_instance(); ?>"/>
32+
</div>
33+
</div>
3434
</form>
3535
<?php //$template->the_action_links(array('lostpassword' => false)); ?>

‎form-profile.php

+44-42
Original file line numberDiff line numberDiff line change
@@ -27,48 +27,48 @@
2727
<?php do_action('profile_personal_options', $profileuser); ?>
2828

2929
<fieldset>
30-
<legend><?php _e('Name', 'stormbringer') ?></legend>
30+
<legend><?php _e('Nom', 'stormbringer') ?></legend>
3131

3232

3333
<div class="form-group">
34-
<label class="control-label" for="user_login"><?php _e('Username', 'stormbringer') ?></label>
34+
<label class="control-label" for="user_login"><?php _e('Nom d\'utilisateur', 'stormbringer') ?></label>
3535

36-
<div class="form-field">
37-
<input placeholder="<?php _e('Username', 'stormbringer') ?>" disabled="disabled" type="text" name="user_login" id="user_login" class="form-control" value="<?php echo esc_attr($profileuser->user_login); ?>"/>
38-
<span class="help-block"><?php _e('Your username cannot be changed.', 'stormbringer'); ?></span>
36+
<div class="form-input">
37+
<input placeholder="<?php _e('Nom d\'utilisateur', 'stormbringer') ?>" disabled="disabled" type="text" name="user_login" id="user_login" class="form-control" value="<?php echo esc_attr($profileuser->user_login); ?>"/>
3938
</div>
39+
<span class="help-block"><?php _e('Votre nom d\'utilisateur ne peut pas être changé', 'stormbringer'); ?></span>
4040
</div>
4141

4242
<div class="form-group">
43-
<label class="control-label" for="first_name"><?php _e('First name', 'stormbringer') ?></label>
43+
<label class="control-label" for="first_name"><?php _e('Prénom', 'stormbringer') ?></label>
4444

45-
<div class="form-field">
46-
<input placeholder="<?php _e('First name', 'stormbringer') ?>" type="text" name="first_name" id="first_name" class="form-control" value="<?php echo esc_attr($profileuser->first_name) ?>"/>
45+
<div class="form-input">
46+
<input placeholder="<?php _e('Prénom', 'stormbringer') ?>" type="text" name="first_name" id="first_name" class="form-control" value="<?php echo esc_attr($profileuser->first_name) ?>"/>
4747
</div>
4848
</div>
4949

5050
<div class="form-group">
51-
<label class="control-label" for="last_name"><?php _e('Last name', 'stormbringer') ?></label>
51+
<label class="control-label" for="last_name"><?php _e('Nom', 'stormbringer') ?></label>
5252

53-
<div class="form-field">
54-
<input placeholder="<?php _e('Last name', 'stormbringer') ?>" type="text" name="last_name" id="last_name" class="form-control" value="<?php echo esc_attr($profileuser->last_name) ?>"/>
53+
<div class="form-input">
54+
<input placeholder="<?php _e('Nom', 'stormbringer') ?>" type="text" name="last_name" id="last_name" class="form-control" value="<?php echo esc_attr($profileuser->last_name) ?>"/>
5555
</div>
5656
</div>
5757

5858
<div class="form-group">
59-
<label class="control-label" for="nickname"><?php _e('Nickname', 'stormbringer') ?>
59+
<label class="control-label" for="nickname"><?php _e('Surnom', 'stormbringer') ?>
6060
<span class="form-required">*</span></label>
6161

62-
<div class="form-field">
63-
<input placeholder="<?php _e('Nickname', 'stormbringer') ?>" type="text" name="nickname" id="nickname" class="form-control" value="<?php echo esc_attr($profileuser->nickname) ?>"/>
62+
<div class="form-input">
63+
<input placeholder="<?php _e('Surnom', 'stormbringer') ?>" type="text" name="nickname" id="nickname" class="form-control" value="<?php echo esc_attr($profileuser->nickname) ?>"/>
6464
</div>
6565
</div>
6666

6767
<div class="form-group">
68-
<label class="control-label" for="display_name"><?php _e('Display name publicly as', 'stormbringer') ?>
68+
<label class="control-label" for="display_name"><?php _e('Nom affiché publiquement', 'stormbringer') ?>
6969
<span class="form-required">*</span></label>
7070

71-
<div class="form-field">
71+
<div class="form-input">
7272
<select name="display_name" id="display_name" class="form-control">
7373
<?php
7474
$public_display = array();
@@ -98,21 +98,21 @@
9898

9999

100100
<fieldset>
101-
<legend><?php _e('Contact Info', 'stormbringer') ?></legend>
101+
<legend><?php _e('Réseaux sociaux', 'stormbringer') ?></legend>
102102

103103
<div class="form-group">
104104
<label class="control-label" for="email"><?php _e('E-mail', 'stormbringer') ?><span class="form-required">*</span></label>
105105

106-
<div class="form-field">
106+
<div class="form-input">
107107
<input placeholder="<?php _e('E-mail', 'stormbringer') ?>" type="text" name="email" id="email" class="form-control" value="<?php echo esc_attr($profileuser->user_email) ?>"/>
108108
</div>
109109
</div>
110110

111111
<div class="form-group">
112112
<label class="control-label" for="url"><?php _e('Website', 'stormbringer') ?></label>
113113

114-
<div class="form-field">
115-
<input placeholder="<?php _e('Website', 'stormbringer') ?>" type="text" name="url" id="url" class="form-control" value="<?php echo esc_attr($profileuser->user_url) ?>"/>
114+
<div class="form-input">
115+
<input placeholder="<?php _e('Site web', 'stormbringer') ?>" type="text" name="url" id="url" class="form-control" value="<?php echo esc_attr($profileuser->user_url) ?>"/>
116116
</div>
117117
</div>
118118

@@ -122,7 +122,7 @@
122122
<div class="form-group">
123123
<label class="control-label" for="<?php echo $name; ?>"><?php echo apply_filters('user_' . $name . '_label', $desc); ?></label>
124124

125-
<div class="form-field">
125+
<div class="form-input">
126126
<input placeholder="<?php echo apply_filters('user_' . $name . '_label', $desc); ?>" type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" class="form-control" value="<?php echo esc_attr($profileuser->$name) ?>"/>
127127
</div>
128128
</div>
@@ -134,34 +134,34 @@
134134
</fieldset>
135135

136136
<fieldset>
137-
<legend><?php _e('About Yourself', 'stormbringer'); ?></legend>
137+
<legend><?php _e('À propos de vous', 'stormbringer'); ?></legend>
138138

139139
<div class="form-group">
140140
<label class="control-label" for="description"><?php _e('Biographical Info', 'stormbringer'); ?></label>
141141

142-
<div class="form-field">
142+
<div class="form-input">
143143
<textarea name="description" id="description" rows="5" cols="30" class="form-control"><?php echo esc_html($profileuser->description); ?></textarea>
144-
<span class="help-block"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.', 'stormbringer'); ?></span>
145144
</div>
145+
<div class="help-block"><?php _e('Décrivez-vous en quelques mots.', 'stormbringer'); ?></div>
146146
</div>
147147

148148
<?php
149149
$show_password_fields = apply_filters('show_password_fields', true, $profileuser);
150150
if ($show_password_fields) :
151151
?>
152152
<div class="form-group">
153-
<label class="control-label" for="pass1"><?php _e('New Password', 'stormbringer'); ?></label>
153+
<label class="control-label" for="pass1"><?php _e('Nouveau mot de passe', 'stormbringer'); ?></label>
154+
<div class="form-input">
155+
<input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" class="form-control"/>
156+
</div>
157+
<div class="help-block"><?php _e('Si vous souhaitez changer de mot de passe, sinon laissez le champ vide.', 'stormbringer'); ?></div>
154158

155-
<div class="form-field">
156-
<input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" class="form-control"/>
157-
<span class="help-block"><?php _e('If you would like to change the password type a new one. Otherwise leave this blank.', 'stormbringer'); ?></span><br/>
159+
<div class="form-input form-input-offset">
158160
<input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" class="form-control"/>
159-
<span class="help-block"><?php _e('Type your new password again.', 'stormbringer'); ?></span><br/>
160-
161-
<p id="pass-strength-result"><?php _e('Strength indicator', 'stormbringer'); ?></p>
162-
163-
<p class="help-block indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).', 'stormbringer'); ?></p>
164161
</div>
162+
<span class="help-block"><?php _e('Saisissez votre mot de passe à nouveau.', 'stormbringer'); ?></span><br/>
163+
<p id="pass-strength-result" class="help-block"><?php _e('Force du mot de passe', 'stormbringer'); ?></p>
164+
<p class="help-block indicator-hint"><?php _e('Conseil : Le mot de passe doit comporter au moins 8 charactères. Pour le rendre plus fort, utilisez des capitales et minuscules, chiffres et symboles comme ! " ? $ % ^ &amp; ).', 'stormbringer'); ?></p>
165165
</div>
166166
<?php endif; ?>
167167
</fieldset>
@@ -171,12 +171,12 @@
171171

172172
<?php if (count($profileuser->caps) > count($profileuser->roles) && apply_filters('additional_capabilities_display', true, $profileuser)) { ?>
173173
<fieldset>
174-
<legend><?php _e('Additional Capabilities', 'stormbringer') ?></legend>
174+
<legend><?php _e('Permissions', 'stormbringer') ?></legend>
175175

176176
<div class="form-group">
177-
<label class="control-label"><?php _e('Capabilities', 'stormbringer'); ?></label>
177+
<label class="control-label"><?php _e('Permissions', 'stormbringer'); ?></label>
178178

179-
<div class="form-field">
179+
<div class="form-input">
180180
<?php
181181
$output = '';
182182
global $wp_roles;
@@ -194,12 +194,14 @@
194194
</fieldset>
195195
<?php } ?>
196196

197-
<div class="form-group form-actions">
198-
<input class="btn btn-primary" type="submit" name="form-submit" value="<?php esc_attr_e('Update Profile', 'stormbringer'); ?>"/>
199-
<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($current_user->ID); ?>"/>
200-
<input type="hidden" name="from" value="profile"/>
201-
<input type="hidden" name="checkuser_id" value="<?php echo $current_user->ID; ?>"/>
202-
<?php wp_nonce_field('update-user_' . $current_user->ID) ?>
197+
<div class="form-group">
198+
<div class="form-actions">
199+
<input class="btn btn-primary" type="submit" name="form-submit" value="<?php esc_attr_e('Mettre à jour mon compte', 'stormbringer'); ?>"/>
200+
<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($current_user->ID); ?>"/>
201+
<input type="hidden" name="from" value="profile"/>
202+
<input type="hidden" name="checkuser_id" value="<?php echo $current_user->ID; ?>"/>
203+
<?php wp_nonce_field('update-user_' . $current_user->ID) ?>
204+
</div>
203205
</div>
204206

205207
</form>

0 commit comments

Comments
 (0)