[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] [REF] rtl: Finally finish backporting MR !800 to 27.x

"Jonny Bradley \(@jonnybradley\) via TikiWiki-cvs" <[email protected]>
Newsgroups gmane.comp.cms.tiki.cvs
Message-ID <6891ebc238f66_2c11d431c28898@gitlab-sidekiq-low-urgency-cpu-bound-v2-68d57f6d77-lrbnp.mail> 

Jonny Bradley pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki


Commits:
8162b46c by Jonny Bradley at 2025-08-05T11:24:45+00:00
[REF] rtl: Finally finish backporting MR !800 to 27.x
---
* [REF] Several other minor updates found from !8194 in 28.x that look like good notice suppression fixes - so adding them here too

* [REF] rtl: Finally finish backporting MR !800 to 27.x - needed to be done manually as `templates/layouts/admin/layout_view.tpl` doesn't exsist in 27.x

See merge request tikiwiki/tiki!8195

- - - - -


13 changed files:

- templates/error_raw.tpl
- templates/error_simple.tpl
- templates/error_ticket.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/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">
@@ -13,7 +13,7 @@
             {include file='tiki-ajax_header.tpl'}
         {/if}
 
-        <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std middle" id="middle">
+        <div class="container{if isset($smarty.session.fullscreen) && $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std middle" id="middle">
 {if !isset($smarty.session.fullscreen) || $smarty.session.fullscreen ne 'y'}
             <div class="row">
                 <header class="page-header w-100" id="page-header">


=====================================
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">
@@ -30,19 +30,19 @@
     {/if}
     <a class="btn btn-info btn-lg skipnav" href="#col1">{tr}Skip to main content{/tr}</a>
     <div class="middle_outer" id="middle_outer">
-        {if $smarty.session.fullscreen ne 'y'}
+        {if isset($smarty.session.fullscreen) && $smarty.session.fullscreen ne 'y'}
             {if $prefs.theme_unified_admin_backend eq 'y' && $smarty.server.SCRIPT_NAME eq $url_path|cat:'tiki-admin.php'}
                 {modulelist zone=top class="top_modules uab top navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant} w-100 mb-sm" heading_text='{tr}Site identity, navigation, etc.{/tr}' role=banner}
             {/if}
         {/if}
         <div class="topbar-wrapper navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-topbar-nav-{$navbar_color_variant}">
-            <div class="topbar container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std navbar-{$navbar_color_variant} bg-{$navbar_color_variant} tiki-topbar-nav-{$navbar_color_variant}" id="topbar">
+            <div class="topbar container{if isset($smarty.session.fullscreen) && $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std navbar-{$navbar_color_variant} bg-{$navbar_color_variant} tiki-topbar-nav-{$navbar_color_variant}" id="topbar">
                 {modulelist zone=topbar class='topbar_modules w-100' heading_text='{tr}Navigation and related functionality and content{/tr}'}
             </div>
         </div>
         <div class="middle-wrapper">
             <div class="page-content-top-margin"  style="height: var(--tiki-page-content-top-margin)"></div>
-        <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std middle" id="middle">
+        <div class="container{if isset($smarty.session.fullscreen) && $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std middle" id="middle">
             <div class="row row-middle" id="row-middle">
                 {if (zone_is_empty('left') or $prefs.feature_left_column eq 'n') and (zone_is_empty('right') or $prefs.feature_right_column eq 'n')}
                     <div class="col col1 col-md-12 pb-4" id="col1">
@@ -177,10 +177,10 @@
             </div> {* row *}
         </div> {* container *}
     </div> {* middle_outer *}
-    {if !isset($smarty.session.fullscreen) || $smarty.session.fullscreen ne 'y'}
+    {if !isset($smarty.session.fullscreen) || isset($smarty.session.fullscreen) && $smarty.session.fullscreen ne 'y'}
         <footer class="footer main-footer" id="footer">
             <div class="footer_liner">
-                <div class="container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std">
+                <div class="container container-std">
                     {modulelist zone=bottom class='bottom_modules p-3 mx-n2point5' heading_text='{tr}Site information, links, etc.{/tr}' role=contentinfo} {* div.modules *}
                 </div>
             </div>


=====================================
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/8162b46c97f4e33b7812fcb2e13551101b18d120

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/8162b46c97f4e33b7812fcb2e13551101b18d120
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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.