diff --git a/auquotidien/modules/events.py b/auquotidien/modules/events.py index 930707d..dc89f45 100644 --- a/auquotidien/modules/events.py +++ b/auquotidien/modules/events.py @@ -132,11 +132,7 @@ class Event(StorableObject): r += htmltext('') if self.url: - if get_response().iframe_mode: - r += htmltext('%s') % ( - self.url, _('More information')) - else: - r += htmltext('%s') % ( + r += htmltext('%s') % ( self.url, _('More information')) r += htmltext('') return r.getvalue() diff --git a/auquotidien/modules/root.py b/auquotidien/modules/root.py index 5adcdd7..a4698a7 100644 --- a/auquotidien/modules/root.py +++ b/auquotidien/modules/root.py @@ -363,8 +363,7 @@ class AnnouncesDirectory(Directory): r += htmltext('

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

') - if not get_response().iframe_mode: - r += htmltext('%s') % (root_url, _('Back Home')) + r += htmltext('%s') % (root_url, _('Back Home')) else: r += htmltext('

') r += _('Do you want to stop receiving announces by sms ?') @@ -469,8 +468,7 @@ class AnnouncesDirectory(Directory): r += htmltext('

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

') - if not get_response().iframe_mode: - r += htmltext('%s') % (root_url, _('Back Home')) + r += htmltext('%s') % (root_url, _('Back Home')) return r.getvalue() # asking email confirmation before subscribing someone @@ -492,8 +490,7 @@ class AnnouncesDirectory(Directory): r += htmltext('

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

') - if not get_response().iframe_mode: - r += htmltext('%s') % (root_url, _('Back Home')) + r += htmltext('%s') % (root_url, _('Back Home')) return r.getvalue() def emailconfirm(self): @@ -605,8 +602,7 @@ class AnnouncesDirectory(Directory): r += htmltext('

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

') - if not get_response().iframe_mode: - r += htmltext('%s') % (root_url, _('Back Home')) + r += htmltext('%s') % (root_url, _('Back Home')) else: r += htmltext('

') @@ -896,10 +892,6 @@ class AlternateRootDirectory(OldRootDirectory): return redirect(misc.get_variadic_url(redirect_url, get_publisher().substitutions.get_context_variables())) - if get_response().iframe_mode: - # never display home page in an iframe - return redirect('%sservices' % root_url) - template.html_top() r = TemplateIO(html=True) get_response().filter['is_index'] = True @@ -977,17 +969,7 @@ class AlternateRootDirectory(OldRootDirectory): else: r += htmltext('

%s

') % _('Services') - if get_response().iframe_mode: - if get_request().user: - message = TextsDirectory.get_html_text('welcome-logged') - else: - message = TextsDirectory.get_html_text('welcome-unlogged') - - if message: - r += htmltext('
') - r += message - r += htmltext('
') - elif 'auquotidien-welcome-in-services' in get_response().filter.get('keywords', []): + if 'auquotidien-welcome-in-services' in get_response().filter.get('keywords', []): homepage_text = TextsDirectory.get_html_text('aq-home-page') if homepage_text: r += htmltext('
')