From 2c3c471b4eeb0a514b8d8ba1cbee71356eda46d8 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sun, 17 Jul 2016 14:28:18 -0300
Subject: [PATCH] Otimização do carregamento de jasvascript

---
 admin/admin.db    | Bin 340992 -> 0 bytes
 admin1/head.php   | 47 ++++++++++-------------------------------------
 admin1/headjs.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 init/head.php     | 21 ++-------------------
 init/headjs.php   | 20 ++++++++++++++++++++
 5 files changed, 79 insertions(+), 56 deletions(-)
 create mode 100644 admin1/headjs.php
 create mode 100644 init/headjs.php
diff --git a/admin/admin.db b/admin/admin.db
index 9eb288a..c7f335d 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/head.php b/admin1/head.php
index 0f87b4d..00caa95 100755
--- a/admin1/head.php
+++ b/admin1/head.php
@@ -1,60 +1,33 @@
 <!DOCTYPE html>
 <html lang="pt-br">
 <head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+<META HTTP-EQUIV="Content-Type">
+<meta charset='utf-8'>
+<meta http-equiv='X-UA-Compatible' content='IE=edge'>
+<meta name='viewport' content='width=device-width, initial-scale=1'>
+<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+<meta name='description' content='Interface Integrada para Internet de ferramentas de geoprocessamento'>
+<meta name='author' content='i3Geo'>
+<title>i3Geo</title>
 <?php
 // utilizado para o cabecalho das paginas que nao sao mapas e que usam bootstrap com material design
 echo "
-	<meta charset='utf-8'>
-    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
-    <meta name='viewport' content='width=device-width, initial-scale=1'>
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <meta name='description' content='Interface Integrada para Internet de ferramentas de geoprocessamento'>
-    <meta name='author' content='i3Geo'>
     <link rel='icon' href='" . ONDEI3GEO . "/favicon.ico'>
-    <title>i3Geo</title>
 	<link rel='stylesheet' type='text/css' href='" . ONDEI3GEO . "/pacotes/jquery/jquery-ui/jquery-ui.min.css'>
     <!-- Material Design fonts -->
     <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/css?family=Roboto:300,400,500,700'>
     <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/icon?family=Material+Icons'>
-
     <!-- Bootstrap core CSS -->
     <link href='" . ONDEI3GEO . "/pacotes/bootstrap/css/bootstrap.min.css' rel='stylesheet'>
     <!-- Bootstrap Material Design -->
     <link rel='stylesheet' type='text/css' href='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/css/bootstrap-material-design.min.css'>
     <link rel='stylesheet' type='text/css' href='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/css/ripples.min.css'>
-
-
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <link href='" . ONDEI3GEO . "/pacotes/bootstrap/css/ie10-viewport-bug-workaround.css' rel='stylesheet'>
-
     <!-- Custom styles for this template -->
-
     <link href='" . ONDEI3GEO . "/pacotes/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
 
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src='https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js'></script>
-      <script src='https://oss.maxcdn.com/respond/1.4.2/respond.min.js'></script>
-    <![endif]-->
-     <script src='" . ONDEI3GEO . "/pacotes/jquery/dist/jquery.min.js'></script>
-     <script src='" . ONDEI3GEO . "/pacotes/jquery/jquery-ui/jquery-ui.min.js'></script>
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap/js/bootstrap.min.js'></script>
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap/js/ie10-viewport-bug-workaround.js'></script>
-
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/js/material.min.js'></script>
-	<script src='" . ONDEI3GEO . "/pacotes/cpaint/cpaint2_compacto.inc.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/dicionario_compacto.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/classe_util_compacto.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/classe_idioma_compacto.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/classe_login_compacto.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/classe_php_compacto.js'></script>
-	<script src='" . ONDEI3GEO . "/classesjs/compactados/mustache.js'></script>
-	<script src='" . ONDEI3GEO . "/admin1/head.js'></script>
-	<script src='" . ONDEI3GEO . "/admin1/js/core.js'></script>
-	<script src='" . ONDEI3GEO . "/admin1/dicionario/core.js'></script>
-	<script src='" . ONDEI3GEO . "/admin1/dicionario/menup.js'></script>
+    <script src='". ONDEI3GEO . "/admin1/headjs.php'></script>
 ";
 ?>
 <script>
@@ -104,7 +77,7 @@ hr {
 }
 
 body {
-	background-color: #fff;
+	background-color: background-color: rgb(240,240,250);;
 }
 
 .marginBottom-0 {
diff --git a/admin1/headjs.php b/admin1/headjs.php
new file mode 100644
index 0000000..4f61c67
--- /dev/null
+++ b/admin1/headjs.php
@@ -0,0 +1,47 @@
+<?php
+define ( ONDEI3GEO, dirname ( dirname ( __FILE__ ) ) );
+if (extension_loaded ( 'zlib' )) {
+	ob_start ( 'ob_gzhandler' );
+}
+header ( "Content-type: text/javascript" );
+
+include (ONDEI3GEO . "/pacotes/jquery/dist/jquery.min.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/jquery/jquery-ui/jquery-ui.min.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/bootstrap/js/bootstrap.min.js");
+echo "\n";
+// IE10 viewport hack for Surface/desktop Windows 8 bug //
+include (ONDEI3GEO . "/pacotes/bootstrap/js/ie10-viewport-bug-workaround.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/js/material.min.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/cpaint/cpaint2_compacto.inc.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/dicionario_compacto.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/classe_util_compacto.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/classe_idioma_compacto.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/classe_login_compacto.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/classe_php_compacto.js");
+echo "\n";
+include (ONDEI3GEO . "/classesjs/compactados/mustache.js");
+echo "\n";
+include (ONDEI3GEO . "/admin1/head.js");
+echo "\n";
+include (ONDEI3GEO . "/admin1/js/core.js");
+echo "\n";
+include (ONDEI3GEO . "/admin1/dicionario/core.js");
+echo "\n";
+include (ONDEI3GEO . "/admin1/dicionario/menup.js");
+echo "\n";
+include (ONDEI3GEO . "/admin1/dicionario.js");
+echo "\n";
+
+if (extension_loaded ( 'zlib' )) {
+	ob_end_flush ();
+}
+?>
\ No newline at end of file
diff --git a/init/head.php b/init/head.php
index dcb4dd0..a4f7640 100755
--- a/init/head.php
+++ b/init/head.php
@@ -13,37 +13,20 @@ echo "
     <meta name='author' content='i3Geo'>
     <link rel='icon' href='" . ONDEI3GEO . "/favicon.ico'>
     <title>i3Geo</title>
-
     <!-- Material Design fonts -->
     <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/css?family=Roboto:300,400,500,700'>
     <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/icon?family=Material+Icons'>
-
     <!-- Bootstrap core CSS -->
     <link href='" . ONDEI3GEO . "/pacotes/bootstrap/css/bootstrap.min.css' rel='stylesheet'>
-
     <!-- Bootstrap Material Design -->
     <link rel='stylesheet' type='text/css' href='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/css/bootstrap-material-design.min.css'>
     <link rel='stylesheet' type='text/css' href='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/css/ripples.min.css'>
-
-
     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
     <link href='" . ONDEI3GEO . "/pacotes/bootstrap/css/ie10-viewport-bug-workaround.css' rel='stylesheet'>
-
     <!-- Custom styles for this template -->
-
     <link href='" . ONDEI3GEO . "/pacotes/font-awesome/css/font-awesome.min.css' rel='stylesheet'>
 
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src='https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js'></script>
-      <script src='https://oss.maxcdn.com/respond/1.4.2/respond.min.js'></script>
-    <![endif]-->
-     <script src='" . ONDEI3GEO . "/pacotes/jquery/dist/jquery.min.js'></script>
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap/js/bootstrap.min.js'></script>
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap/js/ie10-viewport-bug-workaround.js'></script>
-    <script src='" . ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/js/material.min.js'></script>
-";
+    <script src='" . ONDEI3GEO . "/init/headjs.php'></script>";
 ?>
 <style>
 #brasil {
@@ -119,7 +102,7 @@ hr {
     width: 40px;
 }
 body{
-	background-color: #fff;
+	background-color: rgb(240,240,240);
 }
 </style>
 </head>
diff --git a/init/headjs.php b/init/headjs.php
new file mode 100644
index 0000000..a5bcf45
--- /dev/null
+++ b/init/headjs.php
@@ -0,0 +1,20 @@
+<?php
+define ( ONDEI3GEO, dirname ( dirname ( __FILE__ ) ) );
+if (extension_loaded ( 'zlib' )) {
+	ob_start ( 'ob_gzhandler' );
+}
+header ( "Content-type: text/javascript" );
+
+include (ONDEI3GEO . "/pacotes/jquery/dist/jquery.min.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/bootstrap/js/bootstrap.min.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/bootstrap/js/ie10-viewport-bug-workaround.js");
+echo "\n";
+include (ONDEI3GEO . "/pacotes/bootstrap-material-design/dist/js/material.min.js");
+echo "\n";
+
+if (extension_loaded ( 'zlib' )) {
+	ob_end_flush ();
+}
+?>
\ No newline at end of file
--
libgit2 0.21.2

