kallithea Changeset - 3a567e329fb6

Changeset - 3a567e329fb6

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 15 years ago 2010-09-30 18:35:03
marcin@python-works.com

updated whoosh deps,
fixed templates, changelog and changeset stylings
changed 8 letter password into 6 letter passwords required

5 files changed with 31 insertions and 16 deletions:

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

0 comments (0 inline, 0 general)

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -253,13 +253,13 @@ class LoginForm(formencode.Schema): @@
                                        'empty':_('Please enter a login'),
                                        'tooShort':_('Enter a value %(min)i characters long or more')}
+                            )
     password = UnicodeString(
                             strip=True,
-                            min=8,
+                            min=6,
                             not_empty=True,
                             messages={
                                       'empty':_('Please enter a password'),
                                       'tooShort':_('Enter a value %(min)i characters long or more')}
+                                )
@@ @@ -270,16 +270,16 @@ class LoginForm(formencode.Schema): @@
 def UserForm(edit=False, old_data={}):
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         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)
         email = All(Email(not_empty=True), UniqSystemEmail(old_data))
     return _UserForm

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -1158,13 +1158,13 @@ div.options a:hover @@
 	overflow: hidden;
+}
 #content div.box div.message
+{
 	margin: 0 0 0px 0;
-    padding: 0 0 10px 0;
+    padding: 10px 0 10px 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.message div.image
+{
@@ @@ -3055,13 +3055,15 @@ h3.files_location{ @@
 #changeset_content .container .wrapper {
 	width: 600px;
+}
 #changeset_content .container {
 	height: 120px;
 	min-height: 120px;
 	font-size: 1.2em;
+}
 #changeset_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
@@ @@ -3187,13 +3189,12 @@ h3.files_location{ @@
+}
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDDDDD;
 	display: block;
 	float: right;
 	font-size: 0.75em;
 	text-align: center;
 	min-width: 15px;
+}
 .right .changes .added {
 	background: #BBFFBB;

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Changelog - %s') % c.repo_name}
+    ${_('Changelog')} - ${c.repo_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}

pylons_app/templates/changeset/changeset.html

➞

Show inline comments

 <%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()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
@@ @@ -31,25 +31,37 @@ @@
 				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='show'))}</span>
 				 &raquo; <span>${h.link_to(_('download diff'),
 				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='download'))}</span>
 				</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 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">
 		                     ${_('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>
@@ @@ -69,12 +81,14 @@ @@
 				%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:
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div id="body" class="diffblock">
 			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">
 				<div>

setup.py

➞

Show inline comments

@@ @@ -17,17 +17,17 @@ setup( @@
     url='http://hg.python-works.com',
     install_requires=[
         "Pylons>=1.0.0",
         "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",
     ],
     setup_requires=["PasteScript>=1.6.3"],
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,

0 comments (0 inline, 0 general)