Changeset - 6d44d3862ec4
[Not reviewed]
default
0 3 0
Marcin Kuzminski - 15 years ago 2010-09-30 12:44:06
marcin@python-works.com
fixes #36, removed username, name, lastname, minimal length restrictions,
fixed branches/tags icons in changelog and made them active links
3 files changed with 20 insertions and 18 deletions:
0 comments (0 inline, 0 general)
pylons_app/model/forms.py
Show inline comments
 
@@ -247,7 +247,7 @@ class LoginForm(formencode.Schema):
 
    filter_extra_fields = True
 
    username = UnicodeString(
 
                             strip=True,
 
                             min=3,
 
                             min=1,
 
                             not_empty=True,
 
                             messages={
 
                                       'empty':_('Please enter a login'),
 
@@ -256,7 +256,7 @@ class LoginForm(formencode.Schema):
 

	
 
    password = UnicodeString(
 
                            strip=True,
 
                            min=3,
 
                            min=8,
 
                            not_empty=True,
 
                            messages={
 
                                      'empty':_('Please enter a password'),
 
@@ -271,15 +271,15 @@ def UserForm(edit=False, old_data={}):
 
    class _UserForm(formencode.Schema):
 
        allow_extra_fields = True
 
        filter_extra_fields = True
 
        username = All(UnicodeString(strip=True, min=3, not_empty=True), ValidUsername(edit, old_data))
 
        username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data))
 
        if edit:
 
            new_password = All(UnicodeString(strip=True, min=3, not_empty=False), ValidPassword)
 
            new_password = All(UnicodeString(strip=True, min=8, not_empty=False), ValidPassword)
 
            admin = StringBoolean(if_missing=False)
 
        else:
 
            password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword)
 
        active = StringBoolean(if_missing=False)
 
        name = UnicodeString(strip=True, min=3, not_empty=True)
 
        lastname = UnicodeString(strip=True, min=3, not_empty=True)
 
        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
 
@@ -298,7 +298,7 @@ def RepoForm(edit=False, old_data={}):
 
        allow_extra_fields = True
 
        filter_extra_fields = False
 
        repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
 
        description = UnicodeString(strip=True, min=3, not_empty=True)
 
        description = UnicodeString(strip=True, min=1, not_empty=True)
 
        private = StringBoolean(if_missing=False)
 
        
 
        if edit:
 
@@ -312,7 +312,7 @@ def RepoSettingsForm(edit=False, old_dat
 
        allow_extra_fields = True
 
        filter_extra_fields = False
 
        repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
 
        description = UnicodeString(strip=True, min=3, not_empty=True)
 
        description = UnicodeString(strip=True, min=1, not_empty=True)
 
        private = StringBoolean(if_missing=False)
 
        
 
        chained_validators = [ValidPerms, ValidSettings]
 
@@ -323,8 +323,8 @@ def ApplicationSettingsForm():
 
    class _ApplicationSettingsForm(formencode.Schema):
 
        allow_extra_fields = True
 
        filter_extra_fields = False
 
        hg_app_title = UnicodeString(strip=True, min=3, not_empty=True)
 
        hg_app_realm = UnicodeString(strip=True, min=3, not_empty=True)
 
        hg_app_title = UnicodeString(strip=True, min=1, not_empty=True)
 
        hg_app_realm = UnicodeString(strip=True, min=1, not_empty=True)
 
        
 
    return _ApplicationSettingsForm
 
 
 
@@ -333,7 +333,7 @@ def ApplicationUiSettingsForm():
 
        allow_extra_fields = True
 
        filter_extra_fields = False
 
        web_push_ssl = OneOf(['true', 'false'], if_missing='false')
 
        paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=3, not_empty=True))
 
        paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True))
 
        hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False)
 
        hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False)
 
        
pylons_app/public/css/style.css
Show inline comments
 
@@ -3152,7 +3152,7 @@ h3.files_location{
 
	border-bottom: 1px solid #CCCCCC;
 
	border-left: 1px solid #CCCCCC;
 
	border-right: 1px solid #CCCCCC;
 
	min-height: 90px;
 
	min-height: 80px;
 
	overflow: hidden;
 
	font-size:1.2em;	
 
}
 
@@ -3223,14 +3223,14 @@ h3.files_location{
 
}
 
 
.right .logtags .branchtag{
 
	background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 130px 9px;
 
	background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat right 9px;
 
    display:block;
 
    padding:12px 2px 2px 24px;
 
    padding:12px 16px 0px 0px
 
}
 
.right .logtags .tagtag{
 
    background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 130px 9px;
 
    background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat right 9px;
 
    display:block;
 
    padding:12px 2px 2px 24px;
 
    padding:12px 18px 0px 0px
 
}
 
 
/* -----------------------------------------------------------
pylons_app/templates/changelog/changelog.html
Show inline comments
 
@@ -76,9 +76,11 @@
 
										</div>
 
									%endfor
 
								<span class="logtags">
 
									<span class="branchtag">${cs.branch}</span>
 
									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 
									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
 
									%for tag in cs.tags:
 
										<span class="tagtag">${tag}</span>
 
										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 
										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
 
									%endfor
 
								</span>																	
 
						</div>				
0 comments (0 inline, 0 general)