"Latest set of changes up to go live."

bzr-revno: 19
This commit is contained in:
raoul@snyman.info 2015-10-18 15:10:51 +02:00 committed by Raoul Snyman
commit 955c1c7506
6 changed files with 65 additions and 26 deletions

View File

@ -103,6 +103,9 @@ Internals
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 @@ startup, but it is recommended that you make your own backup too.
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 @@ As leader of the project, I'd like to say a special thank you to the folks invol
.. 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`_ ]

View File

@ -408,6 +408,9 @@ CODE_COLOR_SCHEME = 'monokai'
# ("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

View File

@ -7,5 +7,5 @@ fi
$NIKOLA clean
$NIKOLA build
cd output
rsync -r -a -v -z -e ssh * openlp@openlp.org:public_html/beta/
rsync -r -a -v -z -e ssh * openlp@openlp.org:public_html/
cd ..

BIN
files/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -319,8 +319,8 @@ p.indent {
margin-left: 3em;
}
a.screenshot-gallery {
display: block;
div.screenshot {
border-radius: 6px;
border: 4px solid #efefef;
margin: 0 10px;
}

View File

@ -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&amp;tr=udp://tracker.unit193.net:6969&amp;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&amp;tr=udp://tracker.unit193.net:6969&amp;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">