openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Update jQuery and jQuery Mobile 

bzr-revno: 2426
This commit is contained in:
Samuel Mehrbrodt 2014-10-21 22:07:19 +01:00 committed by Tim Bentley
parent 5ecbfa61fd d0616aeb1d
commit 674cf930ef
14 changed files with 68 additions and 16967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/remotes/html/index.html
View File

@ -31,12 +31,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1" />
<title>${app_title}</title>
<link rel="stylesheet" href="/files/jquery.mobile.css" />
<link rel="stylesheet" href="/files/jquery.mobile.min.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/jquery.min.js"></script>
<script type="text/javascript" src="/files/openlp.js"></script>
<script type="text/javascript" src="/files/jquery.mobile.js"></script>
<script type="text/javascript" src="/files/jquery.mobile.min.js"></script>
<script type="text/javascript">
translationStrings = {
"go_live": "${go_live}",

9404
openlp/plugins/remotes/html/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

4
openlp/plugins/remotes/html/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
openlp/plugins/remotes/html/jquery.mobile.css
View File

File diff suppressed because one or more lines are too long

7551
openlp/plugins/remotes/html/jquery.mobile.js
View File

File diff suppressed because it is too large Load Diff

2
openlp/plugins/remotes/html/jquery.mobile.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
openlp/plugins/remotes/html/jquery.mobile.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
openlp/plugins/remotes/html/main.html
View File

@ -32,10 +32,10 @@
<title>${live_title}</title>
<link rel="stylesheet" href="/files/main.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/jquery.min.js"></script>
<script type="text/javascript" src="/files/main.js"></script>
</head>
<body>
<img id="image" class="size"/>
</body>
</html>
</html>

2
openlp/plugins/remotes/html/openlp.css
View File

@ -32,7 +32,7 @@
background-image: url(images/ui-icon-unblank.png);
}
/* Overwrite style from jquery-mobile.css */
/* Overwrite style from jquery-mobile.min.css */
.ui-li .ui-btn-text a.ui-link-inherit{
white-space: normal;
}

2
openlp/plugins/remotes/html/stage.html
View File

@ -32,7 +32,7 @@
<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/jquery.min.js"></script>
<script type="text/javascript" src="/files/stage.js"></script>
</head>
<body>

2
scripts/jenkins_script.py
View File

@ -106,7 +106,7 @@ class JenkinsTrigger(object):
def print_output(self):
"""
Print the status information of the build tirggered.
Print the status information of the build triggered.
"""
print('Add this to your merge proposal:')
print('--------------------------------')

6
tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py
View File

@ -38,12 +38,12 @@ TEST_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'presentationmanagersongs'))
class TestSongShowPlusFileImport(SongImportTestHelper):
class TestPresentationManagerFileImport(SongImportTestHelper):
def __init__(self, *args, **kwargs):
self.importer_class_name = 'PresentationManagerImport'
self.importer_module_name = 'presentationmanager'
super(TestSongShowPlusFileImport, self).__init__(*args, **kwargs)
super(TestPresentationManagerFileImport, self).__init__(*args, **kwargs)
def test_song_import(self):
"""
@ -51,3 +51,5 @@ class TestSongShowPlusFileImport(SongImportTestHelper):
"""
self.file_import([os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.sng')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.json')))
self.file_import([os.path.join(TEST_PATH, 'Agnus Dei.sng')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Agnus Dei.json')))

14
tests/resources/presentationmanagersongs/Agnus Dei.json Normal file
View File

@ -0,0 +1,14 @@
{
"title": "Agnus Dei",
"verse_order_list": ["v1", "v2"],
"verses": [
[
"Alleluia Alleluluia \nfor the Lord almighty reigns \nAlleluia Alleluluia \nHoly holy are you Lord God Almighty \nWorthy is the lamb \nWorthy is the lamb \nHoly holy are you Lord God Almighty",
"v1"
],
[
"Worthy is the lamb \nWorthy is the lamb \nYou are holy holy \nAre you lamb \nWorthy is the lamb \nYou are holy holy \nYou are holy holy",
"v2"
]
]
}

34
tests/resources/presentationmanagersongs/Agnus Dei.sng Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<song xmlns="creativelifestyles/song">
<attributes>
<title>Agnus Dei</title>
<author></author>
<copyright></copyright>
<ccli_number></ccli_number>
<comments></comments>
</attributes>
<verses>
<verse id="Verse 1">
Alleluia Alleluluia
for the Lord almighty reigns
Alleluia Alleluluia
Holy holy are you Lord God Almighty
Worthy is the lamb
Worthy is the lamb
Holy holy are you Lord God Almighty
</verse>
<verse id="Verse 2">
Worthy is the lamb
Worthy is the lamb
You are holy holy
Are you lamb
Worthy is the lamb
You are holy holy
You are holy holy
</verse>
</verses>
</song>