Mercurial > hg > fapweb
changeset 979:678b44a20e1a
Implement rest of notes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 29 Nov 2014 13:19:54 +0200 |
| parents | 2c435f651a47 |
| children | 18b48fe650ec |
| files | admajax.php msite.inc.php |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/admajax.php Sat Nov 29 13:09:37 2014 +0200 +++ b/admajax.php Sat Nov 29 13:19:54 2014 +0200 @@ -153,12 +153,14 @@ " - ".$compoModeData[$item["ctype"]][1]."<br />\n". " Name: ".stGetFormTextInput(40, SET_LEN_COMPO_NAME, "name", $id, $prefix, $item["name"])."<br />\n". $str1. - " ".stGetFormTextArea(8, 60, "description", $id, $prefix, $item["description"])."<br />\n". - " ".stGetFormTextArea(8, 40, "notes", $id, $prefix, $item["notes"])."\n". + "<div class=\"compoDesc\"><h3>Description</h3>".stGetFormTextArea(8, 60, "description", $id, $prefix, $item["description"])."</div>\n". + "<div class=\"compoDesc\"><h3>Notes (shown in results)</h3>".stGetFormTextArea(8, 60, "notes", $id, $prefix, $item["notes"])."</div>\n". + "<div>\n". " ".stGetFormCheckBoxInput("visible", $id, $prefix, $item["visible"], "Visible")."\n". $str2."\n". " ".stGetFormButtonInput("update", $id, $prefix, "Update", "updateCompo(".$id.")")."\n". - " ".stGetFormButtonInput("delete", $id, $prefix, "Delete", "deleteCompo(".$id.")")."\n"; + " ".stGetFormButtonInput("delete", $id, $prefix, "Delete", "deleteCompo(".$id.")")."\n". + "</div>\n"; }
--- a/msite.inc.php Sat Nov 29 13:09:37 2014 +0200 +++ b/msite.inc.php Sat Nov 29 13:19:54 2014 +0200 @@ -835,7 +835,9 @@ $prev = $entry["position"]; } - $out .= "\n\n".($html ? "</pre>\n" : ""); + $out .= + "\n".($compo["notes"] != "" ? "NOTES: ".chentities($compo["notes"])."\n" : ""). + "\n".($html ? "</pre>\n" : ""); } return $out;