Changeset 2262

Show
Ignore:
Timestamp:
05/19/05 21:54:47 (19 years ago)
Author:
jerome
Message:

The URL to the logo used in the CGI scripts is now configurable

Location:
pykota/trunk
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/cgi-bin/dumpykota.cgi

    r2229 r2262  
    4949          <td> 
    5050            <p> 
    51               <a href="http://www.librelogiciel.com/software/"><img src="http://www.librelogiciel.com/software/PyKota/pykota.png?version=%s" alt="PyKota's Logo" /></a> 
     51              <a href="http://www.librelogiciel.com/software/"><img src="%s?version=%s" alt="PyKota's Logo" /></a> 
    5252              <br /> 
    5353              <a href="http://www.librelogiciel.com/software/">PyKota v%s</a> 
    … …  
    8585        """Displays the dumper interface.""" 
    8686        global header, footer 
    87         print header % (self.getCharset(), _("PyKota Data Dumper"), version.__version__, version.__version__, _("PyKota Data Dumper"), _("Dump"), _("Please click on the above button")) 
     87        print header % (self.getCharset(), _("PyKota Data Dumper"), self.config.getLogoURL(), version.__version__, version.__version__, _("PyKota Data Dumper"), _("Dump"), _("Please click on the above button")) 
    8888        print self.htmlListDataTypes(self.options.get("data", ""))  
    8989        print "<br />" 

  • pykota/trunk/cgi-bin/printquota.cgi

    r2229 r2262  
    4949          <td> 
    5050            <p> 
    51               <a href="http://www.librelogiciel.com/software/"><img src="http://www.librelogiciel.com/software/PyKota/pykota.png?version=%s" alt="PyKota's Logo" /></a> 
     51              <a href="http://www.librelogiciel.com/software/"><img src="%s?version=%s" alt="PyKota's Logo" /></a> 
    5252              <br /> 
    5353              <a href="http://www.librelogiciel.com/software/">PyKota v%s</a> 
    … …  
    8282        """Displays the administrative interface.""" 
    8383        global header, footer 
    84         print header % (self.getCharset(), _("PyKota Reports"), version.__version__, version.__version__, _("PyKota Reports"), _("Report")) 
     84        print header % (self.getCharset(), _("PyKota Reports"), self.config.getLogoURL(), version.__version__, version.__version__, _("PyKota Reports"), _("Report")) 
    8585        print self.body 
    8686        print footer % _("Report") 

  • pykota/trunk/cgi-bin/pykotme.cgi

    r2232 r2262  
    5050          <td> 
    5151            <p> 
    52               <a href="http://www.librelogiciel.com/software/"><img src="http://www.librelogiciel.com/software/PyKota/pykota.png?version=%s" alt="PyKota's Logo" /></a> 
     52              <a href="http://www.librelogiciel.com/software/"><img src="%s?version=%s" alt="PyKota's Logo" /></a> 
    5353              <br /> 
    5454              <a href="http://www.librelogiciel.com/software/">PyKota v%s</a> 
    … …  
    8383        """Displays the administrative interface.""" 
    8484        global header, footer 
    85         print header % (self.getCharset(), _("PyKota Reports"), version.__version__, version.__version__, _("PyKota Quotes"), _("Quote")) 
     85        print header % (self.getCharset(), _("PyKota Reports"), self.config.getLogoURL(), version.__version__, version.__version__, _("PyKota Quotes"), _("Quote")) 
    8686        print self.body 
    8787        print footer % _("Quote") 

  • pykota/trunk/conf/pykota.conf.sample

    r2252 r2262  
    191191# logs. 
    192192debug : Yes 
     193 
     194# 
     195# The URL to PyKota's logo when used from the CGI scripts. 
     196# You can use your own logo by modifying the URL below. 
     197# If not defined, the default URL is the same as the 
     198# one defined below 
     199logourl : http://www.librelogiciel.com/software/PyKota/pykota.png 
    193200 
    194201# Mail server to use to warn users 

  • pykota/trunk/NEWS

    r2257 r2262  
    2222PyKota NEWS : 
    2323        
     24    - 1.23alpha3 : 
     25     
     26        - The URL to the logo displayed in the CGI scripts is configurable. 
     27         
    2428    - 1.23alpha2 : 
    2529     

  • pykota/trunk/pykota/config.py

    r2147 r2262  
    143143        return logger     
    144144         
     145    def getLogoURL(self) : 
     146        """Returns the URL to use for the logo in the CGI scripts.""" 
     147        url = self.getGlobalOption("logourl", ignore=1) or \ 
     148                   "http://www.librelogiciel.com/software/PyKota/pykota.png" 
     149        return url.strip()            
     150     
    145151    def getAccounterBackend(self, printername) :     
    146152        """Returns the accounter backend to use for a given printer. 

  • pykota/trunk/pykota/version.py

    r2254 r2262  
    2222# 
    2323 
    24 __version__ = "1.23alpha2_unofficial" 
     24__version__ = "1.23alpha3_unofficial" 
    2525 
    2626__doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng.""" 

  • pykota/trunk/README

    r2243 r2262  
    648648look, especially quota violations will appear in different colors. 
    649649 
    650 For different security concerns, please give a look at the SECURITY 
     650For additionnal security concerns, please give a look at the SECURITY 
    651651file which is part of this software. 
    652652 

  • pykota/trunk/TODO

    r2256 r2262  
    3535          at least we avoid the problematic '<' and '>' on command 
    3636          lines, which would mandate the use of quotes... 
    37          
    38         - Make the PyKota's logo URL a new configuration directive. 
    3937         
    4038        - Pass-through mode for printers : history correctly filled (including