Merge branch 'origin/dev'

2024-12-04 18:33:38 +00:00 · 2014-05-23 07:28:30 -07:00 · 2014-05-23 07:28:30 -07:00 · 55421cbe33
commit 55421cbe33
parent 2bc5412c2a 41ff17a2f0
27 changed files with 30 additions and 6 deletions
--- a/gui/slick/css/browserconfig.xml
+++ b/gui/slick/css/browserconfig.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/favicon-70.png"/>
+      <square150x150logo src="/favicon-150.png"/>
+      <square310x310logo src="/favicon-310.png"/>
+      <TileColor>#FFFFFF</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
--- a/gui/slick/images/google/google.donate.gif
+++ b/gui/slick/images/google/google.donate.gif
--- a/gui/slick/images/ico/apple-touch-icon-114x114-precomposed.png
+++ b/gui/slick/images/ico/apple-touch-icon-114x114-precomposed.png
--- a/gui/slick/images/ico/apple-touch-icon-144x144-precomposed.png
+++ b/gui/slick/images/ico/apple-touch-icon-144x144-precomposed.png
--- a/gui/slick/images/ico/apple-touch-icon-57x57-precomposed.png
+++ b/gui/slick/images/ico/apple-touch-icon-57x57-precomposed.png
--- a/gui/slick/images/ico/apple-touch-icon-72x72-precomposed.png
+++ b/gui/slick/images/ico/apple-touch-icon-72x72-precomposed.png
--- a/gui/slick/images/ico/apple-touch-icon-precomposed.png
+++ b/gui/slick/images/ico/apple-touch-icon-precomposed.png
--- a/gui/slick/images/ico/favicon-114.png
+++ b/gui/slick/images/ico/favicon-114.png
--- a/gui/slick/images/ico/favicon-120.png
+++ b/gui/slick/images/ico/favicon-120.png
--- a/gui/slick/images/ico/favicon-144.png
+++ b/gui/slick/images/ico/favicon-144.png
--- a/gui/slick/images/ico/favicon-150.png
+++ b/gui/slick/images/ico/favicon-150.png
--- a/gui/slick/images/ico/favicon-152.png
+++ b/gui/slick/images/ico/favicon-152.png
--- a/gui/slick/images/ico/favicon-16.png
+++ b/gui/slick/images/ico/favicon-16.png
--- a/gui/slick/images/ico/favicon-160.png
+++ b/gui/slick/images/ico/favicon-160.png
--- a/gui/slick/images/ico/favicon-196.png
+++ b/gui/slick/images/ico/favicon-196.png
--- a/gui/slick/images/ico/favicon-310.png
+++ b/gui/slick/images/ico/favicon-310.png
--- a/gui/slick/images/ico/favicon-32.png
+++ b/gui/slick/images/ico/favicon-32.png
--- a/gui/slick/images/ico/favicon-57.png
+++ b/gui/slick/images/ico/favicon-57.png
--- a/gui/slick/images/ico/favicon-64.png
+++ b/gui/slick/images/ico/favicon-64.png
--- a/gui/slick/images/ico/favicon-70.png
+++ b/gui/slick/images/ico/favicon-70.png
--- a/gui/slick/images/ico/favicon-72.png
+++ b/gui/slick/images/ico/favicon-72.png
--- a/gui/slick/images/ico/favicon-76.png
+++ b/gui/slick/images/ico/favicon-76.png
--- a/gui/slick/images/ico/favicon-96.png
+++ b/gui/slick/images/ico/favicon-96.png
--- a/gui/slick/images/ico/favicon.ico
+++ b/gui/slick/images/ico/favicon.ico
--- a/gui/slick/images/payza.jpg
+++ b/gui/slick/images/payza.jpg
--- a/gui/slick/images/xbmc-notify.png
+++ b/gui/slick/images/xbmc-notify.png
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@ -10,16 +10,29 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="robots" content="noindex">
    <meta name="apple-mobile-web-app-capable" content="yes">
-    <title>SickRage - TVRage $sickbeard.version.SICKBEARD_VERSION - $title</title>
+    <title>SickRage - BRANCH:$sickbeard.version.SICKBEARD_VERSION - $title</title>
    <!--[if lt IE 9]>
         <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
    <![endif]-->

-    <link rel="shortcut icon" href="$sbRoot/images/ico/favicon.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="$sbRoot/images/ico/apple-touch-icon-144x144-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="$sbRoot/images/ico/apple-touch-icon-114x114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="$sbRoot/images/ico/apple-touch-icon-72x72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="$sbRoot/images/ico/apple-touch-icon-57x57-precomposed.png">
+	<link rel="shortcut icon" href="$sbRoot/images/ico/favicon.ico">
+	<link rel="icon" sizes="16x16 32x32 64x64" href="$sbRoot/images/ico/favicon.ico">
+	<link rel="icon" type="image/png" sizes="196x196" href="$sbRoot/images/ico/favicon-196.png">
+	<link rel="icon" type="image/png" sizes="160x160" href="$sbRoot/images/ico/favicon-160.png">
+	<link rel="icon" type="image/png" sizes="96x96" href="$sbRoot/images/ico/favicon-96.png">
+	<link rel="icon" type="image/png" sizes="64x64" href="$sbRoot/images/ico/favicon-64.png">
+	<link rel="icon" type="image/png" sizes="32x32" href="$sbRoot/images/ico/favicon-32.png">
+	<link rel="icon" type="image/png" sizes="16x16" href="$sbRoot/images/ico/favicon-16.png">
+	<link rel="apple-touch-icon" sizes="152x152" href="$sbRoot/images/ico/favicon-152.png">
+	<link rel="apple-touch-icon" sizes="144x144" href="$sbRoot/images/ico/favicon-144.png">
+	<link rel="apple-touch-icon" sizes="120x120" href="$sbRoot/images/ico/favicon-120.png">
+	<link rel="apple-touch-icon" sizes="114x114" href="$sbRoot/images/ico/favicon-114.png">
+	<link rel="apple-touch-icon" sizes="76x76" href="$sbRoot/images/ico/favicon-76.png">
+	<link rel="apple-touch-icon" sizes="72x72" href="$sbRoot/images/ico/favicon-72.png">
+	<link rel="apple-touch-icon" href="$sbRoot/images/ico/favicon-57.png">
+	<meta name="msapplication-TileColor" content="#FFFFFF">
+	<meta name="msapplication-TileImage" content="$sbRoot/images/ico/favicon-144.png">
+	<meta name="msapplication-config" content="$sbRoot/css/browserconfig.xml">

    <link rel="stylesheet" type="text/css" href="$sbRoot/css/default.css?$sbPID" />
    <link rel="stylesheet" type="text/css" href="$sbRoot/css/comingEpisodes.css?$sbPID" />