Merge pull request #20 from zms-publishing/zmi4

Renewed ZMI
zopefoundation · Jul 13, 2020 · 39220df · 39220df
2 parents b9a0aee + edcb2d2
commit 39220df
Show file tree

Hide file tree

Showing 24 changed files with 431 additions and 344 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,6 +3,8 @@ Products.ZMySQLDA change log
 
 4.8 (unreleased)
 ----------------
+- ZMI refresh for Zope 4 with svg icons
+  (`#20 <https://github.com/zms-publishing/Products.ZMySQLDA/pull/20>`_)
 
 
 4.7 (2020-05-04)

diff --git a/Products/ZMySQLDA/__init__.py b/Products/ZMySQLDA/__init__.py
@@ -25,10 +25,10 @@ def initialize(context):
         permission=add_zmysql_database_connections,
         constructors=(DA.manage_addZMySQLConnectionForm,
                       DA.manage_addZMySQLConnection),
-        icon='www/da.gif')
+        icon='www/da.svg')
 
 
 misc_ = {}
 for icon in ('table', 'view', 'stable', 'what', 'field', 'text', 'bin',
              'int', 'float', 'date', 'time', 'datetime'):
-    misc_[icon] = ImageFile(os.path.join('www', '%s.gif') % icon, globals())
+    misc_[icon] = ImageFile(os.path.join('www', '%s.svg') % icon, globals())
diff --git a/Products/ZMySQLDA/tests/base.py b/Products/ZMySQLDA/tests/base.py
@@ -98,6 +98,7 @@ def setUp(cls):
     @classmethod
     def testSetUp(cls):
         from Products.ZMySQLDA import DA
+
         # Clean out the test table before every test
         if have_test_database():
             dbconn = real_connect()

diff --git a/Products/ZMySQLDA/tests/test_db.py b/Products/ZMySQLDA/tests/test_db.py
@@ -45,8 +45,8 @@ def test_DateTime_or_None(self):
 class DBPoolTests(unittest.TestCase):
 
     def _makeOne(self, *args, **kw):
-        from Products.ZMySQLDA.db import DBPool
         from Products.ZMySQLDA.db import DB
+        from Products.ZMySQLDA.db import DBPool
         return DBPool(DB, **kw)
 
     def test_instantiate_defaults(self):
@@ -111,8 +111,8 @@ def test_name(self):
 class PatchedDBPoolTests(PatchedConnectionTestsBase):
 
     def _makeOne(self, *args, **kw):
-        from Products.ZMySQLDA.db import DBPool
         from Products.ZMySQLDA.db import DB
+        from Products.ZMySQLDA.db import DBPool
         return DBPool(DB, **kw)
 
     def test_variables(self):

diff --git a/Products/ZMySQLDA/www/bin.svg b/Products/ZMySQLDA/www/bin.svg
diff --git a/Products/ZMySQLDA/www/browse.dtml b/Products/ZMySQLDA/www/browse.dtml
@@ -6,12 +6,17 @@
 
 <main class="container-fluid">
 
-  <dtml-tree header=info>
-    <img src="&dtml-SCRIPT_NAME;/misc_/ZMySQLDA/&dtml-icon;"
-         alt="&dtml-type;" border="0">
-    <strong><dtml-var name></strong> (<code><dtml-var description></code>)
-  </dtml-tree>
+<dtml-tree header=info>
+  <img src="&dtml-SCRIPT_NAME;/misc_/ZMySQLDA/&dtml-icon;" alt="&dtml-type;" title="&dtml-type;" style="height:16px;width:20px;" />
+  <b><dtml-var name></b>&nbsp;&nbsp;<code><dtml-var description></code>
+</dtml-tree>
 
 </main>
 
+<style>
+  img:not([alt=table]) {
+    opacity:.35;
+  }
+</style>
+
 <dtml-var manage_page_footer>