mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 15:44:11 -08:00
9c8ca6af21
commite321aeabaeMerge:8ec99ff4337568ae9eAuthor: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit37568ae9ecMerge:01a83216932ad9050cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit32ad9050cfAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169cMerge:bcad49ce73c6883489Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit3c6883489cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1bMerge:714576be429f3a5c48Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit29f3a5c48fAuthor: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45Merge:b999c50a2512899294Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit5128992940Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2eMerge:9ca20e496e3906b245Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commite3906b245cAuthor: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964Merge:e0644dbbf456a74d88Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit456a74d88cAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commitb725bd0faeAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6Merge:5b6925b00004ecad05Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit5b6925b00cAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bfAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit24c43056baAuthor: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit606b7e905dAuthor: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commitd73ddad477Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721eMerge:7410b16838994f3e15Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit7410b16835Merge:e955c983ab09e7d19bAuthor: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit8994f3e15eAuthor: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77caAuthor: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3Merge:2fa17ac18eed41e454Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commitb09e7d19b3Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit2fa17ac185Merge:b905154373b1e46f72Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit3b1e46f72bAuthor: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754fAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792aAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfbAuthor: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46aAuthor: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229Merge:81a633288897757bd0Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit897757bd04Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit6e563f6e4bMerge:5320f5c677f69ae953Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67cAuthor: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953bMerge:c79f8c1ba17f6fbabfAuthor: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit17f6fbabfaAuthor: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commitc79f8c1bafMerge:12c92e30b536401fe0Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit12c92e30b7Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commitfd10b755b0Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commitdbbb7680d9Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commitcf0dd5bbadAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7fMerge:ec6ed256f89d433b41Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit89d433b41aAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6fAuthor: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit536401fe0fAuthor: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fbAuthor: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2dMerge:339bdddc3cc9f1577aAuthor: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0cAuthor: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371eAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit2e60a457bfAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160bMerge:b42801f6a00b051b8cAuthor: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit00b051b8c7Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7eAuthor: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384fAuthor: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6aeMerge:de4934f21946129f20Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit946129f206Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commitd1aa11ec89Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commitde4934f21dMerge:af06e4205b10076b01Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commitb10076b015Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4bMerge:beae8efb22ac1c1636Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit2ac1c1636cAuthor: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit004ecad059Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21Merge:d14ab7e3e9839e5e56Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit9839e5e566Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commite7f74d94c1Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530Merge:f886837668210da6e8Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit8210da6e82Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commitf88683766bAuthor: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8cAuthor: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffaAuthor: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit7fb3a9b82cMerge:9a2ed804cecb1e87feAuthor: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commitecb1e87fe6Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit9a2ed804caAuthor: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commitd20fad28e5Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commitae813ddf75Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0cAuthor: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit9ee28c7513Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit1a8ba06702Merge:0fd232e70ee4d69b1cAuthor: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70dAuthor: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commitee4d69b1c5Merge:31c535094d1ad11194Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commitd1ad111949Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit31c5350941Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit7eb70e17e0Merge:5bb4f271a3dfcb4699Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit3dfcb46991Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3baAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59fAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit5bb4f271aaAuthor: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>
904 lines
41 KiB
PHP
904 lines
41 KiB
PHP
<!DOCTYPE html>
|
|
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
|
<head>
|
|
<meta charset="utf-8">
|
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
<title>
|
|
@section('title')
|
|
@show
|
|
:: {{ $snipeSettings->site_name }}
|
|
</title>
|
|
<!-- Tell the browser to be responsive to screen width -->
|
|
<meta content="width=device-width, initial-scale=1" name="viewport">
|
|
|
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
|
|
|
|
|
|
|
<link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : '/img/logo.png' }}">
|
|
<link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : '/img/logo.png' }}">
|
|
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->favicon)) : 'favicon.ico' }} ">
|
|
|
|
|
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
|
<meta name="baseUrl" content="{{ url('/') }}/">
|
|
|
|
<script nonce="{{ csrf_token() }}">
|
|
window.Laravel = { csrfToken: '{{ csrf_token() }}' };
|
|
</script>
|
|
|
|
{{-- stylesheets --}}
|
|
|
|
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
|
<link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
|
|
|
|
|
|
|
|
{{-- page level css --}}
|
|
@stack('css')
|
|
|
|
|
|
|
|
@if (($snipeSettings) && ($snipeSettings->header_color!=''))
|
|
<style nonce="{{ csrf_token() }}">
|
|
.main-header .navbar, .main-header .logo {
|
|
background-color: {{ $snipeSettings->header_color }};
|
|
background: -webkit-linear-gradient(top, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
|
|
background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
|
|
border-color: {{ $snipeSettings->header_color }};
|
|
}
|
|
.skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li:hover > a, .skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} .sidebar-menu > li.active > a {
|
|
border-left-color: {{ $snipeSettings->header_color }};
|
|
}
|
|
|
|
.btn-primary {
|
|
background-color: {{ $snipeSettings->header_color }};
|
|
border-color: {{ $snipeSettings->header_color }};
|
|
}
|
|
</style>
|
|
@endif
|
|
|
|
{{-- Custom CSS --}}
|
|
@if (($snipeSettings) && ($snipeSettings->custom_css))
|
|
<style>
|
|
{!! $snipeSettings->show_custom_css() !!}
|
|
</style>
|
|
@endif
|
|
|
|
@if (($snipeSettings) && ($snipeSettings->custom_css))
|
|
<style>
|
|
{!! $snipeSettings->show_custom_css() !!}
|
|
</style>
|
|
@endif
|
|
|
|
|
|
<script nonce="{{ csrf_token() }}">
|
|
window.snipeit = {
|
|
settings: {
|
|
"per_page": {{ $snipeSettings->per_page }}
|
|
}
|
|
};
|
|
</script>
|
|
<!-- Add laravel routes into javascript Primarily useful for vue.-->
|
|
@routes
|
|
|
|
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
|
<script src="{{ url(asset('js/html5shiv.js')) }}" nonce="{{ csrf_token() }}"></script>
|
|
<script src="{{ url(asset('js/respond.js')) }}" nonce="{{ csrf_token() }}"></script>
|
|
|
|
|
|
</head>
|
|
<body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : '' }}">
|
|
<a class="skip-main" href="#main">Skip to main content</a>
|
|
<div class="wrapper">
|
|
|
|
<header class="main-header">
|
|
|
|
<!-- Logo -->
|
|
|
|
|
|
<!-- Header Navbar: style can be found in header.less -->
|
|
<nav class="navbar navbar-static-top" role="navigation">
|
|
<!-- Sidebar toggle button above the compact sidenav -->
|
|
<a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="push-menu" role="button">
|
|
<span class="sr-only">Toggle navigation</span>
|
|
</a>
|
|
<div class="nav navbar-nav navbar-left">
|
|
<div class="left-navblock">
|
|
@if ($snipeSettings->brand == '3')
|
|
<a class="logo navbar-brand no-hover" href="{{ url('/') }}">
|
|
@if ($snipeSettings->logo!='')
|
|
<img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
|
|
@endif
|
|
{{ $snipeSettings->site_name }}
|
|
</a>
|
|
@elseif ($snipeSettings->brand == '2')
|
|
<a class="logo navbar-brand no-hover" href="{{ url('/') }}">
|
|
@if ($snipeSettings->logo!='')
|
|
<img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
|
|
@endif
|
|
<span class="sr-only">{{ $snipeSettings->site_name }}</span>
|
|
</a>
|
|
@else
|
|
<a class="logo navbar-brand no-hover" href="{{ url('/') }}">
|
|
{{ $snipeSettings->site_name }}
|
|
</a>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Navbar Right Menu -->
|
|
<div class="navbar-custom-menu">
|
|
<ul class="nav navbar-nav">
|
|
@can('index', \App\Models\Asset::class)
|
|
<li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!} tabindex="-1">
|
|
<a href="{{ url('hardware') }}" tabindex="-1">
|
|
<i class="fa fa-barcode" aria-hidden="true"></i>
|
|
<span class="sr-only">Assets</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\License::class)
|
|
<li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!} tabindex="-1">
|
|
<a href="{{ route('licenses.index') }}" tabindex="-1">
|
|
<i class="fa fa-floppy-o"></i>
|
|
<span class="sr-only">Licenses</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('index', \App\Models\Accessory::class)
|
|
<li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!} tabindex="-1">
|
|
<a href="{{ route('accessories.index') }}" tabindex="-1">
|
|
<i class="fa fa-keyboard-o"></i>
|
|
<span class="sr-only">Accessories</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('index', \App\Models\Consumable::class)
|
|
<li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ url('consumables') }}" tabindex="-1">
|
|
<i class="fa fa-tint"></i>
|
|
<span class="sr-only">Consumables</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\Component::class)
|
|
<li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('components.index') }}" tabindex="-1">
|
|
<i class="fa fa-hdd-o"></i>
|
|
<span class="sr-only">Components</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('index', \App\Models\Asset::class)
|
|
<li>
|
|
<form class="navbar-form navbar-left form-horizontal" role="search" action="{{ route('findbytag/hardware') }}" method="get">
|
|
<div class="col-xs-12 col-md-12">
|
|
<div class="col-xs-12 form-group">
|
|
<label class="sr-only" for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
|
|
<input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
|
|
<input type="hidden" name="topsearch" value="true" id="search">
|
|
</div>
|
|
<div class="col-xs-1">
|
|
<button type="submit" class="btn btn-primary pull-right">
|
|
<i class="fa fa-search" aria-hidden="true"></i>
|
|
<span class="sr-only">Search</span>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('admin')
|
|
<li class="dropdown" aria-hidden="true">
|
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" tabindex="-1">
|
|
{{ trans('general.create') }}
|
|
<strong class="caret"></strong>
|
|
</a>
|
|
<ul class="dropdown-menu">
|
|
@can('create', \App\Models\Asset::class)
|
|
<li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
|
|
<a href="{{ route('hardware.create') }}" tabindex="-1">
|
|
<i class="fa fa-barcode fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.asset') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('create', \App\Models\License::class)
|
|
<li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
|
|
<a href="{{ route('licenses.create') }}" tabindex="-1">
|
|
<i class="fa fa-floppy-o fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.license') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('create', \App\Models\Accessory::class)
|
|
<li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}>
|
|
<a href="{{ route('accessories.create') }}" tabindex="-1">
|
|
<i class="fa fa-keyboard-o fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.accessory') }}</a>
|
|
</li>
|
|
@endcan
|
|
@can('create', \App\Models\Consumable::class)
|
|
<li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}>
|
|
<a href="{{ route('consumables.create') }}" tabindex="-1">
|
|
<i class="fa fa-tint fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.consumable') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('create', \App\Models\Component::class)
|
|
<li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
|
|
<a href="{{ route('components.create') }}" tabindex="-1">
|
|
<i class="fa fa-hdd-o fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.component') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('create', \App\Models\User::class)
|
|
<li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
|
|
<a href="{{ route('users.create') }}" tabindex="-1">
|
|
<i class="fa fa-user fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.user') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('admin')
|
|
@if ($snipeSettings->show_alerts_in_menu=='1')
|
|
<!-- Tasks: style can be found in dropdown.less -->
|
|
<?php $alert_items = \App\Helpers\Helper::checkLowInventory(); ?>
|
|
|
|
<li class="dropdown tasks-menu">
|
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
|
<i class="fa fa-flag-o" aria-hidden="true"></i>
|
|
<span class="sr-only">Alerts</span>
|
|
@if (count($alert_items))
|
|
<span class="label label-danger">{{ count($alert_items) }}</span>
|
|
@endif
|
|
</a>
|
|
<ul class="dropdown-menu">
|
|
<li class="header">You have {{ count($alert_items) }} items below or almost below minimum quantity levels</li>
|
|
<li>
|
|
<!-- inner menu: contains the actual data -->
|
|
<ul class="menu">
|
|
|
|
@for($i = 0; count($alert_items) > $i; $i++)
|
|
|
|
<li><!-- Task item -->
|
|
<a href="{{route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
|
|
<h2>{{ $alert_items[$i]['name'] }}
|
|
<small class="pull-right">
|
|
{{ $alert_items[$i]['remaining'] }} remaining
|
|
</small>
|
|
</h2>
|
|
<div class="progress xs">
|
|
<div class="progress-bar progress-bar-yellow" style="width: {{ $alert_items[$i]['percent'] }}%" role="progressbar" aria-valuenow="{{ $alert_items[$i]['percent'] }}" aria-valuemin="0" aria-valuemax="100">
|
|
<span class="sr-only">{{ $alert_items[$i]['percent'] }}% Complete</span>
|
|
</div>
|
|
</div>
|
|
</a>
|
|
</li>
|
|
<!-- end task item -->
|
|
@endfor
|
|
</ul>
|
|
</li>
|
|
{{-- <li class="footer">
|
|
<a href="#">View all tasks</a>
|
|
</li> --}}
|
|
</ul>
|
|
</li>
|
|
@endcan
|
|
@endif
|
|
|
|
|
|
<!-- User Account: style can be found in dropdown.less -->
|
|
@if (Auth::check())
|
|
<li class="dropdown user user-menu">
|
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
|
@if (Auth::user()->present()->gravatar())
|
|
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image" alt="">
|
|
@else
|
|
<i class="fa fa-user fa-fws" aria-hidden="true"></i>
|
|
@endif
|
|
|
|
<span class="hidden-xs">{{ Auth::user()->first_name }} <strong class="caret"></strong></span>
|
|
</a>
|
|
<ul class="dropdown-menu">
|
|
<!-- User image -->
|
|
<li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('view-assets') }}">
|
|
<i class="fa fa-check fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.viewassets') }}
|
|
</a></li>
|
|
|
|
<li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('account.requested') }}">
|
|
<i class="fa fa-check fa-disk fa-fw" aria-hidden="true"></i>
|
|
Requested Assets
|
|
</a></li>
|
|
<li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('account.accept') }}">
|
|
<i class="fa fa-check fa-disk fa-fw"></i>
|
|
Accept Assets
|
|
</a></li>
|
|
|
|
|
|
|
|
<li>
|
|
<a href="{{ route('profile') }}">
|
|
<i class="fa fa-user fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.editprofile') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ route('account.password.index') }}">
|
|
<i class="fa fa-asterisk fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.changepassword') }}
|
|
</a>
|
|
</li>
|
|
|
|
|
|
|
|
@can('self.api')
|
|
<li>
|
|
<a href="{{ route('user.api') }}">
|
|
<i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> Manage API Keys
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
<li class="divider"></li>
|
|
<li>
|
|
<a href="{{ url('/logout') }}">
|
|
<i class="fa fa-sign-out fa-fw" aria-hidden="true"></i>
|
|
{{ trans('general.logout') }}
|
|
</a>
|
|
</li>
|
|
</ul>
|
|
</li>
|
|
@endif
|
|
|
|
|
|
@can('superadmin')
|
|
<li>
|
|
<a href="{{ route('settings.index') }}">
|
|
<i class="fa fa-cogs fa-fw" aria-hidden="true"></i>
|
|
<span class="sr-only">{{ trans('general.admin') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
</div>
|
|
</nav>
|
|
<a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu" role="button">
|
|
<span class="sr-only">Toggle navigation</span>
|
|
<i class="fa fa-bars"></i>
|
|
</a>
|
|
<!-- Sidebar toggle button-->
|
|
</header>
|
|
|
|
<!-- Left side column. contains the logo and sidebar -->
|
|
<aside class="main-sidebar">
|
|
<!-- sidebar: style can be found in sidebar.less -->
|
|
<section class="sidebar">
|
|
<!-- sidebar menu: : style can be found in sidebar.less -->
|
|
<ul class="sidebar-menu" data-widget="tree">
|
|
@can('admin')
|
|
<li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('home') }}">
|
|
<i class="fa fa-dashboard" aria-hidden="true"></i> <span>Dashboard</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('index', \App\Models\Asset::class)
|
|
<li class="treeview{{ (Request::is('hardware*') ? ' active' : '') }}">
|
|
<a href="#"><i class="fa fa-barcode" aria-hidden="true"></i>
|
|
<span>{{ trans('general.assets') }}</span>
|
|
<i class="fa fa-angle-left pull-right"></i>
|
|
</a>
|
|
<ul class="treeview-menu">
|
|
<li>
|
|
<a href="{{ url('hardware') }}">
|
|
{{ trans('general.list_all') }}
|
|
</a>
|
|
</li>
|
|
|
|
<?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->get(); ?>
|
|
@if (count($status_navs) > 0)
|
|
<li class="divider"> </li>
|
|
@foreach ($status_navs as $status_nav)
|
|
<li><a href="{{ route('statuslabels.show', ['statuslabel' => $status_nav->id]) }}"}> {{ $status_nav->name }}</a></li>
|
|
@endforeach
|
|
@endif
|
|
|
|
|
|
<li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
|
|
<a href="{{ url('hardware?status=Deployed') }}"><i class="fa fa-circle-o text-blue"></i>
|
|
{{ trans('general.all') }}
|
|
{{ trans('general.deployed') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
|
|
<a href="{{ url('hardware?status=RTD') }}">
|
|
<i class="fa fa-circle-o text-green"></i>
|
|
{{ trans('general.all') }}
|
|
{{ trans('general.ready_to_deploy') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}"><i class="fa fa-circle-o text-orange"></i>
|
|
{{ trans('general.all') }}
|
|
{{ trans('general.pending') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a href="{{ url('hardware?status=Undeployable') }}"><i class="fa fa-times text-red"></i>
|
|
{{ trans('general.all') }}
|
|
{{ trans('general.undeployable') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Archived') }}"><i class="fa fa-times text-red"></i>
|
|
{{ trans('general.all') }}
|
|
{{ trans('admin/hardware/general.archived') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Requestable') }}"><i class="fa fa-check text-blue"></i>
|
|
{{ trans('admin/hardware/general.requestable') }}
|
|
</a>
|
|
</li>
|
|
|
|
@can('audit', \App\Models\Asset::class)
|
|
<li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('assets.audit.due') }}">
|
|
<i class="fa fa-clock-o text-yellow"></i> {{ trans('general.audit_due') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::is('hardware/audit/overdue') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('assets.audit.overdue') }}">
|
|
<i class="fa fa-warning text-red"></i> {{ trans('general.audit_overdue') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
<li class="divider"> </li>
|
|
@can('checkout', \App\Models\Asset::class)
|
|
<li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('hardware/bulkcheckout') }}">
|
|
{{ trans('general.bulk_checkout') }}
|
|
</a>
|
|
</li>
|
|
<li{!! (Request::is('hardware/requested') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('assets.requested') }}">
|
|
{{ trans('general.requested') }}</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('create', \App\Models\Asset::class)
|
|
<li{!! (Request::query('Deleted') ? ' class="active"' : '') !!}>
|
|
<a href="{{ url('hardware?status=Deleted') }}">
|
|
{{ trans('general.deleted') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ route('maintenances.index') }}">
|
|
{{ trans('general.asset_maintenances') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('admin')
|
|
<li>
|
|
<a href="{{ url('hardware/history') }}">
|
|
{{ trans('general.import-history') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('audit', \App\Models\Asset::class)
|
|
<li>
|
|
<a href="{{ route('assets.bulkaudit') }}">
|
|
{{ trans('general.bulkaudit') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\License::class)
|
|
<li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('licenses.index') }}">
|
|
<i class="fa fa-floppy-o"></i>
|
|
<span>{{ trans('general.licenses') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('index', \App\Models\Accessory::class)
|
|
<li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('accessories.index') }}">
|
|
<i class="fa fa-keyboard-o"></i>
|
|
<span>{{ trans('general.accessories') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\Consumable::class)
|
|
<li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ url('consumables') }}">
|
|
<i class="fa fa-tint"></i>
|
|
<span>{{ trans('general.consumables') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\Component::class)
|
|
<li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('components.index') }}">
|
|
<i class="fa fa-hdd-o"></i>
|
|
<span>{{ trans('general.components') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('view', \App\Models\PredefinedKit::class)
|
|
<li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('kits.index') }}">
|
|
<i class="fa fa-object-group"></i>
|
|
<span>{{ trans('general.kits') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\User::class)
|
|
<li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('users.index') }}">
|
|
<i class="fa fa-users"></i>
|
|
<span>{{ trans('general.people') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
@can('import')
|
|
<li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('imports.index') }}">
|
|
<i class="fa fa-cloud-download"></i>
|
|
<span>{{ trans('general.import') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('backend.interact')
|
|
<li class="treeview">
|
|
<a href="#">
|
|
<i class="fa fa-gear" aria-hidden="true"></i>
|
|
<span>{{ trans('general.settings') }}</span>
|
|
<i class="fa fa-angle-left pull-right"></i>
|
|
</a>
|
|
|
|
<ul class="treeview-menu">
|
|
@if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
|
|
<li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('fields.index') }}">
|
|
{{ trans('admin/custom_fields/general.custom_fields') }}
|
|
</a>
|
|
</li>
|
|
@endif
|
|
|
|
@can('view', \App\Models\Statuslabel::class)
|
|
<li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('statuslabels.index') }}">
|
|
{{ trans('general.status_labels') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\AssetModel::class)
|
|
<li>
|
|
<a href="{{ route('models.index') }}" {{ (Request::is('/assetmodels') ? ' class="active"' : '') }}>
|
|
{{ trans('general.asset_models') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
|
|
@can('view', \App\Models\Category::class)
|
|
<li>
|
|
<a href="{{ route('categories.index') }}" {{ (Request::is('/categories') ? ' class="active"' : '') }}>
|
|
{{ trans('general.categories') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Manufacturer::class)
|
|
<li>
|
|
<a href="{{ route('manufacturers.index') }}" {{ (Request::is('/manufacturers') ? ' class="active"' : '') }}>
|
|
{{ trans('general.manufacturers') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Supplier::class)
|
|
<li>
|
|
<a href="{{ route('suppliers.index') }}" {{ (Request::is('/suppliers') ? ' class="active"' : '') }}>
|
|
{{ trans('general.suppliers') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Department::class)
|
|
<li>
|
|
<a href="{{ route('departments.index') }}" {{ (Request::is('/departments') ? ' class="active"' : '') }}>
|
|
{{ trans('general.departments') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Location::class)
|
|
<li>
|
|
<a href="{{ route('locations.index') }}" {{ (Request::is('/locations') ? ' class="active"' : '') }}>
|
|
{{ trans('general.locations') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Company::class)
|
|
<li>
|
|
<a href="{{ route('companies.index') }}" {{ (Request::is('/companies') ? ' class="active"' : '') }}>
|
|
{{ trans('general.companies') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('view', \App\Models\Depreciation::class)
|
|
<li>
|
|
<a href="{{ route('depreciations.index') }}" {{ (Request::is('/depreciations') ? ' class="active"' : '') }}>
|
|
{{ trans('general.depreciation') }}
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
</ul>
|
|
|
|
</li>
|
|
@endcan
|
|
|
|
@can('reports.view')
|
|
<li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
|
|
<a href="#" class="dropdown-toggle">
|
|
<i class="fa fa-bar-chart"></i>
|
|
<span>{{ trans('general.reports') }}</span>
|
|
<i class="fa fa-angle-left pull-right"></i>
|
|
</a>
|
|
|
|
<ul class="treeview-menu">
|
|
<li>
|
|
<a href="{{ route('reports.activity') }}" {{ (Request::is('reports/activity') ? ' class="active"' : '') }}>
|
|
{{ trans('general.activity_report') }}
|
|
</a>
|
|
</li>
|
|
|
|
<li><a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }}>
|
|
{{ trans('general.audit_report') }}</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/depreciation') }}" {{ (Request::is('reports/depreciation') ? ' class="active"' : '') }}>
|
|
{{ trans('general.depreciation_report') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/licenses') }}" {{ (Request::is('reports/licenses') ? ' class="active"' : '') }}>
|
|
{{ trans('general.license_report') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/asset_maintenances') }}" {{ (Request::is('reports/asset_maintenances') ? ' class="active"' : '') }}>
|
|
{{ trans('general.asset_maintenance_report') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/unaccepted_assets') }}" {{ (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') }}>
|
|
{{ trans('general.unaccepted_asset_report') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/accessories') }}" {{ (Request::is('reports/accessories') ? ' class="active"' : '') }}>
|
|
{{ trans('general.accessory_report') }}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
|
|
{{ trans('general.custom_report') }}
|
|
</a>
|
|
</li>
|
|
</ul>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('viewRequestable', \App\Models\Asset::class)
|
|
<li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
|
|
<a href="{{ route('requestable-assets') }}">
|
|
<i class="fa fa-laptop"></i>
|
|
<span>{{ trans('admin/hardware/general.requestable') }}</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
|
|
</ul>
|
|
</section>
|
|
<!-- /.sidebar -->
|
|
</aside>
|
|
|
|
<!-- Content Wrapper. Contains page content -->
|
|
|
|
<div class="content-wrapper" role="main">
|
|
|
|
@if ($debug_in_production)
|
|
<div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
|
|
<div class="col-md-12" style="margin-bottom: 0px; background-color: #b50408 ; color: white; padding: 10px 20px 10px 30px; font-size: 16px;">
|
|
<i class="fa fa-warning fa-3x pull-left"></i> <strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong>
|
|
{!! trans('general.debug_warning_text') !!}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<!-- Content Header (Page header) -->
|
|
<section class="content-header" style="padding-bottom: 30px;">
|
|
<h1 class="pull-left">
|
|
@yield('title')
|
|
</h1>
|
|
<div class="pull-right">
|
|
@yield('header_right')
|
|
</div>
|
|
|
|
|
|
|
|
</section>
|
|
|
|
|
|
<section class="content" id="main" tabindex="-1">
|
|
|
|
<!-- Notifications -->
|
|
<div class="row">
|
|
@if (config('app.lock_passwords'))
|
|
<div class="col-md-12">
|
|
<div class="callout callout-info">
|
|
{{ trans('general.some_features_disabled') }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@include('notifications')
|
|
</div>
|
|
|
|
|
|
<!-- Content -->
|
|
<div id="{!! (Request::is('*api*') ? 'app' : 'webui') !!}">
|
|
@yield('content')
|
|
</div>
|
|
|
|
</section>
|
|
|
|
</div><!-- /.content-wrapper -->
|
|
|
|
<footer class="main-footer hidden-print">
|
|
|
|
<div class="pull-right hidden-xs">
|
|
@if ($snipeSettings->version_footer!='off')
|
|
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
|
|
<strong>Version</strong> {{ config('version.app_version') }} - build {{ config('version.build_version') }} ({{ config('version.branch') }})
|
|
@endif
|
|
@endif
|
|
|
|
@if ($snipeSettings->support_footer!='off')
|
|
@if (($snipeSettings->support_footer=='on') || (($snipeSettings->support_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
|
|
<a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it.readme.io/docs/overview" rel="noopener">User's Manual</a>
|
|
<a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/" rel="noopener">Report a Bug</a>
|
|
@endif
|
|
@endif
|
|
|
|
@if ($snipeSettings->privacy_policy_link!='')
|
|
<a target="_blank" class="btn btn-default btn-xs" rel="noopener" href="{{ $snipeSettings->privacy_policy_link }}" target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
|
|
@endif
|
|
|
|
|
|
</div>
|
|
@if ($snipeSettings->footer_text!='')
|
|
<div class="pull-right">
|
|
{!! Parsedown::instance()->text(e($snipeSettings->footer_text)) !!}
|
|
</div>
|
|
@endif
|
|
|
|
|
|
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software, made with <i class="fa fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
|
|
</footer>
|
|
|
|
|
|
|
|
</div><!-- ./wrapper -->
|
|
|
|
|
|
<!-- end main container -->
|
|
|
|
<div class="modal modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
|
<h4 class="modal-title" id="myModalLabel"> </h4>
|
|
</div>
|
|
<div class="modal-body"></div>
|
|
<div class="modal-footer">
|
|
<form method="post" id="deleteForm" role="form">
|
|
{{ csrf_field() }}
|
|
{{ method_field('DELETE') }}
|
|
|
|
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('general.cancel') }}</button>
|
|
<button type="submit" class="btn btn-outline" id="dataConfirmOK">{{ trans('general.yes') }}</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{{-- Javascript files --}}
|
|
<script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
|
|
{{-- Page level javascript --}}
|
|
@stack('js')
|
|
|
|
@section('moar_scripts')
|
|
@show
|
|
|
|
|
|
<script nonce="{{ csrf_token() }}">
|
|
$.validate({
|
|
form : '#create-form',
|
|
modules : 'date, toggleDisabled',
|
|
disabledFormFilter : '#create-form',
|
|
showErrorDialogs : true
|
|
});
|
|
|
|
$(function () {
|
|
|
|
$('[data-toggle="tooltip"]').tooltip();
|
|
$('[data-toggle="popover"]').popover();
|
|
$('.select2 span').addClass('needsclick');
|
|
$('.select2 span').removeAttr('title');
|
|
|
|
// This javascript handles saving the state of the menu (expanded or not)
|
|
$('body').bind('expanded.pushMenu', function() {
|
|
$.ajax({
|
|
type: 'GET',
|
|
url: "{{ route('account.menuprefs', ['state'=>'open']) }}",
|
|
_token: "{{ csrf_token() }}"
|
|
});
|
|
|
|
});
|
|
|
|
$('body').bind('collapsed.pushMenu', function() {
|
|
$.ajax({
|
|
type: 'GET',
|
|
url: "{{ route('account.menuprefs', ['state'=>'close']) }}",
|
|
_token: "{{ csrf_token() }}"
|
|
});
|
|
});
|
|
|
|
});
|
|
|
|
// Initiate the ekko lightbox
|
|
$(document).on('click', '[data-toggle="lightbox"]', function(event) {
|
|
event.preventDefault();
|
|
$(this).ekkoLightbox();
|
|
});
|
|
|
|
|
|
|
|
</script>
|
|
|
|
@if ((Session::get('topsearch')=='true') || (Request::is('/')))
|
|
<script nonce="{{ csrf_token() }}">
|
|
$("#tagSearch").focus();
|
|
</script>
|
|
@endif
|
|
|
|
|
|
|
|
</body>
|
|
</html>
|