From 9890c6be423c698516372be3c4b1096c71292ce8 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Sat, 2 Oct 2010 19:57:57 +0000 Subject: [PATCH] UI tweaks git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@1029 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/static/main.css | 4 ++-- conifer/syrup/views/general.py | 6 +++++- conifer/templates/browse_index.xhtml | 28 ++++++++++++++++++---------- conifer/templates/master.xhtml | 4 +++- conifer/templates/prefs.xhtml | 2 ++ 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/conifer/static/main.css b/conifer/static/main.css index 18ebded..9986e53 100644 --- a/conifer/static/main.css +++ b/conifer/static/main.css @@ -184,7 +184,7 @@ span.final_item { font-weight: bold; font-size: 110%; } .itemtree li { margin: 12px 8px; line-height: 115%; } .itemtree li .mainline { padding-left: 8px; } -.itemtree li .author_pub { padding-left: 8px; font-size: 90%; margin: 4px 0 4px 0; color: #111; } +.itemtree li .author_pub { padding-left: 8px; font-size: 90%; margin: 2px 0; color: #111; } .itemtree .metalink { padding-left: 8px; color: gray; } .itemtree .metalink a { @@ -286,7 +286,7 @@ p.todo, div.todo { background-color: #fdd; padding: 6px; margin: 12px; border-le font-size: 80%; color: navy; } -.menublock { color: #da9; font-size: 80%; } +.menublock { color: #da9; font-size: 80%; margin: 1px 0; } .menublock a { color: #666; padding: 0 8px; } .menublock a:hover { color: blue; } diff --git a/conifer/syrup/views/general.py b/conifer/syrup/views/general.py index e350a57..d4fd6a3 100644 --- a/conifer/syrup/views/general.py +++ b/conifer/syrup/views/general.py @@ -5,7 +5,11 @@ from search import * #----------------------------------------------------------------------------- def welcome(request): - return HttpResponseRedirect('browse/') + user = request.user + if user.is_authenticated() and user.sites(): + return HttpResponseRedirect('site/') # My Sites + else: + return HttpResponseRedirect('browse/') # MARK: propose we get rid of this. We already have a 'Sites' browser. def open_sites(request): diff --git a/conifer/templates/browse_index.xhtml b/conifer/templates/browse_index.xhtml index 6bdab46..3820921 100644 --- a/conifer/templates/browse_index.xhtml +++ b/conifer/templates/browse_index.xhtml @@ -12,21 +12,29 @@ blocks = itertools.groupby(sites, lambda s: s.course.department) ${title} -

${title}

+

${title}

(Note: some reserve materials may require you to log in)
- - -
-

${dept}

-

- ${site} + + lock + +

+

${dept}

+
+ + ${lock()} + +

+ + ${site}

- -
- +
+
diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml index 3a1ddb2..df2c525 100644 --- a/conifer/templates/master.xhtml +++ b/conifer/templates/master.xhtml @@ -58,7 +58,9 @@ import os
Welcome! Log In - • Preferences + + • Preferences +
diff --git a/conifer/templates/prefs.xhtml b/conifer/templates/prefs.xhtml index dc1e6aa..99c2ab3 100644 --- a/conifer/templates/prefs.xhtml +++ b/conifer/templates/prefs.xhtml @@ -11,6 +11,7 @@ title = _('Preferences')

${title}

+

Preferred Language

@@ -19,6 +20,7 @@ title = _('Preferences') value="${code}">${_(descr)}
+

Notification preferences

-- 2.11.0