Mercurial > hg > fapweb
changeset 752:c714140541d5
Add more data to previewTypeList array and implement array index argument in
stGetFormOptionListFromArray().
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 20 Nov 2014 08:24:30 +0200 |
| parents | 025380b800a2 |
| children | 5fce9011101a |
| files | admajax.php msite.inc.php msitegen.inc.php |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/admajax.php Thu Nov 20 08:01:28 2014 +0200 +++ b/admajax.php Thu Nov 20 08:24:30 2014 +0200 @@ -128,7 +128,7 @@ " ".stGetFormCheckBoxInput("voting", $id, $prefix, $item["voting"], "Enable voting", "onChange=\"setCompoData(".$id.",'voting')\""). " ".stGetFormCheckBoxInput("show_authors", $id, $prefix, $item["show_authors"], "Show authors")."\n". - " ".stGetFormOptionListFromArray($prefix."preview_type".$id, " ", FALSE, $previewTypeList, $item["preview_type"], 0)."\n"; + " ".stGetFormOptionListFromArray($prefix."preview_type".$id, " ", FALSE, $previewTypeList, $item["preview_type"], 0, 0)."\n"; break; default: @@ -138,7 +138,7 @@ return " <h2>#".$id." - ".chentities($item["name"])."</h2>\n". - " Type: ".stGetFormOptionListFromArray($prefix."type".$id, " ", FALSE, $compoModeData, $item["ctype"], 0, "updateCompoType(".$id.")"). + " Type: ".stGetFormOptionListFromArray($prefix."type".$id, " ", FALSE, $compoModeData, $item["ctype"], 0, 0, "updateCompoType(".$id.")"). " - ".$compoModeData[$item["ctype"]][1]."<br />\n". " Name: ".stGetFormTextInput(40, SET_LEN_COMPO_NAME, "name", $id, $prefix, $item["name"])."<br />\n". $str1. @@ -210,7 +210,7 @@ if ($mode) stGetFormOptionListFromArray($prefix."preview_type".$eid, " ", FALSE, $previewTypeList, $item["preview_type"], 0); else - echo " ".$previewTypeList[$item["preview_type"]]; + echo " ".$previewTypeList[$item["preview_type"]][1]; echo " </div>\n"; break;
--- a/msite.inc.php Thu Nov 20 08:01:28 2014 +0200 +++ b/msite.inc.php Thu Nov 20 08:24:30 2014 +0200 @@ -50,9 +50,9 @@ define("EPREV_AUDIO", 2); // Preview is audio (Vorbis, MP3) $previewTypeList = array( - EPREV_NONE => "No previews", - EPREV_IMAGE => "Image file", - EPREV_AUDIO => "Audio file", + EPREV_NONE => array("No previews" , "Default"), + EPREV_IMAGE => array("Image file" , "Image"), + EPREV_AUDIO => array("Audio file" , "Audio"), );
--- a/msitegen.inc.php Thu Nov 20 08:01:28 2014 +0200 +++ b/msitegen.inc.php Thu Nov 20 08:24:30 2014 +0200 @@ -305,7 +305,7 @@ } -function stGetFormOptionListFromArray($id, $indent, $outer, $data, $active, $size = 10, $onChange = "") +function stGetFormOptionListFromArray($id, $indent, $outer, $data, $active, $size = 10, $arrIndex = 0, $onChange = "") { $str = stGetFormOptionListStart($id, $indent, $outer, $size, $onChange); @@ -313,7 +313,7 @@ { $str .= stGetFormOptionListItem($indent." ", $key, ($key == $active), - is_array($value) ? $value[0] : $value); + is_array($value) ? $value[$arrIndex] : $value); } return $str.stGetFormOptionListEnd($indent, $outer);