Skip to content

Commit a02f753

Browse files
committed
Fixed a bunch of icon problems.
1 parent 6736e9a commit a02f753

19 files changed

+10
-5
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
recursive-include mdemos/menus/static *
22
recursive-include mdemos/menus/templates *
3+
recursive-include mdemos/menus/public *

mdemos/menus/default.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,23 @@
2222
.. moduleauthor:: Luke Macken <[email protected]>
2323
"""
2424

25+
import tw2.core
2526
import moksha.common.utils
2627

2728
from mdemos.menus import (
2829
MokshaMenu, MokshaContextualMenu,
2930
)
3031

32+
menu_images = tw2.core.DirLink(filename="public", modname=__name__)
33+
34+
3135
class MokshaContextMenu(MokshaContextualMenu):
3236

3337
@classmethod
3438
def default(cls, *args, **kw):
3539
return """
3640
<a rel="text">
37-
<img src="/images/moksha-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br/>
41+
<img src="/tw2/resources/mdemos.menus.default/public/moksha-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br/>
3842
</a>
3943
<a href="/widget">Documentation</a>
4044
<a href="https://fedorahosted.org/moksha/report/3">Tickets</a>
@@ -49,7 +53,7 @@ class MokshaDefaultMenu(MokshaMenu):
4953
def widgets(cls, *args, **kw):
5054
menu = """
5155
<a rel="text">
52-
<img src="/images/block.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/>
56+
<img src="/tw2/resources/mdemos.menus.default/public/block.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/>
5357
<br/>
5458
</a>
5559
"""
@@ -74,7 +78,7 @@ def widgets(cls, *args, **kw):
7478
def moksha(cls, *args, **kw):
7579
return """
7680
<a rel="text">
77-
<img src="/images/moksha-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br>
81+
<img src="/tw2/resources/mdemos.menus.default/public/moksha-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br>
7882
<br>Moksha is a platform for creating live collaborative web applications.<br><br>
7983
</a>
8084
<a rel="separator"></a>
@@ -101,7 +105,7 @@ def fedora(cls, *args, **kw):
101105
}
102106
menu = """
103107
<a rel="text">
104-
<img src="/images/fedora-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br>
108+
<img src="/tw2/resources/mdemos.menus.default/public/fedora-icon.png" style="position:absolute;margin-top:-20px; margin-left:-25px;margin-bottom:10px"/><br>
105109
</a>
106110
<a rel="separator"></a>
107111
"""
2.45 KB
Loading

mdemos/menus/public/block.png

3.51 KB
Loading

mdemos/menus/public/error.png

1.44 KB
Loading

mdemos/menus/public/fedora-icon.png

4.44 KB
Loading

mdemos/menus/public/gears.png

5.23 KB
Loading
3.27 KB
Loading

mdemos/menus/public/info.png

1.63 KB
Loading

mdemos/menus/public/line.png

172 Bytes
Loading

mdemos/menus/public/moksha-icon.png

4.45 KB
Loading
4.25 KB
Loading

mdemos/menus/public/moksha-logo.png

13.2 KB
Loading

mdemos/menus/public/ok.png

1.48 KB
Loading

mdemos/menus/public/star.png

2.28 KB
Loading

mdemos/menus/public/strype2.png

1.54 KB
Loading
3.92 KB
Loading
2.6 KB
Loading

mdemos/menus/widgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MokshaMenuBase(twc.Widget):
7070
rootMenuSelector = 'rootVoices'
7171
menuSelector = 'menuContainer'
7272
callback = '/apps/menu'
73-
iconPath = '/resources/mdemos.menus.widgets/static/images/'
73+
iconPath = '/tw2/resources/mdemos.menus.widgets/static/images/'
7474
additionalData = ""
7575
menus = []
7676
menuWidth = 200

0 commit comments

Comments
 (0)