moonq/qalbum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade nanoG2

Browse Source
This commit is contained in:
q
2019-04-11 12:59:25 +03:00
parent 6d89c26f7e
commit cca14c430c
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qalbum/Qalbum.py
View File

@@ -27,7 +27,7 @@ from datetime import datetime
# (c) ville.q.rantanen@gmail.com # (c) ville.q.rantanen@gmail.com
__version__='2.20180827' __version__='2.20190411a'
FILECONFIG=".config" FILECONFIG=".config"
FILEDESC="descriptions.csv" FILEDESC="descriptions.csv"

20
qalbum/Qnano2.py
View File

@@ -39,7 +39,7 @@ from Qalbum import \
# (c) ville.q.rantanen@gmail.com # (c) ville.q.rantanen@gmail.com
__version__='0.20180827' __version__='0.20190411a'
imagesearch=re.compile('.*\.jpg$|.*\.jpeg$|.*\.gif$|.*\.png$|.*\.tif$|.*\.svg$|.*\.pdf$',re.I) imagesearch=re.compile('.*\.jpg$|.*\.jpeg$|.*\.gif$|.*\.png$|.*\.tif$|.*\.svg$|.*\.pdf$',re.I)
vectorsearch=re.compile('.*\.svg$|.*\.pdf$',re.I) vectorsearch=re.compile('.*\.svg$|.*\.pdf$',re.I)
@@ -63,8 +63,8 @@ def getheader(path,parent,title=""):
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<link href="https://unpkg.com/nanogallery2@2.2.0/dist/css/nanogallery2.min.css" rel="stylesheet" type="text/css"> <link href="https://unpkg.com/nanogallery2/dist/css/nanogallery2.min.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="https://unpkg.com/nanogallery2@2.2.0/dist/jquery.nanogallery2.min.js"></script> <script type="text/javascript" src="https://unpkg.com/nanogallery2/dist/jquery.nanogallery2.min.js"></script>
<TITLE>'''+title+'''</TITLE> <TITLE>'''+title+'''</TITLE>
<script type="text/javascript"> <script type="text/javascript">
$( document ).ready(function() { $( document ).ready(function() {
@@ -135,6 +135,7 @@ def getfooter():
def imagelinks(path,list): def imagelinks(path,list):
''' Returns the HTML string of images ''' ''' Returns the HTML string of images '''
strout='''\n<div id="Qnano2-gallery" data-nanogallery2='{ strout='''\n<div id="Qnano2-gallery" data-nanogallery2='{
"galleryDisplayTransition": "none",
"thumbnailHeight": 90, "thumbnailHeight": 90,
"thumbnailWidth": 90, "thumbnailWidth": 90,
"itemsBaseURL": "", "itemsBaseURL": "",
@@ -143,7 +144,16 @@ def imagelinks(path,list):
"position": "onBottom", "position": "onBottom",
"hideIcons": true, "hideIcons": true,
"titleFontSize": "0.8em" "titleFontSize": "0.8em"
} },
"thumbnailDisplayTransition": "none",
"thumbnailDisplayTransitionDuration": 100,
"thumbnailDisplayInterval": 5,
"thumbnailHoverEffect2": "borderLighter|scale120",
"thumbnailBorderHorizontal": 1,
"thumbnailBorderVertical": 1,
"imageTransition": "slideAppear",
"viewerImageDisplay": "upscale"
}'> }'>
''' '''
descriptions=getdescriptions(path,list) descriptions=getdescriptions(path,list)
@@ -157,7 +167,7 @@ def imagelinks(path,list):
strout += '<a href=".med/%s.jpg" data-ngthumb=".tn/%s.jpg" data-ngdownloadurl="%s">%s</a><br>\n'%( strout += '<a href=".med/%s.jpg" data-ngthumb=".tn/%s.jpg" data-ngdownloadurl="%s">%s</a><br>\n'%(
urllib.quote(i), urllib.quote(i),
urllib.quote(i), urllib.quote(i),
nice.encode('ascii', 'xmlcharrefreplace'), urllib.quote(i),
desc desc
) )
strout+='</div>' strout+='</div>'

2
setup.py
View File

@@ -8,7 +8,7 @@ setup(
'scripts/Qalbum-descriptor'], 'scripts/Qalbum-descriptor'],
package_data={'':['lib/*']}, package_data={'':['lib/*']},
include_package_data=True, include_package_data=True,
version = '2.20180827', version = '2.20190411a',
description = 'A tool to create a web gallery from a folder structure of images / other files.', description = 'A tool to create a web gallery from a folder structure of images / other files.',
author = 'Ville Rantanen', author = 'Ville Rantanen',
author_email = 'ville.q.rantanen@gmail.com', author_email = 'ville.q.rantanen@gmail.com',