{"pull_request":{"state":"open","user":{"avatar_url":"https://secure.gravatar.com/avatar/586addfa5de457468b2f616e7123ea90?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","gravatar_id":"586addfa5de457468b2f616e7123ea90","url":"https://api.github.com/users/daifu","login":"daifu","id":69009},"deletions":32,"merged_by":null,"updated_at":"2011-11-02T22:47:35Z","comments":0,"closed_at":null,"base":{"ref":"core/eventful","repo":{"name":"CS130-Mashup","fork":false,"pushed_at":"2011-11-01T07:46:40Z","master_branch":null,"homepage":"","clone_url":"https://github.com/alroman/CS130-Mashup.git","open_issues":2,"updated_at":"2011-11-01T07:46:40Z","language":"PHP","forks":4,"private":false,"svn_url":"https://svn.github.com/alroman/CS130-Mashup","url":"https://api.github.com/repos/alroman/CS130-Mashup","owner":{"avatar_url":"https://secure.gravatar.com/avatar/9913051abbeb19ec309fdf8e9fab90cc?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","gravatar_id":"9913051abbeb19ec309fdf8e9fab90cc","url":"https://api.github.com/users/alroman","login":"alroman","id":686549},"html_url":"https://github.com/alroman/CS130-Mashup","description":"UCLA CS130 - IBM Entertainment mashup project","size":244,"id":2536372,"watchers":4,"git_url":"git://github.com/alroman/CS130-Mashup.git","created_at":"2011-10-08T01:54:52Z","ssh_url":"git@github.com:alroman/CS130-Mashup.git"},"user":{"avatar_url":"https://secure.gravatar.com/avatar/9913051abbeb19ec309fdf8e9fab90cc?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","gravatar_id":"9913051abbeb19ec309fdf8e9fab90cc","url":"https://api.github.com/users/alroman","login":"alroman","id":686549},"label":"alroman:core/eventful","sha":"18e33e951faa77fe9a288a6fe39da308852e1a9e"},"diff_url":"https://github.com/alroman/CS130-Mashup/pull/6.diff","commits":15,"url":"https://api.github.com/repos/alroman/CS130-Mashup/pulls/6","additions":6972,"merged":false,"head":{"ref":"alfonso","repo":{"name":"CS130-Mashup","fork":true,"pushed_at":"2011-11-01T07:30:01Z","master_branch":null,"homepage":"","clone_url":"https://github.com/daifu/CS130-Mashup.git","open_issues":0,"updated_at":"2011-11-01T07:30:02Z","language":"PHP","forks":0,"private":false,"svn_url":"https://svn.github.com/daifu/CS130-Mashup","url":"https://api.github.com/repos/daifu/CS130-Mashup","owner":{"avatar_url":"https://secure.gravatar.com/avatar/586addfa5de457468b2f616e7123ea90?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","gravatar_id":"586addfa5de457468b2f616e7123ea90","url":"https://api.github.com/users/daifu","login":"daifu","id":69009},"html_url":"https://github.com/daifu/CS130-Mashup","description":"UCLA CS130 - IBM Entertainment mashup project","size":132,"id":2551938,"watchers":2,"git_url":"git://github.com/daifu/CS130-Mashup.git","created_at":"2011-10-11T00:00:11Z","ssh_url":"git@github.com:daifu/CS130-Mashup.git"},"user":{"avatar_url":"https://secure.gravatar.com/avatar/586addfa5de457468b2f616e7123ea90?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png","gravatar_id":"586addfa5de457468b2f616e7123ea90","url":"https://api.github.com/users/daifu","login":"daifu","id":69009},"label":"daifu:alfonso","sha":"10e88b66b0f5ea033ee3e65c728c697c78f334c5"},"body":"Merged event calendar to Alfonso's branch and it is working.\r\n\r\nAdded event_cal_filter function for the event calendar.\r\n\r\nTo used the event calendar:\r\n1. Get the events object from eventful API and use event_cal_filter to retrive the json object for event calendar:\r\n\r\n```PHP\r\n$la_events = $this->eventful->getEvents(array('location' => $city));\r\n$la_events_cal = $this->event_cal_filter($la_events);\r\n$data = array('la_events' => $la_events, 'msg' => $city, 'events_cal' => $la_events_cal);\r\n$this->load->view('events_la', $data);\r\n```\r\n\r\n2. Added HTML to view:\r\n\r\n```HTML\r\n<div class=\"span6\" id=\"eventCalendar\" style=\"margin-top: 10px;\">\r\n       <div id=\"dest\" style=\"width:340px\"></div>\r\n       <div id=\"calendar\"></div>\r\n </div>\r\n```\r\n3. Added according javascript library and CSS:\r\n\r\n```HTML\r\n    <!--CSS For Event Calendar-->\r\n   <link rel=\"stylesheet\" href=\"<?php echo base_url(); ?>css/jquery.calendarPicker.css\" />\r\n   <link rel=\"stylesheet\" href=\"<?php echo base_url(); ?>css/calendar.css\" />\r\n   <link rel=\"stylesheet\" href=\"<?php echo base_url(); ?>css/fullcalendar.css\" />\r\n   <link rel=\"stylesheet\" href=\"<?php echo base_url(); ?>css/fullcalendar.print.css\" media=\"print\"/>\r\n   <!-- End -->\r\n```\r\n```HTML\r\n<!-- Javascript for event calendar -->\r\n<script type=\"text/javascript\" src=\"<?php echo base_url(); ?>js/fullcalendar.min.js\"></script>\r\n<script type=\"text/javascript\" src=\"<?php echo base_url(); ?>js/jquery.calendarPicker.js\"></script>\r\n<script type=\"text/javascript\" src=\"<?php echo base_url(); ?>js/calendar.js\"></script>\r\n```\r\nAnd the javascript, and it is too long, please look at events_la.php for example.","merged_at":null,"html_url":"https://github.com/alroman/CS130-Mashup/pull/6","review_comments":0,"_links":{"comments":{"href":"https://api.github.com/repos/alroman/CS130-Mashup/issues/6/comments"},"html":{"href":"https://github.com/alroman/CS130-Mashup/pull/6"},"review_comments":{"href":"https://api.github.com/repos/alroman/CS130-Mashup/pulls/6/comments"},"self":{"href":"https://api.github.com/repos/alroman/CS130-Mashup/pulls/6"}},"issue_url":"https://github.com/alroman/CS130-Mashup/issues/6","number":6,"title":"Alfonso","mergeable":false,"id":451415,"patch_url":"https://github.com/alroman/CS130-Mashup/pull/6.patch","changed_files":21,"created_at":"2011-11-01T07:37:19Z"},"action":"reopened","number":6}