Explorar o código

Signed-off-by: zry <admin@z-touhou.org>

zry %!s(int64=8) %!d(string=hai) anos
pai
achega
bd7fa9cd4f
Modificáronse 5 ficheiros con 55 adicións e 3 borrados
  1. 2 0
      swyzxwb_photovote/settings.py
  2. 26 0
      templates/vote/pw.flist.html
  3. 8 1
      templates/vote/pw.view.html
  4. 2 1
      vote/urls.py
  5. 17 1
      vote/views.py

+ 2 - 0
swyzxwb_photovote/settings.py

@@ -92,7 +92,9 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR,'static'),
 )
+
 PHOTO_DIR_URL = 'http://swzry-file.zry.iego.net/swyzxwb/photovote/001/'
+THUMB_ARGS = '?imageView2/1/w/300/h/300'
 
 MEDIA_ROOT = os.path.join(STATICFILES_DIRS[0],'uploads')
 MEDIA_URL = '/static/uploads/'

+ 26 - 0
templates/vote/pw.flist.html

@@ -0,0 +1,26 @@
+{% extends "layout.html" %}
+
+{% block title %}
+    邵武一中新闻部摄影大赛-投票系统
+{% endblock %}
+
+{% block content %}
+
+{% include "common/paginator.html" %}
+
+{% for i in lPage %}
+<div class="col-md-4">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h3 class="panel-title">{{i.title}}</h3>
+    </div>
+    <div class="panel-body">
+      <img class="img-responsive" src="{{pwurl}}{{i.filename}}.{{i.fileext}}{{thumbargs}}" />
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+{% include "common/paginator.html" %}
+
+{% endblock %}

+ 8 - 1
templates/vote/pw.view.html

@@ -34,7 +34,14 @@
         </tr>
         <tr>
           <th>操作</th>
-          <td><a href="{%url 'votephoto' pwobj.uuid %}" role="button" class="btn btn-xs btn-primary">投票给本作品</a></td>
+          <td>
+            <a href="{%url 'votephoto' pwobj.uuid %}" role="button" class="btn btn-xs btn-primary">投票给本作品</a>
+            {% if hasnext %}
+                <a href="{%url 'pwview' nextuuid %}" role="button" class="btn btn-xs btn-primary">下一张作品</a>
+            {% else %}
+                <button class="btn btn-grey btn-xs">已是最后一张</button>
+            {% endif %}
+          </td>
         </tr>
       </tbody>
     </table>

+ 2 - 1
vote/urls.py

@@ -12,6 +12,7 @@ urlpatterns = patterns('vote.views',
     url(r'^admin/photoworks/xlsadd/$', 'XLSFilePW', name='pwaddxls'),
 
     url(r'^user/view/(?P<uuid>\w*-\w*-\w*-\w*-\w*)/$', 'ViewPhotoWorks', name='pwview'),
-    url(r'^user/vote.do/(?P<uuid>\w*-\w*-\w*-\w*-\w*)/$', 'ViewPhotoWorks', name='votephoto'),
+    url(r'^user/list/$', 'FrontListPhotoWorks', name='pwflist'),
+    url(r'^user/vote.do/(?P<uuid>\w*-\w*-\w*-\w*-\w*)/$', 'VotePhotoWorks', name='votephoto'),
 
 )

+ 17 - 1
vote/views.py

@@ -113,12 +113,28 @@ def ExpPW_ByIpid(request,ID):
 def ViewPhotoWorks(request,uuid):
 	try:
 		pwobj = PhotoWorks.objects.get(uuid=uuid)
-		kwvars = {'request':request,'pwobj':pwobj,'pwurl':settings.PHOTO_DIR_URL}
+		try:
+			npwobj = PhotoWorks.objects.get(id=pwobj.id+1)
+			hasnext = True
+			nextuuid = npwobj.uuid
+		except PhotoWorks.DoesNotExist:
+			hasnext = False
+			nextuuid = ""
+		kwvars = {'request':request,'pwobj':pwobj,'pwurl':settings.PHOTO_DIR_URL,'hasnext':hasnext,'nextuuid':nextuuid}
 		return render_to_response('vote/pw.view.html',kwvars,RequestContext(request))
 	except PhotoWorks.DoesNotExist:
 		kwvars = {"msg":"404 作品不存在","detail":"您所查看的摄影作品不存在","error":"PhotoWorks '%s' Not Found."%uuid}
 		return render_to_response('error.html',kwvars,RequestContext(request))
 
+def FrontListPhotoWorks(request,uuid):
+	pwlist = PhotoWorks.objects.all()
+	lst = SelfPaginator(request,pwlist, 24)
+	kwvars = {'request':request,'lPage':lst,'pwurl':settings.PHOTO_DIR_URL,'thumbargs':settings.THUMB_ARGS}
+	return render_to_response('vote/pw.flist.html',kwvars,RequestContext(request))
+
+def VotePhotoWorks(request,uuid):
+	return 0
+
 @login_required
 @PermissionVerify()
 def GenEmptyXLS(request):