From 14fbc7c36f9ec57a5fdd331348728379a6b69091 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Fri, 3 Apr 2009 01:30:56 +0000 Subject: [PATCH] added mockup for Physical Item Processing admin-screen Including a simple form for patron-item checkout. git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@245 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/TODO | 4 +++- conifer/static/main.css | 2 +- conifer/syrup/urls.py | 5 +++++ conifer/syrup/views.py | 11 +++++++++++ conifer/templates/phys/checkout.xhtml | 35 +++++++++++++++++++++++++++++++++++ conifer/templates/phys/index.xhtml | 25 +++++++++++++++++++++++++ conifer/templates/tabbar.xhtml | 11 +---------- 7 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 conifer/templates/phys/checkout.xhtml create mode 100644 conifer/templates/phys/index.xhtml diff --git a/conifer/TODO b/conifer/TODO index 7ed6d55..3d86214 100644 --- a/conifer/TODO +++ b/conifer/TODO @@ -3,5 +3,7 @@ * Update views.search() when this is in place. -* ... +* Import of reserves data from Leddy voyager. Laurentian, others? + +* Generating barcodes in emails, printable screens? (3 of 9 enough?) diff --git a/conifer/static/main.css b/conifer/static/main.css index 8fb8431..513f84d 100644 --- a/conifer/static/main.css +++ b/conifer/static/main.css @@ -73,7 +73,7 @@ a:hover { text-decoration: underline; } /* actions (e.g. "edit user" link) */ .action a { font-weight: bold; } -#tabbar { margin: 18 0; padding: 0; width: 700; } +#tabbar { margin: 18 0; padding: 0; } #tabbar li { display: inline; } #tabbar li a { padding: 18 18 4 18; background-color: #ddf; color: black; text-decoration: none; } #tabbar li a:hover { background-color: #fc8; } diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py index b294286..17cdb53 100644 --- a/conifer/syrup/urls.py +++ b/conifer/syrup/urls.py @@ -39,11 +39,16 @@ urlpatterns = patterns('conifer.syrup.views', (ITEM_PREFIX + r'edit/$', 'item_edit'), (ITEM_PREFIX + r'add/$', 'item_add'), # for adding sub-things (ITEM_PREFIX + r'add/cat_search/$', 'item_add_cat_search'), + (r'^admin/$', 'admin_index'), (r'^admin/terms/' + GENERIC_REGEX, 'admin_terms'), (r'^admin/depts/' + GENERIC_REGEX, 'admin_depts'), (r'^admin/news/' + GENERIC_REGEX, 'admin_news'), (r'^admin/targets/' + GENERIC_REGEX, 'admin_targets'), + + (r'^phys/$', 'phys_index'), + (r'^phys/checkout/$', 'phys_checkout'), + (r'^course/(?P\d+)/reseq$', 'course_reseq'), (ITEM_PREFIX + r'reseq', 'item_heading_reseq'), (ITEM_PREFIX + r'relocate/', 'item_relocate'), # move to new subheading diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index d293340..dbdb7dc 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -1209,3 +1209,14 @@ def item_relocate(request, course_id, item_id): return HttpResponseRedirect(course.course_url()) + +#----------------------------------------------------------------------------- +# Physical item processing + +@admin_only # fixme, is this the right permission? +def phys_index(request): + return g.render('phys/index.xhtml') + +@admin_only # fixme, is this the right permission? +def phys_checkout(request): + return g.render('phys/checkout.xhtml') diff --git a/conifer/templates/phys/checkout.xhtml b/conifer/templates/phys/checkout.xhtml new file mode 100644 index 0000000..67b7e56 --- /dev/null +++ b/conifer/templates/phys/checkout.xhtml @@ -0,0 +1,35 @@ + + + + + ${title} + + + +

${title}

+
+ + + + + + + + + + + + +
Patron Barcode
Item Barcode
+
+ +
+ + + diff --git a/conifer/templates/phys/index.xhtml b/conifer/templates/phys/index.xhtml new file mode 100644 index 0000000..eb696c0 --- /dev/null +++ b/conifer/templates/phys/index.xhtml @@ -0,0 +1,25 @@ + + + + + ${title} + + +

${title}

+

Patron assistance

+ + +

Circulations workflow

+ + + + diff --git a/conifer/templates/tabbar.xhtml b/conifer/templates/tabbar.xhtml index 2401282..ac0be18 100644 --- a/conifer/templates/tabbar.xhtml +++ b/conifer/templates/tabbar.xhtml @@ -11,15 +11,6 @@
  • Browse
  • My Courses
  • Admin Options
    • - - - - +
  • Physical Item Processing
    • -- 2.11.0