diff options
| -rw-r--r-- | photoblaster/config.py | 1 | ||||
| -rw-r--r-- | photoblaster/server.py | 10 | ||||
| -rw-r--r-- | photoblaster/templates/gallery.html | 2 | ||||
| -rw-r--r-- | share/frontend/gallery-static/js/main.js | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/photoblaster/config.py b/photoblaster/config.py index 4977edf..be972bb 100644 --- a/photoblaster/config.py +++ b/photoblaster/config.py @@ -67,3 +67,4 @@ BASE_URL = "http://i.asdf.us" PBCONCAT_DIMENSIONS_LIMIT = 700 PBCONCAT_FRAMES_LIMIT = 20 +GALLERY_LIMIT = 1000 diff --git a/photoblaster/server.py b/photoblaster/server.py index 3138a94..4a5ac2c 100644 --- a/photoblaster/server.py +++ b/photoblaster/server.py @@ -13,7 +13,7 @@ from photoblaster.modules import Modules, PbProcessError from photoblaster.db.models.imcmd import ImCmd from photoblaster.param import BadParamError, FileTooBigError from photoblaster.config import SERVER_HOST, SERVER_PORT, STATIC_FOLDER, \ - WORKING_DIR, LOCAL + WORKING_DIR, LOCAL, GALLERY_LIMIT # gallery stuff GALLERY_TAG_TRANS = { @@ -178,9 +178,9 @@ class Server(object): if request.args.get('addr'): search_params['remote_addr'] = request.args['remote_addr'] qs.append("addr=" + request.args['addr']) - limit = request.args.get('limit') or 20 - if limit > 100: - limit = 100 + limit = int(request.args.get('limit', 20)) + if limit > GALLERY_LIMIT: + limit = GALLERY_LIMIT offset = int(request.args.get('start', 0)) if request.args.get('random'): results = ImCmd.search_random(**search_params) @@ -198,6 +198,8 @@ class Server(object): ] older = offset + limit newer = offset - limit + if limit != 20: + qs.append("limit=%s" % limit) qs = "&".join(qs) return render_template( diff --git a/photoblaster/templates/gallery.html b/photoblaster/templates/gallery.html index b4f0221..f409952 100644 --- a/photoblaster/templates/gallery.html +++ b/photoblaster/templates/gallery.html @@ -12,7 +12,7 @@ <script type="text/javascript"> var imagedata = [ {% for image in images %} -[ "{{ image }}" ], +"{{ image }}", {% endfor %} ] diff --git a/share/frontend/gallery-static/js/main.js b/share/frontend/gallery-static/js/main.js index 3db8785..af22fa6 100644 --- a/share/frontend/gallery-static/js/main.js +++ b/share/frontend/gallery-static/js/main.js @@ -1,8 +1,8 @@ $(function(){ - for (var i=0; i< (imagedata.length - 1); i++){ + for (var i=0; i < imagedata.length; i++){ var newDiv = document.createElement("div"); var newImage = document.createElement("img"); - newImage.src = imagedata[i][0]; + newImage.src = imagedata[i]; newImage.className = "pb"; newDiv.appendChild(newImage); // consider calling something like isotope add here...and ONLY APPENDING the image to the parent div once it has loaded |