summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db.json31
-rw-r--r--index.js2
2 files changed, 25 insertions, 8 deletions
diff --git a/db.json b/db.json
index 8717042..aa6fc40 100644
--- a/db.json
+++ b/db.json
@@ -1834,10 +1834,10 @@
"keywords": "#Drone #Verticality #Arts #Morality #War #Governments\r\n",
"description": "Drone Shadows is a series of public installation of artist, writer and technologist James Bridle. The 1:1 scale representation of a drone is supposed to shift the invisible drone warfare closer to our reality. The image depicts the shadow of a The General Atomics MQ-9 Reaper drone. It is used as a surveillance and weapons platform and operated by the US, UK, Australia, France, and NASA.\r\n",
"image": {
- "uri": "",
+ "uri": "https://marsupial.s3.amazonaws.com/armory/fc519c90-3985-11e7-a9cd-015e907df360.jpg",
"caption": "",
- "width": "",
- "height": ""
+ "width": "640",
+ "height": "426"
},
"credit": "Courtesy Roberta Mataityte / Lighthouse. Photo by James Bridle\r\n",
"links": [
@@ -1852,7 +1852,8 @@
],
"disabled": false,
"__index": 69,
- "dateCreated": "Fri, 12 May 2017 11:13:25 GMT"
+ "dateCreated": "Fri, 12 May 2017 11:13:25 GMT",
+ "shortDescription": ""
},
{
"id": "nothing-is-beyond-our-reach",
@@ -2137,7 +2138,7 @@
{
"id": "terms-and-conditions",
"title": "Terms and Conditions",
- "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec euismod ligula non gravida consectetur. Vivamus at justo a purus hendrerit egestas nec in justo. Integer ullamcorper tortor vitae vulputate lobortis. Suspendisse mollis pellentesque iaculis. Maecenas a neque viverra, posuere leo id, auctor risus. Maecenas pretium nisl eget nisi imperdiet lobortis. Vivamus sit amet interdum dolor. Ut id dui leo. Nam nunc sem, iaculis vel rhoncus nec, efficitur nec leo. Maecenas ut semper neque. Proin aliquam neque tortor, condimentum gravida leo rutrum nec.\r\n\r\nMorbi vulputate risus ut fringilla vehicula. Cras ut aliquet lorem. Morbi et malesuada ex, nec aliquam ante. Fusce ac viverra velit. Curabitur hendrerit metus sit amet ipsum efficitur ultricies. Nulla ut massa vitae ipsum vulputate vehicula. Nulla blandit lacinia condimentum. Nulla convallis blandit libero, maximus venenatis orci luctus eget. Cras scelerisque luctus felis eu tempus. Fusce id dignissim arcu.\r\n\r\nQuisque dictum ligula eget velit vestibulum euismod. Aliquam commodo orci nec nulla gravida, id maximus lacus rutrum. Vestibulum condimentum tellus eget viverra porttitor. Fusce eget mauris eu dui consequat vehicula eu quis dolor. Suspendisse commodo sollicitudin libero ut tempor. Aliquam vitae aliquet sapien. Nullam pellentesque ligula id arcu porttitor, in ullamcorper urna sodales. Vestibulum convallis id enim at tincidunt. Donec urna nibh, aliquam a felis eget, mattis suscipit erat.\r\n\r\nVestibulum faucibus, lectus at mollis dictum, sem leo consequat est, vitae commodo lorem felis ac dui. Maecenas efficitur eget lorem eu dictum. In tincidunt dolor sit amet nunc imperdiet, eu fringilla augue tempus. Sed suscipit lectus leo, nec bibendum dolor laoreet non. Morbi molestie varius tortor sed mattis. Donec sodales turpis mauris, non congue elit molestie vitae. Cras id justo nunc. Nullam non felis non enim tincidunt rutrum sit amet sed enim. Mauris pellentesque nisi metus, vitae elementum orci ultrices pretium. Suspendisse semper erat metus, vitae ornare magna dapibus ac. Integer venenatis tempor ullamcorper. Donec a placerat ex. Nullam laoreet libero tellus, eget pharetra tortor consequat sed.\r\n\r\nCras sagittis libero ac pellentesque interdum. Proin ac ultricies lorem. Ut vulputate cursus tristique. Sed fringilla placerat nisi, et aliquam odio eleifend eu. Duis nulla tortor, imperdiet ac efficitur nec, sodales eget est. Integer faucibus pulvinar ligula, maximus eleifend elit molestie ac. Etiam pulvinar posuere scelerisque. Nulla facilisi. Proin dapibus iaculis orci, et luctus sapien ultricies non. Cras feugiat purus quis dolor viverra viverra. Donec fringilla massa quis leo elementum, sit amet feugiat justo dapibus. Suspendisse condimentum, elit nec lobortis semper, dui ante pellentesque massa, vitae condimentum elit odio eu est.\r\n\r\n",
+ "body": "The <i>Terms and Conditions</i> of a website is a legal document describing a relationship between a software vendor and the end user. Typically this document is designed to indemnify the company who made the software from what you do with it. It also describes your rights in using the software - and what rights you give up.\r\n\r\nThe website <a href=\"https://tosdr.org/\">TOS;DR</a> was created to keep track of what's hidden in the small print of these legal agreements. For instance, on Youtube, \"Deleted videos are not really deleted.\" Facebook and Google admit to tracking your behavior, even on other websites. Instagram and Netflix waive your right to participating in a class action lawsuit. You cannot delete your Skype account.\r\n\r\nA website is also legally bound to describe what information it uses to track you, which it publishes on its <a href=\"/page/privacy\">Privacy Policy</a>. ",
"disabled": false,
"__index": 2,
"dateCreated": "Sat, 13 May 2017 19:49:53 GMT"
@@ -2145,7 +2146,7 @@
{
"id": "privacy-policy",
"title": "Privacy Policy",
- "body": "Lorem Ipsum Privacy Policy",
+ "body": "A website is required by law to publish a <i>Privacy Policy</i> if it collects <i>personally identifiable information</i> (PII) which can be used to trace an individual's identity. This information can include your name, email address, telephone number, social security number, date of birth, mother's maiden name, etc. The Privacy Policy should indicate what information is tracked and how it is stored.\r\n\r\nA website's Privacy Policy is intimately tied to its <a href=\"/page/terms\">Terms and Conditions</a>. For more information on how these two documents differ, read the article, <a href=\"https://termsfeed.com/blog/privacy-policies-vs-terms-conditions/\">Privacy Policy vs Terms and Conditions</a>.",
"disabled": false,
"__index": 3,
"dateCreated": "Sat, 13 May 2017 19:50:06 GMT"
@@ -2153,7 +2154,7 @@
{
"id": "information",
"title": "Information",
- "body": "Information about the project will go here.",
+ "body": "In a new commission that is both object and environment, Pritzker Prize-winning architects Jacques Herzog and Pierre de Meuron with artist/activist Ai Weiwei explore the meaning of public space in our surveillance-laden world, referencing the story of Hansel and Gretel in which the children lose their way and feel a sense of menace in a space they know and trust. The artists take advantage of the vast openness of the Drill Hall, creating a 21st century public place in which the environment is disconcerting, the entrance is unexpected, and every movement is tracked and surveyed by drones and communicated to an unknown public.\r\n\r\nThe work builds on the artists’ shared practice as designers of form and investigation (the Beijing Olympic Stadium and “quite simply the best summer Serpentine Pavilion ever” according to Time Out London) and their deep interest in the public realm whether through activism or architecture. Ai Weiwei has described their collaborations as follows: “My experience of working with Jacques and Pierre is that we never think separately. It’s like three soldiers in the war—and that’s a good feeling: we have a constant understanding.”\r\n\r\nCurated by Tom Eccles and Hans Ulrich Obrist",
"disabled": false,
"__index": 0,
"dateCreated": "Sun, 14 May 2017 14:58:56 GMT"
@@ -2165,6 +2166,22 @@
"disabled": false,
"__index": 1,
"dateCreated": "Sun, 14 May 2017 15:00:14 GMT"
+ },
+ {
+ "id": "livestream",
+ "title": "Livestream",
+ "body": "Mauris aliquet feugiat nisi a maximus. Vestibulum tempus molestie felis in euismod. Pellentesque malesuada et ex eu mattis. Fusce scelerisque, urna sit amet dictum congue, nibh purus auctor dui, in tincidunt ipsum nibh in erat. Morbi fringilla aliquam quam, ac pharetra quam posuere molestie. Mauris eget arcu consequat, lacinia orci tristique, hendrerit sapien. Pellentesque laoreet finibus est, tincidunt ornare lacus mattis et. Aenean placerat dui et urna mollis, vitae mattis massa fermentum.",
+ "disabled": false,
+ "__index": 4,
+ "dateCreated": "Sun, 14 May 2017 21:47:11 GMT"
+ },
+ {
+ "id": "contact",
+ "title": "Contact",
+ "body": "Please send us your comments/questions about the installation, and also any suggestions for additions to our virtual timeline on the History of Surveillance.",
+ "disabled": false,
+ "__index": 5,
+ "dateCreated": "Mon, 15 May 2017 09:43:18 GMT"
}
]
} \ No newline at end of file
diff --git a/index.js b/index.js
index 8921784..5cd8692 100644
--- a/index.js
+++ b/index.js
@@ -37,7 +37,7 @@ var app = okcms.createApp({
date: {type: 'string'},
title: {type: 'string'},
medium: {type: 'string'},
- category: {type: 'enum', options:['Surveillance','Drones','Facial Recognition'},
+ category: {type: 'enum', options:['Surveillance','Drones','Facial Recognition']},
keywords: {type: 'text'},
description: {type: 'text'},
image: {type: 'image'},