Skip to content

Commit de84934

Browse files
committed
Merge branch 'feature-PRESIDECMS-3000-dm-tab-without-icon' into release-10.28.0
2 parents 9162c6e + 6415315 commit de84934

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

system/base/EnhancedDataManagerBase.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ component extends="preside.system.base.AdminHandler" {
337337

338338
args.tabs[ i ] = {
339339
id = tabId
340-
, iconClass = translateResource( uri=i18nBase & "viewtab.#tabId#.iconclass", defaultValue=translateResource( i18nDefaultBase & "viewtab.#tabId#.iconclass" ) )
340+
, iconClass = translateResource( uri=i18nBase & "viewtab.#tabId#.iconclass", defaultValue=translateResource( uri=i18nDefaultBase & "viewtab.#tabId#.iconclass", defaultValue="" ) )
341341
, content = customizationService.runCustomization( objectName=objectName, action="_#tabId#Tab", args=args )
342342
, title = customizationService.runCustomization( objectName=objectName, action="_#tabId#TabTitle", args=args, defaultResult=translateResource( uri=i18nBase & "viewtab.#tabId#.title", defaultValue=translateResource( i18nDefaultBase & "viewtab.#tabId#.title" ) ) )
343343
};

system/views/admin/datamanager/_tabs.cfm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
</cfif>
2929
<li<cfif tab.id eq activeTab> class="active"</cfif>>
3030
<a href="##tab-#tab.id#" data-toggle="tab" >
31-
<i class="fa fa-fw #tab.iconClass#" title="#HtmlEditFormat( tab.title )#"></i>&nbsp;
31+
<cfif Len( tab.iconClass )>
32+
<i class="fa fa-fw #tab.iconClass#" title="#HtmlEditFormat( tab.title )#"></i>&nbsp;
33+
</cfif>
3234

3335
<span class="hidden-xs">
3436
#tab.title#

0 commit comments

Comments
 (0)