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,12744,12765,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,12744,12765,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-core/t/lib/Test/Opsview.pm
===================================================================
--- trunk/opsview-core/t/lib/Test/Opsview.pm 2013-08-15 18:21:35 UTC (rev 13274)
+++ trunk/opsview-core/t/lib/Test/Opsview.pm 2013-08-15 18:22:58 UTC (rev 13275)
@@ -225,7 +225,13 @@
for my $m (@criteria) {
--$not_matched if $p->$m() eq $filter->{$m};
}
- push @processes, $p unless $not_matched;
+ unless ($not_matched) {
+ note "Found matching process: pid/"
+ . $p->pid
+ . ", fname/"
+ . $p->fname;
+ push @processes, $p;
+ }
}
return @processes;
Modified: trunk/opsview-web/root/toolbar_container
===================================================================
--- trunk/opsview-web/root/toolbar_container 2013-08-15 18:21:35 UTC (rev 13274)
+++ trunk/opsview-web/root/toolbar_container 2013-08-15 18:22:58 UTC (rev 13275)
@@ -33,6 +33,10 @@
# printed based on filter_options (in stash)
print_filter_box;
+IF page_view_right_align_links;
+ INCLUDE "view_options_links" page_view_links = page_view_right_align_links;
+END;
+
%]
</div><!-- class="float_right" -->
</div>
Modified: trunk/opsview-web/root/toolbar_items/actions
===================================================================
--- trunk/opsview-web/root/toolbar_items/actions 2013-08-15 18:21:35 UTC (rev 13274)
+++ trunk/opsview-web/root/toolbar_items/actions 2013-08-15 18:22:58 UTC (rev 13275)
@@ -14,7 +14,9 @@
[% IF page_view_include == "view_options_links" %]
-[% INCLUDE $page_view_include %]
+<div id="toolbar_action_icons">
+[% INCLUDE $page_view_include page_view_links = page_view_options_links %]
+</div><!-- id="action_icons" -->
[% ELSE; # IF page_view_include == "view_options_links"; %]
<script type="text/_javascript_">
function viewOptionsButton() {
Modified: trunk/opsview-web/root/view_options_links
===================================================================
--- trunk/opsview-web/root/view_options_links 2013-08-15 18:21:35 UTC (rev 13274)
+++ trunk/opsview-web/root/view_options_links 2013-08-15 18:22:58 UTC (rev 13275)
@@ -1,7 +1,8 @@
-<div id="toolbar_action_icons">
-[% FOREACH option IN page_view_options_links %]
+[% FOREACH option IN page_view_links %]
[% IF option.link %]
<a title="[% option.name | html %]"
+ [% option.id ? 'id="'_ option.id _'"' : '' %]
+ [% option.style ? 'style="'_ option.style _'"' : '' %]
href="" option.link | html %]"><img
class="icon_button"
border="0"
@@ -13,4 +14,3 @@
src="" c.uri_for("/images/" _ option.icon ).path %]" />
[% END %]
[% END %]
-</div><!-- id="action_icons" -->
