diff --git a/chant.php b/chant.php index 70e2a7b..e5138d6 100644 --- a/chant.php +++ b/chant.php @@ -192,6 +192,9 @@ if($c['gabc_verses'] || $c['tex_verses']){ } echo "\n"; } +if($c['remarks'] > '') { + echo "

Remarks

\n

".nl2br($c['remarks'])."

\n"; +} $sql1 = 'SELECT * FROM '.db('changesets').' WHERE chant_id = '.$c['id'].' ORDER BY time DESC'; $req1 = $mysqli->query($sql1) or die('Erreur SQL !
'.$sql1.'
'.$mysqli->error); if($req1->num_rows > 0 || $c['transcriber'] > '') { diff --git a/chant_edit.php b/chant_edit.php index 902fe15..247bd2c 100644 --- a/chant_edit.php +++ b/chant_edit.php @@ -93,7 +93,7 @@ if(!$logged_in) { $mysqli->query($sql) or die('Erreur SQL !
'.$sql.'
'.$mysqli->error); $id = $mysqli->insert_id; $mypost['id'] = $id; - foreach(array('version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses') as $k) { + foreach(array('version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks') as $k) { if($mypost[$k] > '' && $mypost[$k] != "(c4)") { $sql = 'UPDATE '.db('chants').' SET `'.$k.'` = "'.$mysqli->real_escape_string($mypost[$k]).'" WHERE `id` = '.$id; $mysqli->query($sql) or die('Erreur SQL !
'.$sql.'
'.$mysqli->error); @@ -159,7 +159,7 @@ if(!$logged_in) { natcasesort($new_tags); unset($mypost['tags']); - $fields = array('id','incipit','version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses'); + $fields = array('id','incipit','version','office-part','mode','mode_var','commentary','initial','transcriber','gabc','gabc_verses','tex_verses','remarks'); $old = array(); $new = array(); foreach($fields as $f) { @@ -334,6 +334,9 @@ if(!$logged_in) { } echo 'Add more'; + echo "

Remarks

\n"; + echo '\n"; + echo '

'; foreach ($c_s as $s) { diff --git a/gregobase_structure.sql b/gregobase_structure.sql index a2a95d8..1acada3 100644 --- a/gregobase_structure.sql +++ b/gregobase_structure.sql @@ -1,11 +1,11 @@ -- phpMyAdmin SQL Dump --- version 4.0.4 +-- version 4.0.8 -- http://www.phpmyadmin.net -- -- Client: localhost --- Généré le: Mer 26 Juin 2013 à 17:28 --- Version du serveur: 5.5.31-0ubuntu0.12.04.2 --- Version de PHP: 5.4.17RC1 +-- Généré le: Jeu 24 Octobre 2013 à 07:46 +-- Version du serveur: 10.0.4-MariaDB-1~raring-log +-- Version de PHP: 5.5.5-1+debphp.org~raring+1 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; @@ -19,8 +19,6 @@ SET time_zone = "+00:00"; -- -- Base de données: `grego` -- -CREATE DATABASE IF NOT EXISTS `grego` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci; -USE `grego`; -- -------------------------------------------------------- @@ -37,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `gregobase_booklets` ( `content` text COLLATE utf8_unicode_ci, `options` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=432 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -------------------------------------------------------- @@ -85,8 +83,9 @@ CREATE TABLE IF NOT EXISTS `gregobase_chants` ( `gabc` text COLLATE utf8_unicode_ci, `gabc_verses` text COLLATE utf8_unicode_ci, `tex_verses` text COLLATE utf8_unicode_ci, + `remarks` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=3302 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -------------------------------------------------------- @@ -142,7 +141,7 @@ CREATE TABLE IF NOT EXISTS `gregobase_sources` ( `caption` text COLLATE utf8_unicode_ci NOT NULL, `pages` mediumtext COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=10 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -------------------------------------------------------- @@ -155,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `gregobase_tags` ( `tag` varchar(255) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `tag` (`tag`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; diff --git a/style.css b/style.css index 327e7f5..a20a477 100644 --- a/style.css +++ b/style.css @@ -155,6 +155,10 @@ code { margin-top: 0px; } +.remarks { + padding-left: 2em; +} + .version { color: #999; font-size: 8pt;