Mercurial > kallithea
changeset 1944:5fc9c92025c1 beta
white space cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 22 Jan 2012 21:23:32 +0200 |
| parents | c59cc8231f3c |
| children | 9f859220ee67 |
| files | rhodecode/lib/celerylib/tasks.py rhodecode/lib/helpers.py rhodecode/templates/base/base.html |
| diffstat | 3 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/celerylib/tasks.py Sun Jan 22 21:16:55 2012 +0200 +++ b/rhodecode/lib/celerylib/tasks.py Sun Jan 22 21:23:32 2012 +0200 @@ -251,7 +251,7 @@ log = get_logger(send_password_link) DBS = get_session() - + try: user = User.get_by_email(user_email) if user: @@ -281,7 +281,7 @@ log = get_logger(reset_user_password) DBS = get_session() - + try: try: user = User.get_by_email(user_email) @@ -325,7 +325,7 @@ """ log = get_logger(send_email) DBS = get_session() - + email_config = config subject = "%s %s" % (email_config.get('email_prefix'), subject) if not recipients:
--- a/rhodecode/lib/helpers.py Sun Jan 22 21:16:55 2012 +0200 +++ b/rhodecode/lib/helpers.py Sun Jan 22 21:23:32 2012 +0200 @@ -774,7 +774,7 @@ # urlify changesets text_ = urlify_changesets(text_, repository) - + def linkify_others(t,l): urls = re.compile(r'(\<a.*?\<\/a\>)',) links = [] @@ -782,8 +782,8 @@ if not urls.match(e): links.append('<a class="message-link" href="%s">%s</a>' % (l,e)) else: - links.append(e) - + links.append(e) + return ''.join(links) try: conf = config['app_conf'] @@ -817,12 +817,12 @@ 'issue-prefix': ISSUE_PREFIX, 'serv': ISSUE_SERVER_LNK, } - + newtext = URL_PAT.sub(url_func, text_) - + # wrap not links into final link => link_ newtext = linkify_others(newtext, link_) - + return literal(newtext) except: log.error(traceback.format_exc())
--- a/rhodecode/templates/base/base.html Sun Jan 22 21:16:55 2012 +0200 +++ b/rhodecode/templates/base/base.html Sun Jan 22 21:23:32 2012 +0200 @@ -85,7 +85,7 @@ <div class="input"> ${h.text('username',class_='focus',size=40)} </div> - + </div> <div class="field"> <div class="label"> @@ -94,7 +94,7 @@ <div class="input"> ${h.password('password',class_='focus',size=40)} </div> - + </div> <div class="buttons"> <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div> @@ -124,7 +124,7 @@ </ol> </div> %endif - </div> + </div> </div> </%def>