openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #27646
[Merge] lp:~raoul-snyman/openlp/website into lp:openlp/website
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/website into lp:openlp/website.
Requested reviews:
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/website/+merge/274823
Latest set of changes up to go live.
--
Your team OpenLP Core is subscribed to branch lp:openlp/website.
=== modified file 'blog/openlp-22-released.rst'
--- blog/openlp-22-released.rst 2015-10-16 18:37:12 +0000
+++ blog/openlp-22-released.rst 2015-10-18 13:06:22 +0000
@@ -103,6 +103,9 @@
Important Notes
^^^^^^^^^^^^^^^
+Incompatibilities
+-----------------
+
**OpenLP 2.2 is not backwards compatible with 2.0.5.**
**Service Files created in 2.2 cannot be opened in 2.0.**
@@ -113,10 +116,14 @@
Upgrading from versions of OpenLP before 2.0.5 are not supported. You need to upgrade to 2.0.5 first, and make sure
you run OpenLP at least once before continuing to upgrade to 2.2.
+Known Issues
+------------
+
There are some known issues in OpenLP 2.2 that you should know about before upgrading:
1. Live Backgrounds does not work on Windows and Mac OS X
2. Playback of linked audio does not work on Mac OS X
+3. OpenLP on Linux will not start up if VLC is not installed. Simply install VLC to get around this problem.
We plan to fix these issues in OpenLP 2.4. We're moving to a faster release cycle, which means that OpenLP 2.4 should be released in 6 to 12 months from now.
@@ -131,7 +138,7 @@
.. raw:: html
- <div class="text-center"><p><a class="btn btn-success btn-lg" href="/#download"><strong>Download Now</strong></a></p></div>
+ <div class="text-center"><p><a class="btn btn-success btn-lg" href="/#downloads"><strong>Download Now</strong></a></p></div>
[ Image Credit: `Thai Lanterns by Mark Fischer`_ ]
=== modified file 'conf.py'
--- conf.py 2015-10-16 22:07:17 +0000
+++ conf.py 2015-10-18 13:06:22 +0000
@@ -408,6 +408,9 @@
# ("icon", "/favicon.ico", "16x16"),
# ("icon", "/icon_128x128.png", "128x128"),
# }
+FAVICONS = {
+ ('icon', '/favicon.png', '16x16,24x24,32x32,48x48,64x64')
+}
# Show only teasers in the index pages? Defaults to False
INDEX_TEASERS = True
=== modified file 'deploy.sh'
--- deploy.sh 2015-10-14 17:10:26 +0000
+++ deploy.sh 2015-10-18 13:06:22 +0000
@@ -7,5 +7,5 @@
$NIKOLA clean
$NIKOLA build
cd output
-rsync -r -a -v -z -e ssh * openlp@xxxxxxxxxx:public_html/beta/
+rsync -r -a -v -z -e ssh * openlp@xxxxxxxxxx:public_html/
cd ..
=== added file 'files/favicon.png'
Binary files files/favicon.png 1970-01-01 00:00:00 +0000 and files/favicon.png 2015-10-18 13:06:22 +0000 differ
=== modified file 'themes/openlp2v2/assets/css/custom.css'
--- themes/openlp2v2/assets/css/custom.css 2015-10-16 22:07:17 +0000
+++ themes/openlp2v2/assets/css/custom.css 2015-10-18 13:06:22 +0000
@@ -319,8 +319,8 @@
margin-left: 3em;
}
-a.screenshot-gallery {
- display: block;
+div.screenshot {
border-radius: 6px;
border: 4px solid #efefef;
+ margin: 0 10px;
}
=== modified file 'themes/openlp2v2/templates/front_page.html'
--- themes/openlp2v2/templates/front_page.html 2015-10-16 22:07:17 +0000
+++ themes/openlp2v2/templates/front_page.html 2015-10-18 13:06:22 +0000
@@ -122,25 +122,33 @@
</p>
</div>
</div>
+ </div>
+ </div>
+ <div class="space"></div>
+ <div class="row">
+ <h2 class="text-center"><i class="fa fw fa-desktop"></i> Screenshots</h2>
+ <div class="col-md-offset-2 col-md-8">
<div class="space"></div>
<div class="row">
- <h2 class="text-center"><i class="fa fw fa-desktop"></i> Screenshots</h2>
- <div class="col-md-offset-2 col-md-8">
- <div class="space"></div>
- <div class="row">
- <a href="/screenshots/mainwindow.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Control OpenLP from the Main Window" class="col-sm-3">
- <img src="/screenshots/mainwindow.png" class="img-responsive">
- </a>
- <a href="/screenshots/songimporterchoices.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Import Songs from Many Formats" class="col-sm-3">
- <img src="/screenshots/songimporterchoices.png" class="img-responsive">
- </a>
- <a href="/screenshots/song_edit_verse_in_use.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Editing a Song" class="col-sm-3">
- <img src="/screenshots/song_edit_verse_in_use.png" class="img-responsive">
- </a>
- <a href="/screenshots/stage_view_song_w_note.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Browser-based Stage View" class="col-sm-3">
- <img src="/screenshots/stage_view_song_w_note.png" class="img-responsive">
- </a>
- </div>
+ <div class="col-sm-3">
+ <a href="/screenshots/mainwindow.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Control OpenLP from the Main Window">
+ <img src="/screenshots/mainwindow.png" class="img-responsive">
+ </a>
+ </div>
+ <div class="col-sm-3">
+ <a href="/screenshots/songimporterchoices.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Import Songs from Many Formats">
+ <img src="/screenshots/songimporterchoices.png" class="img-responsive">
+ </a>
+ </div>
+ <div class="col-sm-3">
+ <a href="/screenshots/song_edit_verse_in_use.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Editing a Song">
+ <img src="/screenshots/song_edit_verse_in_use.png" class="img-responsive">
+ </a>
+ </div>
+ <div class="col-sm-3">
+ <a href="/screenshots/stage_view_song_w_note.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Browser-based Stage View">
+ <img src="/screenshots/stage_view_song_w_note.png" class="img-responsive">
+ </a>
</div>
</div>
</div>
@@ -280,11 +288,32 @@
</div>
<div class="windows hidden">
<h4>OpenLP 2.2 for Windows 7 and higher</h4>
- <p>OpenLP-2.2-setup.exe</p>
+ <p>OpenLP-2.2-setup.exe / OpenLPPortable_2.2.paf.exe</p>
<p>
- <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe"; class="btn btn-success"><i class="fa fa-fw fa-download"></i> Direct Download</a>
- <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent"; class="btn btn-warning"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent</a>
- <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent"; class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
+ <div class="btn-group">
+ <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe"; class="btn btn-success"><i class="fa fa-fw fa-download"></i> Installer</a>
+ <div class="btn-group">
+ <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-cloud-download"></i> BitTorrent <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent";><i class="fa fa-fw fa-file"></i> Torrent File</a></li>
+ <li><a href="magnet:?xt=urn:btih:e496b1f1251e313b4fad630af81288180f380010&tr=udp://tracker.unit193.net:6969&tr=udp://open.demonii.com:1337"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="btn-group">
+ <a href="https://get.openlp.org/2.2/OpenLPPortable_2.2.paf.exe"; class="btn btn-primary"><i class="fa fa-fw fa-download"></i> PortableApps.com</a>
+ <div class="btn-group">
+ <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <i class="fa fa-fw fa-cloud-download"></i> BitTorrent <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="https://get.openlp.org/2.2/OpenLPPortable_2.2.paf.exe.torrent";><i class="fa fa-fw fa-file"></i> Torrent File</a></li>
+ <li><a href="magnet:?xt=urn:btih:4666535f08b091c38c8aab6cead166e45d27d36a&tr=udp://tracker.unit193.net:6969&tr=udp://open.demonii.com:1337"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
+ </ul>
+ </div>
+ </div>
</p>
</div>
<div class="macosx hidden">
@@ -293,7 +322,7 @@
<p>
<a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg"; class="btn btn-success"><i class="fa fa-fw fa-download"></i> Direct Download</a>
<a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg.torrent"; class="btn btn-warning"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent</a>
- <a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg.torrent"; class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
+ <a href="magnet:?xt=urn:btih:46a69790629817a731930545d7bb1ead052df62d&tr=udp://tracker.unit193.net:6969&tr=udp://open.demonii.com:1337" class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
</p>
</div>
<div class="linux hidden">
Follow ups
