summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-08-07 11:42:04 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-08-07 11:43:08 -0400
commit49dddf03895dcfa2998489eb384181aa142fe0ac (patch)
tree1a40bd3fc61d890b3c03b10e2f57877bf7d03ebb /ecomp-sdk
parentac05129bf7c8fbe62f17647f6233ce01a58ca1a3 (diff)
Remove icons; revise role centralization.
Some icons & images are being removed due to restricted use. Made enhancements to the Role centralization code to allow multiple urls for one function code. This replaces the previous commit by Sunder Tattavarada. Issue: PORTAL-17, PORTAL-21 Change-Id: I1d9dc4f1ae20aeb26af00bb0d6384cca926f2115 Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk')
-rw-r--r--ecomp-sdk/epsdk-analytics/README.md3
-rw-r--r--ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java2
-rw-r--r--ecomp-sdk/epsdk-app-os/README.md1
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css16
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/eye.js34
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/utils.js252
-rw-r--r--ecomp-sdk/epsdk-app-overlay/README.md1
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/b2b-angular.css4
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/eye.js34
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/utils.js252
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js20
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gifbin8203 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/RAPTOR_BANNER.jpgbin6249 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/accessicon.gifbin329 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/active.gifbin338 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/addbtn.pngbin662 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ajax-loader.gifbin673 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add.gifbin469 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gifbin564 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_multiple.gifbin748 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_one.gifbin631 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_back.gifbin621 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_cancel.gifbin652 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left.gifbin382 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left2.gifbin399 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_next.gifbin609 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_plus.gifbin67 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gifbin686 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.pngbin29837 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right.gifbin381 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right2.gifbin399 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_save.gifbin606 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/att-globe1.jpgbin5855 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/button_import.pngbin546 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon.gifbin552 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav.gifbin538 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gifbin1065 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calender_icon.gifbin552 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankdown.gifbin192 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankup.gifbin193 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columndown.gifbin124 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnup.gifbin126 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/crosshairs.pngbin218 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/csv_icon.gifbin447 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/deleteicon.gifbin80 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/downloadicon.gifbin74 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.jpgbin761 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.pngbin3186 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon.gifbin1055 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon_multi.gifbin1026 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gifbin201 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow.gifbin195 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gifbin74 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowup.gifbin106 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/h.pngbin380 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/inactive.gifbin352 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loader.gifbin958 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loading.gifbin4176 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gifbin645 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/blue.pngbin1309 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/green.pngbin1190 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/lightblue.pngbin1269 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpgbin712 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/orange.pngbin3413 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/pink.pngbin1321 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/purple.pngbin1324 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/red.pngbin1305 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/yellow.pngbin1309 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/minus.gifbin75 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/modify_icon.gifbin246 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/page.gifbin554 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_large.gifbin434 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_small.gifbin361 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pen_paper.gifbin618 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/plus.gifbin78 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/popupicon.gifbin79 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/position.pngbin267 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/printer.gifbin1019 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/progress.gifbin734 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/question_mark.jpgbin426 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gifbin155 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gifbin897 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/r_back.gifbin918 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor.jpgbin889 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.gifbin3150 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.jpgbin1827 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/required.gifbin854 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/shareicon.gifbin542 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/sv.pngbin11373 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left.gifbin137 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gifbin106 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right.gifbin138 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right_sel.gifbin104 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/test_run.gifbin330 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/text.gifbin141 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gifbin807 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gifbin1120 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gifbin197 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_plus.gifbin200 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet.gifbin906 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gifbin1144 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_dashboard.gifbin1164 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gifbin983 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gifbin53 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gifbin56 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gifbin283 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_dots.gifbin68 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_folder.gifbin980 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_lastsub.gifbin78 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_open.gifbin286 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gifbin265 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gifbin854 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowright.gifbin845 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/txt_icon.gifbin154 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF033.pngbin520 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF034.pngbin536 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF035.pngbin487 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF036.pngbin482 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/BorderLayout-24x24.pngbin1369 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.pngbin552 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/DeleteCross-16x16.pngbin750 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/addbtn.pngbin662 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/button_import.pngbin546 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.pngbin264 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon.pngbin235 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/cross-small.pngbin291 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.gifbin447 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.jpgbin632 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.pngbin938 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gifbin592 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.pngbin566 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon.gifbin579 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/downloadicon.gifbin74 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/editicon.gifbin360 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excel2007.jpgbin761 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon.gifbin1055 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon_multi.gifbin1026 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/executeicon.pngbin1076 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/file_import.pngbin653 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pdficon_small.gifbin361 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pen_paper.gifbin618 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pencil-small.pngbin309 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-add.pngbin724 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-favorite.pngbin693 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-my.pngbin739 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-public.pngbin776 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report.pngbin563 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/reports.pngbin769 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.gifbin223 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.pngbin3501 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/tick-small.pngbin283 -> 0 bytes
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js1486
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java4
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java29
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java11
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RestApiRequestBuilder.java9
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UrlAccessCentalizedImpl.java79
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/web/support/UserUtils.java3
161 files changed, 76 insertions, 2170 deletions
diff --git a/ecomp-sdk/epsdk-analytics/README.md b/ecomp-sdk/epsdk-analytics/README.md
index ad46a446..9e81d85e 100644
--- a/ecomp-sdk/epsdk-analytics/README.md
+++ b/ecomp-sdk/epsdk-analytics/README.md
@@ -13,7 +13,8 @@ features including charts, maps and reports ("Raptor").
Version 1.3.0
- [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
-
+- [PORTAL-58] Removing restricted image files under raptor
+- [PORTAL-60] remove CalendarPopup.js that's user for raptor schedule tab
Version 1.1.0
- [Portal-7] Improvements added as part of the rebasing process
- [PORTAL-17] Remove jfree related items
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
index 2c589991..5082dad5 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/openecomp/portalapp/controller/core/FnMenuController.java
@@ -79,7 +79,7 @@ public class FnMenuController extends RestrictedBaseController {
public void getFunctionCDList(HttpServletRequest request, HttpServletResponse response) throws Exception {
ObjectMapper mapper = new ObjectMapper();
try {
- response.getWriter().write(mapper.writeValueAsString(service.getFunctionCDList()));
+ response.getWriter().write(mapper.writeValueAsString(service.getFunctionCDList(request)));
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "getFunctionCDList", e);
response.setCharacterEncoding("UTF-8");
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 8601a9a7..143a489f 100644
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -16,6 +16,7 @@ https://www.eclipse.org/m2e-wtp/
Version 1.3.0
- [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
- [Portal-34] Restore required properties in fusion.properties file
+- [PORTAL-17] removing eye.js and utils.js
Version 1.1.0
- [Portal-7] Improvements added as part of the rebasing process
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
index bb691d6d..987a68dd 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
@@ -56,6 +56,9 @@
.icon-misc-trash:before,
.icon-misc-pen:before,
.ion-navicon:before,
+.icon-primary-close:before, .close:before, .reset-field:before,
+.icon-datanetwork-softwareasaservice:before,
+.icon-datanetwork-messaging2:before,
.icon-arrows-upload:before {
display: inline-block;
font-family: "Ionicons";
@@ -174,4 +177,15 @@
.icon-misc-pen:before { content: "\f2bf"; }
-.ion-navicon:before { content: "\f20e"; } \ No newline at end of file
+.ion-navicon:before { content: "\f20e"; }
+
+.icon-building-home:before { content: "\f144"; }
+
+.icon-content-star:before { content: "\f24e"; }
+
+.icon-primary-close:before, .close:before, .reset-field:before { content: "\f129"; }
+
+.icon-datanetwork-softwareasaservice:before { content: "\f40c"; }
+
+.icon-datanetwork-messaging2:before { content: "\f132"; }
+
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/eye.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/eye.js
deleted file mode 100644
index 8a281dc3..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/eye.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Zoomimage
- * Author: Stefan Petre www.eyecon.ro
- *
- */
-(function($){
- var EYE = window.EYE = function() {
- var _registered = {
- init: []
- };
- return {
- init: function() {
- $.each(_registered.init, function(nr, fn){
- fn.call();
- });
- },
- extend: function(prop) {
- for (var i in prop) {
- if (prop[i] != undefined) {
- this[i] = prop[i];
- }
- }
- },
- register: function(fn, type) {
- if (!_registered[type]) {
- _registered[type] = [];
- }
- _registered[type].push(fn);
- }
- };
- }();
- $(EYE.init);
-})(jQuery);
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/utils.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/utils.js
deleted file mode 100644
index d9be8532..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/utils.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- *
- * Utilities
- * Author: Stefan Petre www.eyecon.ro
- *
- */
-(function($) {
-EYE.extend({
- getPosition : function(e, forceIt)
- {
- var x = 0;
- var y = 0;
- var es = e.style;
- var restoreStyles = false;
- if (forceIt && jQuery.curCSS(e,'display') == 'none') {
- var oldVisibility = es.visibility;
- var oldPosition = es.position;
- restoreStyles = true;
- es.visibility = 'hidden';
- es.display = 'block';
- es.position = 'absolute';
- }
- var el = e;
- if (el.getBoundingClientRect) { // IE
- var box = el.getBoundingClientRect();
- x = box.left + Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) - 2;
- y = box.top + Math.max(document.documentElement.scrollTop, document.body.scrollTop) - 2;
- } else {
- x = el.offsetLeft;
- y = el.offsetTop;
- el = el.offsetParent;
- if (e != el) {
- while (el) {
- x += el.offsetLeft;
- y += el.offsetTop;
- el = el.offsetParent;
- }
- }
- if (jQuery.browser.safari && jQuery.curCSS(e, 'position') == 'absolute' ) {
- x -= document.body.offsetLeft;
- y -= document.body.offsetTop;
- }
- el = e.parentNode;
- while (el && el.tagName.toUpperCase() != 'BODY' && el.tagName.toUpperCase() != 'HTML')
- {
- if (jQuery.curCSS(el, 'display') != 'inline') {
- x -= el.scrollLeft;
- y -= el.scrollTop;
- }
- el = el.parentNode;
- }
- }
- if (restoreStyles == true) {
- es.display = 'none';
- es.position = oldPosition;
- es.visibility = oldVisibility;
- }
- return {x:x, y:y};
- },
- getSize : function(e)
- {
- var w = parseInt(jQuery.curCSS(e,'width'), 10);
- var h = parseInt(jQuery.curCSS(e,'height'), 10);
- var wb = 0;
- var hb = 0;
- if (jQuery.curCSS(e, 'display') != 'none') {
- wb = e.offsetWidth;
- hb = e.offsetHeight;
- } else {
- var es = e.style;
- var oldVisibility = es.visibility;
- var oldPosition = es.position;
- es.visibility = 'hidden';
- es.display = 'block';
- es.position = 'absolute';
- wb = e.offsetWidth;
- hb = e.offsetHeight;
- es.display = 'none';
- es.position = oldPosition;
- es.visibility = oldVisibility;
- }
- return {w:w, h:h, wb:wb, hb:hb};
- },
- getClient : function(e)
- {
- var h, w;
- if (e) {
- w = e.clientWidth;
- h = e.clientHeight;
- } else {
- var de = document.documentElement;
- w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
- h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
- }
- return {w:w,h:h};
- },
- getScroll : function (e)
- {
- var t=0, l=0, w=0, h=0, iw=0, ih=0;
- if (e && e.nodeName.toLowerCase() != 'body') {
- t = e.scrollTop;
- l = e.scrollLeft;
- w = e.scrollWidth;
- h = e.scrollHeight;
- } else {
- if (document.documentElement) {
- t = document.documentElement.scrollTop;
- l = document.documentElement.scrollLeft;
- w = document.documentElement.scrollWidth;
- h = document.documentElement.scrollHeight;
- } else if (document.body) {
- t = document.body.scrollTop;
- l = document.body.scrollLeft;
- w = document.body.scrollWidth;
- h = document.body.scrollHeight;
- }
- if (typeof pageYOffset != 'undefined') {
- t = pageYOffset;
- l = pageXOffset;
- }
- iw = self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0;
- ih = self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0;
- }
- return { t: t, l: l, w: w, h: h, iw: iw, ih: ih };
- },
- getMargins : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'marginTop') || '';
- var r = jQuery.curCSS(e,'marginRight') || '';
- var b = jQuery.curCSS(e,'marginBottom') || '';
- var l = jQuery.curCSS(e,'marginLeft') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- getPadding : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'paddingTop') || '';
- var r = jQuery.curCSS(e,'paddingRight') || '';
- var b = jQuery.curCSS(e,'paddingBottom') || '';
- var l = jQuery.curCSS(e,'paddingLeft') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- getBorder : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'borderTopWidth') || '';
- var r = jQuery.curCSS(e,'borderRightWidth') || '';
- var b = jQuery.curCSS(e,'borderBottomWidth') || '';
- var l = jQuery.curCSS(e,'borderLeftWidth') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)||0
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- traverseDOM : function(nodeEl, func)
- {
- func(nodeEl);
- nodeEl = nodeEl.firstChild;
- while(nodeEl){
- EYE.traverseDOM(nodeEl, func);
- nodeEl = nodeEl.nextSibling;
- }
- },
- getInnerWidth : function(el, scroll) {
- var offsetW = el.offsetWidth;
- return scroll ? Math.max(el.scrollWidth,offsetW) - offsetW + el.clientWidth:el.clientWidth;
- },
- getInnerHeight : function(el, scroll) {
- var offsetH = el.offsetHeight;
- return scroll ? Math.max(el.scrollHeight,offsetH) - offsetH + el.clientHeight:el.clientHeight;
- },
- getExtraWidth : function(el) {
- if($.boxModel)
- return (parseInt($.curCSS(el, 'paddingLeft'))||0)
- + (parseInt($.curCSS(el, 'paddingRight'))||0)
- + (parseInt($.curCSS(el, 'borderLeftWidth'))||0)
- + (parseInt($.curCSS(el, 'borderRightWidth'))||0);
- return 0;
- },
- getExtraHeight : function(el) {
- if($.boxModel)
- return (parseInt($.curCSS(el, 'paddingTop'))||0)
- + (parseInt($.curCSS(el, 'paddingBottom'))||0)
- + (parseInt($.curCSS(el, 'borderTopWidth'))||0)
- + (parseInt($.curCSS(el, 'borderBottomWidth'))||0);
- return 0;
- },
- isChildOf: function(parentEl, el, container) {
- if (parentEl == el) {
- return true;
- }
- if (!el || !el.nodeType || el.nodeType != 1) {
- return false;
- }
- if (parentEl.contains && !$.browser.safari) {
- return parentEl.contains(el);
- }
- if ( parentEl.compareDocumentPosition ) {
- return !!(parentEl.compareDocumentPosition(el) & 16);
- }
- var prEl = el.parentNode;
- while(prEl && prEl != container) {
- if (prEl == parentEl)
- return true;
- prEl = prEl.parentNode;
- }
- return false;
- },
- centerEl : function(el, axis)
- {
- var clientScroll = EYE.getScroll();
- var size = EYE.getSize(el);
- if (!axis || axis == 'vertically')
- $(el).css(
- {
- top: clientScroll.t + ((Math.min(clientScroll.h,clientScroll.ih) - size.hb)/2) + 'px'
- }
- );
- if (!axis || axis == 'horizontally')
- $(el).css(
- {
- left: clientScroll.l + ((Math.min(clientScroll.w,clientScroll.iw) - size.wb)/2) + 'px'
- }
- );
- }
-});
-if (!$.easing.easeout) {
- $.easing.easeout = function(p, n, firstNum, delta, duration) {
- return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
- };
-}
-
-})(jQuery); \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/README.md b/ecomp-sdk/epsdk-app-overlay/README.md
index a0116b1b..9bd382ab 100644
--- a/ecomp-sdk/epsdk-app-overlay/README.md
+++ b/ecomp-sdk/epsdk-app-overlay/README.md
@@ -19,6 +19,7 @@ AngularJS version 1.5.0.
Version 1.3.0
- [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
+- [PORTAL-17] removing eye.js and utils.js - rework
Version 1.1.0
[Portal-7] Improvements added as part of the rebasing process
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
index 76fe7a58..4de78c9a 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
@@ -87,7 +87,7 @@ function exclusiveCheckBox(which) {
//-->
</script>
<script language="javascript" src="<%= AppUtils.getBaseFolderURL() %>js/other_scripts.js"></script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/CalendarPopup.js"></script>
+<%-- TODO : need a calendar popup functionality --%>
<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/rounded-corners.js"></script>
<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/form-field-tooltip.js"></script>
<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp
index 185f65c1..84c14510 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp
@@ -739,7 +739,7 @@ toggleFieldTypeSelection();
//-->
</script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/CalendarPopup.js"></script>
+<%-- TODO : need a calendar popup functionality --%>
<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
<iframe id="calendarFrame" class="nav" z-index:199; scrolling="no" frameborder="0" width=165px height=165px src="" style="position:absolute; display:none;">
</iframe>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
index b8d1ad1c..df5df348 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
@@ -97,7 +97,7 @@ function initFormFields() {
//-->
</script>
<script language="javascript" src="<%= AppUtils.getBaseFolderURL() %>js/other_scripts.js"></script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/CalendarPopup.js"></script>
+<%-- TODO : need a calendar popup functionality --%>
<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
<iframe id="calendarFrame" class="nav" z-index:199; scrolling="no" frameborder="0" width=165px height=165px src="" style="position:absolute; display:none;">
</iframe>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/b2b-angular.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/b2b-angular.css
index 1c7f2875..6ee85307 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/b2b-angular.css
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/b2b-angular.css
@@ -818,7 +818,7 @@ small {
@font-face {
font-family: 'icoPrimary';
src: url("../b2b-angular/fonts/icons/icoPrimary.eot?timestamp=@@timestamp");
- src: url("../b2b-angular/fonts/icons/icoPrimary.eot?timestamp=@@timestamp#iefix") format("embedded-opentype"), url("data:font/woff2; charset=utf-8;base64,d09GMgABAAAAABD0AAsAAAAAIegAABClAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAAfBEICroMr2IBNgIkA4EgC1IABCAFgyoHIBupG1GUj1aB7Gdh7HA7jbPiOgkYNpcuoRGZ37q6G3w0QpLZI9q02bs97HSRw5ogEesTAjElSqy0FGpCCRWzJBXR9DXJiydPX7T+Ip7vq3Pv2mcm2W+ShSugqkVXWVfbquUDpNKMTezCAYKwBVR91VU1+/0yazd3Lg9/AVmoSmRNKGStQEmoXKfLdLXNNyxbs5Yfwc8kTV8FeDfk73Xq+p9zCqBT5NCYYSvusE3/f1mxnmQFWA6RnaJdkoqgAvFKLJdQbnlDXMbO3TvsHZa1ZsvFBqhZqAl6879jOe2lIjbiiEUU6HPz354AaHoI7QMGgDpOXQeAvZtjQTfBi9SwGR2SIFAN8E15bK7/byAvdR15B0eq3dPoY80wQNCRBpSOYaquB+mFOI/OPmQdcg6lDWUMzf2mPPFfIgEMIB8Vhmz3g8Q/IzYiOSH/Lz9muMlr/jtGiCJVD2IyIRDYAKCZgxRuYmymuEdFrlK6KIorkyoV0Jgn91QkTcVrHlnDg0jnUvGnTA92OqstI80g6PVEEm6BJ58mg+OFFJIiZSQJRK/PEoSkZFHIMFiIwSg5iVar1xtzjZI/tyLTWigIQa1DY08zd4EUSVJK8Gz82QyGgCCkMyoZr7IHBBsvEoBwgxx6h+4EV3YeZwzc4W52q6lXGM9evr6oy1gTMmP79l5RTsJBClIq7jrFUaLH1BlHKTeOKPwhzFfAQqrZ2mdSzISbZTdbdQl5bjevMrg6SgcDfJsLwZ/gjUAu7PiWjAuyegyQbSvIRz8KdZreQMHJY91AKf2ArQnUq2M6QdzlV0h1cKvJFCQVXWrjZUR+mfsPuqrSKAw7vXHdA4jIfVYLo4QrFyzwSOWFzqWWIKXKCEE+n6FtUFH2YbuLsSii68GKBu9o6y0RSZVJ6FRPGxY6Wb2FSJub7hiVhvKqc+F2ZtFE3vy1GtWhiilfD6YouogRzzUU9QRuchi1FjSJJgeylOAoWaCMiX6CWJbjEw6CqMHl0OrKXnIfH7FAFHoZV2FPGgcTV4VSp4ELLxaGwcusuFYdvr5GheLQpKy5GMVLTbBdzuKpytLgd8xSTL08wGmaatJUkkztzRHn2w1Xct5RnWGYyhc+auWs9aErust7X2pNknPQ2B2xIlkrnvHaZA1jFaxXrNVb3cXM+hsVaV1EXdc/huV7XRgkZtxMJhCI4mMuecG0QWlOcxNicqGmtL5Yl1MtLdMuJZAYGFr+/P8+gr7e06WKrICOPml5b5Sf7tmW1JdFGrwGUEwBf/ugoV77AoqJkjXmTRyNQO+F45oBx8CweKoOWwPZj+aomITyzIUd5nHykU3h0LJjuvrUF2MQTKJTKF3omb9SMBepKzcOhZBoAWkP8+mKQRI+dD7mrTs3znGe6gr/mwGLt422RgkZnEDSK3zTEJuKNuypY3YIlACmD/E9UiDiW2pRpQFoIgY7UcwtdgFPmOI1KptGbgcZMkRPIREEQT6lN2dwYWs3U1lqLIorlivL7I4rN2oukpq/qu/QZiikJ5jZH+SjMMi4EXhLg9b7QhPFhFjkFki1i1pl8SNzSoZkDACAalthJVIMPBQdXQdiqtHyZrzsHFI1T5Gb6wPe+qNx+crLqRAFgeKxDOFLaukLuRIbl/ourN1HPnsxaSqUSLpJAXWIYs5UHlzOXzuteVtoQ9hau02jSTcwSs6UMVxp7dI8ung189KKGvmmpMtZF8G85uXCLcWOprejUii+ko1h/AYKs28W8lVRxlHzLI3XJYBelGiLoBBX01ilMCJwScYKsWmLVkmq3hLYezFPsXpoGkVE5aRiCpXBlhyDAsMTY/jqTSxhSLVsMwKRptxYOTg30SKjXESn43ch5IpJaBAUozLiiL05h3Fv0VN2IQVOPehaVXcThJXuuUP07jSi5YgkX2ndValmfTYCjkkCWR8V63ctCjduimfsyJwyXMMi0V6sJBKjXkPZ56wEKGZTEvPG49iM57DV0TwzvaYbajGyUZv0NuTSsnNYBdvKsVZ80SobcaqLo+xtycdXWB+FcsLCVjAcE0eYu6bcbIAxp3N1M+GWLWpksrCjNS5NMpa365lnKZz9bAw3TUuws386w6Zoq20INqiI5w/boj3XHG9/C3MNubDPWsPY/O5u09KaHVOf+vbCgu3+6z5//jc2vXnoO896lqr8R6+f2/+3/Id9t16NzQwm4gf+PncKN87cnnbF+sZXu3+sH5hdu8N1wRwqX6mdkxYu6pw+sW2997RlbPcH0/ZmTC8raJhvqPKYLvXHRhWudJ1Liu64Nz1W8PzkrZp6Z9LWpSP6fa/kdETO32qo9piy5EebyrZ4nnduD+7TLUhvKr613OaZIfbAshG9RfHkhuZOayS3tCbN4lZQQOUt7CEYG95Y7LrV1nEsHErjtvc7U3FsAU4PVnTl3GUMT+i0jMk+bNV9k3a984q/YP+GVL9/c+pBVZ7Gvrd4a81CErT+ojV89xV8dPwpYSkhdeQFsbU/BImq2YOBHTsCg7NnF7Smp9Vs1IHiwstT7vCvX+e/c8oU/x3r1t/pJwZ5vcwDM5Q4XaliSPRz3lVO0/posZkkb11CSuJ1weOcUyd/YPjR8IEMNpzXWqe+plZfVyty0Ta+hbOS+4Pf5+eQB1TkesscVVylVfWpwqpeIo+ZoNBXpr+m7+D83+FFaR3pYBNKfmNFtoNLqD+VsMNrGbzE/1kJMbia6E+rDmfQxMiOnos7MBPGczniMTmEC0RIN5G5tSsIWTFMdU1VqI6Xpri6VYdDOJypzNwIhQfQq/IHhgEY5LaybdyPNqvkJkJV6tvK2iyFAwbOgV9Wx9VnSraqrlGptkLhKMtVKSz+URWSxvuO4w5c+ZoW+nHfeEuEP8SwJA1THlNe7bQ/rsYFBzQfaIpwlKlCcBEi6ADB/HoNDjMowhoPzicj9C72LEWiQtTTeZbsSH8kbccSNEkpuNMeSQ9V0ZlhnvATXeK1XMiOLlVcNbkokdXLjVbLbcF2Y2BnWSxWtjMQKN8Jesoj7q5ySmoZhELhgawx451aHRErl0sOS5WjK7SR/70L9DPSJxQFHJCod5eSp4TGVrqNha981GKj7l0W2QAYb4DIgf7MRzL6D3oWg0RR8Hob0w/2ZzyS2Y+CrO0HbWQjILQRItofbI/YPtamLAOeQjAgH0d4IjtMVhCykoSZ7YHKsCquropUYZpZHT90yiY4+ECT4RefbRyPNykYkPewzh5K73tqrO/kkiUnfWPHCirpaTkWfa3vxypHHMydVDyqsTnYNtppK0W+fwozn7eXbcxSxhQIuIX6Wr1GH9Sr9SEi9YvM8YU/+8jIKk8QNbnTIquTCzti6ZyeS491FCYtiZvjFpYTzJp41vJp4J6lULO3NnWBM700r7aqrZmaIBZaBzeGbWVzV84YVf1EU853ybe8b7QojW6d5HDbeafdSdEgB2+32+D3NRpj54fZLwvC99mVzccCu8LEiqxx2YNZWEaH0/677E86jRpT8it4PjlV+Mu6J0Vh144nfrg77dq1wLWe/Y6994T//mvZWSjZN5H8ePVdv36Wwf/u1Y8JAkAIsBKbl47Ll9++2wzmu9/e9HFLzbIYIO41PbOPPMdEOCU/3Sg9a3bX57+hFtVv1NVXWUINujqdSpevU+q862up1UEROWGr63KbvtWcZYFjgd1WQeQIQKfv/fRKVdLxpCkCVlC7aAVO2p58udqwMfsljBIv7tt1UNKjATlYVfE1pmhKf10H3qktgGC/kYk6imEfAALQvGuq/BZoxCaUw2EsjWDQX9RTmMJJxqqDJLXLkXA4UU8z1DHto99cmRs9NvfsBpBnVCcfwc3xBfAZHKQp6yrHAetqau7Y/3qvEfPOzguH15gjv45zhAYoTAEAlYrW3iuxRcuBeAgAUCkE0ttVJq/ZnGKiMV2qMXtN5OxaIKljlsAszEVLJyYof/m8/L/cdcydFqyuDKfkeZiudqlBdxIAGK4b9JUNAEBS0cjW0hKqLzrGGiOnh3KQ/zP+avzv3uyVqkr6jqEERzETpZddeWYZuMFzMCckS8bWU8OdbYMBh8s10jG433q4j128fIas0f1p8rkb6jweLnX7OtuL+kpGBcrKgoESn9SsUvR4Pc0KX6atPtKUnJ3lTw6Sw8xTjUZQsArReKdhKA8Z9axQK95JCQIbf6d4dVoFXum8/L+RPeZOzU+iJ4+kzV/xyvj1IhSXlObJifEYeN2dxp+mD3oyxtTWTEjLz2e60vNVeAbz3vOiChblVxi/NFbko0rPy+6g473UEa6BhoHqSRNqfVRa3Zz9L9FcPLKtpDTQVjywaMCVMuJm0JFLXsOki3ypXQ70cBq6yXYAgEmkm0C6ZmZzjMlyCROr6iq6K1Zs7MovYVA47f9pWVit40j6vHVwGk/4uay9spjYHWVCzCIMeS7ceBFT4sNoRzwPXw8b/4KIjNR2D+hitbmpNR9o86D4fgvE4DgMWLpa1aARLEtHarsBwkeHS20xkbBYWCwsnsd7PCixPw2A8gwfyq3D5A8Mhu/kYWNu5IP+rfKHhvF4EcYMAOT+kX3gyOjgct+RvgW99/bc+9z5vp4+wyP3Htnx8PupRCcPPCfxIznC8Yh7PMBL3FtWTrcBOMK32gxsKw22MVvMd9ga1ZzZ3+N2thOtW3R/Z88Do5MDPzmEW/zAvoN37evbJ++7d9+F3fLaiznEQ/7Gp5K2Jw8OmgJasSIPEpK3UzRDYiWL8KxtIc2veoLtVb+vYS8K+/MXt7erb7Bu9U2WvS5eavPNPl/Fq+ol0Tlzoxnq1WS5trnU5LReMjlMTxQvdmm411KfpVyhbFzALMcLnn7llvEH1e+z6sfZCer3QJ4ozNngqVQ8oPAiWV332kDBUz0DlqjlkpUniltC1ktm3OZRj7ZDe4nEtHFtjFw6J46fLsQdzCbqh5kOvOkqu3czy/E2vJzB8xBjE47hSeAQUDQ+NIIJJHcgc33JO5go3T5nbvdKNih/LyMcY/AKjIRcPkhVk/UiuI5Kobe/Wfmb29tOdK4Y3xGNAZo99oRLIycsxqF/53E//4rOrZ7IcyUrz1zamdx7l22wa9VPbTt/+3RpwS7XGPXTfznuQ4seHl/I1Bfh7v704h7DbJ1YrZ9fk1Cjh89vud1+e6Dn9oLND1k2nyGb15Py4uQHm/bPPjd6TvWE86Nnb7oWF5eHKmfisSDQBo638MeOe4u9vwwNv3pLvPs/SCLXK3U61/uidPwYDwAaoAEAXk1sFTnoJryR2CFc6H1YnqgROygXnEj8QI9B6wABAAJ4aV5G3xSx/DcViwEA4HX9bwcnNv8/hYF6CgBUCoBj8/ctSgEwLfAaYK1MjKj3JKNalv6Np+hn6IVTECHLyhCO9gGOC0EIQwCL8Cq+AZgJs8mkBPDCFHwJcAOWw3x4DAZhFkRgrBZK8p8ApGFPeAVEoOa7qxHgnjy5EWikZwYFSliTQYMGqgAL+zIYYCE5QwEamBTUgAXu+SEdYXWNHjSQQYEAm5G2CX7EEE5kMCBDFiogxGbRQD5cnhVZ8IcXEWAWRGABBGDxrs+DaZm26jMzoXkuN4Qh+sQlDhpwMeaDHfLABW7SRUiQ/qzjCjAKohCDZTA3bBHS848Uz/MxDNlf8H9qtgQaVMKluR6D6M4VxWl3PQozoE+HVbPq54ZtzPEO3AU0bAAAAAA=") format("woff2"), url("data:application/font-woff; charset=utf-8;base64,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") format("woff"), url("../b2b-angular/fonts/icons/icoPrimary.ttf?timestamp=@@timestamp") format("truetype");
+ src: url("../b2b-angular/fonts/icons/icoPrimary.eot?timestamp=@@timestamp#iefix") format("embedded-opentype"), url("../b2b-angular/fonts/icons/icoPrimary.ttf?timestamp=@@timestamp") format("truetype");
font-weight: normal;
font-style: normal; }
@@ -837,7 +837,7 @@ small {
.selectWrap:after {
color: #0568ae;
display: inline-block;
- font-family: 'icoPrimary' !important;
+ font-family: 'icoPrimary';
font-style: normal;
font-size: 20px;
font-weight: normal;
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/eye.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/eye.js
deleted file mode 100644
index 8a281dc3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/eye.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Zoomimage
- * Author: Stefan Petre www.eyecon.ro
- *
- */
-(function($){
- var EYE = window.EYE = function() {
- var _registered = {
- init: []
- };
- return {
- init: function() {
- $.each(_registered.init, function(nr, fn){
- fn.call();
- });
- },
- extend: function(prop) {
- for (var i in prop) {
- if (prop[i] != undefined) {
- this[i] = prop[i];
- }
- }
- },
- register: function(fn, type) {
- if (!_registered[type]) {
- _registered[type] = [];
- }
- _registered[type].push(fn);
- }
- };
- }();
- $(EYE.init);
-})(jQuery);
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/utils.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/utils.js
deleted file mode 100644
index d9be8532..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/js/utils.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- *
- * Utilities
- * Author: Stefan Petre www.eyecon.ro
- *
- */
-(function($) {
-EYE.extend({
- getPosition : function(e, forceIt)
- {
- var x = 0;
- var y = 0;
- var es = e.style;
- var restoreStyles = false;
- if (forceIt && jQuery.curCSS(e,'display') == 'none') {
- var oldVisibility = es.visibility;
- var oldPosition = es.position;
- restoreStyles = true;
- es.visibility = 'hidden';
- es.display = 'block';
- es.position = 'absolute';
- }
- var el = e;
- if (el.getBoundingClientRect) { // IE
- var box = el.getBoundingClientRect();
- x = box.left + Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) - 2;
- y = box.top + Math.max(document.documentElement.scrollTop, document.body.scrollTop) - 2;
- } else {
- x = el.offsetLeft;
- y = el.offsetTop;
- el = el.offsetParent;
- if (e != el) {
- while (el) {
- x += el.offsetLeft;
- y += el.offsetTop;
- el = el.offsetParent;
- }
- }
- if (jQuery.browser.safari && jQuery.curCSS(e, 'position') == 'absolute' ) {
- x -= document.body.offsetLeft;
- y -= document.body.offsetTop;
- }
- el = e.parentNode;
- while (el && el.tagName.toUpperCase() != 'BODY' && el.tagName.toUpperCase() != 'HTML')
- {
- if (jQuery.curCSS(el, 'display') != 'inline') {
- x -= el.scrollLeft;
- y -= el.scrollTop;
- }
- el = el.parentNode;
- }
- }
- if (restoreStyles == true) {
- es.display = 'none';
- es.position = oldPosition;
- es.visibility = oldVisibility;
- }
- return {x:x, y:y};
- },
- getSize : function(e)
- {
- var w = parseInt(jQuery.curCSS(e,'width'), 10);
- var h = parseInt(jQuery.curCSS(e,'height'), 10);
- var wb = 0;
- var hb = 0;
- if (jQuery.curCSS(e, 'display') != 'none') {
- wb = e.offsetWidth;
- hb = e.offsetHeight;
- } else {
- var es = e.style;
- var oldVisibility = es.visibility;
- var oldPosition = es.position;
- es.visibility = 'hidden';
- es.display = 'block';
- es.position = 'absolute';
- wb = e.offsetWidth;
- hb = e.offsetHeight;
- es.display = 'none';
- es.position = oldPosition;
- es.visibility = oldVisibility;
- }
- return {w:w, h:h, wb:wb, hb:hb};
- },
- getClient : function(e)
- {
- var h, w;
- if (e) {
- w = e.clientWidth;
- h = e.clientHeight;
- } else {
- var de = document.documentElement;
- w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
- h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
- }
- return {w:w,h:h};
- },
- getScroll : function (e)
- {
- var t=0, l=0, w=0, h=0, iw=0, ih=0;
- if (e && e.nodeName.toLowerCase() != 'body') {
- t = e.scrollTop;
- l = e.scrollLeft;
- w = e.scrollWidth;
- h = e.scrollHeight;
- } else {
- if (document.documentElement) {
- t = document.documentElement.scrollTop;
- l = document.documentElement.scrollLeft;
- w = document.documentElement.scrollWidth;
- h = document.documentElement.scrollHeight;
- } else if (document.body) {
- t = document.body.scrollTop;
- l = document.body.scrollLeft;
- w = document.body.scrollWidth;
- h = document.body.scrollHeight;
- }
- if (typeof pageYOffset != 'undefined') {
- t = pageYOffset;
- l = pageXOffset;
- }
- iw = self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0;
- ih = self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0;
- }
- return { t: t, l: l, w: w, h: h, iw: iw, ih: ih };
- },
- getMargins : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'marginTop') || '';
- var r = jQuery.curCSS(e,'marginRight') || '';
- var b = jQuery.curCSS(e,'marginBottom') || '';
- var l = jQuery.curCSS(e,'marginLeft') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- getPadding : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'paddingTop') || '';
- var r = jQuery.curCSS(e,'paddingRight') || '';
- var b = jQuery.curCSS(e,'paddingBottom') || '';
- var l = jQuery.curCSS(e,'paddingLeft') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- getBorder : function(e, toInteger)
- {
- var t = jQuery.curCSS(e,'borderTopWidth') || '';
- var r = jQuery.curCSS(e,'borderRightWidth') || '';
- var b = jQuery.curCSS(e,'borderBottomWidth') || '';
- var l = jQuery.curCSS(e,'borderLeftWidth') || '';
- if (toInteger)
- return {
- t: parseInt(t, 10)||0,
- r: parseInt(r, 10)||0,
- b: parseInt(b, 10)||0,
- l: parseInt(l, 10)||0
- };
- else
- return {t: t, r: r, b: b, l: l};
- },
- traverseDOM : function(nodeEl, func)
- {
- func(nodeEl);
- nodeEl = nodeEl.firstChild;
- while(nodeEl){
- EYE.traverseDOM(nodeEl, func);
- nodeEl = nodeEl.nextSibling;
- }
- },
- getInnerWidth : function(el, scroll) {
- var offsetW = el.offsetWidth;
- return scroll ? Math.max(el.scrollWidth,offsetW) - offsetW + el.clientWidth:el.clientWidth;
- },
- getInnerHeight : function(el, scroll) {
- var offsetH = el.offsetHeight;
- return scroll ? Math.max(el.scrollHeight,offsetH) - offsetH + el.clientHeight:el.clientHeight;
- },
- getExtraWidth : function(el) {
- if($.boxModel)
- return (parseInt($.curCSS(el, 'paddingLeft'))||0)
- + (parseInt($.curCSS(el, 'paddingRight'))||0)
- + (parseInt($.curCSS(el, 'borderLeftWidth'))||0)
- + (parseInt($.curCSS(el, 'borderRightWidth'))||0);
- return 0;
- },
- getExtraHeight : function(el) {
- if($.boxModel)
- return (parseInt($.curCSS(el, 'paddingTop'))||0)
- + (parseInt($.curCSS(el, 'paddingBottom'))||0)
- + (parseInt($.curCSS(el, 'borderTopWidth'))||0)
- + (parseInt($.curCSS(el, 'borderBottomWidth'))||0);
- return 0;
- },
- isChildOf: function(parentEl, el, container) {
- if (parentEl == el) {
- return true;
- }
- if (!el || !el.nodeType || el.nodeType != 1) {
- return false;
- }
- if (parentEl.contains && !$.browser.safari) {
- return parentEl.contains(el);
- }
- if ( parentEl.compareDocumentPosition ) {
- return !!(parentEl.compareDocumentPosition(el) & 16);
- }
- var prEl = el.parentNode;
- while(prEl && prEl != container) {
- if (prEl == parentEl)
- return true;
- prEl = prEl.parentNode;
- }
- return false;
- },
- centerEl : function(el, axis)
- {
- var clientScroll = EYE.getScroll();
- var size = EYE.getSize(el);
- if (!axis || axis == 'vertically')
- $(el).css(
- {
- top: clientScroll.t + ((Math.min(clientScroll.h,clientScroll.ih) - size.hb)/2) + 'px'
- }
- );
- if (!axis || axis == 'horizontally')
- $(el).css(
- {
- left: clientScroll.l + ((Math.min(clientScroll.w,clientScroll.iw) - size.wb)/2) + 'px'
- }
- );
- }
-});
-if (!$.easing.easeout) {
- $.easing.easeout = function(p, n, firstNum, delta, duration) {
- return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
- };
-}
-
-})(jQuery); \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
index 3247ae7a..109c1c7b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
@@ -740,6 +740,26 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal
$scope.saveRole = function() {
var errorMsg;
+
+ $scope.role = {
+ 'id':null,
+ 'created':null,
+ 'modified':null,
+ 'createdId':null,
+ 'modifiedId':null,
+ 'rowNum':null,
+ 'auditUserId':null,
+ 'auditTrail':null,
+ 'name':$scope.role.name,
+ 'active':false,
+ 'priority':$scope.role.priority,
+ 'roleFunctions':null,
+ 'childRoles':null,
+ 'toggleActiveAltText':"Click to Activate Role ",
+ 'toggleActiveImage':" / static fusion images inactive.png ",
+ 'editUrl':" role.htm ? role_id = null",
+ };
+
// Validate non-empty priority as integer
if ($scope.role.priority && $scope.role.priority != '' && isNaN(parseInt($scope.role.priority))) {
errorMsg = 'Priority must be an integer.';
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif
deleted file mode 100644
index 56c4f8db..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ATT_Business_logo.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/RAPTOR_BANNER.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/RAPTOR_BANNER.jpg
deleted file mode 100644
index afdc7825..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/RAPTOR_BANNER.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/accessicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/accessicon.gif
deleted file mode 100644
index 973f7590..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/accessicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/active.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/active.gif
deleted file mode 100644
index 944cb3b5..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/active.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/addbtn.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/addbtn.png
deleted file mode 100644
index 8f746db6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/addbtn.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ajax-loader.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ajax-loader.gif
deleted file mode 100644
index f2a1bc0c..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/ajax-loader.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add.gif
deleted file mode 100644
index f3cfc64e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif
deleted file mode 100644
index ada0334c..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_edge.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_multiple.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_multiple.gif
deleted file mode 100644
index 904369e5..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_multiple.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_one.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_one.gif
deleted file mode 100644
index e7fe4690..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_add_one.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_back.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_back.gif
deleted file mode 100644
index c8ee935d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_back.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_cancel.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_cancel.gif
deleted file mode 100644
index 1d1d001b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_cancel.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left.gif
deleted file mode 100644
index a79ccadd..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif
deleted file mode 100644
index 726d4227..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_left2.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_next.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_next.gif
deleted file mode 100644
index 6743e7af..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_next.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif
deleted file mode 100644
index 7a402426..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_plus.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif
deleted file mode 100644
index d67e1a63..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png
deleted file mode 100644
index bca729f2..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_reorder_all.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right.gif
deleted file mode 100644
index e4879966..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif
deleted file mode 100644
index 302cb291..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_right2.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_save.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_save.gif
deleted file mode 100644
index 2702547a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/arrow_save.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/att-globe1.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/att-globe1.jpg
deleted file mode 100644
index a88bedb3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/att-globe1.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/button_import.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/button_import.png
deleted file mode 100644
index 7fab1a02..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/button_import.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif
deleted file mode 100644
index caf77f9a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav.gif
deleted file mode 100644
index 2bccb616..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif
deleted file mode 100644
index 093ef50a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calendar_icon_nav1.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calender_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calender_icon.gif
deleted file mode 100644
index caf77f9a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/calender_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankdown.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankdown.gif
deleted file mode 100644
index 15d1aac7..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankdown.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankup.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankup.gif
deleted file mode 100644
index f76975bd..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnblankup.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columndown.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columndown.gif
deleted file mode 100644
index 6c8d80e6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columndown.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnup.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnup.gif
deleted file mode 100644
index 1c9b24f8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/columnup.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/crosshairs.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/crosshairs.png
deleted file mode 100644
index c90509ce..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/crosshairs.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/csv_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/csv_icon.gif
deleted file mode 100644
index d73e93a6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/csv_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/deleteicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/deleteicon.gif
deleted file mode 100644
index d544b59b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/deleteicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/downloadicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/downloadicon.gif
deleted file mode 100644
index 1dddfb68..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/downloadicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.jpg
deleted file mode 100644
index 77d7cc20..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.png
deleted file mode 100644
index 7a8e9c83..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excel2007.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon.gif
deleted file mode 100644
index 3ca1270b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon_multi.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon_multi.gif
deleted file mode 100644
index 8ca69611..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/excelicon_multi.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif
deleted file mode 100644
index d3e37e84..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow-right.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow.gif
deleted file mode 100644
index 40a44336..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/green-arrow.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif
deleted file mode 100644
index 4c312a35..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowdn.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif
deleted file mode 100644
index 23442aaf..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/grnarrowup.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/h.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/h.png
deleted file mode 100644
index 389eb08a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/h.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/inactive.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/inactive.gif
deleted file mode 100644
index bb0a7112..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/inactive.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loader.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loader.gif
deleted file mode 100644
index 32af9875..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loader.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loading.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loading.gif
deleted file mode 100644
index 7ca73e93..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/loading.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif
deleted file mode 100644
index 84e1aaad..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/lookup_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/blue.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/blue.png
deleted file mode 100644
index 69590b92..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/blue.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/green.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/green.png
deleted file mode 100644
index 0f79315e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/green.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/lightblue.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/lightblue.png
deleted file mode 100644
index 03586d7d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/lightblue.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg
deleted file mode 100644
index d6b996c5..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/map_iphone.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/orange.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/orange.png
deleted file mode 100644
index 8bee9da3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/orange.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/pink.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/pink.png
deleted file mode 100644
index 71a7cd65..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/pink.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/purple.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/purple.png
deleted file mode 100644
index b5787389..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/purple.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/red.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/red.png
deleted file mode 100644
index e993751a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/red.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/yellow.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/yellow.png
deleted file mode 100644
index a9d65acc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/maps/yellow.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/minus.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/minus.gif
deleted file mode 100644
index 0c62d1a0..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/minus.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/modify_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/modify_icon.gif
deleted file mode 100644
index 994fe655..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/modify_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/page.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/page.gif
deleted file mode 100644
index 01c9fbfb..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/page.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif
deleted file mode 100644
index 39673df7..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_large.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif
deleted file mode 100644
index bb5edcac..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pdficon_small.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pen_paper.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pen_paper.gif
deleted file mode 100644
index ba562347..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/pen_paper.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/plus.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/plus.gif
deleted file mode 100644
index 4a51f04d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/plus.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/popupicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/popupicon.gif
deleted file mode 100644
index 7babac50..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/popupicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/position.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/position.png
deleted file mode 100644
index ba003bca..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/position.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/printer.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/printer.gif
deleted file mode 100644
index b2ce8173..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/printer.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/progress.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/progress.gif
deleted file mode 100644
index b713e27d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/progress.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/question_mark.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/question_mark.jpg
deleted file mode 100644
index 808e424d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/question_mark.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif
deleted file mode 100644
index 05fe83ec..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_dk.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif
deleted file mode 100644
index b629545e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/quickhelp_lt.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/r_back.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/r_back.gif
deleted file mode 100644
index d3dc5791..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/r_back.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor.jpg
deleted file mode 100644
index 401efb4b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif
deleted file mode 100644
index 5ea26299..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.jpg
deleted file mode 100644
index 23c755b3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/raptor_logo.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/required.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/required.gif
deleted file mode 100644
index 4c28998d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/required.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/shareicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/shareicon.gif
deleted file mode 100644
index 31153568..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/shareicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/sv.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/sv.png
deleted file mode 100644
index f57fecb1..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/sv.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left.gif
deleted file mode 100644
index ccb53633..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif
deleted file mode 100644
index 9a534806..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_left_sel.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right.gif
deleted file mode 100644
index 62f25162..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right_sel.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right_sel.gif
deleted file mode 100644
index b59c337c..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tab_right_sel.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/test_run.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/test_run.gif
deleted file mode 100644
index 92c1c3dc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/test_run.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/text.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/text.gif
deleted file mode 100644
index 6db2fe1e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/text.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif
deleted file mode 100644
index 6e289cec..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/context-menu-gradient.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif
deleted file mode 100644
index cd89accb..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_folder.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif
deleted file mode 100644
index 45ff7280..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_minus.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_plus.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_plus.gif
deleted file mode 100644
index 39a6bde8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_plus.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet.gif
deleted file mode 100644
index be072083..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif
deleted file mode 100644
index f8ccce34..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_crosstab.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_dashboard.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_dashboard.gif
deleted file mode 100644
index 46632c8c..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_dashboard.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif
deleted file mode 100644
index c8efeed8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dhtmlgoodies_sheet_graph.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif
deleted file mode 100644
index 2f9bf5a6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind1.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif
deleted file mode 100644
index a1da6310..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/dragDrop_ind2.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif
deleted file mode 100644
index bba11d39..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_close.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_dots.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_dots.gif
deleted file mode 100644
index db93fd92..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_dots.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_folder.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_folder.gif
deleted file mode 100644
index ef555b7a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_folder.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_lastsub.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_lastsub.gif
deleted file mode 100644
index 6e122445..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_lastsub.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_open.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_open.gif
deleted file mode 100644
index b6d60b84..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_open.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif
deleted file mode 100644
index e3c8e44e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/folder_sub.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif
deleted file mode 100644
index 22b9bdbe..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowleft.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowright.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowright.gif
deleted file mode 100644
index b827b06a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/tree/grnarrowright.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/txt_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/txt_icon.gif
deleted file mode 100644
index 0a73eb52..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/txt_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF033.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF033.png
deleted file mode 100644
index 74db3c9a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF033.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF034.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF034.png
deleted file mode 100644
index 4f607345..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF034.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF035.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF035.png
deleted file mode 100644
index cdc43ff3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF035.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF036.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF036.png
deleted file mode 100644
index da9db296..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/images/uF036.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/BorderLayout-24x24.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/BorderLayout-24x24.png
deleted file mode 100644
index a5324fc3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/BorderLayout-24x24.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png
deleted file mode 100644
index ac970bda..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/Calendar-16x16.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/DeleteCross-16x16.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/DeleteCross-16x16.png
deleted file mode 100644
index 79daacfc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/DeleteCross-16x16.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/addbtn.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/addbtn.png
deleted file mode 100644
index 8f746db6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/addbtn.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/button_import.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/button_import.png
deleted file mode 100644
index 7fab1a02..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/button_import.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png
deleted file mode 100644
index 312c4398..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon-highlighted.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon.png
deleted file mode 100644
index 6c1c3c15..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/copyicon.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/cross-small.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/cross-small.png
deleted file mode 100644
index bf0ccbe7..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/cross-small.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.gif
deleted file mode 100644
index d73e93a6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg
deleted file mode 100644
index b4d795bd..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.png
deleted file mode 100644
index bfae8fc3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/csv_icon.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif
deleted file mode 100644
index b62241b4..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png
deleted file mode 100644
index aee193de..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon-highlighted.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon.gif
deleted file mode 100644
index 4b07af82..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/deleteicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/downloadicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/downloadicon.gif
deleted file mode 100644
index 1dddfb68..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/downloadicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/editicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/editicon.gif
deleted file mode 100644
index 48538c18..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/editicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excel2007.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excel2007.jpg
deleted file mode 100644
index 77d7cc20..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excel2007.jpg
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon.gif
deleted file mode 100644
index 3ca1270b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon_multi.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon_multi.gif
deleted file mode 100644
index 8ca69611..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/excelicon_multi.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/executeicon.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/executeicon.png
deleted file mode 100644
index 295c429b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/executeicon.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/file_import.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/file_import.png
deleted file mode 100644
index 2374ba3f..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/file_import.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif
deleted file mode 100644
index bb5edcac..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pdficon_small.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pen_paper.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pen_paper.gif
deleted file mode 100644
index ba562347..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pen_paper.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pencil-small.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pencil-small.png
deleted file mode 100644
index e6f2ca02..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/pencil-small.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-add.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-add.png
deleted file mode 100644
index c75b6663..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-add.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-favorite.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-favorite.png
deleted file mode 100644
index e75cacc3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-favorite.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-my.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-my.png
deleted file mode 100644
index 1b9e092d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-my.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-public.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-public.png
deleted file mode 100644
index 9ee052ec..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report-public.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report.png
deleted file mode 100644
index b0cd69fc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/report.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/reports.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/reports.png
deleted file mode 100644
index 40dca71e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/reports.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.gif
deleted file mode 100644
index 164b9123..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.gif
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.png
deleted file mode 100644
index 7ff964f8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/search.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/tick-small.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/tick-small.png
deleted file mode 100644
index a110aef9..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/img/tick-small.png
+++ /dev/null
Binary files differ
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js
deleted file mode 100644
index 07cd7ee8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/CalendarPopup.js
+++ /dev/null
@@ -1,1486 +0,0 @@
-// ===================================================================
-// Author: Matt Kruse <matt@mattkruse.com>
-// WWW: http://www.mattkruse.com/
-//
-// NOTICE: You may use this code for any purpose, commercial or
-// private, without any further permission from the author. You may
-// remove this notice from your final code if you wish, however it is
-// appreciated by the author if at least my web site address is kept.
-//
-// You may *NOT* re-distribute this code in any way except through its
-// use. That means, you can include it in your product, or your web
-// site, or any other form where the code is actually being used. You
-// may not put the plain javascript up on your site for download or
-// include it in your javascript libraries for download.
-// If you wish to share this code with others, please just point them
-// to the URL instead.
-// Please DO NOT link directly to my .js files from your site. Copy
-// the files to your server and use them there. Thank you.
-// ===================================================================
-
-
-/* SOURCE FILE: date.js */
-
-// HISTORY
-// ------------------------------------------------------------------
-// May 17, 2003: Fixed bug in parseDate() for dates <1970
-// March 11, 2003: Added parseDate() function
-// March 11, 2003: Added "NNN" formatting option. Doesn't match up
-// perfectly with SimpleDateFormat formats, but
-// backwards-compatability was required.
-
-// ------------------------------------------------------------------
-// These functions use the same 'format' strings as the
-// java.text.SimpleDateFormat class, with minor exceptions.
-// The format string consists of the following abbreviations:
-//
-// Field | Full Form | Short Form
-// -------------+--------------------+-----------------------
-// Year | yyyy (4 digits) | yy (2 digits), y (2 or 4 digits)
-// Month | MMM (name or abbr.)| MM (2 digits), M (1 or 2 digits)
-// | NNN (abbr.) |
-// Day of Month | dd (2 digits) | d (1 or 2 digits)
-// Day of Week | EE (name) | E (abbr)
-// Hour (1-12) | hh (2 digits) | h (1 or 2 digits)
-// Hour (0-23) | HH (2 digits) | H (1 or 2 digits)
-// Hour (0-11) | KK (2 digits) | K (1 or 2 digits)
-// Hour (1-24) | kk (2 digits) | k (1 or 2 digits)
-// Minute | mm (2 digits) | m (1 or 2 digits)
-// Second | ss (2 digits) | s (1 or 2 digits)
-// AM/PM | a |
-//
-// NOTE THE DIFFERENCE BETWEEN MM and mm! Month=MM, not mm!
-// Examples:
-// "MMM d, y" matches: January 01, 2000
-// Dec 1, 1900
-// Nov 20, 00
-// "M/d/yy" matches: 01/20/00
-// 9/2/00
-// "MMM dd, yyyy hh:mm:ssa" matches: "January 01, 2000 12:30:45AM"
-// ------------------------------------------------------------------
-
-var MONTH_NAMES=new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-var DAY_NAMES=new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sun','Mon','Tue','Wed','Thu','Fri','Sat');
-function LZ(x) {return(x<0||x>9?"":"0")+x}
-
-// ------------------------------------------------------------------
-// isDate ( date_string, format_string )
-// Returns true if date string matches format of format string and
-// is a valid date. Else returns false.
-// It is recommended that you trim whitespace around the value before
-// passing it to this function, as whitespace is NOT ignored!
-// ------------------------------------------------------------------
-function isDate(val,format) {
- var date=getDateFromFormat(val,format);
- if (date==0) { return false; }
- return true;
- }
-
-// -------------------------------------------------------------------
-// compareDates(date1,date1format,date2,date2format)
-// Compare two date strings to see which is greater.
-// Returns:
-// 1 if date1 is greater than date2
-// 0 if date2 is greater than date1 of if they are the same
-// -1 if either of the dates is in an invalid format
-// -------------------------------------------------------------------
-function compareDates(date1,dateformat1,date2,dateformat2) {
- var d1=getDateFromFormat(date1,dateformat1);
- var d2=getDateFromFormat(date2,dateformat2);
- if (d1==0 || d2==0) {
- return -1;
- }
- else if (d1 > d2) {
- return 1;
- }
- return 0;
- }
-
-// ------------------------------------------------------------------
-// formatDate (date_object, format)
-// Returns a date in the output format specified.
-// The format string uses the same abbreviations as in getDateFromFormat()
-// ------------------------------------------------------------------
-function formatDate(date,format) {
- format=format+"";
- var result="";
- var i_format=0;
- var c="";
- var token="";
- var y=date.getYear()+"";
- var M=date.getMonth()+1;
- var d=date.getDate();
- var E=date.getDay();
- var H=date.getHours();
- var m=date.getMinutes();
- var s=date.getSeconds();
- var yyyy,yy,MMM,MM,dd,hh,h,mm,ss,ampm,HH,H,KK,K,kk,k;
- // Convert real date parts into formatted versions
- var value=new Object();
- if (y.length < 4) {y=""+(y-0+1900);}
- value["y"]=""+y;
- value["yyyy"]=y;
- value["yy"]=y.substring(2,4);
- value["M"]=M;
- value["MM"]=LZ(M);
- value["MMM"]=MONTH_NAMES[M-1];
- value["NNN"]=MONTH_NAMES[M+11];
- value["d"]=d;
- value["dd"]=LZ(d);
- value["E"]=DAY_NAMES[E+7];
- value["EE"]=DAY_NAMES[E];
- value["H"]=H;
- value["HH"]=LZ(H);
- if (H==0){value["h"]=12;}
- else if (H>12){value["h"]=H-12;}
- else {value["h"]=H;}
- value["hh"]=LZ(value["h"]);
- if (H>11){value["K"]=H-12;} else {value["K"]=H;}
- value["k"]=H+1;
- value["KK"]=LZ(value["K"]);
- value["kk"]=LZ(value["k"]);
- if (H > 11) { value["a"]="PM"; }
- else { value["a"]="AM"; }
- value["m"]=m;
- value["mm"]=LZ(m);
- value["s"]=s;
- value["ss"]=LZ(s);
- while (i_format < format.length) {
- c=format.charAt(i_format);
- token="";
- while ((format.charAt(i_format)==c) && (i_format < format.length)) {
- token += format.charAt(i_format++);
- }
- if (value[token] != null) { result=result + value[token]; }
- else { result=result + token; }
- }
- return result;
- }
-
-// ------------------------------------------------------------------
-// Utility functions for parsing in getDateFromFormat()
-// ------------------------------------------------------------------
-function _isInteger(val) {
- var digits="1234567890";
- for (var i=0; i < val.length; i++) {
- if (digits.indexOf(val.charAt(i))==-1) { return false; }
- }
- return true;
- }
-function _getInt(str,i,minlength,maxlength) {
- for (var x=maxlength; x>=minlength; x--) {
- var token=str.substring(i,i+x);
- if (token.length < minlength) { return null; }
- if (_isInteger(token)) { return token; }
- }
- return null;
- }
-
-// ------------------------------------------------------------------
-// getDateFromFormat( date_string , format_string )
-//
-// This function takes a date string and a format string. It matches
-// If the date string matches the format string, it returns the
-// getTime() of the date. If it does not match, it returns 0.
-// ------------------------------------------------------------------
-function getDateFromFormat(val,format) {
- val=val+"";
- format=format+"";
- var i_val=0;
- var i_format=0;
- var c="";
- var token="";
- var token2="";
- var x,y;
- var now=new Date();
-
- var year=now.getYear();
- var month=now.getMonth()+1;
- var date=1;
- var hh=now.getHours();
- var mm=now.getMinutes();
- var ss=now.getSeconds();
- var ampm="";
-
- while (i_format < format.length) {
- // Get next token from format string
- c=format.charAt(i_format);
- token="";
- while ((format.charAt(i_format)==c) && (i_format < format.length)) {
- token += format.charAt(i_format++);
- }
- // Extract contents of value based on format token
- if (token=="yyyy" || token=="yy" || token=="y") {
- if (token=="yyyy") { x=4;y=4; }
- if (token=="yy") { x=2;y=2; }
- if (token=="y") { x=2;y=4; }
- year=_getInt(val,i_val,x,y);
- if (year==null) { return 0; }
- i_val += year.length;
- if (year.length==2) {
- if (year > 70) { year=1900+(year-0); }
- else { year=2000+(year-0); }
- }
- }
- else if (token=="MMM"||token=="NNN"){
- month=0;
- for (var i=0; i<MONTH_NAMES.length; i++) {
- var month_name=MONTH_NAMES[i];
- if (val.substring(i_val,i_val+month_name.length).toLowerCase()==month_name.toLowerCase()) {
- if (token=="MMM"||(token=="NNN"&&i>11)) {
- month=i+1;
- if (month>12) { month -= 12; }
- i_val += month_name.length;
- break;
- }
- }
- }
- if ((month < 1)||(month>12)){return 0;}
- }
- else if (token=="EE"||token=="E"){
- for (var i=0; i<DAY_NAMES.length; i++) {
- var day_name=DAY_NAMES[i];
- if (val.substring(i_val,i_val+day_name.length).toLowerCase()==day_name.toLowerCase()) {
- i_val += day_name.length;
- break;
- }
- }
- }
- else if (token=="MM"||token=="M") {
- month=_getInt(val,i_val,token.length,2);
- if(month==null||(month<1)||(month>12)){return 0;}
- i_val+=month.length;}
- else if (token=="dd"||token=="d") {
- date=_getInt(val,i_val,token.length,2);
- if(date==null||(date<1)||(date>31)){return 0;}
- i_val+=date.length;}
- else if (token=="hh"||token=="h") {
- hh=_getInt(val,i_val,token.length,2);
- if(hh==null||(hh<1)||(hh>12)){return 0;}
- i_val+=hh.length;}
- else if (token=="HH"||token=="H") {
- hh=_getInt(val,i_val,token.length,2);
- if(hh==null||(hh<0)||(hh>23)){return 0;}
- i_val+=hh.length;}
- else if (token=="KK"||token=="K") {
- hh=_getInt(val,i_val,token.length,2);
- if(hh==null||(hh<0)||(hh>11)){return 0;}
- i_val+=hh.length;}
- else if (token=="kk"||token=="k") {
- hh=_getInt(val,i_val,token.length,2);
- if(hh==null||(hh<1)||(hh>24)){return 0;}
- i_val+=hh.length;hh--;}
- else if (token=="mm"||token=="m") {
- mm=_getInt(val,i_val,token.length,2);
- if(mm==null||(mm<0)||(mm>59)){return 0;}
- i_val+=mm.length;}
- else if (token=="ss"||token=="s") {
- ss=_getInt(val,i_val,token.length,2);
- if(ss==null||(ss<0)||(ss>59)){return 0;}
- i_val+=ss.length;}
- else if (token=="a") {
- if (val.substring(i_val,i_val+2).toLowerCase()=="am") {ampm="AM";}
- else if (val.substring(i_val,i_val+2).toLowerCase()=="pm") {ampm="PM";}
- else {return 0;}
- i_val+=2;}
- else {
- if (val.substring(i_val,i_val+token.length)!=token) {return 0;}
- else {i_val+=token.length;}
- }
- }
- // If there are any trailing characters left in the value, it doesn't match
- if (i_val != val.length) { return 0; }
- // Is date valid for month?
- if (month==2) {
- // Check for leap year
- if ( ( (year%4==0)&&(year%100 != 0) ) || (year%400==0) ) { // leap year
- if (date > 29){ return 0; }
- }
- else { if (date > 28) { return 0; } }
- }
- if ((month==4)||(month==6)||(month==9)||(month==11)) {
- if (date > 30) { return 0; }
- }
- // Correct hours value
- if (hh<12 && ampm=="PM") { hh=hh-0+12; }
- else if (hh>11 && ampm=="AM") { hh-=12; }
- var newdate=new Date(year,month-1,date,hh,mm,ss);
- return newdate.getTime();
- }
-
-// ------------------------------------------------------------------
-// parseDate( date_string [, prefer_euro_format] )
-//
-// This function takes a date string and tries to match it to a
-// number of possible date formats to get the value. It will try to
-// match against the following international formats, in this order:
-// y-M-d MMM d, y MMM d,y y-MMM-d d-MMM-y MMM d
-// M/d/y M-d-y M.d.y MMM-d M/d M-d
-// d/M/y d-M-y d.M.y d-MMM d/M d-M
-// A second argument may be passed to instruct the method to search
-// for formats like d/M/y (european format) before M/d/y (American).
-// Returns a Date object or null if no patterns match.
-// ------------------------------------------------------------------
-function parseDate(val) {
- var preferEuro=(arguments.length==2)?arguments[1]:false;
- generalFormats=new Array('y-M-d','MMM d, y','MMM d,y','y-MMM-d','d-MMM-y','MMM d');
- monthFirst=new Array('M/d/y','M-d-y','M.d.y','MMM-d','M/d','M-d');
- dateFirst =new Array('d/M/y','d-M-y','d.M.y','d-MMM','d/M','d-M');
- var checkList=new Array('generalFormats',preferEuro?'dateFirst':'monthFirst',preferEuro?'monthFirst':'dateFirst');
- var d=null;
- for (var i=0; i<checkList.length; i++) {
- var l=window[checkList[i]];
- for (var j=0; j<l.length; j++) {
- d=getDateFromFormat(val,l[j]);
- if (d!=0) { return new Date(d); }
- }
- }
- return null;
- }
-
-/* SOURCE FILE: PopupWindow.js */
-
-/*
-PopupWindow.js
-Author: Matt Kruse
-Last modified: 02/16/04
-
-DESCRIPTION: This object allows you to easily and quickly popup a window
-in a certain place. The window can either be a DIV or a separate browser
-window.
-
-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the
-Macintosh platform. Due to bugs in Netscape 4.x, populating the popup
-window with <STYLE> tags may cause errors.
-
-USAGE:
-// Create an object for a WINDOW popup
-var win = new PopupWindow();
-
-// Create an object for a DIV window using the DIV named 'mydiv'
-var win = new PopupWindow('mydiv');
-
-// Set the window to automatically hide itself when the user clicks
-// anywhere else on the page except the popup
-win.autoHide();
-
-// Show the window relative to the anchor name passed in
-win.showPopup(anchorname);
-
-// Hide the popup
-win.hidePopup();
-
-// Set the size of the popup window (only applies to WINDOW popups
-win.setSize(width,height);
-
-// Populate the contents of the popup window that will be shown. If you
-// change the contents while it is displayed, you will need to refresh()
-win.populate(string);
-
-// set the URL of the window, rather than populating its contents
-// manually
-win.setUrl("http://www.site.com/");
-
-// Refresh the contents of the popup
-win.refresh();
-
-// Specify how many pixels to the right of the anchor the popup will appear
-win.offsetX = 50;
-
-// Specify how many pixels below the anchor the popup will appear
-win.offsetY = 100;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the
- same. For example:
- <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the
- anchor tag correctly. Do not do <A></A> with no space.
-
-4) When a PopupWindow object is created, a handler for 'onmouseup' is
- attached to any event handler you may have already defined. Do NOT define
- an event handler for 'onmouseup' after you define a PopupWindow object or
- the autoHide() will not work correctly.
-*/
-function getPos(e)
-{
- var posx = 0;
- var posy = 0;
- var coordinates = new Object();
- if (!e) var e = window.event;
- if (e.pageX || e.pageY)
- {
- posx = e.pageX;
- posy = e.pageY;
- }
- else if (e.clientX || e.clientY)
- {
-
- posx = e.clientX + document.body.scrollLeft
- + document.documentElement.scrollLeft;
- posy = e.clientY + document.body.scrollTop
- + document.documentElement.scrollTop;
- }
-
- //alert("posx: " + posx + " posy: " + posy);
- coordinates.x = posx;
- coordinates.y = posy;
- return coordinates;
-}
-// Set the position of the popup window based on the anchor
-function PopupWindow_getXYPosition(anchorname) {
- var coordintes
- if (this.type == "WINDOW") {
- coordinates = getAnchorWindowPosition(anchorname);
- coordinates = getPos(anchorname); // Replaced using getPost(event)
- }
- else {
- //alert("envent: " + anchorname);
- //coordinates = getAnchorPosition(anchorname);
- coordinates = getPos(anchorname); // Replaced using getPost(event)
- }
-
- this.x = coordinates.x;
- this.y = coordinates.y;
- //alert("PopupWindow_getXYPosition x: " + this.x + " y: " + this.y);
- }
-// Set width/height of DIV/popup window
-function PopupWindow_setSize(width,height) {
- this.width = width;
- this.height = height;
- }
-// Fill the window with contents
-function PopupWindow_populate(contents) {
- this.contents = contents;
- this.populated = false;
- }
-// Set the URL to go to
-function PopupWindow_setUrl(url) {
- this.url = url;
- }
-// Set the window popup properties
-function PopupWindow_setWindowProperties(props) {
- this.windowProperties = props;
- }
-// Refresh the displayed contents of the popup
-function PopupWindow_refresh() {
- if (this.divName != null) {
- // refresh the DIV object
- if (this.use_gebi) {
- document.getElementById(this.divName).innerHTML = this.contents;
- }
- else if (this.use_css) {
- document.all[this.divName].innerHTML = this.contents;
- }
- else if (this.use_layers) {
- var d = document.layers[this.divName];
- d.document.open();
- d.document.writeln(this.contents);
- d.document.close();
- }
- }
- else {
- if (this.popupWindow != null && !this.popupWindow.closed) {
- if (this.url!="") {
- this.popupWindow.location.href=this.url;
- }
- else {
- this.popupWindow.document.open();
- this.popupWindow.document.writeln(this.contents);
- this.popupWindow.document.close();
- }
- this.popupWindow.focus();
- }
- }
- }
-
-var offsetLeft = 0;
-var offsetTop = 0;
-function parenName(ref)
- {
- ok=0; // it's just to start the loop, we don't use it to get out.
- while (!ok)
- {
- ref = ref.parentNode;
- if (ref.nodeType==1) //check that the node is a tag, not text (type=3)
- {
- if (String(ref.nodeName)=="DIV")
- {
- offsetLeft = ref.offsetLeft;
- offsetTop = ref.offsetTop;
-
- return ;
- }
- if (String(ref.nodeName)=="BODY")
- {
- return ;
- }
- }
- }
- }
-
-// Position and show the popup, relative to an anchor object
-function PopupWindow_showPopup(anchorname) {
- this.getXYPosition(anchorname);
- this.x += this.offsetX - 125;
- this.y += this.offsetY;
- if (!this.populated && (this.contents != "")) {
- this.populated = true;
- this.refresh();
- }
- if (this.divName != null) {
- // Show the DIV object
- var oDiv = document.getElementById(this.divName);
- parenName(oDiv);
- if (this.use_gebi) {
- document.getElementById(this.divName).style.left = this.x - offsetLeft + "px";
- document.getElementById(this.divName).style.top = this.y - offsetTop + "px";
- document.getElementById(this.divName).style.visibility = "visible";
- }
- else if (this.use_css) {
- document.all[this.divName].style.left = this.x;
- document.all[this.divName].style.top = this.y;
- document.all[this.divName].style.visibility = "visible";
- }
- else if (this.use_layers) {
- document.layers[this.divName].left = this.x;
- document.layers[this.divName].top = this.y;
- document.layers[this.divName].visibility = "visible";
- }
- }
- else {
- if (this.popupWindow == null || this.popupWindow.closed) {
- // If the popup window will go off-screen, move it so it doesn't
- if (this.x<0) { this.x=0; }
- if (this.y<0) { this.y=0; }
- if (screen && screen.availHeight) {
- if ((this.y + this.height) > screen.availHeight) {
- this.y = screen.availHeight - this.height;
- }
- }
- if (screen && screen.availWidth) {
- if ((this.x + this.width) > screen.availWidth) {
- this.x = screen.availWidth - this.width;
- }
- }
- var avoidAboutBlank = window.opera || ( document.layers && !navigator.mimeTypes['*'] ) || navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled );
- this.popupWindow = window.open(avoidAboutBlank?"":"about:blank","window_"+anchorname,this.windowProperties+",width="+this.width+",height="+this.height+",screenX="+this.x+",left="+this.x+",screenY="+this.y+",top="+this.y+"");
- }
- this.refresh();
- }
-
- //added for IE6 issue
- ///////////////////////
- showFrame(this.divName, this.frameName);
- /*var oIfr = document.getElementById(this.frameName);
- var oCal = document.getElementById(this.divName);
- oIfr.style.display='block';
- oIfr.style.top=oCal.style.top;
- oIfr.style.left=oCal.style.left;*/
-
-
- }
-// Hide the popup
-function PopupWindow_hidePopup() {
- if (this.divName != null) {
- if (this.use_gebi) {
-
- document.getElementById(this.divName).style.visibility = "hidden";
- }
- else if (this.use_css) {
- document.all[this.divName].style.visibility = "hidden";
- }
- else if (this.use_layers) {
- document.layers[this.divName].visibility = "hidden";
- }
- }
- else {
- if (this.popupWindow && !this.popupWindow.closed) {
- this.popupWindow.close();
- this.popupWindow = null;
- }
- }
-
-
- //added for IE6 issue
- //////////////
- hideFrame(this.divName, this.frameName);
- /*var oIfr = document.getElementById(this.frameName);
- oIfr.style.display='none'; */
- }
-// Pass an event and return whether or not it was the popup DIV that was clicked
-function PopupWindow_isClicked(e) {
- if (this.divName != null) {
- if (this.use_layers) {
- var clickX = e.pageX;
- var clickY = e.pageY;
- var t = document.layers[this.divName];
- if ((clickX > t.left) && (clickX < t.left+t.clip.width) && (clickY > t.top) && (clickY < t.top+t.clip.height)) {
- window.calendarAction='Y';
- return true;
- }
- else { return false; }
- }
- else if (document.all) { // Need to hard-code this to trap IE for error-handling
- var t = window.event.srcElement;
- while (t.parentElement != null) {
- if (t.id==this.divName) {
- window.calendarAction='Y';
- return true;
- }
- t = t.parentElement;
- }
- return false;
- }
- else if (this.use_gebi && e) {
- var t = e.originalTarget;
- //console.log(t);
- while (t && t.parentNode != null) {
- if (t.id==this.divName) {
- window.calendarAction='Y';
- return true;
- }
- t = t.parentNode;
- }
- return false;
- }
- return false;
- }
- return false;
- }
-
-// Check an onMouseDown event to see if we should hide
-function PopupWindow_hideIfNotClicked(e) {
- if (this.autoHideEnabled && !this.isClicked(e)) {
-
- this.hidePopup();
- }
- }
-// Call this to make the DIV disable automatically when mouse is clicked outside it
-function PopupWindow_autoHide() {
- this.autoHideEnabled = true;
- }
-// This global function checks all PopupWindow objects onmouseup to see if they should be hidden
-function PopupWindow_hidePopupWindows(e) {
- for (var i=0; i<popupWindowObjects.length; i++) {
- if (popupWindowObjects[i] != null) {
- var p = popupWindowObjects[i];
- p.hideIfNotClicked(e);
- }
- }
- }
-// Run this immediately to attach the event listener
-function PopupWindow_attachListener() {
- if (document.layers) {
- document.captureEvents(Event.MOUSEUP);
- }
- window.popupWindowOldEventListener = document.onmouseup;
- if (window.popupWindowOldEventListener != null) {
- document.onmouseup = new Function("window.popupWindowOldEventListener(); PopupWindow_hidePopupWindows();");
- }
- else {
- document.onmouseup = PopupWindow_hidePopupWindows;
- }
- }
-
-// Reset the calendar DIV realted to another DIV
-function PopupWindow_resetPosition(relatedDiv) {
- //var calendarDiv = document.getElementById("calendarDiv");
- var calendarDiv = document.getElementById(this.divName);
- var popupDiv = document.getElementById(relatedDiv);
- var left = calendarDiv.offsetLeft - popupDiv.offsetLeft;
- var top = calendarDiv.offsetTop - popupDiv.offsetTop;
- //alert("left: " + left + " top: " + top);
-
- calendarDiv.style.left = left + "px";
- calendarDiv.style.top = top + "px";
-
- var calendarDivFrame = document.getElementById(this.divName + "frame");
- var popupDivFrame = document.getElementById(relatedDiv + "frame");
- var leftFrame = calendarDivFrame.offsetLeft - popupDivFrame.offsetLeft;
- var topFrame = calendarDivFrame.offsetTop - popupDivFrame.offsetTop;
- //alert("left: " + left + " top: " + top);
-
- calendarDivFrame.style.left = leftFrame + "px";
- calendarDivFrame.style.top = leftFrame + "px";
-}
-
-// CONSTRUCTOR for the PopupWindow object
-// Pass it a DIV name to use a DHTML popup, otherwise will default to window popup
-function PopupWindow() {
- if (!window.popupWindowIndex) { window.popupWindowIndex = 0; }
- if (!window.popupWindowObjects) { window.popupWindowObjects = new Array(); }
- if (!window.listenerAttached) {
- window.listenerAttached = true;
- PopupWindow_attachListener();
- }
-
- this.index = popupWindowIndex++;
- popupWindowObjects[this.index] = this;
- this.divName = null;
- //added for IE6 issue
- this.frameName = null
- this.popupWindow = null;
- this.width=0;
- this.height=0;
- this.populated = false;
- this.visible = false;
- this.autoHideEnabled = false;
-
- this.contents = "";
- this.url="";
- this.windowProperties="toolbar=no,location=no,status=no,menubar=no,scrollbars=auto,resizable,alwaysRaised,dependent,titlebar=no";
- if (arguments.length>0) {
- this.type="DIV";
- this.divName = arguments[0];
- //added for IE6 issue
-
- if (arguments.length>1)
- this.frameName = arguments[1];
- }
- else {
- this.type="WINDOW";
- }
- this.use_gebi = false;
- this.use_css = false;
- this.use_layers = false;
- if (document.getElementById) { this.use_gebi = true; }
- else if (document.all) { this.use_css = true; }
- else if (document.layers) { this.use_layers = true; }
- else { this.type = "WINDOW"; }
- this.offsetX = 0;
- this.offsetY = 0;
- // Method mappings
- this.getXYPosition = PopupWindow_getXYPosition;
- this.populate = PopupWindow_populate;
- this.setUrl = PopupWindow_setUrl;
- this.setWindowProperties = PopupWindow_setWindowProperties;
- this.refresh = PopupWindow_refresh;
- this.showPopup = PopupWindow_showPopup;
- this.hidePopup = PopupWindow_hidePopup;
- this.setSize = PopupWindow_setSize;
- this.isClicked = PopupWindow_isClicked;
- this.autoHide = PopupWindow_autoHide;
- this.hideIfNotClicked = PopupWindow_hideIfNotClicked;
-
- // Added to reset the Calendar DIV when it related with another DIV
- this.resetPosition = PopupWindow_resetPosition;
- }
-
-/* SOURCE FILE: CalendarPopup.js */
-
-// HISTORY
-// ------------------------------------------------------------------
-// Feb 7, 2005: Fixed a CSS styles to use px unit
-// March 29, 2004: Added check in select() method for the form field
-// being disabled. If it is, just return and don't do anything.
-// March 24, 2004: Fixed bug - when month name and abbreviations were
-// changed, date format still used original values.
-// January 26, 2004: Added support for drop-down month and year
-// navigation (Thanks to Chris Reid for the idea)
-// September 22, 2003: Fixed a minor problem in YEAR calendar with
-// CSS prefix.
-// August 19, 2003: Renamed the function to get styles, and made it
-// work correctly without an object reference
-// August 18, 2003: Changed showYearNavigation and
-// showYearNavigationInput to optionally take an argument of
-// true or false
-// July 31, 2003: Added text input option for year navigation.
-// Added a per-calendar CSS prefix option to optionally use
-// different styles for different calendars.
-// July 29, 2003: Fixed bug causing the Today link to be clickable
-// even though today falls in a disabled date range.
-// Changed formatting to use pure CSS, allowing greater control
-// over look-and-feel options.
-// June 11, 2003: Fixed bug causing the Today link to be unselectable
-// under certain cases when some days of week are disabled
-// March 14, 2003: Added ability to disable individual dates or date
-// ranges, display as light gray and strike-through
-// March 14, 2003: Removed dependency on graypixel.gif and instead
-/// use table border coloring
-// March 12, 2003: Modified showCalendar() function to allow optional
-// start-date parameter
-// March 11, 2003: Modified select() function to allow optional
-// start-date parameter
-/*
-DESCRIPTION: This object implements a popup calendar to allow the user to
-select a date, month, quarter, or year.
-
-COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the
-Macintosh platform.
-The calendar can be modified to work for any location in the world by
-changing which weekday is displayed as the first column, changing the month
-names, and changing the column headers for each day.
-
-USAGE:
-// Create a new CalendarPopup object of type WINDOW
-var cal = new CalendarPopup();
-
-// Create a new CalendarPopup object of type DIV using the DIV named 'mydiv'
-var cal = new CalendarPopup('mydiv');
-
-// Easy method to link the popup calendar with an input box.
-cal.select(inputObject, anchorname, dateFormat);
-// Same method, but passing a default date other than the field's current value
-cal.select(inputObject, anchorname, dateFormat, '01/02/2000');
-// This is an example call to the popup calendar from a link to populate an
-// input box. Note that to use this, date.js must also be included!!
-<A HREF="#" onClick="cal.select(document.forms[0].date,'anchorname','MM/dd/yyyy'); return false;">Select</A>
-
-// Set the type of date select to be used. By default it is 'date'.
-cal.setDisplayType(type);
-
-// When a date, month, quarter, or year is clicked, a function is called and
-// passed the details. You must write this function, and tell the calendar
-// popup what the function name is.
-// Function to be called for 'date' select receives y, m, d
-cal.setReturnFunction(functionname);
-// Function to be called for 'month' select receives y, m
-cal.setReturnMonthFunction(functionname);
-// Function to be called for 'quarter' select receives y, q
-cal.setReturnQuarterFunction(functionname);
-// Function to be called for 'year' select receives y
-cal.setReturnYearFunction(functionname);
-
-// Show the calendar relative to a given anchor
-cal.showCalendar(anchorname);
-
-// Hide the calendar. The calendar is set to autoHide automatically
-cal.hideCalendar();
-
-// Set the month names to be used. Default are English month names
-cal.setMonthNames("January","February","March",...);
-
-// Set the month abbreviations to be used. Default are English month abbreviations
-cal.setMonthAbbreviations("Jan","Feb","Mar",...);
-
-// Show navigation for changing by the year, not just one month at a time
-cal.showYearNavigation();
-
-// Show month and year dropdowns, for quicker selection of month of dates
-cal.showNavigationDropdowns();
-
-// Set the text to be used above each day column. The days start with
-// sunday regardless of the value of WeekStartDay
-cal.setDayHeaders("S","M","T",...);
-
-// Set the day for the first column in the calendar grid. By default this
-// is Sunday (0) but it may be changed to fit the conventions of other
-// countries.
-cal.setWeekStartDay(1); // week is Monday - Sunday
-
-// Set the weekdays which should be disabled in the 'date' select popup. You can
-// then allow someone to only select week end dates, or Tuedays, for example
-cal.setDisabledWeekDays(0,1); // To disable selecting the 1st or 2nd days of the week
-
-// Selectively disable individual days or date ranges. Disabled days will not
-// be clickable, and show as strike-through text on current browsers.
-// Date format is any format recognized by parseDate() in date.js
-// Pass a single date to disable:
-cal.addDisabledDates("2003-01-01");
-// Pass null as the first parameter to mean "anything up to and including" the
-// passed date:
-cal.addDisabledDates(null, "01/02/03");
-// Pass null as the second parameter to mean "including the passed date and
-// anything after it:
-cal.addDisabledDates("Jan 01, 2003", null);
-// Pass two dates to disable all dates inbetween and including the two
-cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");
-
-// When the 'year' select is displayed, set the number of years back from the
-// current year to start listing years. Default is 2.
-// This is also used for year drop-down, to decide how many years +/- to display
-cal.setYearSelectStartOffset(2);
-
-// Text for the word "Today" appearing on the calendar
-cal.setTodayText("Today");
-
-// The calendar uses CSS classes for formatting. If you want your calendar to
-// have unique styles, you can set the prefix that will be added to all the
-// classes in the output.
-// For example, normal output may have this:
-// <SPAN CLASS="cpTodayTextDisabled">Today<SPAN>
-// But if you set the prefix like this:
-cal.setCssPrefix("Test");
-// The output will then look like:
-// <SPAN CLASS="TestcpTodayTextDisabled">Today<SPAN>
-// And you can define that style somewhere in your page.
-
-// When using Year navigation, you can make the year be an input box, so
-// the user can manually change it and jump to any year
-cal.showYearNavigationInput();
-
-// Set the calendar offset to be different than the default. By default it
-// will appear just below and to the right of the anchorname. So if you have
-// a text box where the date will go and and anchor immediately after the
-// text box, the calendar will display immediately under the text box.
-cal.offsetX = 20;
-cal.offsetY = 20;
-
-NOTES:
-1) Requires the functions in AnchorPosition.js and PopupWindow.js
-
-2) Your anchor tag MUST contain both NAME and ID attributes which are the
- same. For example:
- <A NAME="test" ID="test"> </A>
-
-3) There must be at least a space between <A> </A> for IE5.5 to see the
- anchor tag correctly. Do not do <A></A> with no space.
-
-4) When a CalendarPopup object is created, a handler for 'onmouseup' is
- attached to any event handler you may have already defined. Do NOT define
- an event handler for 'onmouseup' after you define a CalendarPopup object
- or the autoHide() will not work correctly.
-
-5) The calendar popup display uses style sheets to make it look nice.
-
-*/
-
-// CONSTRUCTOR for the CalendarPopup Object
-function CalendarPopup() {
- var c;
- //added for IE6 issue
- if (arguments.length>1) {
- c = new PopupWindow(arguments[0], arguments[1]);
- }
- else if (arguments.length>0) {
- c = new PopupWindow(arguments[0]);
- }
- else {
- c = new PopupWindow();
- c.setSize(150,175);
- }
- c.offsetX = 20;
- c.offsetY = 0;
- c.autoHide();
- // Calendar-specific properties
- c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
- c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
- c.dayHeaders = new Array("S","M","T","W","T","F","S");
- c.returnFunction = "CP_tmpReturnFunction";
- c.returnMonthFunction = "CP_tmpReturnMonthFunction";
- c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";
- c.returnYearFunction = "CP_tmpReturnYearFunction";
- c.weekStartDay = 0;
- c.isShowYearNavigation = false;
- c.displayType = "date";
- c.disabledWeekDays = new Object();
- c.disabledDatesExpression = "";
- c.yearSelectStartOffset = 2;
- c.currentDate = null;
- c.todayText="Today";
- c.cssPrefix="";
- c.isShowNavigationDropdowns=false;
- c.isShowYearNavigationInput=false;
- window.CP_calendarObject = null;
- window.CP_targetInput = null;
- window.CP_dateFormat = "MM/dd/yyyy";
- // Method mappings
- c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;
- c.setReturnFunction = CP_setReturnFunction;
- c.setReturnMonthFunction = CP_setReturnMonthFunction;
- c.setReturnQuarterFunction = CP_setReturnQuarterFunction;
- c.setReturnYearFunction = CP_setReturnYearFunction;
- c.setMonthNames = CP_setMonthNames;
- c.setMonthAbbreviations = CP_setMonthAbbreviations;
- c.setDayHeaders = CP_setDayHeaders;
- c.setWeekStartDay = CP_setWeekStartDay;
- c.setDisplayType = CP_setDisplayType;
- c.setDisabledWeekDays = CP_setDisabledWeekDays;
- c.addDisabledDates = CP_addDisabledDates;
- c.setYearSelectStartOffset = CP_setYearSelectStartOffset;
- c.setTodayText = CP_setTodayText;
- c.showYearNavigation = CP_showYearNavigation;
- c.showCalendar = CP_showCalendar;
- c.hideCalendar = CP_hideCalendar;
- c.getStyles = getCalendarStyles;
- c.refreshCalendar = CP_refreshCalendar;
- c.getCalendar = CP_getCalendar;
- c.select = CP_select;
- c.setCssPrefix = CP_setCssPrefix;
- c.showNavigationDropdowns = CP_showNavigationDropdowns;
- c.showYearNavigationInput = CP_showYearNavigationInput;
- c.copyMonthNamesToWindow();
- // Return the object
- return c;
- }
-function CP_copyMonthNamesToWindow() {
- // Copy these values over to the date.js
- if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {
- window.MONTH_NAMES = new Array();
- for (var i=0; i<this.monthNames.length; i++) {
- window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthNames[i];
- }
- for (var i=0; i<this.monthAbbreviations.length; i++) {
- window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthAbbreviations[i];
- }
- }
-}
-// Temporary default functions to be called when items clicked, so no error is thrown
-function CP_tmpReturnFunction(y,m,d) {
- if (window.CP_targetInput!=null) {
- var dt = new Date(y,m-1,d,0,0,0);
- if (window.CP_calendarObject!=null) { window.CP_calendarObject.copyMonthNamesToWindow(); }
- window.CP_targetInput.value = formatDate(dt,window.CP_dateFormat);
- /////////
- if (window.CP_targetInput.onchange){
- window.CP_targetInput.onchange();
- }
- }
- else {
- alert('Use setReturnFunction() to define which function will get the clicked results!');
- }
- }
-function CP_tmpReturnMonthFunction(y,m) {
- alert('Use setReturnMonthFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , month='+m);
- }
-function CP_tmpReturnQuarterFunction(y,q) {
- alert('Use setReturnQuarterFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , quarter='+q);
- }
-function CP_tmpReturnYearFunction(y) {
- alert('Use setReturnYearFunction() to define which function will get the clicked results!\nYou clicked: year='+y);
- }
-
-// Set the name of the functions to call to get the clicked item
-function CP_setReturnFunction(name) { this.returnFunction = name; }
-function CP_setReturnMonthFunction(name) { this.returnMonthFunction = name; }
-function CP_setReturnQuarterFunction(name) { this.returnQuarterFunction = name; }
-function CP_setReturnYearFunction(name) { this.returnYearFunction = name; }
-
-// Over-ride the built-in month names
-function CP_setMonthNames() {
- for (var i=0; i<arguments.length; i++) { this.monthNames[i] = arguments[i]; }
- this.copyMonthNamesToWindow();
- }
-
-// Over-ride the built-in month abbreviations
-function CP_setMonthAbbreviations() {
- for (var i=0; i<arguments.length; i++) { this.monthAbbreviations[i] = arguments[i]; }
- this.copyMonthNamesToWindow();
- }
-
-// Over-ride the built-in column headers for each day
-function CP_setDayHeaders() {
- for (var i=0; i<arguments.length; i++) { this.dayHeaders[i] = arguments[i]; }
- }
-
-// Set the day of the week (0-7) that the calendar display starts on
-// This is for countries other than the US whose calendar displays start on Monday(1), for example
-function CP_setWeekStartDay(day) { this.weekStartDay = day; }
-
-// Show next/last year navigation links
-function CP_showYearNavigation() { this.isShowYearNavigation = (arguments.length>0)?arguments[0]:true; }
-
-// Which type of calendar to display
-function CP_setDisplayType(type) {
- if (type!="date"&&type!="week-end"&&type!="month"&&type!="quarter"&&type!="year") { alert("Invalid display type! Must be one of: date,week-end,month,quarter,year"); return false; }
- this.displayType=type;
- }
-
-// How many years back to start by default for year display
-function CP_setYearSelectStartOffset(num) { this.yearSelectStartOffset=num; }
-
-// Set which weekdays should not be clickable
-function CP_setDisabledWeekDays() {
- this.disabledWeekDays = new Object();
- for (var i=0; i<arguments.length; i++) { this.disabledWeekDays[arguments[i]] = true; }
- }
-
-// Disable individual dates or ranges
-// Builds an internal logical test which is run via eval() for efficiency
-function CP_addDisabledDates(start, end) {
- if (arguments.length==1) { end=start; }
- if (start==null && end==null) { return; }
- if (this.disabledDatesExpression!="") { this.disabledDatesExpression+= "||"; }
- if (start!=null) { start = parseDate(start); start=""+start.getFullYear()+LZ(start.getMonth()+1)+LZ(start.getDate());}
- if (end!=null) { end=parseDate(end); end=""+end.getFullYear()+LZ(end.getMonth()+1)+LZ(end.getDate());}
- if (start==null) { this.disabledDatesExpression+="(ds<="+end+")"; }
- else if (end ==null) { this.disabledDatesExpression+="(ds>="+start+")"; }
- else { this.disabledDatesExpression+="(ds>="+start+"&&ds<="+end+")"; }
- }
-
-// Set the text to use for the "Today" link
-function CP_setTodayText(text) {
- this.todayText = text;
- }
-
-// Set the prefix to be added to all CSS classes when writing output
-function CP_setCssPrefix(val) {
- this.cssPrefix = val;
- }
-
-// Show the navigation as an dropdowns that can be manually changed
-function CP_showNavigationDropdowns() { this.isShowNavigationDropdowns = (arguments.length>0)?arguments[0]:true; }
-
-// Show the year navigation as an input box that can be manually changed
-function CP_showYearNavigationInput() { this.isShowYearNavigationInput = (arguments.length>0)?arguments[0]:true; }
-
-// Hide a calendar object
-function CP_hideCalendar() {
- if (arguments.length > 0) { window.popupWindowObjects[arguments[0]].hidePopup(); }
- else { this.hidePopup(); }
- }
-
-
-// Refresh the contents of the calendar display
-function CP_refreshCalendar(index) {
- var calObject = window.popupWindowObjects[index];
- if (arguments.length>1) {
- calObject.populate(calObject.getCalendar(arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]));
- }
- else {
- calObject.populate(calObject.getCalendar());
- }
- calObject.refresh();
- }
-
-// Populate the calendar and display it
-function CP_showCalendar(anchorname) {
-
- if (arguments.length>1) {
- if (arguments[1]==null||arguments[1]=="") {
- //var dd = parseDate();
- this.currentDate=new Date();
- //this.currentDate = dd;
-
- }
- else {
- this.currentDate=new Date(parseDate(arguments[1]));
- }
- }
- this.populate(this.getCalendar());
- this.showPopup(anchorname);
- }
-
-// Simple method to interface popup calendar with a text-entry box
-function CP_select(inputobj, linkname, format) {
- var selectedDate=(arguments.length>3)?arguments[3]:null;
- if (!window.getDateFromFormat) {
- alert("calendar.select: To use this method you must also include 'date.js' for date formatting");
- return;
- }
- if (this.displayType!="date"&&this.displayType!="week-end") {
- alert("calendar.select: This function can only be used with displayType 'date' or 'week-end'");
- return;
- }
- if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
- alert("calendar.select: Input object passed is not a valid form input object");
- window.CP_targetInput=null;
- return;
- }
- if (inputobj.disabled) { return; } // Can't use calendar input on disabled form input!
- window.CP_targetInput = inputobj;
- window.CP_calendarObject = this;
- this.currentDate=null;
- var time=0;
- if (selectedDate!=null) {
- time = getDateFromFormat(selectedDate,format)
- }
- else if (inputobj.value!="") {
- time = getDateFromFormat(inputobj.value,format);
- }
- if (selectedDate!=null || inputobj.value!="") {
- if (time==0) { this.currentDate=null; }
- else { this.currentDate=new Date(time); }
- }
- window.CP_dateFormat = format;
- this.showCalendar(linkname);
- }
-
-// Get style block needed to display the calendar correctly
-function getCalendarStyles() {
- var result = "";
- var p = "";
- if (this!=null && typeof(this.cssPrefix)!="undefined" && this.cssPrefix!=null && this.cssPrefix!="") { p=this.cssPrefix; }
- result += "<STYLE>\n";
- result += "."+p+"cpYearNavigation,."+p+"cpMonthNavigation { background-color:#C0C0C0; text-align:center; vertical-align:center; text-decoration:none; color:#000000; font-weight:bold; }\n";
- result += "."+p+"cpDayColumnHeader, ."+p+"cpYearNavigation,."+p+"cpMonthNavigation,."+p+"cpCurrentMonthDate,."+p+"cpCurrentMonthDateDisabled,."+p+"cpOtherMonthDate,."+p+"cpOtherMonthDateDisabled,."+p+"cpCurrentDate,."+p+"cpCurrentDateDisabled,."+p+"cpTodayText,."+p+"cpTodayTextDisabled,."+p+"cpText { font-family:arial; font-size:8pt; }\n";
- result += "TD."+p+"cpDayColumnHeader { text-align:right; border:solid thin #C0C0C0;border-width:0px 0px 1px 0px; }\n";
- result += "."+p+"cpCurrentMonthDate, ."+p+"cpOtherMonthDate, ."+p+"cpCurrentDate { text-align:right; text-decoration:none; }\n";
- result += "."+p+"cpCurrentMonthDateDisabled, ."+p+"cpOtherMonthDateDisabled, ."+p+"cpCurrentDateDisabled { color:#D0D0D0; text-align:right; text-decoration:line-through; }\n";
- result += "."+p+"cpCurrentMonthDate, .cpCurrentDate { color:#000000; }\n";
- result += "."+p+"cpOtherMonthDate { color:#808080; }\n";
- result += "TD."+p+"cpCurrentDate { color:white; background-color: #C0C0C0; border-width:1px; border:solid thin #800000; }\n";
- result += "TD."+p+"cpCurrentDateDisabled { border-width:1px; border:solid thin #FFAAAA; }\n";
- result += "TD."+p+"cpTodayText, TD."+p+"cpTodayTextDisabled { border:solid thin #C0C0C0; border-width:1px 0px 0px 0px;}\n";
- result += "A."+p+"cpTodayText, SPAN."+p+"cpTodayTextDisabled { height:20px; }\n";
- result += "A."+p+"cpTodayText { color:black; }\n";
- result += "."+p+"cpTodayTextDisabled { color:#D0D0D0; }\n";
- result += "."+p+"cpBorder { border:solid thin #808080; }\n";
- result += "</STYLE>\n";
- return result;
- }
-
-// Return a string containing all the calendar code to be displayed
-function CP_getCalendar() {
- var now = new Date();
- if (typeof oracleDateString == 'function'){
- now = parseDate(oracleDateString());
- }else if (typeof parent.oracleDateString == 'function'){
- now = parseDate(parent.oracleDateString());
- }
- // Reference to window
- if (this.type == "WINDOW") { var windowref = "window.opener."; }
- else { var windowref = ""; }
- var result = "";
- // If POPUP, write entire HTML document
- if (this.type == "WINDOW") {
- result += "<HTML><HEAD><TITLE>Calendar</TITLE>"+this.getStyles()+"</HEAD><BODY MARGINWIDTH=0 MARGINHEIGHT=0 TOPMARGIN=0 RIGHTMARGIN=0 LEFTMARGIN=0>\n";
- result += '<CENTER><TABLE WIDTH=100% BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>\n';
- }
- else {
- result += '<TABLE CLASS="'+this.cssPrefix+'cpBorder" WIDTH=144 BORDER=1 BORDERWIDTH=1 CELLSPACING=0 CELLPADDING=1>\n';
- result += '<TR><TD ALIGN=CENTER>\n';
- result += '<CENTER>\n';
- }
- // Code for DATE display (default)
- // -------------------------------
- if (this.displayType=="date" || this.displayType=="week-end") {
- if (this.currentDate==null) { this.currentDate = now; }
- if (arguments.length > 0) { var month = arguments[0]; }
- else { var month = this.currentDate.getMonth()+1; }
- if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }
- else { var year = this.currentDate.getFullYear(); }
- var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);
- if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {
- daysinmonth[2] = 29;
- }
- var current_month = new Date(year,month-1,1);
- var display_year = year;
- var display_month = month;
- var display_date = 1;
- var weekday= current_month.getDay();
- var offset = 0;
-
- offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;
- if (offset > 0) {
- display_month--;
- if (display_month < 1) { display_month = 12; display_year--; }
- display_date = daysinmonth[display_month]-offset+1;
- }
- var next_month = month+1;
- var next_month_year = year;
- if (next_month > 12) { next_month=1; next_month_year++; }
- var last_month = month-1;
- var last_month_year = year;
- if (last_month < 1) { last_month=12; last_month_year--; }
- var date_class;
- if (this.type!="WINDOW") {
- result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
- }
- result += '<TR>\n';
- var refresh = windowref+'CP_refreshCalendar';
- var refreshLink = 'javascript:' + refresh;
- if (this.isShowNavigationDropdowns) {
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';
- for( var monthCounter=1; monthCounter<=12; monthCounter++ ) {
- var selected = (monthCounter==month) ? 'SELECTED' : '';
- result += '<option value="'+monthCounter+'" '+selected+'>'+this.monthNames[monthCounter-1]+'</option>';
- }
- result += '</select></TD>';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
-
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';
- for( var yearCounter=year-this.yearSelectStartOffset; yearCounter<=year+this.yearSelectStartOffset; yearCounter++ ) {
- var selected = (yearCounter==year) ? 'SELECTED' : '';
- result += '<option value="'+yearCounter+'" '+selected+'>'+yearCounter+'</option>';
- }
- result += '</select></TD>';
- }
- else {
- if (this.isShowYearNavigation) {
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;</A></TD>';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="58"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+'</SPAN></TD>';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;</A></TD>';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
-
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year-1)+');">&lt;</A></TD>';
- if (this.isShowYearNavigationInput) {
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><INPUT NAME="cpYear" CLASS="'+this.cssPrefix+'cpYearNavigation" SIZE="4" MAXLENGTH="4" VALUE="'+year+'" onBlur="'+refresh+'('+this.index+','+month+',this.value-0);"></TD>';
- }
- else {
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><SPAN CLASS="'+this.cssPrefix+'cpYearNavigation">'+year+'</SPAN></TD>';
- }
- result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year+1)+');">&gt;</A></TD>';
- }
- else {
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;&lt;</A></TD>\n';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="100"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+' '+year+'</SPAN></TD>\n';
- result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;&gt;</A></TD>\n';
- }
- }
- result += '</TR></TABLE>\n';
- result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=0 CELLPADDING=1 ALIGN=CENTER>\n';
- result += '<TR>\n';
- for (var j=0; j<7; j++) {
-
- result += '<TD CLASS="'+this.cssPrefix+'cpDayColumnHeader" WIDTH="14%"><SPAN CLASS="'+this.cssPrefix+'cpDayColumnHeader">'+this.dayHeaders[(this.weekStartDay+j)%7]+'</TD>\n';
- }
- result += '</TR>\n';
- for (var row=1; row<=6; row++) {
- result += '<TR>\n';
- for (var col=1; col<=7; col++) {
- var disabled=false;
- if (this.disabledDatesExpression!="") {
- var ds=""+display_year+LZ(display_month)+LZ(display_date);
- eval("disabled=("+this.disabledDatesExpression+")");
- }
- var dateClass = "";
- if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {
- dateClass = "cpCurrentDate";
- }
- else if (display_month == month) {
- dateClass = "cpCurrentMonthDate";
- }
- else {
- dateClass = "cpOtherMonthDate";
- }
- if (disabled || this.disabledWeekDays[col-1]) {
- result += ' <TD CLASS="'+this.cssPrefix+dateClass+'"><SPAN CLASS="'+this.cssPrefix+dateClass+'Disabled">'+display_date+'</SPAN></TD>\n';
- }
- else {
- var selected_date = display_date;
- var selected_month = display_month;
- var selected_year = display_year;
- if (this.displayType=="week-end") {
- var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);
- d.setDate(d.getDate() + (7-col));
- selected_year = d.getYear();
- if (selected_year < 1000) { selected_year += 1900; }
- selected_month = d.getMonth()+1;
- selected_date = d.getDate();
- }
- result += ' <TD CLASS="'+this.cssPrefix+dateClass+'"><A HREF="javascript:'+windowref+this.returnFunction+'('+selected_year+','+selected_month+','+selected_date+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+this.cssPrefix+dateClass+'">'+display_date+'</A></TD>\n';
- }
- display_date++;
- if (display_date > daysinmonth[display_month]) {
- display_date=1;
- display_month++;
- }
- if (display_month > 12) {
- display_month=1;
- display_year++;
- }
- }
- result += '</TR>';
- }
- var current_weekday = now.getDay() - this.weekStartDay;
- if (current_weekday < 0) {
- current_weekday += 7;
- }
- result += '<TR>\n';
- result += ' <TD COLSPAN=7 ALIGN=CENTER CLASS="'+this.cssPrefix+'cpTodayText">\n';
- if (this.disabledDatesExpression!="") {
- var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());
- eval("disabled=("+this.disabledDatesExpression+")");
- }
- if (disabled || this.disabledWeekDays[current_weekday+1]) {
- result += ' <SPAN CLASS="'+this.cssPrefix+'cpTodayTextDisabled">'+this.todayText+'</SPAN>\n';
- }
- else {
- result += ' <A CLASS="'+this.cssPrefix+'cpTodayText" HREF="javascript:'+windowref+this.returnFunction+'(\''+now.getFullYear()+'\',\''+(now.getMonth()+1)+'\',\''+now.getDate()+'\');'+windowref+'CP_hideCalendar(\''+this.index+'\');">'+this.todayText+'</A>\n';
- }
- result += ' <BR>\n';
- result += ' </TD></TR></TABLE></CENTER></TD></TR></TABLE>\n';
- }
-
- // Code common for MONTH, QUARTER, YEAR
- // ------------------------------------
- if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {
- if (arguments.length > 0) { var year = arguments[0]; }
- else {
- if (this.displayType=="year") { var year = now.getFullYear()-this.yearSelectStartOffset; }
- else { var year = now.getFullYear(); }
- }
- if (this.displayType!="year" && this.isShowYearNavigation) {
- result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
- result += '<TR>\n';
- result += ' <TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-1)+');">&lt;&lt;</A></TD>\n';
- result += ' <TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="100">'+year+'</TD>\n';
- result += ' <TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+1)+');">&gt;&gt;</A></TD>\n';
- result += '</TR></TABLE>\n';
- }
- }
-
- // Code for MONTH display
- // ----------------------
- if (this.displayType=="month") {
- // If POPUP, write entire HTML document
- result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
- for (var i=0; i<4; i++) {
- result += '<TR>';
- for (var j=0; j<3; j++) {
- var monthindex = ((i*3)+j);
- result += '<TD WIDTH=33% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnMonthFunction+'('+year+','+(monthindex+1)+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+this.monthAbbreviations[monthindex]+'</A></TD>';
- }
- result += '</TR>';
- }
- result += '</TABLE></CENTER></TD></TR></TABLE>\n';
- }
-
- // Code for QUARTER display
- // ------------------------
- if (this.displayType=="quarter") {
- result += '<BR><TABLE WIDTH=120 BORDER=1 CELLSPACING=0 CELLPADDING=0 ALIGN=CENTER>\n';
- for (var i=0; i<2; i++) {
- result += '<TR>';
- for (var j=0; j<2; j++) {
- var quarter = ((i*2)+j+1);
- result += '<TD WIDTH=50% ALIGN=CENTER><BR><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnQuarterFunction+'('+year+','+quarter+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">Q'+quarter+'</A><BR><BR></TD>';
- }
- result += '</TR>';
- }
- result += '</TABLE></CENTER></TD></TR></TABLE>\n';
- }
-
- // Code for YEAR display
- // ---------------------
- if (this.displayType=="year") {
- var yearColumnSize = 4;
- result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
- result += '<TR>\n';
- result += ' <TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-(yearColumnSize*2))+');">&lt;&lt;</A></TD>\n';
- result += ' <TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+(yearColumnSize*2))+');">&gt;&gt;</A></TD>\n';
- result += '</TR></TABLE>\n';
- result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
- for (var i=0; i<yearColumnSize; i++) {
- for (var j=0; j<2; j++) {
- var currentyear = year+(j*yearColumnSize)+i;
- result += '<TD WIDTH=50% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnYearFunction+'('+currentyear+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+currentyear+'</A></TD>';
- }
- result += '</TR>';
- }
- result += '</TABLE></CENTER></TD></TR></TABLE>\n';
- }
- // Common
- if (this.type == "WINDOW") {
- result += "</BODY></HTML>\n";
- }
- return result;
- }
-
-//added for IE6 issue
-
-function showFrame(divName, frameName){
-
- // added to show Iframe behind calender
- var oIfr = document.getElementById(frameName);
- var oCal = document.getElementById(divName);
- if (oIfr != null){
- oIfr.style.display='block';
- oIfr.style.top=oCal.style.top;
- oIfr.style.left=oCal.style.left;
- }
-
-}
-function hideFrame(divName, frameName){
- var oIfr = document.getElementById(frameName);
- if (oIfr != null){
- oIfr.style.display='none';
- }
-}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
index 040c9d26..2face03a 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+
import org.openecomp.portalsdk.core.domain.Menu;
import org.openecomp.portalsdk.core.domain.MenuData;
import org.openecomp.portalsdk.core.domain.RoleFunction;
@@ -40,7 +42,7 @@ public interface FnMenuService {
List<Long> getParentId(String label);
@SuppressWarnings("rawtypes")
List<List> getParentList();
- List<RoleFunction> getFunctionCDList();
+ List<RoleFunction> getFunctionCDList(HttpServletRequest request);
void removeMenuItem(Menu domainFnMenu);
Map<String, List<MenuData>> setMenuDataStructure(List<List<MenuData>> childItemList, List<MenuData> parentList, Set<MenuData> menuResult) throws Exception;
}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
index ca73339d..9b16aabb 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
@@ -21,21 +21,20 @@ package org.openecomp.portalsdk.core.service;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
-import org.openecomp.portalsdk.core.domain.FnMenu;
+import javax.servlet.http.HttpServletRequest;
+
import org.openecomp.portalsdk.core.domain.Menu;
import org.openecomp.portalsdk.core.domain.MenuData;
-import org.openecomp.portalsdk.core.domain.Role;
import org.openecomp.portalsdk.core.domain.RoleFunction;
-import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -46,9 +45,14 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional
public class FnMenuServiceImpl implements FnMenuService{
+
+ private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnMenuServiceImpl.class);
@Autowired
private DataAccessService dataAccessService;
+ @Autowired
+ private RoleService roleService;
+
@SuppressWarnings("unchecked")
public List<MenuData> getFnMenuItems() {
//List msgDB = getDataAccessService().getList(Profile.class, null);
@@ -100,14 +104,11 @@ public class FnMenuServiceImpl implements FnMenuService{
@SuppressWarnings("unchecked")
@Override
- public List<RoleFunction> getFunctionCDList() {
- // TODO Auto-generated method stub
- //List<String> functioCDlist = new ArrayList<String>();
- //functioCDlist.add("Mahdy1");
- //functioCDlist.add("Mahdy2");
- return getDataAccessService().executeNamedQuery("functionCDlist", null, null);
-
- //return null;
+ public List<RoleFunction> getFunctionCDList(HttpServletRequest request) {
+ Set roleFunctionList = new HashSet<>();
+ roleFunctionList = UserUtils.getRoleFunctions(request);
+ List roleFunctionFinalList = new ArrayList<>(roleFunctionList);
+ return roleFunctionFinalList;
}
@Override
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java
index 1bfe2aba..270369c5 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java
@@ -139,8 +139,13 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS
HashSet<RoleFunction> rolefun = null;
String repsonse = restApiRequestBuilder.getViaREST("/user/" + bean.getUserid(), true, bean.getUserid());
+
user = mapper.readValue(repsonse, User.class);
+
+ Set<RoleFunction> roleFunctionListNew = new HashSet<>();
+ Set<RoleFunction> roleFunctionList = new HashSet<>();
+ SortedSet<UserApp> UserAppSet = new TreeSet<>();
@SuppressWarnings("unchecked")
Set<UserApp> setAppsObj = user.getUserApps();
@@ -153,8 +158,8 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS
rolefun = new HashSet<>();
Role role = nextApp.getRole();
- Set<RoleFunction> roleFunctionList = role.getRoleFunctions();
- Set<RoleFunction> roleFunctionListNew = new HashSet<>();
+ roleFunctionList = role.getRoleFunctions();
+
Iterator<RoleFunction> itetaror = roleFunctionList.iterator();
while (itetaror.hasNext()) {
Object nextValue = itetaror.next();
@@ -165,7 +170,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS
role.setRoleFunctions(roleFunctionListNew);
nextApp.setRole(role);
nextApp.getRole().getRoleFunctions();
- SortedSet<UserApp> UserAppSet = new TreeSet<>();
+
UserAppSet.add(nextApp);
user.setUserApps(UserAppSet);
}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RestApiRequestBuilder.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RestApiRequestBuilder.java
index f7a9cbec..94ecfaf4 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RestApiRequestBuilder.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/RestApiRequestBuilder.java
@@ -52,9 +52,9 @@ public class RestApiRequestBuilder {
decryptedPwd, isBasicAuth);
} catch (Exception ex) {
response = "Failed to perform GET " + ex.toString();
- throw new Exception(ex.getMessage());
+ throw new Exception("get Failed"+ ex);
}
- logger.debug(EELFLoggerDelegate.debugLogger, "getRoles response: {}", response);
+ logger.debug(EELFLoggerDelegate.errorLogger, "getRoles response: {}", response);
return response;
}
@@ -90,7 +90,8 @@ public class RestApiRequestBuilder {
RestWebServiceClient.getInstance().postPortalContent(restEndPoint, userId, appName, requestId, appUserName,
decryptedPwd, content_type, content, isBasicAuth);
} catch (Exception ex) {
- logger.error(EELFLoggerDelegate.debugLogger, "POST response: {}", ex);
+ logger.error(EELFLoggerDelegate.errorLogger, "POST response: {}", ex);
+
throw new Exception("Save Failed");
}
logger.debug(EELFLoggerDelegate.debugLogger, "POST response: {}");
@@ -129,7 +130,7 @@ public class RestApiRequestBuilder {
RestWebServiceClient.getInstance().deletePortalContent(restEndPoint, userId, appName, requestId, appUserName,
decryptedPwd, content_type, content, isBasicAuth, filter);
} catch (Exception ex) {
- logger.error(EELFLoggerDelegate.debugLogger, "DELETE response: {}", ex);
+ logger.error(EELFLoggerDelegate.errorLogger, "DELETE response: {}", ex);
throw new Exception("Delete Failed");
}
logger.debug(EELFLoggerDelegate.debugLogger, "DELETE response: {}");
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UrlAccessCentalizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UrlAccessCentalizedImpl.java
deleted file mode 100644
index 528f1bbb..00000000
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/UrlAccessCentalizedImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.openecomp.portalsdk.core.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.openecomp.portalsdk.core.domain.RoleFunction;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.exception.SessionExpiredException;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalsdk.core.web.support.AppUtils;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class UrlAccessCentalizedImpl implements UrlAccessService {
-
- @Autowired
- AppService appService;
-
- @Autowired
- RoleService roleService;
-
-
- @Override
- public boolean isUrlAccessible(HttpServletRequest request, String currentUrl) {
-
- boolean isAccessible = false;
- User user = UserUtils.getUserSession(request);
-
-
- HttpSession session = AppUtils.getSession(request);
-
- if (session == null) {
- throw new SessionExpiredException();
- }
-
- @SuppressWarnings("unchecked")
- List<RoleFunction> allRoleFunctionsList = (List<RoleFunction>) session.getAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTION_LIST));
-
- List<String> allUrls = new ArrayList<String>();
-
- for (int i = 0; i < allRoleFunctionsList.size(); i++) {
- if (allRoleFunctionsList.get(i).getCode() != null && ((String) allRoleFunctionsList.get(i).getCode()).substring(0, 4).toUpperCase().equals("url_".toUpperCase())) {
- String functionCd = ((String) allRoleFunctionsList.get(i).getCode()).substring(4).toUpperCase();
- allUrls.add(functionCd);
- }
- }
-
- @SuppressWarnings("unchecked")
- Set<RoleFunction> roleFunction = UserUtils.getRoleFunctions(request);
- List list = new ArrayList<>(roleFunction);
- List<String> UserURLlist = new ArrayList<String>();
-
- if (list != null && list.size() > 0) {
- for (int i = 0; i < list.size(); i++) {
- if (list.get(i) != null && ((String) list.get(i)).substring(0, 4).toUpperCase().equals("url_".toUpperCase())) {
- String functionCd = ((String) list.get(i)).substring(4).toUpperCase();
- UserURLlist.add(functionCd);
- }
- }
- }
-
- if((!UserURLlist.contains(currentUrl) && !allUrls.contains(currentUrl)) || (UserURLlist.contains(currentUrl) && allUrls.contains(currentUrl)))
- {
- isAccessible = true;
- }else {
- isAccessible = false;
- }
- return isAccessible;
-
- }
-
-
-}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/web/support/UserUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/web/support/UserUtils.java
index ea26b969..a7850e34 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/web/support/UserUtils.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/web/support/UserUtils.java
@@ -154,9 +154,6 @@ public class UserUtils {
session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME),
roleFunctions);
}
-
-
-
return roleFunctions;
}