diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl index 6cfe9712042281bdc333adfb4bc48146db1c79c7..39c35fdcb5f49b8db460166bd306d23274bad575 100644 --- a/gui/slick/interfaces/default/inc_top.tmpl +++ b/gui/slick/interfaces/default/inc_top.tmpl @@ -231,6 +231,7 @@ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="$sbRoot/images/menu/system18-2.png" class="navbaricon hidden-xs" /><b class="caret hidden-xs"></b><span class="visible-xs">System <b class="caret"></b></span></a> <ul class="dropdown-menu"> <li><a href="$sbRoot/home/updateCheck?pid=$sbPID"><i class="menu-icon-update"></i> Check For Updates</a></li> + <li><a href="$sbRoot/changes"><i class="menu-icon-help"></i> Changelog</a></li> <li><a href="$sbRoot/home/restart/?pid=$sbPID" class="confirm restart"><i class="menu-icon-restart"></i> Restart</a></li> <li><a href="$sbRoot/home/shutdown/?pid=$sbPID" class="confirm shutdown"><i class="menu-icon-shutdown"></i> Shutdown</a></li> <li><a href="$sbRoot/logout" class="confirm logout"><i class="menu-icon-shutdown"></i> Logout</a></li> diff --git a/gui/slick/interfaces/default/news.tmpl b/gui/slick/interfaces/default/markdown.tmpl similarity index 73% rename from gui/slick/interfaces/default/news.tmpl rename to gui/slick/interfaces/default/markdown.tmpl index 74256e73bffdac73e356f5154834a9003da049f9..31ea924e75e18dd770e983d4f7a5eb0320d5d9af 100644 --- a/gui/slick/interfaces/default/news.tmpl +++ b/gui/slick/interfaces/default/markdown.tmpl @@ -1,12 +1,9 @@ #import sickbeard #from sickbeard.common import * -#set global $title="News" -#set global $header="News" -#set global $topmenu="news" #import os.path #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") -$newsdata +$data #include $os.path.join($sickbeard.PROG_DIR,"gui/slick/interfaces/default/inc_bottom.tmpl") diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index ff4ced8699419cdb75583ee1252ad6278620f9e3..3acb9b5cd82ceb231e34291ba7bb6769febe438b 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -58,8 +58,9 @@ import adba, subliminal from lib.trakt import TraktAPI from lib.trakt.exceptions import traktException from versionChecker import CheckVersion -import babelfish + import requests +import markdown2 try: import json @@ -281,7 +282,7 @@ class WebHandler(BaseHandler): class LoginHandler(BaseHandler): def get(self, *args, **kwargs): if self.get_current_user(): - self.redirect('/news/') + self.redirect('/home/') else: t = PageTemplate(rh=self, file="login.tmpl") self.finish(t.respond()) @@ -304,7 +305,7 @@ class LoginHandler(BaseHandler): else: logger.log('User attempted a failed login to the SickRage web interface from IP: ' + self.request.remote_ip, logger.WARNING) - self.redirect('/news/') + self.redirect('/home/') class LogoutHandler(BaseHandler): @@ -339,7 +340,7 @@ class WebRoot(WebHandler): super(WebRoot, self).__init__(*args, **kwargs) def index(self): - return self.redirect('/news/') + return self.redirect('/home/') def robots_txt(self): """ Keep web crawlers out """ @@ -2162,12 +2163,34 @@ class HomeNews(Home): super(HomeNews, self).__init__(*args, **kwargs) def index(self): - t = PageTemplate(rh=self, file="news.tmpl") - t.submenu = self.HomeMenu() - with open("news.md", "r") as newsfile: + with open(ek.ek(os.path.join, sickbeard.PROG_DIR, "news.md"), "r") as newsfile: news = newsfile.read() - import markdown2 - t.newsdata = markdown2.markdown(news) + + t = PageTemplate(rh=self, file="markdown.tmpl") + t.submenu = self.HomeMenu() + t.title = "News" + t.header = "News" + t.topmenu = "news" + t.data = markdown2.markdown(news) + + return t.respond() + +@route('/changes(/?.*)') +class HomeChangeLog(Home): + def __init__(self, *args, **kwargs): + super(HomeChangeLog, self).__init__(*args, **kwargs) + + def index(self): + with open(ek.ek(os.path.join, sickbeard.PROG_DIR, "CHANGES.md"), "r") as changesfile: + changes = changesfile.read() + + t = PageTemplate(rh=self, file="markdown.tmpl") + t.submenu = self.HomeMenu() + t.title = "Changelog" + t.header = "Changelog" + t.topmenu = "changes" + t.data = markdown2.markdown(changes) + return t.respond() @route('/home/postprocess(/?.*)')