[TikiWiki-commits] [Git][tikiwiki/tiki][master] [ENH][UI] Layout: Simplify the code and overall look and feel by removing...
"luci \(@luciash\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68fdeda6527a7_2c14d9af1c9882c@gitlab-sidekiq-low-urgency-cpu-bound-v2-854849f664-7kvb2.mail> |
luci pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
3da6c0d4 by luci at 2025-10-26T10:44:45+01:00
[ENH][UI] Layout: Simplify the code and overall look and feel by removing totally unnecessary extra div wrapper introduced in !7951
- - - - -
3 changed files:
- templates/layouts/basic/layout_view.tpl
- templates/layouts/classic/layout_view.tpl
- templates/layouts/social/layout_view.tpl
Changes:
=====================================
templates/layouts/basic/layout_view.tpl
=====================================
@@ -103,12 +103,10 @@
{/if}
</div>
<div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
</div>
{elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
@@ -142,12 +140,10 @@
{/if}
</div>
<div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
{else}
<div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -188,20 +184,16 @@
{/if}
</div>
<div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
<div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
{/if}
</div>
=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -114,12 +114,10 @@
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
</div>
<div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
{elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
<div class="col col1 col-md-12 col-lg-9 {if $prefs.feature_fixed_width neq 'y'}col-xl-10{/if} order-md-1 order-lg-2 pb-4" id="col1">
@@ -155,12 +153,10 @@
</div>
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
<div class="col col2 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
{else}
<div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -203,20 +199,16 @@
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
</div>
<div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
<div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
{/if}
</div> {* row row-middle *}
=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -134,12 +134,10 @@
{/if}
</div>
<div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
</div>
{elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
@@ -174,12 +172,10 @@
{/if}
</div>
<div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
{else}
<div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -221,20 +217,16 @@
{/if}
</div>
<div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
- {/if}
- {$modzoneleft}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+ {/if}
+ {$modzoneleft}
</div>
<div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
- <div class="p-1 bg-light">
- {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
- {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
- {/if}
- {$modzoneright}
- </div>
+ {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+ {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+ {/if}
+ {$modzoneright}
</div>
{/if}
</div> {* row *}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3da6c0d479f22be96d79ec1f726e32921f6dfed0
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3da6c0d479f22be96d79ec1f726e32921f6dfed0
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