Mercurial > kallithea
changeset 529:3a567e329fb6
updated whoosh deps,
fixed templates, changelog and changeset stylings
changed 8 letter password into 6 letter passwords required
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 30 Sep 2010 18:35:03 +0200 |
| parents | 6d0d5e7d7356 |
| children | a08f610e545e |
| files | pylons_app/model/forms.py pylons_app/public/css/style.css pylons_app/templates/changelog/changelog.html pylons_app/templates/changeset/changeset.html setup.py |
| diffstat | 5 files changed, 61 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/model/forms.py Thu Sep 30 17:11:58 2010 +0200 +++ b/pylons_app/model/forms.py Thu Sep 30 18:35:03 2010 +0200 @@ -256,7 +256,7 @@ password = UnicodeString( strip=True, - min=8, + min=6, not_empty=True, messages={ 'empty':_('Please enter a password'), @@ -273,10 +273,10 @@ filter_extra_fields = True username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data)) if edit: - new_password = All(UnicodeString(strip=True, min=8, not_empty=False), ValidPassword) + new_password = All(UnicodeString(strip=True, min=6, not_empty=False), ValidPassword) admin = StringBoolean(if_missing=False) else: - password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword) + password = All(UnicodeString(strip=True, min=6, not_empty=True), ValidPassword) active = StringBoolean(if_missing=False) name = UnicodeString(strip=True, min=1, not_empty=True) lastname = UnicodeString(strip=True, min=1, not_empty=True)
--- a/pylons_app/public/css/style.css Thu Sep 30 17:11:58 2010 +0200 +++ b/pylons_app/public/css/style.css Thu Sep 30 18:35:03 2010 +0200 @@ -1161,7 +1161,7 @@ #content div.box div.message { margin: 0 0 0px 0; - padding: 0 0 10px 0; + padding: 10px 0 10px 0; clear: both; overflow: hidden; } @@ -3058,7 +3058,9 @@ } #changeset_content .container { - height: 120px; + min-height: 120px; + font-size: 1.2em; + } #changeset_content .container .left { @@ -3190,7 +3192,6 @@ border: 1px solid #DDDDDD; display: block; float: right; - font-size: 0.75em; text-align: center; min-width: 15px; }
--- a/pylons_app/templates/changelog/changelog.html Thu Sep 30 17:11:58 2010 +0200 +++ b/pylons_app/templates/changelog/changelog.html Thu Sep 30 18:35:03 2010 +0200 @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Changelog - %s') % c.repo_name} + ${_('Changelog')} - ${c.repo_name} </%def> <%def name="breadcrumbs_links()">
--- a/pylons_app/templates/changeset/changeset.html Thu Sep 30 17:11:58 2010 +0200 +++ b/pylons_app/templates/changeset/changeset.html Thu Sep 30 18:35:03 2010 +0200 @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Changeset')} + ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id} - ${c.repo_name} </%def> <%def name="breadcrumbs_links()"> @@ -34,42 +34,56 @@ </div> </div> </div> - - <div id="changeset_content"> - <div class="container"> - <div class="left"> - <div class="date">${_('Date')}: ${c.changeset.date}</div> - <div class="author">${_('Author')}: ${c.changeset.author}</div> - <div class="message">${h.wrap_paragraphs(c.changeset.message)}</div> - </div> - <div class="right"> - %if len(c.changeset.parents)>1: - <div class="merge"> - ${_('merge')} - <img alt="merge" src="/images/icons/arrow_join.png"> - </div> - %endif - %for p_cs in reversed(c.changeset.parents): - <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id, - h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)} - </div> - %endfor - <span class="logtags"> - <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span> - %for tag in c.changeset.tags: - <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> - ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span> - %endfor - </span> - </div> - </div> - <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> - <div class="cs_files"> - %for change,filenode,diff,cs1,cs2 in c.changes: - <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> - %endfor - </div> + <div id="changeset_content"> + <div class="container"> + <div class="left"> + <div class="date">${_('commit')} ${c.changeset.revision}: ${c.changeset.short_id}@${c.changeset.date}</div> + <div class="author"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/> + </div> + <span>${h.person(c.changeset.author)}</span><br/> + <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/> + </div> + <div class="message"> + ${h.link_to(h.wrap_paragraphs(c.changeset.message), + h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id))} + </div> + </div> + <div class="right"> + <div class="changes"> + <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span> + <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span> + <span class="added" title="${_('added')}">${len(c.changeset.added)}</span> + </div> + %if len(c.changeset.parents)>1: + <div class="merge"> + ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/> + </div> + %endif + %for p_cs in reversed(c.changeset.parents): + <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id, + h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)} + </div> + %endfor + <span class="logtags"> + <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span> + %for tag in c.changeset.tags: + <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}"> + ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span> + %endfor + </span> + </div> + </div> + <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span> + <div class="cs_files"> + %for change,filenode,diff,cs1,cs2 in c.changes: + <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> + %endfor + </div> + </div> + </div> %for change,filenode,diff,cs1,cs2 in c.changes:
--- a/setup.py Thu Sep 30 17:11:58 2010 +0200 +++ b/setup.py Thu Sep 30 18:35:03 2010 +0200 @@ -20,11 +20,11 @@ "SQLAlchemy>=0.6", "babel", "Mako>=0.3.2", - "vcs>=0.1.6", + "vcs>=0.1.7", "pygments>=1.3.0", "mercurial>=1.6", "pysqlite", - "whoosh==1.0.0b17", + "whoosh==1.0.0b19", "py-bcrypt", "celery", ],