[Checkins] SVN: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/ updated

[Andreas Jung]

Log message for revision 102025:
  updated
  

Changed:
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/index.pt
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/static/default.css
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/tests.py
  U   zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py

-=-
Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/index.pt
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/index.pt	2009-07-19 15:39:27 UTC (rev 102024)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/index.pt	2009-07-19 15:57:45 UTC (rev 102025)
@@ -12,6 +12,7 @@
   <div id="logo">
       <img src="${request.application_url}/static/zopyx_logo.png" /> 
       <h2>ZOPYX SmartPrintNG Server</h2>
+      <div id="version">Version: ${version}</div>
   </div>
   <br/>
   <div>
@@ -21,7 +22,7 @@
   </ul>
   </div>
   <div id="footer">
-      (C) 2009, ZOPYX Ltd. &amp; Co. KG, www.zopyx.com, info at zopyx.com
+      (C) 2009, ZOPYX Ltd. &amp; Co. KG, <a href="http://www.zopyx.com">www.zopyx.com</a>, <a href="mailto:info at zopyx.com">info at zopyx.com</a>
   </div>
 
 

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/static/default.css
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/static/default.css	2009-07-19 15:39:27 UTC (rev 102024)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/templates/static/default.css	2009-07-19 15:57:45 UTC (rev 102025)
@@ -14,3 +14,18 @@
     border-top: 1px solid black;
     font-size: 10px;
 }
+
+#version {
+    font-size: 110%;
+    font-weight: bold;
+}
+
+a {
+}
+
+a,
+a:active, 
+a:visited {
+    color: black;
+    text-decoration: none;
+}

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/tests.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/tests.py	2009-07-19 15:39:27 UTC (rev 102024)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/tests.py	2009-07-19 15:57:45 UTC (rev 102025)
@@ -27,7 +27,7 @@
         request = testing.DummyRequest()
         renderer = testing.registerDummyRenderer('templates/index.pt')
         response = index(context, request)
-        renderer.assert_(project='zopyx.smartprintng.server')
+        renderer.assert_(project='my_server')
 
 class ViewIntegrationTests(unittest.TestCase):
     """ These tests are integration tests for the view.  These test

Modified: zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py
===================================================================
--- zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py	2009-07-19 15:39:27 UTC (rev 102024)
+++ zopyx.smartprintng.server/trunk/zopyx/smartprintng/server/views.py	2009-07-19 15:57:45 UTC (rev 102025)
@@ -3,7 +3,7 @@
 # (C) 2008, 2009, ZOPYX Ltd & Co. KG, Tuebingen, Germany
 ##########################################################################
 
-
+import pkg_resources
 from repoze.bfg.chameleon_zpt import render_template_to_response
 from repoze.bfg.view import static
 from zopyx.smartprintng.server.base import ServerCore
@@ -23,9 +23,11 @@
 
     def __call__(self):
         converters = ServerCore().availableConverters()
+        version = pkg_resources.require('zopyx.smartprintng.server')[0].version 
         return render_template_to_response('templates/index.pt',
                                            converters=converters,
                                            request=self.request,
+                                           version=version,
                                            project='zopyx.smartprintng.server')
 
 ##################