From 3edd19470d0e587fb566fbc7fcb177c4f6c28749 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Wed, 8 Apr 2009 23:13:41 +0000 Subject: [PATCH] minor HTML adjustments; deleted an old template. git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@312 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/TODO | 4 ++++ conifer/templates/admin/index.xhtml | 15 ++++-------- conifer/templates/item_add_elec.xhtml | 9 ++++---- conifer/templates/item_add_heading.xhtml | 2 +- conifer/templates/item_add_phys.xhtml | 39 -------------------------------- conifer/templates/item_add_url.xhtml | 2 +- conifer/templates/item_metadata.xhtml | 2 +- conifer/templates/prefs.xhtml | 1 + conifer/templates/search_results.xhtml | 4 ++-- 9 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 conifer/templates/item_add_phys.xhtml diff --git a/conifer/TODO b/conifer/TODO index e45827d..2f3768a 100644 --- a/conifer/TODO +++ b/conifer/TODO @@ -17,6 +17,10 @@ IMPORTANT: * accented characters in z3950 queries seem to fail. More tests needed. +* manage z3950 targets? Search z3950 targets? + +* Send me email when my sites change? + MAYBE: * Generating barcodes in emails, printable screens? (3 of 9 enough?) diff --git a/conifer/templates/admin/index.xhtml b/conifer/templates/admin/index.xhtml index 2c09a6e..295f37a 100644 --- a/conifer/templates/admin/index.xhtml +++ b/conifer/templates/admin/index.xhtml @@ -11,21 +11,16 @@ title = _('Administrative Options')

${title}

- - - + + + diff --git a/conifer/templates/item_add_elec.xhtml b/conifer/templates/item_add_elec.xhtml index f17f03c..a66efc0 100644 --- a/conifer/templates/item_add_elec.xhtml +++ b/conifer/templates/item_add_elec.xhtml @@ -1,6 +1,6 @@ ${title} -

Metadata

@@ -37,16 +36,16 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
- +
Title of document
${item_metadata_formset()}

-

File contents

+

File contents

- +
File

diff --git a/conifer/templates/item_add_heading.xhtml b/conifer/templates/item_add_heading.xhtml index 426c550..88c238a 100644 --- a/conifer/templates/item_add_heading.xhtml +++ b/conifer/templates/item_add_heading.xhtml @@ -19,7 +19,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term) ${course_banner(course)} ${nested_title(parent_item)} ${offer_to_delete(item)} -

${title}

+

${title}

Heading diff --git a/conifer/templates/item_add_phys.xhtml b/conifer/templates/item_add_phys.xhtml deleted file mode 100644 index febc734..0000000 --- a/conifer/templates/item_add_phys.xhtml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - ${title} - - - - ${course_banner(course)} - ${nested_title(parent_item)} - ${offer_to_delete(item)} -

${title}

- - - - - - - -
Display name
-

Metadata

- ${item_metadata_formset(show_more=False)} -

- - -

- - - - diff --git a/conifer/templates/item_add_url.xhtml b/conifer/templates/item_add_url.xhtml index 513bd8d..22771af 100644 --- a/conifer/templates/item_add_url.xhtml +++ b/conifer/templates/item_add_url.xhtml @@ -19,7 +19,7 @@ course_title = '%s: %s (%s)' % (course.code, course.title, course.term) ${course_banner(course)} ${nested_title(parent_item)} ${offer_to_delete(item)} -

${title}

+

${title}

diff --git a/conifer/templates/item_metadata.xhtml b/conifer/templates/item_metadata.xhtml index 1740879..d35f681 100644 --- a/conifer/templates/item_metadata.xhtml +++ b/conifer/templates/item_metadata.xhtml @@ -54,7 +54,7 @@ is_editor = course.can_edit(request.user)
Title
-

Additional metadata

+

Additional metadata

diff --git a/conifer/templates/prefs.xhtml b/conifer/templates/prefs.xhtml index 2ad2cd0..b812ea3 100644 --- a/conifer/templates/prefs.xhtml +++ b/conifer/templates/prefs.xhtml @@ -22,6 +22,7 @@ title = _('Preferences')

Notification preferences

+

This doesn't work yet.

diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml index 80b88c5..fc195a2 100644 --- a/conifer/templates/search_results.xhtml +++ b/conifer/templates/search_results.xhtml @@ -18,9 +18,9 @@ courses = course_list

${title}

-

+

You searched: ${query_string} -

+
${attr.get_name_display()}