diff --git a/app/templates/theme1/layout.html b/app/templates/theme1/layout.html index 2d402ad..250d56d 100755 --- a/app/templates/theme1/layout.html +++ b/app/templates/theme1/layout.html @@ -1,5 +1,5 @@ - + Adianti ERP Template diff --git a/app/templates/theme1/login.html b/app/templates/theme1/login.html index 7ffd3c7..5840e14 100755 --- a/app/templates/theme1/login.html +++ b/app/templates/theme1/login.html @@ -1,5 +1,5 @@ - + Adianti ERP Template diff --git a/app/templates/theme2/layout.html b/app/templates/theme2/layout.html index 4d590a0..28f45c3 100755 --- a/app/templates/theme2/layout.html +++ b/app/templates/theme2/layout.html @@ -1,19 +1,19 @@ - - - - - - - - - Adianti Framework ERP Template II + + + + + + + + + Adianti Framework ERP Template II {LIBRARIES} {HEAD} - - - + + + - - -
- - + +
+
+
- -
- - + + + + \ No newline at end of file diff --git a/app/templates/theme2/login.html b/app/templates/theme2/login.html index 5082e4b..b8dba0b 100755 --- a/app/templates/theme2/login.html +++ b/app/templates/theme2/login.html @@ -1,19 +1,19 @@ - + Adianti Framework ERP Template II - - {LIBRARIES} - {HEAD} - + + {LIBRARIES} + {HEAD} + - +
@@ -32,9 +32,9 @@
-
-
-
+
+
+
[public view]
diff --git a/app/templates/theme3/layout.html b/app/templates/theme3/layout.html index f2e29bd..3baa7b5 100755 --- a/app/templates/theme3/layout.html +++ b/app/templates/theme3/layout.html @@ -1,5 +1,5 @@ - + diff --git a/app/templates/theme3/login.html b/app/templates/theme3/login.html index 46541d7..1cab95e 100755 --- a/app/templates/theme3/login.html +++ b/app/templates/theme3/login.html @@ -1,5 +1,5 @@ - + diff --git a/app/templates/theme4/layout.html b/app/templates/theme4/layout.html index a30cdd5..d99af75 100755 --- a/app/templates/theme4/layout.html +++ b/app/templates/theme4/layout.html @@ -1,5 +1,5 @@ - + diff --git a/app/templates/theme4/login.html b/app/templates/theme4/login.html index dd7d7a7..5fe98dd 100755 --- a/app/templates/theme4/login.html +++ b/app/templates/theme4/login.html @@ -1,5 +1,5 @@ - + diff --git a/composer.json b/composer.json index cf11930..0f48bb7 100755 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "require": { - "dvi/adianti_base": "1.1.1", + "dvi/adianti_base": "1.1.2", "dvi/adianti_extensions": "1.2.2", - "dvi/adianti_components": "1.3.1", + "dvi/adianti_components": "1.3.5", "phpmailer/phpmailer": "^6.0", "tburry/pquery": "^1.1", "picqer/php-barcode-generator": "^0.2.2", diff --git a/index.php b/index.php index 3a682cd..b09ce6e 100755 --- a/index.php +++ b/index.php @@ -36,6 +36,7 @@ function dd($var) $content = str_replace('{IF-BUILDER}', '', $content); $content = ApplicationTranslator::translateTemplate($content); +$content = str_replace('{LANGUAGE}', LANG, $content); $content = str_replace('{APPNAME}', APPLICATION_NAME, $content); $content = str_replace('{LIBRARIES}', file_get_contents("app/templates/{$theme}/libraries.html"), $content); $content = str_replace('{class}', $class, $content);