blue
/
GregoBase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CDE modes + some small fixes

This commit is contained in:
Olivier Berten 2014-06-05 19:09:42 +01:00
parent 6a07c1932d
commit 3a9572ea43
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chant.php
View File

@ -201,15 +201,17 @@ foreach($proof as $r) {
if(count($proof) > 0 || $logged_in) { if(count($proof) > 0 || $logged_in) {
echo "</ul>\n"; echo "</ul>\n";
} }
echo '<p id="push1"><a href="#">Report a problem</a></p>'; if($logged_in) {
$report_form = '<form action="'.$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:'').'" method="post"><textarea name="pleasefix" class="gabc"></textarea><br /><input type="submit" /></form>'; echo '<p id="push1"><a href="#">Report a problem</a></p>';
$report_form = '<form action="'.$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:'').'" method="post"><textarea name="pleasefix" class="gabc"></textarea><br /><input type="submit" /></form>';
echo <<<POPUP1 echo <<<POPUP1
<div id="popup1"> <div id="popup1">
Please describe the problem:<br /> Please describe the problem:<br />
$report_form $report_form
</div> </div>
POPUP1; POPUP1;
}
echo "<h4>Download</h4>\n<ul>\n"; echo "<h4>Download</h4>\n<ul>\n";
$content = json_decode($c['gabc']); $content = json_decode($c['gabc']);
if(is_string($content)) { if(is_string($content)) {

8
chant_edit.php
View File

@ -286,7 +286,7 @@ if(!$logged_in) {
echo "<h4>Mode</h4>\n"; echo "<h4>Mode</h4>\n";
echo '<select name="mode">'."\n"; echo '<select name="mode">'."\n";
echo '<option value=""></option>'."\n"; echo '<option value=""></option>'."\n";
foreach(array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 'p' => 'T. pereg.') as $k => $v) { foreach(array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 'c' => 'C', 'd' => 'D', 'e' => 'E', 'p' => 'T. pereg.') as $k => $v) {
echo '<option value="'.$k.'"'.($c['mode']==$k?' selected="selected"':'').'>'.$v.'</option>'."\n"; echo '<option value="'.$k.'"'.($c['mode']==$k?' selected="selected"':'').'>'.$v.'</option>'."\n";
} }
echo "</select>\n"; echo "</select>\n";
@ -327,6 +327,9 @@ if(!$logged_in) {
$sources_box .= "</select>\n"; $sources_box .= "</select>\n";
echo $sources_box; echo $sources_box;
} }
echo "<h4>Remarks</h4>\n";
echo '<textarea name="remarks" class="gabc">'.$c['remarks']."</textarea>\n";
echo "<h4>Sources</h4>\n"; echo "<h4>Sources</h4>\n";
echo '<span style="margin-left:295px;">Page</span><span style="margin-left:40px;">Sequence</span><span style="margin-left:20px;">Extent</span>'; echo '<span style="margin-left:295px;">Page</span><span style="margin-left:40px;">Sequence</span><span style="margin-left:20px;">Extent</span>';
$i = 0; $i = 0;
@ -350,9 +353,6 @@ if(!$logged_in) {
} }
echo '<a href="#" class="add" rel=".clone2"><img src="list-add.png" alt="Add more" /></a>'; echo '<a href="#" class="add" rel=".clone2"><img src="list-add.png" alt="Add more" /></a>';
echo "<h4>Remarks</h4>\n";
echo '<textarea name="remarks" class="gabc">'.$c['remarks']."</textarea>\n";
echo '<p><input type="hidden" name="id" value="'.$id.'" /><input type="submit" /></p>'; echo '<p><input type="hidden" name="id" value="'.$id.'" /><input type="submit" /></p>';
foreach ($c_s as $s) { foreach ($c_s as $s) {

2
chant_img.php
View File

@ -135,6 +135,8 @@ function mgabc2tex($c, $firstverse = False) {
if($c['mode'] || $c['mode_var']) { if($c['mode'] || $c['mode_var']) {
if($c['mode'] == 'p') { if($c['mode'] == 'p') {
$mode = "T. pereg."; $mode = "T. pereg.";
} elseif(in_array($c['mode'], array('c','d','e'))) {
$mode = strtoupper($c['mode']).($c['mode_var']?' '.$c['mode_var']:'');
} else { } else {
$mode = $c['mode'].($c['mode_var']?' '.$c['mode_var']:''); $mode = $c['mode'].($c['mode_var']?' '.$c['mode_var']:'');
} }