Changeset 245 for trunk


Ignore:
Timestamp:
07/16/07 12:39:47 (5 years ago)
Author:
marc
Message:

Added favicon.ico support, updated translation.

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r244 r245  
    33 * Switch to GPLv3 
    44 * Added RPM packages 
     5 * Added a favicon to the server 
    56 * Simplified and improved Makefile 
    67 * Cleaning of the code to try to be at least more compatible with PEP-8 

  • trunk/config.py

    r241 r245  
    8484<head> 
    8585<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
     86<link rel="icon" href="/favicon.ico" type="image/x-icon"> 
    8687<title>Itaka</title> 
    8788</head> 

  • trunk/locale/es/LC_MESSAGES/itaka.po

    r241 r245  
    229229#: uigtk.py:446 
    230230msgid "Clear" 
    231 msgstr "Limpiar" 
     231msgstr "Vaciar" 
    232232 
    233233#: uigtk.py:452 

  • trunk/server.py

    r244 r245  
    200200        self.add_child_to_resource('root', '', self.root) 
    201201        self.add_child_to_resource('root', 'screenshot', ScreenshotResource(self.gui, self.authresource)) 
     202        self.add_child_to_resource('root', 'favicon.ico', IconResource(self.gui, self.authresource)) 
    202203        self.create_site(self.root) 
    203204 
    … …  
    452453            self.request.setHeader('Connection', 'close') 
    453454            return self.data 
     455 
     456class IconResource(resource.Resource): 
     457    """  
     458    Handle server requests and call for favicon.ico 
     459    """ 
     460 
     461    def __init__(self, gui_instance, auth_instance): 
     462        """  
     463        Constructor 
     464 
     465        @type gui_instance: Gui 
     466        @param gui_instance: An instance of our L{Gui} class 
     467 
     468        @type auth_instance: AuthenticatedResource 
     469        @param auth_instance: An instance of our L{AuthenticatedResource} class 
     470        """ 
     471 
     472        self.gui = gui_instance 
     473        self.auth = auth_instance 
     474        self.itaka_globals = self.gui.itaka_globals 
     475 
     476    def render_GET(self, request): 
     477        """ 
     478        Handle GET requests 
     479 
     480        @type request: instance 
     481        @param request: twisted.web.server.Request instance 
     482        """ 
     483 
     484        self.configuration = self.gui.configuration 
     485        self.request = request 
     486        self.type = 'image/x-icon' 
     487        self.file = os.path.join(self.itaka_globals.image_dir, 'favicon.ico') 
     488        self.data = open(self.file, 'rb').read() 
     489        self.size = str(os.stat(self.file).st_size) 
     490 
     491        if self.configuration['server']['authentication']: 
     492            if self.auth.authenticated or self.auth.authenticate(self.request): 
     493                self.auth.set_request_data(self.data, self.size, self.type, True) 
     494            return self.auth.return_object_data() 
     495        else: 
     496            self.request.setHeader('Content-Type', self.type) 
     497            self.request.setHeader('Content-Length', self.size) 
     498            self.request.setHeader('Connection', 'close') 
     499            return self.data 
Note: See TracChangeset for help on using the changeset viewer.