Yuri Baburov avatar Yuri Baburov committed f7dd4e7 Merge

Merged from default branch

Comments (0)

Files changed (21)

File contents unchanged.

Add a comment to this file

apps/accounts/models.py

File contents unchanged.

File contents unchanged.

apps/textblocks/templatetags/text_block.py

 @register.inclusion_tag('templatetags/text_block.html')
 def text_block(code):
     try:    
-        return {'text_block': TextBlock.objects.get(code=code) }
-    except TextBlock.DoesNotExist:
+        return {'text_block': TextBlock.objects.get(code=code) }
+    except TextBlock.DoesNotExist:
         return {'text_block': {'html': ''}}

File contents unchanged.

Add a comment to this file

static/buriy/css/default_left.css

File contents unchanged.

Add a comment to this file

static/buriy/css/default_right.css

File contents unchanged.

File contents unchanged.

Add a comment to this file

templates/lib/debug.html

File contents unchanged.

Add a comment to this file

templates/openid/complete.html

File contents unchanged.

File contents unchanged.

Add a comment to this file

themes/buriy/blog/post_detail.html

File contents unchanged.

Add a comment to this file

themes/buriy/blog/post_list.html

File contents unchanged.

File contents unchanged.

themes/buriy_blog/base.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-transitional.dtd">
+
+<html lang="en">
+<head>
+
+<meta http-equiv="content-language" content="ru,en-us"/>
+<meta name="generator" content="Buriy-blog v0.3"/>
+<meta name="name" content="Yuri Baburov's blog"/>
+<!--
+<meta name="description" content="Blog about me, my life and work: python, django" />
+<meta name="keywords" content="buriy, bur, burchik, Baburov, Yuri Baburov, Yuri Vovanych, Yuriy Baburov"/>
+-->
+
+<!-- prevent caching (can be removed) -->
+<!--<meta http-equiv="Pragma" content="no-cache"/>-->
+<!--<meta http-equiv="Cache-Control" content="no-cache, must-revalidate"/>-->
+<!--<meta http-equiv="Expires" content="-1"/>-->
+<link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.buriy.com/rss/"/>
+
+<link rel="stylesheet" type="text/css" href="/media/default_right.css"/>
+<link rel="stylesheet" type="text/css" href="/media/nicetitle.css"/>
+<script type="text/javascript" src="/media/nicetitle.js"></script>
+
+<!-- favorite icon -->
+<link rel="shortcut icon" href="/media/blog.gif"/>
+<link rel="icon" href="/media/blog.gif"/>
+
+<title>Yuri Baburov &raquo; {% block title %} {% endblock %}</title>
+{% block head %}
+{% endblock %}
+</head>
+<body>
+<!-- page header -->
+<div id="header"><a name="top"></a>
+<h1><a href="http://www.buriy.com/" accesskey="1">buriy's blog</a>
+</h1>
+</div>
+
+<!-- begin wrapper divs -->
+<div id="mainwrapper">
+<div id="wrapper"><!-- page content -->
+<div id="container">
+{% block content %}{% endblock %}
+</div>
+
+<!-- page menu -->
+<h2 class="hidden">Sidebar</h2>
+<div id="sidebarcontainer"><!--%parsedinclude(sidebar.inc)%--> <!-- page menu -->
+<div class="sidebar">
+<dl class="sidebardl">
+	<dt>Navigation</dt>
+	<dd><a href="/" title="Today&#39;s entry">Today</a></dd>
+	<dd><a href="/2007/" title="Archives 2007">Archives 2007</a></dd>
+	<dd><a href="/2006/" title="Archives 2006">Archives 2006</a></dd>
+</dl>
+</div>
+
+<!-- category list, not on error or member page -->
+<div class="sidebar">
+<dl class="sidebardl">
+	<dt>Categories</dt>
+	{% for cat in categories %} 
+	<dd>
+		<a href="/{{cat.norm_value}}/">	{{cat.value}} </a> 
+	</dd>
+	{% endfor %}
+</dl>
+</div>
+
+<!-- search form --> <!-- 
+<div class="sidebar">
+<dl class="sidebardl">
+<dt>Search</dt>
+<dd><%searchform%></dd>
+</dl>
+</div>
+--> <!-- login form --> <!--
+<div class="sidebar">
+<dl class="sidebardl">
+<dt>Login</dt>
+<dd><%loginform%></dd>
+</dl>
+</div>
+--> <!-- links -->
+<div class="sidebar">
+    <dl class="sidebardl">
+    	<dt>Links</dt>
+    	<dd><a rel="nofollow" href="http://buriy.moikrug.ru/"><img
+    		style="width: 16px; height: 16px; border:0; vertical-align: middle; margin-right: 3px;"
+    		src="/media/moikrug.gif" alt="MoiKrug - Бабуров Юрий"
+    		title="MoiKrug - Бабуров Юрий"/></a><a rel="nofollow" 
+    		href="http://buriy.moikrug.ru/"
+    		title="MoiKrug - Бабуров Юрий"/>Бабуров Юрий</a></dd>
+    	<dd><a rel="nofollow" href="http://buriy.livejournal.com" title="My another blog">buriy.livejournal.com</a></dd>
+    	<dd><a href="http://effele.com/" title="Effective learning">Effective learning</a></dd>
+    </dl>
+    <div class="sidebar">
+        <dl class="sidebardl">
+	    <dt>Last comments</dt>
+	    {% for c in comments %}
+            <dd>
+	        <nobr>{{c.submit_date|date:"M d"}}, {{c.person_name}}</nobr>
+	        <a title='{{c.get_content_object.pub_date|date:"M d, Y"}}: {{c.get_content_object.headline}}'
+		href="{{c.get_content_object.get_absolute_url}}">
+		{{c.get_content_object.headline}}</a>
+	    </dd>
+    	    {% endfor %}
+        </dl>
+    </div>
+<!-- <dl class="sidebardl">
+    	<dt>My top weekly tracks</dt>
+	<div align="center">
+	<a href="http://www.last.fm/user/buriy/?chartstyle=buriy-weekly-top"><img src="http://imagegen.last.fm/buriy-weekly-top/tracks/buriy.gif" border="0" /></a>
+	</div>
+    </dl>
+-->
+<!--
+<a href="http://www.anothr.com/add?url=http%3A//www.buriy.com/">
+<img src="http://www.anothr.com/images/addtoanothr2.jpg" border="0"
+alt="Subscribe by Anothr(Skype/Gtalk/Msn)"/></a>
+<span style="font-size:10px;display:block;color:DarkGray;line-height:1.2em">
+Subscribe via Skype/Gtalk/MSN</span>-->
+</div>
+</div>
+
+<div class="clearing" style="clear:both">&nbsp;</div>
+
+</div>
+</div>
+
+<div id="footer">
+    <div id="copyrights"><small>Copyright 2006 (c) <b>buriy</b> and
+    others&nbsp; | <a href="#top">Back to top</a></small></div>
+</div>
+
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-3332477-1");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+
+</body>
+</html>

themes/buriy_blog/entry_archive.html

+{% extends "blog/base.html" %}
+{% load comments %}
+
+{% block title %}Last news{% endblock %}
+{% block head %} 
+<link rel="openid.server" href="http://www.livejournal.com/openid/server.bml" />
+<link rel="openid.delegate" href="http://buriy.livejournal.com/" />
+<link rel="meta" type="application/rdf+xml" title="FOAF" href="http://www.buriy.com/media/foaf.rdf" />
+<!--<meta http-equiv="X-XRDS-Location" content="http://buriy.livejournal.com/data/yadis" />
+<meta http-equiv="X-YADIS-Location" content="http://buriy.livejournal.com/data/yadis" />-->
+<meta name="microid" content="1b02104d6725eb30e4025cab7dfc49efbe704bb2" />
+{% endblock %}
+{% block content %}
+<div class="content">
+    {% for object in latest %}
+        {% get_free_comment_count for blog.entry object.id as comment_count %}
+    
+        <div class="contenttitle">
+        <h2>{{ object.pub_date|date:"m/j" }}: <a
+            nicetitle="Бабуров Юрий: {{ object.headline }}"
+            href="{{ object.get_absolute_url }}"> {{ object.headline }}</a></h2>
+        </div>
+        
+        <div class="contentitem">
+            <div class="contentitem1">
+            <small class="contentitemcategory">
+                Categories: 
+                {% for cat in object.tags.all %}
+                <a rel="tag" nicetitle="Category: {{ cat.value }}" href="/{{ cat.norm_value }}/">
+                    {{cat.value}}</a>{% if not forloop.last %}, {% endif %}
+                {% endfor %}
+            </small>
+        </div>
+            <div class="contentitem2">
+                <small class="contentitempostedby">
+                Posted by: {{ object.author }}
+                </small>
+            </div>
+            <div class="contentitem3">
+                <small class="contentitemcomments">
+                    <a nicetitle="Add comment on '{{ object.headline }}'" href="{{ object.get_absolute_url }}#comments" rel="bookmark">
+                    {% if comment_count %}
+                    {{ comment_count }} comment{{ comment_count|pluralize }}
+                    {% else %}
+                    Add comment
+                    {% endif %}
+                    </a>
+                </small>
+            </div>
+            {% if user.is_authenticated %}
+            <div class="contentitem4">
+                <small class="contentitemedit">
+                    <a nicetitle="Edit post '{{ object.headline }}'" 
+                    href="/admin/blog/entry/{{object.id }}" rel="bookmark">
+                    Edit post
+                    </a>
+                </small>
+            </div>
+            {% endif %}
+        </div>
+        <div class="contentbody">
+            {{ object.body|safe|linebreaks }}
+        </div>
+    {% endfor %}
+</div>
+{% endblock %}

themes/buriy_blog/entry_archive_day.html

+{% extends "blog/base.html" %}
+{% load comments %}
+{% block title %}{{ day|date:"F j" }}{% endblock %}
+
+{% block content %}
+
+<div class="content">
+    <div class="contenttitle">
+        <h2>{{ day|date:"F j" }} archive</h2>
+        You are currently viewing archive for {{ day|date:"d F, Y" }} 
+    </div>
+</div>
+<div class="content">
+    {% for object in object_list %}
+        {% get_free_comment_count for blog.entry object.id as comment_count %}
+    
+        <div class="contenttitle">
+        <h2>{{ object.pub_date|date:"m/j" }}: <a
+            nicetitle="Бабуров Юрий: {{ object.headline }}"
+            href="{{ object.get_absolute_url }}"> {{ object.headline }}</a></h2>
+        </div>
+        
+        <div class="contentitem">
+            <div class="contentitem1">
+                <small class="contentitemcategory">
+                Categories: 
+                {% for cat in object.tags.all %}{% if not forloop.first %}, {% endif %}
+                <a rel="tag" nicetitle="Category: {{ cat.value }}" href="/{{ cat.norm_value }}/">{{cat.value}}</a>
+                {% endfor %}
+                </small>
+            </div>
+            <div class="contentitem2">
+                <small class="contentitempostedby">
+                Posted by: {{ object.author }}
+                </small>
+            </div>
+            <div class="contentitem3">
+                <small class="contentitemcomments">
+                    <a nicetitle="Add comment on '{{ object.headline }}'" href="{{ object.get_absolute_url }}#comments" rel="bookmark">
+                    {% if comment_count %}
+                    {{ comment_count }} comment{{ comment_count|pluralize }}
+                    {% else %}
+                    Add comment
+                    {% endif %}
+                    </a>
+                </small>
+            </div>
+            {% if user.is_authenticated %}
+            <div class="contentitem4">
+                <small class="contentitemedit">
+                    <a nicetitle="Edit post '{{ object.headline }}'" 
+                    href="/admin/blog/entry/{{object.id }}" rel="bookmark">
+                    Edit post
+                    </a>
+                </small>
+            </div>
+            {% endif %}
+        </div>
+        <div class="contentbody">
+            {{ object.body|safe|linebreaks }}
+        </div>
+    {% endfor %}
+</div>
+{% endblock %}

themes/buriy_blog/entry_archive_month.html

+{% extends "blog/base.html" %}
+{% load comments %}
+{% block title %}{{ month|date:"F Y" }}{% endblock %}
+
+{% block content %}
+<div class="content">
+    <div class="contenttitle">
+        <h2>{{ month|date:"F Y" }} archive</h2>
+        You are currently viewing archive for {{ month|date:"F Y" }} 
+    </div>
+</div>
+<div class="content">
+    {% for object in object_list %}
+        {% get_free_comment_count for blog.entry object.id as comment_count %}
+    
+        <div class="contenttitle">
+        <h2>{{ object.pub_date|date:"M/j" }}: <a
+            nicetitle="Бабуров Юрий: {{ object.headline }}"
+            href="{{ object.get_absolute_url }}"> {{ object.headline }}</a></h2>
+        </div>
+        
+        <div class="contentitem">
+            <div class="contentitem1">
+                <small class="contentitemcategory">
+                Categories: 
+                {% for cat in object.tags.all %}{% if not forloop.first %}, {% endif %}
+                <a rel="tag" nicetitle="Category: {{ cat.value }}" href="/{{ cat.norm_value }}/">{{cat.value}}</a>
+                {% endfor %}
+                </small>
+            </div>
+            <div class="contentitem2">
+                <small class="contentitempostedby">
+                Posted by: {{ object.author }}
+                </small>
+            </div>
+            <div class="contentitem3">
+                <small class="contentitemcomments">
+                    <a nicetitle="Add comment on '{{ object.headline }}'" href="{{ object.get_absolute_url }}#comments" rel="bookmark">
+                    {% if comment_count %}
+                    {{ comment_count }} comment{{ comment_count|pluralize }}
+                    {% else %}
+                    Add comment
+                    {% endif %}
+                    </a>
+                </small>
+            </div>
+            {% if user.is_authenticated %}
+            <div class="contentitem4">
+                <small class="contentitemedit">
+                    <a nicetitle="Edit post '{{ object.headline }}'" 
+                    href="/admin/blog/entry/{{object.id }}" rel="bookmark">
+                    Edit post
+                    </a>
+                </small>
+            </div>
+            {% endif %}
+        </div>
+        <div class="contentbody">
+            {{ object.body|safe|linebreaks }}
+        </div>
+    {% endfor %}
+</div>
+{% endblock %}

themes/buriy_blog/entry_archive_year.html

+{% extends "blog/base.html" %}
+
+{% block title %}{{ year }} archives{% endblock %}
+
+{% block content %}
+<div class="content">
+<h1>{{ year }} year archive</h1>
+
+{% regroup object_list by pub_date.month as grouped_list %}
+
+<ul class="linklist">
+{% for group in grouped_list %}
+    <li><h2><a href="{{ group.list.0.pub_date|date:"M"|lower }}/">
+	{{ group.list.0.pub_date|date:"F" }}</a></h2>
+    <ul>
+        {% for object in group.list %}
+	<li>{{object.pub_date|date:"m/d"}}
+	    <a href="{{object.get_absolute_url}}">{{ object.headline }}</a>
+	</li>
+        {% endfor %}
+    </ul>
+{% endfor %}
+
+</ul>
+</div>
+{% endblock %}

themes/buriy_blog/entry_detail.html

+{% extends "blog/base.html" %}
+{% load comments %}
+{% block title %}{{ object.headline|escape }}{% endblock %}
+{% block content %}
+<div class="content">
+        <div class="contenttitle">
+        <h2>{{ object.pub_date|date:"m/j" }}: <a
+            nicetitle="Бабуров Юрий: {{ object.headline }}"
+            href="{{ object.get_absolute_url }}"> {{ object.headline }}</a></h2>
+        </div>
+        
+        <div class="contentitem">
+            <div class="contentitem1">
+                <small class="contentitemcategory">
+                Categories: 
+                {% for cat in object.tags.all %}
+                <a nicetitle="Category: {{ cat.value }}" href="/{{ cat.norm_value }}/">
+                    {{cat.value}}</a>{% if not forloop.last %}, {% endif %}
+                {% endfor %}
+                </small>
+            </div>
+            <div class="contentitem2">
+                <small class="contentitempostedby">
+                Posted by: {{ object.author }}
+                </small>
+            </div>
+            <div class="contentitem3">
+                <small class="contentitemcomments">
+                    <a nicetitle="Add comment on '{{ object.headline }}'" href="{{ object.get_absolute_url }}#comments" rel="bookmark">
+                    {% if comment_count %}
+                    {{ comment_count }} comment{{ comment_count|pluralize }}
+                    {% else %}
+                    Add comment
+                    {% endif %}
+                    </a>
+                </small>
+            </div>
+            {% if user.is_authenticated %}
+            <div class="contentitem4">
+                <small class="contentitemedit">
+                    <a nicetitle="Edit post '{{ object.headline }}'" 
+                    href="/admin/blog/entry/{{object.id }}" rel="bookmark">
+                    Edit post
+                    </a>
+                </small>
+            </div>
+            {% endif %}
+        </div>
+        <div class="contentbody">
+            {{ object.body|safe|linebreaks }}
+        </div>
+</div>
+
+{% load comments %}
+{% get_free_comment_list for blog.entry object.id as comment_list %}
+
+<div class="content">
+    <div class="contenttitle">
+        <h2>Comments</h2>
+    </div>
+    <a name="comments"></a>
+    <div class="comments">
+        {% if comment_list %}
+            {% for comment in comment_list %}
+{% comment %} 
+            <div class="comment" id="c{{ comment.id }}">
+                <h3>{{ comment.person_name }} <span class="small quiet">{{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}</span></h3>
+                {{ comment.comment|escape|urlizetrunc:"40"|linebreaks }}
+            </div>
+{% endcomment %}
+            {% ifequal comment.person_name "bur" %} 
+            <div class="itemcomment id1" id="c{{ comment.id }}">
+            {% else %}
+                {% ifequal comment.person_name "buriy" %} 
+	        <div class="itemcomment id1" id="c{{ comment.id }}">
+                {% else %}
+        	<div class="itemcomment id0" id="c{{ comment.id }}">
+		{% endifequal %}
+            {% endifequal %} 
+                <h3>
+                <b>{{ comment.person_name }}</b> wrote:</h3>
+                
+                <div class="commentbody"> 
+                    {{ comment.comment|escape|urlizetrunc:"45"|linebreaks }}
+                </div>
+                <div class="commentinfo">
+                {{ comment.submit_date|date:"F j, Y" }} at {{ comment.submit_date|date:"P" }}
+                </div>
+            </div>
+            {% endfor %} 
+        {% else %} 
+            No comments yet 
+        {% endif %}
+    </div>
+</div>
+<div class="content">
+    <div class="contenttitle">
+        <h2>Add Comment</h2>
+    </div>
+    {% free_comment_form for blog.entry object.id %}
+</div>
+{% endblock %}
Add a comment to this file

themes/web_brains/blog/sidebar.html

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.