From 62e2d4995329f48cd3a133a660a71e98580a328c Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Wed, 5 Mar 2014 22:01:51 +0100
Subject: [PATCH] [gen] Added a transparent clickable logo at the top left (or
 right if rtl) of the page.

---
 fields/file.py           |   2 +-
 gen/mixins/ToolMixin.py  |   5 ++---
 gen/ui/home.gif          | Bin 569 -> 0 bytes
 gen/wrappers/__init__.py |  13 ++++++-------
 4 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 gen/ui/home.gif

diff --git a/fields/file.py b/fields/file.py
index 95356ea..e61dc0f 100644
--- a/fields/file.py
+++ b/fields/file.py
@@ -400,7 +400,7 @@ class File(Field):
             if rq: action = rq.get('%s_delete' % self.name, None)
             if action != 'nochange':
                 # Delete the file on disk
-                info = getattr(zobj.aq_base, self.name)
+                info = getattr(zobj.aq_base, self.name, None)
                 if info:
                     info.removeFile(zobj.getDbFolder(), removeEmptyFolders=True)
                 # Delete the FileInfo in the DB
diff --git a/gen/mixins/ToolMixin.py b/gen/mixins/ToolMixin.py
index 57b92c6..df53255 100644
--- a/gen/mixins/ToolMixin.py
+++ b/gen/mixins/ToolMixin.py
@@ -1243,9 +1243,8 @@ class ToolMixin(BaseMixin):
         tb = sys.exc_info()
         if error.type.__name__ == 'Unauthorized':
             siteUrl = self.getSiteUrl()
-            htmlMessage = '<a href="%s"><img src="%s/ui/home.gif"/></a>' \
-                          'You are not allowed to access this page.' % \
-                          (siteUrl, siteUrl)
+            htmlMessage = '<a href="/">Back</a> You are not allowed to ' \
+                          'access this page.'
             userId = self.appy().user.login
             textMessage = 'Unauthorized for %s @%s.' % \
                           (userId, self.REQUEST.get('PATH_INFO'))
diff --git a/gen/ui/home.gif b/gen/ui/home.gif
deleted file mode 100644
index c203753bd45d91db9b616c4f0898b46117eee837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 569
zcmZ?wbhEHb6krfwIF`lG9-!G4B-s_D+!mtT6{_4Bra37}y*EKKC4EwQ*7Wq8X_+}w
zQ}X9#7EVhqT$EF^q@r?aUe&7HhJ_XNn+rR()J@sjGU;&L%p<L{wzkZ>cxjQsjfD!2
zmaE@hrG9I*+PyWZ_t$CP+@$_wlh)(S+RwI{Jl|pVVyD^jT~5z;IX~Is^<tm?<NfB(
z_qu#M==|!4>&Fu|pHA4lJ8k~<yu+7s4)4#qzrWz|{-V?83yvRv<Rzc4*ZjX-3;c0A
z{O9fPulFK<-HZNtKkCJcXRlx0eg5kHn-|aDzr1_v<Ij5^{(OD&`2NTLcRv5V_xZ<-
zufJb>_<#S)_q$(zKK%0I(U<?PKK*_4_5b~E|DJvM|K#hRS6_cW|MvU-&mT{||9kx7
z=gV*Z-hBIU_xImd-~Ye){`=YQFHe8}`1t+*yC47G|M>sv*RPL1{=ND0=k<Ro0L7my
zj9d)$3_1)z0E!a^_Gu0EP0cN>ZB05l?QOcYHoD!-nsyHMcA68lt*!L*tgN-$)h$g_
zJUmoPEj3!z%#4*?Gc#S4%`H@$W%UgeU6NDNQydkH4CI<*l%$>F6B3hRGn}Qg<Xa@t
zVxpN@BEo|N+9bn516UcNB18Dv#61J!7}>qNgSpzo{M_7`*nEBF=@^7G9%A7Xlru?~
Pz~H!~U4WaFiNP8Gr(sg$

diff --git a/gen/wrappers/__init__.py b/gen/wrappers/__init__.py
index 93a88bc..ce56bf2 100644
--- a/gen/wrappers/__init__.py
+++ b/gen/wrappers/__init__.py
@@ -150,16 +150,15 @@ class AbstractWrapper(object):
        <tr class="top">
         <!-- Top banner -->
         <td var="bannerName=(dir == 'ltr') and 'banner' or 'bannerrtl'"
-            style=":url(bannerName, bg=True) + '; background-repeat:no-repeat'">
+            style=":url(bannerName, bg=True) + '; background-repeat:no-repeat;\
+                   position:relative'">
+         <!-- Logo (transparent clickable zone by default) -->
+         <div align=":dleft" style="position: absolute"><a href="/">
+          <img src=":url('logo')"/></a></div>
 
          <!-- Top links -->
          <div style="margin-top: 4px" align=":dright">
-          <!-- Icon "home" -->
-          <a class="pageLink" href="/" title=": _('app_home')">
-           <img src=":url('home.gif')" style="margin-right: 3px"/>
-          </a>
-
-          <!-- Additional links -->
+          <!-- Custom links -->
           <x>:tool.pxLinks</x>
 
           <!-- Top-level pages -->