This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 8b3b919d4f10c6daca9c805711317ea4fe9d4ebf Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Mon Jun 17 20:25:46 2019 +0200
[frontend] separate projects_header block from show_top block --- frontend/coprs_frontend/coprs/templates/coprs/group_show.html | 3 +++ frontend/coprs_frontend/coprs/templates/coprs/show.html | 4 ++++ frontend/coprs_frontend/coprs/templates/coprs/show/all.html | 6 +++++- frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html | 2 ++ frontend/coprs_frontend/coprs/templates/coprs/show/group.html | 6 +++++- frontend/coprs_frontend/coprs/templates/coprs/show/user.html | 6 +++++- 6 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/group_show.html b/frontend/coprs_frontend/coprs/templates/coprs/group_show.html index 2528f64..6a32eb7 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/group_show.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/group_show.html @@ -9,6 +9,9 @@ <div class="col-md-9 col-sm-8"> {% block show_top %} {% endblock %} + + {% block projects_header %} + {% endblock %} <div class="list-group"> {% for copr in coprs %} <!--copr-project--> diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html b/frontend/coprs_frontend/coprs/templates/coprs/show.html index 10ed4e8..f71361f 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html @@ -10,6 +10,10 @@ {% block content %} {% block show_top %} {% endblock %} + + {% block projects_header %} + {% endblock %} + <div class="panel panel-default"> <div class="list-group"> {% for copr in coprs %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/all.html b/frontend/coprs_frontend/coprs/templates/coprs/show/all.html index be8624a..58e7605 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show/all.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show/all.html @@ -1,8 +1,9 @@ {% extends "coprs/show.html" %} {% block title %}Project List{% endblock %} {% block header %}Project List{% endblock %} -{% block show_top %}
+ +{% block show_top %} {% if not g.user and not fulltext%} <br> <div class="panel panel-default"> @@ -11,7 +12,10 @@ </div> </div> {% endif %} +{% endblock %} +
+{% block projects_header %} {% if g.user %} <a href="{{url_for('coprs_ns.copr_add', username=g.user.name) }}" class="btn button-new pull-right btn-primary"> <span class="pficon pficon-add-circle-o"></span> New Project diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html b/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html index fb713ec..8f309c0 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html @@ -14,5 +14,7 @@ </ol> {% endblock %} {% block show_top %} + + <h1> Search Results <small> {{fulltext}} </small></h1> {% endblock %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/group.html b/frontend/coprs_frontend/coprs/templates/coprs/show/group.html index e33a6b7..eb282a9 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show/group.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show/group.html @@ -12,8 +12,9 @@ </li> </ol> {% endblock %} -{% block show_top %}
+ +{% block show_top %} <div id="profile"> <h1>@{{group.name}} Group</h1> <p> @@ -21,7 +22,10 @@ <a href="https://admin.fedoraproject.org/accounts/group/members/{{ group.fas_name }}" title="{{ group.fas_name }}'s Members" target="_blank">View Members</a> </h> </div> +{% endblock %} +
+{% block projects_header %} {% if g.user and g.user.can_build_in_group(group) %} <a href="{{url_for('coprs_ns.copr_add', group_name=group.name) }}" class="btn button-new pull-right btn-primary"> <span class="pficon pficon-add-circle-o"></span> diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/user.html b/frontend/coprs_frontend/coprs/templates/coprs/show/user.html index a25eba4..322cf0f 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/show/user.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/show/user.html @@ -12,8 +12,9 @@ </li> </ol> {% endblock %} -{% block show_top %}
+ +{% block show_top %} <div id="profile"> <img src="{{ user.gravatar_url }}" alt="User Image" class="avatar"> <h1>{{user.name|capitalize}}'s Profile</h1> @@ -37,7 +38,10 @@ {% include "user_meta.html" %} </p> </div> +{% endblock %} +
+{% block projects_header %} {% if g.user == user %} <a href="{{url_for('coprs_ns.copr_add', username=g.user.name) }}" class="btn button-new pull-right btn-primary"> <span class="pficon pficon-add-circle-o"></span> New Project