From 393ba068af3b8da8b90e433cf32900a5ede02c0b Mon Sep 17 00:00:00 2001
From: gfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 27 Jan 2009 02:28:30 +0000
Subject: [PATCH] minor UI tweaks; attachment-links now open directly

(rather than having to click on the About page and then click on
'download')


git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@121 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 conifer/genshi_namespace.py                    |   7 +++++++
 conifer/static/main.css                        |   5 +++++
 conifer/static/tango/view_detailed.png         | Bin 0 -> 597 bytes
 conifer/static/tango/x-office-address-book.png | Bin 753 -> 757 bytes
 conifer/syrup/models.py                        |   2 +-
 conifer/syrup/urls.py                          |   2 +-
 conifer/syrup/views.py                         |   6 ++++--
 conifer/templates/components/item.xhtml        |   4 ++--
 conifer/templates/item_metadata.xhtml          |   2 +-
 conifer/templates/master.xhtml                 |   2 +-
 conifer/templates/simplemessage.xhtml          |  12 ++++++++++++
 11 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 conifer/static/tango/view_detailed.png
 create mode 100644 conifer/templates/simplemessage.xhtml

diff --git a/conifer/genshi_namespace.py b/conifer/genshi_namespace.py
index 3bd545d..75bbaf7 100644
--- a/conifer/genshi_namespace.py
+++ b/conifer/genshi_namespace.py
@@ -11,11 +11,18 @@ from conifer.syrup import models
 # approach?
 
 def item_url(item, suffix=''):
+    if item.item_type == 'ELEC' and suffix == '':
+        return item_download_url(item)
     if item.item_type == 'URL' and suffix == '':
         return item.url
     else:
         return '/syrup/course/%d/item/%d/%s' % (item.course_id, item.id, suffix)
 
+def item_download_url(item):
+    assert item.item_type == 'ELEC'
+    return '/syrup/course/%d/item/%d/dl/%s' % (
+        item.course_id, item.id, item.fileobj.name.split('/')[-1])
+
 def course_url(course, suffix=''):
     return '/syrup/course/%d/%s' % (course.id, suffix)
 
diff --git a/conifer/static/main.css b/conifer/static/main.css
index 3e9d2a1..c2430fb 100644
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -122,6 +122,11 @@ a:hover {  text-decoration: underline;  }
     font-weight: bold; color: navy; 
 }
 
+.itemtree li.item_ELEC { 
+    list-style-image: url(tango/view_detailed.png);
+    margin-top: 4;
+}
+
 .itemtree li.item_URL { 
     list-style-image: url(tango/applications-internet.png);
     margin-top: 4;
diff --git a/conifer/static/tango/view_detailed.png b/conifer/static/tango/view_detailed.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fea77a1498bad4738fd6b3f97fd3cbb0958feb8
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)CU+3B{ojuRk{EG0pdwS
zK~#9!rIO7~R6!7hzdPKyOu!!q#uex!L?*!{Vd)zf*S>?V;sdxNapB5^J_9TF8ptFD
zGcmHz2|~C(eY<{K^vq>I5*OB{sycnD&pFlEvo}BXR+pDHT#VQ#ZKJfcq#Tq`McQ!v
zT!Nx)jW)lh`P!ZS`>l<YVGK@PJ56oWrBhW#T{%@|^fJTDX`^91$8y6xKp20^*H?<+
z*7^!f17!hq0p${udCL6^@(g+oC}5xkpphn=4)g7M&Wmj@1yN81m8&|+tQTmbBjT7k
zD#qK7J@WMd>^|V1Vdj__sws;Yho3TfxC7wzlyI;|IM~DM=`CRIz*n`CyQKlR;nhz7
z>Z;_+=MzSw9o%6&9$y<c8a+kTFte)x+46k`uO<MrP09ZLqYkjMvwN!?cPICm1eS{K
zLNQpyJ<(J(ilRTGZXNZ+!0B}Z7Ge&bYrm;`-X{h#3ErI1et4P4Jb#B3Yu&4hpv6tN
zJNbMInBdc+nTeMiADu89ZewOlCMVYzZf-t7)p2KG3;nyDi34E&;bYFvtG`T)Q3*kq
z<MOl1$k)>nQ$r*qb5v0=R1FnPSq*c?%`s0u@%%E9A0A)49#1ZiR*)b_8&lm1+6pnG
jUPa-C-`{@){yY8vGLOG$Q0rsm00000NkvXXu0mjf6Cwmo

literal 0
HcmV?d00001

diff --git a/conifer/static/tango/x-office-address-book.png b/conifer/static/tango/x-office-address-book.png
index f3b5d9d98cb0ba5a7dfdcc80a0762896f8426b88..039391a701a098bfb32953b89b5aa26df81be022 100644
GIT binary patch
delta 624
zcmV-$0+0Ri1@#4xBnkm@Qb$4nuFf3kks&Y&*#R2?H8HWUw$hPXM1M3%L_t(I%Z-!C
zYE(fOg}<tM>)zW#(rqR|0-~;5NI(Sf85AOJ)Zog63tvFYqBSl=pTbSZKIj`LxDc{&
zh$M;{FhtDIp@%!v<f1#Bgha@Jf})E0s?LAv7XUM}^K(Fh6R4C#IOkrxdV1$EfS8$`
zpBs^;@!<Y-+L@u9YJUo2__NVON<jfs1(+zp8;g^I?$%rGPCcYHKK)1njhi>FIp;jK
z(2Up0bTUm~EiTOnb4^}Y!aPT}Q)-nMoj0kCPqX`X@udWa<5+rNyV=G%M|)$Npq!wS
z1d}L=K%xNxi3iGYF|Z^7l0*TXH0y1sSdm+Y3MBPv2@hl*+<#sjB0T_v08t#_tQ#zP
z>qsgAtyYGJLng<DNsEHrRtCWPuNhjc@Oi1+2Pj2qb3`9t09{y0r3f!2Kh`$T#!?v`
zI+98VAcO!s1A_OEYqS(3afnhesw@#w0^q0~2JEXxka0wWr;WrTQ016Y)r9R<3PAEx
zaccplmb*QG$A5!|iP2jB20>R_s)1)`rvpHiD6I3xTfl=-A@zEdOdBqo9V5*Q2pD1C
z+2~MdFh2xncT!%zc}FNc&i95f9w7yh3J^jd0Baq;es8+d-In~mybN$V1o-sv8&@w@
zkW&1&2c(pAMV*zcLav>=#FhTTLV#ww!}*CJCMVAvIZfD0sHZQh>&MpM*@xB5hDp0_
zeY22BqA=PV3}yd+SjY6`F~7L9DGuf)XJ+T0oV1<ywDA0%0Qd)y<?Ce-GTnv%0000<
KMNUMnLSTY=u^s^c

delta 622
zcmV-!0+Ido1@Q%tB#|*K3e^e*11c!FWV*_cXheTKNkl<ZILnojO;1xn6o#Lf-nsYo
zgSKElP-+xnOpGxm#%TNvnqb_R5aPmxf5D^+2rNweAA~)TpJ3v`gbfM?Fjllwp&%`{
z?d|RKj*DWU!a`3no0&P!yze<@1i(~rVGfw#-(!C9)$}ZYm?|#JjYvK7;`u{7U*okp
z1X_Pn^V$GNDF6`1nGHXnURmbZy&|dX<Vy>fdHm=>7=}i6gAUnLjE(X>jmiN-<vmoZ
zO{gMxqZwM66#0=jbs&|Uq_(&8+5&JKM;hSZ&?6diq2452s!+Q!N|1<Q`E63A3SAX}
zkvK6Y=zFmMTvq{xmft&&Un<ncvP6Ooxz&Fyj1c^~Rv`Ip7sm5M?am;;c5K3K*xwX~
z9_>Po%vy<hAxGlJKH9ZWO&@@FpL{xMgO4jQB!I0H=2W2w4Mqs0?qVVl5CZ3@iH_Q5
z+93gi5P&%$#9dUw#~&W*y>2U#+drva&iD8v1}&UKj}VTJlH4p)yLu5FbwG%LTW)_z
z@njKhuQz)Dg8>7%3n>6hHch>)Nq*l&HCl9SMfK*yxf9h>U_dF0bUK0G(d38YB%=;o
zAM5K%4QTue;5AyjS$>Np4Wa2Rtqnp7Y!yKWfdIPQkgw%xm~S4*&+F>|Pc48Ct6SW^
z5$})fc_F2wDbj502XcG-7I%-uSO8XsUW19;5QV~}Gl}9<0oOKn&aJ`x`_1Z%ZZ*T5
zY9L)#p*woO@E?TkhD_ecn5C7fINdinRa}_;&+p9Qt7!r78*{tc*=oLQ{{R3007*qo
IM6N<$g7T{+5&!@I

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 8642479..8dd5549 100644
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -329,7 +329,7 @@ class Item(m.Model):
     def needs_meta_link(self):
         """Should an 'About' link be displayed for this item?"""
 
-        return self.item_type == 'URL'
+        return self.item_type in ('ELEC', 'URL')
 
 #------------------------------------------------------------
 
diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index 3cff76f..8eefdb3 100644
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -11,7 +11,7 @@ urlpatterns = patterns('conifer.syrup.views',
     (r'^course/$', 'my_courses'),
     (r'^browse/$', 'browse_courses'),
     (r'^browse/(?P<browse_option>.*)/$', 'browse_courses'),
-    (r'^join/$', 'join_course'),
+    (r'^prefs/$', 'user_prefs'),
     (r'^opencourse/$', 'open_courses'),
     (r'^search/$', 'search'),
     (r'^instructors/$', 'instructors'),
diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index a5f5b84..bb6f581 100644
--- a/conifer/syrup/views.py
+++ b/conifer/syrup/views.py
@@ -76,8 +76,10 @@ def instructors(request):
                     page_num=page_num,
                     count=count)
 
-def join_course(request):
-    return g.render('join_course.xhtml')
+def user_prefs(request):
+    return g.render('simplemessage.xhtml',
+                    title='Sorry...', 
+                    content='The Preferences page isn\'t ready yet.')
 
 def browse_courses(request, browse_option=''):
     #the defaults should be moved into a config file or something...
diff --git a/conifer/templates/components/item.xhtml b/conifer/templates/components/item.xhtml
index 6b93494..d1355fc 100644
--- a/conifer/templates/components/item.xhtml
+++ b/conifer/templates/components/item.xhtml
@@ -8,10 +8,10 @@
     <li py:for="item, subs in tree" class="item_${item.item_type}">
       <a href="${item_url(item)}">${item}</a> 
       <span py:if="item.needs_meta_link()" class="metalink">
-	[<a href="${item_url(item)}meta/">about</a>]
+	[<a href="${item_url(item, 'meta/')}">about</a>]
       </span>
       <span class="editlinks" py:if="edit">
-	[<a href="${item_url(item)}edit/">edit</a>]
+	[<a href="${item_url(item, 'edit/')}">edit</a>]
       </span>
       ${show_tree(subs, edit)}
     </li>
diff --git a/conifer/templates/item_metadata.xhtml b/conifer/templates/item_metadata.xhtml
index ece8add..0be6ca4 100644
--- a/conifer/templates/item_metadata.xhtml
+++ b/conifer/templates/item_metadata.xhtml
@@ -25,7 +25,7 @@ title = item.title
       <tr py:if="item.url"><th>URL</th><td><a href="${item.url}">${item.url}</a></td></tr>
     </table>
     <div py:if="item.item_type=='ELEC'">
-    <p><a href="${item_url(item)}dl/${item.fileobj.name.split('/')[-1]}">Download</a></p>
+    <p><a href="${item_download_url(item)}">Download</a></p>
     <table>
     <tr><th>Content type</th><td>${item.fileobj_mimetype}</td></tr>
     <tr><th>Content length</th><td>${item.fileobj.size}</td></tr>
diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml
index 74f0ec4..e6878ea 100644
--- a/conifer/templates/master.xhtml
+++ b/conifer/templates/master.xhtml
@@ -40,7 +40,7 @@ app_name = 'Syrup E-Reserve System'
       <span py:if="user.is_authenticated()">
 	<strong style="padding-right: 18;">Welcome, ${user.first_name or user.username}!</strong>
 	<a href="/accounts/logout">Log Out</a>
-	&bull; <a href="/user/prefs">Preferences</a>
+	&bull; <a href="/syrup/prefs/">Preferences</a>
 	&bull; <a href="/admin/">Admin UI</a>
       </span>
       <span py:if="not user.is_authenticated()">
diff --git a/conifer/templates/simplemessage.xhtml b/conifer/templates/simplemessage.xhtml
new file mode 100644
index 0000000..8fe83c4
--- /dev/null
+++ b/conifer/templates/simplemessage.xhtml
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="master.xhtml"/>
+<head>
+  <title>${title}</title>
+</head>
+<body>
+  <h1>${title}</h1>
+  ${content}
+</body>
+</html>
-- 
2.11.0