Alterações na página inicial

Edmar Moretti
1 parent 05c2e901
Showing 3 changed files with 95 additions and 79 deletions Show diff stats
init/dicionario.js
init/index.js
init/nindex.php
+//veja em index.js o objeto que utiliza essa traducao
 g_traducao_init =
 	{
 		1 : [
@@ -14,6 +15,13 @@ g_traducao_init =
 				es : "Test de instalaci&oacute;n"
 			}
 		],
+		"2a" : [
+				{
+					pt : "Verifica se a instala&ccedil;&atilde;o est&aacute; correta. Mostra algumas informa&ccedil;&otilde;es b&aacute;sicas sobre o servidor e as configura&ccedil;&otilde;es do software.",
+					en : "",
+					es : ""
+				}
+			],
 		3 : [
 			{
 				pt : "Sistema de administra&ccedil;&atilde;o",
@@ -5,181 +5,182 @@ botoesIni = [
 	"titulo":$trad(4,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": true
+	"_target": "_blank"
 },{
 	"img":"osm.png",
 	"href":"../<?php echo $customDir; ?>/black_osm.htm",
 	"titulo":$trad(23,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": true
+	"_target": "_blank"
 },{
 	"img":"mashup.png",
 	"href":"../mashups",
 	"titulo":$trad(18,g_traducao_init) + "<br><a href='../mashups/osm.php?temas=&largura=800&altura=500' target=_blank >OSM</a>" + " - <a href='../mashups/openlayers.php?temas=&largura=800&altura=500' target=_blank >OpenLayers</a>",
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"googlemaps.png",
 	"href":"../<?php echo $customDir; ?>/black_gm.phtml",
 	"titulo":$trad(6,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": true
+	"_target": "_blank"
 },{
 	"img":"googlemaps_noite.png",
 	"href":"../<?php echo $customDir; ?>/googlemaps_noite.phtml",
 	"titulo":$trad(22,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": false
+	"_target": "_blank"
 },{
 	"img":"googleearth.png",
 	"href":"../<?php echo $customDir; ?>/googleearth.phtml",
 	"titulo":$trad(7,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": false
+	"_target": "_blank"
 },{
 	"img":"cartogramas.png",
 	"href":"../<?php echo $customDir; ?>/black_carto_ol.htm",
 	"titulo":$trad(8,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": false
+	"_target": "_blank"
 },{
 	"img":"editor.png",
 	"href":"../ferramentas/metaestat/editorlimites.php",
 	"titulo":$trad(9,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": false
+	"_target": "_blank"
 },{
 	"img":"window-duplicate.png",
 	"href":"../ferramentas/salvamapa/lista.htm",
 	"titulo":$trad(34,g_traducao_init),
 	"subtitulo": "",
 	"fa": "list",
-	"atalho": true
+	"_target": "_self"
 },{
 	"img":"svn-update.png",
 	"href":"../datadownload.htm",
 	"titulo":$trad(10,g_traducao_init),
 	"subtitulo": "",
 	"fa": "download",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"ogc_logo.jpg",
 	"href":"../ogc.htm",
 	"titulo":$trad(11,g_traducao_init),
 	"subtitulo": "",
 	"fa": "download",
-	"atalho": true
+	"_target": "_self"
 },{
 	"img":"application-vnd-google-earth-kml.png",
 	"href":"../kml.php",
 	"titulo":$trad(12,g_traducao_init),
 	"subtitulo": "",
 	"fa": "download",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"../imagens/saiku_free_small.png",
 	"href":"../ferramentas/saiku/esquemaxml.php?locaplic="+window.location.href.replace("/init/index.php",""),
 	"titulo":$trad(25,g_traducao_init),
 	"subtitulo": " <a style='cursor:pointer;' target=_blank src='https://medium.com/innovative-business-intelligence/so-people-who-land-on-our-community-download-page-will-notice-a-subtle-difference-when-they-click-1b61aca316c5' >"+$trad(29,g_traducao_init)+"</a>",
 	"fa": "bar-chart",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"insert-link.png",
 	"href":"../geradordelinks.htm",
 	"titulo":$trad(13,g_traducao_init),
 	"subtitulo": "",
 	"fa": "link",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"openlayersdebug.png",
 	"href":"../<?php echo $customDir; ?>/openlayersdebug.htm",
 	"titulo":$trad(5,g_traducao_init),
 	"subtitulo": "",
 	"fa": "map-o",
-	"atalho": true
+	"_target": "_blank"
 },{
 	"img":"certificate-server.png",
 	"href":"../testainstal.php",
 	"titulo":$trad(2,g_traducao_init),
-	"subtitulo": "Verifica se a instalação do i3Geo está correta e mostra algumas das características do servidor, como as versões dos softwares básicos instalados.",
+	"subtitulo": $trad("2a",g_traducao_init),
 	"fa": "check",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"applications-development-web.png",
 	"href":"../admin",
 	"titulo":$trad(3,g_traducao_init),
 	"subtitulo": "",
 	"fa": "cogs",
-	"atalho": true
+	"_target": "_self"
 },{
 	"img":"folder-image.png",
 	"href":"../exemplos",
 	"titulo":$trad(14,g_traducao_init),
 	"subtitulo": "",
 	"fa": "graduation-cap",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"applications-development.png",
 	"href":"../pacotes/utils/index.php",
 	"titulo":$trad(33,g_traducao_init),
 	"subtitulo": "",
-	"fa": "wrench"
+	"fa": "wrench",
+	"_target": "_self"
 },{
 	"img":"guiamigracao.png",
 	"href":"../guia_de_migracao.txt",
 	"titulo":$trad(17,g_traducao_init),
 	"subtitulo": "",
 	"fa": "book",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"docapi.png",
 	"href":"../documentacao",
 	"titulo":$trad(24,g_traducao_init),
 	"subtitulo": "",
 	"fa": "book",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"gvsigtraining.png",
 	"href":"http://moodle.gvsig-training.com/course/view.php?id=11",
 	"titulo":$trad(28,g_traducao_init),
 	"subtitulo": "",
 	"fa": "book",
-	"atalho": true
+	"_target": "_self"
 },{
 	"img":"tools-report-bug.png",
 	"href":"https://softwarepublico.gov.br/gitlab/i3geo/i3geo/issues",
 	"titulo":$trad(16,g_traducao_init),
 	"subtitulo": "",
 	"fa": "bug",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"../imagens/apple-touch-icon.png",
 	"href":"https://softwarepublico.gov.br/gitlab/groups/i3geo",
 	"titulo":$trad(30,g_traducao_init),
 	"subtitulo": "",
 	"fa": "group",
-	"atalho": true
+	"_target": "_self"
 },{
 	"img":"logo_psp.png",
 	"href":"https://portal.softwarepublico.gov.br/social/i3geo/",
 	"titulo":$trad(31,g_traducao_init),
 	"subtitulo": "",
 	"fa": "group",
-	"atalho": false
+	"_target": "_self"
 },{
 	"img":"mailman.jpg",
 	"href":"http://lists.osgeo.org/cgi-bin/mailman/listinfo/i3geo",
 	"titulo":$trad(32,g_traducao_init),
 	"subtitulo": "",
 	"fa": "envelope",
-	"atalho": true
+	"_target": "_self"
 }
 ];
 function mostraBotoes(){
@@ -42,7 +42,7 @@ define ( &quot;ONDEI3GEO&quot;, &quot;..&quot; );
 <head>
 	<?php include "head.php"; ?>
 <style>
- #brasil {
+#brasil {
 	background-image: url("../imagens/sprite.png");
 	background-position: 0 -600px;
 	background-repeat: no-repeat;
@@ -78,17 +78,17 @@ define ( &quot;ONDEI3GEO&quot;, &quot;..&quot; );
 	text-align: left;
 }
 </style>
-	<script src='../classesjs/compactados/dicionario_compacto.js'></script>
-	<script src='../classesjs/compactados/classe_util_compacto.js'></script>
-	<script src='../classesjs/compactados/classe_idioma_compacto.js'></script>
-	<script src='../classesjs/compactados/mustache.js'></script>
-	<script src='dicionario.js'></script>
- </head>
+<script src='../classesjs/compactados/dicionario_compacto.js'></script>
+<script src='../classesjs/compactados/classe_util_compacto.js'></script>
+<script src='../classesjs/compactados/classe_idioma_compacto.js'></script>
+<script src='../classesjs/compactados/mustache.js'></script>
+<script src='dicionario.js'></script>
+</head>
 <body style="background-color: #eeeeee; padding-top: 80px;">
 	<nav class="navbar navbar-fixed-top navbar-inverse">
-		<div class="container">
+		<div class="container-fluid">
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
 					<span class="sr-only"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
@@ -100,7 +100,7 @@ define ( &quot;ONDEI3GEO&quot;, &quot;..&quot; );
 					<li><a href="#"><div class="fa" id="bandeiras"></div></a></li>
 				</ul>
 				<!-- template para permitir a traducao -->
-				<div id="menuTpl" >
+				<div id="menuTpl">
 					<ul class="nav navbar-nav">
 						<li><a href="#map-o">{{{mapas}}}</a></li>
 					</ul>
@@ -123,60 +123,67 @@ define ( &quot;ONDEI3GEO&quot;, &quot;..&quot; );
 			</div>
 		</div>
 	</nav>
-	<div class="container">
-		<div class="row" >
-			<div class="col-sm-12" id="mensagemLogin">
-			</div>
+	<div class="container-fluid">
+		<div class="row">
+			<div class="col-sm-12" id="mensagemLogin"></div>
 			<div class="col-sm-12">
-				<div class="jumbotron" id="jumbotron">
-				</div>
+				<div class="jumbotron" id="jumbotron"></div>
 			</div>
-				<!-- Template para criacao dos quadros ver index.js -->
-				<div id="botoesTpl">
-					<div id="{{{fa}}}" class="col-sm-12" style="width:260px;min-width:260px;max-width:260px;">
-						<div class="panel panel-default">
-							<div class="panel-body" style="height: 250px;">
-								<div class="thumbnail" style="height:90px;">
-									<img class="img-rounded" style="height: 100%; width: 100%" src="imagens/{{{img}}}" />
-								</div>
-								<h4>{{{titulo}}}</h4>
-								<div style="overflow:auto;height:200px;">
-									<p>{{{subtitulo}}}</p>
-								</div>
+		</div>
+	</div>
+	<div class="container">
+		<div class="row">
+			<!-- Template para criacao dos quadros ver index.js -->
+			<div id="botoesTpl" class="hidden" >
+				<div id="{{{fa}}}" class="col-sm-12" style="width: 260px; min-width: 260px; max-width: 260px;">
+					<div class="panel panel-default">
+						<div class="panel-body" style="height: 250px;">
+							<div class="thumbnail" style="height: 90px;">
+								<img class="img-rounded" style="height: 100%; width: 100%" src="imagens/{{{img}}}" />
 							</div>
-							<div class="panel-footer text-right" style="border:0px;background-color:white;">
-								<p>
-									<a class="btn btn-primary btn-raised" href="{{{href}}}" role="button" target="_blank" >
-									{{{abrir}}} <i class="fa fa-{{{fa}}}" aria-hidden="true" ></i>
-									</a>
-								</p>
+							<h4>{{{titulo}}}</h4>
+							<div style="overflow: auto; height: 200px;">
+								<h5>{{{subtitulo}}}</h5>
 							</div>
 						</div>
+						<div class="panel-footer text-right" style="border: 0px; background-color: white;">
+							<p>
+								<a class="btn btn-primary btn-raised" href="{{{href}}}" role="button" target="{{{target}}}"> {{{abrir}}} <i class="fa fa-{{{fa}}}" aria-hidden="true"></i>
+								</a>
+							</p>
+						</div>
 					</div>
 				</div>
-			<div class="col-sm-12 hidden" id="tt" style="width:260px;">
-				<div class="panel panel-default" >
+			</div>
+			<div class="col-sm-12 hidden" id="tt" style="width: 260px; min-width: 260px; max-width: 260px;">
+				<div class="panel panel-default">
 					<div class="panel-body">
 						<a class="twitter-timeline" href="https://twitter.com/i3geo" data-widget-id="288061915689787392" height="300">Tweets @i3Geo</a>
 					</div>
 				</div>
 			</div>
-			<div class="col-sm-12 hidden" style="width:260px;">
-				<div class="panel panel-default" >
+			<div class="col-sm-12 hidden" style="width: 260px; min-width: 260px; max-width: 260px;">
+				<div class="panel panel-default">
 					<div class="panel-body">
 						<a class="twitter-timeline" href="https://twitter.com/hashtag/i3geo" data-widget-id="643417277208133633" height="300">i3geo Tweets</a>
 					</div>
 				</div>
 			</div>
 		</div>
+		<div class="row">
+			<div class="col-sm-12">
+				<script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_basic_stats.js"></script>
+			</div>
+		</div>
-		<hr>
+		<hr/>
-		<footer class="text-center" >
-			<div class="row hidden" >
+		<footer class="text-center">
+			<div class="row hidden">
 				<div class="col-sm-6"
+
 					<a rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" target="_blank"><img alt="Licen&ccedil;a Creative Commons" style="border-width: 0" src="https://i.creativecommons.org/l/GPL/2.0/88x62.png" /></a><br />O i3Geo est&aacute; licenciado com uma Licen&ccedil;a <a
-					rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" target="_blank">Creative Commons - Licen&ccedil;a P&uacute;blica Geral GNU (&#34;GNU General Public License&#34;)</a>
+						rel="license" href="http://creativecommons.org/licenses/GPL/2.0/legalcode.pt" target="_blank">Creative Commons - Licen&ccedil;a P&uacute;blica Geral GNU (&#34;GNU General Public License&#34;)</a>
 				</div>
 				<div class="col-sm-6">
 					<script type='text/javascript' src='https://www.openhub.net/p/i3geo/widgets/project_users?format=js&style=blue'></script>
@@ -187,22 +194,22 @@ define ( &quot;ONDEI3GEO&quot;, &quot;..&quot; );
 	</div>
     <?php
-    echo "<script>";
-    include "index.js";
-    echo "</script>";
-    include "body.php";
-    ?>
+				echo "<script>";
+				include "index.js";
+				echo "</script>";
+				include "body.php";
+				?>
     <script>
     $(document).ready(function(){
 		var template = '<div class="col-sm-12" style="width:260px;min-width:260px;max-width:260px;"><div class="panel panel-default"><div class="panel-body" style="height: 250px;"><div class="thumbnail" style="height:90px;"><img class="img-rounded" style="height: 100%; width: 100%" src="imagens/{{{img}}}" /></div><h4>{{{titulo}}}</h4><div style="overflow:auto;height:200px;"><p>{{{subtitulo}}}</p></div></div><div class="panel-footer text-right" style="border:0px;background-color:white;"><p><a class="btn btn-primary btn-raised" href="{{{href}}}" role="button" target="_blank" >Abrir <i class="fa fa-{{{fa}}}" aria-hidden="true" ></i></a></p></div></div></div>';
     	<?php
-		if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
-			echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
-		} else {
-			echo "var men = '';";
-		}
-		?>
+					if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
+						echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
+					} else {
+						echo "var men = '';";
+					}
+					?>
     	mostraBotoesBT(men);
     	$('.hidden').removeClass('hidden');
     	//carrega o TT