Working on Pro theme

blogs/templates/blogs/themes/pro-adams/base.html

@@ -55,19 +55,14 @@
                         {% endif %}
                     </a>
                     <p>
-                        I'm a front-end developer in Rochester, NY working full-time on the <a href="http://amara.org/">Amara</a> project for <a href="http://pculture.org/">PCF</a>. I founded <a href="https://snipt.net/">Snipt</a>.
+                        I'm a front-end developer in Rochester, NY working on the <a href="http://amara.org/">Amara</a> project for <a href="http://pculture.org/">PCF</a>. I also built <a href="https://snipt.net/">Snipt</a>.
                     </p>
                 </div>
             </header>
         {% endblock %}
         <section class="main group">
             <section class="content group">
-                <div class="gutter">
-
-                </div>
-                <div class="content-inner">
-
-                </div>
+                {% block content %}{% endblock %}
             </section>
             <aside class="main">
                 <section class="module projects">
@@ -82,23 +77,23 @@
                     </ul>
                 </section>
                 <section class="module places">
-                    <h1>In other places</h1>
+                    <h1>Elsewhere</h1>
                     <ul>
-                        <li><a href="https://github.com/nicksergeant">GitHub</a></li>
                         <li><a href="https://twitter.com/nicksergeant">Twitter</a></li>
+                        <li><a href="https://github.com/nicksergeant">GitHub</a></li>
+                        <li><a href="http://www.linkedin.com/in/nicksergeant">LinkedIn</a></li>
                     </ul>
                 </section>
                 <section class="module snipts">
                     <h1>Recent snipts</h1>
                     <ul>
-                        <li><a href="#">List of lexers for use with the Snipt API</a></li>
-                        <li><a href="#">Snipt API</a></li>
-                        <li><a href="#">Git merge (pull) from remote repo</a></li>
+                        {% for snipt in normal_snipts %}
+                            <li><a href="{{ snipt.get_absolute_url }}">{{ snipt.title }}</a></li>
+                        {% endfor %}
                     </ul>
                 </section>
             </aside>
         </section>
-        <!--{% block content %}{% endblock %}-->
     </div>
 
     {% if not debug %}

blogs/templates/blogs/themes/pro-adams/list.html

@@ -8,13 +8,9 @@
     {% autopaginate snipts 10 %}
     {% for snipt in snipts %}
         {% include "blogs/themes/pro-adams/snipt-list.html" %}
-    {% empty %}
-        <div class="empty-snipts">
-            {{ blog_user.username }} has no public blog posts.
-        </div>
     {% endfor %}
     {% paginate %}
-    <script type="text/javascript" id="disqus">
+    <script type="text/javascript">
         var disqus_shortname = 'snipt-net';
         {% if debug %}
             var disqus_developer = 1;

blogs/templates/blogs/themes/pro-adams/post.html

@@ -8,21 +8,4 @@
     {% with 'true' as detail %}
         {% include "blogs/themes/pro-adams/snipt-list.html" %}
     {% endwith %}
-    <div id="disqus_thread"></div>
-    <script type="text/javascript">
-        var disqus_shortname = 'snipt-net';
-        {% if debug %}
-            var disqus_developer = 1;
-        {% endif %}
-        var disqus_url = '{{ snipt.get_full_absolute_url }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}';
-        var disqus_title = '{{ snipt.title }}';
-        var disqus_identifier = {{ snipt.id }};
-
-        (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-    </script>
 {% endblock %}
-

blogs/templates/blogs/themes/pro-adams/snipt-list.html

@@ -1,5 +1,24 @@
-<a href="{{ snipt.get_full_absolute_url }}">{{ snipt.title }}</a><br />
-
-{% if detail %}
-    {{ snipt.stylized|safe }}
-{% endif %}
+<article class="group">
+    <div class="gutter"></div>
+    <div class="content-inner">
+        <a href="{{ snipt.get_full_absolute_url }}">{{ snipt.title }}</a>
+        {% if detail %}
+            {{ snipt.stylized|safe }}
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+                var disqus_shortname = 'snipt-net';
+                {% if debug %}
+                    var disqus_developer = 1;
+                {% endif %}
+                var disqus_url = '{{ snipt.get_full_absolute_url }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}';
+                var disqus_title = '{{ snipt.title }}';
+                var disqus_identifier = {{ snipt.id }};
+                (function() {
+                    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+                    dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js';
+                    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+                })();
+            </script>
+        {% endif %}
+    </div>
+</article>

blogs/views.py

@@ -19,6 +19,11 @@ def blog_list(request, username_or_custom_slug=None):
                                   publish_date__lte=datetime.datetime.now()
                                   ).order_by('-publish_date').exclude(title__iexact='Homepage')
 
+    normal_snipts = Snipt.objects.filter(blog_post=False, user=request.blog_user, public=True).order_by('-created')
+    normal_snipts = normal_snipts.exclude(title__in=[''])
+    normal_snipts = normal_snipts.exclude(tags__name__in=['tmp'])
+    normal_snipts = normal_snipts[:3]
+
     sidebar = get_object_or_None(Snipt,
                                  user=request.blog_user,
                                  title='Blog Sidebar')
@@ -26,6 +31,7 @@ def blog_list(request, username_or_custom_slug=None):
     context = {
         'blog_user': request.blog_user,
         'has_snipts': True,
+        'normal_snipts': normal_snipts,
         'public': True,
         'sidebar': sidebar,
         'snipts': snipts,

media/css/blog-themes/pro-adams/style.css

@@ -1 +1 @@
-html,body{background:#FFF}body{color:#666;font:normal 14px/16px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-rendering:optimizeLegibility}*{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.hidden{display:none}div.frame{margin:0 auto;position:relative;width:980px}div.frame div.ruler{background:#EAEAEA;height:100%;position:fixed;top:0;width:1px;z-index:49}div.frame div.left-y{margin-left:40px}div.frame div.right-y{margin-left:760px}header.main{padding:20px 0;position:relative;z-index:50}header.main a.logo{display:inline-block}header.main a.logo span.avatar{display:inline-block;height:80px;width:80px;-webkit-background-clip:padding-box;-webkit-border-radius:80px;-moz-background-clip:padding-box;-moz-border-radius:80px;border-radius:80px;background-clip:padding-box}header.main div.bio{display:inline-block;margin:9px 0 0 12px;vertical-align:top}header.main div.bio a.name{color:#666;font:500 18px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-decoration:none;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio a.name:hover{color:black}header.main div.bio p{color:#B7B7B7;font:500 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;margin-top:1px;max-width:400px}header.main div.bio p a{color:#B7B7B7;font-weight:bold;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio p a:hover{color:#666}section.main section.content{float:left;width:760px}section.main section.content div.gutter{float:left;width:80px}section.main section.content div.content-inner{float:right;margin-left:16px;width:664px}section.main aside.main{float:right;padding-left:20px;width:220px}section.main aside.main section.module{margin-bottom:40px}section.main aside.main section.module h1{color:#999;font:bold 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;margin-bottom:10px}section.main aside.main section.module ul li{margin:0}section.main aside.main section.module ul li a{color:#999;display:block;font:normal 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;max-width:220px;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}section.main aside.main section.module ul li a:before{background:#EEE;content:"";display:inline-block;margin-right:10px;height:9px;width:9px;-webkit-background-clip:padding-box;-webkit-border-radius:5px;-moz-background-clip:padding-box;-moz-border-radius:5px;border-radius:5px;background-clip:padding-box}section.main aside.main section.module ul li a:hover:before{background:#CCC}
+html,body{background:#FFF}body{color:#666;font:normal 14px/16px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-rendering:optimizeLegibility}*{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.hidden{display:none}div.frame{margin:0 auto;position:relative;width:980px}div.frame div.ruler{background:#EAEAEA;height:100%;position:fixed;top:0;width:1px;z-index:49}div.frame div.left-y{margin-left:40px}div.frame div.right-y{margin-left:760px}header.main{padding:20px 0;position:relative;z-index:50}header.main a.logo{display:inline-block}header.main a.logo span.avatar{display:inline-block;height:80px;width:80px;-webkit-background-clip:padding-box;-webkit-border-radius:80px;-moz-background-clip:padding-box;-moz-border-radius:80px;border-radius:80px;background-clip:padding-box}header.main div.bio{display:inline-block;margin:9px 0 0 12px;vertical-align:top}header.main div.bio a.name{color:#666;font:500 18px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-decoration:none;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio a.name:hover{color:black}header.main div.bio p{color:#B7B7B7;font:500 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;margin-top:1px;max-width:400px}header.main div.bio p a{color:#B7B7B7;font-weight:bold;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio p a:hover{color:#666}section.main section.content{float:left;width:760px}section.main section.content div.gutter{float:left;width:80px}section.main section.content div.content-inner{float:right;margin-left:16px;width:664px}section.main aside.main{float:right;padding-left:20px;width:220px}section.main aside.main section.module{margin-bottom:40px}section.main aside.main section.module h1{color:#999;font:bold 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;margin-bottom:10px}section.main aside.main section.module ul li{margin:0}section.main aside.main section.module ul li a{color:#999;display:block;font:normal 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;max-width:220px;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}section.main aside.main section.module ul li a:before{background:#EEE;content:"";display:inline-block;margin-right:10px;height:9px;width:9px;-webkit-background-clip:padding-box;-webkit-border-radius:5px;-moz-background-clip:padding-box;-moz-border-radius:5px;border-radius:5px;background-clip:padding-box}section.main aside.main section.module ul li a:hover:before{background:#CCC}div.pagination{clear:left;margin-left:96px}

media/css/blog-themes/pro-adams/style.scss

@@ -224,3 +224,7 @@ section.main {
         }
     }
 }
+div.pagination {
+    clear: left;
+    margin-left: 96px;
+}

media/css/pro.css

@@ -31,4 +31,4 @@ table {
     border-collapse: collapse;
     border-spacing: 0;
 }
-html,body{background:#FFF}body{color:#666;font:normal 14px/16px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-rendering:optimizeLegibility}*{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.hidden{display:none}div.frame{margin:0 auto;position:relative;width:980px}div.frame div.ruler{background:#EAEAEA;height:100%;position:fixed;top:0;width:1px;z-index:49}div.frame div.left-y{margin-left:40px}div.frame div.right-y{margin-left:760px}header.main{padding:20px 0;position:relative;z-index:50}header.main a.logo{display:inline-block}header.main a.logo span.avatar{display:inline-block;height:80px;width:80px;-webkit-background-clip:padding-box;-webkit-border-radius:80px;-moz-background-clip:padding-box;-moz-border-radius:80px;border-radius:80px;background-clip:padding-box}header.main div.bio{display:inline-block;margin:9px 0 0 12px;vertical-align:top}header.main div.bio a.name{color:#666;font:500 18px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-decoration:none;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio a.name:hover{color:black}header.main div.bio p{color:#B7B7B7;font:500 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;margin-top:1px;max-width:400px}header.main div.bio p a{color:#B7B7B7;font-weight:bold;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio p a:hover{color:#666}section.main section.content{float:left;width:760px}section.main section.content div.gutter{float:left;width:80px}section.main section.content div.content-inner{float:right;margin-left:16px;width:664px}section.main aside.main{float:right;padding-left:20px;width:220px}section.main aside.main section.module{margin-bottom:40px}section.main aside.main section.module h1{color:#999;font:bold 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;margin-bottom:10px}section.main aside.main section.module ul li{margin:0}section.main aside.main section.module ul li a{color:#999;display:block;font:normal 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;max-width:220px;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}section.main aside.main section.module ul li a:before{background:#EEE;content:"";display:inline-block;margin-right:10px;height:9px;width:9px;-webkit-background-clip:padding-box;-webkit-border-radius:5px;-moz-background-clip:padding-box;-moz-border-radius:5px;border-radius:5px;background-clip:padding-box}section.main aside.main section.module ul li a:hover:before{background:#CCC}
+html,body{background:#FFF}body{color:#666;font:normal 14px/16px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-rendering:optimizeLegibility}*{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.group:after{content:".";display:block;height:0;clear:both;visibility:hidden}.hidden{display:none}div.frame{margin:0 auto;position:relative;width:980px}div.frame div.ruler{background:#EAEAEA;height:100%;position:fixed;top:0;width:1px;z-index:49}div.frame div.left-y{margin-left:40px}div.frame div.right-y{margin-left:760px}header.main{padding:20px 0;position:relative;z-index:50}header.main a.logo{display:inline-block}header.main a.logo span.avatar{display:inline-block;height:80px;width:80px;-webkit-background-clip:padding-box;-webkit-border-radius:80px;-moz-background-clip:padding-box;-moz-border-radius:80px;border-radius:80px;background-clip:padding-box}header.main div.bio{display:inline-block;margin:9px 0 0 12px;vertical-align:top}header.main div.bio a.name{color:#666;font:500 18px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;text-decoration:none;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio a.name:hover{color:black}header.main div.bio p{color:#B7B7B7;font:500 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;margin-top:1px;max-width:400px}header.main div.bio p a{color:#B7B7B7;font-weight:bold;-webkit-transition:color .05s linear;-moz-transition:color .05s linear;-o-transition:color .05s linear;transition:color .05s linear}header.main div.bio p a:hover{color:#666}section.main section.content{float:left;width:760px}section.main section.content div.gutter{float:left;width:80px}section.main section.content div.content-inner{float:right;margin-left:16px;width:664px}section.main aside.main{float:right;padding-left:20px;width:220px}section.main aside.main section.module{margin-bottom:40px}section.main aside.main section.module h1{color:#999;font:bold 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;margin-bottom:10px}section.main aside.main section.module ul li{margin:0}section.main aside.main section.module ul li a{color:#999;display:block;font:normal 12px "Helvetica Neue",Helvetica,Arial,"Liberation Sans",FreeSans,sans-serif;line-height:18px;max-width:220px;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}section.main aside.main section.module ul li a:before{background:#EEE;content:"";display:inline-block;margin-right:10px;height:9px;width:9px;-webkit-background-clip:padding-box;-webkit-border-radius:5px;-moz-background-clip:padding-box;-moz-border-radius:5px;border-radius:5px;background-clip:padding-box}section.main aside.main section.module ul li a:hover:before{background:#CCC}div.pagination{clear:left;margin-left:96px}