Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_clear_all.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_ship_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user_pending.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_usertogroup2_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_paymenttype_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_a.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_group_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_deny.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_option_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_image_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_usertogroup_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_more_brackets_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_place_order_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_style_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_paymenttype.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_usertogroup2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_frontend_mail.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_clear_all_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_general.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_general.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_general.tpl (revision 7283) @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + " header_label="la_Text_RootCategory"> + + + + + + + +
+ + + [-] +
+ + + + + + + + + + + + ', 'ModuleRootCategory', '950x600');"> +  
+ + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_update_rates.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_process_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_pending.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_pending_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_affiliate_payment_type.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_search_reset_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset.gif =================================================================== diff -u -r7079 -r7283 Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_relation_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl =================================================================== diff -u -r6929 -r7283 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl (.../tree.tpl) (revision 6929) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/tree.tpl (.../tree.tpl) (revision 7283) @@ -2,8 +2,8 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_cat_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_review_pending.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_archive.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_order_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_search_reset.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_print_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_e-mail.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_template.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_affiliate_payment_type_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_base_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_affiliate_plan_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_frontend_mail_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_shipping_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_archive_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_upcat_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_review_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_homecat_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_permission.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_affiliate_plan.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_recalculate_order.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_affiliate_payment_type_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_f3.gif =================================================================== diff -u -r7079 -r7283 Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_e-mail_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_print.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_update_rates_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_ship_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_process.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_image_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_paymenttype_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_usertogroup2_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user_deleted.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_b.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_image.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_group_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_image_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_option_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_manufacturer.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user_attn.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_usertogroup_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_place_order_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/tab_back.jpg =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_review.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js =================================================================== diff -u -r7099 -r7283 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 7099) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/js/ajax.js (.../ajax.js) (revision 7283) @@ -1,7 +1,20 @@ +function preg_print_pre(obj, reg) +{ + if (!reg) reg = /.*/; + var p = '' + for (var prop in obj) { + if (prop.match(reg) ) { + p += prop + ': '+obj[prop] + '\n' + } + } + alert(p) +} + + // Main AJAX classs function Request() {} -Request.timeout = 5000; //5 seconds +Request.timeout = 15000; //5 seconds Request.method = 'GET'; Request.headers = new Array(); Request.params = null; @@ -24,12 +37,18 @@ if (req.readyState == 4) { p_busyReq = false; window.clearTimeout(toId); - if (req.status == 200) { - p_successCallBack(req, p_pass, p_object); - } else { - p_errorCallBack(req, p_pass, p_object); + try { + if (req.status == 200) { + // preg_print_pre(req) + p_successCallBack(req, p_pass, p_object); + } else { + p_errorCallBack(req, p_pass, p_object); + } + Request.hideProgress(p_progId); } - Request.hideProgress(p_progId); + catch (e) { +// alert('AJAX error') + } } } var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes'; @@ -201,6 +220,7 @@ } AjaxProgressBar.prototype.Query = function() { +// prompt('requestinng', this.URL); Request.makeRequest(this.URL, this.BusyRequest, '', this.successCallback, this.errorCallback, '', this); } Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_infinity_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_affiliate_plan.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_process_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_attn.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_pending_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_selector.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_deleted.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js =================================================================== diff -u -r7102 -r7283 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7102) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7283) @@ -79,6 +79,17 @@ this.SetOnMouseOut(); this.SetOnClick(); if (this.Hidden) this.Hide(); + if (!img.complete) { + var real_path = img_path.replace('#MODULE#', this.Module) + 'toolbar/'; + var old_path = img_path.replace('#MODULE#', 'kernel') + 'toolbar/'+this.ToolBar.IconPrefix + this.Title+'.gif'; + real_path = real_path.replace('http://kostja.prod.intechnic.lv/in-portal.RC', '.'); + old_path = old_path.replace('http://kostja.prod.intechnic.lv/in-portal.RC', '.'); + var source = old_path.replace('/core/', '/kernel/').replace('.gif', '*.gif'); + var path = 'cp '+source+' '+real_path; +// prompt('exec: ', path) +// img.src = 'img/bad_button.GIF'; + } +// preg_print_pre(img, /natural|compl/i) } ToolBarButton.prototype.SetOnMouseOver = function() { Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_relation_reciprocal_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_new.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_relation_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_billing.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_infinity.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/link_arrow.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_relation_reciprocal.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_homecat.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_cat.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_group.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_image_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_refresh_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_manufacturer_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_goto_order.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_cat_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_deny_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_arrange_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search.tpl (revision 7283) @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + " id="_cb_" onclick="update_checkbox(this, document.getElementById(''))" > + " name="" value=""> + + + + + + + " value="" size="3" /> + + + + + + + + + + + + + "> + + + +
[ID: ; DisplayOrder: ; Field: ] + + + + + + + + + + + + + + + + "> + + + ][VariableValue]" VALUE="">% + + + + "> + + + ][VariableValue]" value="">%     + ][VariableValue]" value="">%     + ][VariableValue]" value="">% + + + + + + + + + + + "> + + + ][VariableValue]" id="_cb_conf[Search_ShowMultiple_][VariableValue]" onclick="update_checkbox(this, document.getElementById('conf[Search_ShowMultiple_][VariableValue]'))" > + ][VariableValue]" name="conf[Search_ShowMultiple_][VariableValue]" value=""> + + + + + + style="border-bottom-width: 0px;"> + +
+ + + + +
+ + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_pending.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_affiliate.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_recalculate_order_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_affiliate_plan_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_reset_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_review_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_cat.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_image_primary.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_pick.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_goto_order_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_image.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_hot.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css =================================================================== diff -u -r7034 -r7283 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css (.../style.css) (revision 7034) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css (.../style.css) (revision 7283) @@ -619,9 +619,9 @@ /* Toolbar */ -.toolbar-button, .toolbar-button-over { +.toolbar-button, .toolbar-button-disabled, .toolbar-button-over { float: left; - clear: none; + clear: none !important; border: none; text-align: center; font-size: 10px; Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_currency_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_cat_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_b_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_theme_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_shipping.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_cat_top.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_order_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_print_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_primary_affiliate_payment_type_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_style.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_group_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_selector_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_relation_one-way_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_base_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_list.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/custom_fields/custom_fields_list.tpl (revision 7283) @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_frontend_mail_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_archive_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_shipping.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_flip.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -r7014 -r7283 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7014) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7283) @@ -23,14 +23,17 @@ + + + tableborder_full_kernelpagination_bar"> - @@ -47,40 +50,43 @@ - Toolbars['_search'] = new ToolBar('icon16_'); - Toolbars['_search'].AddButton( - new ToolBarButton( - 'search', - '', - function() { search('','', ) }, - null, - '') ); - Toolbars['_search'].AddButton( - new ToolBarButton( - 'search_reset', - '', - function() { search_reset('','', ) }, - null, - '') ); - Toolbars['_search'].Render(document.getElementById('search_buttons[]')); + Toolbars['_search'] = new ToolBar('icon16_'); + Toolbars['_search'].UseLabels = false; + Toolbars['_search'].AddButton( + new ToolBarButton( + 'search', + '', + function() { search('','', ) }, + null, + '') ); + Toolbars['_search'].AddButton( + new ToolBarButton( + 'search_reset', + '', + function() { search_reset('','', ) }, + null, + '') ); + Toolbars['_search'].Render(document.getElementById('search_buttons[]')); Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_style_disabled.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_refresh.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/sections_list.css =================================================================== diff -u -r6734 -r7283 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/sections_list.css (.../sections_list.css) (revision 6734) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/sections_list.css (.../sections_list.css) (revision 7283) @@ -19,7 +19,7 @@ font-weight: bold; font-size: 12px; color: #ffffff; - background: url(../img/summary/overviewbox_header.gif) top left no-repeat; + background: url(../../../kernel/admin_templates/img/summary/overviewbox_header.gif) top left no-repeat; } .overviewbox_body { @@ -56,13 +56,13 @@ font-weight: bold; font-size: 12px; color: #000000; - background: url(../img/summary/searchbox_header.gif) top left no-repeat; + background: url(../../../kernel/admin_templates/img/summary/searchbox_header.gif) top left no-repeat; } .searchbox_body { border: 1px solid #666767; height: 65px; - background: url(../img/summary/searchbox_bg.gif) top left; + background: url(../../../kernel/admin_templates/img/summary/searchbox_bg.gif) top left; } .search { @@ -93,7 +93,7 @@ font-weight: bold; font-size: 12px; color: #000000; - background: url(../img/summary/usersbox_header.gif) top left no-repeat; + background: url(../../../kernel/admin_templates/img/summary/usersbox_header.gif) top left no-repeat; } .usersbox_body { @@ -103,18 +103,18 @@ .lTDi { border-right: 1px solid #CCCCCC; - border-top: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; } .rTDi { - border-top: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; } .lTD { - border-right: 1px solid #CCCCCC; + border-right: 1px solid #CCCCCC; } .rTD { - + } \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_upcat_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_user.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_homecat_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search_edit.tpl =================================================================== diff -u --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search_edit.tpl (revision 0) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_search_edit.tpl (revision 7283) @@ -0,0 +1,75 @@ + + + + + + + + + +
- - - + + + + - +
-
:  _search_keyword" name="_search_keyword" value="" onkeydown="search_keydown(event, '', '', );" style="border: 1px solid grey;" /> ]"> - + ]"> +
+ +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_group.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_search_a_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_theme.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_to_base.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_reset_f2.gif =================================================================== diff -u -r7079 -r7283 Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_new_affiliate_f2.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_review.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icon16_user_denied.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_e-mail_f3.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/itemicons/icons16_permissions_inherited.gif =================================================================== diff -u Binary files differ Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/img/toolbar/tool_update_rates_f2.gif =================================================================== diff -u Binary files differ