Merge branch 'develop' into pp_subtitle

gui/slick/views/errorlogs.mako

@@ -13,9 +13,6 @@ pre {
 }
 </style>
 </%block>
-<%block name="scripts">
-<script type="text/javascript" src="${srRoot}/js/new/errorlogs.js"></script>
-</%block>
 <%block name="content">
 <%
     if logLevel == sickbeard.logger.WARNING:

gui/slick/views/viewlogs.mako

@@ -4,8 +4,14 @@
     from sickbeard import classes
     from sickbeard.logger import reverseNames
 %>
-<%block name="scripts">
-<script type="text/javascript" src="${srRoot}/js/new/viewlogs.js"></script>
+<%block name="css">
+<style>
+pre {
+  overflow: auto;
+  word-wrap: normal;
+  white-space: pre;
+}
+</style>
 </%block>
 <%block name="content">
 % if not header is UNDEFINED: