Attach js on updates page via controller

This commit is contained in:
Dmitriy Simushev 2014-10-10 12:38:00 +00:00
parent d01bd8a080
commit 54b4814389
4 changed files with 42 additions and 38 deletions

View File

@ -16,38 +16,40 @@
* limitations under the License. * limitations under the License.
*/ */
function loadNews() { (function ($) {
if (typeof(window.mibewNews) == "undefined" || typeof(window.mibewNews.length) == "undefined") { var loadNews = function () {
if (typeof (window.mibewNews) == "undefined" || typeof (window.mibewNews.length) == "undefined") {
return; return;
} }
var str = "<div>"; var str = "<div>";
for (var i = 0; i < window.mibewNews.length; i++) { for (var i = 0; i < window.mibewNews.length; i++) {
str += "<div class=\"newstitle\"><a hre" + "f=\"" + window.mibewNews[i].link + "\">" + window.mibewNews[i].title + "</a>, <span class=\"small\">" + window.mibewNews[i].date + "</span></div>"; str += "<div class=\"news-title\"><a hre" + "f=\"" + window.mibewNews[i].link + "\">" + window.mibewNews[i].title + "</a>, <span class=\"small\">" + window.mibewNews[i].date + "</span></div>";
str += "<div class=\"newstext\">" + window.mibewNews[i].message+"</div>"; str += "<div class=\"news-text\">" + window.mibewNews[i].message + "</div>";
} }
$("#news").html(str + "</div>"); $("#news").html(str + "</div>");
} }
function loadVersion() { var loadVersion = function () {
if(typeof(window.mibewLatest) == "undefined" || typeof(window.mibewLatest.version) == "undefined") { if (typeof (window.mibewLatest) == "undefined" || typeof (window.mibewLatest.version) == "undefined") {
return; return;
} }
var current = $("#cver").html(); var current = $("#current-version").html();
if(current != window.mibewLatest.version) { if (current != window.mibewLatest.version) {
if(current < window.mibewLatest.version) { if (current < window.mibewLatest.version) {
$("#cver").css("color","red"); $("#current-version").css("color", "red");
} }
$("#lver").html(window.mibewLatest.version+", Download <a href=\""+window.mibewLatest.download+"\">"+window.mibewLatest.title+"</a>"); $("#latest-version").html(window.mibewLatest.version + ", Download <a href=\"" + window.mibewLatest.download + "\">" + window.mibewLatest.title + "</a>");
} else { } else {
$("#cver").css("color","green"); $("#current-version").css("color", "green");
$("#lver").html(window.mibewLatest.version); $("#latest-version").html(window.mibewLatest.version);
}
} }
}
$(function(){ $(function () {
loadNews(); loadNews();
loadVersion(); loadVersion();
}); });
})(jQuery);

View File

@ -19,6 +19,7 @@
namespace Mibew\Controller; namespace Mibew\Controller;
use Mibew\Asset\AssetManagerInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
/** /**
@ -57,6 +58,12 @@ class UpdatesController extends AbstractController
$page = array_merge($page, prepare_menu($operator)); $page = array_merge($page, prepare_menu($operator));
$this->getAssetManager()->attachJs(
'https://mibew.org/latestMibew.js',
AssetManagerInterface::ABSOLUTE_URL
);
$this->getAssetManager()->attachJs('js/compiled/update.js');
return $this->render('updates', $page); return $this->render('updates', $page);
} }
} }

View File

@ -990,7 +990,7 @@ table.awaiting .no-threads, table.awaiting .no-visitors {
padding:4px; padding:4px;
} }
.newstext { .news-text {
margin-bottom:1em; margin-bottom:1em;
} }

View File

@ -1,11 +1,6 @@
{{#extends "_layout"}} {{#extends "_layout"}}
{{#override "menu"}}{{> _menu}}{{/override}} {{#override "menu"}}{{> _menu}}{{/override}}
{{#override "head"}}
<script type="text/javascript" language="javascript" src="http://mibew.org/latestMibew.js"></script>
<script type="text/javascript" language="javascript" src="{{asset "js/compiled/update.js"}}"></script>
{{/override}}
{{#override "content"}} {{#override "content"}}
{{l10n "Messenger updates."}} {{l10n "Messenger updates."}}
@ -23,12 +18,12 @@
<div id="news"></div> <div id="news"></div>
{{l10n "You are using:"}}<br/> {{l10n "You are using:"}}<br/>
<div id="cver">{{version}}</div> <div id="current-version">{{version}}</div>
<br/> <br/>
{{l10n "Latest version:"}} {{l10n "Latest version:"}}
<div id="lver"></div> <div id="latest-version"></div>
<br/> <br/>