Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12773,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10622,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12546,12555,12580,12583,12599-12600,12609,12611,12614-12615,12618,12624,12630-12631,12633,12643,12645-12646,12649,12653-12654,12657-12658,12660,12662-12663,12666,12668,12678-
12679,12681-12682,12685,12687,12691-12693,12697,12703,12721,12724-12725,12731-12732,12737-12739,12741,12743-12744,12746,12750,12754-12756,12759,12764-12765,12770,12772-12776,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-08-15 18:46:29 UTC (rev 13283)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-08-15 18:48:23 UTC (rev 13284)
@@ -1779,61 +1779,58 @@
msgstr "Finish"
msgid "ui.admin.role.edit.administration.adminaccess"
-msgstr "Allows administrative tasks — ADMINACCESS"
+msgstr "Allows administrative tasks"
msgid "ui.admin.role.edit.administration.administration_access"
msgstr "Administration Access"
msgid "ui.admin.role.edit.administration.netflow"
-msgstr "Allows access to NetFlow dashlets — NETFLOW"
+msgstr "Allows access to NetFlow dashlets"
msgid "ui.admin.role.edit.administration.no_content"
msgstr "You don't have any administration rights."
msgid "ui.admin.role.edit.administration.passwordsave"
-msgstr "Allows user to save a new password — PASSWORDSAVE"
+msgstr "Allows user to save a new password"
msgid "ui.admin.role.edit.administration.reloadaccess"
-msgstr "Allows reloading of Opsview — RELOADACCESS"
+msgstr "Allows reloading of Opsview"
msgid "ui.admin.role.edit.administration.reportadmin"
-msgstr "Allows access to the reporting module as an administrator — REPORTADMIN"
+msgstr "Allows access to the reporting module as an administrator"
msgid "ui.admin.role.edit.administration.reportuser"
-msgstr "Allows access to the reporting module as a user — REPORTUSER"
+msgstr "Allows access to the reporting module as a user"
msgid "ui.admin.role.edit.configuration.configuration_access"
msgstr "Configuration Access"
msgid "ui.admin.role.edit.configuration.configurecontacts"
-msgstr "Allows access to the contacts section of the configuration screens — CONFIGURECONTACTS"
+msgstr "Allows access to the contacts section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configurehostgroups"
-msgstr "Allows access to the host groups section of the configuration screens — CONFIGUREHOSTGROUPS"
+msgstr "Allows access to the host groups section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configurehosts"
-msgstr "Allows access to the hosts section of the configuration screens — CONFIGUREHOSTS"
+msgstr "Allows access to the hosts section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configurekeywords"
-msgstr "Allows access to the keywords section of the configuration screens — CONFIGUREKEYWORDS"
+msgstr "Allows access to the keywords section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configurenetflow"
-msgstr "Allows access to the NetFlow section of the configuration screens — CONFIGURENETFLOW"
+msgstr "Allows access to the NetFlow section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configureprofiles"
-msgstr "Allows access to the shared notification profiles section of the configuration screens — CONFIGUREPROFILES"
+msgstr "Allows access to the shared notification profiles section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configureroles"
-msgstr "Allows access to the roles section of the configuration screens — CONFIGUREROLES"
+msgstr "Allows access to the roles section of the configuration screens"
msgid "ui.admin.role.edit.configuration.configuresave"
-msgstr "Allows saving changes — CONFIGURESAVE"
+msgstr "Allows saving changes"
-msgid "ui.admin.role.edit.configuration.configuretenancy"
-msgstr "Allows access to the tenancies section of the configuration screens — CONFIGURETENANCY"
-
msgid "ui.admin.role.edit.configuration.configureview"
-msgstr "Allows access to everything else — CONFIGUREVIEW"
+msgstr "Allows access to everything else"
msgid "ui.admin.role.edit.configuration.label.all_monitoringservers"
msgstr "All monitoring servers"
@@ -1857,49 +1854,49 @@
msgstr "Name"
msgid "ui.admin.role.edit.statusaccess.actionall"
-msgstr "Allows setting of acknowledgements, submitting results, rechecks for all object — ACTIONALL"
+msgstr "Allows setting of acknowledgements, submitting results, rechecks for all object"
msgid "ui.admin.role.edit.statusaccess.actionsome"
-msgstr "Allows setting of acknowledgements, submitting results, rechecks for some objects — ACTIONSOME"
+msgstr "Allows setting of acknowledgements, submitting results, rechecks for some objects"
msgid "ui.admin.role.edit.statusaccess.downtimeall"
-msgstr "Allows setting of scheduled downtimes for all objects — DOWNTIMEALL"
+msgstr "Allows setting of scheduled downtimes for all objects"
msgid "ui.admin.role.edit.statusaccess.downtimesome"
-msgstr "Allows setting of scheduled downtimes for some objects — DOWNTIMESOME"
+msgstr "Allows setting of scheduled downtimes for some objects"
msgid "ui.admin.role.edit.statusaccess.nagvis"
-msgstr "Allows access to Nagvis — NAGVIS"
+msgstr "Allows access to Nagvis"
msgid "ui.admin.role.edit.statusaccess.no_content"
msgstr "You don't have any status rights."
msgid "ui.admin.role.edit.statusaccess.notifysome"
-msgstr "Allows sending of notifications — NOTIFYSOME"
+msgstr "Allows sending of notifications"
msgid "ui.admin.role.edit.statusaccess.rrdgraphs"
-msgstr "Allows access to graphing page — RRDGRAPHS"
+msgstr "Allows access to graphing page"
msgid "ui.admin.role.edit.statusaccess.status_access"
msgstr "Status Access"
msgid "ui.admin.role.edit.statusaccess.testall"
-msgstr "Allows use of the Test Service Check feature for all objects — TESTALL"
+msgstr "Allows use of the Test Service Check feature for all objects"
msgid "ui.admin.role.edit.statusaccess.testchange"
-msgstr "Allows parameters to the Test Service Check feature to be altered before execution — TESTCHANGE"
+msgstr "Allows parameters to the Test Service Check feature to be altered before execution"
msgid "ui.admin.role.edit.statusaccess.testsome"
-msgstr "Allows use of the Test Service Check feature for some objects — TESTSOME"
+msgstr "Allows use of the Test Service Check feature for some objects"
msgid "ui.admin.role.edit.statusaccess.viewall"
-msgstr "Allows viewing of status information for all objects — VIEWALL"
+msgstr "Allows viewing of status information for all objects"
msgid "ui.admin.role.edit.statusaccess.viewportaccess"
-msgstr "Allows access to keywords summary page — VIEWPORTACCESS"
+msgstr "Allows access to keywords summary page"
msgid "ui.admin.role.edit.statusaccess.viewsome"
-msgstr "Allows viewing of status information for some objects — VIEWSOME"
+msgstr "Allows viewing of status information for some objects"
msgid "ui.admin.role.list.help.cannotDeleteRolesStillUsed"
msgstr "Cannot delete roles which contacts are still using"
Modified: trunk/opsview-web/root/admin/host/snmp
===================================================================
--- trunk/opsview-web/root/admin/host/snmp 2013-08-15 18:46:29 UTC (rev 13283)
+++ trunk/opsview-web/root/admin/host/snmp 2013-08-15 18:48:23 UTC (rev 13284)
@@ -72,13 +72,11 @@
</div>
-<div>
<div class="helpline action" _onclick_="queryhost({extra_params:'testconnection=1',hostid:[% object.id || 0 %],url:'[% c.uri_for("/admin/host/query_host").path | escape_js_string %]'})">[% c.loc("ui.admin.host.edit.action.testSNMP") | html %]</div>
[% indicator_icon( { id => "query_host_indicator" } ); %]
<div id="snmp_info" class="input">
</div>
-</div>
-
+<br/>
[%
checkbox(
Modified: trunk/opsview-web/root/admin/role/local_helper_functions
===================================================================
--- trunk/opsview-web/root/admin/role/local_helper_functions 2013-08-15 18:46:29 UTC (rev 13283)
+++ trunk/opsview-web/root/admin/role/local_helper_functions 2013-08-15 18:48:23 UTC (rev 13284)
@@ -11,9 +11,9 @@
id => inputid,
);
"</td><td>";
- "<label for=''>"; access_name; "</label>";
+ "<label for=''>"; access_name | html; "</label>";
"</td><td style='padding-left: 7px'>";
- "<label for=''>"; display_label; "</label>";
+ "<label for=''>"; display_label | html; "</label>";
"</td></tr>";
END;
END;
