From d1aa11ec89347fb2c139d751719c4459c2448321 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jun 2020 20:29:19 -0700 Subject: [PATCH 1/3] Fix for weird padlock display in asset listing with encrypted custom fields --- app/Presenters/AssetPresenter.php | 7 ++- public/css/build/all.css | Bin 248117 -> 248872 bytes public/css/dist/all.css | Bin 240238 -> 240993 bytes public/css/overrides.css | Bin 6726 -> 7481 bytes public/css/overrides.css.map | Bin 11037 -> 12592 bytes public/js/build/vue.js.map | Bin 2832412 -> 2832412 bytes public/mix-manifest.json | 10 ++-- resources/assets/less/overrides.less | 69 +++++++++++++++++++++++++++ 8 files changed, 79 insertions(+), 7 deletions(-) diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index 4b791be0c1..b8fc9c901d 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -268,8 +268,11 @@ class AssetPresenter extends Presenter "searchable" => true, "sortable" => true, "switchable" => true, - "title" => ($field->field_encrypted=='1') ?' '.$field->name : $field->name, - "formatter" => "customFieldsFormatter" + "title" => $field->name, + 'formatter' => 'customFieldsFormatter', + 'escape' => true, + 'class' => ($field->field_encrypted=='1') ? 'css-padlock' : '', + 'visible' => true, ]; } diff --git a/public/css/build/all.css b/public/css/build/all.css index a56df622ffb651a59a28cd5cf28364a22ba1366a..0852d2469d9dea691357480cd04ce653f916c5a9 100644 GIT binary patch delta 529 zcmdlwiGRfm{)QID7N#xCJSXc*GW3#*i**x|lT(X}^NT9&^hz>xGxPFNi*%q;Nr^?t z`6;QG63O{_#ihB4NjX^Lax#-s^NNuqs?+lGN_2}et5U5DtaCE+Qgt&@Gt)DeO01^e zcVH4{&Ph$1{__=6G#&?8C8eh27p3BK7n(da=bptboxGxPFNi*%q;Nr^?t z`6;QG63O{_#ihB4NjX^Lax#-s^NNuqs?+lGN_2}et5U5DtaCE+Qgt&@Gt)Cp4=3X=<7|ymz zQbn<&ATcE;KRFu_7*GQyJFXO)ZuN-CT-wN>prRHUbZDw4JF1E3xfvK4D_H|&QZn<> zb&G&uP-10-(1I4)AT2ULEsjbsGtry~QXubU;A{?8fay(;8aX!u6JxjOo~KN3A5whfQrEgl~A@o9g-zP zbAjX_m}!ma9#be>C9@ERB-3l6ZE?#<3|m>wBz#x4%erqG!Au)ywSR**rEo*3g>lB8 z_vz;>mYUDc5g!Sg?fu&FlB;?3_)9bvo#t1}4CF%JiMQTc3b;HF1# z^4`~UFdTWIBgQUGV%%P|bKHG4`sKZKgMu{K@-?-oof8uQ)J1_qR(-zwR delta 11 ScmdmKbNw*$Ta diff --git a/public/css/overrides.css.map b/public/css/overrides.css.map index 8f69f597f48e5e69fb2ffe3108125b3238709457..bfec6b1f14327caee8c5227e26036df3988294d5 100644 GIT binary patch delta 1523 zcmah}O>fgc5It6K=K`0ZTu@}kO{pkNB_zjkLe-B{q~%M#Y@A8FioKicZknVO%8%$3 z{zE1H3%`f)rmaI`ie;_k*_k)*y;=L`rAa;Hluha&@g=F6am5~ zi2VK6c;nlvMI^jRB@&TDC=AZpAK@TqpL8hhK6cUmS;95YJ>;SXvJX?_ zs^>s=Vt~`FL12tpGc^YzVWjW^g#nWw#4=q>GT~}WF*Z_Bpoh>`GJ`HteJ%zLXf9%; zE=Of>d@3kz_rQJpH(1c(ZvO~Xx!(Izls6ej`*U4?9@@48VlxNnxDRY^aA z9|&!b5$P%B_z-kDIak)}*-9QuK`kkgvo@@oA|#ZLiYgKwCy*k$z|uB^UhpzFGr+XV zb=CIm;DV5h8R@#`4Y)}r-D)f|PYXW6&cLs&qWbtenyW7UzSLG`N-RNL-O7=u2T-%`dSITcg>29!j}D zH$gr~OdWP!@@yoPVZvNLee!&fOLr9tGL7b12R1R%R=HE`4!LocfSHsgStba>S;`rW zdzqKXOIPaITH-*lxsF+il=eM0=3f1X^->uRbM}inZ|e0f_NBtYqY?wxlS+(SPs$Bl z_tWN8|7uxk>>XY%;5r3x$>BN(sWO&6c+_@AGp`0s%J8SCWrq9LKVH8ek@iTe=zb{s zc6!9r&_`3Jvl&JGt?f6_rZt%=d*r^WmP6dOleMP)`?M9j7gzZ)c!<*vhJA4;^U&;cef$0UqC=6dC|Lw&ehW8_HCRT}0i8I7!#2Rsy_?$SmVzJ)-JCw^O=UslNx-s`GTMnKbSMGkr#U$Pf w&>;^6IJP1fV1flDD8nUO!8KIi25h*6JE%ep9H>JBn$UtabfEhk?|ZX{19Nlt6rltca0z9oKov~5f*RDJ0Tx_C6K .th-inner, +th.css-license > .th-inner, +th.css-consumable > .th-inner, +th.css-accessory > .th-inner +{ + font-size: 0px; + line-height: 4!important; + text-align: left; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + + +th.css-padlock > .th-inner::before, +th.css-barcode > .th-inner::before, +th.css-license > .th-inner::before, +th.css-consumable > .th-inner::before, +th.css-accessory > .th-inner::before + +{ + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: 20px; +} + +th.css-padlock > .th-inner::before +{ + content: "\f023"; + padding-right: 2px; +} + +th.css-barcode > .th-inner::before +{ + content: "\f02a"; +} + +th.css-license > .th-inner::before +{ + content: "\f0c7"; +} + +th.css-consumable > .th-inner::before +{ + content: "\f043"; +} + +th.css-accessory > .th-inner::before +{ + content: "\f11c"; +} \ No newline at end of file From b941ef1e08f84f40f503db6ebe67d0e8dca9c74a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jun 2020 20:41:40 -0700 Subject: [PATCH 2/3] Pulled CSS font awesome styles out of the blade and into overrides.css --- resources/views/users/index.blade.php | 60 --------------------------- 1 file changed, 60 deletions(-) diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 0d1ae2f325..30b791378f 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -15,66 +15,6 @@ @section('header_right') - - @can('create', \App\Models\User::class) @if ($snipeSettings->ldap_enabled == 1) LDAP Sync From 946129f20614e65bbbecbbda70cfba81b89d0937 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jun 2020 20:45:20 -0700 Subject: [PATCH 3/3] Made quote style consistent --- app/Presenters/AssetPresenter.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index b8fc9c901d..5e009ebfa1 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -269,10 +269,10 @@ class AssetPresenter extends Presenter "sortable" => true, "switchable" => true, "title" => $field->name, - 'formatter' => 'customFieldsFormatter', - 'escape' => true, - 'class' => ($field->field_encrypted=='1') ? 'css-padlock' : '', - 'visible' => true, + "formatter"=> 'customFieldsFormatter', + "escape" => true, + "class" => ($field->field_encrypted=='1') ? 'css-padlock' : '', + "visible" => true, ]; }