Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 9237021f2bf925010ecbf08ceaa3f3625e371ee3
Author: Jakub Kadl����k <jkadlcik(a)redhat.com>
Date: Mon Nov 30 20:25:47 2015 +0100
[frontend] unite edit, webhooks and delete under settings page
---------------------------------------------------------------
.../coprs/templates/coprs/detail.html | 17 ++--------
.../coprs/templates/coprs/detail/delete.html | 23 --------------
.../coprs/templates/coprs/detail/edit.html | 18 -----------
.../templates/coprs/detail/settings/delete.html | 17 ++++++++++
.../templates/coprs/detail/settings/edit.html | 12 +++++++
.../templates/coprs/detail/settings/settings.html | 32 ++++++++++++++++++++
.../templates/coprs/detail/settings/webhooks.html | 21 +++++++++++++
.../coprs/templates/coprs/detail/webhooks.html | 24 ---------------
.../coprs/views/coprs_ns/coprs_general.py | 6 ++--
9 files changed, 88 insertions(+), 82 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail.html
index 0359501..44598a8 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail.html
@@ -6,16 +6,13 @@
{% set url_builds = url_for('coprs_ns.group_copr_builds', group_name =
copr.group.name, coprname = copr.name) %}
{% set url_monitor = url_for('coprs_ns.group_copr_build_monitor', group_name =
copr.group.name, coprname = copr.name) %}
{% set url_add_build = url_for('coprs_ns.group_copr_add_build', group_name =
copr.group.name, coprname = copr.name) %}
- {% set url_delete = url_for('coprs_ns.group_copr_delete', group_name =
copr.group.name, coprname = copr.name) %}
- {% set url_edit = url_for('coprs_ns.group_copr_edit', group_name =
copr.group.name, coprname = copr.name) %}
+ {% set url_settings = url_for('coprs_ns.group_copr_edit', group_name =
copr.group.name, coprname = copr.name) %}
{% else %}
{% set url_overview = url_for('coprs_ns.copr_detail', username =
copr.owner.name, coprname = copr.name) %}
{% set url_builds = url_for('coprs_ns.copr_builds', username =
copr.owner.name, coprname = copr.name) %}
{% set url_monitor = url_for('coprs_ns.copr_build_monitor', username =
copr.owner.name, coprname = copr.name) %}
{% set url_add_build = url_for('coprs_ns.copr_add_build', username =
copr.owner.name, coprname = copr.name) %}
- {% set url_delete = url_for('coprs_ns.copr_delete', username =
copr.owner.name, coprname = copr.name) %}
- {% set url_edit = url_for('coprs_ns.copr_edit', username = copr.owner.name,
coprname = copr.name) %}
- {% set url_webhooks = url_for('coprs_ns.copr_webhooks', username =
copr.owner.name, coprname = copr.name) %}
+ {% set url_settings = url_for('coprs_ns.copr_edit', username = copr.owner.name,
coprname = copr.name) %}
{% endif %}
{% block title %}{{ copr.owner.name }}/{{ copr.name }} Copr{% endblock %}
@@ -74,14 +71,6 @@
{{ nav_element("add_build", "New Build", url_add_build) }}
{% endif %}
- {% if g.user and g.user.can_edit(copr) %}
- {{ nav_element("edit", "Edit", url_edit) }}
- {% endif %}
-
- {% if g.user and g.user.can_edit(copr) %}
- {{ nav_element("webhooks", "Webhooks", url_webhooks) }}
- {% endif %}
-
{% if g.user and not copr.is_a_group_project %}
{{ nav_element("permissions", "Permissions", url_for(
'coprs_ns.copr_permissions', username = copr.owner.name, coprname =
copr.name))
@@ -89,7 +78,7 @@
{% endif %}
{% if g.user and g.user.can_edit(copr) %}
- {{ nav_element("delete", "Delete", url_delete) }}
+ {{ nav_element("settings", "Settings", url_settings) }}
{% endif %}
</ul>
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/delete.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/delete.html
deleted file mode 100644
index f165cec..0000000
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/delete.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "coprs/detail.html" %}
-{% from "coprs/_coprs_forms.html" import copr_delete_form %}
-
-{% set selected_tab = "delete" %}
-
-{% block title %}Delete {{ copr.owner.name }}/{{ copr.name }}?{% endblock %}
-
-{%block project_breadcrumb %}
-<li class="active">
- Delete
-</li>
-{%endblock%}
-
-{% block detail_body %}
-<h2> Delete Project </h2>
- <p>If you really want to delete this Project, you'll have to answer this
riddle:</p>
- <p>{{ range(5)|random }}.{{ range(10)|random }} hens lay {{ range(5)|random }}.{{
range(10)|random }} eggs in
- {{ range(5)|random }}.{{ range(10)|random }} days. How many eggs do {{ range(5)|random
}}.{{ range(10)|random }}
- hens lay in {{ range(5)|random }}.{{ range(10)|random }} days?</p>
- <p>Ok, kidding, just type "<strong>yes</strong>" into the
below box.</p>
- {{ copr_delete_form(form, copr) }}
-
-{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/edit.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/edit.html
deleted file mode 100644
index e5b8c03..0000000
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/edit.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "coprs/detail.html" %}
-{% from "coprs/_coprs_forms.html" import copr_form, copr_permissions_form with
context %}
-
-{% set selected_tab = "edit" %}
-
-{% block title %}Editing {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
-
-{%block project_breadcrumb %}
-<li class="active">
- Edit
-</li>
-{%endblock%}
-
-{% block detail_body %}
- <h2> Edit Project Details</h2>
-
- {{ copr_form(form, view = view, copr = copr) }}
-{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/delete.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/delete.html
new file mode 100644
index 0000000..ddb1a0a
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/delete.html
@@ -0,0 +1,17 @@
+{% extends "coprs/detail/settings/settings.html" %}
+{% from "coprs/_coprs_forms.html" import copr_delete_form %}
+
+{% set selected_monitor_tab = "delete" %}
+
+
+{% block tab_content %}
+
+<h2> Delete Project </h2>
+<p>If you really want to delete this Project, you'll have to answer this
riddle:</p>
+<p>{{ range(5)|random }}.{{ range(10)|random }} hens lay {{ range(5)|random }}.{{
range(10)|random }} eggs in
+ {{ range(5)|random }}.{{ range(10)|random }} days. How many eggs do {{
range(5)|random }}.{{ range(10)|random }}
+ hens lay in {{ range(5)|random }}.{{ range(10)|random }} days?</p>
+<p>Ok, kidding, just type "<strong>yes</strong>" into the
below box.</p>
+{{ copr_delete_form(form, copr) }}
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/edit.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/edit.html
new file mode 100644
index 0000000..d768ae8
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/edit.html
@@ -0,0 +1,12 @@
+{% extends "coprs/detail/settings/settings.html" %}
+{% from "coprs/_coprs_forms.html" import copr_form %}
+
+{% set selected_monitor_tab = "edit" %}
+
+
+{% block tab_content %}
+
+<h2> Edit Project Details</h2>
+{{ copr_form(form, view=view, copr=copr) }}
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/settings.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/settings.html
new file mode 100644
index 0000000..5da1c96
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/settings.html
@@ -0,0 +1,32 @@
+{% extends "coprs/detail.html" %}
+{% block title %}Settings {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
+
+{% set selected_tab = "settings" %}
+
+
+{% macro tab(tab_name, tab_title, href) %}
+<li class="{% if selected_monitor_tab == tab_name %}active{% endif %}">
+ <a href="{{ href }}">
+ {{ tab_title }}
+ </a>
+</li>
+{% endmacro %}
+
+
+{% block detail_body %}
+
+<ul class="nav nav-tabs nav-tabs-pf">
+ {% if copr.is_a_group_project %}
+ {{ tab("edit", "Edit",
url_for('coprs_ns.group_copr_edit', group_name=copr.group.name,
coprname=copr.name)) }}
+ {{ tab("webhooks", "Webhooks",
url_for('coprs_ns.group_copr_webhooks', group_name=copr.group.name,
coprname=copr.name)) }}
+ {{ tab("delete", "Delete",
url_for('coprs_ns.group_copr_delete', group_name=copr.group.name,
coprname=copr.name)) }}
+ {% else %}
+ {{ tab("edit", "Edit", url_for('coprs_ns.copr_edit',
username=copr.owner.name, coprname=copr.name)) }}
+ {{ tab("webhooks", "Webhooks",
url_for('coprs_ns.copr_webhooks', username=copr.owner.name, coprname=copr.name))
}}
+ {{ tab("delete", "Delete",
url_for('coprs_ns.copr_delete', username=copr.owner.name, coprname=copr.name)) }}
+ {% endif %}
+</ul>
+
+{% block tab_content %}{% endblock %}
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/webhooks.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/webhooks.html
new file mode 100644
index 0000000..b73679e
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/settings/webhooks.html
@@ -0,0 +1,21 @@
+{% extends "coprs/detail/settings/settings.html" %}
+
+{% set selected_monitor_tab = "webhooks" %}
+
+
+{% block tab_content %}
+
+<div class="row">
+ <div class="col-sm-8 col-md-9">
+ <h2> Webhooks </h2>
+ <p> You can set up an automatic builds with webhooks </p>
+
+ <h3> GitHub </h3>
+ <p> We might need to explain here what to do with that... </p>
+ <div class="well well-sm">
+ {{ github_url }}
+ </div>
+ </div>
+</div>
+
+{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/webhooks.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail/webhooks.html
deleted file mode 100644
index 77b2e78..0000000
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail/webhooks.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "coprs/detail.html" %}
-
-{% set selected_tab = "webhooks" %}
-
-{%block project_breadcrumb %}
-<li class="active">
- Webhooks
-</li>
-{%endblock%}
-
-{% block detail_body %}
-<div class="row">
- <div class="col-sm-8 col-md-9">
- <h2> Webhooks </h2>
- <p> You can set up an automatic builds with webhooks </p>
-
- <h3> GitHub </h3>
- <p> We might need to explain here what to do with that... </p>
- <div class="well well-sm">
- {{ github_url }}
- </div>
- </div>
-</div>
-{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 4a0712f..b689aac 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -362,7 +362,7 @@ def render_copr_webhooks(copr):
copr.webhook_secret)
return flask.render_template(
- "coprs/detail/webhooks.html",
+ "coprs/detail/settings/webhooks.html",
copr=copr, github_url=github_url)
@@ -385,7 +385,7 @@ def render_copr_edit(copr, form, view):
form = forms.CoprFormFactory.create_form_cls(
copr.mock_chroots)(obj=copr)
return flask.render_template(
- "coprs/detail/edit.html",
+ "coprs/detail/settings/edit.html",
copr=copr, form=form, view=view)
@@ -609,7 +609,7 @@ def process_delete(copr, url_on_error, url_on_success):
flask.flash("Project has been deleted successfully.")
return flask.redirect(url_on_success)
else:
- return render_template("coprs/detail/delete.html", form=form,
copr=copr)
+ return render_template("coprs/detail/settings/delete.html", form=form,
copr=copr)
@coprs_ns.route("/<username>/<coprname>/delete/",
methods=["GET", "POST"])