Revert "fixed backend test failure - had to remove grammar formatting replacement for flash message in api_watch_checknow."

This reverts commit b1292908e2.

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 :
 
@@ -684,8 +684,7 @@ def changedetection_app(config=None, datastore_o=None):
                 except KeyError :
                     pass
 
-                flash("{} watch{} {} rechecking.".format(i, "" if (i == 1) else "es", "is" if (i == 1) else "are"), "notice")
-                #flash("{} watches are rechecking.".format(i))
+                flash("{0} watch{1} {2} rechecking.".format(i, "" if i == 1 else "es", "is" if i == 1 else "are"))
             
             # Clear selected statuses, so we do not see the 'unviewed' class
             elif func == 'mark_selected_viewed' :
@@ -755,14 +754,13 @@ 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/<string:uuid>", methods=['GET'])
     @login_required
@@ -939,7 +937,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,12 +1003,11 @@ 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
-
-        #flash("{} watch{} {} rechecking.".format(i, "" if (i == 1) else "es", "is" if (i == 1) else "are"), "notice")
-        flash("{} watches are rechecking.".format(i))
+        flash("{0} watch{1} {2} rechecking.".format(i, "" if i == 1 else "es", "is" if i == 1 else "are"))
         return redirect(url_for('index', tag=tag))
 
     # @todo handle ctrl break
@@ -1024,6 +1021,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

changedetectionio/static/js/tbltools.js

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

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,14 +219,10 @@ 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: 5px;
-	border-bottom-left-radius: 5px;
+	border-top-left-radius: 0px;
+	border-bottom-left-radius: 0px;
 	border-top-right-radius: 5px;
 	border-bottom-right-radius: 5px;
 }

changedetectionio/templates/watch-overview.html

@@ -42,9 +42,6 @@
 					<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>