topics, minor changes

Author: bcambel

pyhackers/controllers/discuss.py

@@ -1,5 +1,5 @@
 import logging
-from flask import request, jsonify, Blueprint, redirect
+from flask import request, jsonify, Blueprint, redirect, abort, make_response
 from flask.ext.login import login_required, current_user
 from pyhackers.cache import cache
 from pyhackers.helpers import render_template, render_base_template, current_user_id
@@ -32,6 +32,10 @@ def discussion_ctrl(slug, id):
                                 related_discussions=related_discussions,
                                 )
 
+@discuss_app.route('topic/<regex(".+"):slug>')
+def discuss_topic_ctrl(slug):
+    response = make_response("ok")
+    return response
 
 @discuss_app.route('new', methods=('GET', 'POST'))
 @login_required

pyhackers/controllers/main.py

@@ -257,6 +257,9 @@ def new_message():
 def about():
     return render_base_template("about.html")
 
+@main_app.route("/timeline")
+def timeline():
+    return render_base_template("timeline.html")
 
 @main_app.route("/coding")
 def coding():

pyhackers/static/coffee/app/main.coffee

@@ -78,23 +78,23 @@ Application = {
 ##            mixpanel.track("signup-popup")
 #        )
 
-        $(document).on('click','a', (evt) =>
-            href = $(evt.currentTarget).attr('href')
-
-            hashtag = href[0] == "#"
-
-            @dog.click(href, hashtag)
-
-            if hashtag
-                return
-
-            evt.stopPropagation()
-            evt.preventDefault()
-
-            window.setTimeout( =>
-                document.location = href
-            , 200)
-        )
+#        $(document).on('click','a', (evt) =>
+#            href = $(evt.currentTarget).attr('href')
+#
+#            hashtag = href[0] == "#"
+#
+#            @dog.click(href, hashtag)
+#
+#            if hashtag
+#                return
+#
+#            evt.stopPropagation()
+#            evt.preventDefault()
+#
+#            window.setTimeout( =>
+#                document.location = href
+#            , 200)
+#        )
 
 
         _.defer( =>  do @dog.view )

pyhackers/static/css/app.css

@@ -15,6 +15,8 @@ div#page-wrap {
 .message{
     max-height: 69px;
     overflow-y:hidden;
+    color:dimgray;
+    font-size:13px;
 }
 .message-container{
     border-bottom: 1px solid #d3d3d3;
@@ -108,7 +110,7 @@ a:hover {
 }
 
 .link-box {
-    margin-bottom: 10px;
+    margin-bottom: 0px;
     padding-bottom: 7px;
     padding-right: 0;
     margin-left: 65px;
@@ -155,6 +157,10 @@ h4 a {
     padding-top: 5px;
 }
 
+.link-box i {
+    margin-right:5px;
+}
+
 .link-container .col-lg-10 {
     padding-right: 5px;
 }
@@ -221,9 +227,14 @@ h4 a {
 }
 
 .front-action span.label {
-    color: #3a3c3c;
+    color: #d3d3d3;
     font-size: 12px;
     font-weight: bold;
+    margin-left:4px;
+}
+
+.message{
+
 }
 
 .links a.link {

pyhackers/static/js/app/main.js

@@ -101,30 +101,24 @@
     </div>
     {% include "modals.html" %}
     {% include "js_templates.html" %}
-
-
-
-
-
     {% include "mailchimp_form.html" %}
 
     <script src="http://code.jquery.com/jquery-2.0.3.min.js" type="text/javascript"></script>
 
-    <script>
-        {% block scripts %}{% endblock %}
-    </script>
+
 
     <script src="{{ static_route }}/js/underscore-min.js" type="text/javascript"></script>
     <script src="{{ static_route }}/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.3.0/handlebars.min.js" type="text/javascript"></script>
     <script src="/static/js/app/main.js?_={{ cache_buster }}"></script>
 {% block script_links %}{% endblock %}
 
     {% if PROD %}
         {% include "3rd_party.html" %}
     {% endif %}
-
-
-
+    <script>
+        {% block scripts %}{% endblock %}
+    </script>
 </div>
 </body>
 </html>

pyhackers/templates/base.html

@@ -47,17 +47,14 @@
                     </div>
                 </div>
             </div>
-            <div class='row' style="padding-top:5px;">
+            <div class='row'>
                 <div class='col-lg-5'>
                     <a href="#post" class="link-discuss">{{ ago }}</a>
-                    <a href="/user/{{ user.nick }}">@{{ user.nick }}</a>
+                    <a href="/user/{{ user.nick }}"> by @{{ user.nick }}</a>
+                    <a href="#post" class="link-discuss">{{ comment }} Comments</a>
                 </div>
 
                 <div class="col-6" style="text-align: right">
-                    <a href="#/tag/flask" class='tag' style="">
-                        <span class="">#Flask</span>
-                    </a>
-                    <a href="#/tag/ajax" class='tag'><span class="">#AJAX</span></a>
                 </div>
             </div>
         </div>

pyhackers/templates/js_templates.html

@@ -71,6 +71,5 @@ <h4>Top 400 Python Projects in Github</h4>
 
 
 {% block script_links %}
-<script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.3.0/handlebars.min.js" type="text/javascript"></script>
 <script src="/static/js/app/sly.js?_={{ cache_buster }}" type="text/javascript"></script>
 {% endblock %}

pyhackers/templates/project_frame.html

@@ -0,0 +1,50 @@
+{% extends "base.html" %}
+
+{% block content %}
+    <div class="links container">
+        <div id='timeline' class="col-lg-10 linklist row">
+
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block scripts %}
+    $(function(){
+    var $template = window.Handlebars.compile($("#message-template").html());
+    var msgs = [
+        {
+        user: {nick: 'bcambel'},
+        ago:'34m ago',
+        html: '<i class="fa fa-file-text-o"></i>&nbsp;<a href="" class="link">Daniel Greenfield</a> wrote a blog post&nbsp;'+
+            '<a class="link" href="http://pydanny.com/awesome-slugify-human-readable-url-slugs-from-any-string.html">awesome-slugify: Human-readable URL slugs from any string</a>',
+        },{
+        user: {nick: 'bcambel'},
+        ago:'34m ago',
+        html: '<i class="fa fa-github-alt"></i>&nbsp;<i class="fa fa-bullhorn"></i>&nbsp;<a class="link" href="">Django</a> has a new release&nbsp;' +
+            '<a class="link" href="https://github.com/django/django/releases/tag/1.7a1">1.7a1: Tag 1.7a1</a>'
+        },
+        {
+        user: {nick: 'progrium'},
+        ago:'19h ago',
+        html: '<i class="fa fa-twitter"></i>&nbsp;<a class="link" href="">Jeff Lindsay</a> SystemsLive podcast with @TimothyFitz talking about Flynn and any other topic you bring up <a href="http://mixlr.com/systemslive/chat" class="link">http://mixlr.com/systemslive/chat</a> '
+        },
+    {
+        user: {nick: 'progrium'},
+        ago:'19h ago',
+        html: '<i class="fa fa-github-alt"></i>&nbsp;<i class="fa fa-plus"></i>&nbsp;<a class="link" href="">Jeff Lindsay</a> created a new repository. <a href="https://github.com/ipython/sloan-2013-reports" class="link">Sloan 2013 Reports</a> '
+        },
+        {
+        user: {nick: 'bcambel'},
+        ago:'34m ago',
+        html: '<i class="fa fa-github-alt"></i>&nbsp;<i class="fa fa-star"></i>&nbsp;<a class="link" href="">jezdez</a> starred&nbsp;' +
+            '<a class="link" href="https://github.com/mailgun/flanker">Mailgun / Flanker</a>'
+        },
+        {
+        user: {nick: 'bcambel'},
+        ago:'34m ago',
+        html:'<i class="fa fa-file-text-o"></i>&nbsp;<a href="" class="link">Jesse Noller</a> wrote a blog post&nbsp;'+
+            '<a class="link" href="http://jessenoller.com/blog/2013/4/15/joining-rackspace"> Joining Rackspace</a>'}]
+    $('#timeline').append($template({message: msgs}));
+    });
+{% endblock %}