Merge remote-tracking branch 'pretalx/main' into sync-up

doc/Makefile

@@ -112,13 +112,13 @@ latex:
 
 latexpdf:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
+	@echo "Running LaTeX files through pdflatex …"
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
 latexpdfja:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
+	@echo "Running LaTeX files through platex and dvipdfmx …"
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
@@ -141,7 +141,7 @@ texinfo:
 
 info:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
+	@echo "Running Texinfo files through makeinfo …"
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
 

doc/_templates/index.html

@@ -1,12 +1,12 @@
 {% extends "layout.html" %}
-{% set title = 'Overview' %}
+{% set title = "Overview" %}
 {% block body %}
-    <h1>Welcome to pretalx's documentation</h1>
+    <h1>Welcome to pretalx’s documentation</h1>
     <p>
         <p>pretalx is an open source conference management tool.
         It starts you off by creating a  Calls for Participation that is
         exactly right for you. You can then review incoming submissions with
-        your team and choose the best ones. Once you've made your choice,
+        your team and choose the best ones. Once you’ve made your choice,
         create the best schedule for your conference with our schedule editor.
         It even takes into account when your speakers are available!
         And it can do even more – check the <a href="https://pretalx.com/p/features">
@@ -17,7 +17,7 @@ <h1>Welcome to pretalx's documentation</h1>
         complete as possible. We want you to be able understand, use, run, and
         improve pretalx. That said, documentation is never finished, and rarely
         perfect. If there is anything unclear or missing in our documentation,
-        or if pretalx behaves in unexpected ways, we'd be happy if you'd <a
+        or if pretalx behaves in unexpected ways, we’d be happy if you’d <a
         href="https://github.com/pretalx/pretalx/issues/new">let us know</a>.
         </p>
     </p>
@@ -61,7 +61,7 @@ <h2>Documentation structure</h2>
             <div class="text">
                 <p>
                     You want to interact with pretalx using its RESTful API?
-                    We've got you covered.
+                    We’ve got you covered.
                 </p>
             </div>
         </div>
@@ -75,7 +75,7 @@ <h2>Documentation structure</h2>
             <div class="text">
                 <p>
                     You want to contribute to pretalx, either to fix bugs,
-                    or to introduce that feature you're missing?
+                    or to introduce that feature you’re missing?
                     Setup instructions and helpful instructions are over here.
                 </p>
             </div>
@@ -99,7 +99,7 @@ <h2>Project information</h2>
     maintainer of this project is <a href="https://rixx.de">Tobias Kunze</a>
     who also runs the pretalx hosting at <a href="https://pretalx.com">pretalx.com</a>.</p>
 
-    If you'd like to contribute to pretalx, you are most welcome! We have written
+    If you’d like to contribute to pretalx, you are most welcome! We have written
     a little about how to get started
     <a href="https://docs.pretalx.org/developer/index.html">here</a>.
     </p>

doc/_themes/pretalx_theme/footer.html

@@ -1,51 +1,9 @@
 <footer>
-  <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-    {% if next %}
-      <a href="{{ next.link|e }}" class="float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
-    {% endif %}
-    {% if prev %}
-      <a href="{{ prev.link|e }}" class="" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
-    {% endif %}
-  </div>
-
-  <div id="sep" role="contentinfo">
-
-    {%- if build_id and build_url %}
-      {% trans build_url=build_url, build_id=build_id %}
-        <span class="build">
-          Build
-          <a href="{{ build_url }}">{{ build_id }}</a>.
-        </span>
-      {% endtrans %}
-    {%- elif commit %}
-      {% trans commit=commit %}
-        <span class="commit">
-          Revision <code>{{ commit }}</code>.
-        </span>
-      {% endtrans %}
-    {%- elif last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-    </p>
-  </div>
-  <div id="source-link">
-  {% if meta is defined and meta is not none %}{% set check_meta = True %}{% else %}{% set check_meta = False %}{% endif %}
-    {% if pagename != "search" %}
-      Caught a mistake or want to contribute to the documentation?
-      {% if check_meta and 'github_url' in meta %}
-        <!-- User defined GitHub URL -->
-        <a href="{{ meta['github_url'] }}" class="fa fa-github">Edit this page!</a>
-      {% else %}
-        <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}" class="fa fa-github">Edit this page!</a>
-      {% endif %}
-    {% endif %}
-  </div>
+  {% if pagename != "search" %}
+    <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}" class="fa fa-github"> Edit this page</a> &middot;
+  {% endif %}
+  {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+  <div>
   {%- block extrafooter %} {% endblock %}
-    <p>
-    {%- if hasdoc('copyright') %}
-      {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-    {%- else %}
-      {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-    {%- endif %}
-    {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a>{% endtrans %}.
+  </div>
 </footer>

doc/_themes/pretalx_theme/header.html

@@ -1,34 +1,36 @@
 <header>
-  {% if logo and theme_logo_only %}
-    <a id="logourl" href="/" class="mobile-hide">
-  {% else %}
-    <a id="logourl" href="/" class="icon icon-home mobile-hide"> {{ project }}
-  {% endif %}
-
-  {% if logo %}
-    {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-    <img src="{{ pathto('_static/' + logo, 1) }}" class="logo mobile-hide" />
-  {% endif %}
+  <a id="logourl" href="/" class="mobile-hide">
+    <img src="/_static/images/logo.svg" />
   </a>
 
-  {% include "searchbox.html" %}
+  <div id="spacer"></div>
+
+  {%- if builder != 'singlehtml' %}
+  <div role="search" id="header-search">
+    <form id="rtd-search-form" action="{{ pathto('search') }}" method="get">
+      <input type="text" name="q" placeholder="Search docs" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+  </div>
+  {%- endif %}
 
   <div id="related" class="mobile-hide">
     <div class="dropdown">
       <div class="dropdown-title">Support us</div>
       <div class="dropdown-body">
         <div class="dropdown-item"><a href="https://pretalx.com/p/pricing">Hosted pretalx</a></div>
         <div class="dropdown-item"><a href="https://pretalx.com/p/pricing">pretalx support</a></div>
-        <div class="dropdown-item"><a href="https://patreon.com/rixx">Developer patreon</a></div>
-        <div class="dropdown-item"><a href="https://liberapay.com/rixx">Developer liberapay</a></div>
+        <div class="dropdown-item"><a href="https://rixx.de/funding">Developer support</a></div>
       </div>
     </div>
     <div class="dropdown">
       <div class="dropdown-title">Resources</div>
       <div class="dropdown-body">
+        <div class="dropdown-item"><a href="https://pretalx.com/p/about/">Website</a></div>
         <div class="dropdown-item"><a href="https://pretalx.com/p/news/">Blog</a></div>
+        <div class="dropdown-item"><a href="https://pretalx.com/p/try/">Try pretalx</a></div>
         <div class="dropdown-item"><a href="https://github.com/pretalx/pretalx/">Source code</a></div>
-        <div class="dropdown-item"><a href="https://twitter.com/pretalx">Twitter</a></div>
       </div>
     </div>
   </div>

doc/_themes/pretalx_theme/layout.html

@@ -10,68 +10,37 @@
 <!DOCTYPE html>
 <head>
   <meta charset="utf-8">
-  {{ metatags }}
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block htmltitle %}
   <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
   {% endblock %}
   <link rel="shortcut icon" href="{{ pathto('_static/images/favicon.png', 1) }}"/>
-  {# CANONICAL URL #}
-  {% if theme_canonical_url %}
-    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-  {% endif %}
-
-  {# OPENSEARCH #}
-  {% if not embedded %}
-    {% if use_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {% endif %}
-  {% endif %}
-  <link rel="stylesheet" href="{{ pathto('_static/pretalx.css', 1) }}" type="text/css" />
 
+  <link rel="stylesheet" href="{{ pathto('_static/pretalx.css', 1) }}" type="text/css" />
   {% for cssfile in css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
   {% endfor %}
-
   {% for cssfile in extra_css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
   {% endfor %}
 
   {%- block linktags %}
-    {%- if hasdoc('about') %}
-        <link rel="author" title="{{ _('About these documents') }}"
-              href="{{ pathto('about') }}"/>
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-        <link rel="index" title="{{ _('Index') }}"
-              href="{{ pathto('genindex') }}"/>
-    {%- endif %}
-    {%- if hasdoc('search') %}
-        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
-    {%- if parents %}
-        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
-    {%- endif %}
-    {%- if next %}
-        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
-    {%- endif %}
-    {%- if prev %}
-        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
-    {%- endif %}
+    <link rel="index" title="Index" href="{{ pathto('genindex') }}"/>
+    <link rel="search" title="Search" href="{{ pathto('search') }}"/>
   {%- endblock %}
+
+  {{ metatags }}
+
   {%- block extrahead %} {% endblock %}
 
   {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
   <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
-
 </head>
 
 <body role="document">
+
   {% block extrabody %} {% endblock %}
+
   {% include "header.html" %}
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="nav-shift" class="nav-side">
@@ -109,48 +78,32 @@
         {% endblock %}
       </nav>
 
-
       {# PAGE CONTENT #}
       <div class="nav-content">
         <div class="rst-content">
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             {% block body %}{% endblock %}
            </div>
-           <div class="articleComments">
-            {% block comments %}{% endblock %}
-           </div>
           </div>
           {% include "footer.html" %}
         </div>
       </div>
     </main>
 
-  {% if not embedded %}
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }},
-            SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-
-  {% endif %}
-
-  {# STICKY NAVIGATION #}
-  {% if theme_sticky_navigation %}
   <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:'{{ url_root }}',
+          VERSION:'{{ release|e }}',
+          COLLAPSE_INDEX:false,
+          FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+          HAS_SOURCE:  {{ has_source|lower }},
+          SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
+      };
   </script>
-  {% endif %}
+  {%- for scriptfile in script_files %}
+    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+  {%- endfor %}
 
   {%- block footer %} {% endblock %}