[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] Cleanup: Remove feature_bidi and streamline RTL logic
"Jonny Bradley \(@jonnybradley\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6891e44dea659_2cd5d68802ea@gitlab-sidekiq-low-urgency-cpu-bound-v2-68d57f6d77-86kpx.mail> |
Jonny Bradley pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki Commits: 905c60b4 by Jonny Bradley at 2025-08-05T10:53:35+00:00 Cleanup: Remove feature_bidi and streamline RTL logic --- * Cleanup: Remove feature_bidi and streamline RTL logic --- * Cleanup: Remove feature_bidi and streamline RTL logic See merge request tikiwiki/tiki!6614 (cherry picked from commit ed482f5ead095fc5839fdac41deb47a0d5d1f6e4) 7ca7705b Cleanup: Remove feature_bidi and streamline RTL logic Co-authored-by: Olivier Kango <[email protected]> See merge request tikiwiki/tiki!8194 - - - - - 14 changed files: - templates/error_raw.tpl - templates/error_simple.tpl - templates/error_ticket.tpl - templates/layouts/admin/layout_view.tpl - templates/layouts/basic/layout_embed.tpl - templates/layouts/basic/layout_view.tpl - templates/layouts/classic/layout_view.tpl - templates/layouts/layout_plain.tpl - templates/layouts/social/layout_view.tpl - templates/tiki-index_p.tpl - templates/tiki-print.tpl - templates/tiki-view_tracker_more_info.tpl - templates/tiki-webmail_contacts.tpl - templates/tiki_full.tpl Changes: ===================================== templates/error_raw.tpl ===================================== @@ -1,4 +1,4 @@ -{if $prefs.feature_bidi eq 'y'} +{if Language::isRTL()} <table dir="rtl" ><tr><td> {/if} @@ -12,6 +12,6 @@ </div> </div> </div> -{if $prefs.feature_bidi eq 'y'} +{if Language::isRTL()} </td></tr></table> {/if} ===================================== templates/error_simple.tpl ===================================== @@ -4,7 +4,7 @@ {include file='header.tpl'} </head> <body{html_body_attributes}> - {if $prefs.feature_bidi eq 'y'} + {if Language::isRTL()} <table dir="rtl" ><tr><td> {/if} <div id="tiki-mid"> @@ -16,7 +16,7 @@ </div> </div> </div> - {if $prefs.feature_bidi eq 'y'} + {if Language::isRTL()} </td></tr></table> {/if} {include file='footer.tpl'} ===================================== templates/error_ticket.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/layouts/admin/layout_view.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} </head> ===================================== templates/layouts/basic/layout_embed.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/layouts/basic/layout_view.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/layouts/classic/layout_view.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/layouts/layout_plain.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/layouts/social/layout_view.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/tiki-index_p.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} </head> ===================================== templates/tiki-print.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="print_page_{$page_id}"{/if}> +<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="print_page_{$page_id}"{/if}{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} </head> ===================================== templates/tiki-view_tracker_more_info.tpl ===================================== @@ -4,7 +4,7 @@ {include file='header.tpl'} </head> <body{html_body_attributes}> - {if $prefs.feature_bidi eq 'y'} + {if Language::isRTL()} <table dir="rtl" ><tr><td> {/if} <div id="tiki-main" class="alert alert-info"> @@ -27,7 +27,7 @@ <a href="#" onclick="javascript:window.close();" class="link">{tr}close{/tr}</a> </div> </div> - {if $prefs.feature_bidi eq 'y'} + {if Language::isRTL()} </td></tr></table> {/if} {include file='footer.tpl'} ===================================== templates/tiki-webmail_contacts.tpl ===================================== @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{$prefs.language}"> +<html lang="{$prefs.language}"{if Language::isRTL()} dir="rtl"{/if}> <head> {include file='header.tpl'} <meta name="viewport" content="width=device-width, initial-scale=1.0"> ===================================== templates/tiki_full.tpl ===================================== @@ -6,7 +6,7 @@ <body{html_body_attributes}> {* Index we display a wiki page here *} -{if $prefs.feature_bidi eq 'y'} +{if Language::isRTL()} <div dir="rtl"> {/if} {if $prefs.feature_ajax eq 'y'} @@ -58,7 +58,7 @@ </div> </div> {/if} -{if $prefs.feature_bidi eq 'y'} +{if Language::isRTL()} </div> {/if} {include file='footer.tpl'} View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/905c60b4cd3446cfd9f2842ebe6a3b5fe789479c -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/905c60b4cd3446cfd9f2842ebe6a3b5fe789479c You're receiving this email because of your account on gitlab.com. _______________________________________________ TikiWiki-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs