diff --git a/src/zabapgit_css_common.w3mi.data.css b/src/zabapgit_css_common.w3mi.data.css index 31365ec0b..8bcfae494 100644 --- a/src/zabapgit_css_common.w3mi.data.css +++ b/src/zabapgit_css_common.w3mi.data.css @@ -38,7 +38,7 @@ input:focus, textarea:focus { .darkgrey { color: #808080 !important; } .attention { color: red !important; } .error { color: #d41919 !important; } -.warning { color: #e4ae0d !important; } +.warning { color: #efb301 !important; } .blue { color: #5e8dc9 !important; } .red { color: red !important; } diff --git a/src/zabapgit_css_common.w3mi.xml b/src/zabapgit_css_common.w3mi.xml index cbea95037..dbdbed67e 100644 --- a/src/zabapgit_css_common.w3mi.xml +++ b/src/zabapgit_css_common.w3mi.xml @@ -15,7 +15,7 @@ MI ZABAPGIT_CSS_COMMON filename - common.css + ~wwwtmp.css MI diff --git a/src/zabapgit_file_status.prog.abap b/src/zabapgit_file_status.prog.abap index ee105864a..f3109c138 100644 --- a/src/zabapgit_file_status.prog.abap +++ b/src/zabapgit_file_status.prog.abap @@ -103,6 +103,7 @@ CLASS lcl_file_status IMPLEMENTATION. iv_msgv2 = -obj_type iv_msgv3 = -obj_name iv_msgv4 = 'are not placed in the same folder' + iv_msgty = 'W' iv_rc = '1' ) ##no_text. ENDIF. ENDLOOP. @@ -117,6 +118,7 @@ CLASS lcl_file_status IMPLEMENTATION. io_log->add( iv_msgv1 = 'Package and path does not match for object,' iv_msgv2 = -obj_type iv_msgv3 = -obj_name + iv_msgty = 'W' iv_rc = '2' ) ##no_text. ENDIF. ENDLOOP. @@ -128,6 +130,7 @@ CLASS lcl_file_status IMPLEMENTATION. IF -filename IS NOT INITIAL AND -filename = ls_file-filename. io_log->add( iv_msgv1 = 'Multiple files with same filename,' iv_msgv2 = -filename + iv_msgty = 'W' iv_rc = '3' ) ##no_text. ENDIF. @@ -135,6 +138,7 @@ CLASS lcl_file_status IMPLEMENTATION. io_log->add( iv_msgv1 = 'Filename is empty for object' iv_msgv2 = -obj_type iv_msgv3 = -obj_name + iv_msgty = 'W' iv_rc = '4' ) ##no_text. ENDIF. diff --git a/src/zabapgit_objects_impl.prog.abap b/src/zabapgit_objects_impl.prog.abap index ced014a35..6510a1d3a 100644 --- a/src/zabapgit_objects_impl.prog.abap +++ b/src/zabapgit_objects_impl.prog.abap @@ -484,6 +484,7 @@ CLASS lcl_objects IMPLEMENTATION. io_log->add( iv_msgv1 = 'Object type ignored, not supported:' iv_msgv2 = is_item-obj_type iv_msgv3 = '-' + iv_msgty = 'E' iv_msgv4 = is_item-obj_name ) ##no_text. ENDIF. RETURN. diff --git a/src/zabapgit_util.prog.abap b/src/zabapgit_util.prog.abap index 87e8603a7..6e58940ed 100644 --- a/src/zabapgit_util.prog.abap +++ b/src/zabapgit_util.prog.abap @@ -1055,6 +1055,7 @@ CLASS lcl_log DEFINITION FINAL. iv_msgv2 TYPE csequence OPTIONAL iv_msgv3 TYPE csequence OPTIONAL iv_msgv4 TYPE csequence OPTIONAL + iv_msgty TYPE symsgty DEFAULT 'E' iv_rc TYPE balsort OPTIONAL, count RETURNING VALUE(rv_count) TYPE i, @@ -1075,7 +1076,9 @@ CLASS lcl_log IMPLEMENTATION. METHOD to_html. - DATA: lv_string TYPE string. + DATA: lv_class TYPE string, + lv_icon TYPE string, + lv_string TYPE string. FIELD-SYMBOLS: LIKE LINE OF mt_log. @@ -1086,10 +1089,23 @@ CLASS lcl_log IMPLEMENTATION. ENDIF. LOOP AT mt_log ASSIGNING . + CASE -msgty. + WHEN 'W'. + lv_icon = 'alert'. + lv_class = 'warning'. + WHEN 'E'. + lv_icon = 'flame'. + lv_class = 'error'. + WHEN OTHERS. " ??? unexpected + lv_icon = 'flame'. + lv_class = 'error'. + ENDCASE. + CONCATENATE -msgv1 -msgv2 -msgv3 -msgv4 INTO lv_string SEPARATED BY space. - ro_html->add( '' ). - ro_html->add_icon( iv_name = 'alert' iv_class = 'error' ). " warning CSS exists too + + ro_html->add( || ). + ro_html->add_icon( iv_name = lv_icon ). ro_html->add( lv_string ). ro_html->add( '' ). ENDLOOP. @@ -1101,7 +1117,7 @@ CLASS lcl_log IMPLEMENTATION. FIELD-SYMBOLS: LIKE LINE OF mt_log. APPEND INITIAL LINE TO mt_log ASSIGNING . - -msgty = 'W'. + -msgty = iv_msgty. " Error by default -msgid = '00'. -msgno = '001'. -msgv1 = iv_msgv1.