[Openvas-commits] r10582 - in trunk/gsd: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 18 11:48:13 CET 2011
Author: raimund
Date: 2011-03-18 11:48:10 +0100 (Fri, 18 Mar 2011)
New Revision: 10582
Modified:
trunk/gsd/ChangeLog
trunk/gsd/src/dash_resources.html
trunk/gsd/src/dash_task.html
trunk/gsd/src/dash_task_count.html
trunk/gsd/src/dash_task_top5.html
trunk/gsd/src/dash_trend.html
trunk/gsd/src/dash_vulnerabilities.html
trunk/gsd/src/gsd_mw.cpp
Log:
Prepared dashboard for translation.
* src/gsd_mw.cpp (updatedashboard): Replace dummies in html documents with
translatable strings, shorten task names for top 5 chart.
* src/dash_task.html, src/dash_task_count.html, src/dash_resources.html,
src/dash_trend.html, src/dash_vulnerabilities.html, src/dash_task_top5.html:
Replaced visible text with dummies for translation, improved text layout.
Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/ChangeLog 2011-03-18 10:48:10 UTC (rev 10582)
@@ -1,3 +1,14 @@
+2011-03-18 Raimund Renkert <raimund.renkert at greenbone.net>
+
+ Prepared dashboard for translation.
+
+ * src/gsd_mw.cpp (updatedashboard): Replace dummies in html documents with
+ translatable strings, shorten task names for top 5 chart.
+
+ * src/dash_task.html, src/dash_task_count.html, src/dash_resources.html,
+ src/dash_trend.html, src/dash_vulnerabilities.html, src/dash_task_top5.html:
+ Replaced visible text with dummies for translation, improved text layout.
+
2011-03-17 Raimund Renkert <raimund.renkert at greenbone.net>
Added new charts to dashboard.
Modified: trunk/gsd/src/dash_resources.html
===================================================================
--- trunk/gsd/src/dash_resources.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_resources.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -15,14 +15,22 @@
bar = raph.g.hbarchart (10, 22, 150, 150, data, {stroke: "#000",
colors: bar_color, type: "soft"});
- var bar0 = raph.text (40, bar[0][0].y + 5 , "Targets:").attr ({"font-size": 12});
- var bar1 = raph.text (55, bar[0][1].y + 5 , "Scan Configs:").attr ({"font-size": 12});
- var bar2 = raph.text (48, bar[0][2].y + 5, "Schedules:").attr ({"font-size": 12});
- var bar3 = raph.text (48, bar[0][3].y + 5, "Escalators:").attr ({"font-size": 12});
- var bar4 = raph.text (50, bar[0][4].y + 5, "Credentials:").attr ({"font-size": 12});
- var bar5 = raph.text (38, bar[0][5].y + 5, "Agents:").attr ({"font-size": 12});
- var bar6 = raph.text (44, bar[0][6].y + 5, "Overrides:").attr ({"font-size": 12});
- var bar7 = raph.text (35, bar[0][7].y + 5, "Notes:").attr ({"font-size": 12});
+ var bar0 = raph.text (15, bar[0][0].y + 5 , "__targets__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar1 = raph.text (15, bar[0][1].y + 5 , "__configs__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar2 = raph.text (15, bar[0][2].y + 5, "__schedules__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar3 = raph.text (15, bar[0][3].y + 5, "__escalators__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar4 = raph.text (15, bar[0][4].y + 5, "__credentials__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar5 = raph.text (15, bar[0][5].y + 5, "__agents__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar6 = raph.text (15, bar[0][6].y + 5, "__overrides__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar7 = raph.text (15, bar[0][7].y + 5, "__notes__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
var bar0_1 = raph.text (105, bar[0][0].y + 5 , data[0]).attr ({"font-size": 12});
var bar1_1 = raph.text (105, bar[0][1].y + 5 , data[1]).attr ({"font-size": 12});
@@ -38,7 +46,7 @@
<body class="raphael" onload="init()">
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Resources Overview</div>
+ align="center">__title__</div>
<div id="diagram" style='position: absolute; left: 50%; top: 50%; margin:
-90px 0px 0px -77px;'>
</div>
Modified: trunk/gsd/src/dash_task.html
===================================================================
--- trunk/gsd/src/dash_task.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_task.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -78,7 +78,7 @@
<body class="raphael" onload="init()" >
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Scan Tasks</div>
+ align="center">__title__</div>
<div id="diagram" style='position: absolute; left: 50%; top: 50%; margin:
-75px 0px 0px -120px;' ></div>
</body>
Modified: trunk/gsd/src/dash_task_count.html
===================================================================
--- trunk/gsd/src/dash_task_count.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_task_count.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -14,26 +14,32 @@
bar = raph.g.hbarchart (10, 22, 150, 150, data, {stroke: "#000",
colors: bar_color, type: "soft"});
- var bar0 = raph.text (40, bar[0][0].y + 5 , "Total:").attr ({"font-size": 14});
- var bar1 = raph.text (50, bar[0][1].y + 5 , "Running:").attr ({"font-size": 14});
- var bar2 = raph.text (52, bar[0][2].y + 5, "Progress:").attr ({"font-size": 14});
- var bar3 = raph.text (41, bar[0][3].y + 5, "Done:").attr ({"font-size": 14});
- var bar4 = raph.text (38, bar[0][4].y + 5, "New:").attr ({"font-size": 14});
- var bar5 = raph.text (42, bar[0][5].y + 5, "Error:").attr ({"font-size": 14});
+ var bar0 = raph.text (15, bar[0][0].y + 5 , "__total__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar1 = raph.text (15, bar[0][1].y + 5 , "__running__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar2 = raph.text (15, bar[0][2].y + 5, "__progress__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar3 = raph.text (15, bar[0][3].y + 5, "__done__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar4 = raph.text (15, bar[0][4].y + 5, "__new__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar5 = raph.text (15, bar[0][5].y + 5, "__error__").attr
+ ({"font-size": 12, 'text-anchor': 'start'});
- var bar0_1 = raph.text (90, bar[0][0].y + 5 , data[0]).attr ({"font-size": 14});
- var bar1_1 = raph.text (90, bar[0][1].y + 5 , data[1]).attr ({"font-size": 14});
- var bar2_1 = raph.text (90, bar[0][2].y + 5, data[2]).attr ({"font-size": 14});
- var bar3_1 = raph.text (90, bar[0][3].y + 5, data[3]).attr ({"font-size": 14});
- var bar4_1 = raph.text (90, bar[0][4].y + 5, data[4]).attr ({"font-size": 14});
- var bar5_1 = raph.text (90, bar[0][5].y + 5, data[5]).attr ({"font-size": 14});
+ var bar0_1 = raph.text (90, bar[0][0].y + 5 , data[0]).attr ({"font-size": 12});
+ var bar1_1 = raph.text (90, bar[0][1].y + 5 , data[1]).attr ({"font-size": 12});
+ var bar2_1 = raph.text (90, bar[0][2].y + 5, data[2]).attr ({"font-size": 12});
+ var bar3_1 = raph.text (90, bar[0][3].y + 5, data[3]).attr ({"font-size": 12});
+ var bar4_1 = raph.text (90, bar[0][4].y + 5, data[4]).attr ({"font-size": 12});
+ var bar5_1 = raph.text (90, bar[0][5].y + 5, data[5]).attr ({"font-size": 12});
}
</script>
</head>
<body class="raphael" onload="init()">
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Task Overview</div>
+ align="center">__title__</div>
<div id="diagram" align="center" style='position: absolute; left: 50%; top: 50%; margin:
-90px 0px 0px -77px;'>
</div>
Modified: trunk/gsd/src/dash_task_top5.html
===================================================================
--- trunk/gsd/src/dash_task_top5.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_task_top5.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -19,24 +19,29 @@
bar = raph.g.hbarchart (10, 22, 150, 150, data, {stroke: "#000",
colors: bar_color, type: "soft"});
- var bar0 = raph.text (90, bar[0][0].y + 5 , name1).attr ({"font-size": 12});
- var bar1 = raph.text (90, bar[0][1].y + 5 , name2).attr ({"font-size": 12});
- var bar2 = raph.text (90, bar[0][2].y + 5, name3).attr ({"font-size": 12});
- var bar3 = raph.text (90, bar[0][3].y + 5, name4).attr ({"font-size": 12});
- var bar4 = raph.text (90, bar[0][4].y + 5, name5).attr ({"font-size": 12});
+ var bar0 = raph.text (15, bar[0][0].y + 5 , name1).attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar1 = raph.text (15, bar[0][1].y + 5 , name2).attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar2 = raph.text (15, bar[0][2].y + 5, name3).attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar3 = raph.text (15, bar[0][3].y + 5, name4).attr
+ ({"font-size": 12, 'text-anchor': 'start'});
+ var bar4 = raph.text (15, bar[0][4].y + 5, name5).attr
+ ({"font-size": 12, 'text-anchor': 'start'});
- var bar0_1 = raph.text (20, bar[0][0].y + 5 , data[0]).attr ({"font-size": 12});
- var bar1_1 = raph.text (20, bar[0][1].y + 5 , data[1]).attr ({"font-size": 12});
- var bar2_1 = raph.text (20, bar[0][2].y + 5, data[2]).attr ({"font-size": 12});
- var bar3_1 = raph.text (20, bar[0][3].y + 5, data[3]).attr ({"font-size": 12});
- var bar4_1 = raph.text (20, bar[0][4].y + 5, data[4]).attr ({"font-size": 12});
+ var bar0_1 = raph.text (145, bar[0][0].y + 5 , data[0]).attr ({"font-size": 12});
+ var bar1_1 = raph.text (145, bar[0][1].y + 5 , data[1]).attr ({"font-size": 12});
+ var bar2_1 = raph.text (145, bar[0][2].y + 5, data[2]).attr ({"font-size": 12});
+ var bar3_1 = raph.text (145, bar[0][3].y + 5, data[3]).attr ({"font-size": 12});
+ var bar4_1 = raph.text (145, bar[0][4].y + 5, data[4]).attr ({"font-size": 12});
}
</script>
</head>
<body class="raphael" onload="init()">
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Top 5 Tasks</div>
+ align="center">__title__</div>
<div id="diagram" style='position: absolute; left: 50%; top: 50%; margin:
-90px 0px 0px -77px;'>
</div>
Modified: trunk/gsd/src/dash_trend.html
===================================================================
--- trunk/gsd/src/dash_trend.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_trend.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -31,19 +31,19 @@
label = raph.image (icon_down, 112, 158, 16, 16);
text = raph.text (144, 168, "N/A");
- var bar1 = raph.text (bar[0][0].x, bar[0][0].y - 3, data[0]).attr ({"font-size": 14});
- var bar2 = raph.text (bar[0][1].x, bar[0][1].y - 3, data[1]).attr ({"font-size": 14});
- var bar3 = raph.text (bar[0][2].x, bar[0][2].y - 3, data[2]).attr ({"font-size": 14});
- var bar4 = raph.text (bar[0][3].x, bar[0][3].y - 3, data[3]).attr ({"font-size": 14});
- var bar5 = raph.text (bar[0][4].x, bar[0][4].y - 3, data[4]).attr ({"font-size": 14});
- var bar6 = raph.text (bar[0][5].x, bar[0][5].y - 3, data[5]).attr ({"font-size": 14});
+ var bar1 = raph.text (bar[0][0].x, bar[0][0].y - 3, data[0]).attr ({"font-size": 12});
+ var bar2 = raph.text (bar[0][1].x, bar[0][1].y - 3, data[1]).attr ({"font-size": 12});
+ var bar3 = raph.text (bar[0][2].x, bar[0][2].y - 3, data[2]).attr ({"font-size": 12});
+ var bar4 = raph.text (bar[0][3].x, bar[0][3].y - 3, data[3]).attr ({"font-size": 12});
+ var bar5 = raph.text (bar[0][4].x, bar[0][4].y - 3, data[4]).attr ({"font-size": 12});
+ var bar6 = raph.text (bar[0][5].x, bar[0][5].y - 3, data[5]).attr ({"font-size": 12});
};
</script>
</head>
<body class="raphael" onload="init()">
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Trends</div>
+ align="center">__title__</div>
<div id="diagram" style='position: absolute; left: 50%; top: 50%; margin:
-93px 0px 0px -85px;' >
</div>
Modified: trunk/gsd/src/dash_vulnerabilities.html
===================================================================
--- trunk/gsd/src/dash_vulnerabilities.html 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/dash_vulnerabilities.html 2011-03-18 10:48:10 UTC (rev 10582)
@@ -78,7 +78,7 @@
<body class="raphael" onload="init()" >
<div id=title style='position: absolute; height:16px;
width: 100%; background-color: #e5e5e5; border: 1px solid #e5e5e5'
- align="center">Vulnerabilities</div>
+ align="center">__title__</div>
<div id="diagram" style='position: absolute; left: 50%; top: 50%; margin:
-75px 0px 0px -120px;' ></div>
</body>
Modified: trunk/gsd/src/gsd_mw.cpp
===================================================================
--- trunk/gsd/src/gsd_mw.cpp 2011-03-17 17:42:58 UTC (rev 10581)
+++ trunk/gsd/src/gsd_mw.cpp 2011-03-18 10:48:10 UTC (rev 10582)
@@ -4410,6 +4410,16 @@
}
}
+ for (int ndx = 0; ndx < name.size (); ndx++)
+ {
+ if (name.at (ndx).length () > 20)
+ {
+ QString temp = name.at (ndx);
+ temp.remove (17, name.at (ndx).length () - 17);
+ temp.append ("...");
+ name.replace (ndx, temp);
+ }
+ }
QString data_top5_val = QString ("%1, %2, %3, %4, %5").arg (val[0])
.arg (val[1])
@@ -4438,6 +4448,33 @@
task_top5.replace ("__name5__", name[4]);
task_top5.replace ("__color__", data_top5_col);
+ //Replace translated strings
+ tasks.replace ("__title__", tr ("Scan Tasks"));
+
+ trends.replace ("__title__", tr ("Trends"));
+
+ task_count.replace ("__title__", tr ("Task Overview"));
+ task_count.replace ("__total__", tr ("Total"));
+ task_count.replace ("__running__", tr ("Running"));
+ task_count.replace ("__progress__", tr ("Progress"));
+ task_count.replace ("__done__", tr ("Done"));
+ task_count.replace ("__new__", tr ("New"));
+ task_count.replace ("__error__", tr ("Error"));
+
+ resources.replace ("__title__", tr ("Resources Overview"));
+ resources.replace ("__targets__", tr ("Targets"));
+ resources.replace ("__configs__", tr ("Scan Configs"));
+ resources.replace ("__schedules__", tr ("Schedules"));
+ resources.replace ("__escalators__", tr ("Escalators"));
+ resources.replace ("__credentials__", tr ("Credentials"));
+ resources.replace ("__agents__", tr ("Agents"));
+ resources.replace ("__overrides__", tr ("Overrides"));
+ resources.replace ("__notes__", tr ("Notes"));
+
+ vulnerabilities.replace ("__title__", tr ("Vulnerabilities"));
+
+ task_top5.replace ("__title__", tr ("Top 5 Tasks"));
+
wv_tasks->page()->mainFrame()->setScrollBarPolicy(Qt::Horizontal,
Qt::ScrollBarAlwaysOff);
wv_tasks->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical,
More information about the Openvas-commits
mailing list