Skip to content

Commit c2bfdd2

Browse files
author
Dmytro Lukianenko
committed
[FIX] Style in tree
1 parent 344a841 commit c2bfdd2

2 files changed

Lines changed: 32 additions & 23 deletions

File tree

‎manager/media/style/default/css/tree.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#treeloader.visible { opacity: 0.7; visibility: visible; -webkit-transition-duration: 0s; transition-duration: 0s }
66
.treeframebody { height: 100%; min-height: calc(100% + 1px); background-color: #fafafa; border-right: 1px solid #cfd2d6; }
77
#treeMenu { display: table; width: 100%; height: 1.875rem; table-layout: fixed; margin-top: -1px; background-color: #dfdfdf; border-bottom: 1px solid #cfd2d6 }
8-
#treeMenu .treeButton { display: table-cell; cursor: pointer; height: 1.875rem; line-height: 2rem; white-space: nowrap; text-align: center; vertical-align: middle; -webkit-transition-duration: 0.15s; transition-duration: 0.15s }
8+
#treeMenu .treeButton { display: table-cell; cursor: pointer; height: 1.875rem; white-space: nowrap; text-align: center; vertical-align: middle; -webkit-transition-duration: 0.15s; transition-duration: 0.15s }
99
#treeMenu .treeButton:hover:not(.disabled) { background-color: rgba(255, 255, 255, .5); cursor: pointer; -webkit-transition-duration: 0s; transition-duration: 0s }
1010
#treeMenu .treeButton:not(.disabled):active { background-color: #d5d5d5 }
1111
#treeMenu .treeButton .fa { display: block; width: 1.2em; height: 1.2em; margin: auto; line-height: 1.3em; font-size: 1.1em; }

‎manager/views/frame/1.blade.php‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
@php
2+
if (!function_exists('jsSvg')) {
3+
function jsSvg($svg) {
4+
$svg = str_replace(["\n", "\r", "\t"], '', $svg);
5+
$svg = preg_replace('/\s+/', ' ', $svg);
6+
return json_encode(trim($svg));
7+
}
8+
}
9+
@endphp
110
<!DOCTYPE html>
211
<html dir="{{ManagerTheme::getTextDir()}}" lang="{{ManagerTheme::getLang()}}" xml:lang="{{ManagerTheme::getLang()}}">
312
<head>
@@ -77,9 +86,9 @@
7786
actions_pencil: '{!!addslashes($_style['icon_pencil'])!!}',
7887
actions_plus: '{!!addslashes($_style['icon_plus'])!!}',
7988
actions_reply: '{!!addslashes($_style['icon_reply'])!!}',
80-
collapse_tree: '{!!addslashes('<i class="' . $_style['icon_arrow_up_circle'] . '"></i>')!!}',
89+
collapse_tree: {!! jsSvg($_style['icon_tabler_arrow_up']) !!},
8190
email: '{!!addslashes('<i class="' . $_style['icon_mail'] . '"></i>')!!}',
82-
expand_tree: '{!!addslashes('<i class="' . $_style['icon_arrow_down_circle'] . '"></i>')!!}',
91+
expand_tree: {!! jsSvg($_style['icon_tabler_arrow_down']) !!},
8392
icon_angle_left: '{!!addslashes($_style['icon_angle_left'])!!}',
8493
icon_angle_right: '{!!addslashes($_style['icon_angle_right'])!!}',
8594
icon_chunk: '{!!addslashes($_style['icon_chunk'])!!}',
@@ -171,40 +180,40 @@
171180
<li id="searchform">
172181
<form action="index.php?a=71" method="post" target="main">
173182
<input type="hidden" value="Search" name="submitok" />
174-
<label for="searchid" class="label_searchid"><i class="{{$_style['icon_search']}}"></i></label>
183+
<label for="searchid" class="label_searchid">{!! $_style['icon_tabler_search'] !!}</label>
175184
<input type="text" id="searchid" name="searchid" size="25" />
176185
<div class="mask"></div>
177186
</form>
178187
</li>
179188
@if (evo()->getConfig('show_newresource_btn') && evo()->hasPermission('new_document'))
180189
<li id="newresource" class="dropdown newresource">
181190
<a href="javascript:;" class="dropdown-toggle" onclick="return false;" title="{{ManagerTheme::getLexicon('add_resource')}}">
182-
<i class="{{$_style['icon_plus']}}"></i>
191+
{!! $_style['icon_tabler_file_plus'] !!}
183192
</a>
184193
<ul class="dropdown-menu">
185194
@if (evo()->hasPermission('new_document'))
186195
<li>
187196
<a onclick="" href="index.php?a=4" target="main">
188-
<i class="{{$_style['icon_document']}}"></i>{{ManagerTheme::getLexicon('add_resource')}}
197+
{!! $_style['icon_tabler_file_plus'] !!} {{ManagerTheme::getLexicon('add_resource')}}
189198
</a>
190199
</li>
191200
<li>
192201
<a onclick="" href="index.php?a=72" target="main">
193-
<i class="{{$_style['icon_chain']}}"></i>{{ManagerTheme::getLexicon('add_weblink')}}
202+
{!! $_style['icon_tabler_link'] !!} {{ManagerTheme::getLexicon('add_weblink')}}
194203
</a>
195204
</li>
196205
@endif
197206
@if (evo()->getConfig('use_browser') && evo()->hasPermission('assets_images'))
198207
<li>
199208
<a onclick="" href="media/browser/{{evo()->getConfig('which_browser')}}/browse.php?&type=images" target="main">
200-
<i class="{{$_style['icon_camera']}}"></i>{{ManagerTheme::getLexicon('images_management')}}
209+
{!! $_style['icon_tabler_camera'] !!} {{ManagerTheme::getLexicon('images_management')}}
201210
</a>
202211
</li>
203212
@endif
204213
@if (evo()->getConfig('use_browser') && evo()->hasPermission('assets_files'))
205214
<li>
206215
<a onclick="" href="media/browser/{{$modx->getConfig('which_browser')}}/browse.php?&type=files" target="main">
207-
<i class="{{$_style['icon_files']}}"></i>{{ManagerTheme::getLexicon('files_management')}}
216+
{!! $_style['icon_tabler_files'] !!} {{ManagerTheme::getLexicon('files_management')}}
208217
</a>
209218
</li>
210219
@endif
@@ -213,7 +222,7 @@
213222
@endif
214223
<li id="preview">
215224
<a href="../" target="_blank" title="{{ManagerTheme::getLexicon('preview')}}">
216-
<i class="{{$_style['icon_desktop']}}"></i>
225+
{!! $_style['icon_tabler_device_desktop'] !!}
217226
</a>
218227
</li>
219228
<li id="account" class="dropdown account">
@@ -222,27 +231,27 @@
222231
@if ($user['photo'])
223232
<span class="icon photo" style="background-image: url({!!MODX_SITE_URL . entities($user['photo'], evo()->getConfig('modx_charset'))!!});"></span>
224233
@else
225-
<span class="icon"><i class="{{$_style['icon_user']}}"></i></span>
234+
<span class="icon">{!! $_style['icon_tabler_user_circle'] !!}</span>
226235
@endif
227236
</a>
228237
<ul class="dropdown-menu">
229238
@if (evo()->hasPermission('change_password'))
230239
<li>
231240
<a onclick="" href="index.php?a=28" target="main">
232-
<i class="{{$_style['icon_lock']}}"></i>{{ManagerTheme::getLexicon('change_password')}}
241+
{!! $_style['icon_tabler_lock'] !!} {{ManagerTheme::getLexicon('change_password')}}
233242
</a>
234243
</li>
235244
@endif
236245
<li>
237246
<a href="index.php?a=8">
238-
<i class="{{$_style['icon_logout']}}"></i>{{ManagerTheme::getLexicon('logout')}}
247+
{!! $_style['icon_tabler_logout'] !!} {{ManagerTheme::getLexicon('logout')}}
239248
</a>
240249
</li>
241250
</ul>
242251
</li>
243252
<li id="theme">
244253
<a id="treeMenu_theme_dark" onclick="modx.tree.toggleTheme(event)" title="{{ManagerTheme::getLexicon('manager_theme_mode_title')}}">
245-
<i class="{{$_style['icon_theme']}}"></i>
254+
{!! $_style['icon_tabler_brightness'] !!}
246255
</a>
247256
</li>
248257
@if (
@@ -253,46 +262,46 @@
253262
)
254263
<li id="system" class="dropdown">
255264
<a href="javascript:;" class="dropdown-toggle" title="{{ManagerTheme::getLexicon('system')}}" onclick="return false;">
256-
<i class="{{$_style['icon_cogs']}}"></i>
265+
{!! $_style['icon_tabler_settings_cog'] !!}
257266
</a>
258267
<ul class="dropdown-menu">
259268
@if (evo()->hasPermission('settings'))
260269
<li>
261270
<a href="index.php?a=17" target="main">
262-
<i class="{{$_style['icon_sliders']}}"></i>{{ManagerTheme::getLexicon('edit_settings')}}
271+
{!! $_style['icon_tabler_adjustments_horizontal'] !!} {{ManagerTheme::getLexicon('edit_settings')}}
263272
</a>
264273
</li>
265274
@endif
266275
@if (evo()->hasPermission('view_eventlog'))
267276
<li>
268277
<a href="index.php?a=70" target="main">
269-
<i class="{{$_style['icon_calendar']}}"></i>{{ManagerTheme::getLexicon('site_schedule')}}
278+
{!! $_style['icon_tabler_calendar'] !!} {{ManagerTheme::getLexicon('site_schedule')}}
270279
</a>
271280
</li>
272281
@endif
273282
@if (evo()->hasPermission('view_eventlog'))
274283
<li>
275284
<a href="index.php?a=114" target="main">
276-
<i class="{{$_style['icon_info_triangle']}}"></i>{{ManagerTheme::getLexicon('eventlog_viewer')}}
285+
{!! $_style['icon_tabler_info_triangle'] !!} {{ManagerTheme::getLexicon('eventlog_viewer')}}
277286
</a>
278287
</li>
279288
@endif
280289
@if (evo()->hasPermission('logs'))
281290
<li>
282291
<a href="index.php?a=13" target="main">
283-
<i class="{{$_style['icon_user_secret']}}"></i>{{ManagerTheme::getLexicon('view_logging')}}
292+
{!! $_style['icon_tabler_timeline_event_exclamation'] !!} {{ManagerTheme::getLexicon('view_logging')}}
284293
</a>
285294
</li>
286295
<li>
287296
<a href="index.php?a=53" target="main">
288-
<i class="{{$_style['icon_info_circle']}}"></i>{{ManagerTheme::getLexicon('view_sysinfo')}}
297+
{!! $_style['icon_tabler_info_circle'] !!} {{ManagerTheme::getLexicon('view_sysinfo')}}
289298
</a>
290299
</li>
291300
@endif
292301
@if (evo()->hasPermission('help'))
293302
<li>
294303
<a href="index.php?a=9" target="main">
295-
<i class="{{$_style['icon_question_circle']}}"></i>{{ManagerTheme::getLexicon('help')}}
304+
{!! $_style['icon_tabler_help_circle'] !!} {{ManagerTheme::getLexicon('help')}}
296305
</a>
297306
</li>
298307
@endif
@@ -306,7 +315,7 @@
306315
@if (evo()->getConfig('show_fullscreen_btn'))
307316
<li id="fullscreen">
308317
<a href="javascript:;" onclick="toggleFullScreen();" id="toggleFullScreen" title="{{ManagerTheme::getLexicon('toggle_fullscreen')}}">
309-
<i class="{{$_style['icon_expand']}}"></i>
318+
{!! $_style['icon_tabler_arrows_maximize'] !!}
310319
</a>
311320
</li>
312321
@endif
@@ -320,7 +329,7 @@
320329
@if (evo()->getConfig('global_tabs'))
321330
<div class="tab-row-container evo-tab-row">
322331
<div class="tab-row">
323-
<h2 id="evo-tab-home" class="tab selected" data-target="evo-tab-page-home">
332+
<h2 id="evo-tab-home" class="tab selected" data-target="evo-tab-page-home" style="display:none!important;">
324333
<i class="{{$_style['icon_home']}}"></i></h2>
325334
</div>
326335
</div>

0 commit comments

Comments
 (0)