lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-12-15 12:36:53 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

pulling upgrade

Browse Source
This commit is contained in:
ntmmfts
2022-01-06 20:54:48 -10:00
parent e5add6c773
commit bb5221d2c8
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
changedetectionio/__init__.py
View File

@@ -663,7 +663,7 @@ def changedetection_app(config=None, datastore_o=None):
uuids = request.form.get('uuids')
if uuids == '' :
flash("No watches selected.", "notice")
flash("No watches selected.")
else :
@@ -755,11 +755,11 @@ def changedetection_app(config=None, datastore_o=None):
datastore.needs_write = True
flash("{} {} deleted.".format(i, "watch was" if (i) == 1 else "watches were"), "notice")
flash("{0} {1} deleted.".format(i, "watch was" if (i) == 1 else "watches were"))
else :
flash("Invalid parameter received.", "error")
flash("Invalid parameter received.")
render_template(url_for('index'), tag = limit_tag)
return index()
@@ -939,7 +939,7 @@ def changedetection_app(config=None, datastore_o=None):
if add_paused :
datastore.data['watching'][new_uuid]['paused'] = True
datastore.needs_write = True
flash("Watch added in a paused state.", "notice")
flash("Watch added in a paused state.")
else : # watch now
# Straight into the queue.
@@ -1005,6 +1005,7 @@ def changedetection_app(config=None, datastore_o=None):
else:
# No tag, no uuid, add everything.
for watch_uuid, watch in datastore.data['watching'].items():
if watch_uuid not in running_uuids and not datastore.data['watching'][watch_uuid]['paused']:
update_q.put(watch_uuid)
i += 1
@@ -1024,6 +1025,7 @@ def changedetection_app(config=None, datastore_o=None):
return app
# Check for new version and anonymous stats
def check_for_new_version():
import requests
@@ -1094,7 +1096,7 @@ def ticker_thread_check_time_launch_checks():
for uuid, watch in copied_datastore.data['watching'].items():
# If they supplied an individual entry minutes to threshold.
if 'minutes_between_check' in watch and watch['minutes_between_check'] is not None:
# Cast to int just incase
# Cast to int just incase #160, kluge for checks in seconds
max_time = int(watch['minutes_between_check']) * 60
else:
# Default system wide.

17
changedetectionio/static/js/tbltools.js
View File

@@ -218,7 +218,13 @@ function checkChange(e) {
var i;
var totalCheckbox = document.querySelectorAll('input[name="check"]').length;
var totalChecked = document.querySelectorAll('input[name="check"]:checked').length;
var checkboxFunctions = document.getElementById('checkbox-functions'); //document.querySelectorAll('[id=checkbox-functions]');
var checkboxFunctions = document.getElementById('checkbox-functions');
if(totalCheckbox == totalChecked) {
document.getElementsByName("showhide")[0].checked=true;
}
else {
document.getElementsByName("showhide")[0].checked=false;
}
if (totalChecked > 0) {
checkboxFunctions.style.display = "";
checkboxFunctions.style.left = offsetLeft + 30 + "px";
@@ -389,3 +395,12 @@ function getSort() {
}
}
}
function closeGridDisplay() {
document.getElementsByName("showhide")[0].checked = false;
var checkboxes = document.getElementsByName('check');
for (var i = 0; i < checkboxes.length; i++) {
checkboxes[i].checked = false;
}
document.getElementById("checkbox-functions").style.display = "none";
}

20
changedetectionio/static/styles/styles.css
View File

@@ -179,18 +179,18 @@ section.content {
#post-list-buttons li {
display:inline-block
}
#post-list-buttons a {
border-top-left-radius:initial;
border-top-right-radius:initial;
border-bottom-left-radius:5px;
border-bottom-right-radius:5px;
}
#post-list-buttons-top-grid {
margin: 0px;
}
#post-list-buttons-top-grid li {
list-style-type: none;
}
#post-list-buttons a {
border-top-left-radius:initial;
border-top-right-radius:initial;
border-bottom-left-radius:5px;
border-bottom-right-radius:5px
}
#checkbox-functions ul {
padding-left: 0px;
}
@@ -219,10 +219,14 @@ section.content {
-ms-grid-column: 1;
-ms-grid-row: 4;
}
#grid-item-5 { /* IE grid support */
-ms-grid-column: 1;
-ms-grid-row: 5;
}
#checkbox-functions .pure-button {
background: #0078e7;
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}

3
changedetectionio/templates/watch-overview.html
View File

@@ -42,6 +42,9 @@
<li id="grid-item-4">
<a href="javascript:processChecked('delete_selected', '{{ active_tag }}');" class="pure-button button-tag danger " title="Delete Selected{%if active_tag%} in &quot;{{active_tag}}&quot;{%endif%}">Delete&nbsp;&nbsp;</a>
</li>
<li id="grid-item-5">
<a href="javascript:closeGridDisplay();" class="pure-button button-tag ">Cancel&nbsp;&nbsp;</a>
</li>
</ul>
</div>
</div>