Merge branch 'master' of git.zzyzx.io:10ninox-labs/showtimes-web

index.html

@@ -16,10 +16,17 @@
           <li>{{#link-to 'groups'}}Theaters{{/link-to}}</li>
           <li>{{#link-to 'api'}}API{{/link-to}}</a></li>
           <li>{{#link-to 'about'}}About{{/link-to}}</a></li>
-          <li><a><div class="fb-like" data-href="http://showtimes.everyday.in.th" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true"></div></a></li>
         </ul>
       </div>
     </div>
+    <div class="row-fluid">
+      <div class="span12">
+        <span class="pull-right">
+          <span class="fb-like" style="top:-6px" data-href="http://showtimes.everyday.in.th" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true"></span>
+          <span class="g-plusone" data-href="http://showtimes.everyday.in.th/"></span>
+        </span>
+      </div>
+    </div>
 
     {{outlet}}
   </script>
@@ -102,8 +109,17 @@
             <td>
               {{#if poster_path}}<div class="pull-left" style="margin-right:0.5em"><img src="http://image.tmdb.org/t/p/w92{{unbound poster_path}}" align="left" class="img-rounded" /></div>{{/if}}
               <h4>{{movie}} <small class='muted'><mark>{{audio}}</mark> on {{format-date date}}</small></h4>
-              <p>{{showtimes}} {{#if cinema}}<small class='muted'>#{{cinema}}</small>{{/if}}</p>
+              <p>
-              {{#if imdb_id}}<p><a href="http://www.imdb.com/title/{{unbound imdb_id}}/">IMDb</p>{{/if}}
+              {{#if cinema}}<small class='muted'>#{{cinema}}</small><br/>{{/if}}
+              {{showtimes}}
+              <span style="color:#7C7C7C"><br/><br/>
+              {{#if imdb_id}}<a href="http://www.imdb.com/title/{{unbound imdb_id}}/" class="btn btn-info btn-mini">IMDb</a>{{/if}}
+              {{#if vote_average}}<a href="http://www.themoviedb.org/movie/{{unbound movie_id}}/" class="btn btn-info btn-mini">TMDb</a> rating {{vote_average}} ({{vote_count}} vote){{/if}}
+              {{#if videos}}<br/><strong>Trailer</strong> {{#each videos}}
+                <a href="http://{{unbound site}}.com/watch?v={{unbound key}}" class="btn btn-default btn-mini">Link</a>&nbsp;
+              {{/each}}{{/if}}
+              </span>
+              </p>
             </td>
           </tr>
         {{else}}
@@ -181,13 +197,14 @@
     </div>
   </script>
 
-  <script src="/js/libs/jquery-1.10.2.js"></script>
+  <script src="/js/libs/jquery-1.11.1.min.js"></script>
   <script src="/js/libs/handlebars-1.1.2.js"></script>
-  <script src="/js/libs/ember-1.7.0.js"></script>
+  <script src="/js/libs/ember-1.7.0.min.js"></script>
   <script src="/bower_components/showdown/compressed/showdown.js"></script>
   <script src="/bower_components/moment/moment.js"></script>
   <script src="/js/app.js"></script>
-  <script src="/js/trackers.js"></script>
+  <script src="/js/trackers.js" async defer></script>
+  <script src="https://apis.google.com/js/platform.js" async defer></script>
   <div id="fb-root"></div>
 </body>
 </html>