Skip to content

Commit c04d62c

Browse files
goorsgoors
committed
Merge branch 'release/2.3'
2 parents 6a054aa + f94f40f commit c04d62c

File tree

6 files changed

+42
-16
lines changed

6 files changed

+42
-16
lines changed

‎PostModel.py

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,22 @@ def addFiles(self, files, post):
130130
def addImages(self, images, post):
131131

132132
from models import db
133-
from PIL import Image
134-
import glob, os
133+
import os
135134

136-
size = 80, 80
137135

138136
for image in images:
137+
138+
139+
139140
filename = secure_filename(image.filename)
140141
image.save(os.path.join(UPLOAD_FOLDER, filename))
141142

142-
im = Image.open(UPLOAD_FOLDER + filename)
143+
self.generateImage(80, 80, filename, "th_")
144+
self.generateImage(400, 400, filename, "gallery_")
145+
146+
'''im = Image.open(UPLOAD_FOLDER + filename)
143147
im.thumbnail(size, Image.ANTIALIAS)
144-
im.save(UPLOAD_FOLDER + "th_" + filename, "JPEG")
148+
im.save(UPLOAD_FOLDER + "th_" + filename, "JPEG")'''
145149

146150
pi = self.PostImage(post, filename)
147151
db.session.add(pi)
@@ -205,9 +209,10 @@ def removeimage(self, id):
205209
if (posts):
206210
for p in posts:
207211
db.session.delete(p)
208-
if os.path.isfile(UPLOAD_FOLDER + p.FileName) and os.path.isfile(UPLOAD_FOLDER + "th_"+p.FileName):
209-
os.remove(UPLOAD_FOLDER + p.FileName)
212+
if os.path.isfile(UPLOAD_FOLDER + p.ImageName) and os.path.isfile(UPLOAD_FOLDER + "th_"+p.ImageName) and os.path.isfile(UPLOAD_FOLDER + "gallery_"+p.ImageName):
213+
os.remove(UPLOAD_FOLDER + p.ImageName)
210214
os.remove(UPLOAD_FOLDER + "th_" + p.ImageName)
215+
os.remove(UPLOAD_FOLDER + "gallery_" + p.ImageName)
211216
db.session.commit()
212217
return False
213218

@@ -235,9 +240,10 @@ def removeimages(self, post):
235240
if (posts):
236241
for p in posts:
237242
db.session.delete(p)
238-
if os.path.isfile(UPLOAD_FOLDER + p.FileName) and os.path.isfile(UPLOAD_FOLDER + "th_"+p.FileName):
239-
os.remove(UPLOAD_FOLDER + p.FileName)
243+
if os.path.isfile(UPLOAD_FOLDER + p.ImageName) and os.path.isfile(UPLOAD_FOLDER + "th_"+p.ImageName) and os.path.isfile(UPLOAD_FOLDER + "gallery_"+p.ImageName):
244+
os.remove(UPLOAD_FOLDER + p.ImageName)
240245
os.remove(UPLOAD_FOLDER + "th_" + p.ImageName)
246+
os.remove(UPLOAD_FOLDER + "gallery_" + p.ImageName)
241247
db.session.commit()
242248
return False
243249

@@ -248,3 +254,15 @@ def getNumberOfComments(self, post):
248254
return commentsNo
249255
return 0
250256

257+
def generateImage(self, size_w, size_h, filename, ex):
258+
259+
from PIL import Image
260+
261+
size = size_w, size_h
262+
263+
im = Image.open(UPLOAD_FOLDER + filename)
264+
im.thumbnail(size, Image.ANTIALIAS)
265+
im.save(UPLOAD_FOLDER + ex + filename, "JPEG")
266+
267+
268+

‎controllers/admin.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ def addpost():
3232
pid = post.addPost(request.form['title'], request.form['slug'], request.form['content'], request.files['photo'], active)
3333
post.addTags(request.form.getlist('tags'), pid);
3434

35-
if(request.files.getlist("files")):
35+
if(request.files["files"]):
3636
post.addFiles(request.files.getlist("files"), pid)
3737

38-
if(request.files.getlist("images")):
38+
if(request.files["images"]):
3939
post.addImages(request.files.getlist("images"), pid)
40-
return redirect("/admin/edit-post/"+pid)
40+
return redirect("/admin/edit-post/"+str(pid))
41+
return render_template("admin/add-post.html", tags=tags.tags())
4142

4243

4344
@admin_api.route('/admin/edit-post/<id>', methods=['POST','GET'])

‎templates/admin/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
<td style="vertical-align: middle">{{ post.DateCreated }}</td>
3333
<td style="vertical-align: middle">
3434
<a href="/admin/edit-post/{{post.Id}}">Edit</a> <br />
35-
<a href="/admin/delete-post/{{ post.Id}}">Delete</a>
35+
<a href="/admin/delete-post/{{ post.Id}}">Delete</a> <br />
36+
<a href="/read/{{ post.Slug }}" target="_blank">Preview</a>
3637
</td>
3738

3839
</tr>

‎templates/home/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
{% endfor %}
77
{% endblock %}
88
{% block body %}
9+
10+
911
<div class="col-xs-12">
1012
<div style="text-align: center;" class="col-xs-12">
1113
{% for tag in tags%}
@@ -47,13 +49,15 @@ <h3 style="cursor: pointer; " onclick="javascript: window.location.href='/read/{
4749
<div class="col-lg-8" style="text-align: left">
4850
{{ snap(post.Content)|safe }}
4951
{% if getimages(post.Id) %}
52+
<div class="fotorama" data-nav="thumbs">
5053
<hr />
5154
{% for image in getimages(post.Id) %}
5255
{% set im = "/static/files/th_"~image.ImageName%}
5356
{% set imB = "/static/files/"~image.ImageName%}
5457

5558
<a href="{{imB}}"><img src="{{ im }}" style="border: 1px solid #ccc; padding: 1px;"></a>
5659
{% endfor %}
60+
</div>
5761
{% endif %}
5862
<div style="clear: both;"></div>
5963
</div>

‎templates/home/read.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ <h3>{{ post.Title }}</h3>
2626
{% endfor %}<hr />
2727
{% endif %}
2828
{% if getimages(post.Id) %}
29+
<div class="fotorama" data-nav="thumbs">
2930
<hr />
3031
{% for image in getimages(post.Id) %}
3132
{% set im = "/static/files/th_"~image.ImageName%}
3233
{% set imB = "/static/files/"~image.ImageName%}
3334

3435
<a href="{{imB}}"><img src="{{ im }}" style="border: 1px solid #ccc; padding: 1px;"></a>
3536
{% endfor %}
36-
<hr />
37+
</div>
3738
{% endif %}
3839
<div class="col-lg-12" style="text-align: left">
3940
{{ post.Content|safe }}

‎templates/layout-fe.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<footer class="text-center" style="margin-top:30px;font-size:12px;padding-top:10px;border-top: 1pt solid #ebebeb;width: 100%; z-index: 4; padding-bottom: 30px; background-color: #ffffff">
2222
Copyright © 2012 Pregmatch.org, Licensed under the Apache License, Version 2.0.
2323
</footer>
24-
25-
24+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <!-- 33 KB -->
25+
<link href="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.2/fotorama.css" rel="stylesheet"> <!-- 3 KB -->
26+
<script src="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.2/fotorama.js"></script> <!-- 16 KB -->
2627
</body>
2728
</html>

0 commit comments

Comments
 (0)