diff options
| author | rubenwardy <rw@rubenwardy.com> | 2018-05-11 15:04:17 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2018-05-11 15:04:17 +0100 |
| commit | 92717f31dd94ad1c763641a397305de9bc143df9 (patch) | |
| tree | 3ff4f1fbfbd0f2b1490c46905b959e75dacbaafa /app/templates | |
| parent | 5424f0aa3499ef9cad33ebad4db055860b8000c8 (diff) | |
| download | cheatdb-92717f31dd94ad1c763641a397305de9bc143df9.tar.xz | |
Add VCS import from Github
Diffstat (limited to 'app/templates')
| -rw-r--r-- | app/templates/base.html | 1 | ||||
| -rw-r--r-- | app/templates/packages/view.html | 38 | ||||
| -rw-r--r-- | app/templates/tasks/view.html | 21 |
3 files changed, 43 insertions, 17 deletions
diff --git a/app/templates/base.html b/app/templates/base.html index 07131de..0ab87b4 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -7,6 +7,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>{% block title %}title{% endblock %} - {{ config.USER_APP_NAME }}</title> <link rel="stylesheet" type="text/css" href="/static/main.css"> + {% block headextra %}{% endblock %} </head> <body> diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 5c68ead..ecd6b35 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -78,25 +78,29 @@ <ul> {% for rel in releases %} - <li> - {% if not rel.approved %}<i>{% endif %} - - <a href="{{ rel.url }}">{{ rel.title }}</a>, - created {{ rel.releaseDate }}. - {% if not rel.approved %} - Waiting for approval. - {% endif %} - - {% if package.checkPerm(current_user, "MAKE_RELEASE") or package.checkPerm(current_user, "APPROVE_RELEASE") %} - <a href="{{ rel.getEditURL() }}">Edit - {% if not rel.approved and package.checkPerm(current_user, "APPROVE_RELEASE") %} - / Approve + {% if rel.approved or package.checkPerm(current_user, "MAKE_RELEASE") or package.checkPerm(current_user, "APPROVE_RELEASE") %} + <li> + {% if not rel.approved %}<i>{% endif %} + + <a href="{{ rel.url }}">{{ rel.title }}</a>, + created {{ rel.releaseDate }}. + {% if rel.task_id %} + <a href="{{ url_for('check_task', id=rel.task_id, r=package.getDetailsURL()) }}">Importing</a> + {% elif not rel.approved %} + Waiting for approval. {% endif %} - </a> - {% endif %} - {% if not rel.approved %}</i>{% endif %} - </li> + {% if not rel.task_id and (package.checkPerm(current_user, "MAKE_RELEASE") or package.checkPerm(current_user, "APPROVE_RELEASE")) %} + <a href="{{ rel.getEditURL() }}">Edit + {% if not rel.approved and package.checkPerm(current_user, "APPROVE_RELEASE") %} + / Approve + {% endif %} + </a> + {% endif %} + + {% if not rel.approved %}</i>{% endif %} + </li> + {% endif %} {% else %} <li>No releases available.</li> {% endfor %} diff --git a/app/templates/tasks/view.html b/app/templates/tasks/view.html new file mode 100644 index 0000000..a01ca80 --- /dev/null +++ b/app/templates/tasks/view.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% block title %} +Working +{% endblock %} + +{% block headextra %} + {% if not "error" in info %} + <meta http-equiv="refresh" content="1;URL="> + {% endif %} +{% endblock %} + +{% block content %} + {% if "error" in info %} + <h1>Task Failed</h1> + + <p>{{ info. error }}</p> + {% else %} + <h1>Working…</h1> + {% endif %} +{% endblock %} |