cvs commit: jakarta-gump/python/gump/document resolver.py

[ajack]

ajack       2003/12/07 09:49:13

  Modified:    python/gump/syndication rss.pyc syndicator.pyc rss.py
                        syndicator.py
               python/gump/document resolver.py
  Log:
  RSS HTML tweaks.
  
  Revision  Changes    Path
  1.2       +50 -41    jakarta-gump/python/gump/syndication/rss.pyc
  
        <<Binary file>>
  
  
  1.2       +25 -23    jakarta-gump/python/gump/syndication/syndicator.pyc
  
        <<Binary file>>
  
  
  1.6       +1 -2      jakarta-gump/python/gump/syndication/rss.py
  
  Index: rss.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/syndication/rss.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rss.py    6 Dec 2003 18:01:48 -0000       1.5
  +++ rss.py    7 Dec 2003 17:49:13 -0000       1.6
  @@ -133,7 +133,7 @@
           <a href="http://feedvalidator.org/check?url=%s";>
               <img align="right" src="http://feedvalidator.org/images/valid-rss.png"; 
                   alt="[Valid RSS]" title="Validate my RSS feed" width="88" 
height="31" />
  -        </a>""") % (self.rssUrl)
  +        </a><br clear><hr>""") % (self.rssUrl)
           
           # Mandatory Fields
           self.rssStream.write(('    <title>Gump: %s</title>\n') 
%(escape(self.title)))
  @@ -355,7 +355,6 @@
           #
           content=self.getProjectContent(project,self.run)
                           
  -        #
           #
           #
           item=Item(('%s %s %s') % 
(project.getName(),project.getStateDescription(),datestr), \
  
  
  
  1.5       +7 -2      jakarta-gump/python/gump/syndication/syndicator.py
  
  Index: syndicator.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/syndication/syndicator.py,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- syndicator.py     6 Dec 2003 18:01:48 -0000       1.4
  +++ syndicator.py     7 Dec 2003 17:49:13 -0000       1.5
  @@ -101,6 +101,8 @@
                                   
           content += self.getStateContent(project.getStatePair())
                           
  +        content += 'Sequence in state: ' + stats.sequenceInState
  +        
           if not stats.previousState == STATE_NONE \
               and not stats.previousState == STATE_UNSET:
               content += 'Previous state: ' \
  @@ -122,6 +124,8 @@
           content='Module ' + module.getName()
                                       
           content += self.getStateContent(module.getStatePair())
  +        
  +        content += 'Sequence in state: ' + stats.sequenceInState
                           
           if not stats.previousState == STATE_NONE \
               and not stats.previousState == STATE_UNSET:
  @@ -143,7 +147,7 @@
              content += ' with reason ' \
                   + statePair.getReasonDescription()
           
  -        content += ( '&nbsp;<img href=\'%s\' alt=\'%s\'/>' ) % \
  +        content += ( '&nbsp;<img src=\'%s\' alt=\'%s\'/>' ) % \
               resolver.getStateIconInformation(statePair)
               
           content += '<br><br>'
  @@ -175,7 +179,8 @@
                       '</td></tr>\n')                   
               content += '<table></p>'
               
  -        content += '\n\n<hr>\n<img align=\'left\' alt=\'Brought to you by Jakarta 
Gump\' src=\'http://jakarta.apache.org/gump/images/bench.png\'/>'
  +        content += ('<br><hr>\n<img align=\'left\' alt=\'Brought to you by Jakarta 
Gump\' src=\'%s\'/>') \
  +                        %    resolver.getImageUrl('apache.png')
           
           return content
   
  
  
  
  1.8       +9 -3      jakarta-gump/python/gump/document/resolver.py
  
  Index: resolver.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/resolver.py,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- resolver.py       6 Dec 2003 18:01:48 -0000       1.7
  +++ resolver.py       7 Dec 2003 17:49:13 -0000       1.8
  @@ -368,7 +368,10 @@
              
       def getAbsoluteUrl(self,object,documentName=None,extn='.html'):
           location=getLocationForObject(object,extn)
  -        if documentName: location.setDocument(documentName)
  +        if documentName:         
  +            if not documentName.endswith(extn):
  +                documentName += extn
  +            location.setDocument(documentName)
           return concatenate(self.rootUrl,location.serialize())
   
       #
  @@ -405,6 +408,9 @@
           
           # Build the URL to the icon
           iconName=gumpSafeName(lower(replace(sname,' ','_')))
  -        url = self.getAbsoluteUrlForRelative("gump_icons/"+iconName+".png")
  +        url = self.getAbsoluteUrlForRelative('gump_icons/'+iconName+'.png')
           
  -        return (url, description)
  \ No newline at end of file
  +        return (url, description)
  +        
  +    def getImageUrl(self,name):
  +        return self.getAbsoluteUrlForRelative('gump_images/'+name)
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]