Merge pull request #55 from arnaudbos/master

Fix syte social integration

13 files changed, 57 insertions, 216 deletions

diff --git a/syte/static/templates/500.html b/syte/static/templates/500.html
deleted file mode 100644
index 68cb76d..0000000
--- a/syte/static/templates/500.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends 'base.html' %}
-{% block pagetitle %}500 Oops{% endblock %}
-{% block main_section %}
-<section class="main-section">
-  <article>
-    <h2>Oops!</h2>
-    <p>An error occurred. Please try again later.</p>
-  </article>
-</section>
-{% endblock %}
diff --git a/syte/static/templates/blog-post-audio.html b/syte/static/templates/blog-post-audio.html
deleted file mode 100644
index ec3e9e2..0000000
--- a/syte/static/templates/blog-post-audio.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-  <h2><a href="/post/{{ id }}">{{ artist }} - {{ track_name }}</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  {{{ player }}}
-  {{#if caption}}
-  {{{ caption }}}
-  {{/if}}
-  {{#if tags }}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/blog-post-link.html b/syte/static/templates/blog-post-link.html
deleted file mode 100644
index d1f0b42..0000000
--- a/syte/static/templates/blog-post-link.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-  <h2><a href="{{url}}">Link: {{title}}</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  {{{ description }}}
-  {{#if tags}}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/blog-post-photo.html b/syte/static/templates/blog-post-photo.html
deleted file mode 100644
index 42e4ff6..0000000
--- a/syte/static/templates/blog-post-photo.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-    <h2><a href="/post/{{ id }}">Photo</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  {{#each photos}}
-    {{#with original_size}}
-      <p><img src="{{url}}" /></p>
-    {{/with}}
-    {{#if caption}}
-       {{{ caption }}}
-    {{/if}}
-  {{/each}}
-  {{#if caption}}
-    {{{ caption }}}
-  {{/if}}
-  {{#if tags }}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/blog-post-quote.html b/syte/static/templates/blog-post-quote.html
deleted file mode 100644
index d15e67e..0000000
--- a/syte/static/templates/blog-post-quote.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-    <h2><a href="/post/{{ id }}">Quote</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  <blockquote>
-    {{text}}
-  </blockquote>
-  {{#if source}}
-  <p>{{{ source }}}</p>
-  {{/if}}
-  {{#if tags }}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/blog-post-text.html b/syte/static/templates/blog-post-text.html
deleted file mode 100644
index b9a0cb6..0000000
--- a/syte/static/templates/blog-post-text.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-    <h2><a href="/post/{{ id }}">{{ title }}&nbsp;</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  {{{ body }}}
-  {{#if tags}}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/blog-post-video.html b/syte/static/templates/blog-post-video.html
deleted file mode 100644
index 1f5dce0..0000000
--- a/syte/static/templates/blog-post-video.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<article id="{{ id }}">
-  <hgroup>
-    <h2><a href="/post/{{ id }}">Video</a></h2>
-    <h3><a href="#{{ id }}">{{ formated_date }}</a></h3>
-  </hgroup>
-  <p>
-    <a href="{{ permalink_url }}" class="no-border"><img src="{{ thumbnail_url }}" /></a>
-  </p>
-  {{#if tags }}
-  <footer>
-    <h4>Tags</h4>
-    <ul class="tags">
-      {{#each tags}}
-      <li><a href="/tags/{{ this }}">{{ this }}</a></li>
-      {{/each}}
-    </ul>
-  </footer>
-  {{/if}}
-</article>
diff --git a/syte/static/templates/dribbble-view.html b/syte/static/templates/dribbble-view.html
deleted file mode 100644
index 259b1cd..0000000
--- a/syte/static/templates/dribbble-view.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="profile dribbble modal fade-large" id="dribbble-profile">
-  {{#with user}}
-  <div class="profile-info">
-    <button class="close" data-dismiss="modal">×</button>
-    <a href="http://dribbble.com/{{ username }}" class="profile-avatar">
-      <img src="{{ avatar_url }}" alt="{{name}}" />
-    </a>
-    <div class="profile-name">
-      <h2><a href="http://dribbble.com/{{ username }}">{{ name }}</a></h2>
-      <h3><a href="http://dribbble.com/{{ username }}">@{{ username}}</a></h3>
-    </div>
-    <p class="profile-location-url">
-      {{#if location }}
-      <span>{{ location }}</span>
-      <span class="divider">·</span>
-      {{/if}}
-      {{#if website_url }}
-      <span><a href="{{ website_url }}">{{ website_url }}</a></span>
-      {{/if}}
-    </p>
-    <a href="http://dribbble.com/{{ username }}" class="btn">Follow on Dribbble</a>
-  </div>
-  <ul class="profile-stats">
-    <li><a href="http://dribbble.com/{{ username }}"><strong>{{ shots_count }}</strong> shots</a></li>
-    <li><a href="http://dribbble.com/{{ username }}" class="shots-likes-received"><strong>{{ likes_received_count }}</strong> likes received</a></li>
-    <li><a href="http://dribbble.com/{{ username }}" class="shots-likes-given"><strong>{{ likes_count }}</strong> likes given</a></li>
-    <li><a href="http://dribbble.com/{{ username }}/following"><strong>{{ following_count }}</strong> following</a></li> 
-    <li><a href="http://dribbble.com/{{ username }}/followers"><strong>{{ followers_count }}</strong> followers</a></li>
-  </ul>
-  {{/with}}
-  <ul class="profile-shots">
-    {{#each shots}}
-    <li>
-      <a href="{{ url }}" class="profile-shot">
-        <img src="{{ image_url }}" alt="{{ title }}" />
-      </a>
-      <span class="profile-shot-title">{{ title }}</span>
-      <ul class="profile-shot-stats">
-        <li><a href="" class="profile-watchers">{{ views_count }}</a></li>
-        <li><a href="" class="profile-comments">{{ comments_count }}</a></li>
-        <li><a href="" class="profile-likes">{{ likes_count }}</a></li>
-      </ul>
-    </li>
-    {{/each}}
-  </ul>
-</div>
diff --git a/syte/static/templates/github-view.html b/syte/static/templates/github-view.html
index c71ad38..9aa8c72 100644
--- a/syte/static/templates/github-view.html
+++ b/syte/static/templates/github-view.html
@@ -20,9 +20,9 @@
     </p>
   </div>
   <ul class="profile-stats">
-    <li><a href="http://github.com/{{ login }}"><strong>{{ public_repo_count }}</strong> repos</a></li>
-    <li><a href="http://github.com/{{ login }}/following"><strong>{{ following_count }}</strong> following</a></li>
-    <li><a href="http://github.com/{{ login }}/followers"><strong>{{ followers_count }}</strong> followers</a></li>
+    <li><a href="http://github.com/{{ login }}"><strong>{{ public_repos }}</strong> repos</a></li>
+    <li><a href="http://github.com/{{ login }}/following"><strong>{{ following }}</strong> following</a></li>
+    <li><a href="http://github.com/{{ login }}/followers"><strong>{{ followers }}</strong> followers</a></li>
   </ul>
   <div class="profile-info-footer">
     <a href="http://github.com/{{ login }}" class="btn">Follow on Github</a>
@@ -31,14 +31,14 @@
   <ul class="profile-repos">
     {{#each repositories}}
     <li>
-    <a href="{{ url }}" class="profile-repo-name">{{ name }}</a>
+    <a href="{{ html_url }}" class="profile-repo-name">{{ name }}</a>
     <p class="profile-repo-text">
       {{ description }}
     </p>
     <ul class="profile-repo-stats">
       <li>{{ language }}</li>
-      <li><a href="{{ url }}/watchers" class="profile-watchers">{{ watchers }}</a></li>
-      <li><a href="{{ url }}/network" class="profile-forks">{{ forks }}</a></li>
+      <li><a href="{{ html_url }}/watchers" class="profile-watchers">{{ watchers }}</a></li>
+      <li><a href="{{ html_url }}/network" class="profile-forks">{{ forks }}</a></li>
     </ul>
     </li>
     {{/each}}
diff --git a/syte/static/templates/google-view.html b/syte/static/templates/google-view.html
new file mode 100644
index 0000000..0a2e0be
--- /dev/null
+++ b/syte/static/templates/google-view.html
@@ -0,0 +1,46 @@
+<div class="profile google modal fade" id="google-profile">
+  {{#with user}}
+  <div class="profile-info">
+    <button class="close" data-dismiss="modal">×</button>
+    <a href="{{ url }}" class="profile-avatar">
+      <img src="{{ image.url }}" alt="{{ displayName }}" />
+    </a>
+    <div class="profile-name">
+      <h2><a href="{{ url }}">{{ displayName }}</a></h2>
+    </div>
+    {{#if tagline}}
+    <p class="profile-description">{{{ tagline }}}</p>
+    {{/if}}
+    <p class="profile-location-url">
+      {{#if placesLived }}
+      <span>{{ placesLived.0.value }}</span>
+      <span class="divider">·</span>
+      {{/if}}
+    </p>
+  </div>
+  <ul class="profile-stats">
+  </ul>
+  <div class="profile-info-footer">
+    <a href="{{ url }}" class="btn">Follow on Google+</a>
+  </div>
+  {{/with}}
+  <ul class="profile-tweets">
+    {{#each posts}}
+      <li>
+        <a href="{{ url }}" class="tweet-title">
+          <img src="{{ actor.image.url }}" alt="{{ actor.displayName }}" />
+          <strong>{{ actor.displayName }}</strong>
+        </a>
+        <p class="tweet-text">
+        {{{ title }}}
+        </p>
+        <ul class="profile-repo-stats tweet-date" style="padding-left: 30px; font-size: 12px;">
+          <li>{{ published }}</li>
+          <li><a class="profile-plusoners">{{ plusoners }}</a></li>
+          <li><a class="profile-resharers">{{ resharers }}</a></li>
+        </ul>
+      </li>
+    {{/each}}
+  </ul>
+</div>
+
diff --git a/syte/static/templates/instagram-view-more.html b/syte/static/templates/instagram-view-more.html
deleted file mode 100644
index 78db9fc..0000000
--- a/syte/static/templates/instagram-view-more.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{{#each media}}
-<li>
-  <a href="{{ link }}" class="profile-shot">
-    {{#with images}}
-     {{#with low_resolution }}
-     <img src="{{ url }}" alt="Instagram Picture" />
-     {{/with}}
-    {{/with}}
-  </a>
-   <span class="profile-shot-title">
-  {{#if caption}}
-  {{#with caption}}
-    {{ text }}
-  {{/with}}
-  {{else}}
-  Untitled
-  {{/if}}
-  </span>
-  <ul class="profile-shot-stats">
-    {{#with likes}}<li><span class="profile-likes">{{ count }}</span></li>{{/with}}
-    <li class="profile-shot-date">{{ formated_date }}</li>
-  </ul>
-</li>
-{{/each}}
-
diff --git a/syte/static/templates/instagram-view.html b/syte/static/templates/instagram-view.html
index 90d49f7..cba2a17 100644
--- a/syte/static/templates/instagram-view.html
+++ b/syte/static/templates/instagram-view.html
@@ -22,6 +22,9 @@
     <li><span><strong>{{ followed_by }}</strong> followers</span></li>
     {{/with}}
   </ul>
+  <div class="profile-info-footer">
+    <a href="{{ url }}" class="btn">Follow on Instagram</a>
+  </div>
   {{/with}}
   <ul class="profile-shots">
     {{#each media}}
@@ -49,10 +52,5 @@
     </li>
     {{/each}}
   </ul>
-  {{#if pagination}}
-  {{#with pagination}}
-  <button class="load-more-button" id="load-more-pics" data-control-next="{{ next_max_id }}">Load more...</button>
-  {{/with}}
-  {{/if}}
 </div>
 
diff --git a/syte/static/templates/twitter-view.html b/syte/static/templates/twitter-view.html
index efa08aa..3fe7046 100644
--- a/syte/static/templates/twitter-view.html
+++ b/syte/static/templates/twitter-view.html
@@ -9,7 +9,7 @@
       <h2><a href="http://twitter.com/#!/{{ screen_name }}">{{ name }}</a></h2>
       <h3><a href="http://twitter.com/#!/{{ screen_name }}">@{{ screen_name}}</a></h3>
     </div>
-    <p class="profile-description">{{{ f_description }}}</p>
+    <p class="profile-description">{{{ description }}}</p>
     <p class="profile-location-url">
       {{#if location }}
       <span>{{ location }}</span>
@@ -40,7 +40,7 @@
         </a>
         {{/with}}
         <p class="tweet-text">
-        {{{ f_text }}}
+        {{{ text }}}
         </p>
         <p class="tweet-date">
           {{ formated_date }}