From 144cb8822cf43cd7ad9727da109ec9edc8cc72ac Mon Sep 17 00:00:00 2001 From: Alexander Tsybulsky Date: Mon, 13 Jul 2020 12:34:39 +0300 Subject: [PATCH] improve missing branch styling (#3619) Co-authored-by: Lars Hvam --- src/ui/zabapgit_css_common.w3mi.data.css | 4 +- .../zabapgit_css_theme_default.w3mi.data.css | 4 + src/ui/zcl_abapgit_gui_chunk_lib.clas.abap | 107 ++++++++++-------- .../zcl_abapgit_gui_page_view_repo.clas.abap | 12 +- 4 files changed, 72 insertions(+), 55 deletions(-) diff --git a/src/ui/zabapgit_css_common.w3mi.data.css b/src/ui/zabapgit_css_common.w3mi.data.css index cb79b0ff3..fbef43582 100644 --- a/src/ui/zabapgit_css_common.w3mi.data.css +++ b/src/ui/zabapgit_css_common.w3mi.data.css @@ -77,6 +77,8 @@ span.separator { /* PANELS */ div.panel { border-radius: 3px; + padding: 0.5em 0.5em; + margin: 0.5em 0.5em; } div.dummydiv { @@ -220,7 +222,7 @@ div.repo_container { } div.repo_banner { - margin: 0em 1.2em 1em; + margin: 0em 1em 1em; padding: 0.5em 0.5em; text-align: center; font-size: 85%; diff --git a/src/ui/zabapgit_css_theme_default.w3mi.data.css b/src/ui/zabapgit_css_theme_default.w3mi.data.css index 7b588e666..070822b0c 100644 --- a/src/ui/zabapgit_css_theme_default.w3mi.data.css +++ b/src/ui/zabapgit_css_theme_default.w3mi.data.css @@ -63,6 +63,10 @@ div.panel.success { color: #589a58 !important; background-color: #c5eac5; } +div.panel.error { + color: #d41919; + background-color: #fad6d6; +} #debug-output { color: var(--theme-debug-color); } div.dummydiv { background-color: var(--theme-container-background-color); } diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap index c7fc3aa28..f5b9d6bc8 100644 --- a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap +++ b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap @@ -16,6 +16,7 @@ CLASS zcl_abapgit_gui_chunk_lib DEFINITION IMPORTING !ix_error TYPE REF TO zcx_abapgit_exception OPTIONAL !iv_error TYPE string OPTIONAL + !iv_extra_style TYPE string OPTIONAL RETURNING VALUE(ro_html) TYPE REF TO zcl_abapgit_html . CLASS-METHODS render_repo_top @@ -142,7 +143,36 @@ ENDCLASS. -CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. +CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. + + + METHOD advanced_submenu. + + CREATE OBJECT ro_menu. + + ro_menu->add( + iv_txt = 'Database util' + iv_act = zif_abapgit_definitions=>c_action-go_db + )->add( + iv_txt = 'Package to zip' + iv_act = zif_abapgit_definitions=>c_action-zip_package + )->add( + iv_txt = 'Transport to zip' + iv_act = zif_abapgit_definitions=>c_action-zip_transport + )->add( + iv_txt = 'Object to files' + iv_act = zif_abapgit_definitions=>c_action-zip_object + )->add( + iv_txt = 'Test changed by' + iv_act = zif_abapgit_definitions=>c_action-changed_by + )->add( + iv_txt = 'Debug info' + iv_act = zif_abapgit_definitions=>c_action-go_debuginfo + )->add( + iv_txt = 'Settings' + iv_act = zif_abapgit_definitions=>c_action-go_settings ). + + ENDMETHOD. METHOD class_constructor. @@ -170,6 +200,26 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. ENDMETHOD. + METHOD help_submenu. + + CREATE OBJECT ro_menu. + + ro_menu->add( + iv_txt = 'Tutorial' + iv_act = zif_abapgit_definitions=>c_action-go_tutorial + )->add( + iv_txt = 'Documentation' + iv_act = zif_abapgit_definitions=>c_action-documentation + )->add( + iv_txt = 'Explore' + iv_act = zif_abapgit_definitions=>c_action-go_explore + )->add( + iv_txt = 'Changelog' + iv_act = zif_abapgit_definitions=>c_action-changelog ). + + ENDMETHOD. + + METHOD normalize_program_name. rv_normalized_program_name = substring_before( @@ -252,6 +302,11 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. METHOD render_error. DATA lv_error TYPE string. + DATA lv_class TYPE string VALUE 'panel error center'. + + IF iv_extra_style IS NOT INITIAL. + lv_class = lv_class && ` ` && iv_extra_style. + ENDIF. CREATE OBJECT ro_html. @@ -261,7 +316,7 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. lv_error = iv_error. ENDIF. - ro_html->add( '
' ). + ro_html->add( |
| ). ro_html->add( |{ zcl_abapgit_html=>icon( 'exclamation-circle/red' ) } Error: { lv_error }| ). ro_html->add( '
' ). @@ -724,52 +779,4 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. ro_html->add( '
' ). ENDMETHOD. - - METHOD advanced_submenu. - - CREATE OBJECT ro_menu. - - ro_menu->add( - iv_txt = 'Database util' - iv_act = zif_abapgit_definitions=>c_action-go_db - )->add( - iv_txt = 'Package to zip' - iv_act = zif_abapgit_definitions=>c_action-zip_package - )->add( - iv_txt = 'Transport to zip' - iv_act = zif_abapgit_definitions=>c_action-zip_transport - )->add( - iv_txt = 'Object to files' - iv_act = zif_abapgit_definitions=>c_action-zip_object - )->add( - iv_txt = 'Test changed by' - iv_act = zif_abapgit_definitions=>c_action-changed_by - )->add( - iv_txt = 'Debug info' - iv_act = zif_abapgit_definitions=>c_action-go_debuginfo - )->add( - iv_txt = 'Settings' - iv_act = zif_abapgit_definitions=>c_action-go_settings ). - - ENDMETHOD. - - METHOD help_submenu. - - CREATE OBJECT ro_menu. - - ro_menu->add( - iv_txt = 'Tutorial' - iv_act = zif_abapgit_definitions=>c_action-go_tutorial - )->add( - iv_txt = 'Documentation' - iv_act = zif_abapgit_definitions=>c_action-documentation - )->add( - iv_txt = 'Explore' - iv_act = zif_abapgit_definitions=>c_action-go_explore - )->add( - iv_txt = 'Changelog' - iv_act = zif_abapgit_definitions=>c_action-changelog ). - - ENDMETHOD. - ENDCLASS. diff --git a/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap b/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap index d18635a78..592a90031 100644 --- a/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_view_repo.clas.abap @@ -713,7 +713,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_VIEW_REPO IMPLEMENTATION. AND mo_repo->has_remote_source( ) = abap_true AND lv_lstate IS INITIAL AND lv_rstate IS INITIAL. ri_html->add( - |
| + |
| && |ZIP source is attached and completely matches to the local state| && |
| ). ENDIF. @@ -765,9 +765,13 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_VIEW_REPO IMPLEMENTATION. ri_html->add( '
' ). ri_html->add( '' ). CATCH zcx_abapgit_exception INTO lx_error. - ri_html->add( render_head_line( iv_lstate = lv_lstate - iv_rstate = lv_rstate ) ). - ri_html->add( zcl_abapgit_gui_chunk_lib=>render_error( ix_error = lx_error ) ). + ri_html->add( + render_head_line( + iv_lstate = lv_lstate + iv_rstate = lv_rstate ) ). + ri_html->add( zcl_abapgit_gui_chunk_lib=>render_error( + iv_extra_style = 'repo_banner' + ix_error = lx_error ) ). ENDTRY. ENDMETHOD.