refactorings, updated libraries and defined default html language

DaviMenezes · May 17, 2018 · 1925fa2 · 1925fa2
1 parent efc62cc
commit 1925fa2
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 84 deletions.
diff --git a/app/templates/theme1/layout.html b/app/templates/theme1/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{LANGUAGE}">
 <head>
     <title>Adianti ERP Template</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

diff --git a/app/templates/theme1/login.html b/app/templates/theme1/login.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{LANGUAGE}">
 <head>
     <title>Adianti ERP Template</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

diff --git a/app/templates/theme2/layout.html b/app/templates/theme2/layout.html
@@ -1,19 +1,19 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="">
-        <meta name="author" content="">
-
-        <title>Adianti Framework ERP Template II</title>
+<!DOCTYPE html>
+<html lang="{LANGUAGE}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <title>Adianti Framework ERP Template II</title>
 
         {LIBRARIES}
         {HEAD}
 
-        <link href="app/templates/{template}/metisMenu/metisMenu.css" rel="stylesheet">
-        <link href="app/templates/{template}/sb-admin-2.css" rel="stylesheet">
-        <script src="app/templates/{template}/metisMenu/metisMenu.js"></script>
+        <link href="app/templates/{template}/metisMenu/metisMenu.css" rel="stylesheet">
+        <link href="app/templates/{template}/sb-admin-2.css" rel="stylesheet">
+        <script src="app/templates/{template}/metisMenu/metisMenu.js"></script>
         <script src="app/templates/{template}/sb-admin-2.js"></script>
 
         <script type="text/javascript">
@@ -59,77 +59,77 @@
             // setInterval( update_notifications_menu, 5000);
         });
         </script>
-    </head>
-    <body>
-        <div id="wrapper">
-            <!-- Navigation -->
-            <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-                <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
+    </head>
+    <body>
+        <div id="wrapper">
+            <!-- Navigation -->
+            <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
                     <a class="navbar-brand" href="http://www.adianti.com.br/framework">Adianti Framework ERP Template II</a>
-                    <div class="navbar-nav"></div>
+                    <div class="navbar-nav"></div>
                 </div>
-
-                <!-- /.navbar-header -->
-
+
+                <!-- /.navbar-header -->
+
                 <ul class="nav navbar-top-links navbar-right">
-                    <li class="dropdown" id="envelope_messages">
-                        <!-- /.dropdown-messages -->
+                    <li class="dropdown" id="envelope_messages">
+                        <!-- /.dropdown-messages -->
                     </li>
 
-                    <li class="dropdown" id="envelope_notifications">
-                        <!-- /.dropdown-messages -->
+                    <li class="dropdown" id="envelope_notifications">
+                        <!-- /.dropdown-messages -->
                     </li>
 
-                    <li class="dropdown notifications-menu" id="support">
+                    <li class="dropdown notifications-menu" id="support">
                       <a generator="adianti" href="index.php?class=SystemSupportForm">
                           <i class="fa fa-life-ring fa-fw"></i>
-                      </a>
+                      </a>
                     </li>
 
-                    <!-- /.dropdown -->
-                    <li class="dropdown">
-                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-user fa-fw"></i>  <i class="fa fa-caret-down"></i>
-                        </a>
+                    <!-- /.dropdown -->
+                    <li class="dropdown">
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <i class="fa fa-user fa-fw"></i>  <i class="fa fa-caret-down"></i>
+                        </a>
                         <ul class="dropdown-menu dropdown-user">
-        				        <li role="presentation" class="dropdown-header">{username}</li>
+        				        <li role="presentation" class="dropdown-header">{username}</li>
                             <li><a href="index.php?class=SystemProfileView"><i class="fa fa-user fa-fw"></i> Perfil </a></li>
-                            <li><a href="index.php?class=LoginForm&method=reloadPermissions&static=1"><i class="fa fa-refresh fa-fw"></i> Recarregar </a></li>
-                            <li class="divider"></li>
-                            <li><a generator="adianti" href="index.php?class=LoginForm&method=onLogout&static=1"><i class="fa fa-sign-out fa-fw"></i> Sair </a>
-                            </li>
-                        </ul>
-                        <!-- /.dropdown-user -->
-                    </li>
-                    <!-- /.dropdown -->
-                </ul>
-                <!-- /.navbar-top-links -->
-
-                <div class="navbar-default sidebar" role="navigation">
-                    <div class="sidebar-nav navbar-collapse">
+                            <li><a href="index.php?class=LoginForm&method=reloadPermissions&static=1"><i class="fa fa-refresh fa-fw"></i> Recarregar </a></li>
+                            <li class="divider"></li>
+                            <li><a generator="adianti" href="index.php?class=LoginForm&method=onLogout&static=1"><i class="fa fa-sign-out fa-fw"></i> Sair </a>
+                            </li>
+                        </ul>
+                        <!-- /.dropdown-user -->
+                    </li>
+                    <!-- /.dropdown -->
+                </ul>
+                <!-- /.navbar-top-links -->
+
+                <div class="navbar-default sidebar" role="navigation">
+                    <div class="sidebar-nav navbar-collapse">
 
                     {MENU}
-
-                    </div>
-                    <!-- /.sidebar-collapse -->
-                </div>
-                <!-- /.navbar-static-side -->
-            </nav>
-
-            <div id="page-wrapper" style="padding-top: 20px">
-                <div id="adianti_div_content"></div>
-            </div>
+
+                    </div>
+                    <!-- /.sidebar-collapse -->
+                </div>
+                <!-- /.navbar-static-side -->
+            </nav>
+
+            <div id="page-wrapper" style="padding-top: 20px">
+                <div id="adianti_div_content"></div>
+            </div>
             <!-- /#page-wrapper -->
             <div id="adianti_online_content"></div>
             <div id="adianti_online_content2"></div>
-
-        </div>
-        <!-- /#wrapper -->
-    </body>
+
+        </div>
+        <!-- /#wrapper -->
+    </body>
 </html>
diff --git a/app/templates/theme2/login.html b/app/templates/theme2/login.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{LANGUAGE}">
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="">
         <meta name="author" content="">
         <title>Adianti Framework ERP Template II</title>
-
-        {LIBRARIES}
-        {HEAD}
-
+
+        {LIBRARIES}
+        {HEAD}
+
         <link href="app/templates/{template}/metisMenu/metisMenu.css" rel="stylesheet">
         <link href="app/templates/{template}/sb-admin-2.css" rel="stylesheet">
         <script src="app/templates/{template}/metisMenu/metisMenu.js"></script>
-        <script src="app/templates/{template}/sb-admin-2.js"></script>
+        <script src="app/templates/{template}/sb-admin-2.js"></script>
     </head>
     <body>
         <div id="wrapper">
@@ -32,9 +32,9 @@
             </nav>
 
             <div id="adianti_div_content"></div>
-            <div id="adianti_online_content"></div>
-            <div id="adianti_online_content2"></div>
-        </div>
+            <div id="adianti_online_content"></div>
+            <div id="adianti_online_content2"></div>
+        </div>
         <div style="text-align:center"><a href="index.php?class=PublicView">[public view]</a></div>
         <!-- /#wrapper -->
     </body>

diff --git a/app/templates/theme3/layout.html b/app/templates/theme3/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{LANGUAGE}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

diff --git a/app/templates/theme3/login.html b/app/templates/theme3/login.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{LANGUAGE}">
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/app/templates/theme4/layout.html b/app/templates/theme4/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{LANGUAGE}">
 <head>
     <meta charset="UTF-8">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">

diff --git a/app/templates/theme4/login.html b/app/templates/theme4/login.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{LANGUAGE}">
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git 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
@@ -36,6 +36,7 @@ function dd($var)
 $content = str_replace('{IF-BUILDER}', '<!--', $content);
 $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);