#79 Update production with bugfixed version 2.9 (again)
Merged 4 years ago by bcotton. Opened 4 years ago by bcotton.

file modified
+1 -1
@@ -25,7 +25,7 @@ 

  #

  from __future__ import unicode_literals, absolute_import

  

- __version__ = '2.7'

+ __version__ = '2.9'

  

  import logging  # noqa

  import os  # noqa

file modified
+3 -3
@@ -135,7 +135,7 @@ 

      for candidate in candidates:

          title = candidate.fas_name or candidate.name

          if candidate.url:

-             title = '%s <a href="%s">[Info]</a>' % (title, candidate.url)

+             title = '%s <a href="%s" target="_blank" rel="noopener noreferrer">[Info]</a>' % (title, candidate.url)

          field = wtforms.SelectField(

              title,

              choices=[(str(item), item) for item in range(max_range + 1)]
@@ -160,7 +160,7 @@ 

              except (KeyError, AuthError) as err:

                  APP.logger.debug(err)

          if candidate.url:

-             title = '%s <a href="%s">[Info]</a>' % (title, candidate.url)

+             title = '%s <a href="%s" target="_blank" rel="noopener noreferrer">[Info]</a>' % (title, candidate.url)

          titles.append((str(candidate.id), title))

      field = wtforms.RadioField(

          'Candidates',
@@ -192,7 +192,7 @@ 

      for candidate in candidates:

          title = candidate.fas_name or candidate.name

          if candidate.url:

-             title = '%s <a href="%s">[Info]</a>' % (title, candidate.url)

+             title = '%s <a href="%s" target="_blank" rel="noopener noreferrer">[Info]</a>' % (title, candidate.url)

          field = wtforms.BooleanField(

              title,

          )

@@ -68,12 +68,13 @@ 

    <h4><strong>Candidates</strong></h4>

    <div class="list-group">

      {% for candidate in election.candidates %}

-       <a {% if candidate.url %}href="{{ candidate.url }}"{%endif%} class="list-group-item">

+       <a {% if candidate.url %}href="{{ candidate.url }}" target="_blank" rel="noopener noreferrer"{%endif%} class="list-group-item">

            {% if election.candidates_are_fasusers %}

              {{ usernamemap['%s' % candidate.id] }}

            {% else %}

              {{ candidate.name }}

            {% endif %}

+           {% if candidate.url %}(click for more info){% endif %}

        </a>

      {% endfor %}

      {% if election.candidates.count() == 0 %}

@@ -112,7 +112,7 @@ 

           Copyright © 2013-2016 Red Hat

              </p>

              <p class="text-muted credit"> Powered by the <a href="https://pagure.io/elections/"

-                   target="_blank">elections</a> app -- version {{ version }}</p>

+                   target="_blank" rel="noopener noreferrer">elections</a> app -- version {{ version }}</p>

          </div>

      </div>

      {% block jscripts %}
@@ -126,17 +126,6 @@ 

            $('[data-toggle="tooltip"]').tooltip()

          })

          </script>

-       {% if config['FEDMENU_URL'] %}

-       <script src="{{ config['FEDMENU_URL'] }}/js/fedmenu.js"></script>

-       <script>

-         fedmenu({

-             'url': '{{ config["FEDMENU_DATA_URL"] }}',

-             'mimeType': 'application/javascript',

-             'position': 'bottom-right',

-         });

-       </script>

-       {% endif %}

- 

      {% endblock %}

  

    </body>

@@ -13,7 +13,7 @@ 

  

      <p class="text-xs-center">{{election.description}}</p>

  

-     <p class="text-xs-center"><a href="{{election.url}}">[More Information]</a></p>

+     <p class="text-xs-center"><a href="{{election.url}}" target="_blank" rel="noopener noreferrer">[More Information]</a></p>

  

      <p>Here are the candidates for the {{ election.seats_elected }} seat(s) open:</p>

      <form action="{{ url_for('vote', election_alias=election.alias) }}" method="post">

@@ -13,7 +13,7 @@ 

  

      <p class="text-xs-center">{{election.description}}</p>

  

-     <p class="text-xs-center"><a href="{{election.url}}">[More Information]</a></p>

+     <p class="text-xs-center"><a href="{{election.url}}" target="_blank" rel="noopener noreferrer">[More Information]</a></p>

  

      <p>Here are the candidates for the {{ election.seats_elected }} seat(s) open:</p>

      <form action="{{ url_for('vote', election_alias=election.alias) }}" method="post">

file modified
+6 -1
@@ -1,7 +1,7 @@ 

  %define modname fedora_elections

  

  Name:           fedora-elections

- Version:        2.7

+ Version:        2.9

  Release:        1%{?dist}

  Summary:        Fedora elections application

  
@@ -112,6 +112,11 @@ 

  

  

  %changelog

+ * Mon Nov 18 2019 Ben Cotton <bcotton@fedoraproject.org> 2.9-1

+ - Update to 2.9 (2.8 existed, in a sense)

+ - Open "more info" links in a new window

+ - Make it more clear that names are clickable links

+ 

  * Tue Oct 17 2017 Pierre-Yves Chibon <pingou@pingoured.fr> - 2.7-1

  - Update to 2.7

  - Fix spelling error (VoidWhisperer)