mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-08 14:16:54 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Browse Source
This commit is contained in:
Awilum
2013-04-06 23:51:29 +03:00
parent e007040feb 928c12abc7
commit 6496e1bad1
17 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/box/users/views/frontend/login.view.php
View File

@@ -5,5 +5,9 @@
<?php echo Form::hidden('csrf', Security::token()); ?>
<label><?php echo __('Username', 'users'); ?></label><input name="username" type="text" class="input-large" />
<label><?php echo __('Password', 'users'); ?></label><input name="password" type="password" class="input-large" />
<<<<<<< HEAD
<br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Log In', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
=======
<br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Login', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
>>>>>>> refs/remotes/origin/master
</form>