From bb5221d2c86d427e0cb7e55ac20df722f27b7855 Mon Sep 17 00:00:00 2001 From: ntmmfts Date: Thu, 6 Jan 2022 20:54:48 -1000 Subject: [PATCH] pulling upgrade --- changedetectionio/__init__.py | 16 ++++++++------- changedetectionio/static/js/tbltools.js | 17 +++++++++++++++- changedetectionio/static/styles/styles.css | 20 +++++++++++-------- .../templates/watch-overview.html | 3 +++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py index 391f7dae..8e948588 100644 --- a/changedetectionio/__init__.py +++ b/changedetectionio/__init__.py @@ -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 : @@ -686,7 +686,7 @@ def changedetection_app(config=None, datastore_o=None): flash("{} watch{} {} rechecking.".format(i, "" if (i == 1) else "es", "is" if (i == 1) else "are"), "notice") #flash("{} watches are rechecking.".format(i)) - + # Clear selected statuses, so we do not see the 'unviewed' class elif func == 'mark_selected_viewed' : @@ -755,15 +755,15 @@ 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() - + @app.route("/diff/", methods=['GET']) @login_required def diff_history_page(uuid): @@ -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. diff --git a/changedetectionio/static/js/tbltools.js b/changedetectionio/static/js/tbltools.js index 1acf0def..7ebd2c05 100644 --- a/changedetectionio/static/js/tbltools.js +++ b/changedetectionio/static/js/tbltools.js @@ -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"; @@ -388,4 +394,13 @@ function getSort() { //alert("Your web browser does not support retaining sorting and page position."); } } +} + +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"; } \ No newline at end of file diff --git a/changedetectionio/static/styles/styles.css b/changedetectionio/static/styles/styles.css index 17f764dd..687e395a 100644 --- a/changedetectionio/static/styles/styles.css +++ b/changedetectionio/static/styles/styles.css @@ -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; } diff --git a/changedetectionio/templates/watch-overview.html b/changedetectionio/templates/watch-overview.html index 53b76bf8..a72209f3 100644 --- a/changedetectionio/templates/watch-overview.html +++ b/changedetectionio/templates/watch-overview.html @@ -42,6 +42,9 @@
  • Delete  
    • +
  • + Cancel   +