From: Michael Tremer Date: Mon, 15 Oct 2018 08:56:00 +0000 (+0100) Subject: Drop admin.ipfire.org X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1647749c2a8edec18b71ce6080aa774a288b6839;p=ipfire.org.git Drop admin.ipfire.org Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 9586aea2..52778bd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,6 @@ web_PYTHON = \ src/web/blog.py \ src/web/download.py \ src/web/handlers.py \ - src/web/handlers_admin.py \ src/web/handlers_base.py \ src/web/handlers_boot.py \ src/web/handlers_fireinfo.py \ diff --git a/src/templates/admin-accounts-edit.html b/src/templates/admin-accounts-edit.html deleted file mode 100644 index 6c693cb7..00000000 --- a/src/templates/admin-accounts-edit.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "admin-base.html" %} - -{% block content %} -
-

{{ _("Account Administrator") }}

- - {{ user.realname }} -
-{% end %} diff --git a/src/templates/admin-accounts.html b/src/templates/admin-accounts.html deleted file mode 100644 index ab8fe3a5..00000000 --- a/src/templates/admin-accounts.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "admin-base.html" %} - -{% block content %} -
-

{{ _("Account Administrator") }}

- -

- {{ _("Create new account") }} -

- - - - - - - {% for account in accounts %} - - - - - {% end %} -
{{ _("Name (Nickname)") }} 
{{ account.cn }} ({{ account.uid }}) - {{ _("Edit") }} - {{ _("Delete") }} -
-
-{% end %} diff --git a/src/templates/admin-downloads-mirrors.html b/src/templates/admin-downloads-mirrors.html deleted file mode 100644 index 2597579a..00000000 --- a/src/templates/admin-downloads-mirrors.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "admin-downloads-base.html" %} - -{% block content %} -
-

{{ _("Download statistics") }}

- -

{{ _("Mirror load from today") }}

- {% module FireinfoTable(mirror_load_today, sortby="percentage") %} - -

{{ _("Mirror load") }}

- {% module FireinfoTable(mirror_load_total, sortby="percentage") %} -
-{% end %} diff --git a/src/templates/admin-downloads.html b/src/templates/admin-downloads.html deleted file mode 100644 index 1e606b96..00000000 --- a/src/templates/admin-downloads.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} - -{% block body %} -
-

{{ _("Download statistics") }}

- -

{{ _("Download counters") }}

- - - - - - - - - - - - - -
{{ _("Today") }}{{ downloads_today }}
{{ _("Yesterday") }}{{ downloads_yesterday }}
{{ _("Total") }}{{ downloads_total }}
- -

{{ _("Downloads by country") }}

- {% module FireinfoGeoTable(downloads_locations_today) %} - {% module FireinfoGeoTable(downloads_locations_total) %} -
-{% end %} diff --git a/src/templates/admin-index.html b/src/templates/admin-index.html deleted file mode 100644 index 0b62dc17..00000000 --- a/src/templates/admin-index.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "base.html" %} - -{% block body %} -
-

{{ _("Admin Area") }}

-
-{% end %} diff --git a/src/templates/admin-mirrors-create.html b/src/templates/admin-mirrors-create.html deleted file mode 100644 index 485026e3..00000000 --- a/src/templates/admin-mirrors-create.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "admin-base.html" %} - -{% block content %} -
-

{{ _("Create new mirror") }}

-
- {% raw xsrf_form_html() %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ _("Hostname") }}
{{ _("Path") }}
{{ _("Owner") }}
{{ _("Location") }}
{{ _("File mirror") }} - -
{{ _("Pakfire 2 mirror") }} - -
{{ _("Pakfire 3 mirror") }} - -
{{ _("Disabled?") }} - -
- -
-
-
-{% end block %} diff --git a/src/templates/admin-mirrors-details.html b/src/templates/admin-mirrors-details.html deleted file mode 100644 index d7b544a0..00000000 --- a/src/templates/admin-mirrors-details.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "admin-base.html" %} - -{% block content %} -
-

{{ mirror.hostname }} - {{ _("Details") }}

- -

- {{ _("All mirrors") }} -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ _("Hostname") }}{{ mirror.url }}
{{ _("Status") }}{{ mirror.state }}
{{ _("Owner") }}{{ mirror.owner }}
{{ _("Location") }}{{ mirror.location }}
{{ _("GeoIP Location") }}{{ mirror.country_code }}
{{ _("File mirror") }}{{ mirror.releases }}
{{ _("Pakfire 2 mirror") }}{{ mirror.pakfire2 }}
{{ _("Pakfire 3 mirror") }}{{ mirror.pakfire3 }}
{{ _("Disabled?") }}{{ mirror.disabled }}
- - {% if mirror.releases == "Y" %} -

{{ _("Filelist") }}

- - {% for file in mirror.filelist %} - - - - {% end %} -
{{ file }}
- {% end %} -
-{% end block %} diff --git a/src/templates/admin-mirrors.html b/src/templates/admin-mirrors.html deleted file mode 100644 index 7220df09..00000000 --- a/src/templates/admin-mirrors.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "admin-base.html" %} - -{% block content %} -
-

{{ _("Mirror Administrator") }}

- -

- {{ _("Create new mirror") }} | - {{ _("Re-check now") }} -

- - - - - - - - {% for mirror in mirrors %} - - - - - - {% end %} -
{{ _("Hostname") }}{{ _("Last update") }} 
{{ mirror.hostname }}{{ locale.format_date(mirror.last_update) }} - {{ _("Details") }} - {{ _("Edit") }} - {{ _("Delete") }} -
-
-{% end %} diff --git a/src/templates/admin-planet-compose.html b/src/templates/admin-planet-compose.html deleted file mode 100644 index 08a31083..00000000 --- a/src/templates/admin-planet-compose.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends "base.html" %} - -{% block body %} -
-

{{ _("Compose new entry") }}

-
- -
- {% raw xsrf_form_html() %} - - {% if entry %} - - {% end %} - -
- -
- -
-
- -
-
- -
-
- -
- -
- -
- - -
-
- -
- -
- - {{ _("Preview") }} - {{ _("Cancel") }} -
-
- -
- -
- - -{% end block %} diff --git a/src/templates/admin-planet.html b/src/templates/admin-planet.html deleted file mode 100644 index 6c3ab5bc..00000000 --- a/src/templates/admin-planet.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base.html" %} - -{% block body %} -
-

{{ _("Planet Administrator") }}

- -

- {{ _("Compose new entry") }} -

- - - - - - - - {% for entry in entries %} - - - - - - {% end %} -
{{ _("Author") }}{{ _("Title") }} 
- {{ entry.author.name }} - - {{ entry.title }} - {% if entry.is_draft() %} - {{ _("Draft") }} - {% end %} - - {{ _("Edit") }} - {% if entry.is_draft() %} - • {{ _("Publish") }} - {% end %} -
-
-{% end %} diff --git a/src/templates/modules/menu.html b/src/templates/modules/menu.html index 3bb5c805..8dbe67b4 100644 --- a/src/templates/modules/menu.html +++ b/src/templates/modules/menu.html @@ -18,14 +18,6 @@
  • {{ _("Community") }}
    • - - {% elif hostname == "admin.ipfire.org" %} -
  • - {{ _("Fireinfo") }} -
    • -
  • - {{ _("Downloads") }} -
    • {% elif hostname in ("downloads.ipfire.org", "download.ipfire.org") %}
  • {{ _("Mirrors") }} @@ -62,7 +54,7 @@
    • -{% elif hostname in ("admin.ipfire.org", "nopaste.ipfire.org", "talk.ipfire.org") %} +{% elif hostname in ("nopaste.ipfire.org", "talk.ipfire.org") %}