nutomic/joinpeertube
1
1
Fork 1
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'feature/continue-joinpeertube' into 'master'

Browse source 
Handle errors in instance listing

See merge request framasoft/joinpeertube!4
This commit is contained in:
Chocobozzz 2018-03-15 17:04:26 +01:00
commit ca4cf8e630
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
content/home.en.md
View file

@ -119,7 +119,8 @@ or the entire fediverse.
Liste des instances Liste des instances
<div id="instances-list" class="list-group"></div> <div id="instances-list" class="list-group"></div>
<div class="alert alert-info">This is like picking an e-mail hosting provider: the domain will also be part of your username!</div> <div id="instances-list-error" class="alert alert-danger" style="display: none">We are sorry but we failed to list available instances. Please try again later.</div>
<div class="alert alert-info">This is like picking an e-mail hosting provider: the domain will be part of your username!</div>
{{% /grid %}} {{% /grid %}}

3
content/home.fr.md
View file

@ -119,7 +119,8 @@ Liste des instances
<div id="instances-list" class="list-group"></div> <div id="instances-list" class="list-group"></div>
<div class="alert alert-info">This is like picking an e-mail hosting provider: the domain will also be part of your username!</div> <div id="instances-list-error" class="alert alert-danger" style="display: none">Nous sommes désolé mais nous n'arrivons pas à récupérer la liste des instances. Merci de réessayer plus tard.</div>
<div class="alert alert-info">C'est comme choisir un fournisseur d'email : le nom de domaine fera partie de votre identifiant !</div>
{{% /grid %}} {{% /grid %}}
{{% /grid %}} {{% /grid %}}

10
themes/hugo-bootstrap-premium/static/js/instances.js
View file

@ -6,8 +6,10 @@ $(function () {
signup: true, signup: true,
healthy: true healthy: true
} }
const instancesListElement = $('#instances-list')
$.get(instancesApi, data, function (res) { $.get(instancesApi, data)
.done(function (res) {
const instances = res.data const instances = res.data
const lis = [] const lis = []
@ -16,8 +18,10 @@ $(function () {
lis.push(el) lis.push(el)
}) })
$('#instances-list').append(lis) instancesListElement.append(lis)
})
.fail(function (err) {
$('#instances-list-error').css('display', 'block')
}) })
function createInstanceElement (host, name, description) { function createInstanceElement (host, name, description) {