Changeset 1669

Timestamp:

12/11/06 19:22:41 (2 years ago)

Author:

eblot

Message:

RevtreePlugin:

Several improvements:

• Fix up SVG scale (changeset-independent)
  
• Fix up XHMTL tooltip (default tooltips are hidden)
  
• Fix up AJAX tooltip text overflow
  
• Fix up old trunks issues
  
• Fix up changeset links to the original changeset page
  
• Add author and pretty date to the changeset message
  

Files:

• revtreeplugin/0.10/revtree/htdocs/css/revtree.css (modified) (2 diffs)
• revtreeplugin/0.10/revtree/htdocs/js/svgtip.js (modified) (3 diffs)
• revtreeplugin/0.10/revtree/svgview.py (modified) (3 diffs)
• revtreeplugin/0.10/revtree/templates/revtree.cs (modified) (1 diff)
• revtreeplugin/0.10/revtree/templates/revtree_log.cs (modified) (1 diff)
• revtreeplugin/0.10/revtree/web_ui.py (modified) (6 diffs)
• revtreeplugin/0.10/setup.py (modified) (1 diff)

revtreeplugin/0.10/revtree/htdocs/css/revtree.css

@@ -56 +56 @@
- position: relative;
- float: left;
+}
+div#revtree {
+ overflow: hidden;  
+}
+#revtree dl { 
+ padding-top: 0;
+ margin-top: 0;
+ font-size: 90%;
+}
+#revtree dt { 
+ font-weight: bold;
+ margin-left: 0em;
+}
+#revtree dd { 
+ display: inline;
+ margin-left: 0.4em;
+}
+#revtree dd.message p {
+ margin-top: -1em;
+ margin-left: 0.4em;
+ margin-bottom: 0;
-}
-
@@ -120 +141 @@
-        border: 1px solid #CCCCCC;
-}
-.jTip{
-cursor:help;
-}
-.jTip a[title] {
-   /* hide default tooltips */
-   display: none;
-}

revtreeplugin/0.10/revtree/htdocs/js/svgtip.js

@@ -5 +5 @@
- * JTip is built on top of the very light weight jquery library.
- *
-
+& tweaked 
- */
-
-$(document).ready(JT_init);
-
+// temporary storage for a:title attributes
+var titles = Array();
+
-function JT_init(){
-    $('a[@id^=rev]')
-
-
-
+
-      .click(function(){return false});     
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  var box = getSvgPosition(linkId);
-  if(title == false)title=' ';
@@ -24 +38 @@
-  var w = self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
-  var hasArea = w - box.x;
-
++8
-  var queryString = url.replace(/^[^\?]+\??/,'');
-  var params = parseQuery( queryString );
-  if(params['width'] === undefined){params['width'] = 250};
-  if(params['link'] !== undefined){
-'#' + linkId
-$('#' + linkId
+object
+//$(object
-  }
-    
-  if(hasArea>((params['width']*1)+75)){
-     var arrowOffset = box.w + 11;
-
+ + 3
-     var side = 'left';
-  } else {
-
+ - 3
-     var side = 'right';
-  }
@@ -66 +80 @@
-
-  document.getElementsByTagName('body')[0].appendChild(d0);
-
+
-  $('#JT').show();
-  $('#JT_copy').load(url);

revtreeplugin/0.10/revtree/svgview.py

@@ -72 +72 @@
-                raise AssertionError, "unsupportedcolor: %s" % value
-        else:
+            # FIXME: use some kind of checksum-based colorization
+            # i.e. branchname -> checksum -> color for permanent branch-color
+            # mapping (persistence over graph generation)
-            self._color = SvgColor.random()
-            
@@ -259 +262 @@
-            self._link.attributes['id'] = 'rev%d' % self._revision
-            self._link.attributes['title'] = 'Changeset %d' % self._revision
+            self._link.attributes['class'] = 'svgtip'
-                    
-    def visible(self):
@@ -905 +909 @@
-        d.toXml(filename)
-        
-
+scale=1, width=None, height=None, 
-        self._svg = SVG.svg((0,0,self._extent[0],self._extent[1]),
-'100%','100%'
+scale*self._extent[0], scale*self._extent[1]
-        self._arrows.render()
-        map(lambda e: e.render(1), self._enhancers)

revtreeplugin/0.10/revtree/templates/revtree.cs

@@ -128 +128 @@
-<?cs else ?>
-<div class="svg">
-
-
-
-
+
-</div>
-<?cs /if ?>

revtreeplugin/0.10/revtree/templates/revtree_log.cs

@@ -1 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>

revtreeplugin/0.10/revtree/web_ui.py

@@ -20 +20 @@
-from trac.perm import IPermissionRequestor
-from trac.util import Markup, TracError
+from trac.util.datefmt import format_datetime, pretty_timedelta
-from trac.web import IRequestHandler
-from trac.web.chrome import add_stylesheet, add_script, \
-                            INavigationContributor, ITemplateProvider
-from trac.web.href import Href
-oneliner
+html
-
-from revtree import Repository, SvgRevtree, ChangesetEmptyRange
@@ -190 +191 @@
-            repos = self.env.get_repository(req.authname)
-            chgset = repos.get_changeset(rev)
-oneliner(chgset.message, self.env
-    shorten=
+html(chgset.message, self.env, req
+True, 
-            # FIXME: check if there is a better way to discard ellipsis
+            #        which are not valid in pure XML
-            wikimsg = Markup(wikimsg.replace('...', ''));
-
-
+
+
+
+
+
+
+
+
-            return 'revtree_log.cs', 'application/xhtml+xml'
-
-"
+ Exception, e
+: %s" % e
-        
-    def _process_revtree(self, req):
@@ -234 +242 @@
-            enhancer = Enhancer(repos, svgrevtree)
-            svgrevtree.add_enhancer(enhancer)
-            #self.env.log.debug("REVISIONS %s" % [revstore.revrange])
-            #self.env.log.debug("BRANCH %s" % revstore.get_branches())
-            #self.env.log.debug("AUTHOR %s" % revstore.get_authors())
-            #self.env.log.debug("HIDE %s" % revstore.get_hidetermbranch())
-            svgrevtree.create(revstore.revrange, revstore.get_branches(), 
-                              revstore.get_authors(), 
@@ -243 +247 @@
-                              revstore.get_style())
-            svgrevtree.build()
-
-
-
-
-
-
-
-
-
-
-
-
+
-            req.hdf.set_unescaped('revtree.svg.image', str(svgrevtree))
-            (w,h) = extent
-            #(w,h) = (900, (900*h)/w)
-            req.hdf['revtree.svg.width'] = "%dpx" % w
-            req.hdf['revtree.svg.height'] = "%dpx" % h
-            
-            # create and order the drop-down list content, starting with the
@@ -267 +256 @@
-            branches.sort()
-            authors.sort()
+            # prepend the trunks to the selected branches
+            for b in self.trunks:
+                if b not in branches:
+                    branches.insert(0, b)
-            branches.insert(0, revstore.anybranch)
-            authors.insert(0, revstore.anyauthor)
@@ -324 +317 @@
-        self.bcre = re.compile(bre)
-        self.urlbase = self.config.get('trac', 'base_url')
-        self.cache_dir = self.config.get('revtree', 'cache_dir', '%s/cache' \
-                                            % self.env.get_htdocs_dir())
-        self.cache_url = self.config.get('revtree', 
-                                         'cache_url', '').encode('ascii')
-        self.trunks = self.env.config.get('revtree', 'trunks', 
-                                          'trunk').split(' ')
-
-
-
-
-
-
-
+
-        if not self.urlbase:
-            raise TracError, "Base URL not defined"

revtreeplugin/0.10/setup.py

@@ -16 +16 @@
-
-PACKAGE = 'RevtreePlugin'
-1
+2
-
-setup (