Author: elias
Date: Thu Sep 1 20:39:30 2011
New Revision: 50962
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50962&view=rev
Log:
[units.wesnoth.org] Slight CSS change and removed addon factions from the
navigation bar.
Modified:
trunk/data/tools/unit_tree/helpers.py
trunk/data/tools/unit_tree/style.css
trunk/data/tools/wmlunits
Modified: trunk/data/tools/unit_tree/helpers.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/helpers.py?rev=50962&r1=50961&r2=50962&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/helpers.py (original)
+++ trunk/data/tools/unit_tree/helpers.py Thu Sep 1 20:39:30 2011
@@ -352,7 +352,7 @@
"non-existant unit id '%s'!\n") % (
eid,
fid,
- repr(uid)))
+ str(uid)))
continue
if not eid in unit.eras:
unit.eras.append(eid)
Modified: trunk/data/tools/unit_tree/style.css
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/style.css?rev=50962&r1=50961&r2=50962&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/style.css (original)
+++ trunk/data/tools/unit_tree/style.css Thu Sep 1 20:39:30 2011
@@ -123,6 +123,7 @@
color: #B48648;
font-size: medium;
font-weight: bold;
+ cursor: pointer;
}
td.raceheader {
background:#272727 url("navbg.png") repeat-x scroll center bottom;
Modified: trunk/data/tools/wmlunits
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmlunits?rev=50962&r1=50961&r2=50962&view=diff
==============================================================================
--- trunk/data/tools/wmlunits (original)
+++ trunk/data/tools/wmlunits Thu Sep 1 20:39:30 2011
@@ -345,6 +345,8 @@
racename = T(race, "plural_name")
m = 1
if u and u.campaign in self.wesnoth.is_mainline_campaign:
+ m = 0
+ if u.campaign == "mainline":
m = 0
r[m][racename] = race.get_text_val("id")
racenames = sorted(r[0].items())
@@ -374,36 +376,40 @@
html, un.name, un.name))
write("</div></li>\n")
+
+ # Add entries for the races also to the navbar itself.
+ if 1:
+ camp = self.campaign
+ if camp == "units": camp = "mainline"
+ class Entry: pass
+ races = {}
- if 1:
+ for uid, u in self.wesnoth.unit_lookup.items():
+ if u.campaign != camp: continue
+ racename = T(u.race, "plural_name")
+ runits = races.get(racename, [])
+ runits.append(uid)
+ races[racename] = runits
+
+ racelist = sorted(races.keys())
got_menu = False
menuid = 0
- camp = self.campaign
- if camp == "units": camp = "mainline"
- for row in self.unitgrid:
- for column in range(6):
- hspan, vspan, un = row[column]
- if not un: continue
- if isinstance(un, helpers.GroupNode):
- if got_menu: write("</div></li>\n")
- add_menu("units_menu" + str(menuid), un.name,
"unitmenu")
- menuid += 1
- got_menu = True
-
- html = "../%s/%s.html" % (
- self.isocode, camp)
- write("<a href=\"%s#%s\">%s</a><br/>" % (
- html, un.name, un.name))
- else:
-
- if camp == "mainline" and un.unit.campaign != camp:
continue
- uid = un.unit.get_text_val("id")
- link = "../%s/%s.html" % (self.isocode, uid)
- name = self.wesnoth.get_unit_value(un.unit,
- "name", translation = self.translation.translate)
- write("<a href=\"" + link + "\">" + name + "</a><br
/>")
+ for r in racelist:
+ if got_menu: write("</div></li>\n")
+ add_menu("units_menu" + str(menuid), r, "unitmenu")
+ menuid += 1
+ got_menu = True
+ link = "../%s/%s.html" % (self.isocode, camp)
+ write("<a href=\"%s#%s\">%s</a><br/>" % (
+ link, r, r))
+ for uid in races[r]:
+ un = self.wesnoth.unit_lookup[uid]
+ link = "../%s/%s.html" % (self.isocode, uid)
+ name = self.wesnoth.get_unit_value(un,
+ "name", translation = self.translation.translate)
+ write("<a href=\"" + link + "\">" + name + "</a><br />")
+
if got_menu: write("</div></li>\n")
- #write("</div></li>\n")
# Languages
x = self.translate("Language", "wesnoth")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
