Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update editorial workflow #1336

Merged
merged 28 commits into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1720468
add web api lesson files
rivaquiroga May 31, 2019
13174b0
warn editor if topics is supplied as a single val rather than a list
mdlincoln May 31, 2019
658c4e5
fix md
rivaquiroga May 31, 2019
9aa1cdf
Merge branch 'add-web-api-lesson' of https://github.com/programminghi…
rivaquiroga May 31, 2019
2ac12b4
fix images filenames
rivaquiroga May 31, 2019
bc3250d
Merge branch 'gh-pages' into add-web-api-lesson
mdlincoln Jun 1, 2019
06f085b
Update reviewer-guidelines.md
Jun 4, 2019
b0deb7e
Update editor-guidelines.md
Jun 4, 2019
96f9495
Update editor-guidelines.md
Jun 4, 2019
18f9d2f
Remove "Join our team of reviewers" (#1338)
adamcrymble Jun 9, 2019
3f378ad
research - add Inside Higher Ed article (#1341)
adamcrymble Jun 13, 2019
ac5af2d
Issue 1083 - french worldcat entry (#1340)
adamcrymble Jun 13, 2019
030f9bf
fix link on line 293
rivaquiroga Jun 15, 2019
8d9676d
Merge branch 'gh-pages' into add-web-api-lesson
mdlincoln Jun 15, 2019
5f6b967
Revise yaml template to make more user friendly (#1344)
adamcrymble Jun 17, 2019
fe01224
fix diveintopython.net links
rivaquiroga Jun 19, 2019
27273cb
replace other diveintopython links with IA
mdlincoln Jun 19, 2019
758c60c
Merge pull request #1323 from programminghistorian/add-web-api-lesson
adamcrymble Jun 19, 2019
4ec2230
Optimizing website for printing and pdfs (#1248)
ZoeLeBlanc Jun 25, 2019
4b12c27
update antonio's institution
arojascastro Jun 26, 2019
9325ceb
added FR translation of Antonio's affiliation
spapastamkou Jun 26, 2019
09c7159
Merge pull request #1351 from programminghistorian/update-affiliation
spapastamkou Jun 26, 2019
8f1275f
Remove a tags surrounding images (#1356)
walshbr Jun 27, 2019
6be4bd4
add privacy policy (#1353)
mdlincoln Jun 27, 2019
6f98476
Update reviewer-guidelines.md
Jun 4, 2019
23b76fc
Update editor-guidelines.md
Jun 4, 2019
4904f14
Update editor-guidelines.md
Jun 4, 2019
b310ea0
Merge branch '1318_workflow-revision' of github.com:programminghistor…
mdlincoln Jun 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bundle exec jekyll build && bundle exec htmlproofer ./_site \
--timeframe '30d' \
--only-4xx \
--http-status-ignore 429,403 \
--url-ignore '/http://www.gutenberg.org/*/','/https://github.com/programminghistorian/jekyll/(commits|blob)/*/','/\#/',"/espanol/","/deprecated/",'/collection.britishmuseum.org/','/analytics.hathitrust.org/'
--url-ignore '/http://www.gutenberg.org/*/','/https://github.com/programminghistorian/jekyll/(commits|blob)/*/','/\#/',"/espanol/","/deprecated/",'/collection.britishmuseum.org/','/analytics.hathitrust.org/','/fr.wikipedia.org/wiki/'

# The folllowing comments docuemnt what each line of that build script does.

Expand Down
24 changes: 15 additions & 9 deletions _data/ph_authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,23 +152,23 @@
github: arojascastro
team: true
team_start: 2016
institution: Cologne Center for eHumanities
institution: Berlin-Brandenburgische Akademie der Wissenschaften
sortname: Rojas Castro
orcid: 0000-0002-8916-4997
affiliation:
en: |
Cologne Center for eHumanities, Germany.
Berlin-Brandenburgische Akademie der Wissenschaften, Germany.
es: |
Cologne Center for eHumanities, Alemania.
Berlin-Brandenburgische Akademie der Wissenschaften, Alemania.
fr: |
Cologne Center for eHumanities, Allemagne.
Académie des sciences de Berlin-Brandebourg, Allemagne.
bio:
en: |
Antonio Rojas Castro is a researcher a the Cologne Center for eHumanities, with a PhD in Humanities (Spanish Literature).
Antonio Rojas Castro is a researcher at the Berlin-Brandenburgische Akademie der Wissenschaften, with a PhD in Humanities (Spanish Literature).
es: |
Antonio Rojas Castro tiene un doctorado en Humanidades (Universitat Pompeu Fabra) y trabaja como investigador en el Cologne Center for eHumanities.
Antonio Rojas Castro tiene un doctorado en Humanidades (Universitat Pompeu Fabra) y trabaja como investigador en la Berlin-Brandenburgische Akademie der Wissenschaften.
fr: |
Antonio Rojas Castro est docteur en Littérature espagnole (Université Pompeu Fabra) et chercheur au Cologne Center for eHumanities.
Antonio Rojas Castro est docteur en Littérature espagnole (Université Pompeu Fabra) et chercheur à l'Académie des sciences de Berlin-Brandebourg.
team_roles:
- spanish
- board
Expand Down Expand Up @@ -1131,10 +1131,16 @@
team: false
bio:
es: |
Silvia Gutiérrez es bibliotecaria de investigación digital en la biblioteca Daniel Cosío Villegas en El Colegio de México.
Silvia Gutiérrez es bibliotecaria de investigación digital en la biblioteca Daniel Cosío Villegas en El Colegio de México.

- name: Matthew J. Lavin
team: false
bio:
en: |
Matthew J. Lavin is a Clinical Assistant Professor of English and Director of the Digital Media Lab at the University of Pittsburgh. His current scholarship and teaching focus on book history, cultural analytics, turn-of-the-twentieth-century U.S. literature and culture.
Matthew J. Lavin is a Clinical Assistant Professor of English and Director of the Digital Media Lab at the University of Pittsburgh. His current scholarship and teaching focus on book history, cultural analytics, turn-of-the-twentieth-century U.S. literature and culture.

- name: Go Sugimoto
team: false
bio:
en: |
Go Sugimoto is a data analyst at the Austrian Centre for Digital Humanities (ACDH) in the Austrian Academy of Sciences. He has worked for a wide range of cultural heritage projects around the world, including Europeana and Archives Portal Europe at the National Archives of the Netherlands, CHIRON fellowship at the University of Florence (Italy), the National Museum of Modern Art Tokyo (Japan), and Wessex Archaeology (UK).
10 changes: 10 additions & 0 deletions _data/snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ menu-about-research:
fr:
title: Recherche
link: /fr/recherche
menu-about-privacy:
en:
title: Privacy Policy
link: /en/privacy-policy
es:
title: Privacy Policy
link: /en/privacy-policy
fr:
title: Privacy Policy
link: /en/privacy-policy
menu-contribute:
en: Contribute
es: Contribuciones
Expand Down
2 changes: 0 additions & 2 deletions _includes/figure.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
{% endif %}

<figure>
<a href="{{ fullpath }}">
<img src="{{ fullpath }}" alt="{{ include.caption }}">
</a>
<figcaption>
{{ include.caption | markdownify }}
</figcaption>
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<link href="https://fonts.googleapis.com/css?family=Crete+Round|Open+Sans|Quattrocento|Roboto|Roboto+Condensed" rel="stylesheet">

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous" media="all">
<link rel="stylesheet" href="{{site.baseurl}}/css/github.css">
<link rel="stylesheet" href="{{site.baseurl}}/css/style.css">

Expand Down
6 changes: 5 additions & 1 deletion _includes/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{% include translation-links.html %}

<nav class="navbar navbar-toggleable-sm navbar-dark bg-dark"
<nav class="hide-screen navbar navbar-toggleable-sm navbar-dark bg-dark"
style="background-color: {{ site.data.snippets.background_color[page.lang] }}" role="navigation">
<!--<div class="container">-->
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
Expand All @@ -42,6 +42,8 @@
role="menuitem">{{site.data.snippets.menu-about-team[page.lang].title}}</a>
<a class="dropdown-item" href="{{site.baseurl}}{{site.data.snippets.menu-about-research[page.lang].link}}"
role="menuitem">{{site.data.snippets.menu-about-research[page.lang].title}}</a>
<a class="dropdown-item" href="{{site.baseurl}}{{site.data.snippets.menu-about-privacy[page.lang].link}}"
role="menuitem">{{site.data.snippets.menu-about-privacy[page.lang].title}}</a>
<a class="dropdown-item" href="{{ site.data.snippets.menu-translation-concordance[page.lang].link}}"
role="menuitem">{{site.data.snippets.menu-translation-concordance[page.lang].title}}</a>
</div>
Expand Down Expand Up @@ -124,3 +126,5 @@
</div>
<!--</div>-->
</nav>

<nav class="hide-print print-header navbar-brand">The Programming Historian </nav>
29 changes: 24 additions & 5 deletions _layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,30 @@
{% include header.html %}

<body>
{% include menu.html %}

{{content}}

{% include footer.html %}
<main class="hide-screen">
{% include menu.html %}
{{content}}
{% include footer.html %}
</main>
<div class="hide-print">
<table>
<thead>
<tr>
<th>
{% include menu.html %}
</th>
</tr>
</thead>
<tbody>
<tr>
<th>
{{content}}
{% include footer.html %}
</th>
</tr>
</tbody>
</table>
</div>
</body>

</html>
Loading