Skip to content

Commit

Permalink
Fixes automatic-ripping-machine/automatic-ripping-machine#503
Browse files Browse the repository at this point in the history 
Added/updated new discord link

Fixed static image links

Added Apprise config tab to be coded later
  • Loading branch information
@1337-server
1337-server committed Jun 3, 2022
1 parent 625de45 commit 06b4f9f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[![Publish Main Docker Image](https://github.com/1337-server/automatic-ripping-machine/actions/workflows/workflow.yml/badge.svg)](https://github.com/1337-server/automatic-ripping-machine/actions/workflows/workflow.yml)

[![Wiki](https://img.shields.io/badge/Wiki-Get%20Help-brightgreen)](https://github.com/1337-server/automatic-ripping-machine/wiki)
[![Discord](https://img.shields.io/discord/576479573886107699)](https://discord.gg/BCarpwC7qC)
[![Discord](https://img.shields.io/discord/576479573886107699)](https://discord.gg/FUSrn8jUcR)


## Overview
Expand Down
2 changes: 1 addition & 1 deletion arm/ripper/apprise_bulk.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def build_apprise_sent(cfg):
'FAAST_TOKEN': 'faast://' + str(cfg['FAAST_TOKEN']),
'FLOCK_TOKEN': 'flock://' + str(cfg['FLOCK_TOKEN']),
'GITTER_TOKEN': 'gitter://' + str(cfg['GITTER_TOKEN']) + "/" + str(cfg['GITTER_ROOM']),
'GOTIFY_TOKEN': 'gotify://' + str(cfg['GOTIFY_HOST']) + "/" + str(cfg['GOTIFY_TOKEN']),
'GOTIFY_TOKEN': 'gotifys://' + str(cfg['GOTIFY_HOST']) + "/" + str(cfg['GOTIFY_TOKEN']),
'KUMULOS_API': 'kumulos://' + str(cfg['KUMULOS_API']) + "/" + str(cfg['KUMULOS_SERVERKEY']),
'MAILGUN_DOMAIN': 'mailgun://' + str(cfg['MAILGUN_USER']) + "@" + str(cfg['MAILGUN_DOMAIN']) + "/"
+ str(cfg['MAILGUN_APIKEY']),
Expand Down
35 changes: 24 additions & 11 deletions arm/ui/templates/settings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ <h2> ARM - Settings </h2>
role="tab"
aria-controls="uiSettingsTab" aria-selected="false">Ui Settings</a>
</li>
<li class="nav-item" role="presentation">
<a class="nav-link" id="apprise-tab" data-toggle="tab" href="#appriseTab"
role="tab"
aria-controls="appriseTab" aria-selected="false">Apprise config</a>
</li>
</ul>

<!-- Tab Panes -->
Expand All @@ -93,14 +98,14 @@ <h2> ARM - Settings </h2>
<li class="list-group-item">Update Available:
<!-- Update A.R.M -->
{% if stats['updated'] %}
<img src="static/img/success.png"
<img src="{{ url_for('static', filename='/img/success.png') }}"
alt="update image" width="20px" height="20px"> You are on the latest version
{% else %}
<img src="static/img/fail.png"
<img src="{{ url_for('static', filename='/img/fail.png') }}"
alt="update image" width="20px" height="20px">
<form id="updateArm" name="updateArm" method="post" action="">
{{ form.hidden_tag() }}
<button title="Not implemented yet!"
<button title="Update A.R.M Via git"
class="btn btn-primary float-right" type="submit">Update
A.R.M
</button>
Expand Down Expand Up @@ -133,7 +138,7 @@ <h2> ARM - Settings </h2>
</a></div>
<div class="col-lg-4 rounded"><a target="_blank" rel="noopener"
class="stretched-link text-center"
href="https://discord.gg/BCarpwC7qC">
href="https://discord.gg/FUSrn8jUcR">
<img class="rounded mx-auto d-block mt-2"
src="{{ url_for('static', filename='/img/discord/discord-128.png') }}"
alt="Discord">
Expand Down Expand Up @@ -186,7 +191,7 @@ <h2> ARM - Settings </h2>
<a class="popovers" onClick='return false;' href=""
data-content="{{ jsoncomments[k]| replace("#", "\n") }}" rel="popover"
data-placement="top" data-original-title="{{ k }}">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More Info">
</a>
</div>
Expand All @@ -211,7 +216,7 @@ <h2> ARM - Settings </h2>
data-content="{{ jsoncomments['index_refresh']| replace("#", "\n") }}"
rel="popover"
data-placement="top" data-original-title="index_refresh">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -225,7 +230,7 @@ <h2> ARM - Settings </h2>
<a class="popovers" onClick='return false;' href=""
data-content="{{ jsoncomments['use_icons']| replace("#", "\n") }}" rel="popover"
data-placement="top" data-original-title="use_icons">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -241,7 +246,7 @@ <h2> ARM - Settings </h2>
data-content="{{ jsoncomments['save_remote_images']| replace("#", "\n") }}"
rel="popover"
data-placement="top" data-original-title="save_remote_images">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -257,7 +262,7 @@ <h2> ARM - Settings </h2>
data-content="{{ jsoncomments['bootstrap_skin']| replace("#", "\n") }}"
rel="popover"
data-placement="top" data-original-title="bootstrap_skin">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -272,7 +277,7 @@ <h2> ARM - Settings </h2>
<a class="popovers" onClick='return false;' href=""
data-content="{{ jsoncomments['language']| replace("#", "\n") }}" rel="popover"
data-placement="top" data-original-title="language">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -288,7 +293,7 @@ <h2> ARM - Settings </h2>
data-content="{{ jsoncomments['database_limit']| replace("#", "\n") }}"
rel="popover"
data-placement="top" data-original-title="database_limit">
<img title="More information" src="static/img/info.png" width="30px"
<img title="More information" src="{{ url_for('static', filename='/img/info.png') }}" width="30px"
height="35px" alt="More info">
</a>
</div>
Expand All @@ -298,6 +303,14 @@ <h2> ARM - Settings </h2>
</button>
</form>
</div>
<!-- Apprise config -->
<div class="tab-pane pt-5" id="appriseTab" role="tabpanel" aria-labelledby="apprise-tab">
<div class="row">
<div class="col-md-8 mx-auto">
To be added
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 06b4f9f

Please sign in to comment.