From f6b9ef16d0b65fd1a75fc947a1fbf9211cd3f2f8 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 11 Mar 2016 18:03:32 +0100 Subject: [PATCH] Add default jquery ui theme instead of smoothness theme (#328) Remove obsolete ajax queue plugin (#328) Add image preview widget for avatar upload in items form (#372) --- Gruntfile.js | 2 +- application/controllers/Items.php | 21 +++- application/language/de-CH/items_lang.php | 3 + application/language/en/items_lang.php | 3 + application/language/en/sales_lang.php | 2 +- application/language/es/items_lang.php | 3 + application/language/fr/items_lang.php | 3 + application/language/id/items_lang.php | 3 + application/language/id/reports_lang.php | 2 +- application/language/nl-BE/items_lang.php | 3 + application/language/ru/items_lang.php | 3 + application/language/th/items_lang.php | 3 + application/language/tr/items_lang.php | 3 + application/language/zh/items_lang.php | 3 + application/views/items/form.php | 47 ++++--- application/views/partial/header.php | 7 +- bower.json | 2 +- dist/jquery-ui.css | 100 +++++++-------- dist/opensourcepos.js | 128 +------------------- dist/opensourcepos.min.css | 19 ++- dist/opensourcepos.min.js | 14 ++- js/jquery.ajax_queue.js | 116 ------------------ templates/spacelab/views/partial/header.php | 6 +- translations/items_lang.csv | 3 + 24 files changed, 159 insertions(+), 340 deletions(-) delete mode 100644 js/jquery.ajax_queue.js diff --git a/Gruntfile.js b/Gruntfile.js index 849882418..e3ba25848 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,7 +29,7 @@ module.exports = function(grunt) { destPrefix: 'dist' }, files: { - 'jquery-ui.css': 'jquery-ui/themes/smoothness/jquery-ui.css', + 'jquery-ui.css': 'jquery-ui/themes/base/jquery-ui.css', 'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css' } } diff --git a/application/controllers/Items.php b/application/controllers/Items.php index 871104d0d..c2fafb31d 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -179,12 +179,16 @@ class Items extends Secure_area implements iData_controller $suppliers[$row['person_id']] = $row['company_name']; } + $item_info = $this->Item->get_info($item_id); $data['suppliers'] = $suppliers; - $data['selected_supplier'] = $this->Item->get_info($item_id)->supplier_id; + $data['selected_supplier'] = $item_info->supplier_id; $data['default_tax_1_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_1_rate') : ''; $data['default_tax_2_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_2_rate') : ''; - - $locations_data = $this->Stock_location->get_undeleted_all()->result_array(); + $data['logo_exists'] = $item_info->pic_id != ''; + $images = glob ("uploads/item_pics/" . $item_info->pic_id . ".*"); + $data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : ''; + + $locations_data = $this->Stock_location->get_undeleted_all()->result_array(); foreach($locations_data as $location) { $quantity = $this->Item_quantity->get_item_quantity($item_id,$location['location_id'])->quantity; @@ -413,13 +417,20 @@ class Items extends Secure_area implements iData_controller 'max_size' => '100', 'max_width' => '640', 'max_height' => '480', - 'file_name' => sizeof($map)); + 'file_name' => sizeof($map) + 1); $this->load->library('upload', $config); $this->upload->do_upload('item_image'); return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '

'.$this->lang->line('upload_no_file_selected').'

'); } - + + public function remove_logo($item_id) + { + $item_data = array('pic_id' => null); + $result = $this->Item->save($item_data, $item_id);; + echo json_encode(array('success' => $result)); + } + function save_inventory($item_id=-1) { $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; diff --git a/application/language/de-CH/items_lang.php b/application/language/de-CH/items_lang.php index 9c2bb99fc..df357d97f 100644 --- a/application/language/de-CH/items_lang.php +++ b/application/language/de-CH/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Datenbank"; $lang["items_update"] = "Ändere Artikel"; $lang["items_use_inventory_menu"] = "Verwende Bestandesmenu"; $lang["items_import_items_excel"] = "Importiere Artikel mit Excel Datei"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php index 6a23dc8f5..9968a495e 100644 --- a/application/language/en/items_lang.php +++ b/application/language/en/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "Update Item"; $lang["items_use_inventory_menu"] = "Use Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index 30db8f80e..59395c3e4 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -37,7 +37,7 @@ $lang["sales_discount_short"] = "%"; $lang["sales_edit"] = "Edit"; $lang["sales_edit_item"] = "Edit Item"; $lang["sales_edit_sale"] = "Edit Sale"; -$lang["sales_email_receipt"] = "Email Receipt"; +$lang["sales_email_receipt"] = "E-Mail Receipt"; $lang["sales_employee"] = "Employee"; $lang["sales_error_editing_item"] = "Error editing item"; $lang["sales_find_or_scan_item"] = "Find/Scan Item"; diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php index a467d17b3..c7254b559 100644 --- a/application/language/es/items_lang.php +++ b/application/language/es/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de datos UPC"; $lang["items_update"] = "Actualizar Artículo"; $lang["items_use_inventory_menu"] = "Usar Menú de Inventario"; $lang["items_import_items_excel"] = "Importar Artículos desde Excel"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/fr/items_lang.php b/application/language/fr/items_lang.php index 150462379..be51dd6c5 100644 --- a/application/language/fr/items_lang.php +++ b/application/language/fr/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de Données UPC"; $lang["items_update"] = "Éditer Item"; $lang["items_use_inventory_menu"] = "Utiliser Menu Inv."; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php index c7b9d0ca2..d95d0b23d 100644 --- a/application/language/id/items_lang.php +++ b/application/language/id/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Database UPC"; $lang["items_update"] = "Ubah"; $lang["items_use_inventory_menu"] = "Gunakan Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php index bb58cd0ff..51f2a465f 100644 --- a/application/language/id/reports_lang.php +++ b/application/language/id/reports_lang.php @@ -65,7 +65,7 @@ $lang["reports_requisition_related_item_unit_quantity"] = "Unit Item Barang"; $lang["reports_requisitions"] = "Laporan Permintaan"; $lang["reports_returns"] = "Retur"; $lang["reports_revenue"] = "Pendapatan"; -$lang["reports_sale_id"] = "ID Penjualan"; +$lang["reports_sale_id"] = "ID Penjualan "; $lang["reports_sale_type"] = "Jenis Penjualan"; $lang["reports_sales"] = "Penjualan"; $lang["reports_sales_amount"] = "Jumlah Penjualan"; diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php index 428916fcf..b81b5208d 100755 --- a/application/language/nl-BE/items_lang.php +++ b/application/language/nl-BE/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "Bewerk Product"; $lang["items_use_inventory_menu"] = "Use Inv. Menu"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php index 3aefe81fe..d7ee3daeb 100644 --- a/application/language/ru/items_lang.php +++ b/application/language/ru/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC база данных"; $lang["items_update"] = "Обновить Товар"; $lang["items_use_inventory_menu"] = "Используйте меню инвентаря"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/th/items_lang.php b/application/language/th/items_lang.php index f075e590d..52f3e2d61 100644 --- a/application/language/th/items_lang.php +++ b/application/language/th/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC ฐานข้อมูล"; $lang["items_update"] = "ปรับแต่งสินค้า"; $lang["items_use_inventory_menu"] = "ใช้เมนูสินค้าคงเหลือ"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/tr/items_lang.php b/application/language/tr/items_lang.php index e3ae89279..3854c39a7 100644 --- a/application/language/tr/items_lang.php +++ b/application/language/tr/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Veritabanı"; $lang["items_update"] = "Ürün Güncelle"; $lang["items_use_inventory_menu"] = "Stok Menüsünü Kullan"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php index b938c985e..4f0f519bc 100755 --- a/application/language/zh/items_lang.php +++ b/application/language/zh/items_lang.php @@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database"; $lang["items_update"] = "更新產品"; $lang["items_use_inventory_menu"] = "使用庫存清單"; $lang["items_import_items_excel"] = "Import items from Excel sheet"; +$lang["items_select_image"] = "Select Image"; +$lang["items_change_image"] = "Change Image"; +$lang["items_remove_image"] = "Remove Image"; diff --git a/application/views/items/form.php b/application/views/items/form.php index 7caad3d96..05a20ef33 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -187,38 +187,27 @@
- lang->line('items_image'), 'item_image', array('class'=>'control-label col-xs-3')); ?> -
-
-
- lang->line("common_import_select_file"); ?>lang->line("common_import_change_file"); ?> - lang->line("common_import_remove_file"); ?> -
-
-
- lang->line('items_image'), 'items_image', array('class'=>'control-label col-xs-3')); ?> -
-
-
- <?php echo $this->lang->line('items_image'); ?> +
+
+
+
+ <?php echo $this->lang->line('items_image'); ?>
-
- - lang->line("config_company_select_image"); ?> - lang->line("config_company_change_image"); ?> - - - lang->line("config_company_remove_image"); ?> + + lang->line("items_select_image"); ?> + lang->line("items_change_image"); ?> + + + lang->line("items_remove_image"); ?>
-*/ ?> +
lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
@@ -335,6 +324,14 @@ }).responseText).success; }, 'lang->line("items_item_number_duplicate"); ?>'); + $("a.fileinput-exists").click(function() { + $.ajax({ + type: "GET", + url: "item_id"); ?>", + dataType: "json" + }) + }); + $('#item_form').validate($.extend({ submitHandler: function(form, event) { $(form).ajaxSubmit({ diff --git a/application/views/partial/header.php b/application/views/partial/header.php index c75907493..17bc87e9d 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -7,7 +7,7 @@ input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?> - + @@ -49,7 +49,6 @@ - @@ -65,11 +64,11 @@ - + - + diff --git a/bower.json b/bower.json index d1e531159..89795de1f 100644 --- a/bower.json +++ b/bower.json @@ -50,7 +50,7 @@ }, "jquery-ui": { "main": [ - "themes/smoothness/jquery-ui.css", + "themes/base/jquery-ui.css", "jquery-ui.js" ] } diff --git a/dist/jquery-ui.css b/dist/jquery-ui.css index 1c22746c8..975aa1bdb 100644 --- a/dist/jquery-ui.css +++ b/dist/jquery-ui.css @@ -1,8 +1,8 @@ -/*! jQuery UI - v1.11.4 - 2015-03-11 +/*! jQuery UI - v1.11.3 - 2015-02-12 * http://jqueryui.com * Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px +* Copyright jQuery Foundation and other contributors; Licensed MIT */ /* Layout helpers ----------------------------------*/ @@ -830,8 +830,8 @@ body .ui-tooltip { /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana,Arial,sans-serif; - font-size: 1.1em; + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; } .ui-widget .ui-widget { font-size: 1em; @@ -840,25 +840,25 @@ body .ui-tooltip { .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana,Arial,sans-serif; + font-family: Arial,Helvetica,sans-serif; font-size: 1em; } .ui-widget-content { - border: 1px solid #aaaaaa; - background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #dddddd; + background: #ffffff; + color: #333333; } .ui-widget-content a { - color: #222222; + color: #333333; } .ui-widget-header { - border: 1px solid #aaaaaa; - background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #dddddd; + background: #e9e9e9; + color: #333333; font-weight: bold; } .ui-widget-header a { - color: #222222; + color: #333333; } /* Interaction states @@ -866,15 +866,15 @@ body .ui-tooltip { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; + border: 1px solid #c5c5c5; + background: #f6f6f6; font-weight: normal; - color: #555555; + color: #454545; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555555; + color: #454545; text-decoration: none; } .ui-state-hover, @@ -883,10 +883,10 @@ body .ui-tooltip { .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999; - background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; + border: 1px solid #cccccc; + background: #ededed; font-weight: normal; - color: #212121; + color: #2b2b2b; } .ui-state-hover a, .ui-state-hover a:hover, @@ -896,21 +896,21 @@ body .ui-tooltip { .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited { - color: #212121; + color: #2b2b2b; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa; - background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x; + border: 1px solid #003eff; + background: #007fff; font-weight: normal; - color: #212121; + color: #ffffff; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #212121; + color: #ffffff; text-decoration: none; } @@ -919,31 +919,31 @@ body .ui-tooltip { .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1; - background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; - color: #363636; + border: 1px solid #dad55e; + background: #fffa90; + color: #777620; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { - color: #363636; + color: #777620; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a; - background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; - color: #cd0a0a; + border: 1px solid #f1a899; + background: #fddfdf; + color: #5f3f3f; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #cd0a0a; + color: #5f3f3f; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #cd0a0a; + color: #5f3f3f; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -978,27 +978,27 @@ body .ui-tooltip { } .ui-icon, .ui-widget-content .ui-icon { - background-image: url("images/ui-icons_222222_256x240.png"); + background-image: url("images/ui-icons_444444_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url("images/ui-icons_222222_256x240.png"); + background-image: url("images/ui-icons_444444_256x240.png"); } .ui-state-default .ui-icon { - background-image: url("images/ui-icons_888888_256x240.png"); + background-image: url("images/ui-icons_777777_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_555555_256x240.png"); } .ui-state-active .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_ffffff_256x240.png"); } .ui-state-highlight .ui-icon { - background-image: url("images/ui-icons_2e83ff_256x240.png"); + background-image: url("images/ui-icons_777620_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url("images/ui-icons_cd0a0a_256x240.png"); + background-image: url("images/ui-icons_cc0000_256x240.png"); } /* positioning */ @@ -1188,37 +1188,37 @@ body .ui-tooltip { .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 4px; + border-top-left-radius: 3px; } .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 4px; + border-top-right-radius: 3px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 4px; + border-bottom-left-radius: 3px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 4px; + border-bottom-right-radius: 3px; } /* Overlays */ .ui-widget-overlay { - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + background: #aaaaaa; opacity: .3; filter: Alpha(Opacity=30); /* support: IE8 */ } .ui-widget-shadow { - margin: -8px 0 0 -8px; - padding: 8px; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + margin: 0px 0 0 0px; + padding: 5px; + background: #666666; opacity: .3; filter: Alpha(Opacity=30); /* support: IE8 */ border-radius: 8px; diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js index f30bd7929..83e5a7826 100644 --- a/dist/opensourcepos.js +++ b/dist/opensourcepos.js @@ -14714,7 +14714,7 @@ return jQuery; })); /** -* @version: 2.1.18 +* @version: 2.1.19 * @author: Dan Grossman http://www.dangrossman.info/ * @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved. * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php @@ -14813,7 +14813,7 @@ return jQuery; options = $.extend(this.element.data(), options); //html template for the picker UI - if (typeof options.template !== 'string' && !(options.template instanceof jQuery)) + if (typeof options.template !== 'string' && !(options.template instanceof $)) options.template = '