Commit 0f1b375b4c8ef0575a648d4e8dda99acd8791b72

Authored by Edmar Moretti
1 parent ca5cf2f6

V6 - atualização do layout das ferramentas de upload de dados

admin/html/admin.css
  1 +.subbloco{
  2 + background-color: rgb(248,248,248);
  3 + width: 95%;
  4 + padding: 5px;
  5 + margin: 7px;
  6 +}
1 .letras{ 7 .letras{
2 font-size: 1em; 8 font-size: 1em;
3 } 9 }
@@ -13,7 +19,7 @@ @@ -13,7 +19,7 @@
13 font-size:1em; 19 font-size:1em;
14 } 20 }
15 .yui-skin-sam .yui-button { 21 .yui-skin-sam .yui-button {
16 - margin: 0.25em; 22 + margin: 0.25em;
17 } 23 }
18 .ajuda_usuario 24 .ajuda_usuario
19 { 25 {
@@ -199,7 +205,7 @@ fieldset { @@ -199,7 +205,7 @@ fieldset {
199 border-radius: 5px 5px 5px 5px; 205 border-radius: 5px 5px 5px 5px;
200 box-shadow: 0 1px 3px gray; 206 box-shadow: 0 1px 3px gray;
201 background-color: rgb(250, 250, 250); 207 background-color: rgb(250, 250, 250);
202 - margin: 15px; 208 + margin: 7px;
203 } 209 }
204 210
205 .mascaraPrincipal { 211 .mascaraPrincipal {
  1 +.subbloco{
  2 + background-color: rgb(248,248,248);
  3 + width: 90%;
  4 + padding: 5px;
  5 + margin: 7px;
  6 +}
1 .i3GeoMascaraCoord { 7 .i3GeoMascaraCoord {
2 width: 100%; 8 width: 100%;
3 } 9 }
css/i3geo6.css
  1 +.subbloco{
  2 +background-color: rgb(248,248,248);
  3 +width: 90%;
  4 +padding: 5px;
  5 +margin: 7px;
  6 +}
1 .i3GeoMascaraCoord { 7 .i3GeoMascaraCoord {
2 width: 100%; 8 width: 100%;
3 } 9 }
css/i3geo6.css.php
1 -<?php error_reporting(0);if(extension_loaded('zlib')){ob_start('ob_gzhandler');} header("Content-type: text/css"); ?>.i3GeoMascaraCoord { 1 +<?php error_reporting(0);if(extension_loaded('zlib')){ob_start('ob_gzhandler');} header("Content-type: text/css"); ?>.subbloco{
  2 +background-color: rgb(248,248,248);
  3 +width: 90%;
  4 +padding: 5px;
  5 +margin: 7px;
  6 +}
  7 +.i3GeoMascaraCoord {
2 width: 100%; 8 width: 100%;
3 } 9 }
4 .i3GeoMascaraCoord td { 10 .i3GeoMascaraCoord td {
ferramentas/upload/index.js
@@ -104,16 +104,21 @@ i3GEOF.upload = { @@ -104,16 +104,21 @@ i3GEOF.upload = {
104 */ 104 */
105 html:function(){ 105 html:function(){
106 var ins = '<form id=i3GEOuploadf target="i3GEOuploadiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/upload/upload.php" method="post" ENCTYPE="multipart/form-data">' + 106 var ins = '<form id=i3GEOuploadf target="i3GEOuploadiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/upload/upload.php" method="post" ENCTYPE="multipart/form-data">' +
  107 + '<fieldset class=subbloco >' +
107 '<p class="paragrafo" >shp: <br><input type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' + 108 '<p class="paragrafo" >shp: <br><input type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
108 '<p class="paragrafo" >shx: <br><input type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' + 109 '<p class="paragrafo" >shx: <br><input type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
109 - '<p class="paragrafo" >dbf: <br><input type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>'; 110 + '<p class="paragrafo" >dbf: <br><input type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' +
  111 + '</fieldset>';
110 if(i3GEO.parametros.editor === "sim"){ 112 if(i3GEO.parametros.editor === "sim"){
111 - ins += '<p class="paragrafo" >'+$trad(1,i3GEOF.upload.dicionario)+':<br>' + 113 + ins += '<fieldset class=subbloco >' +
  114 + '<p class="paragrafo" >'+$trad(1,i3GEOF.upload.dicionario)+':<br>' +
112 '<input class=digitar type="text" size=45 name="dirDestino" id="dirDestino" style="top:0px;left:0px;cursor:pointer;">' + 115 '<input class=digitar type="text" size=45 name="dirDestino" id="dirDestino" style="top:0px;left:0px;cursor:pointer;">' +
113 "&nbsp;<img onclick='i3GEO.util.navegadorDir(\"dirDestino\",false,false,false,true);' src='"+i3GEO.configura.locaplic+"/imagens/ic_zoom.png' style='cursor:pointer;position :relative;top:2px'/></p>" + 116 "&nbsp;<img onclick='i3GEO.util.navegadorDir(\"dirDestino\",false,false,false,true);' src='"+i3GEO.configura.locaplic+"/imagens/ic_zoom.png' style='cursor:pointer;position :relative;top:2px'/></p>" +
114 - '<p class="paragrafo" ><input type=checkbox name=i3GEOuploadCriaMapfile id=i3GEOuploadCriaMapfile />&nbsp;'+$trad(10,i3GEOF.upload.dicionario); 117 + '<p class="paragrafo" ><input type=checkbox name=i3GEOuploadCriaMapfile id=i3GEOuploadCriaMapfile />&nbsp;'+$trad(10,i3GEOF.upload.dicionario) +
  118 + '</fieldset>';
115 } 119 }
116 - ins += '<p class="paragrafo" >'+$trad(2,i3GEOF.upload.dicionario)+': ' + 120 + ins += '<fieldset class=subbloco >' +
  121 + '<p class="paragrafo" >'+$trad(2,i3GEOF.upload.dicionario)+': ' +
117 ' <select id=tipo name=tipo >' + 122 ' <select id=tipo name=tipo >' +
118 ' <option value="">'+$trad(3,i3GEOF.upload.dicionario)+'</option>' + 123 ' <option value="">'+$trad(3,i3GEOF.upload.dicionario)+'</option>' +
119 ' <option value="1">'+$trad(4,i3GEOF.upload.dicionario)+'</option>' + 124 ' <option value="1">'+$trad(4,i3GEOF.upload.dicionario)+'</option>' +
@@ -123,12 +128,16 @@ i3GEOF.upload = { @@ -123,12 +128,16 @@ i3GEOF.upload = {
123 '</p>' + 128 '</p>' +
124 '<p class=paragrafo >'+$trad(7,i3GEOF.upload.dicionario)+':</p>' + 129 '<p class=paragrafo >'+$trad(7,i3GEOF.upload.dicionario)+':</p>' +
125 '<div id=i3GEOuploadListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' + 130 '<div id=i3GEOuploadListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
126 - '<br><p class="paragrafo" ><input id=i3GEOuploadbotao1 type="button" value="'+$trad(8,i3GEOF.upload.dicionario)+'" size=12 name="submit">' + 131 + '</fieldset>' +
  132 + '<fieldset class=subbloco >' +
  133 + '<p class="paragrafo" ><input id=i3GEOuploadbotao1 type="button" value="'+$trad(8,i3GEOF.upload.dicionario)+'" size=12 name="submit">' +
127 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' + 134 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
128 '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' + 135 '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
129 '</form>' + 136 '</form>' +
  137 +
130 "<p class='paragrafo' style=color:red >"+$trad(9,i3GEOF.upload.dicionario)+"</p>" + 138 "<p class='paragrafo' style=color:red >"+$trad(9,i3GEOF.upload.dicionario)+"</p>" +
131 - '<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>'; 139 + '<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
  140 + '</fieldset>';
132 return ins; 141 return ins;
133 }, 142 },
134 /* 143 /*
@@ -144,7 +153,7 @@ i3GEOF.upload = { @@ -144,7 +153,7 @@ i3GEOF.upload = {
144 }; 153 };
145 titulo = $trad("a2")+" <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=27' >&nbsp;&nbsp;&nbsp;</a>"; 154 titulo = $trad("a2")+" <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=27' >&nbsp;&nbsp;&nbsp;</a>";
146 janela = i3GEO.janela.cria( 155 janela = i3GEO.janela.cria(
147 - "355px", 156 + "400px",
148 "470px", 157 "470px",
149 "", 158 "",
150 "", 159 "",
ferramentas/uploaddbf/index.js
@@ -105,24 +105,30 @@ i3GEOF.uploaddbf = { @@ -105,24 +105,30 @@ i3GEOF.uploaddbf = {
105 */ 105 */
106 html:function(){ 106 html:function(){
107 var ins = '<form id=i3GEOuploaddbff target="i3GEOuploaddbfiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploaddbf/upload.php" method="post" ENCTYPE="multipart/form-data">' + 107 var ins = '<form id=i3GEOuploaddbff target="i3GEOuploaddbfiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploaddbf/upload.php" method="post" ENCTYPE="multipart/form-data">' +
  108 + '<fieldset class=subbloco >' +
108 '<p class="paragrafo" >'+$trad(1,i3GEOF.uploaddbf.dicionario)+': <br> '+ 109 '<p class="paragrafo" >'+$trad(1,i3GEOF.uploaddbf.dicionario)+': <br> '+
109 '<select name="i3GEOuploaddbftipoarquivo"> '+ 110 '<select name="i3GEOuploaddbftipoarquivo"> '+
110 ' <option value="dbf" select >dbf</option> '+ 111 ' <option value="dbf" select >dbf</option> '+
111 ' <option value="csvpv" >csv ";"</option> '+ 112 ' <option value="csvpv" >csv ";"</option> '+
112 ' <option value="csvv" >csv ","</option> '+ 113 ' <option value="csvv" >csv ","</option> '+
113 '</select></p> '+ 114 '</select></p> '+
114 - 115 + '</fieldset>' +
  116 + '<fieldset class=subbloco >' +
115 '<p class="paragrafo" >'+$trad(2,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomex" style="top:0px;left:0px"></p>' + 117 '<p class="paragrafo" >'+$trad(2,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomex" style="top:0px;left:0px"></p>' +
116 '<p class="paragrafo" >'+$trad(3,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomey" style="top:0px;left:0px"></p>' + 118 '<p class="paragrafo" >'+$trad(3,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomey" style="top:0px;left:0px"></p>' +
117 -  
118 - '<p class="paragrafo" >'+$trad(4,i3GEOF.uploaddbf.dicionario)+': <br><input type="file" size=18 name="i3GEOuploaddbffile" style="top:0px;left:0px;cursor:pointer;"></p>' + 119 + '<p class="paragrafo" >'+$trad(4,i3GEOF.uploaddbf.dicionario)+': <br><input type="file" size=10 name="i3GEOuploaddbffile" style="width:270px;top:0px;left:0px;cursor:pointer;"></p>' +
  120 + '</fieldset>' +
  121 + '<fieldset class=subbloco >' +
119 '<p class=paragrafo >'+$trad(5,i3GEOF.uploaddbf.dicionario)+':</p>' + 122 '<p class=paragrafo >'+$trad(5,i3GEOF.uploaddbf.dicionario)+':</p>' +
120 '<div id=i3GEOuploaddbfListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' + 123 '<div id=i3GEOuploaddbfListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
121 - '<br><p class="paragrafo" ><input id=i3GEOuploaddbfbotao1 type="button" value="'+$trad(6,i3GEOF.uploaddbf.dicionario)+'" size=12 name="submit">' + 124 + '</fieldset>' +
  125 + '<fieldset class=subbloco >' +
  126 + '<p class="paragrafo" ><input id=i3GEOuploaddbfbotao1 type="button" value="'+$trad(6,i3GEOF.uploaddbf.dicionario)+'" size=12 name="submit">' +
122 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' + 127 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
123 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' + 128 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
124 '</form>' + 129 '</form>' +
125 - '<br><iframe name=i3GEOuploaddbfiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>'; 130 + '<br><iframe name=i3GEOuploaddbfiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
  131 + '</fieldset>' ;
126 return ins; 132 return ins;
127 }, 133 },
128 /* 134 /*
@@ -166,4 +172,4 @@ i3GEOF.uploaddbf = { @@ -166,4 +172,4 @@ i3GEOF.uploaddbf = {
166 i3GEOF.uploaddbf.aguarde.visibility="visible"; 172 i3GEOF.uploaddbf.aguarde.visibility="visible";
167 $i("i3GEOuploaddbff").submit(); 173 $i("i3GEOuploaddbff").submit();
168 } 174 }
169 -};  
170 \ No newline at end of file 175 \ No newline at end of file
  176 +};
ferramentas/uploadgpx/index.js
@@ -111,15 +111,21 @@ i3GEOF.uploadgpx = { @@ -111,15 +111,21 @@ i3GEOF.uploadgpx = {
111 */ 111 */
112 html:function(){ 112 html:function(){
113 var ins = '<form id=i3GEOuploadgpxf target="i3GEOuploadgpxiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadgpx/upload.php" method="post" ENCTYPE="multipart/form-data">' + 113 var ins = '<form id=i3GEOuploadgpxf target="i3GEOuploadgpxiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadgpx/upload.php" method="post" ENCTYPE="multipart/form-data">' +
  114 + '<fieldset class=subbloco >' +
114 '<p class="paragrafo" >' + $trad(1,i3GEOF.uploadgpx.dicionario) + 115 '<p class="paragrafo" >' + $trad(1,i3GEOF.uploadgpx.dicionario) +
115 '<br><br><input type="file" size=18 name="i3GEOuploadgpx" style="top:0px;left:0px;cursor:pointer;"></p>' + 116 '<br><br><input type="file" size=18 name="i3GEOuploadgpx" style="top:0px;left:0px;cursor:pointer;"></p>' +
  117 + '</fieldset>' +
  118 + '<fieldset class=subbloco >' +
116 '<p class=paragrafo >' + $trad(2,i3GEOF.uploadgpx.dicionario) + ':</p>' + 119 '<p class=paragrafo >' + $trad(2,i3GEOF.uploadgpx.dicionario) + ':</p>' +
117 '<div id=i3GEOuploadgpxListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' + 120 '<div id=i3GEOuploadgpxListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
118 - '<br><p class="paragrafo" ><input id=i3GEOuploadgpxbotao1 type="button" value="'+$trad(3,i3GEOF.uploadgpx.dicionario)+'" size=12 name="submit">' + 121 + '</fieldset>' +
  122 + '<fieldset class=subbloco >' +
  123 + '<p class="paragrafo" ><input id=i3GEOuploadgpxbotao1 type="button" value="'+$trad(3,i3GEOF.uploadgpx.dicionario)+'" size=12 name="submit">' +
119 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' + 124 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
120 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' + 125 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
121 '</form>' + 126 '</form>' +
122 - '<br><iframe name=i3GEOuploadgpxiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>'; 127 + '<br><iframe name=i3GEOuploadgpxiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
  128 + '</fieldset>';
123 return ins; 129 return ins;
124 }, 130 },
125 /* 131 /*
@@ -135,7 +141,7 @@ i3GEOF.uploadgpx = { @@ -135,7 +141,7 @@ i3GEOF.uploadgpx = {
135 }; 141 };
136 titulo = "GPX <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=103' >&nbsp;&nbsp;&nbsp;</a>"; 142 titulo = "GPX <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=103' >&nbsp;&nbsp;&nbsp;</a>";
137 janela = i3GEO.janela.cria( 143 janela = i3GEO.janela.cria(
138 - "320px", 144 + "400px",
139 "280px", 145 "280px",
140 "", 146 "",
141 "", 147 "",
@@ -163,4 +169,4 @@ i3GEOF.uploadgpx = { @@ -163,4 +169,4 @@ i3GEOF.uploadgpx = {
163 i3GEOF.uploadgpx.aguarde.visibility="visible"; 169 i3GEOF.uploadgpx.aguarde.visibility="visible";
164 $i("i3GEOuploadgpxf").submit(); 170 $i("i3GEOuploadgpxf").submit();
165 } 171 }
166 -};  
167 \ No newline at end of file 172 \ No newline at end of file
  173 +};
ferramentas/uploadkml/index.js
@@ -111,19 +111,27 @@ i3GEOF.uploadkml = { @@ -111,19 +111,27 @@ i3GEOF.uploadkml = {
111 */ 111 */
112 html:function(){ 112 html:function(){
113 var ins = '<form id=i3GEOuploadkmlf target="i3GEOuploadkmliframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadkml/upload.php" method="post" ENCTYPE="multipart/form-data">' + 113 var ins = '<form id=i3GEOuploadkmlf target="i3GEOuploadkmliframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadkml/upload.php" method="post" ENCTYPE="multipart/form-data">' +
  114 + '<fieldset class=subbloco >' +
114 '<p class="paragrafo" style=color:red >' + $trad(1,i3GEOF.uploadkml.dicionario) + '</p>' + 115 '<p class="paragrafo" style=color:red >' + $trad(1,i3GEOF.uploadkml.dicionario) + '</p>' +
115 '<p class="paragrafo" > ' + $trad(2,i3GEOF.uploadkml.dicionario) + 116 '<p class="paragrafo" > ' + $trad(2,i3GEOF.uploadkml.dicionario) +
116 '<br><input type="file" size=22 name="i3GEOuploadkml" style="top:0px;left:0px;cursor:pointer;"></p>' + 117 '<br><input type="file" size=22 name="i3GEOuploadkml" style="top:0px;left:0px;cursor:pointer;"></p>' +
  118 + '</fieldset>' +
  119 + '<fieldset class=subbloco >' +
117 '<p class=paragrafo >' + $trad(3,i3GEOF.uploadkml.dicionario) + 120 '<p class=paragrafo >' + $trad(3,i3GEOF.uploadkml.dicionario) +
118 '<br><input type=text size=42 name=layerkml value=""/></p>' + 121 '<br><input type=text size=42 name=layerkml value=""/></p>' +
  122 + '</fieldset>' +
  123 + '<fieldset class=subbloco >' +
119 '<p class=paragrafo >' + $trad(4,i3GEOF.uploadkml.dicionario) + '</p>' + 124 '<p class=paragrafo >' + $trad(4,i3GEOF.uploadkml.dicionario) + '</p>' +
120 '<div id=i3GEOuploadkmlListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' + 125 '<div id=i3GEOuploadkmlListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
121 - '<br><p class="paragrafo" ><input id=i3GEOuploadkmlbotao1 type="button" value="'+$trad(5,i3GEOF.uploadkml.dicionario)+'" size=12 name="submit">' + 126 + '</fieldset>' +
  127 + '<fieldset class=subbloco >' +
  128 + '<p class="paragrafo" ><input id=i3GEOuploadkmlbotao1 type="button" value="'+$trad(5,i3GEOF.uploadkml.dicionario)+'" size=12 name="submit">' +
122 '<br><p class="paragrafo" >' + $trad(6,i3GEOF.uploadkml.dicionario)+'</p>'+ 129 '<br><p class="paragrafo" >' + $trad(6,i3GEOF.uploadkml.dicionario)+'</p>'+
123 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' + 130 '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
124 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' + 131 '<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
125 '</form>' + 132 '</form>' +
126 - '<br><iframe name=i3GEOuploadkmliframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>'; 133 + '<br><iframe name=i3GEOuploadkmliframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
  134 + '</fieldset>';
127 return ins; 135 return ins;
128 }, 136 },
129 /* 137 /*
@@ -167,4 +175,4 @@ i3GEOF.uploadkml = { @@ -167,4 +175,4 @@ i3GEOF.uploadkml = {
167 i3GEOF.uploadkml.aguarde.visibility="visible"; 175 i3GEOF.uploadkml.aguarde.visibility="visible";
168 $i("i3GEOuploadkmlf").submit(); 176 $i("i3GEOuploadkmlf").submit();
169 } 177 }
170 -};  
171 \ No newline at end of file 178 \ No newline at end of file
  179 +};