[silvatheme.infraemobile][Sylvain Viollon] Remove the mobi stuff.
[email protected] Thu, 05 Dec 2013 16:05:51 +0100
| Newsgroups | gmane.comp.web.zope.silva.cvs |
|---|---|
| Message-ID | <[email protected]> |
author: Sylvain Viollon
date: Thu Dec 05 16:06:08 2013 +0100
revision: 191:869ba8debaca in silvatheme.infraemobile
branch: 2.4
details: https://hg.infrae.com/silvatheme.infraemobile?cmd=changeset;node=869ba8debaca
modified: setup.py src/silvatheme/infraemobile/configure.zcml src/silvatheme/infraemobile/interfaces.py
added:
removed:
log: Remove the mobi stuff.
diffstat:
setup.py | 2 --
src/silvatheme/infraemobile/configure.zcml | 4 +---
src/silvatheme/infraemobile/interfaces.py | 17 ++++++-----------
3 files changed, 7 insertions(+), 16 deletions(-)
diffs (73 lines):
diff -r 939284045a33 -r 869ba8debaca setup.py
--- a/setup.py Sat Jun 01 18:17:16 2013 +0200
+++ b/setup.py Thu Dec 05 16:06:08 2013 +0100
@@ -15,12 +15,10 @@
'Products.Silva',
'Products.SilvaMetadata',
'five.grok',
- 'mobi.interfaces',
'silva.core.conf',
'silva.core.interfaces',
'silva.core.layout',
'silva.core.views',
- 'silva.mobi',
'zope.component',
'zope.traversing',
])
diff -r 939284045a33 -r 869ba8debaca src/silvatheme/infraemobile/configure.zcml
--- a/src/silvatheme/infraemobile/configure.zcml Sat Jun 01 18:17:16 2013 +0200
+++ b/src/silvatheme/infraemobile/configure.zcml Thu Dec 05 16:06:08 2013 +0100
@@ -4,11 +4,9 @@
xmlns:five="http://namespaces.zope.org/five"
xmlns:browser="http://namespaces.zope.org/browser">
- <five:registerPackage package="." />
-
<include package="silva.core.conf" />
<include package="silva.core.views" />
- <include package="silva.mobi" />
+ <include package="silva.core.layout" />
<include package="Products.Silva" />
<include package="Products.SilvaMetadata" />
diff -r 939284045a33 -r 869ba8debaca src/silvatheme/infraemobile/interfaces.py
--- a/src/silvatheme/infraemobile/interfaces.py Sat Jun 01 18:17:16 2013 +0200
+++ b/src/silvatheme/infraemobile/interfaces.py Thu Dec 05 16:06:08 2013 +0100
@@ -1,14 +1,10 @@
-from mobi.interfaces.devices import IBasicDeviceType, IAdvancedDeviceType
-from silva import mobi as silvamobi
from silva.core import conf as silvaconf
+from silva.core.layout.interfaces import ISilvaSkin
from silva.core.layout.porto.interfaces import IPorto
-from silva.mobi.interfaces import ISilvaMobiSkin
from js.jquery import jquery
-SKIN_NAME = 'Infrae Mobile Skin'
-
class IMobi(IPorto):
""" A layer for mobiles
@@ -23,16 +19,15 @@
silvaconf.resource('infraemobile_advanced.css')
-class IMobiSkin(IMobi, ISilvaMobiSkin):
+class IMobiSkin(IMobi, ISilvaSkin):
""" Skin for mobiles
"""
- silvamobi.mobiskin(SKIN_NAME)
- silvamobi.mobidevice(IBasicDeviceType)
+ silvaconf.skin('Infrae Mobile Simple Skin')
-class IMobiAdvancedSkin(IMobiAdvanced, ISilvaMobiSkin):
+class IMobiAdvancedSkin(IMobiAdvanced, ISilvaSkin):
""" Skin for advanced mobiles
"""
- silvamobi.mobiskin(SKIN_NAME)
- silvamobi.mobidevice(IAdvancedDeviceType)
+ silvaconf.skin('Infrae Mobile Advanced Skin')
+