diff --git a/__pycache__/daapinterface.cpython-39.pyc b/__pycache__/daapinterface.cpython-39.pyc new file mode 100644 index 0000000..8dde7c8 Binary files /dev/null and b/__pycache__/daapinterface.cpython-39.pyc differ diff --git a/daapinterface.py b/daapinterface.py index 2f1145f..ebe3483 100644 --- a/daapinterface.py +++ b/daapinterface.py @@ -32,6 +32,8 @@ sparql = SPARQLWrapper("https://query.daap.bannerrepeater.org/proxy/wdqs/bigdata # # # # # # # # # # # # # # # # # # # # # # # # # PAGES # # # # # # # # # # # # # # # # # # # # # # # # + +######################### HOMEPAGE @app.route("/") def home(): sparql.setQuery(''' @@ -85,6 +87,8 @@ def home(): return render_template('home.html', results=results, ImagesBanner=ImagesBanner) +######################### BROWSE THE ARCHIVE + @app.route("/browsethearchive") def browsethearchive(): sparql.setQuery(''' @@ -120,7 +124,7 @@ def browsethearchive(): publication_date = publication["date"]["value"] if "image" in publication: publication_image = publication["image"]["value"] - return render_template('browsethearchive.html', results=results) + return render_template('orderindex.html', results=results, order='browse the archive from A-Z') @app.route("/browsebycategory") def browsebycategory(): @@ -160,7 +164,7 @@ ORDER BY DESC(?dateadded) ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('recentindex.html', results=results) + return render_template('orderindex.html', results=results, order='index by recently added works') ######################### OLDEST INDEX @app.route("/datesindex_asc") @@ -190,7 +194,7 @@ ORDER BY ASC(?date) ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('oldestindex.html', results=results) + return render_template('orderindex.html', results=results, order='index by publication date from oldest') ######################### NEWEST INDEX @app.route("/datesindex_desc") @@ -221,7 +225,7 @@ ORDER BY DESC(?date) ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('newestindex.html', results=results) + return render_template('orderindex.html', results=results, order='index by publication date from newest') ######################### ARTIST INDEX @app.route("/artistsindex") @@ -245,7 +249,7 @@ def artistsindex(): ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('artistsindex.html', results=results) + return render_template('peopleindex.html', results=results, targetgroup='creators / contributors') ######################### PUBLISHERS INDEX @app.route("/publishersindex") @@ -272,9 +276,9 @@ def publishersindex(): ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('publishersindex.html', results=results) + return render_template('peopleindex.html', results=results, targetgroup='publishers') -######################### SELF PUBLISHED INDEX +######################### SELFPUBLISHED INDEX @app.route("/selfpublishedindex") def selfpublishedindex(): sparql.setQuery(''' @@ -292,7 +296,7 @@ def selfpublishedindex(): ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('selfpublishedindex.html', results=results) + return render_template('orderindex.html', results=results, order='index of self-pubished works') ######################### ZINES INDEX @app.route("/zinesindex") @@ -314,7 +318,7 @@ def zinesindex(): sparql.setReturnFormat(JSON) results = sparql.query().convert() # print(results) - return render_template('zinesindex.html', results=results) + return render_template('orderindex.html', results=results, order="index of zines") ########################## @@ -1125,11 +1129,8 @@ def item(): # PAGES FROM WIKI ######################### - -######################### ABOUT -@app.route("/about") -def about(): - url="https://daap.bannerrepeater.org/w/index.php?title=About&action=render" +def fetchwikipage(wikipagename): + url="https://daap.bannerrepeater.org/w/index.php?title="+wikipagename+"&action=render" # Make a GET request to fetch the raw HTML content html_content = requests.get(url).text # Parse the html content @@ -1137,273 +1138,98 @@ def about(): # print(soup.prettify()) # print the parsed data of html text=soup.find("html") - # A problem with image src obtention was solved by using absolute paths rather than traditional wiki syntax - - # replaceString = "wiki/Special:Redirect/file/" - # cleanSoup = BeautifulSoup(str(text).replace("wiki/File:", replaceString)) - - # for a in soup.find_all('a', href=True): - # if a.text: - # print(a['href']) - - - # replace src from img zith href from a href and remove the a - text=Markup(text) - return render_template('about.html', text=text) + return render_template('wikipagetemp.html', text=text) +######################### ABOUT +@app.route("/about") +def about(): + return fetchwikipage("About") ######################### UPLOAD @app.route("/upload") def upload(): - url="https://daap.bannerrepeater.org/w/index.php?title=Upload&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - - return render_template('upload.html', text=text) + return fetchwikipage("Upload") # #################### TEAM @app.route("/team") def team(): - url="https://daap.bannerrepeater.org/w/index.php?title=Team&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - - text=Markup(text) - return render_template('team.html', text=text) + return fetchwikipage("Team") # #################### CASE STUDY @app.route("/casestudy") def casestudy(): - url="https://daap.bannerrepeater.org/w/index.php?title=Carolee_Schneemann_case_study&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - - text=Markup(text) - return render_template('casestudy.html', text=text) - - + return fetchwikipage("Carolee_Schneemann_case_study") # #################### CODE OF CONDUCT @app.route("/codeofconduct") def codeofconduct(): - url="https://daap.bannerrepeater.org/w/index.php?title=Code_of_Conduct&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - - text=Markup(text) - return render_template('codeofconduct.html', text=text) - + return fetchwikipage("Code_of_Conduct") # #################### SEARCH TOOLS @app.route("/searchtools") def searchtools(): - url="https://daap.bannerrepeater.org/w/index.php?title=Search_Tools&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - - text=Markup(text) - return render_template('searchtools.html', text=text) + return fetchwikipage("Search_Tools") # #################### SUPPORT @app.route("/support") def support(): - url="https://daap.bannerrepeater.org/w/index.php?title=Support&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - - text=Markup(text) - return render_template('support.html', text=text) + return fetchwikipage("Support") ######################### TUTORIAL @app.route("/tutorials") def tutorials(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorials&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) - - + return fetchwikipage("Tutorials") ######################### TUTORIAL 1 @app.route("/tutorial_1") def tutorial_1(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_1&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_1") ######################### TUTORIAL 2 @app.route("/tutorial_2") def tutorial_2(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_2&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_2") ######################### TUTORIAL 3 @app.route("/tutorial_3") def tutorial_3(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_3&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_3") ######################### TUTORIAL 4 @app.route("/tutorial_4") def tutorial_4(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_4&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) - + return fetchwikipage("Tutorial_4") ######################### TUTORIAL 5 @app.route("/tutorial_5") def tutorial_5(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_5&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) - + return fetchwikipage("Tutorial_5") ######################### TUTORIAL 6 @app.route("/tutorial_6") def tutorial_6(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_6&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_6") ######################### TUTORIAL 7 @app.route("/tutorial_7") def tutorial_7(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_7&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_7") ######################### TUTORIAL 8 @app.route("/tutorial_8") def tutorial_8(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_8&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_8") ######################### TUTORIAL 9 @app.route("/tutorial_9") def tutorial_9(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_9&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_9") ######################### TUTORIAL 10 TEST @app.route("/tutorial_10") def tutorial_10(): - url="https://daap.bannerrepeater.org/w/index.php?title=Tutorial_10&action=render" - # Make a GET request to fetch the raw HTML content - html_content = requests.get(url).text - # Parse the html content - soup = BeautifulSoup(html_content, "lxml") - # print(soup.prettify()) # print the parsed data of html - - text=soup.find("html") - text=Markup(text) -# print(text) - return render_template('tutorials.html', text=text) + return fetchwikipage("Tutorial_10") diff --git a/static/css/style.css b/static/css/style.css index 96ac35f..a4d1ca5 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -471,6 +471,10 @@ div#footer-title-contact { margin-bottom: 20px !important; } +div#footer-title-contact p{ + font-size: 18ps; letter-spacing: 0.12em; +} + #footer-socials-links { display: flex; flex-direction: column; diff --git a/templates/--layout.html b/templates/--layout.html deleted file mode 100644 index 67c2320..0000000 --- a/templates/--layout.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - D.A.A.P - - - - - - - - - - - {% block content %} - {% endblock content %} - - - - - - - - - \ No newline at end of file diff --git a/templates/00-old-about.html b/templates/00-old-about.html deleted file mode 100644 index dbb7c67..0000000 --- a/templates/00-old-about.html +++ /dev/null @@ -1,127 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - - -
About: Digital Archive of Artists Publishing (DAAP)
- -
- -
-
The Digital Archive of Artists Publishing (DAAP) is an interactive, user-driven, searchable database of Artists’ Books and publications, that acts as a hub to engage with others, built by artists, publishers, and a community of producers in contemporary Artists’ Publishing, developed via an ethically driven design process and open-data methodology. -
- -
- -
-
- -
- -
-
Introduction to the project
- -
-

- A collaborative project, with the support of Wikimedia UK, DAAP is inspired by the site of Banner Repeater’s public Archive of Artists’ Publishing on Hackney Downs train station, with 11,000 people passing a day, in response to the need for a similarly dynamic approach to archiving in an online context.

- -

- We have drawn upon the working knowledge of users and archivists alike, to develop a database with sufficient complexity, whilst remaining searchable, that affords multiple histories to develop, confronting issues of authorship and representation, whilst addressing the challenges of cataloguing often deliberately difficult to categorise materials. With an emphasis on inclusivity from the start, we aim to privilege anecdotal histories and multiple perspectives alongside factual data, whilst the wiki style approach means that users can upload their own material, single items, or entire collections, choosing appropriate sharing permissions at time of upload.

- -

- DAAP is committed to challenging the politics of traditional archives that come of issues regarding inclusion and accessibility, from a post-colonial, critical gender and LGBTQI perspective. The project will work to ensure an equitable and ethical design process occurs throughout the archive development.

-
-
- -
-
Introduction to the digital infrastructure
- -
-

- DAAP brings together scholars and practitioners in the field of art, artist’s publishing and creative technology to set a precedent for modelling bespoke and non-standardised artist publications as linked data. Linked open data is data that is machine-readable, published online following specific interoperability standards, and published with an open license thus enabling others to connect to it.

- -

- Utilising the open-source software Wikibase, DAAP brings to the surface new and unexpected data connections across diverse collection artefacts, providing a resource to link to other archives, and communities, whilst visualisation tools offer exciting visual diagrams for in-depth research. DAAP implements a custom frontend interface on top of the Wikibase database, which follows familiar user interface metaphors, increasing accessibility across a broader audience.

- -

- Wikibase is part of a family of applications maintained by the Wikimedia Foundation, an international non-profit supporting public knowledge platforms such as Wikipedia and Wikidata. DAAP’s installation of Wikibase benefits from the technical affordances of the public platform Wikidata:

- -
    -
  • storing structured data;
  • -
  • using a flexible linked-data-compliant model for developing bibliographic data about publications;
  • -
  • capacity for multiple users to contribute to the database;
  • -
  • version control;
  • -
  • sophisticated querying options and visualizations provided via Wikidata Query Service tools.
  • -
- -

- In addition to the structured data in the database, DAAP takes advantage of the possibility to connect archive records held in Wikibase to regular wiki text pages, so that long-form anecdotal narratives can sit alongside factual data. At the same time, due to its independence from Wikidata, DAAP also serves as a space of more open experimentation – where data is modelled and tested with active users within a community of subject specialists (artists, self-publishers, librarians, academics, students, etc).

- -
-
- -
-
Our ethical standpoint
-
-

- Artists' Publishing is incredibly complex, to the extent that each item could almost warrant a new category of its own, making visible the challenges in sharing deliberately difficult to categorise material.

- -

- The project has developed through an interrogation of how an informed use of open-source linked data technology can be utilised towards a more ethically driven archival process.

- -

- Utilising a linked data database for the digital platform enables data to be structured in flexible ways, which can grow and develop organically around community needs, rather than conforming to rigid, pre-existing bibliographic standards. Traditional ‘standards’ aim to structure bibliographic data in ways that make it possible to find publications online, but as is increasingly clear, technology is not neutral, with an active tendency to reproduce existing bias’ and discriminations already existing in the world today. How search criteria, and other structural aspects of archiving contribute to this, is an ongoing conversation that drives the development of the archive, drawing from the experiences of users, archivists and technologists, alike.

$ - -

- The native features of the linked data environment have been activated within a communal practice, in order for the project to support an equitable, and ethical design process throughout the archive development. This in itself, is a vital and ongoing conversational process, in which mistakes can be made, discussed and rectified. Workshops have facilitated much of these conversations so far, with a host of users, as well as experts, joining in discussion and debate, which will continue as the archive continues to grow.

- -

- DAAP developed from critique regarding the extractive relations of digital neo-colonialisms, as well as historical colonialisms, since 2010, and we are strongly committed to challenging the politics of traditional archives that come of issues regarding inclusion and accessibility, from a post-colonial, critical gender and LGBTQI perspective.

- -

-

Telegram channel

- We have initiated a dedicated Telegram group to facilitate discussions around data entry and the ethics of archiving in between the workshop sessions. Get in touch if you’d like to join the channel.

- -

-

Code of conduct

- We enforce a strict Code of Conduct throughout our public events both in person and online. Read the full CoC text here.

-
-
- - -
-
Our Team
-
-

- The Artists' Publishing team is led by artist and writer Ami Clarke, founder of Banner Repeater, curator of the arts programme and Un-Publish series, joined by experts in Artists' Publishing: Arnaud Desjardin of The Everyday Press, and Marcus Campbell Books and author of The Book on Books on Artists' Books, Gustavo Grandal Montero librarian and researcher at UAL, curator of The Special Collections at Chelsea College of Arts Library - the oldest and one of the largest artists' books collection in the UK, and editor of the Art Libraries Journal, and, curator and digital archivist Dr Karen Di Franco who produced Book Works digital archive, and recently having been awarded her AHRC Collaborative Doctoral Candidate, University of Reading & Tate Britain.

- -

- The Technical team is led by digital designer and UX researcher Lozana Rossenova, currently completing her PhD in Digital Archive Design at the Centre for the Study of the Networked Image, in collaboration with leading digital art organization Rhizome. She brings her UX design and data modeling expertise developed during her PhD research and her professional practice in working with born-digital archives and linked open data (LOD) standards. The technical team is joined by Varia member Julie Boschat Thorez as lead developer on the project. She brings technical expertise from working on archival and conservation projects with leading digital artists and art organizations from the Netherlands, such as LIMA. Paulien Hosang has developed the visual design for the archive’s interface, drawing on experience working for non-profit clients at digital agencies both in the UK and the Netherlands.

- -

- The Artists’ Publishing team is also joined by historian, archivist and writer Frances Whorrall-Campbell (MA) and artist Cicilia Östholm (PhD student, Fine Art/Humanities RCA), co-initiator of equal voices in the room? who will help guide important ways to address bias and inequality through technological intervention, to undermine dominance and hegemonies based on gender binaries and the Western canon. Over the years important contributions have been made to the archival process, by several Banner Repeater volunteers, most recently of whom have done considerable work: Charlie Pritchard, Ariel Finch, Amelia Claringbull, Louise Rutledge, and Nína Óskarsdóttir, Maša Škrinjar kindly funded by an Erasmus scheme.

-
-
- -
-
A project by Banner Repeater with the support of Wikimedia UK
-
-

- Banner Repeater is an artist-led org: experimental project space and reading room with a public Archive of Artists’ Publishing, founded in 2010 by artist Ami Clarke. The project is driven by its location, on Hackney Downs train station, platform 1, dedicated to developing critical art in the natural interstice the platform and incidental footfall of over 11,000 passengers a day provides.

- -

- Banner Repeater works with artists to develop new works, through an ambitious exhibition programme installed in a highly visible and accessible project space, with a programme of events, talks, and performances, to introduce discussion and encourage debate of key issues in art today. The reading room holds a permanently sited public Archive of Artists’ Publishing that provides an important bibliographic resource that all visitors to BR can browse, alongside the Digital Archive of Artists’ Publishing - a tool as well as an electronic commons for the exchange of detailed information.

- -

- Networked strategies underpin everything that we do, pioneering a hybrid way of working in critically engaged contemporary art practice through the strong symbiosis between the experiments in text and publishing held in the public Archive of Artists’ Publishing on platform 1 Hackney Downs, and artistic practices engaging in networked strategies today.

- -

- Banner Repeater is supported by Arts Council England, The Elephant Trust, The British Council, Chelsea Arts Club Trust, The Goethe Institut, Transport for London, Arriva Rail, ACoRP, The Community Rail Network, Del Chopo Museum Mexico City, The Italian Institute of Culture, London. BR was initially supported by a grant from the Empty Shop Fund, Arts in Empty Spaces, Hackney Council in 2010.

-
-
- -
-
- - - -{% endblock content %} \ No newline at end of file diff --git a/templates/00-old-layout.html b/templates/00-old-layout.html deleted file mode 100644 index 67c2320..0000000 --- a/templates/00-old-layout.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - D.A.A.P - - - - - - - - - - - {% block content %} - {% endblock content %} - - - - - - - - - \ No newline at end of file diff --git a/templates/00-old-selfpublishedindex.html b/templates/00-old-selfpublishedindex.html deleted file mode 100644 index dc19ce6..0000000 --- a/templates/00-old-selfpublishedindex.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
INDEX OF PUBLISHERS
- - - - - - - - - - - -{% for x in results['results']['bindings']%} - - - - - - -{% endfor %} - - -
IDWORKALIASESDESCRIPTION
{{ x['work']['value'] | replace('http://wikibase.svc/entity/', '') }}{{ x["workLabel"]['value'] }} - {% if "workAltLabel" in x %} - {{ x["workAltLabel"]["value"] }} - {% endif %} - - {% if "workDescription" in x %} - {{ x["workDescription"]["value"] }} - {% endif %} -
- - - - - - - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/00-old-zinesindex.html b/templates/00-old-zinesindex.html deleted file mode 100644 index 7a2700c..0000000 --- a/templates/00-old-zinesindex.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
INDEX OF ZINES
- - - - - - - - - - - -{% for x in results['results']['bindings']%} - - - - - - -{% endfor %} - - -
IDWORKALIASESDESCRIPTION
{{ x['work']['value'] | replace('http://wikibase.svc/entity/', '') }}{{ x["workLabel"]['value'] }} - {% if "workAltLabel" in x %} - {{ x["workAltLabel"]["value"] }} - {% endif %} - - {% if "workDescription" in x %} - {{ x["workDescription"]["value"] }} - {% endif %} -
- - - - - - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/about-wiki.html b/templates/about-wiki.html deleted file mode 100644 index e4b639c..0000000 --- a/templates/about-wiki.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/about.html b/templates/about.html deleted file mode 100644 index e4b639c..0000000 --- a/templates/about.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/artistsindex.html b/templates/artistsindex.html deleted file mode 100644 index a6dbda5..0000000 --- a/templates/artistsindex.html +++ /dev/null @@ -1,148 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
INDEX OF CREATORS / CONTRIBUTORS
- - - - - - - - - - - -{% for x in results['results']['bindings']%} - - - - - - -{% endfor %} - - -
IDLABELALIASESDESCRIPTION
{{ x['creators']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }}{{ x["creatorsLabel"]['value'] }} - {% if "creatorsAltLabel" in x %} - {{ x["creatorsAltLabel"]["value"] }} - {% endif %} - - {% if "creatorsDescription" in x %} - {{ x["creatorsDescription"]["value"] }} - {% endif %} -
- - - - - - - - - - - - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/browsethearchive.html b/templates/browsethearchive.html deleted file mode 100644 index 0ad0306..0000000 --- a/templates/browsethearchive.html +++ /dev/null @@ -1,151 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
-
BROWSE THE ARCHIVE FROM A–Z
- -
- -{% for x in results['results']['bindings']%} -
-
- {% if "image" in x %} - - -
- {% else %} - -
-
- {% endif %} -
- -
- - {{ x["workLabel"]["value"]}} -
- - {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} - {% endif %} - - - -
- -
-{% endfor %} - -
- - - - - - - -
- - -{% endblock content %} - - - diff --git a/templates/casestudy.html b/templates/casestudy.html deleted file mode 100644 index e4b639c..0000000 --- a/templates/casestudy.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/contributor.html b/templates/contributor.html deleted file mode 100644 index 50f00a4..0000000 --- a/templates/contributor.html +++ /dev/null @@ -1,227 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - - -
- - - -
- - - - {% for x in contributorintro['results']['bindings'] %} - {% if 'itemtypeLabel' in x %} -
- {{ x['itemtypeLabel']['value'] }} -
- {% else %} -
- PERSON/ORGANISATION -
- {% endif %} - - -
- {{ x['itemLabel']['value'] }} -
- -
- - {% if 'itemDescription' in x %} - {{ x['itemDescription']['value'] }} - {% endif %} -
- {% endfor %} - -
- - - - - - -
- -
- - -
- {% if contributorimage['results']['bindings']==[] %} - - {% else %} - - {% for x in contributorimage['results']['bindings'] %} -
- - {% if "image" in x %} - - - {% endif %} - - {% if "depictsLabel" in x %} -

{{ x['depictsLabel']['value'] }}

- {% endif %} - - {% if "licenseLabel" in x %} -

License: {{ x['licenseLabel']['value'] }}

- {% endif %} - -
- {% endfor %} - - {% endif %} -
- -
- - - -
- - -
- - - - - -
- - - -
-

BIOGRAPHY

- {% if contributorbiography['results']['bindings']==[] %} -

information not available

- {% else %} - - - - - {% for x in contributorbiography['results']['bindings'] %} -
- -
- {{ x["text"] | safe }} -
-
- {% endfor %} - {% endif %} - -
- - - -
- - - -
- - - - - - - - -
-
Creator of
- - {% for x in contributor_creatorof['results']['bindings'] %} -
- -
- {% if "image" in x %} - - - -
- {% else %} - - - -
- {% endif %} -
- - - -
- {% if "dateWorks" in x %} - {{ x["dateWorks"]["value"] | replace("T00:00:00Z", "") }} - {% endif %} -
-
- {% endfor %} -
- - - - -
-
Publisher of
- - {% for x in contributor_publisherof['results']['bindings'] %} -
- -
- {% if "image" in x %} - - - -
- {% else %} - - - -
- {% endif %} -
- - - -
- {% if "dateWorks" in x %} - {{ x["dateWorks"]["value"] | replace("T00:00:00Z", "") }} - {% endif %} -
-
- {% endfor %} -
- - - - -
- - - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index cadbd67..21eae2c 100644 --- a/templates/home.html +++ b/templates/home.html @@ -3,14 +3,6 @@ -
@@ -71,10 +63,11 @@
{% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} + {{ x["date"]["value"][:-16] }} + {% endif %} - {% endif %} +
diff --git a/templates/layout.html b/templates/layout.html index e82e596..6cefa7e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -109,7 +109,7 @@ diff --git a/templates/newestindex.html b/templates/newestindex.html deleted file mode 100644 index 6582810..0000000 --- a/templates/newestindex.html +++ /dev/null @@ -1,149 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
-
INDEX BY PUBLICATION DATE FROM NEWEST
- -
- -{% for x in results['results']['bindings']%} -
-
- {% if "image" in x %} - - -
- {% else %} - -
-
- {% endif %} -
- -
- - {{ x["workLabel"]["value"]}} -
- - {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} - - - {% endif %} -
- -
-{% endfor %} - -
- - - - - - - -
- - -{% endblock content %} - - - diff --git a/templates/oldestindex.html b/templates/oldestindex.html deleted file mode 100644 index 7a9b42d..0000000 --- a/templates/oldestindex.html +++ /dev/null @@ -1,149 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
-
INDEX BY PUBLICATION DATE FROM OLDEST
- -
- -{% for x in results['results']['bindings']%} -
-
- {% if "image" in x %} - - -
- {% else %} - -
-
- {% endif %} -
- -
- - {{ x["workLabel"]["value"]}} -
- - {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} - - - {% endif %} -
- -
-{% endfor %} - -
- - - - - - - -
- - -{% endblock content %} - - - diff --git a/templates/recentindex.html b/templates/orderindex.html similarity index 60% rename from templates/recentindex.html rename to templates/orderindex.html index 9025eea..bfc1863 100644 --- a/templates/recentindex.html +++ b/templates/orderindex.html @@ -1,35 +1,36 @@ {% extends "layout.html" %} {% block content %} -
-
INDEX BY RECENTLY ADDED WORKS
+
+
{{ order }}
-
+
{% for x in results['results']['bindings']%} -
-
+
+
{% if "image" in x %} - +
{% else %} -
+
{% endif %}
-
+
{{ x["workLabel"]["value"]}}
{% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} + {{ x["date"]["value"][:-16] }} + {% endif %} - {% endif %} +
@@ -51,18 +52,18 @@ let startPage; const pageSize = 24; const totalSlidePage = 5; -const pageCount = Math.ceil($(".selfpublishedindex-items").length / pageSize); +const pageCount = Math.ceil($(".browsethearchive-items").length / pageSize); const slideRange = Math.floor(totalSlidePage / 2); slide = function() { - startPage = $("#pagin li a.current").parent().index(); - let paginationStart = (startPage - slideRange) <= 1 ? 0 : - (startPage >= (pageCount - slideRange) ? (pageCount - totalSlidePage) : - (startPage - slideRange - 1)); +startPage = $("#pagin li a.current").parent().index(); +let paginationStart = (startPage - slideRange) <= 1 ? 0 : +(startPage >= (pageCount - slideRange) ? (pageCount - totalSlidePage) : +(startPage - slideRange - 1)); - $("#pagin li").hide(); - for (let t = paginationStart; t < (paginationStart + totalSlidePage); t++) { +$("#pagin li").hide(); +for (let t = paginationStart; t < (paginationStart + totalSlidePage); t++) { $("#pagin li").eq(t + 1).show(); } @@ -70,17 +71,17 @@ slide = function() { prev.show(); if (startPage == 1) { - prev.hide(); - } + prev.hide(); + } if (startPage == pageCount ) { - next.hide(); + next.hide(); } } showPage = function() { - console.log(startPage); - $(".selfpublishedindex-items").hide(); - $(".selfpublishedindex-items").each(function(n) { +console.log(startPage); + $(".browsethearchive-items").hide(); + $(".browsethearchive-items").each(function(n) { if (n >= pageSize * (startPage - 1) && n < pageSize * startPage) $(this).show(); }); @@ -90,23 +91,23 @@ for (let i = 0 ; i < pageCount; i++) { $("#pagin").append('
  • ' + (i + 1) + '
  • '); if (i > pageSize) { - $("#pagin li").eq(i).hide(); + $("#pagin li").eq(i).hide(); } } let prev = $("
  • ").addClass("prev").html("Prev").click(function() { - let prevLi = $("#pagin li a.current").parent().prev().find("a"); +let prevLi = $("#pagin li a.current").parent().prev().find("a"); - if (prevLi[0]) { - $("#pagin li a.current").removeClass("current"); - prevLi.addClass("current"); - } +if (prevLi[0]) { + $("#pagin li a.current").removeClass("current"); + prevLi.addClass("current"); +} - slide(); +slide(); - if (startPage != 0) { - showPage(); - } +if (startPage != 0) { +showPage(); +} }); let next = $("
  • ").addClass("next").html("Next").click(function() { @@ -116,6 +117,7 @@ let next = $("
  • ").addClass("next").html("Next").click(function() { $("#pagin li a.current").removeClass("current"); nextLi.addClass("current"); } + slide(); if (startPage <= pageCount) { diff --git a/templates/organisation.html b/templates/organisation.html deleted file mode 100644 index 3b452d3..0000000 --- a/templates/organisation.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - - - - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/publishersindex.html b/templates/peopleindex.html similarity index 78% rename from templates/publishersindex.html rename to templates/peopleindex.html index c9076d8..c8a9181 100644 --- a/templates/publishersindex.html +++ b/templates/peopleindex.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %} -
    INDEX OF PUBLISHERS
    +
    INDEX OF {{ targetgroup }}
    @@ -14,6 +14,28 @@ {% for x in results['results']['bindings']%} + + +{% if 'creators' in x %} + + + + + + +{% endif %} + + + +{% if 'publishers' in x %} @@ -28,6 +50,10 @@ {% endif %} +{% endif %} + + + {% endfor %} @@ -42,19 +68,6 @@ - - - - - - - - - -{% endblock content %} - - - diff --git a/templates/support.html b/templates/support.html deleted file mode 100644 index e4b639c..0000000 --- a/templates/support.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/team.html b/templates/team.html deleted file mode 100644 index e4b639c..0000000 --- a/templates/team.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/tutorials.html b/templates/tutorials.html deleted file mode 100644 index 413d549..0000000 --- a/templates/tutorials.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/upload.html b/templates/upload.html deleted file mode 100644 index 413d549..0000000 --- a/templates/upload.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -{{ text }} - - - - -{% endblock content %} \ No newline at end of file diff --git a/templates/codeofconduct.html b/templates/wikipagetemp.html similarity index 100% rename from templates/codeofconduct.html rename to templates/wikipagetemp.html diff --git a/templates/zinesindex.html b/templates/zinesindex.html deleted file mode 100644 index d25d676..0000000 --- a/templates/zinesindex.html +++ /dev/null @@ -1,148 +0,0 @@ -{% extends "layout.html" %} -{% block content %} - -
    -
    INDEX OF ZINES
    - -
    - -{% for x in results['results']['bindings']%} -
    -
    - {% if "image" in x %} - - -
    - {% else %} - -
    -
    - {% endif %} -
    - -
    - - {{ x["workLabel"]["value"]}} -
    - - {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }} - - - {% endif %} -
    - -
    -{% endfor %} - -
    - -
      -
    - - - -
    - - -{% endblock content %} - - -
    {{ x['creators']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }}{{ x["creatorsLabel"]['value'] }} + {% if "creatorsAltLabel" in x %} + {{ x["creatorsAltLabel"]["value"] }} + {% endif %} + + {% if "creatorsDescription" in x %} + {{ x["creatorsDescription"]["value"] }} + {% endif %} +
    {{ x['publishers']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }} {{ x["publishersLabel"]['value'] }}