# HG changeset patch # User Marcin Kuzminski # Date 2011-11-19 19:37:54 # Node ID b702d0d4b03057b880e1422dce3a9beefe51c67e # Parent bc16d1d0869a6d7768e587ce732492072cb500b5 fixed inline comment indicator. - templates cleanup diff --git a/rhodecode/public/css/diff.css b/rhodecode/public/css/diff.css --- a/rhodecode/public/css/diff.css +++ b/rhodecode/public/css/diff.css @@ -135,7 +135,8 @@ cursor: pointer; padding:0; margin:0; } -.line:hover{ + +.diffblock.margined.comm .line:hover{ background-color:#FFFFCC !important; cursor: pointer !important; background-image:url("../images/icons/comment_add.png") !important; diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -16,7 +16,7 @@ ${_('private repository')} - ${r2p.user.username} + ${r2p.user.username} %else: diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -58,7 +58,7 @@ ${_('public')} + src="${h.url('/images/icons/arrow_divide.png')}"/> %endif ${h.truncate(repo['description'],60)} diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -138,16 +138,16 @@ %if repo['dbrepo']['repo_type'] =='hg': - ${_('Mercurial repository')} + ${_('Mercurial repository')} %elif repo['dbrepo']['repo_type'] =='git': - ${_('Git repository')} + ${_('Git repository')} %else: %endif %if repo['dbrepo']['private']: - ${_('private')} + ${_('private')} %else: - ${_('public')} + ${_('public')} %endif ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")} diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -59,23 +59,23 @@ ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
${_('Remove all elements')} - remove + remove
add + src="${h.url('/images/icons/arrow_left.png')}"/>
remove + src="${h.url('/images/icons/arrow_right.png')}"/>
${_('Available members')}
${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
- add + add ${_('Add all elements')}
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -119,7 +119,7 @@ %for change,filenode,diff,cs1,cs2,stat in c.changes: %if change !='removed':
-
+
diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -38,7 +38,7 @@ %for entry in c.following:
%if entry.follows_user_id: - ${_('user')} + ${_('user')} ${entry.follows_user.full_contact} %endif @@ -50,9 +50,9 @@
%if entry.follows_repository.private: - ${_('private repository')} + ${_('private repository')} %else: - ${_('public repository')} + ${_('public repository')} %endif ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',