A free open source IT asset/license management system
Merge branch 'develop' into form-macros
Marcus Moore3fc8b976fc94
diff --cc resources/macros/macros.phpindex 7d91f5f966,1321ec1fea..6c0ea884ad--- a/resources/macros/macros.php+++ b/resources/macros/macros.php@@@ -2,65 -2,50 +2,3 @@@/*** Macro helpers*/----/**- * Country macro- * Generates the dropdown menu of countries for the profile form- * Barcode macro- * Generates the dropdown menu of available 1D barcodes-- */- Form::macro('countries', function ($name = 'country', $selected = null, $class = null, $id = null) {-- $idclause = (!is_null($id)) ? $id : '';-- // Pull the autoglossonym array from the localizations translation file- $countries_array = trans('localizations.countries');-- $select = '<select name="'.$name.'" class="'.$class.'" style="width:100%" '.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_country').'" data-allow-clear="true" data-tags="true">';- $select .= '<option value="" role="option">'.trans('localizations.select_country').'</option>';-- foreach ($countries_array as $abbr => $country) {-- // We have to handle it this way to handle deprecation warnings since you can't strtoupper on null- if ($abbr!='') {- $abbr = strtoupper($abbr);- }-- // Loop through the countries configured in the localization file- $select .= '<option value="' . $abbr . '" role="option" ' . (($selected == $abbr) ? ' selected="selected" aria-selected="true"' : ' aria-selected="false"') . '>' . $country . '</option> ';-Form::macro('alt_barcode_types', function ($name = 'alt_barcode', $selected = null, $class = null) {- $barcode_types = [- 'C128',- 'C39',- 'PDF417',- 'EAN5',- 'EAN13',- 'UPCA',- 'UPCE',--- }- ];--- // If the country value doesn't exist in the array, add it as a new option and select it so we don't drop that data- if (!array_key_exists($selected, $countries_array)) {- $select .= '<option value="' . e($selected) . '" selected="selected" role="option" aria-selected="true">' . e($selected) .' *</option> ';- $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';- foreach ($barcode_types as $barcode_type) {- $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$barcode_type.'</option> ';-- }---- $select .= '</select>';---- return $select;--});--- Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {- $formats = [- 'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),- 'firstname' => trans('admin/settings/general.username_formats.first_name_format'),- 'lastname' => trans('admin/settings/general.username_formats.last_name_format'),- 'filastname' => trans('admin/settings/general.username_formats.filastname_format'),- 'lastnamefirstinitial' => trans('admin/settings/general.username_formats.lastnamefirstinitial_format'),- 'firstname_lastname' => trans('admin/settings/general.username_formats.firstname_lastname_underscore_format'),- 'firstinitial.lastname' => trans('admin/settings/general.username_formats.firstinitial_lastname'),- 'lastname_firstinitial' => trans('admin/settings/general.username_formats.lastname_firstinitial'),- 'lastname.firstinitial' => trans('admin/settings/general.username_formats.lastname_dot_firstinitial_format'),- 'firstnamelastname' => trans('admin/settings/general.username_formats.firstnamelastname'),- 'firstnamelastinitial' => trans('admin/settings/general.username_formats.firstnamelastinitial'),- 'lastname.firstname' => trans('admin/settings/general.username_formats.lastnamefirstname'),-/**- * Barcode macro- * Generates the dropdown menu of available 2D barcodes- */-Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null, $class = null) {- $barcode_types = [- 'QRCODE',- 'DATAMATRIX',--- ];--- $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';- foreach ($formats as $format => $label) {- $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";- $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';- foreach ($barcode_types as $barcode_type) {- $select .= '<option value="'.$barcode_type.'"'.($selected == $barcode_type ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$barcode_type.'</option> ';-- }---- $select .= '</select>';---- return $select;--});