Mercurial > kallithea
changeset 1317:c9790080e7cc beta
merge with quick login
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 06 May 2011 22:49:47 +0200 |
| parents | d403e3bfde28 (current diff) caca5ee05bb7 (diff) |
| children | 9778e35ed02b |
| files | |
| diffstat | 2 files changed, 97 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Thu May 05 18:50:13 2011 +0200 +++ b/rhodecode/public/css/style.css Fri May 06 22:49:47 2011 +0200 @@ -1367,6 +1367,71 @@ padding:0 0 2px; } +#quick_login{ +top: 31px; +background-color: rgb(0, 51, 103); +z-index: 999; +height: 150px; +position: absolute; +margin-left: -16px; +width: 281px; +border-radius: 0 0 8px 8px; +} + +#quick_login div.form div.fields{ +padding-top: 2px; +padding-left:10px; +} + +#quick_login div.form div.fields div.field{ + padding: 5px; +} + +#quick_login div.form div.fields div.field div.label label{ +color:#fff; +padding-bottom: 3px; +} + +#quick_login div.form div.fields div.field div.input input { +width:236px; +background:#FFF; +border-top:1px solid #b3b3b3; +border-left:1px solid #b3b3b3; +border-right:1px solid #eaeaea; +border-bottom:1px solid #eaeaea; +color:#000; +font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif; +font-size:11px; +margin:0; +padding:5px 7px 4px; +} + +#quick_login div.form div.fields div.buttons { +clear:both; +overflow:hidden; +text-align:right; +margin:0; +padding:10px 14px 0; +} + +#quick_login div.form div.fields div.buttons input.ui-button{ +background:#e5e3e3 url("../images/button.png") repeat-x; +border-top:1px solid #DDD; +border-left:1px solid #c6c6c6; +border-right:1px solid #DDD; +border-bottom:1px solid #c6c6c6; +color:#515151; +margin:0; +padding:4px 10px; +} + +#quick_login div.form div.links { +clear:both; +overflow:hidden; +margin:10px 0 0; +padding:0 0 2px; +} + #register div.title { clear:both; overflow:hidden;
--- a/rhodecode/templates/base/base.html Thu May 05 18:50:13 2011 +0200 +++ b/rhodecode/templates/base/base.html Fri May 06 22:49:47 2011 +0200 @@ -6,6 +6,37 @@ <!-- user --> <ul id="logged-user"> <li class="first"> + + <div id="quick_login" style="display:none"> + ${h.form(h.url('login_home',came_from=h.url.current()))} + <div class="form"> + <div class="fields"> + <div class="field"> + <div class="label"> + <label for="username">${_('Username')}:</label> + </div> + <div class="input"> + ${h.text('username',class_='focus',size=40)} + </div> + + </div> + <div class="field"> + <div class="label"> + <label for="password">${_('Password')}:</label> + </div> + <div class="input"> + ${h.password('password',class_='focus',size=40)} + </div> + + </div> + <div class="buttons"> + ${h.submit('sign_in','Sign In',class_="ui-button")} + </div> + </div> + </div> + ${h.end_form()} + </div> + <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" /> </div> @@ -110,7 +141,7 @@ <li> <a id="repo_switcher" title="${_('Switch repository')}" href="#"> <span class="icon"> - <img src="${h.url("/images/icons/database.png")}" alt="${_('Products')}" /> + <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" /> </span> <span>↓</span> </a>