Skip to content

Commit

Permalink
Merge pull request #88 from perseids-project/update-about-page
Browse files Browse the repository at this point in the history
Add contributor on about page
  • Loading branch information
zfletch authored May 29, 2018
2 parents 73cf8b3 + cfad1f7 commit 854a12c
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 12 deletions.
17 changes: 14 additions & 3 deletions digital_milliet/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-04-27 21:38+0000\n"
"POT-Creation-Date: 2018-05-29 14:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -219,14 +219,25 @@ msgid ""
msgstr ""

#: digital_milliet/templates/about.html:56
#: digital_milliet/templates/about.html:63
msgid "Sr. Software Developer"
msgstr ""

#: digital_milliet/templates/about.html:58
msgid ""
"Bridget Almas is the lead software developer for <a target=\"_blank\" "
"Bridget Almas is the Software Architect at <a target=\"_blank\" "
"href=\"https://alpheios.net/\">The Alpheios Project</a>. She previously "
"worked as the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts University"
" and has served as architect and code-reviewer on the Digital Milliet "
"project."
msgstr ""

#: digital_milliet/templates/about.html:65
msgid ""
"Zachary Fletcher is the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts "
"University. She served as architect and code-reviewer on the Digital "
"University. He is currently serving as technical lead on the Digital "
"Milliet project."
msgstr ""

Expand Down
4 changes: 4 additions & 0 deletions digital_milliet/static/css/milliet.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added digital_milliet/static/img/ZF.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions digital_milliet/static/sass/_about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,10 @@
margin:0 auto;
display:block;
}
.missing-image {
height: 150px;
margin:0 auto;
display:block;
}
}
}
11 changes: 10 additions & 1 deletion digital_milliet/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,19 @@ <h4><b>Spyridon Loumakis</b>, {{ _('Editor') }}</h4>
</p>
</div>
<div class="col-md-4">
<div class="missing-image"></div>
<h4><b>Bridget Almas</b>, {{ _('Sr. Software Developer') }}</h4>
<p>
{{ _('Bridget Almas is the lead software developer for <a target="_blank" href="http://perseids.org">The Perseids Project</a> at Tufts University. She served as architect and code-reviewer on the Digital Milliet project.') }}
{{ _('Bridget Almas is the Software Architect at <a target="_blank" href="https://alpheios.net/">The Alpheios Project</a>. She previously worked as the lead software developer for <a target="_blank" href="http://perseids.org">The Perseids Project</a> at Tufts University and has served as architect and code-reviewer on the Digital Milliet project.') }}
</p>
</div>
<div class="col-md-4">
<img src="{{ url_for('static', filename='img/ZF.jpg') }}"/>
<h4><b>Zachary Fletcher</b>, {{ _('Sr. Software Developer') }}</h4>
<p>
{{ _('Zachary Fletcher is the lead software developer for <a target="_blank" href="http://perseids.org">The Perseids Project</a> at Tufts University. He is currently serving as technical lead on the Digital Milliet project.') }}
</p>
</div>
</section>
</article>
{% endblock %}
Binary file modified digital_milliet/translations/en/LC_MESSAGES/messages.mo
Binary file not shown.
18 changes: 14 additions & 4 deletions digital_milliet/translations/en/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-04-27 21:38+0000\n"
"POT-Creation-Date: 2018-05-29 14:28+0000\n"
"PO-Revision-Date: 2017-03-01 09:52-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down Expand Up @@ -220,14 +220,25 @@ msgid ""
msgstr ""

#: digital_milliet/templates/about.html:56
#: digital_milliet/templates/about.html:63
msgid "Sr. Software Developer"
msgstr ""

#: digital_milliet/templates/about.html:58
msgid ""
"Bridget Almas is the lead software developer for <a target=\"_blank\" "
"Bridget Almas is the Software Architect at <a target=\"_blank\" "
"href=\"https://alpheios.net/\">The Alpheios Project</a>. She previously "
"worked as the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts University"
" and has served as architect and code-reviewer on the Digital Milliet "
"project."
msgstr ""

#: digital_milliet/templates/about.html:65
msgid ""
"Zachary Fletcher is the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts "
"University. She served as architect and code-reviewer on the Digital "
"University. He is currently serving as technical lead on the Digital "
"Milliet project."
msgstr ""

Expand Down Expand Up @@ -1012,4 +1023,3 @@ msgstr ""
#: digital_milliet/templates/commentary/read.html:147
msgid "Bibliography"
msgstr ""

Binary file modified digital_milliet/translations/fr/LC_MESSAGES/messages.mo
Binary file not shown.
18 changes: 14 additions & 4 deletions digital_milliet/translations/fr/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-04-27 21:38+0000\n"
"POT-Creation-Date: 2018-05-29 14:28+0000\n"
"PO-Revision-Date: 2017-03-01 09:52-0500\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fr\n"
Expand Down Expand Up @@ -287,14 +287,25 @@ msgid ""
msgstr ""

#: digital_milliet/templates/about.html:56
#: digital_milliet/templates/about.html:63
msgid "Sr. Software Developer"
msgstr ""

#: digital_milliet/templates/about.html:58
msgid ""
"Bridget Almas is the lead software developer for <a target=\"_blank\" "
"Bridget Almas is the Software Architect at <a target=\"_blank\" "
"href=\"https://alpheios.net/\">The Alpheios Project</a>. She previously "
"worked as the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts University"
" and has served as architect and code-reviewer on the Digital Milliet "
"project."
msgstr ""

#: digital_milliet/templates/about.html:65
msgid ""
"Zachary Fletcher is the lead software developer for <a target=\"_blank\" "
"href=\"http://perseids.org\">The Perseids Project</a> at Tufts "
"University. She served as architect and code-reviewer on the Digital "
"University. He is currently serving as technical lead on the Digital "
"Milliet project."
msgstr ""

Expand Down Expand Up @@ -1079,4 +1090,3 @@ msgstr ""
#: digital_milliet/templates/commentary/read.html:147
msgid "Bibliography"
msgstr ""

0 comments on commit 854a12c

Please sign in to comment.