From 389a06aac507e816f8d0b1a3a5889f81037ee512 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 13 Aug 2024 15:40:51 +0100 Subject: [PATCH] Hide UI elements from print view on assets Signed-off-by: snipe --- public/css/build/app.css | Bin 24818 -> 26617 bytes public/css/build/overrides.css | Bin 17968 -> 19767 bytes public/css/dist/all.css | Bin 507930 -> 511528 bytes public/mix-manifest.json | 6 +- resources/assets/less/overrides.less | 121 ++++++++++++++++++- resources/views/hardware/view.blade.php | 73 +++++------ resources/views/partials/more-info.blade.php | 2 +- 7 files changed, 161 insertions(+), 41 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 1eb880672e61c799aa6693b95989879dd3b463cd..62573c549c48015753797a417881a235637d55d6 100644 GIT binary patch delta 1810 zcma)6&1%~~5XOgI@&tumrVfD;B3VC{?I;vldJ2?6LwhPMtfIBGMA{XrwVgBsoqFmq zFH-0e^weWtqvzgw>#SCCRt_;07&E)y{CwZc?4KWlzrP0Gentl`O0uAEy$ASJ>@$tw z<@ltr3L+Pb$KVyk?eFMI4dAk3;YeDQf>&(Sd97KhvKRu-D=)R@4gNA!fo!y{-;j-aBF%}s`coL?-YSn@Q6b;cAu*+c#S=OPy} zh9t-Pwid(Q_q+phFwX_STwHK;GHQ$tfvf~eL2K@HX4w|X1O!R-GiH%$xruGl9_t@=T^8sD(*i?d+)?sP?U zPK#0s94IaCQsN(1l2i)B9M$0{7HWd}lUQ4Nu1LIM6}Ba9v$lQNpU(U+@;fas^82&b z+Ig3+-D^zCaj+!iN(b3Ad_N2yh5F?7?XxF?o7=%-sE0#%%8F7*MGRW&Kt5!W&ObdL zW=fUuXf*t|RiWp3U3vQ%B`K9HpdE9V;*gr$x`U3{N!*!!K}lY>BdD{cY~@O^b~s%- zm6EL72(#I$E@(;8v{@T#TV0$>#))ErJ1NB}Y~jPb;5F{ zu42eono{18aCcTY;o bIOr2T)l+6SME7F{gugE)Ul0EQfJ*sy delta 22 ecmex)p7GN`#tp|!H?v6SFirM%WZPu_Qv(2b&ItkTJ!>D#M&!-z=0|iol0;#5FtbA%B2t8B68EJjU;J zEfssmwvVfWFqRZ^2`MnBQe$`mbR~HJh1O)Q7`@4WqlN(k3Ng<#68V57Qsk>nh8SjT zpF)0*$IyZx6@p)3n_Q7o>s?WHXa7gJY?|8*#Xhyv%3qYLjP<&)I18=Vy`iYi$0St} z2da>FsqiJVqL~I6qB;V_LQPPA>K9fqSJYqe4BHaaS?j(GrZdMIJ4Opc{(AYT2;LXl z?lqqEZ}Z+MbQrD+BA z9P#~KKhiq&hr|9=6IPDZz_x8u`ygU8XmINtfGJM!d0tjl^p{i{iyPG~x0%l(Yrt2Q zl4~N^nq*q>v{9{DIkP4y4T5r~TB~f~&~iaFmx2TgM>Nih4p<@Iuz+Yfj~UTY#&c>! zC|Wb;G1s>~L_7$XFr+N(6Uh?dlnAxqwhgasjM~PyF>*whG!`1uwlQlPXKll=J65L% z#|2Ydx{PDuwahFcXJ)#K<<5P)YQj?SLSGYy5cg$gnwze=5;{I+J8Pda$C^~nw7fn# zzIGRH=2>3(pGs*iR-+1yUNLy?=I(Y*JHGY@~G?T t8OB}0c{xMo!l@a%yNtK{v4`?AvOcW0TIB-K)q z!}j1&LRk<&dJ&I;f;WGGm;MOP`V*Y}NYWOBUWF_y!~4$r`ONdYA1r_VusjHra3(w# z&W3Yg?pyx%{I%NwYGc@)2l;XG23v4vbtADn#M;ES!0^0iaUs9o2hfSv))?ji^*QN| z(t5-ejs;c22zKJsJ^4GrbIbBgpu!*!{R4ppKyF3@-7p=3vrxg!Kwc z?4|A=Wwyox)Fgh}0y8ZK;9?;#n_L)rb#&FDzL1e?!49a8iHA8n!adle9`e;PB%U&G z%t$NlaA3?`DgZR8OPK`?7d5vxhDV=@QGIK6>0YG-s7r|rF?3pkVYJPGNJMN52wcL2 z9P6%Zh~)IFRFMVs)81j>!u7smX3(V5RqJP)F2T2YGF3u)mc^3PT9(?++RA4;Ypz`V zz85em-#!MX!{p%$hPVLQlB@d?iDY49#YW5kWOWHA0^3>F4AhnN`VF(TW{wCWD?izM z_|N1haPn6pyro=>YJZf=!yo5WMIF8?EcMYdhvC-CTdE^OU{xyWi&KpZ!x%MLaWJwm z%K|c9!MbEc%BvUk zp-buz9|=Nz&Bl@_u~?$RFS%lFSC$8ejuvN%%HHrN|9C~06KLGif{yEIHJF&((QXb8 fpBKLl#4qLh!9xD&+o_(XdYd<_gvd`-m>X1P1m2!!nR$1Df>^2>6@zAg}0m7 KvLA}WkOKfpS{P>l diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9681b0d92e..3f4ef50a0c 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=da3f7fee4a180ba924f6a3920c94eb71", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4", - "/css/build/overrides.css": "/css/build/overrides.css?id=8b52c9d1db6308dc8e8f5a7b37c3b77e", - "/css/build/app.css": "/css/build/app.css?id=90208ff936931e1db6b2966780582386", + "/css/build/overrides.css": "/css/build/overrides.css?id=45c0cead5a6d7e8ce18bb3be74da66f1", + "/css/build/app.css": "/css/build/app.css?id=be23d679f1a883c2e6bf37fe06b5eca5", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=09fcaf5dbed58ca2e980f209cddbeb49", + "/css/dist/all.css": "/css/dist/all.css?id=4cc4a343a5e63c1c708219008137ae6b", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index c25f535442..979e9fbeee 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -363,8 +363,10 @@ body { } @media print { - a[href]:after { - content: none; + + @page { + size: A4; + margin: 0mm; } .tab-content > .tab-pane { @@ -372,8 +374,123 @@ body { opacity: 1 !important; visibility: visible !important; } + + .img-responsive { + width: 200px; + } + + html, body { + width: 1024px; + } + + body { + margin: 0 auto; + line-height: 1em; + word-spacing:1px; + letter-spacing:0.2px; + font: 15px "Times New Roman", Times, serif; + background:white; + color:black; + width: 100%; + float: none; + } + + /* avoid page-breaks inside a listingContainer*/ + .listingContainer { + page-break-inside: avoid; + } + + h1 { + font: 28px "Times New Roman", Times, serif; + } + + h2 { + font: 24px "Times New Roman", Times, serif; + } + + h3 { + font: 20px "Times New Roman", Times, serif; + } + + /* Improve colour contrast of links */ + a:link, a:visited { + color: #781351 + } + + /* URL */ + a:link, a:visited { + background: transparent; + color:#333; + text-decoration:none; + } + + a[href]:after { + content: "" !important; + } + + a[href^="http://"] { + color:#000; + } + + #header { + height:75px; + font-size: 24pt; + color:black + } + + div.row-new-striped { + margin: 0px; + padding: 0px; + } + + .pagination-detail, .fixed-table-toolbar { + visibility: hidden; + } + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 .col-sm-pull-3 .col-sm-push-9 { + float: left; + } + + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666666666666%; + } + .col-sm-10 { + width: 83.33333333333334%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666666666666%; + } + .col-sm-7 { + width: 58.333333333333336%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666666666667%; + } + .col-sm-4 { + width: 33.33333333333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.666666666666664%; + } + .col-sm-1 { + width: 8.333333333333332%; + } + } + + img.navbar-brand-img, .navbar-brand>img { float: left; padding: 5px 5px 5px 0; diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 16fed07922..a4adb83556 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -133,7 +133,7 @@ @can('update', \App\Models\Asset::class) -
  • +
  • {{ trans('button.upload') }} @@ -176,7 +176,7 @@ @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1')) @if (($asset->assigned_to != '') && ($asset->deleted_at=='')) @can('checkin', \App\Models\Asset::class) -
    +
    model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> {{ trans('admin/hardware/general.checkin') }} @@ -186,7 +186,7 @@ @endcan @elseif (($asset->assigned_to == '') && ($asset->deleted_at=='')) @can('checkout', \App\Models\Asset::class) -
    +
    model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> {{ trans('admin/hardware/general.checkout') }} @@ -199,7 +199,7 @@ @if ($asset->deleted_at=='') @can('update', $asset) -
    +
    {{ trans('admin/hardware/general.edit') }} @@ -207,7 +207,7 @@ @endcan @can('audit', \App\Models\Asset::class) -
    +
    model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> {{ trans('general.audit') }} @@ -218,7 +218,7 @@ @endif @can('create', $asset) -
    +
    {{ trans('admin/hardware/general.clone') }} @@ -226,7 +226,7 @@ @endcan @can('delete', $asset) -
    +
    @if ($asset->deleted_at=='') @@ -247,7 +247,7 @@

    @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar())) - {{ $asset->assignedTo->present()->fullName() }} + {{ $asset->assignedTo->present()->fullName() }} @endif

    {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!} @@ -288,7 +288,7 @@
    • @endif
  • - {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }} + {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
    • @if (isset($asset->expected_checkin))
  • @@ -324,7 +324,7 @@
    {{ $asset->asset_tag }} -