From 432ffe3eeb2ac17a63cc5a8dae55d2ad79960df9 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 4 May 2015 19:51:00 +0000
Subject: [PATCH] Texto de mensagem e cor para versão 7.0

---
 .project             | 10 +++++-----
 admin/html/admin.css |  2 +-
 datadownload.htm     |  4 ++--
 guia_de_migracao.txt |  4 ++++
 init/index.php       |  6 +++---
 ogc.htm              |  4 ++--
 versao.php           | 10 +++++-----
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.project b/.project
index 57f27a6..d600c61 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>i3Geo 6.0</name>
+	<name>i3Geo 7.0</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -27,7 +27,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1428952996735</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -36,7 +36,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1428952996736</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -45,7 +45,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1428952996777</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -54,7 +54,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1428952996779</id>
+			<id>0</id>
 			<name></name>
 			<type>14</type>
 			<matcher>
diff --git a/admin/html/admin.css b/admin/html/admin.css
index 1e09101..4c28260 100644
--- a/admin/html/admin.css
+++ b/admin/html/admin.css
@@ -240,7 +240,7 @@ select{
 	height: 25px;
 	width: 100%;
 	text-align: left;
-	background-color: #990000;
+	background-color:  #4682b4;
 }
 
 .fundoPonto {
diff --git a/datadownload.htm b/datadownload.htm
index f65afdc..a813caf 100644
--- a/datadownload.htm
+++ b/datadownload.htm
@@ -98,7 +98,7 @@ A:hover {
 }
 
 .borda {
-	background-color: #990000;
+	background-color:  #4682b4;
 	padding: 5px 0px 5px 0px;
 	text-align: left;
 	width: 100%;
@@ -109,7 +109,7 @@ A:hover {
 	<div class="borda">
 		<div id="bandeiras"></div>
 		<div style="text-align: center">
-			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;"> <b>i3Geo 6.0</b>
+			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;"> <b>Download</b>
 			</a>
 		</div>
 	</div>
diff --git a/guia_de_migracao.txt b/guia_de_migracao.txt
index 602bc6f..99a05ed 100644
--- a/guia_de_migracao.txt
+++ b/guia_de_migracao.txt
@@ -1,6 +1,10 @@
 GUIA DE UPDATES e UPGRADES
 
 -------------------------------------------------------------------------------------------------
+Para a versão 7.0
+
+
+-------------------------------------------------------------------------------------------------
 Para a versão 6.0
 
 
diff --git a/init/index.php b/init/index.php
index 26af6a2..f1fbdf4 100755
--- a/init/index.php
+++ b/init/index.php
@@ -58,7 +58,7 @@ include("dicionario.js");
 include("../classesjs/compactados/dicionario_compacto.js");
 include("../classesjs/compactados/classe_util_compacto.js");
 include("../classesjs/compactados/classe_idioma_compacto.js");
-
+include("../versao.php");
 include("index.js");
 if($i3geomaster[0]["usuario"] == "admin" && $i3geomaster[0]["senha"] == "admin" ){
 	echo "men = $"."trad(19,g_traducao_init);";
@@ -163,7 +163,7 @@ A:hover {
 }
 
 .borda {
-	background-color: #990000;
+	background-color:  #4682b4;
 	padding: 5px 0px 5px 0px;
 	text-align: left;
 	width: 100%;
@@ -175,7 +175,7 @@ A:hover {
 		<div id="bandeiras"></div>
 		<div style="text-align:center">
 			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;">
-				<b>i3Geo 6.0</b>
+				<b><?php echo $mensagemInicia;?></b>
 			</a>
 		</div>
 	</div>
diff --git a/ogc.htm b/ogc.htm
index 4da5721..18a9ee4 100644
--- a/ogc.htm
+++ b/ogc.htm
@@ -98,7 +98,7 @@ A:hover {
 }
 
 .borda {
-	background-color: #990000;
+	background-color:  #4682b4;
 	padding: 5px 0px 5px 0px;
 	text-align: left;
 	width: 100%;
@@ -111,7 +111,7 @@ A:hover {
 		<div id="bandeiras"></div>
 		<div style="text-align: center">
 			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;">
-				<b>i3Geo 6.0</b>
+				<b>OGC</b>
 			</a>
 		</div>
 	</div>
diff --git a/versao.php b/versao.php
index 750f148..b20901b 100644
--- a/versao.php
+++ b/versao.php
@@ -4,10 +4,10 @@ Utilizado como um include em ms_configura.php
 */
 /**
  * TODO Verificar ao fechar versao
- * v6 numero da versao esta correto?
- * v6 guia de instalacao esta correto?
- * v6 guia de migracao esta correto?
- * v6 gerar repositorio no SVN com o nome i3geo6
+ * v7 numero da versao esta correto?
+ * v7 guia de instalacao esta correto?
+ * v7 guia de migracao esta correto?
+ * v7 gerar repositorio no SVN com o nome i3geo6
  */
-$mensagemInicia = 'Vers&atilde;o 6.0 Beta';
+$mensagemInicia = 'Vers&atilde;o 7.0 (beta)';
 ?>
--
libgit2 0.21.2