gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/python/gump/document/xdocs xdoc.py documenter.py
Date Wed, 16 Jun 2004 23:38:32 GMT
ajack       2004/06/16 16:38:32

  Modified:    python/gump/model Tag: CleanUp project.py
               template/xhtml/css Tag: CleanUp style.css
               python/gump/document/xdocs Tag: CleanUp xdoc.py
                        documenter.py
  Log:
  Tweaking (can't seem to get style working, probably need to brush up on CSS, and where it'll
cascade.)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.85.2.7  +3 -2      gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/project.py,v
  retrieving revision 1.85.2.6
  retrieving revision 1.85.2.7
  diff -u -r1.85.2.6 -r1.85.2.7
  --- project.py	16 Jun 2004 19:42:02 -0000	1.85.2.6
  +++ project.py	16 Jun 2004 23:38:31 -0000	1.85.2.7
  @@ -187,8 +187,9 @@
                   
       def isRedistributable(self):
           # Existence means 'true'
  -        return self.hasDomAttribute('redistributable') \
  -            or (self.module and self.module.isRedistributable())
  +        if self.hasDomAttribute('redistributable'): return True
  +        if self.module: return self.module.isRedistributable()
  +        return False
           
       def wasBuilt(self):
           """ Was a build attempt made? """
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +1 -1      gump/template/xhtml/css/Attic/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/gump/template/xhtml/css/Attic/style.css,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- style.css	16 Jun 2004 17:50:41 -0000	1.1.2.1
  +++ style.css	16 Jun 2004 23:38:31 -0000	1.1.2.2
  @@ -1 +1 @@
  -img          { border: 0 }

HR { color: #8EB4D9; height: 1px; text-align: center; width:
90%; position: 
               relative }

# Annotations
tr.DEBUG    {	bgcolor: #000000 }
tr.INFO
   	{	bgcolor: #00FF00 }               
tr.WARN		{	bgcolor: #00FFFF }
tr.ERROR	{	bgcolor:
#FF0000 }

# State
tr.SUCCESS	{	bgcolor: #00FF00 }
  \ No newline at end of file
  +img          { border: 0 }

HR { color: #8EB4D9; height: 1px; text-align: center; width:
90%; position: 
               relative }

# Annotations
.DEBUG    	{	bgcolor: #000000 }
.INFO
   	{	bgcolor: #00FF00 }               
.WARN		{	bgcolor: #00FFFF }
.ERROR		{	bgcolor: #FF0000
}

# State
.SUCCESS	{	bgcolor: #00FF00 }
.FAILED 	{	bgcolor: #FF0000 }
  \ No newline at end of file
  
  
  
  No                   revision
  No                   revision
  1.2.2.6   +2 -2      gump/python/gump/document/xdocs/xdoc.py
  
  Index: xdoc.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/xdoc.py,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- xdoc.py	16 Jun 2004 23:05:36 -0000	1.2.2.5
  +++ xdoc.py	16 Jun 2004 23:38:31 -0000	1.2.2.6
  @@ -64,7 +64,7 @@
           if stream:
               self.stream=stream
           else:
  -            log.debug('Create transient stream ['+`self.depth`+']...')
  +            # log.debug('Create transient stream ['+`self.depth`+']...')
               self.stream=StringIO.StringIO()
                       	
       def __del__(self):  
  @@ -534,7 +534,7 @@
           # self.setEmptyOk(1)
           
       def start(self):
  -        self.context.writeIndented('<td>')
  +        self.context.writeIndented('<td' + self.getStyleAttribute() + '>')
           
       def end(self):
           self.context.writeLine('</td>')
  
  
  
  1.9.2.10  +11 -7     gump/python/gump/document/xdocs/documenter.py
  
  Index: documenter.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
  retrieving revision 1.9.2.9
  retrieving revision 1.9.2.10
  diff -u -r1.9.2.9 -r1.9.2.10
  --- documenter.py	16 Jun 2004 23:05:36 -0000	1.9.2.9
  +++ documenter.py	16 Jun 2004 23:38:31 -0000	1.9.2.10
  @@ -199,8 +199,10 @@
               logSpec=self.resolver.getFileSpec(self.workspace, 'buildLog')
               
               # Current status
  -            logSource=os.path.join(workContents,logSpec.getDocument())
  -            logTarget=os.path.join(logContents,logSpec.getDocument())
  +            logSource=os.path.abspath(
  +                        os.path.join(xdocWorkDir,logSpec.getDocument()))
  +            logTarget=os.path.abspath(
  +                        os.path.join(logDirectory,logSpec.getDocument()))
                
               # Do the transfer..
               try:
  @@ -717,13 +719,14 @@
                   spec.getRootPath())
                   
           if realTime: 
  -            document.createWarning('This Gump run is currently in progress...')
  +            document.createWarning("""This Gump run is currently in progress.
  +            It started at %s."""
  +                % self.workspace.getStartDateTime() )
           else:
               document.createNote("""This Gump run is complete. 
  -            It started at %s and ended at %s, both %s.""" 
  +            It started at %s and ended at %s.""" 
                   % ( self.workspace.getStartDateTime(),
  -                    self.workspace.getEndDateTime(),
  -                    self.workspace.timezone) )
  +                    self.workspace.getEndDateTime()))
                       
           self.documentSummary(document, self.workspace.getProjectSummary())            
   
           
  @@ -745,7 +748,8 @@
               
               self.setStyleFromState(moduleRow,module.getStatePair())
               
  -            moduleRow.createData(secsToTime(module.getStartSecs()))         
  +            startData=moduleRow.createData(secsToTime(module.getStartSecs()))         

  +            self.setStyleFromState(startData,module.getStatePair())
                           
               self.insertLink(module,self.workspace,moduleRow.createData())   
               self.insertStateIcon(module,self.workspace,moduleRow.createData())      
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message