Author: elias
Date: Wed Aug 24 22:59:47 2011
New Revision: 50911
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50911&view=rev
Log:
[units.wesnoth.org] some css fixes
Modified:
trunk/data/tools/unit_tree/style.css
trunk/data/tools/wmlunits
Modified: trunk/data/tools/unit_tree/style.css
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/unit_tree/style.css?rev=50911&r1=50910&r2=50911&view=diff
==============================================================================
--- trunk/data/tools/unit_tree/style.css (original)
+++ trunk/data/tools/unit_tree/style.css Wed Aug 24 22:59:47 2011
@@ -70,18 +70,21 @@
}
div.main {
margin-top: 0;
- margin-left: 7em;
+ margin-left: 9em;
border-left: 1px solid black;
}
div.popupmenu
{
position: absolute;
- margin-left: 6.5em;
+ margin-left: 8.5em;
margin-top: -1em;
background: white;
border: 1px solid black;
}
-span.unitmenu {
+div.popupmenu a {
+ text-decoration: none;
+}
+a.unitmenu {
display: block;
margin-left: 1em;
font-size: small;
@@ -95,7 +98,7 @@
display: block;
}
div.navbar {
- width: 7em;
+ width: 9em;
float: left;
overflow: hidden;
}
@@ -105,7 +108,7 @@
border-spacing: 0px;
padding: 0px;
border-right: 1px solid black;
- width: 6.5em;
+ width: 8.5em;
}
ul.navbar li {
color: black;
@@ -113,12 +116,12 @@
margin: 0px;
padding: 0px;
}
-ul.navbar li:hover {
+ul.navbar li a:hover {
color: #804000;
}
ul.navbar a {
color: #B48648;
- font-size: small;
+ font-size: medium;
font-weight: bold;
}
td.raceheader {
@@ -141,6 +144,7 @@
table.unitinfo th {
text-align: left;
font-weight: normal;
+ white-space: nowrap;
}
table.attacks col.col1 {
width: 7em;
Modified: trunk/data/tools/wmlunits
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmlunits?rev=50911&r1=50910&r2=50911&view=diff
==============================================================================
--- trunk/data/tools/wmlunits (original)
+++ trunk/data/tools/wmlunits Wed Aug 24 22:59:47 2011
@@ -25,7 +25,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href=\"%(path)sstyle.css\" type=\"text/css\"/>
-<script type="text/javascript" src="%(path)s/menu.js" />
+<script type="text/javascript" src="%(path)s/menu.js"></script>
<title>%(title)s</title>
</head>
<body><div>'''.strip()
@@ -264,7 +264,7 @@
onclick="toggle_menu(this, '""" + id + """', 2)"
onmouseover="toggle_menu(this, '""" + id + """', 1)"
onmouseout="toggle_menu(this, '""" + id + """', 0)">""")
- write('<span class="' + class2 + '">' + name + "</span>")
+ write('<a class="' + class2 + '">' + name + "</a>")
write('<div class="popupmenu" id="' + id + '">')
# Campaigns
@@ -344,14 +344,19 @@
race = u.race
racename = T(race, "plural_name")
m = 1
- if not u or u.campaign in self.wesnoth.is_mainline_campaign:
+ if u and u.campaign in self.wesnoth.is_mainline_campaign:
m = 0
r[m][racename] = race.get_text_val("id")
- racenames = sorted(r[0].items()) + sorted(r[1].items())
+ racenames = sorted(r[0].items())
+ if r[1].items():
+ racenames += [("-", "-")] + sorted(r[1].items())
for racename, rid in racenames:
- write(" <a href=\"mainline.html#%s\">%s</a><br/>" % (
- racename, racename))
+ if racename == "-":
+ write(" -<br/>")
+ else:
+ write(" <a href=\"mainline.html#%s\">%s</a><br/>" % (
+ racename, racename))
write("</div></li>\n")
else:
@@ -373,6 +378,8 @@
if 1:
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]
@@ -382,7 +389,14 @@
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,
@@ -855,7 +869,7 @@
picname = image_collector.add_image("mainline", ricon,
no_tc = True)
icon = os.path.join("../pics", picname)
- write("<td><img src=\"%s\" /></td>\n" % (icon, ))
+ write("<td><img src=\"%s\" alt=\"(icon)\" /></td>\n" % (icon, ))
write("<th>%s</th><td class=\"num\">%s</td>\n" % (_(rid), r))
if row % 2 == 1 : write("</tr>\n")
row += 1
@@ -920,7 +934,7 @@
picname = image_collector.add_image("mainline",
"terrain/" + ticon + ".png", no_tc = True)
icon = os.path.join("../pics", picname)
- write("<td><img src=\"%s\" /></td>\n" % (icon, ))
+ write("<td><img src=\"%s\" alt=\"(icon)\" /></td>\n" % (icon, ))
write("<td>%s</td><%s><i>%s</i></td><%s
class=\"num\"><i>%s</i></td>\n" % (
tname, ccell, c, dcell, d))
write("</tr>\n")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
