diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html index 38df7e8..aec99c6 100644 --- a/pagure/templates/_render_repo.html +++ b/pagure/templates/_render_repo.html @@ -1,10 +1,8 @@ {% macro render_row(items) -%} {% for repo in items %} - {% if repo.is_fork %} - {% set url = url_for('view_repo', username=repo.user.username, repo=repo.name) %} - {% else %} - {% set url = url_for('view_repo', repo=repo.name) %} - {% endif %} + {% set url = url_for('view_repo', + username=repo.user.username if repo.is_fork else None, + repo=repo.name, namespace=repo.namespace) %}
{% if repo.avatar_email %} @@ -13,14 +11,28 @@
{% endif %} -
{{ repo.name }}
+
+ + {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }} + +
- {% if repo.description %}{{ repo.description }}{%else%}no description{% endif %} + + {% if repo.description %}{{ repo.description }}{% else %} + no description{% endif %} +
@@ -137,9 +149,13 @@ url_for( 'view_repo', username=repo.user.username if repo.is_fork else None, - repo=repo.name) + repo=repo.name, namespace=repo.namespace) }}"> -
{{ repo.name }}
+
+ + {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }} + +
{% else %}

No projects found

@@ -207,11 +223,9 @@
{% for repo in list %}
- {% if repo.is_fork %} - {% set url = url_for('view_repo', username=repo.user.username, repo=repo.name) %} - {% else %} - {% set url = url_for('view_repo', repo=repo.name) %} - {% endif %} + {% set url = url_for('view_repo', + username=repo.user.username if repo.is_fork else None, + repo=repo.name, namespace=repo.namespace) %} {% if repo.avatar_email %}
- {{ repo.name }} + + {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }} +
{% endblock %} -{% block title %}Add group - {{ repo.name }}{% endblock %} +{% block title %}Add group - {{ + repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% block repo %} @@ -19,8 +20,10 @@ Add group to the {{repo.name}} project
-
+
diff --git a/pagure/templates/add_token.html b/pagure/templates/add_token.html index d81f36a..15bef0e 100644 --- a/pagure/templates/add_token.html +++ b/pagure/templates/add_token.html @@ -14,7 +14,8 @@
{% for acl in acls %}
diff --git a/pagure/templates/add_user.html b/pagure/templates/add_user.html index da2bb4e..1c0e179 100644 --- a/pagure/templates/add_user.html +++ b/pagure/templates/add_user.html @@ -8,7 +8,8 @@ rel="stylesheet" /> {% endblock %} -{% block title %}Add user - {{ repo.name }}{% endblock %} +{% block title %}Add user - {{ + repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% block repo %}
@@ -18,7 +19,8 @@
+ username=username, repo=repo.name, + namespace=repo.namespace) }}" method="post">
diff --git a/pagure/templates/comment_update.html b/pagure/templates/comment_update.html index 74eff59..3890a00 100644 --- a/pagure/templates/comment_update.html +++ b/pagure/templates/comment_update.html @@ -44,8 +44,8 @@ } $("#update_comment").atwho(userConfig); }); - $.when($.get("{{ url_for('api_ns.api_view_issues', repo=repo.name, username=username, status='all') }}"), - $.get("{{ url_for('api_ns.api_pull_request_views', repo=repo.name, username=username, status='all') }}") + $.when($.get("{{ url_for('api_ns.api_view_issues', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}"), + $.get("{{ url_for('api_ns.api_pull_request_views', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}") ).done(function(issuesResp, prResp) { // 0 is the api response var issuesAndPrs = issuesResp[0]['issues'].concat(prResp[0]['requests']); diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html index 63224de..e4ca68a 100644 --- a/pagure/templates/commit.html +++ b/pagure/templates/commit.html @@ -1,6 +1,7 @@ {% extends "repo_master.html" %} -{% block title %}Commit - {{ repo.name }} - {{ commitid }}{% endblock %} +{% block title %}Commit - {{ + repo.namespace + '/' if repo.namespace }}{{ repo.name }} - {{ commitid }}{% endblock %} {% set tag = "commit"%} {% block repo %} @@ -11,24 +12,31 @@ Commit {{ commitid|short }} {{ splitted_message[0] }}
- raw - patch - tree + raw + patch + tree {% if commit.parents|length == 1 %} - parent + parent {% elif commit.parents|length > 1 %}
-
@@ -37,13 +45,21 @@
{% if commit.author| author2user == commit.committer| author2user %} - {{diff|count}} file{{'s' if diff|count > 1}} Authored and Committed by {{ commit.author | author2user |safe }} - {{commit.commit_time | humanize}} + {{ diff|count}} file{{'s' if diff|count > 1 }} + Authored and Committed by {{ commit.author | author2user |safe }} + + {{ commit.commit_time | humanize }} + {% else %} - {{diff|count}} file{{'s' if diff|count > 1}} Authored by {{ commit.author | author2user |safe }} - {{commit.commit_time | humanize}}, - Committed by {{ commit.committer | author2user |safe }} - {{commit.commit_time | humanize}}, + {{ diff|count}} file{{'s' if diff|count > 1 }} + Authored by {{ commit.author | author2user |safe }} + + {{ commit.commit_time | humanize }} + , + Committed by {{ commit.committer | author2user |safe }} + + {{ commit.commit_time | humanize }} + , {% endif%}
@@ -99,15 +115,17 @@
{% if patch | hasattr('new_file_path') %} - + {{ patch.new_file_path | unicode }} {% elif patch | hasattr('delta') %} - + {{ patch.delta.new_file.path | unicode }} {% endif %} @@ -157,6 +175,7 @@ url: '{{ url_for("internal_ns.get_branches_of_commit") }}' , type: 'POST', data: { + namespace: "{{ repo.namespace }}", repo: "{{ repo.name }}", repouser: "{{ repo.user.user if repo.is_fork else '' }}", commit_id: "{{ commitid }}", diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index 41f4fa6..0839c5a 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -1,6 +1,7 @@ {% extends "repo_master.html" %} -{% block title %}{{ select.capitalize() }} - {{ repo.name }}{% endblock %} +{% block title %}{{ select.capitalize() }} - {{ + repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} {% set tag = "home" %} {% block repo %} @@ -38,8 +39,9 @@