From: <for...@us...> - 2012-05-17 12:59:29
|
Revision: 9539 http://xoops.svn.sourceforge.net/xoops/?rev=9539&view=rev Author: forxoops Date: 2012-05-17 12:59:18 +0000 (Thu, 17 May 2012) Log Message: ----------- Add forms style in main style Change login template with bootstrap Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html Added Paths: ----------- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/required.png Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-05-17 11:53:10 UTC (rev 9538) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-05-17 12:59:18 UTC (rev 9539) @@ -4,6 +4,28 @@ */ @import url(bootstrap.min.css); +/* Forms style */ +input:required, textarea:required{ + background:url(../img/required.png) right center no-repeat; +} +input:focus:invalid, textarea:focus:invalid{ + background-image:none; +} + +.dsc_pattern_vertical{display:none;} + +input:focus:invalid + span + .dsc_pattern_vertical{ + display:block; + color: #b94a48; +} +.dsc_pattern_horizontal{display:none;} +input:focus:invalid + .dsc_pattern_horizontal{ + display:inline; + color: #b94a48; +} +.caption-required{color: #b94a48;} + + .clear { clear: both; } Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/img/required.png (from rev 9532, XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/images/required.png) =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:53:10 UTC (rev 9538) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 12:59:18 UTC (rev 9539) @@ -22,7 +22,7 @@ </div> <{if isset($block.lang_rememberme)}> <label class="checkbox"> - <input type="checkbox" name="rememberme" value="On" class="formButton"/><{$block.lang_rememberme}> + <input type="checkbox" name="rememberme" value="On" class="formButton" checked><{$block.lang_rememberme}> </label> <{/if}> <br/> Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2012-05-17 11:53:10 UTC (rev 9538) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userform.html 2012-05-17 12:59:18 UTC (rev 9539) @@ -1,27 +1,52 @@ -<fieldset class="pad10"> - <legend class="bold"><{$lang_login}></legend> - <form action="user.php" method="post"> - <{$lang_username}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" /><br /><br /> - <{$lang_password}> <input type="password" name="pass" size="21" maxlength="32" /><br /><br /> - <{if isset($lang_rememberme)}> - <input type="checkbox" name="rememberme" value="On" checked /> <{$lang_rememberme}><br /><br /> - <{/if}> - - <input type="hidden" name="op" value="login" /> - <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" /> - <input type="submit" value="<{$lang_login}>" /> - </form> - <br /> - <a name="lost"></a> - <div><{$lang_notregister}><br /></div> -</fieldset> - -<br /> - -<fieldset class="pad10"> - <legend class="bold"><{$lang_lostpassword}></legend> - <div><br /><{$lang_noproblem}></div> - <form action="lostpass.php" method="post"> - <{$lang_youremail}> <input type="text" name="email" size="26" maxlength="60" /> <input type="hidden" name="op" value="mailpasswd" /><input type="hidden" name="t" value="<{$mailpasswd_token}>" /><input type="submit" value="<{$lang_sendpassword}>" /> - </form> +<form class="form-horizontal" action="user.php" method="post"> + <fieldset> + <legend class="bold"><{$lang_login}></legend> + <div class="control-group"> + <label for="xo-sys-uname" class="control-label"><{$lang_username}><span class="caption-required">*</span></label> + <div class="controls"> + <input type="text" name="uname" id="xo-sys-uname" class="span2" value="<{$usercookie}>" required=""> + </div> + </div> + <div class="control-group"> + <label for="xo-sys-pass" class="control-label"><{$lang_password}><span class="caption-required">*</span></label> + <div class="controls"> + <input type="password" name="pass" id="xo-sys-pass" class="span2" required=""> + </div> + </div> + <{if isset($lang_rememberme)}> + <div class="control-group"> + <div class="controls"> + <label class="checkbox"> + <input type="checkbox" name="rememberme" value="On" checked> + <{$lang_rememberme}> + </label> + </div> + </div> + <{/if}> + <input type="hidden" name="op" value="login"> + <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>"> + <div class="form-actions"> + <button class="btn btn-primary" type="submit"><{$lang_login}></button> + </div> + </fieldset> +</form> +<p><{$lang_notregister}></p> +<fieldset name="lost"> + <legend class="bold"><{$lang_lostpassword}></legend> + <form class="form-horizontal" action="lostpass.php" method="post"> + <p><{$lang_noproblem}></p> + <div class="control-group"> + <label for="xo-sys-uname" class="control-label"><{$lang_youremail}><span class="caption-required">*</span></label> + <div class="controls"> + <div class="input-prepend"> + <span class="add-on">@</span><input type="text" name="email" id="xo-sys-email" class="span3" value="<{$usercookie}>" required=""> + </div> + </div> + </div> + <input type="hidden" name="op" value="mailpasswd"> + <input type="hidden" name="t" value="<{$mailpasswd_token}>"> + <div class="form-actions"> + <button class="btn btn-primary" type="submit"><{$lang_sendpassword}></button> + </div> + </form> </fieldset> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |