diff options
| author |  Alexis Degrugillier <github@ainw.org>
| 2013-11-25 19:31:36 -0500 |
|---|---|---|
| committer | Alexis Degrugillier <github@ainw.org>
| 2013-11-25 19:31:36 -0500 |
| commit | 5550720a1463eb3f14da0c6622f20f87631a3d3a (patch) | |
| tree | 79185d934c880c19d0e5555e3b92d983c146b10a | |
| parent | 7e06d0df30af18219d8b35e07634c08494adef32 (diff) | |
| parent | 03081fe9a21a3746ba3dac689f449b7ff3254f95 (diff) | |
Merge remote-tracking branch 'upstream/dev' into issue283
| -rw-r--r-- | app/models/RSSThemes.php | 1 | ||||
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 4 | ||||
| -rw-r--r-- | public/scripts/global_view.js | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/models/RSSThemes.php b/app/models/RSSThemes.php index 3fd0b2ea1..7a6deaf3c 100644 --- a/app/models/RSSThemes.php +++ b/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] . '" />'; } } diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index e9deaf71c..ddebfd876 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/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 . '"'; diff --git a/public/scripts/global_view.js b/public/scripts/global_view.js index 14fad9525..0cdcdd3fa 100644 --- a/public/scripts/global_view.js +++ b/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(); |