Projet

Général

Profil

0001-general-remove-support-for-iframe-mode-29955.patch

Frédéric Péters, 22 janvier 2019 14:26

Télécharger (4,54 ko)

Voir les différences: 

Subject: [PATCH] general: remove support for "iframe" mode (#29955)


 auquotidien/modules/events.py |  6 +-----
 auquotidien/modules/root.py   | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
auquotidien/modules/events.py
132 132 
            r += htmltext('</ul>')
133 133 

  		




  134
  134
  
    
        if self.url:

  		




  135
  
  
    
            if get_response().iframe_mode:

  		




  136
  
  
    
                r += htmltext('<a class="external" href="%s" target="_top">%s</a>') % (

  		




  137
  
  
    
                        self.url, _('More information'))

  		




  138
  
  
    
            else:

  		




  139
  
  
    
                r += htmltext('<a class="external" href="%s">%s</a>') % (

  		




  
  135
  
    
            r += htmltext('<a class="external" href="%s">%s</a>') % (

  		




  140
  136
  
    
                        self.url, _('More information'))

  		




  141
  137
  
    
        r += htmltext('</dd>')

  		




  142
  138
  
    
        return r.getvalue()

  		












  

    
      auquotidien/modules/root.py
    
  





  363
  363
  
    
            r += htmltext('<p>')

  		




  364
  364
  
    
            r += _('You have been unsubscribed from announces')

  		




  365
  365
  
    
            r += htmltext('</p>')

  		




  366
  
  
    
            if not get_response().iframe_mode:

  		




  367
  
  
    
                r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  
  366
  
    
            r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  368
  367
  
    
        else:

  		




  369
  368
  
    
            r += htmltext('<p>')

  		




  370
  369
  
    
            r += _('Do you want to stop receiving announces by sms ?')

  		




  ......




  469
  468
  
    
            r += htmltext('<p>')

  		




  470
  469
  
    
            r += _('You have been subscribed to the announces.')

  		




  471
  470
  
    
            r += htmltext('</p>')

  		




  472
  
  
    
            if not get_response().iframe_mode:

  		




  473
  
  
    
                r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  
  471
  
    
            r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  474
  472
  
    
            return r.getvalue()

  		




  475
  473
  
    

  		




  476
  474
  
    
        # asking email confirmation before subscribing someone

  		




  ......




  492
  490
  
    
        r += htmltext('<p>')

  		




  493
  491
  
    
        r += _('You have been sent an email for confirmation')

  		




  494
  492
  
    
        r += htmltext('</p>')

  		




  495
  
  
    
        if not get_response().iframe_mode:

  		




  496
  
  
    
            r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  
  493
  
    
        r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  497
  494
  
    
        return r.getvalue()

  		




  498
  495
  
    

  		




  499
  496
  
    
    def emailconfirm(self):

  		




  ......




  605
  602
  
    
            r += htmltext('<p>')

  		




  606
  603
  
    
            r += _('You have been unsubscribed from announces')

  		




  607
  604
  
    
            r += htmltext('</p>')

  		




  608
  
  
    
            if not get_response().iframe_mode:

  		




  609
  
  
    
                r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  
  605
  
    
            r += htmltext('<a href="%s">%s</a>') % (root_url, _('Back Home'))

  		




  610
  606
  
    

  		




  611
  607
  
    
        else:

  		




  612
  608
  
    
            r += htmltext('<p>')

  		




  ......




  896
  892
  
    
            return redirect(misc.get_variadic_url(redirect_url,

  		




  897
  893
  
    
                get_publisher().substitutions.get_context_variables()))

  		




  898
  894
  
    

  		




  899
  
  
    
        if get_response().iframe_mode:

  		




  900
  
  
    
            # never display home page in an iframe

  		




  901
  
  
    
            return redirect('%sservices' % root_url)

  		




  902
  
  
    

  		




  903
  895
  
    
        template.html_top()

  		




  904
  896
  
    
        r = TemplateIO(html=True)

  		




  905
  897
  
    
        get_response().filter['is_index'] = True

  		




  ......




  977
  969
  
    
        else:

  		




  978
  970
  
    
            r += htmltext('<h3>%s</h3>') % _('Services')

  		




  979
  971
  
    

  		




  980
  
  
    
        if get_response().iframe_mode:

  		




  981
  
  
    
            if get_request().user:

  		




  982
  
  
    
                message = TextsDirectory.get_html_text('welcome-logged')

  		




  983
  
  
    
            else:

  		




  984
  
  
    
                message = TextsDirectory.get_html_text('welcome-unlogged')

  		




  985
  
  
    

  		




  986
  
  
    
            if message:

  		




  987
  
  
    
                r += htmltext('<div id="welcome-message">')

  		




  988
  
  
    
                r += message

  		




  989
  
  
    
                r += htmltext('</div>')

  		




  990
  
  
    
        elif 'auquotidien-welcome-in-services' in get_response().filter.get('keywords', []):

  		




  
  972
  
    
        if 'auquotidien-welcome-in-services' in get_response().filter.get('keywords', []):

  		




  991
  973
  
    
            homepage_text = TextsDirectory.get_html_text('aq-home-page')

  		




  992
  974
  
    
            if homepage_text:

  		




  993
  975
  
    
                r += htmltext('<div id="home-page-intro">')

  		




  994
  
  
    
-