Merge pull request #269 from marwoodandrew/sdesk-1028

[SDESK-1028][SDESK-1029] Update kill takedown templates

server/data/content_templates.json

@@ -3,19 +3,19 @@
         "template_name": "kill",
         "template_type": "kill",
         "is_public": true,
-         "data": {
-            "body_html": "{% if item.desk_name.strip().lower() == \"new zealand\" %}<p>Pursuant to your Information Supply Agreement with New Zealand Newswire (NZN)  , NZN requests that you remove the above story from any media you publish and access to the story be immediately disabled including but not limited to those websites in either your direct or indirect possession, custody, or control. NZN has become aware that the story may potentially expose NZN and those who publish the story to the risk of:</p><p>[insert relevant option/s from below]</p><p>    - a claim in defamation.</p><p>    - a possible prosecution for contempt.</p><p>    - a contempt prosecution arising out of breach of an order of the Family/Supreme/District/Federal Court.</p><p>    - a breach of a law prohibiting publication.</p><p>    - a breach of a law prohibiting publication that applies retrospectively.</p><p>    - a breach of any State or Commonwealth privacy laws.</p><p>    - a claim for damages.</p><p>    - publishing extremely erroneous material.</p><p>    This kill/takedown is mandatory, and no further use can be made of the story.</p><p>    A replacement story will be issued shortly/will not be issued.</p><p>    NZN will not be liable for any losses, costs and expenses, damages and other costs (including without limitation reasonable legal costs), indirect, consequential special or punitive loss or damage, arising out of the story and this Notice suffered or incurred by you after receipt of this Notice.</p>{% else %}<p>Pursuant to your Information Supply Agreement with Australian Associated Press (AAP)  , AAP requests that you remove the above story from any media you publish and access to the story be immediately disabled including but not limited to those websites in either your direct or indirect possession, custody, or control. AAP has become aware that the story may potentially expose AAP and those who publish the story to the risk of:</p><p>[insert relevant option/s from below]</p><p>    - a claim in defamation.</p><p>    - a possible prosecution for contempt.</p><p>    - a contempt prosecution arising out of breach of an order of the Family/Supreme/District/Federal Court.</p><p>    - a breach of a law prohibiting publication.</p><p>    - a breach of a law prohibiting publication that applies retrospectively.</p><p>    - a breach of any State or Commonwealth privacy laws.</p><p>    - a claim for damages.</p><p>    - publishing extremely erroneous material.</p><p>    This kill/takedown is mandatory, and no further use can be made of the story.</p><p>    A replacement story will be issued shortly/will not be issued.</p><p>    AAP will not be liable for any losses, costs and expenses, damages and other costs (including without limitation reasonable legal costs), indirect, consequential special or punitive loss or damage, arising out of the story and this Notice suffered or incurred by you after receipt of this Notice.</p>{% endif %}",
+        "data": {
+            "body_html": "{% if item.desk_name.strip().lower() == \"new zealand\" %}<p>Pursuant to your Information Supply Agreement with New Zealand Newswire (NZN)  , NZN requests that you remove the above story from any media you publish and access to the story be immediately disabled including but not limited to those websites in either your direct or indirect possession, custody, or control. NZN has become aware that the story may potentially expose NZN and those who publish the story to the risk of:</p><p style=\"color:red\"><strong>[insert relevant option/s from below]</strong></p><p style=\"color:red\">    - a breach of an enforceable embargo</p><p style=\"color:red\">    - a claim in defamation.</p><p style=\"color:red\">    - a possible prosecution for contempt.</p><p style=\"color:red\">    - a contempt prosecution arising out of breach of an order of the Family/Supreme/District/Federal Court.</p><p style=\"color:red\">    - a breach of a law prohibiting publication.</p><p style=\"color:red\">    - a breach of a law prohibiting publication that applies retrospectively.</p><p style=\"color:red\">    - a breach of any State or Commonwealth privacy laws.</p><p style=\"color:red\">    - a claim for damages.</p><p style=\"color:red\">    - publishing extremely erroneous material.</p><p><br></p><p>    This kill/takedown is mandatory, and no further use can be made of the story.</p><p>    A replacement story will be issued shortly/will not be issued.</p><p>    NZN will not be liable for any losses, costs and expenses, damages and other costs (including without limitation reasonable legal costs), indirect, consequential special or punitive loss or damage, arising out of the story and this Notice suffered or incurred by you after receipt of this Notice.</p>{% else %}<p>Pursuant to your Information Supply Agreement with Australian Associated Press (AAP)  , AAP requests that you remove the above story from any media you publish and access to the story be immediately disabled including but not limited to those websites in either your direct or indirect possession, custody, or control. AAP has become aware that the story may potentially expose AAP and those who publish the story to the risk of:</p><p style=\"color:red\"><strong>[insert relevant option/s from below]</strong></p><p style=\"color:red\">   - a breach of an enforceable embargo</p><p style=\"color:red\">    - a claim in defamation.</p><p style=\"color:red\">    - a possible prosecution for contempt.</p><p style=\"color:red\">    - a contempt prosecution arising out of breach of an order of the Family/Supreme/District/Federal Court.</p><p style=\"color:red\">    - a breach of a law prohibiting publication.</p><p style=\"color:red\">    - a breach of a law prohibiting publication that applies retrospectively.</p><p style=\"color:red\">    - a breach of any State or Commonwealth privacy laws.</p><p style=\"color:red\">    - a claim for damages.</p><p style=\"color:red\">    - publishing extremely erroneous material.</p><p><br></p><p>    This kill/takedown is mandatory, and no further use can be made of the story.</p><p>    A replacement story will be issued shortly/will not be issued.</p><p>    AAP will not be liable for any losses, costs and expenses, damages and other costs (including without limitation reasonable legal costs), indirect, consequential special or punitive loss or damage, arising out of the story and this Notice suffered or incurred by you after receipt of this Notice.</p>{% endif %}",
             "type": "text",
             "abstract": "This article has been removed",
             "headline": "Kill\/Takedown notice ~~~ Kill\/Takedown notice",
             "anpa_take_key": "KILL\/TAKEDOWN",
             "ednote": "",
-            "format" : "HTML",
-            "flags" : {
-                "marked_archived_only" : false,
-                "marked_for_not_publication" : false,
-                "marked_for_sms" : false,
-                "marked_for_legal" : false
+            "format": "HTML",
+            "flags": {
+                "marked_archived_only": false,
+                "marked_for_not_publication": false,
+                "marked_for_sms": false,
+                "marked_for_legal": false
             }
         }
     }

server/templates/article_killed_override.json

@@ -1,3 +1,3 @@
 {
-    "body_html": "<p>Please kill story slugged {{ slugline.replace('\"', '\\\"') }} headlined {{headline.replace('\"', '\\\"')}} ex {{ city }} at {%if desk_name.strip().lower() == 'new zealand'%}{{versioncreated | format_datetime('Pacific/Auckland', '%d %b %Y %H:%S %Z')}}{% else %}{{versioncreated | format_datetime('Australia/Sydney', '%d %b %Y %H:%S %Z')}}{% endif %}.</p>{{body_html.replace('\"', '\\\"') | escape}}"
+    "body_html": "<p>Please {%if 'kill' in update_headline.strip().lower() and 'takedown' not in update_headline.strip().lower() %}kill{% elif ('takedown' in update_headline.strip().lower() or 'take down' in update_headline.strip().lower()) and 'kill' not in update_headline.strip().lower() %}takedown{% else %}kill/takedown{% endif %} the story slugged {{ slugline }} headlined {{headline}} ex {{ city }} at {%if desk_name.strip().lower() == 'new zealand'%}{{versioncreated | format_datetime('Pacific/Auckland', '%d %b %Y %H:%S %Z')}}{% else %}{{versioncreated | format_datetime('Australia/Sydney', '%d %b %Y %H:%S %Z')}}{% endif %}.</p>{{ body_html | escape }}"
 }