timprove grammar in error message, decrease header size above form - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations
(HTM) git clone git://src.adamsgaard.dk/cosmo
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 7e8a413b4359f0b6207ec21ade99328990e1150d
(DIR) parent bcf49cd4344fed7ebb260868589c08208772486a
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 18 Aug 2015 13:19:58 +0200
improve grammar in error message, decrease header size above form
Diffstat:
M pages/history.html | 4 ++--
M uploadhistory.php | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
---
(DIR) diff --git a/pages/history.html b/pages/history.html
t@@ -2,8 +2,8 @@
<div class="container">
<br><br>
<!-- page header -->
- <h1 class="header center orange-text">Calculate Exposure and Erosion
- History</h1>
+ <h2 class="header center orange-text">Calculate Exposure and Erosion
+ History</h2>
<div class="row">
(DIR) diff --git a/uploadhistory.php b/uploadhistory.php
t@@ -31,6 +31,8 @@ if (count($missing_fields) > 0) {
// generate comma-separated list of missing field names
for ($i = 0; $i < count($missing_fields); $i++) {
+
+ // text before list of field names
if ($i == 0 && count($missing_fields) == 1) {
$error_msg .= '<p>The following value is missing: <b>';
} elseif ($i == 0) {
t@@ -41,6 +43,8 @@ if (count($missing_fields) > 0) {
$error_msg .= $missing_fields[$i];
} elseif ($i + 1 == count($missing_fields)) { // no comma for last word
$error_msg .= ' and ' . $missing_fields[$i];
+ } elseif ($i + 2 == count($missing_fields)) { // no oxford comma
+ $error_msg .= $missing_fields[$i] . ' ';
} else {
$error_msg .= $missing_fields[$i] . ', ';
}