diff --git a/guide.html b/guide.html index 44da40e..914505b 100644 --- a/guide.html +++ b/guide.html @@ -71,9 +71,9 @@ - + - + \ No newline at end of file diff --git a/index.html b/index.html index 5f94c1d..1ea8e02 100644 --- a/index.html +++ b/index.html @@ -84,8 +84,8 @@

nothing here :(

- + - + \ No newline at end of file diff --git a/js/current-films.js b/js/current-films.js index 08a3276..2c4305e 100644 --- a/js/current-films.js +++ b/js/current-films.js @@ -101,40 +101,6 @@ var currentfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Scala%2050%22", "image": "adox-scala-50-135.png" }, - { - "company": "Adox", - "name": "Adox Scala 160", - "iso": 160, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "", - "price": 2, - "popularity": 425, - "description": "panchromatic film with a clear base intended for reversal processing", - "launched": 2016, - "datasheet": "", - "lomography": "https://www.lomography.com/films/871965587-adox-scala-160/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Scala%20160%22", - "image": "adox-scala-160-135.png" - }, - { - "company": "Adox", - "name": "Adox Silvermax 100", - "iso": 100, - "format": "135", - "color": "black & white", - "type": "", - "emulsion": "classic", - "price": 1, - "popularity": 5273, - "description": "orthopanchromatic film with a classic emulsion, a clear base and an extreme exposure latitude", - "launched": 2012, - "datasheet": "datasheets/adox-silvermax-100.pdf", - "lomography": "https://www.lomography.com/films/871953394-adox-silvermax-100/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Silvermax%20100%22", - "image": "adox-silvermax-100-135.png" - }, { "company": "Agfaphoto", "name": "Agfaphoto APX 100", diff --git a/js/discontinued-films.js b/js/discontinued-films.js index c20bbe0..2d6f11a 100644 --- a/js/discontinued-films.js +++ b/js/discontinued-films.js @@ -1,21 +1,4 @@ var discontinuedfilms = [ - { - "company": "Fujifilm", - "name": "Fujifilm Superia Venus 800", - "iso": "800", - "format": "135", - "color": "color", - "type": "negative", - "emulsion": "", - "price": 3, - "popularity": 2055, - "description": "high ISO film that is primarily targeted at the japanese market", - "launched": 0, - "datasheet": "datasheets/fujifilm-superia-venus-800.pdf", - "lomography": "https://www.lomography.com/films/871939313-fujifilm-superia-venus-800/photos", - "flickr": "https://www.flickr.com/search/?media=photos&text=%22Fuji%20Superia%20Venus%20800%22", - "image": "images/fujifilm-superia-venus-800-135.png" - }, { "company": "Adox", "name": "Adox Color Implosion", @@ -33,6 +16,40 @@ var discontinuedfilms = [ "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Color%20Implosion%22", "image": "adox-color-implosion-135.png" }, + { + "company": "Adox", + "name": "Adox Scala 160", + "iso": 160, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "", + "price": 2, + "popularity": 425, + "description": "panchromatic film with a clear base intended for reversal processing", + "launched": 2016, + "datasheet": "", + "lomography": "https://www.lomography.com/films/871965587-adox-scala-160/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Scala%20160%22", + "image": "adox-scala-160-135.png" + }, + { + "company": "Adox", + "name": "Adox Silvermax 100", + "iso": 100, + "format": "135", + "color": "black & white", + "type": "", + "emulsion": "classic", + "price": 1, + "popularity": 5273, + "description": "orthopanchromatic film with a classic emulsion, a clear base and an extreme exposure latitude", + "launched": 2012, + "datasheet": "datasheets/adox-silvermax-100.pdf", + "lomography": "https://www.lomography.com/films/871953394-adox-silvermax-100/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Adox%20Silvermax%20100%22", + "image": "adox-silvermax-100-135.png" + }, { "company": "Film Washi", "name": "Film Washi X", @@ -50,4 +67,21 @@ var discontinuedfilms = [ "flickr": "", "image": "film-washi-x-400-135.png" }, + { + "company": "Fujifilm", + "name": "Fujifilm Superia Venus 800", + "iso": "800", + "format": "135", + "color": "color", + "type": "negative", + "emulsion": "", + "price": 3, + "popularity": 2055, + "description": "high ISO film that is primarily targeted at the japanese market", + "launched": 0, + "datasheet": "datasheets/fujifilm-superia-venus-800.pdf", + "lomography": "https://www.lomography.com/films/871939313-fujifilm-superia-venus-800/photos", + "flickr": "https://www.flickr.com/search/?media=photos&text=%22Fuji%20Superia%20Venus%20800%22", + "image": "images/fujifilm-superia-venus-800-135.png" + } ] \ No newline at end of file diff --git a/js/guide.js b/js/guide.js index 5f7e879..63b5593 100644 --- a/js/guide.js +++ b/js/guide.js @@ -591,10 +591,6 @@ var guide = [ "title": "Other 35mm Black & White Films", "text": "Those just don’t fit in any of the others categories.", "films": [ - { - "name": "Adox Scala 160", - "format": "135" - }, { "name": "Bergger Pancro 400", "format": "135" @@ -823,10 +819,6 @@ var guide = [ "name": "Adox CHS 100 II", "format": "135" }, - { - "name": "Adox Silvermax 100", - "format": "135" - }, { "name": "Ilford FP4 Plus 125", "format": "135" diff --git a/random.html b/random.html index 9b63e3b..b4691f8 100644 --- a/random.html +++ b/random.html @@ -70,8 +70,8 @@ - + - + \ No newline at end of file