Merge pull request opensourcepos#1 from jekkos/master

new
OreoYedsDur · Apr 25, 2016 · 3785cdb · 3785cdb
2 parents 8139d52 + 4ed63cc
commit 3785cdb
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 98 deletions.
diff --git a/application/language/de-CH/common_lang.php b/application/language/de-CH/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "Letzte Verkäufe";
 $lang["common_website"] = "Website";
 $lang["common_welcome"] = "Willkommen";
-$lang["common_welcome_message"] = "Willkommen bei PHP Point Of Sales, zum Beginnen auf ein Modul klicken";
-$lang["common_you_are_using_ospos"] = "Sie verwenden Open Source Point Of Sales Version";
+$lang["common_welcome_message"] = "Willkommen bei OSPOS, zum Beginnen auf ein Modul klicken";
+$lang["common_you_are_using_ospos"] = "Sie verwenden Open Source Point Of Sale Version";
 $lang["common_zip"] = "PLZ";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Voralge (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Voller Dateipfad zum Excel File notwendig";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/de-CH/login_lang.php b/application/language/de-CH/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Passwort";
 $lang["login_username"] = "Benutzername";
-$lang["login_welcome_message"] = "Willkommen bei Open Source Point Of Sales. Zum Starten bitte auf ein Modul klicken";
diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php
@@ -46,7 +46,7 @@
 $lang["common_view_recent_sales"] = "View Recent Sales";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to Open Source Point Of Sale, click a module below to get started!";
+$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started!";
 $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version";
 $lang["common_zip"] = "Zip";
 $lang["common_import"] = "Import";

diff --git a/application/language/en/login_lang.php b/application/language/en/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
-$lang["login_welcome_message"] = "Welcome to the Open Source Point of Sale System. To continue, please login using your username and password below.";
diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "Ver Ventas Recientes";
 $lang["common_website"] = "sitio";
 $lang["common_welcome"] = "Bienvenido(a)";
-$lang["common_welcome_message"] = "Bienvenido(a) a Open Source Point Of Sale. ¡Haz click en algún módulo debajo, para empezar!";
+$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo debajo, para empezar!";
 $lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión";
 $lang["common_zip"] = "Código Postal";
 $lang["common_import"] = "Importar";
 $lang["common_download_import_template"] = "Descargar Plantilla de Importación de Excel (CSV)";
 $lang["common_import_excel"] = "Importar Excel";
 $lang["common_import_full_path"] = "Requerida la ruta completa del archivo";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/es/login_lang.php b/application/language/es/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Iniciar Sesión";
 $lang["login_password"] = "Contraseña";
 $lang["login_username"] = "Usuario";
-$lang["login_welcome_message"] = "Bienvenido(a) al Sistema Open Source Point of Sale. Para continuar, inicia sesión usando tu Usuario y Contraseña.";
diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "Voir Ventes Récentes";
 $lang["common_website"] = "site-web";
 $lang["common_welcome"] = "Bienvenue";
-$lang["common_welcome_message"] = "Bienvenue à Open Source Point Of Sale, choisissez un module ci-dessous!";
+$lang["common_welcome_message"] = "Bienvenue à OSPOS, choisissez un module ci-dessous!";
 $lang["common_you_are_using_ospos"] = "Vous utilisez Open Source Point Of Sale Version";
 $lang["common_zip"] = "Zip";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/fr/login_lang.php b/application/language/fr/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Mot de passe";
 $lang["login_username"] = "Nom d'utilisateur";
-$lang["login_welcome_message"] = "Bienvenue au Système Open Source Point of Sale. Pour continuer, veuiller entrer votre nom d'utilisateur et votre mot de passe ci-dessous.";
diff --git a/application/language/hr-HR/common_lang.php b/application/language/hr-HR/common_lang.php
@@ -47,7 +47,7 @@
 $lang["common_website"] = "web stranicu";
 $lang["common_welcome"] = "Dobrodošli";
 $lang["common_welcome_message"] = "Dobrodošli u blagajnu otvorenog koda(OSPOS)";
-$lang["common_you_are_using_ospos"] = "Koristite blagajnu otvorenog koda (OSPOS) verziju";
+$lang["common_you_are_using_ospos"] = "Koristite blagajnu otvorenog koda (Open Source Point Of Sale) verziju";
 $lang["common_zip"] = "Broj pošte";
 $lang["common_import"] = "Uvoz";
 $lang["common_download_import_template"] = "Preuzmite predložak za uvoz(CSV)";

diff --git a/application/language/hr-HR/login_lang.php b/application/language/hr-HR/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Prijava";
 $lang["login_password"] = "Lozinka";
 $lang["login_username"] = "Korisničko ime";
-$lang["login_welcome_message"] = "Dobrodošli u blagajnu otvorenog koda (POS). Za nastavak, molim unesite korisničko ime i lozinku.";
diff --git a/application/language/hu-HU/common_lang.php b/application/language/hu-HU/common_lang.php
@@ -46,7 +46,7 @@
 $lang["common_view_recent_sales"] = "Eladások megtekintése";
 $lang["common_website"] = "weboldalt";
 $lang["common_welcome"] = "Üdvözlet";
-$lang["common_welcome_message"] = "Üdvözli az Open Source Point Of Sale, kattintson a modulokra a kezdéshez!";
+$lang["common_welcome_message"] = "Üdvözli az OSPOS, kattintson a modulokra a kezdéshez!";
 $lang["common_you_are_using_ospos"] = "Ön az Open Source Point Of Sale alábbi verzióját használja";
 $lang["common_zip"] = "Ir.Szám";
 $lang["common_import"] = "Import";

diff --git a/application/language/hu-HU/login_lang.php b/application/language/hu-HU/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Belépés";
 $lang["login_password"] = "Jelszó";
 $lang["login_username"] = "Felhasználó név";
-$lang["login_welcome_message"] = "Üdvözöljük az OSPoS rendszerében. Kérem lépjen be felhasználói nevével és jelszavával  a folytatáshoz.";
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
@@ -53,9 +53,9 @@
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/id/login_lang.php b/application/language/id/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Masuk";
 $lang["login_password"] = "Kata kunci";
 $lang["login_username"] = "Nama Anda";
-$lang["login_welcome_message"] = "SELAMAT DATANG. Silahkan login untuk masuk aplikasi, Isikan Nama Pengguna dan Kata Kunci Anda di bawah ini.";
diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "Bekijk recente verkoop";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Welkom";
-$lang["common_welcome_message"] = "Welkom in PHP Point Of Sale, klik beneden een module aan om te beginnen!";
+$lang["common_welcome_message"] = "Welkom in OSPOS, klik beneden een module aan om te beginnen!";
 $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version";
 $lang["common_zip"] = "Postcode";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/nl-BE/login_lang.php b/application/language/nl-BE/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Paswoord";
 $lang["login_username"] = "Gebruiker";
-$lang["login_welcome_message"] = "Welkom in deze module. Voer gebruikersnaam en paswoord in om verder te gaan.";
diff --git a/application/language/pt-BR/common_lang.php b/application/language/pt-BR/common_lang.php
@@ -47,7 +47,7 @@
 $lang["common_website"] = "site da internet";
 $lang["common_welcome"] = "Bem-vindo";
 $lang["common_welcome_message"] = "Bem-vindo";
-$lang["common_you_are_using_ospos"] = "Você está usando OSPOS Versão";
+$lang["common_you_are_using_ospos"] = "Você está usando Open Source Point Of Sale Versão";
 $lang["common_zip"] = "CEP";
 $lang["common_import"] = "Importar";
 $lang["common_download_import_template"] = "Baixar Modelo de importação Excel(CSV)";

diff --git a/application/language/pt-BR/login_lang.php b/application/language/pt-BR/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Senha";
 $lang["login_username"] = "Usuário";
-$lang["login_welcome_message"] = "Bem-vindo ao OSPOS. Para continuar, por favor acessar usando seu nome de usuário e senha abaixo.";
diff --git a/application/language/ru/common_lang.php b/application/language/ru/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "Посмотреть Недавние Продажи";
 $lang["common_website"] = "веб-сайт";
 $lang["common_welcome"] = "Добро пожаловать";
-$lang["common_welcome_message"] = "Добро пожаловать в Open Source Point Of Sale, нажмите модуля ниже, чтобы начать!";
+$lang["common_welcome_message"] = "Добро пожаловать в OSPOS, нажмите модуля ниже, чтобы начать!";
 $lang["common_you_are_using_ospos"] = "Вы использоваете Open Source Point Of Sale Версия";
 $lang["common_zip"] = "Почтовый индекс";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/ru/login_lang.php b/application/language/ru/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Вход";
 $lang["login_password"] = "Пароль";
 $lang["login_username"] = "Имя";
-$lang["login_welcome_message"] = "Добро пожаловать в Open Source Point of Sale. Чтобы продолжить, пожалуйста войдите на сайт, используя имя и пароль.";
diff --git a/application/language/th/common_lang.php b/application/language/th/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "การขายล่าสุด";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "ยินดีต้อนรับ";
-$lang["common_welcome_message"] = "Opensource Point of sale. กรุณาเลือกคำสั่งเมนูด้านล่าง ";
-$lang["common_you_are_using_ospos"] = "คุณกำลังใช้ Opensource Point of Sales รุ่น";
+$lang["common_welcome_message"] = "OSPOS. กรุณาเลือกคำสั่งเมนูด้านล่าง ";
+$lang["common_you_are_using_ospos"] = "คุณกำลังใช้ Open Source Point Of Sale รุ่น";
 $lang["common_zip"] = "รหัสไปรษณีย์";
 $lang["common_import"] = "นำเข้า";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/th/login_lang.php b/application/language/th/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "ลงชื่อเข้าใช้";
 $lang["login_password"] = "รหัสผ่าน";
 $lang["login_username"] = "ชื่อผู้ใช้";
-$lang["login_welcome_message"] = "ยินดีต้องรับสู่ระบบ Open Source Point of Sale. เพื่อที่จะไปต่อ, กรุณาเข้าสู่ระบบโดยใส่ ชื่อผู้ใช้ และ รหัสผ่านที่อยู่ด้านล่าง.";
diff --git a/application/language/tr/common_lang.php b/application/language/tr/common_lang.php
@@ -53,9 +53,9 @@
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/tr/login_lang.php b/application/language/tr/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "Giriş";
 $lang["login_password"] = "Şifre";
 $lang["login_username"] = "Kullanıcı Adı";
-$lang["login_welcome_message"] = "Syolcu POS'a hoşgeldiniz.";
diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php
@@ -46,16 +46,16 @@
 $lang["common_view_recent_sales"] = "最新的消售資訊";
 $lang["common_website"] = "網站";
 $lang["common_welcome"] = "歡迎";
-$lang["common_welcome_message"] = "歡迎使用Open Source Point of Sale，請點擊下面的模組以開始使用！";
-$lang["common_you_are_using_ospos"] = "您正在使用 Open Source Point of Sale 版本";
+$lang["common_welcome_message"] = "歡迎使用OSPOS，請點擊下面的模組以開始使用！";
+$lang["common_you_are_using_ospos"] = "您正在使用 Open Source Point Of Sale 版本";
 $lang["common_zip"] = "郵遞區號";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
 $lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "";
-$lang["common_import_change_file"] = "";
-$lang["common_import_remove_file"] = "";
+$lang["common_import_select_file"] = "Select file";
+$lang["common_import_change_file"] = "Change";
+$lang["common_import_remove_file"] = "Remove";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";

diff --git a/application/language/zh/login_lang.php b/application/language/zh/login_lang.php
@@ -5,4 +5,3 @@
 $lang["login_login"] = "登入";
 $lang["login_password"] = "密碼";
 $lang["login_username"] = "帳號";
-$lang["login_welcome_message"] = "歡迎使用Master6進銷存。若要繼續，請使用您的帳號和密碼登錄。";
diff --git a/application/views/login.php b/application/views/login.php
@@ -19,7 +19,7 @@
 </head>
 
 <body>
-	<div id="logo" align="center"><img src=<?php echo base_url();?>/images/logo.gif></div>
+	<div id="logo" align="center"><img src=<?php echo base_url();?>/images/logo.png></div>
 
 	<div id="login">
 		<?php echo form_open('login') ?>

diff --git a/application/views/partial/header_excel.php b/application/views/partial/header_excel.php
@@ -1,44 +1,43 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' Open Source Point Of Sale' ?></title>
+	<title><?php echo $this->config->item('company') . ' -- ' . $this->lang->line('common_powered_by') . ' OSPOS ' . $this->config->item('application_version') ?></title>
 	<style type="text/css">
-	html {
-	    overflow: auto;
-	}
-	body
-	{
-		background-color:#FFFFFF;
-		font-size:100%;	
-	}
-
-	#menubar,#footer
-	{
-		display:none;
-	}
+		html {
+			overflow: auto;
+		}
+		body
+		{
+			background-color:#FFFFFF;
+			font-size:100%;	
+		}
+		
+		#menubar,#footer
+		{
+			display:none;
+		}
 
-	#sale_return_policy
-	{
-		width:100%;
-		text-align:center;
-	}
-
-	.long_name
-	{
-		display:none;
-	}
-
-	.short_name
-	{
-		display:inline;
-	}
-
-	#receipt_items td
-	{
-		white-space:nowrap;
-	}
+		#sale_return_policy
+		{
+			width:100%;
+			text-align:center;
+		}
+		
+		.long_name
+		{
+			display:none;
+		}
+		
+		.short_name
+		{
+			display:inline;
+		}
+		
+		#receipt_items td
+		{
+			white-space:nowrap;
+		}
 	</style>
 </head>
 <body>
diff --git a/images/favicon.ico b/images/favicon.ico
diff --git a/images/logo.gif b/images/logo.gif
diff --git a/images/logo.png b/images/logo.png
diff --git a/templates/spacelab/views/login.php b/templates/spacelab/views/login.php
@@ -20,7 +20,7 @@
 </head>
 
 <body>
-	<div id="logo" align="center"><img src=<?php echo base_url();?>/images/logo.gif></div>
+	<div id="logo" align="center"><img src=<?php echo base_url();?>/images/logo.png></div>
 
 	<div id="login">
 		<?php echo form_open('login') ?>