diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -19,6 +19,7 @@ news - added help text into repo add/edit forms - created rcextensions module with additional mappings (ref #322) and post push/pull/create repo hooks callbacks +- implemented #377 Users view for his own permissions on account page fixes +++++ diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -4155,6 +4155,47 @@ form.comment-inline-form { padding:5px 0px 5px 38px; } +/**** + PERMS +*****/ +#perms .perms_section_head { + padding:10px 10px 10px 0px; + font-size:16px; + font-weight: bold; +} + +#perms .perm_tag{ + padding: 1px 3px 1px 3px; + font-size: 10px; + font-weight: bold; + text-transform: uppercase; + white-space: nowrap; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +#perms .perm_tag.admin{ + background-color: #B94A48; + color: #ffffff; +} + +#perms .perm_tag.write{ + background-color: #B94A48; + color: #ffffff; +} + +#perms .perm_tag.read{ + background-color: #468847; + color: #ffffff; +} + +#perms .perm_tag.none{ + background-color: #bfbfbf; + color: #ffffff; +} + + /***************************************************************************** DIFFS CSS diff --git a/rhodecode/public/js/rhodecode.js b/rhodecode/public/js/rhodecode.js --- a/rhodecode/public/js/rhodecode.js +++ b/rhodecode/public/js/rhodecode.js @@ -700,6 +700,18 @@ var nameSort = function(a, b, desc, fiel return compState; }; +var permNameSort = function(a, b, desc, field) { + var a_ = fromHTML(a.getData(field)); + var b_ = fromHTML(b.getData(field)); + // extract name from table + a_ = a_.innerHTML; + b_ = b_.innerHTML; + + var comp = YAHOO.util.Sort.compare; + var compState = comp(a_, b_, desc); + return compState; +}; + var groupNameSort = function(a, b, desc, field) { var a_ = fromHTML(a.getData(field)); var b_ = fromHTML(b.getData(field)); 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 @@ -113,52 +113,45 @@
- ${_('My repositories')} + ${_('My repos')} / ${_('My permissions')}
%if h.HasPermissionAny('hg.admin','hg.create.repository')(): %endif
-
- +
+
+
+ - - + + + + <%namespace name="dt" file="/_data_table/_dt_elements.html"/> %if c.user_repos: - %for repo in c.user_repos: + %for repo in c.user_repos: - - + ##QUICK MENU + + ##REPO NAME AND ICONS + + ##LAST REVISION +
${_('Name')}${_('revision')}${_('action')}${_('Revision')}${_('Action')}${_('Action')}
- %if h.is_hg(repo['dbrepo']['repo_type']): - ${_('Mercurial repository')} - %elif h.is_git(repo['dbrepo']['repo_type']): - ${_('Git repository')} - %else: - - %endif - %if repo['dbrepo']['private']: - ${_('private')} - %else: - ${_('public')} - %endif - - ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")} - %if repo['dbrepo_fork']: - - ${_('public')} - %endif - ${("r%s:%s") % (repo['rev'],h.short_id(repo['tip']))} + ${dt.quick_menu(repo['name'])} + + ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))} + + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${_('private')} ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} @@ -177,14 +170,127 @@ %endif
+
+ + 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 @@ -48,7 +48,7 @@ ${_('Name')} - ${_('Tip')} + ${_('Revision')} ${_('Action')} ${_('Action')}