Deal better with chants without incipit

This commit is contained in:
Olivier Berten 2017-03-03 21:50:34 +01:00
parent d4bf7cc443
commit 578fcce0e8
6 changed files with 7 additions and 7 deletions

View File

@ -15,7 +15,7 @@ if(!$c) {
die('Wrong id'); die('Wrong id');
} }
$title = $c['incipit']; $title = $c['incipit']?$c['incipit']:'░░'.$c['id'].'░░';
$custom_header = <<<HEADER $custom_header = <<<HEADER
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="jquery.bpopup.min.js"></script> <script type="text/javascript" src="jquery.bpopup.min.js"></script>
@ -77,7 +77,7 @@ echo '<div id="info">
'; ';
$sql = 'SELECT * FROM '.db('pleasefix').' WHERE chant_id = '.$id.' AND fixed = 0'; $sql = 'SELECT * FROM '.db('pleasefix').' WHERE chant_id = '.$id.' AND fixed = 0';
$req = $mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error); $req = $mysqli->query($sql) or die('Erreur SQL !<br />'.$sql.'<br />'.$mysqli->error);
echo '<h3>'.format_incipit($c['incipit']); echo '<h3>'.format_incipit($title);
if($req->num_rows > 0) { if($req->num_rows > 0) {
echo '<span id="push2"> <a href="#"><img src="warning.png" alt="Warning!" /></a></span>'; echo '<span id="push2"> <a href="#"><img src="warning.png" alt="Warning!" /></a></span>';
} }

View File

@ -25,7 +25,7 @@ if(count($chants)) {
} }
echo "<ul class=\"incipit\">\n"; echo "<ul class=\"incipit\">\n";
foreach($chants as $c) { foreach($chants as $c) {
$incipit = $c['incipit']?format_incipit($c['incipit']):"░░░░"; $incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
echo '<li class="usage-marker '.$c['office-part'].'">'; echo '<li class="usage-marker '.$c['office-part'].'">';
if($c['gabc'] > '') { if($c['gabc'] > '') {
echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>"; echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";

View File

@ -6,7 +6,7 @@ function chant_from_id($c) {
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error); $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$chants = array(); $chants = array();
$ch = $req1->fetch_assoc(); $ch = $req1->fetch_assoc();
return array($ch['office-part'], $ch['incipit'] > ''?$ch['incipit']:'░░░░', $ch['gabc'] > '', $ch['version']); return array($ch['office-part'], $ch['incipit'] > ''?$ch['incipit']:'░░'.$c.'░░', $ch['gabc'] > '', $ch['version']);
} }
define("HOST", ""); // The host you want to connect to. define("HOST", ""); // The host you want to connect to.

View File

@ -10,7 +10,7 @@ $sql1 = 'SELECT * FROM '.db('chants').' WHERE `gabc` IS NULL ORDER BY incipit AS
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error); $req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
echo "<ul class=\"incipit\">\n"; echo "<ul class=\"incipit\">\n";
while($c = $req1->fetch_assoc()) { while($c = $req1->fetch_assoc()) {
$incipit = $c['incipit']?format_incipit($c['incipit']):"==="; $incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
echo '<li class="usage-marker '.$c['office-part'].'">'; echo '<li class="usage-marker '.$c['office-part'].'">';
echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>"; echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";
echo ' <span class="version">('.$c['version'].")</span></li>\n"; echo ' <span class="version">('.$c['version'].")</span></li>\n";

View File

@ -26,7 +26,7 @@ if(count($chants)) {
} }
echo "<ul class=\"incipit\">\n"; echo "<ul class=\"incipit\">\n";
foreach($chants as $c) { foreach($chants as $c) {
$incipit = $c['incipit']?format_incipit($c['incipit']):"==="; $incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
echo '<li class="usage-marker '.$c['office-part'].'">'; echo '<li class="usage-marker '.$c['office-part'].'">';
if($c['gabc'] > '') { if($c['gabc'] > '') {
echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>"; echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";

View File

@ -24,7 +24,7 @@ if(count($chants)) {
} }
echo "<ul>\n"; echo "<ul>\n";
foreach($chants as $c) { foreach($chants as $c) {
$incipit = $c['incipit']?format_incipit($c['incipit']):"==="; $incipit = $c['incipit']?format_incipit($c['incipit']):'░░'.$c['id'].'░░';
echo '<li>'; echo '<li>';
if($c['gabc'] > '') { if($c['gabc'] > '') {
echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>"; echo '<a href="chant.php?id='.$c['id'].'">'.$incipit."</a>";