{"action":"created","comment":{"url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/comments/39638146","id":39638146,"diff_hunk":"@@ -0,0 +1,120 @@\n+<nav class=\"navbar navbar-default\">\n+  <div class=\"container-fluid\">\n+    <!-- Brand and toggle get grouped for better mobile display -->\n+    <div class=\"navbar-header\">\n+      <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#bs-example-navbar-collapse-1\" aria-expanded=\"false\">\n+      <span class=\"sr-only\">Toggle navigation</span>\n+      <span class=\"icon-bar\"></span>\n+      <span class=\"icon-bar\"></span>\n+      <span class=\"icon-bar\"></span>\n+      </button>\n+      <a class=\"navbar-brand myLogo\" href=\"/#/\">\n+      <img src=\"<%= asset_path('logo.png') %>\" width=\"100\" height=\"55\" >\n+      </a>\n+    </div>\n+    <!-- Collect the nav links, forms, and other content for toggling -->\n+    <div class=\"collapse navbar-collapse\" id=\"bs-example-navbar-collapse-1\">\n+      <ul class=\"nav navbar-nav navbar-left\">\n+        <li><a href=\"#/vocabs\"><strong>Vocabulary</strong></a></li>\n+        <li><a href=\"#/flashcards\"><strong>Chinese Vocab Flash Cards</strong></a></li>\n+      </ul>\n+      <ul class=\"nav navbar-nav navbar-right\">\n+        <li class=\"active\"><a href=\"#/profile\">Edit Profile <span class=\"sr-only\">(current)</span></a></li>\n+        <li><a href=\"#/\">Log Out</a></li>\n+      </ul>\n+    </div>\n+    <!-- /.navbar-collapse -->\n+  </div>\n+  <!-- /.container-fluid -->\n+</nav>\n+\n+\n+<div class=\"container-fluid\" id=\"landing\">\n+  <div class=\"col-xs-5 col-md-2\"></div>\n+\n+  <div class=\"col-xs-8 col-md-8\">\n+    <font color=\"black\">\n+\n+    <div class=title>\n+      <h3>\n+        <strong>\n+          <br>\n+\n+          <i>\n+            <ins>\n+              Improve your Chinese Literacy\n+            </ins>\n+          </i>\n+          !\n+        </br>\n+      </strong>\n+      </h3>\n+    </div>\n+\n+           <h4>\n+            Introduction\n+           </h4>\n+\n+\n+          <p>To learn how to read and write chinese characters, the most important thing is to understand each character's context, its meaning, and how it is associated with other characters.\n+          </p>\n+\n+          <p>There are many words that are hard to memorize and require you to check to dictionary for pronounciation, pinyin, and english translation.\n+          </p>\n+\n+          <p>Since China has adopted simplified characters for all formal writing, I recommend learning both traditional and simplified characters.\n+          </p>\n+\n+          <p>Mecha-Assist's website tries to provide features to help facilitate your learning. Memorization happens not by brute force but by reasoning and practice.\n+          </p>\n+\n+        <h4>\n+          Vocabulary\n+        </h4>\n+\n+          <ol>\n+            <li>Insert chinese article of your choice.</li>\n+\n+            <img src=\"http://www.chinese-community-center.org/images%5Ccarticle1.jpg\" height=\"25%\" width=\"25%\" />\n+            <li>Choose to convert between traditional or simplified Chinese.</li>\n+            <img src=\"http://pinpinchinese.com/wp-content/uploads/simplified-vs-traditional-chinese-characters.png\" height=\"45%\" width=\"45%\" />\n+            <li>Click the submit button to annote text with pinyin and get each character's english translation.</li>\n+            <img src=\" http://pinyin.info/news/news_photos/2009/08/fortress_besieged_sample.gif\" height=\"45%\" width=\"45%\" />\n+            <li>Hide the pinyin annotation. Try to read it again. </li>\n+            <li>If you can't read it, double click the word to include in your vocabulary.</li>\n+            <li> Click edit to add any additional english defintions or hints to help you memorize the word. </li>\n+          </ol>\n+\n+        <h4>\n+          Read & Test Idioms\n+        </h4>\n+\n+        <ol>\n+          <li>Vocabs are transfered to this page.</li>\n+          <img src=\"http://www.archchinese.com/learn_chinese_characters.png\" height=\"35%\" width=\"35%\" />\n+          <li>Try to read each vocab out loud.</li>\n+          <li>If you can't read it, click on the 'read out loud' button.</li>\n+          <li>Try to guess the definition before checking the answer.</li>\n+          <li>Click on the card to find the answer </li>\n+          <img src=\" http://www.camsoftpartners.co.uk/images/wenlin3.gif\" height=\"35%\" width=\"35%\" />\n+        </ol>\n+\n+\n+  </div>\n+  <div class=\"col-xs-5 col-md-2\"></div>\n+\n+\n+<!--    <div class=\"row\" id=\"buttons-login\">","path":"app/assets/templates/vocabs/intro.html.erb","position":107,"original_position":107,"commit_id":"ba51b8305f59a9c6155b5ee429c70e8c54402154","original_commit_id":"ba51b8305f59a9c6155b5ee429c70e8c54402154","user":{"login":"f3r","id":970858,"avatar_url":"https://avatars.githubusercontent.com/u/970858?v=3","gravatar_id":"","url":"https://api.github.com/users/f3r","html_url":"https://github.com/f3r","followers_url":"https://api.github.com/users/f3r/followers","following_url":"https://api.github.com/users/f3r/following{/other_user}","gists_url":"https://api.github.com/users/f3r/gists{/gist_id}","starred_url":"https://api.github.com/users/f3r/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/f3r/subscriptions","organizations_url":"https://api.github.com/users/f3r/orgs","repos_url":"https://api.github.com/users/f3r/repos","events_url":"https://api.github.com/users/f3r/events{/privacy}","received_events_url":"https://api.github.com/users/f3r/received_events","type":"User","site_admin":false},"body":"commented code","created_at":"2015-09-16T14:43:12Z","updated_at":"2015-09-16T14:43:12Z","html_url":"https://github.com/WDI-HK-8/mecha-assist/pull/22#discussion_r39638146","pull_request_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22","_links":{"self":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/comments/39638146"},"html":{"href":"https://github.com/WDI-HK-8/mecha-assist/pull/22#discussion_r39638146"},"pull_request":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22"}}},"pull_request":{"url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22","id":45178434,"html_url":"https://github.com/WDI-HK-8/mecha-assist/pull/22","diff_url":"https://github.com/WDI-HK-8/mecha-assist/pull/22.diff","patch_url":"https://github.com/WDI-HK-8/mecha-assist/pull/22.patch","issue_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/22","number":22,"state":"open","locked":false,"title":"Pinyin","user":{"login":"monogut","id":12729485,"avatar_url":"https://avatars.githubusercontent.com/u/12729485?v=3","gravatar_id":"","url":"https://api.github.com/users/monogut","html_url":"https://github.com/monogut","followers_url":"https://api.github.com/users/monogut/followers","following_url":"https://api.github.com/users/monogut/following{/other_user}","gists_url":"https://api.github.com/users/monogut/gists{/gist_id}","starred_url":"https://api.github.com/users/monogut/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/monogut/subscriptions","organizations_url":"https://api.github.com/users/monogut/orgs","repos_url":"https://api.github.com/users/monogut/repos","events_url":"https://api.github.com/users/monogut/events{/privacy}","received_events_url":"https://api.github.com/users/monogut/received_events","type":"User","site_admin":false},"body":"Please review and merge","created_at":"2015-09-16T14:29:35Z","updated_at":"2015-09-16T14:43:12Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f1d4309f8119e25e2e025e46cf44da0b4bdc3427","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22/commits","review_comments_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22/comments","review_comment_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/comments{/number}","comments_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/22/comments","statuses_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/statuses/ba51b8305f59a9c6155b5ee429c70e8c54402154","head":{"label":"WDI-HK-8:pinyin","ref":"pinyin","sha":"ba51b8305f59a9c6155b5ee429c70e8c54402154","user":{"login":"WDI-HK-8","id":12110100,"avatar_url":"https://avatars.githubusercontent.com/u/12110100?v=3","gravatar_id":"","url":"https://api.github.com/users/WDI-HK-8","html_url":"https://github.com/WDI-HK-8","followers_url":"https://api.github.com/users/WDI-HK-8/followers","following_url":"https://api.github.com/users/WDI-HK-8/following{/other_user}","gists_url":"https://api.github.com/users/WDI-HK-8/gists{/gist_id}","starred_url":"https://api.github.com/users/WDI-HK-8/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WDI-HK-8/subscriptions","organizations_url":"https://api.github.com/users/WDI-HK-8/orgs","repos_url":"https://api.github.com/users/WDI-HK-8/repos","events_url":"https://api.github.com/users/WDI-HK-8/events{/privacy}","received_events_url":"https://api.github.com/users/WDI-HK-8/received_events","type":"Organization","site_admin":false},"repo":{"id":42058637,"name":"mecha-assist","full_name":"WDI-HK-8/mecha-assist","owner":{"login":"WDI-HK-8","id":12110100,"avatar_url":"https://avatars.githubusercontent.com/u/12110100?v=3","gravatar_id":"","url":"https://api.github.com/users/WDI-HK-8","html_url":"https://github.com/WDI-HK-8","followers_url":"https://api.github.com/users/WDI-HK-8/followers","following_url":"https://api.github.com/users/WDI-HK-8/following{/other_user}","gists_url":"https://api.github.com/users/WDI-HK-8/gists{/gist_id}","starred_url":"https://api.github.com/users/WDI-HK-8/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WDI-HK-8/subscriptions","organizations_url":"https://api.github.com/users/WDI-HK-8/orgs","repos_url":"https://api.github.com/users/WDI-HK-8/repos","events_url":"https://api.github.com/users/WDI-HK-8/events{/privacy}","received_events_url":"https://api.github.com/users/WDI-HK-8/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/WDI-HK-8/mecha-assist","description":"","fork":false,"url":"https://api.github.com/repos/WDI-HK-8/mecha-assist","forks_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/forks","keys_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/keys{/key_id}","collaborators_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/teams","hooks_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/hooks","issue_events_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/events{/number}","events_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/events","assignees_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/assignees{/user}","branches_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/branches{/branch}","tags_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/tags","blobs_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/refs{/sha}","trees_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/trees{/sha}","statuses_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/statuses/{sha}","languages_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/languages","stargazers_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/stargazers","contributors_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/contributors","subscribers_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/subscribers","subscription_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/subscription","commits_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/commits{/sha}","git_commits_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/commits{/sha}","comments_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/comments{/number}","issue_comment_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/comments{/number}","contents_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/contents/{+path}","compare_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/compare/{base}...{head}","merges_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/merges","archive_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/downloads","issues_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues{/number}","pulls_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls{/number}","milestones_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/milestones{/number}","notifications_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/labels{/name}","releases_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/releases{/id}","created_at":"2015-09-07T14:53:43Z","updated_at":"2015-09-08T03:02:52Z","pushed_at":"2015-09-16T14:38:30Z","git_url":"git://github.com/WDI-HK-8/mecha-assist.git","ssh_url":"git@github.com:WDI-HK-8/mecha-assist.git","clone_url":"https://github.com/WDI-HK-8/mecha-assist.git","svn_url":"https://github.com/WDI-HK-8/mecha-assist","homepage":null,"size":284,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":12,"forks":0,"open_issues":12,"watchers":0,"default_branch":"master"}},"base":{"label":"WDI-HK-8:master","ref":"master","sha":"bd2433918294a8e9524f6223a562302617c8e54f","user":{"login":"WDI-HK-8","id":12110100,"avatar_url":"https://avatars.githubusercontent.com/u/12110100?v=3","gravatar_id":"","url":"https://api.github.com/users/WDI-HK-8","html_url":"https://github.com/WDI-HK-8","followers_url":"https://api.github.com/users/WDI-HK-8/followers","following_url":"https://api.github.com/users/WDI-HK-8/following{/other_user}","gists_url":"https://api.github.com/users/WDI-HK-8/gists{/gist_id}","starred_url":"https://api.github.com/users/WDI-HK-8/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WDI-HK-8/subscriptions","organizations_url":"https://api.github.com/users/WDI-HK-8/orgs","repos_url":"https://api.github.com/users/WDI-HK-8/repos","events_url":"https://api.github.com/users/WDI-HK-8/events{/privacy}","received_events_url":"https://api.github.com/users/WDI-HK-8/received_events","type":"Organization","site_admin":false},"repo":{"id":42058637,"name":"mecha-assist","full_name":"WDI-HK-8/mecha-assist","owner":{"login":"WDI-HK-8","id":12110100,"avatar_url":"https://avatars.githubusercontent.com/u/12110100?v=3","gravatar_id":"","url":"https://api.github.com/users/WDI-HK-8","html_url":"https://github.com/WDI-HK-8","followers_url":"https://api.github.com/users/WDI-HK-8/followers","following_url":"https://api.github.com/users/WDI-HK-8/following{/other_user}","gists_url":"https://api.github.com/users/WDI-HK-8/gists{/gist_id}","starred_url":"https://api.github.com/users/WDI-HK-8/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WDI-HK-8/subscriptions","organizations_url":"https://api.github.com/users/WDI-HK-8/orgs","repos_url":"https://api.github.com/users/WDI-HK-8/repos","events_url":"https://api.github.com/users/WDI-HK-8/events{/privacy}","received_events_url":"https://api.github.com/users/WDI-HK-8/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/WDI-HK-8/mecha-assist","description":"","fork":false,"url":"https://api.github.com/repos/WDI-HK-8/mecha-assist","forks_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/forks","keys_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/keys{/key_id}","collaborators_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/teams","hooks_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/hooks","issue_events_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/events{/number}","events_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/events","assignees_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/assignees{/user}","branches_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/branches{/branch}","tags_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/tags","blobs_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/refs{/sha}","trees_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/trees{/sha}","statuses_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/statuses/{sha}","languages_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/languages","stargazers_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/stargazers","contributors_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/contributors","subscribers_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/subscribers","subscription_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/subscription","commits_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/commits{/sha}","git_commits_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/git/commits{/sha}","comments_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/comments{/number}","issue_comment_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/comments{/number}","contents_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/contents/{+path}","compare_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/compare/{base}...{head}","merges_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/merges","archive_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/downloads","issues_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues{/number}","pulls_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls{/number}","milestones_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/milestones{/number}","notifications_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/labels{/name}","releases_url":"https://api.github.com/repos/WDI-HK-8/mecha-assist/releases{/id}","created_at":"2015-09-07T14:53:43Z","updated_at":"2015-09-08T03:02:52Z","pushed_at":"2015-09-16T14:38:30Z","git_url":"git://github.com/WDI-HK-8/mecha-assist.git","ssh_url":"git@github.com:WDI-HK-8/mecha-assist.git","clone_url":"https://github.com/WDI-HK-8/mecha-assist.git","svn_url":"https://github.com/WDI-HK-8/mecha-assist","homepage":null,"size":284,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":12,"forks":0,"open_issues":12,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22"},"html":{"href":"https://github.com/WDI-HK-8/mecha-assist/pull/22"},"issue":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/22"},"comments":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/issues/22/comments"},"review_comments":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22/comments"},"review_comment":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/pulls/22/commits"},"statuses":{"href":"https://api.github.com/repos/WDI-HK-8/mecha-assist/statuses/ba51b8305f59a9c6155b5ee429c70e8c54402154"}}}}