Merge remote-tracking branch 'upstream/dev' into issue283

app/models/RSSThemes.php

@@ -82,7 +82,6 @@ class RSSThemes extends Model {
 		$url = isset(self::$themeIcons[$url]) ? (self::$themeIconsUrl . $url) :
 			(self::$defaultIconsUrl . $url);
 
-		//return '<i class="icon i_' . $name . '">' . $alts[$name] . '</i>';
 		return '<img class="icon" src="' . Url::display($url) . '" alt="' . $alts[$name] . '" />';
 	}
 }

app/views/helpers/javascript_vars.phtml

@@ -20,6 +20,10 @@
 			'collapse_entry:"', $s['collapse_entry'], '"',
 		"},\n";
 
+	if (Request::param ('output') === 'global') {
+		echo "iconClose='", RSSThemes::icon('close'), "',\n";
+	}
+
 	$mail = Session::param ('mail', 'null');
 	if ($mail != 'null') {
 		$mail = '"' . $mail . '"';

public/scripts/global_view.js

@@ -30,7 +30,7 @@ function load_panel(link) {
 
 function init_close_panel() {
 	$("#panel .close").click(function () {
-		$("#panel").html('<a class="close" href="#"><i class="icon i_close">❌</i></a>');
+		$("#panel").html('<a class="close" href="#">' + window.iconClose + '</a>');
 		init_close_panel();
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();