diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php index 9cbc077fc0..af910bfdc1 100644 --- a/app/Presenters/LocationPresenter.php +++ b/app/Presenters/LocationPresenter.php @@ -102,6 +102,7 @@ class LocationPresenter extends Presenter 'titleTooltip' => trans('general.people'), 'visible' => true, 'class' => 'css-house-user', + // 'data-tooltip' => true, - not working, but I want to try to use regular tooltips here ], [ 'field' => 'currency', 'searchable' => true, @@ -109,6 +110,7 @@ class LocationPresenter extends Presenter 'switchable' => true, 'title' => trans('general.currency'), 'visible' => true, + 'class' => 'css-currency', ], [ 'field' => 'address', 'searchable' => true, diff --git a/public/bootstrap-datepicker.pt.js b/public/bootstrap-datepicker.pt.js new file mode 100644 index 0000000000..011e01e07b --- /dev/null +++ b/public/bootstrap-datepicker.pt.js @@ -0,0 +1,18 @@ +/** + * Portuguese translation for bootstrap-datepicker + * Original code: Cauan Cabral + * Tiago Melo + */ +;(function($){ + $.fn.datepicker.dates['pt'] = { + days: ["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado"], + daysShort: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb"], + daysMin: ["Do", "Se", "Te", "Qu", "Qu", "Se", "Sa"], + months: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"], + monthsShort: ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"], + today: "Hoje", + monthsTitle: "Meses", + clear: "Limpar", + format: "dd/mm/yyyy" + }; +}(jQuery)); diff --git a/public/css/build/app.css b/public/css/build/app.css index dd86764de4..9c64e68a22 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index dff63c72a9..d96e1216f0 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index d7ebd8e5b9..65b7f9dbd9 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 196884e386..f561a1401f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=6d4d575774a1be993efe0598cc6b1c20", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d34ae2483cbe2c77478c45f4006eba55", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=b1c78591f51b52beab05b52f407ad6e6", - "/css/build/overrides.css": "/css/build/overrides.css?id=a91cd05d773097c4e74af95b08222842", - "/css/build/app.css": "/css/build/app.css?id=6e31106a2edbe21721736167b135295b", + "/css/build/overrides.css": "/css/build/overrides.css?id=10d3f63eef985a3df55e66506af9b23f", + "/css/build/app.css": "/css/build/app.css?id=6e3067fde8016a951134eee87737b831", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=53edc92eb2d272744bc7404ec259930e", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=18787b3f00a3be7be38ee4e26cbd2a07", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b", - "/css/dist/all.css": "/css/dist/all.css?id=b110c562934659958d6b909986d16a14", + "/css/dist/all.css": "/css/dist/all.css?id=72da33da732e29f66595d0acce3ece3f", "/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 a177c10e9a..540a6b02a3 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -729,13 +729,10 @@ h4 { any HTML used in the UserPresenter "title" attribute breaks the column selector HTML. Instead, we use CSS to add the icon into the table header, which leaves the column selector - "title" text as-is. + "title" text as-is and hides the icon. See https://github.com/snipe/snipe-it/issues/7989 - */ - -th.css-accessory > .th-inner th.css-accessory > .th-inner, th.css-accessory-alt > .th-inner, th.css-barcode > .th-inner, @@ -747,7 +744,9 @@ th.css-house-laptop > .th-inner, th.css-house-user > .th-inner, th.css-license > .th-inner, th.css-location > .th-inner, -th.css-users > .th-inner +th.css-users > .th-inner, +th.css-currency > .th-inner, +th.css-history > .th-inner { font-size: 0px; line-height: 0.75 !important; @@ -760,7 +759,7 @@ th.css-users > .th-inner th.css-location > .th-inner::before, th.css-accessory > .th-inner::before, -th.css-accessory-alt > .th-inner::before +th.css-accessory-alt > .th-inner::before, th.css-barcode > .th-inner::before, th.css-component > .th-inner::before, th.css-consumable > .th-inner::before, @@ -771,7 +770,9 @@ th.css-house-user > .th-inner::before, th.css-license > .th-inner::before, th.css-location > .th-inner::before, th.css-padlock > .th-inner::before, -th.css-users > .th-inner::before +th.css-users > .th-inner::before, +th.css-currency > .th-inner::before, +th.css-history > .th-inner::before { display: inline-block; font-size: 20px; @@ -851,6 +852,20 @@ th.css-accessory-alt > .th-inner::before { margin-bottom: 0px; } +th.css-currency > .th-inner::before { + content: "\24"; // change this to f51e for coins + font-family: "Font Awesome 5 Free"; + font-size: 19px; + margin-bottom: 0px; +} + +th.css-history > .th-inner::before { + content: "\f1da"; // change this to f51e for coins + font-family: "Font Awesome 5 Free"; + font-size: 19px; + margin-bottom: 0px; +} + .small-box .inner { padding-left: 15px;