remove unused logger instance and duplicated telemeta version variable, use telemeta...

diff --git a/telemeta/__init__.py b/telemeta/__init__.py
index 598a6ee6a6f57535019d734ba8dbc73fcd940e43..f86dd15e27ee6e134416eeb22b014ec407a4f8a2 100644 (file)
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@ -11,7 +11,7 @@ U{http://svn.parisson.org/telemeta}
 """
 
 __docformat__ = 'epytext en'
-__version__ = '0.2.8'
+__version__ = '0.3pre1'
 __url__ = 'http://svn.parisson.org/telemeta'
 __copyright__ = '(C) 2007 Parisson'
 __license__ = 'BSD'
@@ -46,9 +46,3 @@ __license_long__ = """
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  """
 
-
-from telemeta.util.logger import Logger
-
-logger = Logger()
-
-__version__ = "0.3pre1"

diff --git a/telemeta/templates/base.html b/telemeta/templates/base.html
index c72dd14e80d6fd4efcaefc88570190fed228bc31..fe6893668347da3410438090f1d08a1d85e1f55b 100644 (file)
--- a/telemeta/templates/base.html
+++ b/telemeta/templates/base.html
@@ -42,15 +42,15 @@
 
 <div id="footer">
  <hr />
- <a id="telemeta_powered" href="http://svn.parisson.org/telemeta"><img src="{% url telemeta-images "logo_mini.png" %}" height="30" width="93"
+ <a id="telemeta_powered" href="{% telemeta_url %}"><img src="{% url telemeta-images "logo_mini.png" %}" height="30" width="93"
    alt="Telemeta Powered"/></a>
  <p class="left">
-  Powered by <a href="http://svn.parisson.org/telemeta"><strong>Telemeta {% telemeta_version %}</strong></a><br />
+  Powered by <a href="{% telemeta_url %}"><strong>Telemeta {% telemeta_version %}</strong></a><br />
   By <a href="http://www.parisson.com/">Parisson</a> &amp; <a href="http://www.samalyse.com/">Samalyse</a>.
  </p>
 
  <p class="right">
-  Visit the Telemeta open source project at<br /><a href="http://svn.parisson.org/telemeta">http://svn.parisson.org/telemeta</a>
+  Visit the Telemeta open source project at<br /><a href="{% telemeta_url %}">{% telemeta_url %}</a>
  </p>
 </div>
 

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 787d9be15ff42a885a775b7426761325bb39d6f4..6866c5f9732e8d5bc598469b507b30e4cf6924db 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -21,17 +21,24 @@ def mul(value, arg):
     "Multiply a numeric value"
     return value * arg        
 
-
 class TelemetaVersionNode(template.Node):
     def render(self, context):
         from telemeta import __version__
         return __version__
-        
-  
 
 @register.tag
 def telemeta_version(parser, token):
     "Get Telemeta version number"
     return TelemetaVersionNode()
 
+class TelemetaUrlNode(template.Node):
+    def render(self, context):
+        from telemeta import __url__
+        return __url__
+
+@register.tag
+def telemeta_url(parser, token):
+    "Get Telemeta project homepage URL"
+    return TelemetaUrlNode()
+