sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.37'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-17 16:17:59 +02:00
parent eae3e3a02b a04f1fe3e7
commit 4ca5cb5f93
5 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
rowers/views/statements.py
View File

@@ -805,7 +805,7 @@ def get_thumbnails(request,id):
def get_blog_posts(request): def get_blog_posts(request):
try: try:
response = requests.get( response = requests.get(
'https://analytics.rowsandall.com/wp-json/wp/v2/posts') 'https://analytics.rowsandall.com/wp-json/wp/v2/posts?per_page=3')
if response.status_code == 200: if response.status_code == 200:
blogs_json = response.json() blogs_json = response.json()
# with open('blogs.txt','w') as o: # with open('blogs.txt','w') as o:
@@ -819,54 +819,21 @@ def get_blog_posts(request):
for postdata in blogs_json[0:3]: for postdata in blogs_json[0:3]:
try:
featuredmedia = postdata['featured_media']
url = 'https://analytics.rowsandall.com/wp-json/wp/v2/media/%d' % featuredmedia
response = requests.get(url)
if response.status_code == 200:
image_json = response.json()
image_url = image_json[
'media_details'
][
'sizes'
][
'thumbnail'
][
'source_url'
]
else:
image_url = ''
except KeyError:
image_url = ''
try: try:
title = postdata['title']['rendered'].encode( title = postdata['title']['rendered'].encode(
'ascii','xmlcharrefreplace') 'ascii','xmlcharrefreplace')
excerpt = postdata['excerpt']['rendered'].encode(
'ascii','xmlcharrefreplace')
ptester = re.compile('\<p\>(\w.*)\<\/p\>')
excerpt_first = ptester.match(excerpt).group(1)
except TypeError: except TypeError:
title = postdata['title']['rendered'].encode( title = postdata['title']['rendered'].encode(
'ascii','xmlcharrefreplace').decode('utf-8') 'ascii','xmlcharrefreplace').decode('utf-8')
excerpt = postdata['excerpt']['rendered'].encode(
'ascii','xmlcharrefreplace').decode('utf-8')
ptester = re.compile('\<p\>(\w.*)\<\/p\>')
excerpt_first = ptester.match(excerpt).group(1)
thedict = { thedict = {
'title': title, 'title': title,
'author': '', # 'author': '',
'image': image_url, # 'image': image_url,
'excerpt': excerpt_first, # 'excerpt': excerpt_first,
'link': postdata['link'], 'link': postdata['link'],
} }

1
static/css/leaflet.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
static/css/rowsandall2.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
static/css/styles2.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
templates/newbase.html
View File

@@ -43,9 +43,9 @@
<link rel="stylesheet" href="/static/css/resetnew.css" /> <link rel="stylesheet" href="/static/css/resetnew.css" />
<link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css"> <link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css">
<link rel="stylesheet" href="/static/fontawesome/css/all.min.css"> <link rel="stylesheet" href="/static/fontawesome/css/all.min.css">
<link rel="stylesheet" href="/static/css/styles2.css"> <link rel="stylesheet" href="/static/css/styles2.min.css">
<link rel="stylesheet" href="/static/css/text2.css" /> <link rel="stylesheet" href="/static/css/text2.css" />
<link rel="stylesheet" href="/static/css/rowsandall2.css" /> <link rel="stylesheet" href="/static/css/rowsandall2.min.css" />
{% block meta %} {% endblock %} {% block meta %} {% endblock %}
<div id="fb-root"></div> <div id="fb-root"></div>
<script>(function(d, s, id) { <script>(function(d, s, id) {