From 75db191bafd779ba415c59214b38e6cd024885dd Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Sun, 17 Jul 2016 12:52:38 +0200
Subject: [PATCH] Fix notification popup for fresh installs Fix docker setup by
 compiling php5-intl (#616)

---
 Dockerfile                                   |  6 ++++--
 application/controllers/Config.php           |  4 ++--
 application/views/configs/general_config.php | 10 +++++-----
 application/views/partial/header_js.php      |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d2d8a6a57..74ec09cc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,12 @@ FROM php:5-apache
 MAINTAINER jekkos
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     php5-gd \
-    php5-apcu
+    php5-apcu \
+    libicu-dev
 
 RUN a2enmod rewrite
-RUN docker-php-ext-install mysql mysqli bcmath
+RUN docker-php-ext-install mysql mysqli bcmath intl
+RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
 COPY . /app
diff --git a/application/controllers/Config.php b/application/controllers/Config.php
index 3049bea2f..44e2b1948 100644
--- a/application/controllers/Config.php
+++ b/application/controllers/Config.php
@@ -117,8 +117,8 @@ class Config extends Secure_Controller
 			'receiving_calculate_average_price' => $this->input->post('receiving_calculate_average_price') != NULL,
 			'lines_per_page' => $this->input->post('lines_per_page'),
 			'default_sales_discount' => $this->input->post('default_sales_discount'),
-			'config_notify_horizontal_position' => $this->input->post('config_notify_horizontal_position'),
-			'config_notify_vertical_position' => $this->input->post('config_notify_vertical_position'),
+			'notify_horizontal_position' => $this->input->post('notify_horizontal_position'),
+			'notify_vertical_position' => $this->input->post('notify_vertical_position'),
 			'custom1_name' => $this->input->post('custom1_name'),
 			'custom2_name' => $this->input->post('custom2_name'),
 			'custom3_name' => $this->input->post('custom3_name'),
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index 42113d645..16dd357ed 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -96,23 +96,23 @@
 			</div>
 
 			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_notify_alignment'), 'config_notify_horizontal_position', array('class' => 'control-label col-xs-2')); ?>
+				<?php echo form_label($this->lang->line('config_notify_alignment'), 'notify_horizontal_position', array('class' => 'control-label col-xs-2')); ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('config_notify_vertical_position', array(
+							<?php echo form_dropdown('notify_vertical_position', array(
 								'top' => $this->lang->line('config_top'),
 								'bottom' => $this->lang->line('config_bottom')
 							),
-								$this->config->item('config_notify_vertical_position'), array('class' => 'form-control input-sm')); ?>
+								$this->config->item('notify_vertical_position'), array('class' => 'form-control input-sm')); ?>
 						</div>
 						<div class='col-sm-2'>
-							<?php echo form_dropdown('config_notify_horizontal_position', array(
+							<?php echo form_dropdown('notify_horizontal_position', array(
 								'left' => $this->lang->line('config_left'),
 								'center' => $this->lang->line('config_center'),
 								'right' => $this->lang->line('config_right')
 							),
-								$this->config->item('config_notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
+								$this->config->item('notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
 						</div>
 					</div>
 				</div>
diff --git a/application/views/partial/header_js.php b/application/views/partial/header_js.php
index ca75ff9ae..4332eb2b5 100644
--- a/application/views/partial/header_js.php
+++ b/application/views/partial/header_js.php
@@ -12,8 +12,8 @@
 	}
 
 	$.notifyDefaults({ placement: {
-		align: '<?php echo $this->config->item('config_notify_horizontal_position'); ?>',
-		from: '<?php echo $this->config->item('config_notify_vertical_position'); ?>'
+		align: '<?php echo $this->config->item('notify_horizontal_position'); ?>',
+		from: '<?php echo $this->config->item('notify_vertical_position'); ?>'
 	}});
 
 	var post = $.post;