← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol/openlp/trivial into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/trivial/+merge/102962

Hello,

- added favicon to remote pages
-- 
https://code.launchpad.net/~googol/openlp/trivial/+merge/102962
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/trivial into lp:openlp.
=== added file 'openlp/plugins/remotes/html/images/favicon.ico'
Binary files openlp/plugins/remotes/html/images/favicon.ico	1970-01-01 00:00:00 +0000 and openlp/plugins/remotes/html/images/favicon.ico	2012-04-21 07:05:22 +0000 differ
=== modified file 'openlp/plugins/remotes/html/index.html'
--- openlp/plugins/remotes/html/index.html	2012-04-18 20:44:47 +0000
+++ openlp/plugins/remotes/html/index.html	2012-04-21 07:05:22 +0000
@@ -31,6 +31,7 @@
   <title>${app_title}</title>
   <link rel="stylesheet" href="/files/jquery.mobile.css" />
   <link rel="stylesheet" href="/files/openlp.css" />
+  <link rel="shortcut icon" type="image/x-icon" href="/files/images/favicon.ico">
   <script type="text/javascript" src="/files/jquery.js"></script>
   <script type="text/javascript" src="/files/openlp.js"></script>
   <script type="text/javascript" src="/files/jquery.mobile.js"></script>

=== modified file 'openlp/plugins/remotes/html/stage.html'
--- openlp/plugins/remotes/html/stage.html	2012-03-17 10:40:06 +0000
+++ openlp/plugins/remotes/html/stage.html	2012-04-21 07:05:22 +0000
@@ -29,6 +29,7 @@
   <meta charset="utf-8" />
   <title>${stage_title}</title>
   <link rel="stylesheet" href="/files/stage.css" />
+  <link rel="shortcut icon" type="image/x-icon" href="/files/images/favicon.ico">
   <script type="text/javascript" src="/files/jquery.js"></script>
   <script type="text/javascript" src="/files/stage.js"></script>
 </head>


Follow ups