diff options
| -rw-r--r-- | app/src/views.py | 22 | ||||
| -rw-r--r-- | app/utils/util.py | 8 | ||||
| -rw-r--r-- | config/django.ini | 6 | ||||
| -rw-r--r-- | design/templates/details/note.html | 2 | ||||
| -rw-r--r-- | design/templates/details/src_entry.html | 6 | ||||
| -rw-r--r-- | design/templates/src_base.html | 2 |
6 files changed, 26 insertions, 20 deletions
diff --git a/app/src/views.py b/app/src/views.py index 20188fd..fd334f8 100644 --- a/app/src/views.py +++ b/app/src/views.py @@ -4,7 +4,7 @@ from django.contrib.syndication.views import Feed from django.urls import reverse from django.conf import settings -from paypal.standard.forms import PayPalPaymentsForm +#from paypal.standard.forms import PayPalPaymentsForm from .models import Post, Topic, Book @@ -31,16 +31,16 @@ class BookDetailView(DetailView): price = book.price_sale else: price = book.price - paypal_dict = { - "business": settings.PAYPAL_RECEIVER_EMAIL, - "amount": price, - "item_name": book.title, - "invoice": "unique-invoice-id", - "notify_url": "https://luxagraf.net/src/paypal/" + reverse('src:paypal-ipn'), - "return_url": "https://luxagraf.net/src/thank-you", - "cancel_return": "https://luxagraf.net/src/books/", - } - context['paypal_form'] = PayPalPaymentsForm(initial=paypal_dict) + #paypal_dict = { + # "business": settings.PAYPAL_RECEIVER_EMAIL, + # "amount": price, + # "item_name": book.title, + # "invoice": "unique-invoice-id", + # "notify_url": "https://luxagraf.net/src/paypal/" + reverse('src:paypal-ipn'), + # "return_url": "https://luxagraf.net/src/thank-you", + # "cancel_return": "https://luxagraf.net/src/books/", + #} + #context['paypal_form'] = PayPalPaymentsForm(initial=paypal_dict) return context diff --git a/app/utils/util.py b/app/utils/util.py index 1ceb699..6678fc9 100644 --- a/app/utils/util.py +++ b/app/utils/util.py @@ -11,11 +11,17 @@ def markdown_to_html(txt): md = markdown.Markdown( extensions=[ 'markdown.extensions.fenced_code', - 'markdown.extensions.codehilite(css_class=highlight,linenums=False)', + 'markdown.extensions.codehilite', 'markdown.extensions.attr_list', 'footnotes', 'extra' ], + extension_configs = { + 'markdown.extensions.codehilite': { + 'css_class': 'highlight', + 'linenums': False + }, + }, output_format='html5', safe_mode=False ) diff --git a/config/django.ini b/config/django.ini index a22d296..f238c17 100644 --- a/config/django.ini +++ b/config/django.ini @@ -11,15 +11,15 @@ gid = http socket = /tmp/uwsgi.sock chmod-socket = 664 -chown-socket = http:http +chown-socket = www-data:www-data # the base directory -chdir = /home/lxf/apps/luxagraf +chdir = /home/lxf/sites/luxagraf.net # django's wsgi file module = config.wsgi # the virtualenv -home = /home/lxf/apps/luxagraf/venv +home = /home/lxf/sites/luxagraf.net/venv buffer-size =65535 #plugin=python diff --git a/design/templates/details/note.html b/design/templates/details/note.html index 315fd84..583d50b 100644 --- a/design/templates/details/note.html +++ b/design/templates/details/note.html @@ -12,7 +12,7 @@ <meta name="geo.placename" content="{% if object.location.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.country.name}}{%endif%}"> <meta name="geo.region" content="{{object.country.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}"> {%endblock%} -{% block bodyid %}class="notes--permalink" id="archive-{% if month %}{{month|month_number_to_name}}{%endif%}{{year}}"{%endblock%} +{% block bodyid %}class="notes--permalin detail" id="archive-{% if month %}{{month|month_number_to_name}}{%endif%}{{year}}"{%endblock%} {% block primary %}<ul class="bl crumbs" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb"> diff --git a/design/templates/details/src_entry.html b/design/templates/details/src_entry.html index 1c38e94..4f4523a 100644 --- a/design/templates/details/src_entry.html +++ b/design/templates/details/src_entry.html @@ -4,7 +4,7 @@ {% block pagetitle %}{{object.title|striptags}} | luxagraf:src{% endblock %} -{% block bodyid %}class="src"{% endblock %} +{% block bodyid %}class="src detail"{% endblock %} {% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %} {%block extrahead%} <meta property="og:type" content="article" /> @@ -28,14 +28,14 @@ <li><a href="/src/"><code>src</code></a></li> </ul> <main role="main"> - <article class="hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article"> + <article class="hentry post-article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article"> <header id="header" class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}"> <h1 class="p-name entry-title post--title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|safe|smartypants}}{%else%}{{object.title|safe|smartypants|widont}}{%endif%}</h1> {% if object.slug != 'about' %}<time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>{%endif%} {% if object.topics.all %}<span class="src-topics">Topics: {% for topic in object.topics.all%} <a href="/src/topic/{{topic.slug}}">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{%endfor%}</span>{%endif%} <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p> </header> - <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody"> + <div id="article" class="e-content entry-content post-body post-body-{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody"> {{object.body_html|safe|smartypants|widont}} </div> </article> diff --git a/design/templates/src_base.html b/design/templates/src_base.html index a7d3e30..4daa80e 100644 --- a/design/templates/src_base.html +++ b/design/templates/src_base.html @@ -16,7 +16,7 @@ title="Luxagraf:src RSS feed" href="https://luxagraf.net/src/feed.xml"> {%block stylesheet%}<link rel="stylesheet" - href="/media/screenv8.css" + href="/media/screenv9.css" media="screen">{%endblock%} <!--[if IE]> <link rel="stylesheet" |