- tor-commits - lists.torproject.org

r24941: {website} revert part of r24939, resizing the image is easy I used the (in website/trunk: css images)
by Damian Johnson 04 Aug '11

04 Aug '11

Author: atagar Date: 2011-08-04 15:18:19 +0000 (Thu, 04 Aug 2011) New Revision: 24941 Added: website/trunk/images/tor-logo_small.jpg Modified: website/trunk/css/layout.css Log: revert part of r24939, resizing the image is easy I used the larger image because it looked fine and didn't alter the layout of the page. If the size is really a concern then that's trivial to fix - this makes it the same size as the low resolution version. As for the other concerns mentioned in ticket 3682... - The file size difference is tiny. If you really care about sizes that much then we should run an optimizer on the site to remove unnecessary whitespace in the html. Btw, the file size of this small version is 4.5 KB (vs 4.9 with the big version and 4.0 with the low resolution). - It's simple to lighten the image if that looks better to you. In Gimp just go to "Colors > Brightness-Contrast..." to make it match the old version. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-04 03:18:37 UTC (rev 24940) +++ website/trunk/css/layout.css 2011-08-04 15:18:19 UTC (rev 24941) @@ -43,7 +43,7 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo_low_resolution.jpg) left top no-repeat; + background: url(../images/tor-logo_small.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; width: 150px; Added: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tor-logo_small.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

2 2

r24945: {} too many tor-logo's floating around. (website/trunk/images)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:48:07 +0000 (Thu, 04 Aug 2011) New Revision: 24945 Removed: website/trunk/images/tor-logo_low_resolution.jpg website/trunk/images/tor-logo_small.jpg Log: too many tor-logo's floating around. Deleted: website/trunk/images/tor-logo_low_resolution.jpg =================================================================== (Binary files differ) Deleted: website/trunk/images/tor-logo_small.jpg =================================================================== (Binary files differ)

1 0

r24944: {} delete the stupid sitemap that google screws up anyway. (website/trunk)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:46:46 +0000 (Thu, 04 Aug 2011) New Revision: 24944 Removed: website/trunk/sitemap.xml Log: delete the stupid sitemap that google screws up anyway. Deleted: website/trunk/sitemap.xml =================================================================== --- website/trunk/sitemap.xml 2011-08-04 17:46:15 UTC (rev 24943) +++ website/trunk/sitemap.xml 2011-08-04 17:46:46 UTC (rev 24944) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<urlset xmlns="http://www.google.com/schemas/sitemap/0.9"> -<url> -<loc>http://www.torproject.org/</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/overview.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/download/download.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/documentation.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/getinvolved/volunteer.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/corepeople.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/donate/donate.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/torusers.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/tor-doc-relay.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/about/contact.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/docs/trademark-faq.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/inthemedia.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -<url> -<loc>http://www.torproject.org/press/press.html.en</loc> -<lastmod>2011-02-18</lastmod> -<changefreq>monthly</changefreq> -</url> -</urlset>

1 0

r24943: {website} use the new tor-logo. (website/trunk/css)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:46:15 +0000 (Thu, 04 Aug 2011) New Revision: 24943 Modified: website/trunk/css/layout.css Log: use the new tor-logo. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-04 17:45:26 UTC (rev 24942) +++ website/trunk/css/layout.css 2011-08-04 17:46:15 UTC (rev 24943) @@ -43,7 +43,7 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo_small.jpg) left top no-repeat; + background: url(../images/tor-logo.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; width: 150px;

1 0

r24942: {website} update the tor logo from #3682. (website/trunk/images)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 17:45:26 +0000 (Thu, 04 Aug 2011) New Revision: 24942 Modified: website/trunk/images/tor-logo.jpg Log: update the tor logo from #3682. Modified: website/trunk/images/tor-logo.jpg =================================================================== (Binary files differ)

1 0

r24940: {website} make orbot use its own logo, based on feedback from randoms. (website/trunk/en)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 03:18:37 +0000 (Thu, 04 Aug 2011) New Revision: 24940 Modified: website/trunk/en/index.wml Log: make orbot use its own logo, based on feedback from randoms. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-04 03:13:52 UTC (rev 24939) +++ website/trunk/en/index.wml 2011-08-04 03:18:37 UTC (rev 24940) @@ -62,18 +62,9 @@ <h3><a href="http://tails.boum.org/">Tails</a></h3> <p>Live CD/USB distribution preconfigured to use Tor safely.</p> </td> -  <td> <a href="https://guardianproject.info/apps/orbot/"><img - src="$(IMGROOT)/icon-Orbot_andoidLogo.jpg" alt="Orbot Icon"></a> + src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> <p>Tor for <a href="https://code.google.com/android/">Google Android</a> devices.</p>

1 0

r24939: {website} revert part of r24933, the new size logo doesn't look right (website/trunk/css)
by Andrew Lewman 04 Aug '11

04 Aug '11

Author: phobos Date: 2011-08-04 03:13:52 +0000 (Thu, 04 Aug 2011) New Revision: 24939 Modified: website/trunk/css/layout.css Log: revert part of r24933, the new size logo doesn't look right compared to the rest of the images. jeremy will look into keeping the image tiny and sized correctly. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-03 00:27:48 UTC (rev 24938) +++ website/trunk/css/layout.css 2011-08-04 03:13:52 UTC (rev 24939) @@ -43,10 +43,10 @@ h1#logo a, h1#logo a:visited { - background: url(../images/tor-logo.jpg) left top no-repeat; + background: url(../images/tor-logo_low_resolution.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; - width: 160px; + width: 150px; height: 97px; display: block; }

1 0

[arm/master] fix: dropping nonexistent ORCONN attributes
by atagar＠torproject.org 03 Aug '11

03 Aug '11

commit eb4d0007a65a7cd10d50545dee90c56f6e998c31 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 2 07:39:03 2011 -0700 fix: dropping nonexistent ORCONN attributes The AGE, READ, and WRITTEN attributes of ORCONN don't exist so dropping them from the log panel. --- src/cli/logPanel.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 0b4ab9c..bb47517 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -515,9 +515,6 @@ class TorEventObserver(TorCtl.PostEventListener): def or_conn_status_event(self, event): msg = "STATUS: %-10s ENDPOINT: %-20s" % (event.status, event.endpoint) - if event.age: msg += " AGE: %-3s" % event.age - if event.read_bytes: msg += " READ: %-4i" % event.read_bytes - if event.wrote_bytes: msg += " WRITTEN: %-4i" % event.wrote_bytes if event.reason: msg += " REASON: %-6s" % event.reason if event.ncircs: msg += " NCIRCS: %i" % event.ncircs self._notify(event, msg)

1 0

[arm/master] fix: pausing interface could cause crash
by atagar＠torproject.org 03 Aug '11

03 Aug '11

commit 86325e6d124f0b2e5a4826938f2f493495fed9b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 28 11:25:07 2011 -0700 fix: pausing interface could cause crash Creating the pause buffer for the bandwidth graph could trigger a panel redraw, which in turn attempted to use the uninitialized pause value. --- src/cli/graphing/bandwidthStats.py | 11 ++++++++--- src/util/panel.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index f1891f9..654443c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -35,7 +35,7 @@ class BandwidthStats(graphPanel.GraphStats): Uses tor BW events to generate bandwidth usage graph. """ - def __init__(self, config=None): + def __init__(self, config=None, isPauseBuffer=False): graphPanel.GraphStats.__init__(self) self.inputConfig = config @@ -56,7 +56,7 @@ class BandwidthStats(graphPanel.GraphStats): # rate/burst and if tor's using accounting conn = torTools.getConn() self._titleStats, self.isAccounting = [], False - self.resetListener(conn, torTools.State.INIT) # initializes values + if not isPauseBuffer: self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) # Initialized the bandwidth totals to the values reported by Tor. This @@ -78,9 +78,14 @@ class BandwidthStats(graphPanel.GraphStats): self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def clone(self, newCopy=None): - if not newCopy: newCopy = BandwidthStats(self.inputConfig) + if not newCopy: newCopy = BandwidthStats(self.inputConfig, True) newCopy.accountingLastUpdated = self.accountingLastUpdated newCopy.accountingInfo = self.accountingInfo + + # attributes that would have been initialized from calling the resetListener + newCopy.isAccounting = self.isAccounting + newCopy._titleStats = self._titleStats + return graphPanel.GraphStats.clone(self, newCopy) def resetListener(self, conn, eventType): diff --git a/src/util/panel.py b/src/util/panel.py index bb47726..732610c 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -186,7 +186,7 @@ class Panel(): """ if not attr in self.pauseAttr: return None - elif self.isPaused(): return self.pauseBuffer[attr] + elif self.paused: return self.pauseBuffer[attr] else: return self.__dict__.get(attr) def copyAttr(self, attr):

1 0

[arm/master] Deprecating and removing DrawEntry class
by atagar＠torproject.org 03 Aug '11

03 Aug '11

commit 68a962c7d5cf0f2f4b34cba34296d0ba4eff64df Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 3 09:27:28 2011 -0700 Deprecating and removing DrawEntry class The DrawEntry was a helper class added when writing the connection panel to pass around lines that could be rendered. However, this was the only place it was ever used and, in the end, a list of (msg, attr) tuples does a nicer job. --- src/cli/connections/circEntry.py | 23 ++++++------- src/cli/connections/connEntry.py | 20 ++++++------ src/cli/connections/connPanel.py | 17 ++++++++-- src/cli/connections/entries.py | 13 ++++++-- src/util/uiTools.py | 67 -------------------------------------- 5 files changed, 45 insertions(+), 95 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index f94f53a..7bf21db 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -135,7 +135,7 @@ class CircHeaderLine(connEntry.ConnectionLine): def getDetails(self, width): if not self.isBuilt: detailFormat = curses.A_BOLD | uiTools.getColor(connEntry.CATEGORY_COLOR[self.getType()]) - return [uiTools.DrawEntry("Building Circuit...", detailFormat)] + return [("Building Circuit...", detailFormat)] else: return connEntry.ConnectionLine.getDetails(self, width) class CircLine(connEntry.ConnectionLine): @@ -157,10 +157,14 @@ class CircLine(connEntry.ConnectionLine): def getType(self): return connEntry.Category.CIRCUIT + def getListingPrefix(self): + if self.isLast: return (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) + else: return (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) + def getListingEntry(self, width, currentTime, listingType): """ - Provides the DrawEntry for this relay in the circuilt listing. Lines are - composed of the following components: + Provides the [(msg, attr)...] listing for this relay in the circuilt + listing. Lines are composed of the following components: <bracket> <dst> <etc> <placement label> The dst and etc entries largely match their ConnectionEntry counterparts. @@ -182,9 +186,7 @@ class CircLine(connEntry.ConnectionLine): # placementLabel (14 characters) # gap between etc and placement label (5 characters) - if self.isLast: bracket = (curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) - else: bracket = (curses.ACS_VLINE, ord(' '), ord(' ')) - baselineSpace = len(bracket) + 14 + 5 + 1 + baselineSpace = 14 + 5 dst, etc = "", "" if listingType == entries.ListingType.IP_ADDRESS: @@ -213,10 +215,7 @@ class CircLine(connEntry.ConnectionLine): dstLayout = "%%-%is" % (width - baselineSpace - len(etc)) dst = dstLayout % self.foreign.getNickname() - drawEntry = uiTools.DrawEntry("%-14s" % self.placementLabel, lineFormat) - drawEntry = uiTools.DrawEntry(" " * (width - baselineSpace - len(dst) - len(etc) + 5), lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(dst + etc, lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(bracket, curses.A_NORMAL, drawEntry, lockFormat = True) - drawEntry = uiTools.DrawEntry(" ", curses.A_NORMAL, drawEntry, lockFormat = True) - return drawEntry + return ((dst + etc, lineFormat), + (" " * (width - baselineSpace - len(dst) - len(etc) + 5), lineFormat), + ("%-14s" % self.placementLabel, lineFormat)) diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 5feafdb..0c82495 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -250,7 +250,7 @@ class ConnectionLine(entries.ConnectionPanelLine): def getListingEntry(self, width, currentTime, listingType): """ - Provides the DrawEntry for this connection's listing. Lines are composed + Provides the tuple list for this connection's listing. Lines are composed of the following components: <src> --> <dst> <etc> <uptime> (<type>) @@ -289,8 +289,8 @@ class ConnectionLine(entries.ConnectionPanelLine): timePrefix = "+" if self.isInitialConnection else " " else: timePrefix = "" - timeEntry = myListing.getNext().getNext() - timeEntry.text = timePrefix + "%5s" % uiTools.getTimeLabel(currentTime - self.startTime, 1) + timeLabel = timePrefix + "%5s" % uiTools.getTimeLabel(currentTime - self.startTime, 1) + myListing[2] = (timeLabel, myListing[2][1]) return myListing @@ -315,12 +315,12 @@ class ConnectionLine(entries.ConnectionPanelLine): lineFormat = uiTools.getColor(CATEGORY_COLOR[entryType]) timeWidth = 6 if CONFIG["features.connection.markInitialConnections"] else 5 - drawEntry = uiTools.DrawEntry(")" + " " * (9 - len(entryType)), lineFormat) - drawEntry = uiTools.DrawEntry(entryType.upper(), lineFormat | curses.A_BOLD, drawEntry) - drawEntry = uiTools.DrawEntry(" (", lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(" " * timeWidth, lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(self._getListingContent(width - (12 + timeWidth) - 1, listingType), lineFormat, drawEntry) - drawEntry = uiTools.DrawEntry(" ", lineFormat, drawEntry) + drawEntry = [(" ", lineFormat), + (self._getListingContent(width - (12 + timeWidth) - 1, listingType), lineFormat), + (" " * timeWidth, lineFormat), + (" (", lineFormat), + (entryType.upper(), lineFormat | curses.A_BOLD), + (")" + " " * (9 - len(entryType)), lineFormat)] return drawEntry def _getDetails(self, width): @@ -333,7 +333,7 @@ class ConnectionLine(entries.ConnectionPanelLine): """ detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()]) - return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)] + return [(line, detailFormat) for line in self._getDetailContent(width)] def resetDisplay(self): entries.ConnectionPanelLine.resetDisplay(self) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index ae50674..705fd77 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -291,7 +291,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): drawEntries = cursorSelection.getDetails(width) for i in range(min(len(drawEntries), DETAILS_HEIGHT)): - drawEntries[i].render(self, 1 + i, 2) + self.addstr(1 + i, 2, drawEntries[i][0], drawEntries[i][1]) # title label with connection counts if self.isTitleVisible(): @@ -318,9 +318,20 @@ class ConnectionPanel(panel.Panel, threading.Thread): # hilighting if this is the selected line extraFormat = curses.A_STANDOUT if entryLine == cursorSelection else curses.A_NORMAL - drawEntry = entryLine.getListingEntry(width - scrollOffset, currentTime, self._listingType) drawLine = lineNum + detailPanelOffset + 1 - scrollLoc - drawEntry.render(self, drawLine, scrollOffset, extraFormat) + + prefix = entryLine.getListingPrefix() + for i in range(len(prefix)): + self.addch(drawLine, scrollOffset + i, prefix[i]) + + xOffset = scrollOffset + len(prefix) + drawEntry = entryLine.getListingEntry(width - scrollOffset - len(prefix), currentTime, self._listingType) + + for msg, attr in drawEntry: + attr |= extraFormat + self.addstr(drawLine, xOffset, msg, attr) + xOffset += len(msg) + if drawLine >= height: break self.valsLock.release() diff --git a/src/cli/connections/entries.py b/src/cli/connections/entries.py index 6b24412..f832b6a 100644 --- a/src/cli/connections/entries.py +++ b/src/cli/connections/entries.py @@ -112,9 +112,16 @@ class ConnectionPanelLine: self._descriptorCache = None self._descriptorCacheArgs = None + def getListingPrefix(self): + """ + Provides a list of characters to be appended before the listing entry. + """ + + return () + def getListingEntry(self, width, currentTime, listingType): """ - Provides a DrawEntry instance for contents to be displayed in the + Provides a [(msg, attr)...] tuple list for contents to be displayed in the connection panel listing. Arguments: @@ -137,8 +144,8 @@ class ConnectionPanelLine: def getDetails(self, width): """ - Provides a list of DrawEntry instances with detailed information for this - connection. + Provides a list of [(msg, attr)...] tuple listings with detailed + information for this connection. Arguments: width - available space to display in diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 68b93af..01d2ad1 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -528,73 +528,6 @@ def parseShortTimeLabel(timeEntry): except ValueError: raise ValueError(errorMsg) -class DrawEntry: - """ - Renderable content, encapsulating the text and formatting. These can be - chained together to compose lines with multiple types of formatting. - """ - - def __init__(self, text, format=curses.A_NORMAL, nextEntry=None, lockFormat=False): - """ - Constructor for prepared draw entries. - - Arguments: - text - content to be drawn, this can either be a string or list of - integer character codes - format - properties to apply when drawing - nextEntry - entry to be drawn after this one - lockFormat - prevents extra formatting attributes from being applied - when rendered if true - """ - - self.text = text - self.format = format - self.nextEntry = nextEntry - self.lockFormat = lockFormat - - def getNext(self): - """ - Provides the next DrawEntry in the chain. - """ - - return self.nextEntry - - def setNext(self, nextEntry): - """ - Sets additional content to be drawn after this entry. If None then - rendering is terminated after this entry. - - Arguments: - nextEntry - DrawEntry instance to be rendered after this one - """ - - self.nextEntry = nextEntry - - def render(self, drawPanel, y, x, extraFormat=curses.A_NORMAL): - """ - Draws this content at the given position. - - Arguments: - drawPanel - context in which to be drawn - y - vertical location - x - horizontal location - extraFormat - additional formatting - """ - - if self.lockFormat: drawFormat = self.format - else: drawFormat = self.format | extraFormat - - if isinstance(self.text, str): - drawPanel.addstr(y, x, self.text, drawFormat) - else: - for i in range(len(self.text)): - drawChar = self.text[i] - drawPanel.addch(y, x + i, drawChar, drawFormat) - - # if there's additional content to show then render it too - if self.nextEntry: - self.nextEntry.render(drawPanel, y, x + len(self.text), extraFormat) - class Scroller: """ Tracks the scrolling position when there might be a visible cursor. This

1 0