From e5e3b89c6da91239c3db95bf4585b81df9a17033 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sat, 27 Feb 2016 09:42:23 +0000 Subject: [PATCH] fix config page tabs sizes and alignment (#116) --- application/views/configs/barcode_config.php | 78 +++++------ application/views/configs/general_config.php | 72 ++++++----- application/views/configs/locale_config.php | 121 +++++++++--------- application/views/configs/receipt_config.php | 78 +++++------ application/views/configs/stock_config.php | 4 +- application/views/partial/stock_locations.php | 47 ++++--- 6 files changed, 206 insertions(+), 194 deletions(-) diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php index e233e41c4..8ca6b0c15 100644 --- a/application/views/configs/barcode_config.php +++ b/application/views/configs/barcode_config.php @@ -1,20 +1,20 @@
lang->line('config_barcode_configuration'); ?>
-'barcode_config_form', 'class' => 'form-horizontal')); ?> +'barcode_config_form', 'class'=>'form-horizontal')); ?>
lang->line('common_fields_required_message'); ?>
    -
    - lang->line('config_barcode_type'), 'barcode_type',array('class'=>'control-label col-xs-2')); ?> +
    + lang->line('config_barcode_type'), 'barcode_type', array('class'=>'control-label col-xs-2')); ?>
    - config->item('barcode_type'), "class='form-control'");?> + config->item('barcode_type'), array('class'=>'form-control input-sm'));?>
    -
    - lang->line('config_barcode_quality'), 'barcode_quality',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_quality'), 'barcode_quality', array('class'=>'control-label col-xs-2 required')); ?>
    '100', @@ -22,13 +22,13 @@ 'type'=>'number', 'name'=>'barcode_quality', 'id'=>'barcode_quality', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_quality')));?>
    -
    - lang->line('config_barcode_width'), 'barcode_width',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_width'), 'barcode_width', array('class'=>'control-label col-xs-2 required')); ?>
    '5', @@ -37,13 +37,13 @@ 'type'=>'number', 'name'=>'barcode_width', 'id'=>'barcode_width', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_width')));?>
    -
    - lang->line('config_barcode_height'), 'barcode_height',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_height'), 'barcode_height', array('class'=>'control-label col-xs-2 required')); ?>
    'number', @@ -51,17 +51,17 @@ 'max' => 120, 'name'=>'barcode_height', 'id'=>'barcode_height', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_height')));?>
    -
    - lang->line('config_barcode_font'), 'barcode_font',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_font'), 'barcode_font', array('class'=>'control-label col-xs-2 required')); ?>
    barcode_lib->listfonts("fonts"), - $this->config->item('barcode_font'), "class='form-control'"); + $this->barcode_lib->listfonts("fonts"), + $this->config->item('barcode_font'), array('class'=>'form-control input-sm')); ?>
    @@ -71,14 +71,14 @@ 'max' => '30', 'name'=>'barcode_font_size', 'id'=>'barcode_font_size', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_font_size')));?>
    -
    - lang->line('config_barcode_content'), 'barcode_content',array('class'=>'control-label col-xs-2')); ?> -
    +
    + lang->line('config_barcode_content'), 'barcode_content', array('class'=>'control-label col-xs-2')); ?> +
    -
    - lang->line('config_barcode_layout'), 'barcode_layout',array('class'=>'control-label col-xs-2')); ?> +
    + lang->line('config_barcode_layout'), 'barcode_layout', array('class'=>'control-label col-xs-2')); ?>
    -
    +
    'Unit price', 'company_name' => 'Company Name' ), - $this->config->item('barcode_first_row'), "class='form-control'"); + $this->config->item('barcode_first_row'), array('class'=>'form-control input-sm')); ?>
    @@ -131,11 +131,11 @@ 'item_code' => 'Item code', 'company_name' => 'Company Name' ), - $this->config->item('barcode_second_row'), "class='form-control'"); + $this->config->item('barcode_second_row'), array('class'=>'form-control input-sm')); ?>
    -
    +
    'Not show', 'name' => 'Name', @@ -145,48 +145,48 @@ 'item_code' => 'Item code', 'company_name' => 'Company Name' ), - $this->config->item('barcode_third_row'), "class='form-control'"); + $this->config->item('barcode_third_row'), array('class'=>'form-control input-sm')); ?>
    -
    - lang->line('config_barcode_number_in_row'), 'barcode_num_in_row',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_number_in_row'), 'barcode_num_in_row', array('class'=>'control-label col-xs-2 required')); ?>
    'barcode_num_in_row', 'id'=>'barcode_num_in_row', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_num_in_row')));?>
    -
    - lang->line('config_barcode_page_width'), 'barcode_page_width',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_page_width'), 'barcode_page_width', array('class'=>'control-label col-xs-2 required')); ?>
    'barcode_page_width', 'id'=>'barcode_page_width', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_page_width')));?> - % + %
    -
    - lang->line('config_barcode_page_cellspacing'), 'barcode_page_cellspacing',array('class'=>'control-label col-xs-2 required')); ?> +
    + lang->line('config_barcode_page_cellspacing'), 'barcode_page_cellspacing', array('class'=>'control-label col-xs-2 required')); ?>
    'barcode_page_cellspacing', 'id'=>'barcode_page_cellspacing', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('barcode_page_cellspacing')));?> - px + px
    diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index 9f9e0c818..befb69168 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -1,13 +1,13 @@
    lang->line('config_general_configuration'); ?>
    -'config_form','enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?> +'config_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
    lang->line('common_fields_required_message'); ?>
      - lang->line('config_company'), 'company', array('class'=>'control-label col-xs-2 required')); ?> + lang->line('config_company'), 'company', array('class'=>'control-label col-xs-2 required')); ?>
      'company', @@ -18,17 +18,21 @@
      - lang->line('config_company_logo'), 'company_logo', array('class'=>'control-label col-xs-2')); ?> + lang->line('config_company_logo'), 'company_logo', array('class'=>'control-label col-xs-2')); ?>
      - <?php echo $this->lang->line('config_company_logo'); ?> + <?php echo $this->lang->line('config_company_logo'); ?>
      lang->line("config_company_select_image"); ?> - lang->line("config_company_change_image"); ?> + lang->line("config_company_change_image"); ?> + + lang->line("config_company_remove_image"); ?>
      @@ -36,7 +40,7 @@
      - lang->line('config_address'), 'address', array('class'=>'control-label col-xs-2 required')); ?> + lang->line('config_address'), 'address', array('class'=>'control-label col-xs-2 required')); ?>
      'address', @@ -47,7 +51,7 @@
      - lang->line('config_website'), 'website',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_website'), 'website', array('class'=>'control-label col-xs-2')); ?>
      'website', @@ -58,7 +62,7 @@
      - lang->line('common_email'), 'email',array('class'=>'control-label col-xs-2')); ?> + lang->line('common_email'), 'email', array('class'=>'control-label col-xs-2')); ?>
      'email', @@ -70,7 +74,7 @@
      - lang->line('config_phone'), 'phone',array('class'=>'control-label col-xs-2 required')); ?> + lang->line('config_phone'), 'phone', array('class'=>'control-label col-xs-2 required')); ?>
      'phone', @@ -81,7 +85,7 @@
      - lang->line('config_fax'), 'fax',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_fax'), 'fax', array('class'=>'control-label col-xs-2')); ?>
      'fax', @@ -92,7 +96,7 @@
      - lang->line('common_return_policy'), 'return_policy',array('class'=>'control-label col-xs-2 required')); ?> + lang->line('common_return_policy'), 'return_policy', array('class'=>'control-label col-xs-2 required')); ?>
      'return_policy', @@ -103,15 +107,15 @@
      - lang->line('config_default_tax_rate_1'), 'default_tax_1_rate',array('class'=>'control-label col-xs-2 required')); ?> -
      + lang->line('config_default_tax_rate_1'), 'default_tax_1_rate', array('class'=>'control-label col-xs-2 required')); ?> +
      'default_tax_1_name', 'id'=>'default_tax_1_name', 'class'=>'form-control input-sm', 'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1')));?>
      -
      +
      'default_tax_1_rate', 'id'=>'default_tax_1_rate', @@ -122,15 +126,15 @@
      - lang->line('config_default_tax_rate_2'), 'default_tax_1_rate',array('class'=>'control-label col-xs-2')); ?> -
      + lang->line('config_default_tax_rate_2'), 'default_tax_1_rate', array('class'=>'control-label col-xs-2')); ?> +
      'default_tax_2_name', 'id'=>'default_tax_2_name', 'class'=>'form-control input-sm', 'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2')));?>
      -
      +
      'default_tax_2_rate', 'id'=>'default_tax_2_rate', @@ -141,7 +145,7 @@
      - lang->line('config_tax_included'), 'tax_included',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_tax_included'), 'tax_included', array('class'=>'control-label col-xs-2')); ?>
      'tax_included', @@ -152,7 +156,7 @@
      - lang->line('config_default_sales_discount'), 'default_sales_discount',array('class'=>'control-label col-xs-2 required')); ?> + lang->line('config_default_sales_discount'), 'default_sales_discount', array('class'=>'control-label col-xs-2 required')); ?>
      - lang->line('config_sales_invoice_format'), 'sales_invoice_format',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_sales_invoice_format'), 'sales_invoice_format', array('class'=>'control-label col-xs-2')); ?>
      'sales_invoice_format', @@ -180,7 +184,7 @@
      - lang->line('config_recv_invoice_format'), 'recv_invoice_format',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_recv_invoice_format'), 'recv_invoice_format', array('class'=>'control-label col-xs-2')); ?>
      'recv_invoice_format', @@ -191,7 +195,7 @@
      - lang->line('config_receiving_calculate_average_price'), 'receiving_calculate_average_price',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_receiving_calculate_average_price'), 'receiving_calculate_average_price', array('class'=>'control-label col-xs-2')); ?>
      'receiving_calculate_average_price', @@ -202,7 +206,7 @@
      - lang->line('config_lines_per_page'), 'lines_per_page',array('class'=>'control-label col-xs-2 required')); ?> + lang->line('config_lines_per_page'), 'lines_per_page', array('class'=>'control-label col-xs-2 required')); ?>
      'lines_per_page', @@ -216,7 +220,7 @@
      - lang->line('config_custom1'), 'config_custom1',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom1'), 'config_custom1', array('class'=>'control-label col-xs-2')); ?>
      'custom1_name', @@ -227,7 +231,7 @@
      - lang->line('config_custom2'), 'config_custom2',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom2'), 'config_custom2', array('class'=>'control-label col-xs-2')); ?>
      'custom2_name', @@ -238,7 +242,7 @@
      - lang->line('config_custom3'), 'config_custom3',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom3'), 'config_custom3', array('class'=>'control-label col-xs-2')); ?>
      'custom3_name', @@ -249,7 +253,7 @@
      - lang->line('config_custom4'), 'config_custom4',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom4'), 'config_custom4', array('class'=>'control-label col-xs-2')); ?>
      'custom4_name', @@ -260,7 +264,7 @@
      - lang->line('config_custom5'), 'config_custom5',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom5'), 'config_custom5', array('class'=>'control-label col-xs-2')); ?>
      'custom5_name', @@ -271,7 +275,7 @@
      - lang->line('config_custom6'), 'config_custom6',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom6'), 'config_custom6', array('class'=>'control-label col-xs-2')); ?>
      'custom6_name', @@ -282,7 +286,7 @@
      - lang->line('config_custom7'), 'config_custom7',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom7'), 'config_custom7', array('class'=>'control-label col-xs-2')); ?>
      'custom7_name', @@ -293,7 +297,7 @@
      - lang->line('config_custom8'), 'config_custom8',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom8'), 'config_custom8', array('class'=>'control-label col-xs-2')); ?>
      'custom8_name', @@ -304,7 +308,7 @@
      - lang->line('config_custom9'), 'config_custom9',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom9'), 'config_custom9', array('class'=>'control-label col-xs-2')); ?>
      'custom9_name', @@ -315,7 +319,7 @@
      - lang->line('config_custom10'), 'config_custom10',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_custom10'), 'config_custom10', array('class'=>'control-label col-xs-2')); ?>
      'custom10_name', @@ -326,7 +330,7 @@
      - lang->line('config_backup_database'), 'config_backup_database',array('class'=>'control-label col-xs-2')); ?> + lang->line('config_backup_database'), 'config_backup_database', array('class'=>'control-label col-xs-2')); ?>
      lang->line('config_backup_button'); ?> diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php index 938bed429..f66a805b5 100644 --- a/application/views/configs/locale_config.php +++ b/application/views/configs/locale_config.php @@ -1,84 +1,81 @@
      lang->line('config_locale_configuration'); ?>
      -'locale_config_form', 'class'=>'form-horizontal')); ?> +'locale_config_form', 'class'=>'form-horizontal')); ?>
      lang->line('common_fields_required_message'); ?>
        -
        - lang->line('config_currency_symbol'), 'currency_symbol',array('class'=>'control-label col-xs-2')); ?> +
        + lang->line('config_currency_symbol'), 'currency_symbol', array('class'=>'control-label col-xs-2')); ?>
        'currency_symbol', 'id'=>'currency_symbol', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('currency_symbol')));?>
        -
        - lang->line('config_number_format'), 'number_format',array('class'=>'control-label col-xs-2')); ?> -
        -
        - -
        - '' (apostrophe)', - ',' => ', (comma)', - '.' => '. (dot)', - '' => '(none)' - ), - $this->config->item('thousands_separator'), "class='form-control'"); - ?> -
        - -
        - '. (dot)', - ',' => ', (comma)' - ), - $this->config->item('decimal_point'), "class='form-control'"); - ?> -
        -
        -
        - -
        - -
        - lang->line('config_language'), 'language',array('class'=>'control-label col-xs-2')); ?> -
        - 'English', - 'es' => 'Spanish', - 'ru' => 'Russian', - 'nl-BE' => 'Dutch (Belgium)', - 'de-CH' => 'German (Swiss)', - 'zh' => 'Chinese', - 'id' => 'Indonesian', - 'fr' => 'French', - 'th' => 'Thai', - 'tr' => 'Turkish' +
        + lang->line('config_decimal_point'), 'language', array('class'=>'control-label col-xs-2')); ?> +
        + '. (dot)', + ',' => ', (comma)' ), - $this->config->item('language'), "class='form-control'"); + $this->config->item('decimal_point'), array('class'=>'form-control input-sm')); ?>
        -
        +
        + lang->line('config_thousands_separator'), 'language', array('class'=>'control-label col-xs-2')); ?> +
        + '' (apostrophe)', + ',' => ', (comma)', + '.' => '. (dot)', + '' => '(none)' + ), + $this->config->item('thousands_separator'), array('class'=>'form-control input-sm')); + ?> +
        +
        + +
        + lang->line('config_language'), 'language', array('class'=>'control-label col-xs-2')); ?> +
        + 'English', + 'es' => 'Spanish', + 'ru' => 'Russian', + 'nl-BE' => 'Dutch (Belgium)', + 'de-CH' => 'German (Swiss)', + 'zh' => 'Chinese', + 'id' => 'Indonesian', + 'fr' => 'French', + 'th' => 'Thai', + 'tr' => 'Turkish' + ), + $this->config->item('language'), array('class'=>'form-control input-sm')); + ?> +
        +
        + +
        lang->line('config_timezone'), 'timezone',array('class'=>'control-label col-xs-2')); ?> -
        +
        '(GMT-11:00) Midway Island, Samoa', @@ -172,12 +169,13 @@ 'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands', 'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa', 'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati' - ), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get(), "class='form-control'"); + ), + $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get(), array('class'=>'form-control input-sm')); ?>
        -
        +
        lang->line('config_datetimeformat'), 'datetimeformat', array('class'=>'control-label col-xs-2')); ?>
        'yyyy/mm/dd', 'd/m/y' => 'dd/mm/yy', 'm/d/y' => 'mm/dd/yy', - 'y/m/d' => 'yy/mm/dd'), - $this->config->item('dateformat'), "class='form-control'"); + 'y/m/d' => 'yy/mm/dd' + ), + $this->config->item('dateformat'), array('class'=>'form-control input-sm')); ?>
        'hh:mm:ss (24h)', 'h:i:s a' => 'hh:mm:ss am/pm', - 'h:i:s A' => 'hh:mm:ss AM/PM'), - $this->config->item('timeformat'), "class='form-control'"); + 'h:i:s A' => 'hh:mm:ss AM/PM' + ), + $this->config->item('timeformat'), array('class'=>'form-control input-sm')); ?>
        @@ -206,7 +206,8 @@ 'name'=>'submit_form', 'id'=>'submit_form', 'value'=>$this->lang->line('common_submit'), - 'class'=>'btn btn-primary btn-sm pull-right') + 'class'=>'btn btn-primary btn-sm pull-right' + ) ); ?>
        diff --git a/application/views/configs/receipt_config.php b/application/views/configs/receipt_config.php index c258ca1aa..06593f019 100644 --- a/application/views/configs/receipt_config.php +++ b/application/views/configs/receipt_config.php @@ -1,13 +1,13 @@
        lang->line('config_receipt_configuration'); ?>
        -'receipt_config_form', 'class'=>'form-horizontal')); ?> +'receipt_config_form', 'class'=>'form-horizontal')); ?>
        lang->line('common_fields_required_message'); ?>
          -
          - lang->line('config_use_invoice_template'), 'use_invoice_template',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_use_invoice_template'), 'use_invoice_template', array('class'=>'control-label col-xs-2')); ?>
          'use_invoice_template', @@ -17,30 +17,30 @@
          -
          - lang->line('config_invoice_default_comments'), 'invoice_default_comments',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_invoice_default_comments'), 'invoice_default_comments', array('class'=>'control-label col-xs-2')); ?>
          'invoice_default_comments', 'id'=>'invoice_default_comments', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('invoice_default_comments')));?>
          -
          - lang->line('config_invoice_email_message'), 'invoice_email_message',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_invoice_email_message'), 'invoice_email_message', array('class'=>'control-label col-xs-2')); ?>
          'invoice_email_message', 'id'=>'invoice_email_message', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('invoice_email_message')));?>
          -
          - lang->line('config_receipt_show_taxes'), 'receipt_show_taxes',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_receipt_show_taxes'), 'receipt_show_taxes', array('class'=>'control-label col-xs-2')); ?>
          'receipt_show_taxes', @@ -50,8 +50,8 @@
          -
          - lang->line('config_show_total_discount'), 'show_total_discount',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_show_total_discount'), 'show_total_discount', array('class'=>'control-label col-xs-2')); ?>
          'show_total_discount', @@ -61,8 +61,8 @@
          -
          - lang->line('config_print_silently'), 'print_silently',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_print_silently'), 'print_silently', array('class'=>'control-label col-xs-2')); ?>
          'print_silently', @@ -72,8 +72,8 @@
          -
          - lang->line('config_print_header'), 'print_header',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_print_header'), 'print_header', array('class'=>'control-label col-xs-2')); ?>
          'print_header', @@ -83,8 +83,8 @@
          -
          - lang->line('config_print_footer'), 'print_footer',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_print_footer'), 'print_footer', array('class'=>'control-label col-xs-2')); ?>
          'print_footer', @@ -94,8 +94,8 @@
          -
          - lang->line('config_receipt_printer'), 'config_receipt_printer',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_receipt_printer'), 'config_receipt_printer', array('class'=>'control-label col-xs-2')); ?>
          -
          - lang->line('config_invoice_printer'), 'config_invoice_printer',array('class'=>'control-label col-xs-2')); ?> +
          + lang->line('config_invoice_printer'), 'config_invoice_printer', array('class'=>'control-label col-xs-2')); ?>
          -
          - lang->line('config_print_top_margin'), 'print_top_margin',array('class'=>'control-label col-xs-2 required')); ?> +
          + lang->line('config_print_top_margin'), 'print_top_margin', array('class'=>'control-label col-xs-2 required')); ?>
          '20', 'name'=>'print_top_margin', 'id'=>'print_top_margin', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('print_top_margin')));?> - px + px
          -
          - lang->line('config_print_left_margin'), 'print_left_margin',array('class'=>'control-label col-xs-2 required')); ?> +
          + lang->line('config_print_left_margin'), 'print_left_margin', array('class'=>'control-label col-xs-2 required')); ?>
          '20', 'name'=>'print_left_margin', 'id'=>'print_left_margin', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('print_left_margin')));?> - px + px
          -
          - lang->line('config_print_bottom_margin'), 'print_bottom_margin',array('class'=>'control-label col-xs-2 required')); ?> +
          + lang->line('config_print_bottom_margin'), 'print_bottom_margin', array('class'=>'control-label col-xs-2 required')); ?>
          '20', 'name'=>'print_bottom_margin', 'id'=>'print_bottom_margin', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('print_bottom_margin')));?> - px + px
          -
          - lang->line('config_print_right_margin'), 'print_right_margin',array('class'=>'control-label col-xs-2 required')); ?> +
          + lang->line('config_print_right_margin'), 'print_right_margin', array('class'=>'control-label col-xs-2 required')); ?>
          '20', 'name'=>'print_right_margin', 'id'=>'print_right_margin', - 'class'=>'form-control', + 'class'=>'form-control input-sm', 'value'=>$this->config->item('print_right_margin')));?> - px + px
          diff --git a/application/views/configs/stock_config.php b/application/views/configs/stock_config.php index 7ddb39477..781883e81 100644 --- a/application/views/configs/stock_config.php +++ b/application/views/configs/stock_config.php @@ -1,6 +1,6 @@
          lang->line('config_location_configuration'); ?>
          -'location_config_form', 'class'=>'form-horizontal')); ?> +'location_config_form', 'class'=>'form-horizontal')); ?>
          lang->line('common_fields_required_message'); ?>
          @@ -50,7 +50,7 @@ $(document).ready(function() var new_block = block.insertAfter($(this).parent()); var new_block_id = 'stock_location_' + ++id; $(new_block).find('label').html("lang->line('config_stock_location'); ?> " + ++location_count).attr('for', new_block_id).attr('class', 'control-label col-xs-2'); - $(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control').val(''); + $(new_block).find('input').attr('id', new_block_id).removeAttr('disabled').attr('name', new_block_id).attr('class', 'form-control input-sm').val(''); hide_show_remove(); }; diff --git a/application/views/partial/stock_locations.php b/application/views/partial/stock_locations.php index 3e39f3ba6..60c183599 100644 --- a/application/views/partial/stock_locations.php +++ b/application/views/partial/stock_locations.php @@ -1,20 +1,27 @@ - - $location_data ) { ?> - - -
          - lang->line('config_stock_location').' ' .++$i, 'stock_location_'.$i ,array('class'=>'required control-label col-xs-2')); ?> -
          - 'stock_location_'.$location_id, - 'id'=>'stock_location_'.$location_id, - 'class'=>'stock_location valid_chars required form-control', - 'value'=>$location_name); - $location_data['deleted'] && $form_data['disabled'] = 'disabled'; - echo form_input($form_data); - ?> -
          - - -
          - + $location_data) +{ + $location_id = $location_data['location_id']; + $location_name = $location_data['location_name']; +?> +
          + lang->line('config_stock_location') . ' ' . ++$i, 'stock_location_' . $i, array('class'=>'control-label col-xs-2 required')); ?> +
          + 'stock_location_' . $location_id, + 'id'=>'stock_location_' . $location_id, + 'class'=>'stock_location valid_chars form-control input-sm required', + 'value'=>$location_name + ); + $location_data['deleted'] && $form_data['disabled'] = 'disabled'; + echo form_input($form_data); + ?> +
          + + +
          +