Projet

Général

Profil

0001-misc-use-data-popup-attribute-to-mark-popup-links-40.patch

Frédéric Péters, 27 février 2020 18:11

Télécharger (2,47 ko)

Voir les différences: 

Subject: [PATCH] misc: use data-popup attribute to mark popup links (#40248)


 wcs/forms/root.py                                   | 2 +-
 wcs/qommon/templates/qommon/forms/widgets/file.html | 2 +-
 wcs/templates/wcs/formdata_status.html              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
wcs/forms/root.py
497 497 

  		




  498
  498
  
    
            if tracking_code:

  		




  499
  499
  
    
                get_response().add_javascript(['jquery.js', 'jquery-ui.js', 'popup.js'])

  		




  500
  
  
    
                r += htmltext('<a rel="popup" href="%s">%s</a>') % (

  		




  
  500
  
    
                r += htmltext('<a data-popup href="%s">%s</a>') % (

  		




  501
  501
  
    
                        'code/%s/' % tracking_code, tracking_code)

  		




  502
  502
  
    
                r += TextsDirectory.get_html_text('tracking-code-short-text')

  		




  503
  503
  
    
            r += htmltext('</div>')  # <!-- .tracking-code-part -->

  		












  

    
      wcs/qommon/templates/qommon/forms/widgets/file.html
    
  





  34
  34
  
    
  <p class="use-file-from-fargo"><span

  		




  35
  35
  
    
     data-src="{{site_url}}/fargo/pick" data-width="500" data-height="400"

  		




  36
  36
  
    
     data-title="{% trans "Pick a file from the portfolio" %}"

  		




  37
  
  
    
     rel="popup">{% trans "Use file from the portfolio" %}</span></p>

  		




  
  37
  
    
     data-popup>{% trans "Use file from the portfolio" %}</span></p>

  		




  38
  38
  
    
{% endif %}

  		




  39
  39
  
    
{% endblock %}

  		




  40
  40
  
    
{% endblock %}

  		












  

    
      wcs/templates/wcs/formdata_status.html
    
  





  14
  14
  
    
      {% if mine and formdata.formdef.enable_tracking_codes and formdata.tracking_code %}

  		




  15
  15
  
    
        <p id="tracking-code">

  		




  16
  16
  
    
        {% trans "You can get back to this page using the following tracking code:" %}

  		




  17
  
  
    
        <a href="../code/{{ formdata.tracking_code }}/" rel="popup">{{ formdata.tracking_code }}</a>

  		




  
  17
  
    
        <a href="../code/{{ formdata.tracking_code }}/" data-popup>{{ formdata.tracking_code }}</a>

  		




  18
  18
  
    
        </p>

  		




  19
  19
  
    
      {% endif %}

  		




  20
  20
  
    
    </div>

  		




  21
  
  
    
-