diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-11-07 18:43:01 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-11-07 18:43:01 +0000 |
| commit | ee25d99ea44af2340248301de3790bcaf9c6e25f (patch) | |
| tree | 44bf4f5d04cd9471c714b956fe39e470a0be37d6 | |
| parent | Slicer 1.7 compatibility (diff) | |
| download | gentoobrowse-api-0.9.1.2.tar.bz2 gentoobrowse-api-0.9.1.2.tar.xz gentoobrowse-api-0.9.1.2.zip | |
Reference bootstrap css and js from CDNgentoobrowse-api-0.9.1.2
| -rw-r--r-- | gentoobrowse-api/service/notifications/xslt/base.xslt | 7 | ||||
| -rw-r--r-- | gentoobrowse-api/unittests/testNotifications.cpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gentoobrowse-api/service/notifications/xslt/base.xslt b/gentoobrowse-api/service/notifications/xslt/base.xslt index ee21294..65f4e20 100644 --- a/gentoobrowse-api/service/notifications/xslt/base.xslt +++ b/gentoobrowse-api/service/notifications/xslt/base.xslt @@ -3,12 +3,13 @@ <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" /> <xsl:template match="/*"> + <xsl:param name="tbscdn" select="'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2'"/> <xsl:text disable-output-escaping="yes"><!DOCTYPE html> </xsl:text> <html lang="en"> <head> <meta charset="utf-8" /> - <link href="https://gentoobrowse.randomdan.homeip.net/css/bootstrap.min.css" rel="stylesheet" media="screen" /> - <link href="https://gentoobrowse.randomdan.homeip.net/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen" /> + <link href="{$tbscdn}/css/bootstrap.min.css" rel="stylesheet" media="screen" /> + <link href="{$tbscdn}/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen" /> <link href="https://gentoobrowse.randomdan.homeip.net/css/general.css" rel="stylesheet" media="screen" /> <title><xsl:call-template name="title" /></title> </head> @@ -68,7 +69,7 @@ </footer> <script src="https://code.jquery.com/jquery-latest.min.js"></script> - <script src="https://gentoobrowse.randomdan.homeip.net/js/bootstrap.min.js"></script> + <script src="{$tbscdn}/js/bootstrap.min.js"></script> <script src="https://gentoobrowse.randomdan.homeip.net/js/js.js"></script> </body> </html> diff --git a/gentoobrowse-api/unittests/testNotifications.cpp b/gentoobrowse-api/unittests/testNotifications.cpp index 357a29e..79ea08f 100644 --- a/gentoobrowse-api/unittests/testNotifications.cpp +++ b/gentoobrowse-api/unittests/testNotifications.cpp @@ -42,6 +42,7 @@ commonAssert(Gentoo::EmailPtr e) BOOST_REQUIRE(isHtml(e->body[1]->payload)); BOOST_REQUIRE_EQUAL(e->body[0]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); BOOST_REQUIRE_EQUAL(e->body[1]->payload.find("http://gentoobrowse.randomdan.homeip.net"), std::string::npos); + BOOST_REQUIRE_NE(e->body[1]->payload.find("https://cdnjs.cloudflare.com/"), std::string::npos); } BOOST_AUTO_TEST_CASE( testSend ) |