kallithea Changeset - 603b6bcd180b

Changeset - 603b6bcd180b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2011-05-12 18:11:01
marcin@python-works.com

merged fix for #188 into default

2 files changed with 2 insertions and 1 deletions:

rhodecode/model/db.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -71,24 +71,25 @@ class User(Base): @@
     admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
     name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     email = Column("email", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
     is_ldap = Column("is_ldap", Boolean(), nullable=False, unique=None, default=False)
     user_log = relationship('UserLog', cascade='all')
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
     repositories = relationship('Repository')
     user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
     repo_to_perm = relationship('RepoToPerm', primaryjoin='RepoToPerm.user_id==User.user_id', cascade='all')
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.name, self.lastname, self.email)
     @property
     def short_contact(self):
         return '%s %s' % (self.name, self.lastname)
     @property
     def is_admin(self):

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2005,25 +2005,25 @@ text-align:left; @@
 padding-top:0px;
+}
 .stop_following_icon {
 background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 padding-left:20px;
 text-align:left;
 padding-top:0px;
+}
 .action_button {
 border:0;
-display:block;
+display:inline;
+}
 .action_button:hover {
 border:0;
 text-decoration:underline;
 cursor:pointer;
+}
 #switch_repos {
 position:absolute;
 height:25px;
 z-index:1;

0 comments (0 inline, 0 general)