{"action":"created","comment":{"url":"https://api.github.com/repos/ngld/knossos/pulls/comments/241569350","pull_request_review_id":184874236,"id":241569350,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDI0MTU2OTM1MA==","diff_hunk":"@@ -436,30 +455,51 @@ export default {\n \n                 <div v-if=\"popup_mode === 'retail_prompt'\">\n                     <p>\n-                        You're trying to install an FS2 mod which requires retail files which you don't have.<br>\n-                        Please select the folder of your FS2 installation or the FS2 installer from GOG (setup_freespace2_....exe).\n-                    </p>\n-                    <p>\n-                        <strong v-if=\"retail_searching\">Searching files...</strong>\n-                        <strong v-else-if=\"retail_found\">Folder found!</strong>\n-                        <strong v-else>\n-                            Nothing found, please select the appropriate folder or install FS2 and\n-                            <a href=\"#\" @click.prevent=\"retailAutoDetect\">try again</a>.\n-                        </strong>\n+                        <span v-if=\"mod_install_attempted\">You need the FreeSpace 2 data files to play this mod.<br></span>\n+                        Choose how you want to install FreeSpace 2.\n                     </p>\n-                    <form class=\"form-horizontal\">\n+                    <form class=\"form-horizontal col-xs-12\">\n                         <div class=\"form-group\">\n-                            <div class=\"col-xs-8\">\n-                                <input type=\"text\" class=\"form-control\" v-model=\"retail_data_path\" :disabled=\"retail_searching\">\n-                            </div>\n-                            <div class=\"col-xs-4\">\n-                                <button class=\"btn btn-default\" @click.prevent=\"selectRetailFolder\">Browse...</button>\n-                                <button class=\"btn btn-default\" @click.prevent=\"selectRetailFile\">Select .exe</button>\n-                            </div>\n+                            <input type=\"radio\" id=\"auto-detect-installation\" value=\"auto-detect-installation\" v-model=\"retail_install_option\" @click=\"retailAutoDetect\">\n+                            <label for=\"auto-detect-installation\">Auto-detect installation</label>\n+                            <br>\n+                            <input type=\"radio\" id=\"select-installation-folder\" value=\"select-installation-folder\" v-model=\"retail_install_option\" @click=\"retail_data_path = ''\">\n+                            <label for=\"select-installation-folder\">Select installation folder</label>\n+                            <br>\n+                            <input type=\"radio\" id=\"select-installer-file\" value=\"select-installer-file\" v-model=\"retail_install_option\" @click=\"retail_data_path = ''\">\n+                            <label for=\"select-installer-file\">Select GOG installer file</label>\n                         </div>\n                     </form>\n-                    \n-                    <p><button class=\"btn btn-primary\" @click=\"finishRetailPrompt\">Continue</button></p>\n+                    <p v-if=\"retail_install_option === 'select-installation-folder'\">\n+                        Select the folder that has the FreeSpace 2 data files. The folder should include the file <strong>Root_fs2.vp</strong>.<br>\n+                        Knossos will copy the files into the Knossos folder.\n+                    </p>\n+                    <p v-else-if=\"retail_install_option === 'select-installer-file'\">\n+                        Select the GOG FreeSpace 2 installer (example: setup_freespace2_2.0.0.8.exe).<br>\n+                        Knossos will extract the data files from the installer.\n+                    </p>\n+                    <p v-else>\n+                        <span v-if=\"retail_searching\"><strong>Searching files...</strong></span>\n+                        <span v-else-if=\"retail_found\"><strong>FreeSpace 2 folder found</strong> at<br>\n+                        {{  retail_data_path  }}</span>\n+                        <span v-else>\n+                            <strong>FreeSpace 2 folder auto-detection failed.</strong><br>\n+                            Choose another install option or install FreeSpace 2 and\n+                            <a href=\"#\" @click.prevent=\"retailAutoDetect\">try again</a>.\n+                        </span>\n+                    </p>\n+                    <p>\n+                        <div class=\"input-group\" :style=\"{ visibility: (retail_install_option !== 'auto-detect-installation') ? 'visible' : 'hidden' }\">\n+                            <input type=\"text\" class=\"form-control\" v-model=\"retail_data_path\" :disabled=\"retail_searching\">","path":"html/templates/kn-page.vue","position":146,"original_position":146,"commit_id":"62e6805641200ab523c2e57f297d2f9752e45a2d","original_commit_id":"62e6805641200ab523c2e57f297d2f9752e45a2d","user":{"login":"ngld","id":5465775,"node_id":"MDQ6VXNlcjU0NjU3NzU=","avatar_url":"https://avatars3.githubusercontent.com/u/5465775?v=4","gravatar_id":"","url":"https://api.github.com/users/ngld","html_url":"https://github.com/ngld","followers_url":"https://api.github.com/users/ngld/followers","following_url":"https://api.github.com/users/ngld/following{/other_user}","gists_url":"https://api.github.com/users/ngld/gists{/gist_id}","starred_url":"https://api.github.com/users/ngld/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngld/subscriptions","organizations_url":"https://api.github.com/users/ngld/orgs","repos_url":"https://api.github.com/users/ngld/repos","events_url":"https://api.github.com/users/ngld/events{/privacy}","received_events_url":"https://api.github.com/users/ngld/received_events","type":"User","site_admin":false},"body":"This input field is only visible if the user doesn't want to use auto-detection but is disabled while that's running. We should either make explain why the field is disabled. Something like:\r\n```\r\n:placeholder=\"retail_install_option === 'auto-detect-installation' && retail_searching ? 'Looking for FS2...' : ''\"\r\n```\r\nOr remove the `:disabled` attribute. In the latter case we also need to ensure that the result of the auto detection doesn't overwrite anything the user entered (probably check if `retail_install_option` is `auto-detect-installation` before updating `retail_data_path` in `retailAutoDetect`.","created_at":"2018-12-13T21:34:07Z","updated_at":"2018-12-13T21:41:45Z","html_url":"https://github.com/ngld/knossos/pull/147#discussion_r241569350","pull_request_url":"https://api.github.com/repos/ngld/knossos/pulls/147","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/ngld/knossos/pulls/comments/241569350"},"html":{"href":"https://github.com/ngld/knossos/pull/147#discussion_r241569350"},"pull_request":{"href":"https://api.github.com/repos/ngld/knossos/pulls/147"}}},"pull_request":{"url":"https://api.github.com/repos/ngld/knossos/pulls/147","id":237566097,"node_id":"MDExOlB1bGxSZXF1ZXN0MjM3NTY2MDk3","html_url":"https://github.com/ngld/knossos/pull/147","diff_url":"https://github.com/ngld/knossos/pull/147.diff","patch_url":"https://github.com/ngld/knossos/pull/147.patch","issue_url":"https://api.github.com/repos/ngld/knossos/issues/147","number":147,"state":"open","locked":false,"title":"Revise post-setup retail install prompt","user":{"login":"jg18","id":6183333,"node_id":"MDQ6VXNlcjYxODMzMzM=","avatar_url":"https://avatars2.githubusercontent.com/u/6183333?v=4","gravatar_id":"","url":"https://api.github.com/users/jg18","html_url":"https://github.com/jg18","followers_url":"https://api.github.com/users/jg18/followers","following_url":"https://api.github.com/users/jg18/following{/other_user}","gists_url":"https://api.github.com/users/jg18/gists{/gist_id}","starred_url":"https://api.github.com/users/jg18/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jg18/subscriptions","organizations_url":"https://api.github.com/users/jg18/orgs","repos_url":"https://api.github.com/users/jg18/repos","events_url":"https://api.github.com/users/jg18/events{/privacy}","received_events_url":"https://api.github.com/users/jg18/received_events","type":"User","site_admin":false},"body":"Improve UX of the post-setup retail install process.\r\n\r\nP.S. I think I'm getting the hang of this! 😁\r\n\r\nP.P.S. Although I added the `inline-button` class to the Browse... button which is from my \"revise welcome page\" PR #145 . I also couldn't get the `inline-button` class to work when I tried to adapt something from the other PR, presumably something to do with some other CSS rules overriding it, but I don't know what 😠 ","created_at":"2018-12-11T06:38:14Z","updated_at":"2018-12-13T21:41:45Z","closed_at":null,"merged_at":null,"merge_commit_sha":"531a28fa916e0a99b1fa0d373a0bf41e80630679","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/ngld/knossos/pulls/147/commits","review_comments_url":"https://api.github.com/repos/ngld/knossos/pulls/147/comments","review_comment_url":"https://api.github.com/repos/ngld/knossos/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ngld/knossos/issues/147/comments","statuses_url":"https://api.github.com/repos/ngld/knossos/statuses/62e6805641200ab523c2e57f297d2f9752e45a2d","head":{"label":"jg18:revise-retail-prompt","ref":"revise-retail-prompt","sha":"62e6805641200ab523c2e57f297d2f9752e45a2d","user":{"login":"jg18","id":6183333,"node_id":"MDQ6VXNlcjYxODMzMzM=","avatar_url":"https://avatars2.githubusercontent.com/u/6183333?v=4","gravatar_id":"","url":"https://api.github.com/users/jg18","html_url":"https://github.com/jg18","followers_url":"https://api.github.com/users/jg18/followers","following_url":"https://api.github.com/users/jg18/following{/other_user}","gists_url":"https://api.github.com/users/jg18/gists{/gist_id}","starred_url":"https://api.github.com/users/jg18/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jg18/subscriptions","organizations_url":"https://api.github.com/users/jg18/orgs","repos_url":"https://api.github.com/users/jg18/repos","events_url":"https://api.github.com/users/jg18/events{/privacy}","received_events_url":"https://api.github.com/users/jg18/received_events","type":"User","site_admin":false},"repo":{"id":87976254,"node_id":"MDEwOlJlcG9zaXRvcnk4Nzk3NjI1NA==","name":"knossos","full_name":"jg18/knossos","private":false,"owner":{"login":"jg18","id":6183333,"node_id":"MDQ6VXNlcjYxODMzMzM=","avatar_url":"https://avatars2.githubusercontent.com/u/6183333?v=4","gravatar_id":"","url":"https://api.github.com/users/jg18","html_url":"https://github.com/jg18","followers_url":"https://api.github.com/users/jg18/followers","following_url":"https://api.github.com/users/jg18/following{/other_user}","gists_url":"https://api.github.com/users/jg18/gists{/gist_id}","starred_url":"https://api.github.com/users/jg18/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jg18/subscriptions","organizations_url":"https://api.github.com/users/jg18/orgs","repos_url":"https://api.github.com/users/jg18/repos","events_url":"https://api.github.com/users/jg18/events{/privacy}","received_events_url":"https://api.github.com/users/jg18/received_events","type":"User","site_admin":false},"html_url":"https://github.com/jg18/knossos","description":"A mod launcher/installer for FSO","fork":true,"url":"https://api.github.com/repos/jg18/knossos","forks_url":"https://api.github.com/repos/jg18/knossos/forks","keys_url":"https://api.github.com/repos/jg18/knossos/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jg18/knossos/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jg18/knossos/teams","hooks_url":"https://api.github.com/repos/jg18/knossos/hooks","issue_events_url":"https://api.github.com/repos/jg18/knossos/issues/events{/number}","events_url":"https://api.github.com/repos/jg18/knossos/events","assignees_url":"https://api.github.com/repos/jg18/knossos/assignees{/user}","branches_url":"https://api.github.com/repos/jg18/knossos/branches{/branch}","tags_url":"https://api.github.com/repos/jg18/knossos/tags","blobs_url":"https://api.github.com/repos/jg18/knossos/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jg18/knossos/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jg18/knossos/git/refs{/sha}","trees_url":"https://api.github.com/repos/jg18/knossos/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jg18/knossos/statuses/{sha}","languages_url":"https://api.github.com/repos/jg18/knossos/languages","stargazers_url":"https://api.github.com/repos/jg18/knossos/stargazers","contributors_url":"https://api.github.com/repos/jg18/knossos/contributors","subscribers_url":"https://api.github.com/repos/jg18/knossos/subscribers","subscription_url":"https://api.github.com/repos/jg18/knossos/subscription","commits_url":"https://api.github.com/repos/jg18/knossos/commits{/sha}","git_commits_url":"https://api.github.com/repos/jg18/knossos/git/commits{/sha}","comments_url":"https://api.github.com/repos/jg18/knossos/comments{/number}","issue_comment_url":"https://api.github.com/repos/jg18/knossos/issues/comments{/number}","contents_url":"https://api.github.com/repos/jg18/knossos/contents/{+path}","compare_url":"https://api.github.com/repos/jg18/knossos/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jg18/knossos/merges","archive_url":"https://api.github.com/repos/jg18/knossos/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jg18/knossos/downloads","issues_url":"https://api.github.com/repos/jg18/knossos/issues{/number}","pulls_url":"https://api.github.com/repos/jg18/knossos/pulls{/number}","milestones_url":"https://api.github.com/repos/jg18/knossos/milestones{/number}","notifications_url":"https://api.github.com/repos/jg18/knossos/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jg18/knossos/labels{/name}","releases_url":"https://api.github.com/repos/jg18/knossos/releases{/id}","deployments_url":"https://api.github.com/repos/jg18/knossos/deployments","created_at":"2017-04-11T20:25:05Z","updated_at":"2018-12-06T05:36:55Z","pushed_at":"2018-12-11T06:31:33Z","git_url":"git://github.com/jg18/knossos.git","ssh_url":"git@github.com:jg18/knossos.git","clone_url":"https://github.com/jg18/knossos.git","svn_url":"https://github.com/jg18/knossos","homepage":"https://dev.tproxy.de/knossos/","size":6203,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"ngld:develop","ref":"develop","sha":"d8995f49cfde9125336b52b2812fd2a9d6582217","user":{"login":"ngld","id":5465775,"node_id":"MDQ6VXNlcjU0NjU3NzU=","avatar_url":"https://avatars3.githubusercontent.com/u/5465775?v=4","gravatar_id":"","url":"https://api.github.com/users/ngld","html_url":"https://github.com/ngld","followers_url":"https://api.github.com/users/ngld/followers","following_url":"https://api.github.com/users/ngld/following{/other_user}","gists_url":"https://api.github.com/users/ngld/gists{/gist_id}","starred_url":"https://api.github.com/users/ngld/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngld/subscriptions","organizations_url":"https://api.github.com/users/ngld/orgs","repos_url":"https://api.github.com/users/ngld/repos","events_url":"https://api.github.com/users/ngld/events{/privacy}","received_events_url":"https://api.github.com/users/ngld/received_events","type":"User","site_admin":false},"repo":{"id":16528023,"node_id":"MDEwOlJlcG9zaXRvcnkxNjUyODAyMw==","name":"knossos","full_name":"ngld/knossos","private":false,"owner":{"login":"ngld","id":5465775,"node_id":"MDQ6VXNlcjU0NjU3NzU=","avatar_url":"https://avatars3.githubusercontent.com/u/5465775?v=4","gravatar_id":"","url":"https://api.github.com/users/ngld","html_url":"https://github.com/ngld","followers_url":"https://api.github.com/users/ngld/followers","following_url":"https://api.github.com/users/ngld/following{/other_user}","gists_url":"https://api.github.com/users/ngld/gists{/gist_id}","starred_url":"https://api.github.com/users/ngld/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngld/subscriptions","organizations_url":"https://api.github.com/users/ngld/orgs","repos_url":"https://api.github.com/users/ngld/repos","events_url":"https://api.github.com/users/ngld/events{/privacy}","received_events_url":"https://api.github.com/users/ngld/received_events","type":"User","site_admin":false},"html_url":"https://github.com/ngld/knossos","description":"A mod launcher/installer for FSO","fork":false,"url":"https://api.github.com/repos/ngld/knossos","forks_url":"https://api.github.com/repos/ngld/knossos/forks","keys_url":"https://api.github.com/repos/ngld/knossos/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ngld/knossos/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ngld/knossos/teams","hooks_url":"https://api.github.com/repos/ngld/knossos/hooks","issue_events_url":"https://api.github.com/repos/ngld/knossos/issues/events{/number}","events_url":"https://api.github.com/repos/ngld/knossos/events","assignees_url":"https://api.github.com/repos/ngld/knossos/assignees{/user}","branches_url":"https://api.github.com/repos/ngld/knossos/branches{/branch}","tags_url":"https://api.github.com/repos/ngld/knossos/tags","blobs_url":"https://api.github.com/repos/ngld/knossos/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ngld/knossos/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ngld/knossos/git/refs{/sha}","trees_url":"https://api.github.com/repos/ngld/knossos/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ngld/knossos/statuses/{sha}","languages_url":"https://api.github.com/repos/ngld/knossos/languages","stargazers_url":"https://api.github.com/repos/ngld/knossos/stargazers","contributors_url":"https://api.github.com/repos/ngld/knossos/contributors","subscribers_url":"https://api.github.com/repos/ngld/knossos/subscribers","subscription_url":"https://api.github.com/repos/ngld/knossos/subscription","commits_url":"https://api.github.com/repos/ngld/knossos/commits{/sha}","git_commits_url":"https://api.github.com/repos/ngld/knossos/git/commits{/sha}","comments_url":"https://api.github.com/repos/ngld/knossos/comments{/number}","issue_comment_url":"https://api.github.com/repos/ngld/knossos/issues/comments{/number}","contents_url":"https://api.github.com/repos/ngld/knossos/contents/{+path}","compare_url":"https://api.github.com/repos/ngld/knossos/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ngld/knossos/merges","archive_url":"https://api.github.com/repos/ngld/knossos/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ngld/knossos/downloads","issues_url":"https://api.github.com/repos/ngld/knossos/issues{/number}","pulls_url":"https://api.github.com/repos/ngld/knossos/pulls{/number}","milestones_url":"https://api.github.com/repos/ngld/knossos/milestones{/number}","notifications_url":"https://api.github.com/repos/ngld/knossos/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ngld/knossos/labels{/name}","releases_url":"https://api.github.com/repos/ngld/knossos/releases{/id}","deployments_url":"https://api.github.com/repos/ngld/knossos/deployments","created_at":"2014-02-04T22:32:40Z","updated_at":"2018-12-13T21:14:48Z","pushed_at":"2018-12-13T21:14:46Z","git_url":"git://github.com/ngld/knossos.git","ssh_url":"git@github.com:ngld/knossos.git","clone_url":"https://github.com/ngld/knossos.git","svn_url":"https://github.com/ngld/knossos","homepage":"https://fsnebula.org/knossos/","size":6215,"stargazers_count":12,"watchers_count":12,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":12,"mirror_url":null,"archived":false,"open_issues_count":25,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":12,"open_issues":25,"watchers":12,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/ngld/knossos/pulls/147"},"html":{"href":"https://github.com/ngld/knossos/pull/147"},"issue":{"href":"https://api.github.com/repos/ngld/knossos/issues/147"},"comments":{"href":"https://api.github.com/repos/ngld/knossos/issues/147/comments"},"review_comments":{"href":"https://api.github.com/repos/ngld/knossos/pulls/147/comments"},"review_comment":{"href":"https://api.github.com/repos/ngld/knossos/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ngld/knossos/pulls/147/commits"},"statuses":{"href":"https://api.github.com/repos/ngld/knossos/statuses/62e6805641200ab523c2e57f297d2f9752e45a2d"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"ngld"}}