[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] Make Permissions link visually consistent with other dropdown-item...
"Gary Cunningham-Lee \(--- via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6900499bbef81_2c109ecdec85385@gitlab-sidekiq-low-urgency-cpu-bound-v2-854849f664-jf4k9.mail> |
Gary Cunningham-Lee pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
a6bf138b by Gary Cunningham-Lee at 2025-10-28T13:32:53+09:00
[FIX][UI] Make Permissions link visually consistent with other dropdown-item...
---
* [FIX][UI] Make Permissions link visually consistent with other dropdown-item links (in wiki page bar and quickadmin module).
See merge request tikiwiki/tiki!8888
- - - - -
4 changed files:
- templates/modules/mod-quickadmin.tpl
- templates/permission_link.tpl
- templates/tiki-page_bar.tpl
- themes/base_files/scss/_tiki-modules.scss
Changes:
=====================================
templates/modules/mod-quickadmin.tpl
=====================================
@@ -58,8 +58,8 @@
<a class="dropdown-item" href="tiki-admingroups.php">
{icon name="group"} {tr}Groups{/tr}
</a>
- <div class="dropdown-item">
- {permission_link mode=text}
+ <div class="dropdown-item p-0">
+ {permission_link mode=button_link addclass="d-block text-start"}
</div>
<a class="dropdown-item" href="tiki-admin_menus.php">
{icon name="menu"} {tr}Menus{/tr}
=====================================
templates/permission_link.tpl
=====================================
@@ -28,6 +28,14 @@
<span class="badge bg-secondary">{$permission_link.count|escape}</span>
{/if}
</a>
+{elseif $permission_link.mode eq 'dropdown_item'}
+ <a class="btn btn-link dropdown-item{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}">
+ {* {icon name="permission"} *}
+ {$permission_link.label|escape}
+ {if !empty($permission_link.count)}
+ <span class="badge bg-secondary">{$permission_link.count|escape}</span>
+ {/if}
+ </a>
{elseif $permission_link.mode eq 'icon'}
{strip}
<a class="tips btn {if !empty($permission_link.active)}btn-warning {else} btn-link{/if} btn-sm{if !empty($permission_link.addclass)} {$permission_link.addclass}{/if}" href="{$permission_link.url|escape}" title=":{$permission_link.label}">
=====================================
templates/tiki-page_bar.tpl
=====================================
@@ -12,7 +12,7 @@
</a>
{/if}
{if $tiki_p_admin_wiki eq 'y' or $tiki_p_assign_perm_wiki_page eq 'y'}
- {permission_link mode="button" type="wiki page" addclass="dropdown-item" id=$page permType=wiki title=$page}
+ {permission_link mode="dropdown_item" type="wiki page" id=$page permType=wiki title=$page}
{/if}
{if $prefs.feature_page_contribution eq 'y' and $tiki_p_page_contribution_view eq 'y'}
{button _keepall='y' href="tiki-page_contribution.php" page=$page _type="link" _class="dropdown-item" _text="{tr}Contributions by author{/tr}"}
=====================================
themes/base_files/scss/_tiki-modules.scss
=====================================
@@ -487,3 +487,12 @@ header.fixed-top {
.btn-toggle.collapsed .hide-text {
display: none;
}
+
+// Quickadmin module Permissions link
+#quickadmin div.dropdown-item {
+ padding: 0 var(--bs-dropdown-item-padding-x);
+ & .btn-link {
+ color: var(--bs-dropdown-link-color);
+ padding: 0;
+ }
+}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a6bf138b08cdf2464edf0b5c72849457eff61aad
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a6bf138b08cdf2464edf0b5c72849457eff61aad
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