Skip to content

Commit

Permalink
Correcoes de diretorios relativos
Browse files Browse the repository at this point in the history
  • Loading branch information
@guaycuru
guaycuru committed May 31, 2017
1 parent 1bb5e74 commit b48d779
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 20 deletions.
8 changes: 4 additions & 4 deletions classes/GDE/Acontecimento.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ public function getFoto($th = true) {
if($this->getOrigem() !== null)
return $this->getOrigem()->getFoto(true, $th);
elseif($this->tipo == self::TIPO_GDE)
return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "../web/images/gde.gif";
return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "web/images/gde.gif";
elseif($this->tipo == 'gc')
return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "../web/images/gde.gif";
return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "web/images/gde.gif";
}

public function Pode_Responder(Usuario $Usuario) {
Expand Down Expand Up @@ -201,9 +201,9 @@ public function Listar_Respostas(Usuario $Usuario = null) { // Soh usada para Us
*/
public static function TrataURL($url) {
if(preg_match('/(?:http:\/\/)?(?:www.|)youtube.com\/watch?(?:.*?)v=([a-z0-9_\-]+)(?:.*?)(&hd=1|).*/i', $url))
return preg_replace('/(?:http:\/\/)?(?:www.|)youtube.com\/watch?(?:.*?)v=([a-z0-9_\-]+)(?:.*?)(&hd=1|).*/i', '<br /><a href="#" id="youtube_${1}" class="video_youtube"><img src="../web/images/play_video.png" style="background: url(http://i.ytimg.com/vi/${1}/default.jpg) transparent" alt="YouTube" border="0" height="90" width="120" /></a>', $url);
return preg_replace('/(?:http:\/\/)?(?:www.|)youtube.com\/watch?(?:.*?)v=([a-z0-9_\-]+)(?:.*?)(&hd=1|).*/i', '<br /><a href="#" id="youtube_${1}" class="video_youtube"><img src="'.CONFIG_URL.'web/images/play_video.png" style="background: url(http://i.ytimg.com/vi/${1}/default.jpg) transparent" alt="YouTube" border="0" height="90" width="120" /></a>', $url);
if(preg_match('/(?:http:\/\/)?(?:www.|)youtu.be\/([a-z0-9_\-]+)(?:.*?)(\?hd=1|).*/i', $url))
return preg_replace('/(?:http:\/\/)?(?:www.|)youtu.be\/([a-z0-9_\-]+)(?:.*?)(\?hd=1|).*/i', '<br /><a href="#" id="youtube_${1}" class="video_youtube"><img src="../web/images/play_video.png" style="background: url(http://i.ytimg.com/vi/${1}/default.jpg) transparent" alt="YouTube" border="0" height="90" width="120" /></a>', $url);
return preg_replace('/(?:http:\/\/)?(?:www.|)youtu.be\/([a-z0-9_\-]+)(?:.*?)(\?hd=1|).*/i', '<br /><a href="#" id="youtube_${1}" class="video_youtube"><img src="'.CONFIG_URL.'web/images/play_video.png" style="background: url(http://i.ytimg.com/vi/${1}/default.jpg) transparent" alt="YouTube" border="0" height="90" width="120" /></a>', $url);
if(preg_match('/(http\:\/\/i.ytimg.com\/vi\/.*\/default.jpg)/i', $url))
return $url;

Expand Down
4 changes: 2 additions & 2 deletions classes/GDE/Arvore.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,12 +710,12 @@ public function Inicializa_Mostra($meu = true) {
$div = "<a id=\"inline\" href=\"#popup_arvore\"><img src=\"".$this->arquivo."\" border=\"0\" width=\"".$largura."\" height=\"".$altura."\" alt=\"Arvore\" /></a>
<div style=\"display:none\">
<div id=\"popup_arvore\">
<div class=\"div_img_ov_arvore\" style=\"opacity: 0; position: absolute; display: none; z-index: 100;\"><img class=\"img_ov_arvore\" src=\"\" alt=\"\" /></div><div id=\"div_img_ov_mapa\" style=\"position: absolute; z-index: 110;\"><img id=\"img_ov_mapa\" usemap=\"#mapa\" src=\"../web/images/spacer.gif\" width=\"".$this->largura."\" height=\"".$this->altura."\" alt=\"\" /></div>
<div class=\"div_img_ov_arvore\" style=\"opacity: 0; position: absolute; display: none; z-index: 100;\"><img class=\"img_ov_arvore\" src=\"\" alt=\"\" /></div><div id=\"div_img_ov_mapa\" style=\"position: absolute; z-index: 110;\"><img id=\"img_ov_mapa\" usemap=\"#mapa\" src=\"".CONFIG_URL."web/images/spacer.gif\" width=\"".$this->largura."\" height=\"".$this->altura."\" alt=\"\" /></div>
<img src=\"".$this->arquivo."\" class=\"img_arvore\" usemap=\"#mapa\" border=\"0\" alt=\"Arvore\" />
</div>
</div>";
} else {
$div = "<div class=\"div_img_ov_arvore\" style=\"opacity: 0; position: absolute; display: none; z-index: 100;\"><img class=\"img_ov_arvore\" src=\"\" alt=\"\" /></div><div id=\"div_img_ov_mapa\" style=\"position: absolute; z-index: 110;\"><img id=\"img_ov_mapa\" usemap=\"#mapa\" src=\"../web/images/spacer.gif\" width=\"".$this->largura."\" height=\"".$this->altura."\" alt=\"\" /></div><img src=\"".$this->arquivo."\" id=\"img_arvore\" border=\"0\" alt=\"Arvore\" />";
$div = "<div class=\"div_img_ov_arvore\" style=\"opacity: 0; position: absolute; display: none; z-index: 100;\"><img class=\"img_ov_arvore\" src=\"\" alt=\"\" /></div><div id=\"div_img_ov_mapa\" style=\"position: absolute; z-index: 110;\"><img id=\"img_ov_mapa\" usemap=\"#mapa\" src=\"".CONFIG_URL."web/images/spacer.gif\" width=\"".$this->largura."\" height=\"".$this->altura."\" alt=\"\" /></div><img src=\"".$this->arquivo."\" id=\"img_arvore\" border=\"0\" alt=\"Arvore\" />";
}
$div .= "<map name=\"mapa\" id=\"mapa\">
".$this->Mapa($meu)."
Expand Down
2 changes: 1 addition & 1 deletion classes/GDE/Usuario.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ public function getChat_Status($icone = false, $puro = false) {
if(!$icone)
return $status;
else
return '<img src="../web/images/status_'.$status.'.png" class="status_icone status_icone_'.$this->getID().'" alt="'.$status.'" />';
return '<img src="'.CONFIG_URL.'web/images/status_'.$status.'.png" class="status_icone status_icone_'.$this->getID().'" alt="'.$status.'" />';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion views/cadastro.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
}

?>
<script type="text/javascript" src="../web/js/jquery.jhelpertip.js"></script>
<script type="text/javascript" src="<?= CONFIG_URL; ?>web/js/jquery.jhelpertip.js"></script>
<script type="text/javascript">
// <![CDATA[
$(document).ready(function(){
Expand Down
4 changes: 2 additions & 2 deletions web/js/gde.favoritos.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var Adicionar_Favorito = function(ra) {
$.post(CONFIG_URL + 'ajax/favorito.php', {ra: ra, tipo: 'a'}, function(data) {
if(data == '1') {
$("#link_favorito_img").attr("src", "../web/images/star_on.gif");
$("#link_favorito_img").attr("src", CONFIG_URL + "web/images/star_on.gif");
$("#link_favorito").attr("title", "Adicionar aos Favoritos");
$('#link_favorito').unbind('click');
$('#link_favorito').click(function() { Remover_Favorito(ra); return false; });
Expand All @@ -11,7 +11,7 @@ var Adicionar_Favorito = function(ra) {
var Remover_Favorito = function(ra) {
$.post(CONFIG_URL + 'ajax/favorito.php', {ra: ra, tipo: 'r'}, function(data) {
if(data == '1') {
$("#link_favorito_img").attr("src", "../web/images/star_off.gif");
$("#link_favorito_img").attr("src", CONFIG_URL + "web/images/star_off.gif");
$("#link_favorito").attr("title", "Remover dos Favoritos");
$('#link_favorito').unbind('click');
$('#link_favorito').click(function() { Adicionar_Favorito(ra); return false; });
Expand Down
13 changes: 3 additions & 10 deletions web/js/jquery.guaycuru.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,7 @@ jQuery.guaycuru = {

aguarde: function() {

return jQuery.popup.show("", '<h1 style="text-align: center;"><img src="../web/images/loading.gif" /> Aguarde...</h1>', {returnHide: true});

},

abreControlador: function(url) {

//top.frames['controle'].location = '../controladores/' + url;
window.open('../controladores/' + url, 'controle');
return jQuery.popup.show("", '<h1 style="text-align: center;"><img src=' + CONFIG_URL + 'web/images/loading.gif" /> Aguarde...</h1>', {returnHide: true});

},

Expand Down Expand Up @@ -160,7 +153,7 @@ jQuery.guaycuru = {

changeIt: function() {

$("body").css({"background-image": "url(../web/images/bodybg.png)", "background-repeat": "repeat"});
$("body").css({"background-image": "url(" + CONFIG_URL + "web/images/bodybg.png)", "background-repeat": "repeat"});
$("#wrapper").css("background", "transparent");

},
Expand Down Expand Up @@ -262,4 +255,4 @@ jQuery.guaycuru = {
this.blur();
return this;
};
})(jQuery);
})(jQuery);

0 comments on commit b48d779

Please sign in to comment.