From a824368a4ed6d454aae770b4c30412efd6042764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Hud=C3=A1k?= Date: Sat, 22 Aug 2020 09:53:35 +0200 Subject: [PATCH] Add top repo menu to more pages (#3764) * Add top repo menu to more pages - diff, patch - syntax check, code inspector - repo settings * Add to syntax check page, add margin Co-authored-by: Lars Hvam --- src/ui/zabapgit_css_common.w3mi.data.css | 3 ++- src/ui/zcl_abapgit_gui_page_code_insp.clas.abap | 8 ++++---- src/ui/zcl_abapgit_gui_page_diff.clas.abap | 17 +++++++++++------ src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap | 5 +++++ src/ui/zcl_abapgit_gui_page_syntax.clas.abap | 5 +++++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/ui/zabapgit_css_common.w3mi.data.css b/src/ui/zabapgit_css_common.w3mi.data.css index f55395300..6aafc5241 100644 --- a/src/ui/zabapgit_css_common.w3mi.data.css +++ b/src/ui/zabapgit_css_common.w3mi.data.css @@ -150,6 +150,7 @@ div.log .icon { padding-right: 6px; } /* REPOSITORY */ div.repo { margin-top: 3px; + margin-bottom: 3px; padding: 0.5em 1em 0.5em 1em; position: relative; } @@ -959,7 +960,7 @@ table.commit tr .title { .floating-button { position: fixed; - top: 6em; + top: 8em; right: 2.8em; padding: 1em 1.8em; border-radius: 4px; diff --git a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap index fa1349676..2b7aff967 100644 --- a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap @@ -175,6 +175,10 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_CODE_INSP IMPLEMENTATION. CREATE OBJECT ri_html TYPE zcl_abapgit_html. + ri_html->add( `
` ). + ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top( mo_repo ) ). + ri_html->add( `
` ). + IF mv_check_variant IS INITIAL. ri_html->add( zcl_abapgit_gui_chunk_lib=>render_error( iv_error = 'No check variant supplied.' ) ). RETURN. @@ -184,10 +188,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_CODE_INSP IMPLEMENTATION. ri_html->add( '
' ). ri_html->add( |Code inspector check variant: { mv_check_variant }| ). - ri_html->add( |
{ - zcl_abapgit_html=>icon( 'box/grey70' ) }{ - mo_repo->get_package( ) }
| ). - ri_html->add( '
' ). IF lines( mt_result ) = 0. ri_html->add( '
' ). diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/zcl_abapgit_gui_page_diff.clas.abap index 40b61d07c..27a72fc58 100644 --- a/src/ui/zcl_abapgit_gui_page_diff.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_diff.clas.abap @@ -131,7 +131,9 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION IMPORTING !is_diff TYPE ty_file_diff RETURNING - VALUE(ro_html) TYPE REF TO zcl_abapgit_html . + VALUE(ro_html) TYPE REF TO zcl_abapgit_html + RAISING + zcx_abapgit_exception . METHODS render_beacon IMPORTING !is_diff_line TYPE zif_abapgit_definitions=>ty_diff @@ -584,6 +586,10 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION. li_progress = zcl_abapgit_progress=>get_instance( lines( mt_diff_files ) ). + ri_html->add( `
` ). + ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top( mo_repo ) ). + ri_html->add( `
` ). + ri_html->add( |
| ). ri_html->add( zcl_abapgit_gui_chunk_lib=>render_js_error_banner( ) ). LOOP AT mt_diff_files INTO ls_diff_file. @@ -914,9 +920,8 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION. METHOD render_table_head. CREATE OBJECT ro_html. - - ro_html->add( '' ). "#EC NOTEXT - ro_html->add( '' ). "#EC NOTEXT + ro_html->add( '' ). + ro_html->add( '' ). IF mv_unified = abap_true. @@ -930,8 +935,8 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION. ENDIF. - ro_html->add( '' ). "#EC NOTEXT - ro_html->add( '' ). "#EC NOTEXT + ro_html->add( '' ). + ro_html->add( '' ). ENDMETHOD. diff --git a/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap index 20b00da61..49d6ba222 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_sett.clas.abap @@ -93,6 +93,11 @@ CLASS zcl_abapgit_gui_page_repo_sett IMPLEMENTATION. METHOD render_content. CREATE OBJECT ri_html TYPE zcl_abapgit_html. + + ri_html->add( `
` ). + ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top( mo_repo ) ). + ri_html->add( `
` ). + ri_html->add( '
' ). ri_html->add( |
| ). diff --git a/src/ui/zcl_abapgit_gui_page_syntax.clas.abap b/src/ui/zcl_abapgit_gui_page_syntax.clas.abap index 3b69ca3d2..b81da3721 100644 --- a/src/ui/zcl_abapgit_gui_page_syntax.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_syntax.clas.abap @@ -57,6 +57,11 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SYNTAX IMPLEMENTATION. METHOD render_content. CREATE OBJECT ri_html TYPE zcl_abapgit_html. + + ri_html->add( `
` ). + ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top( mo_repo ) ). + ri_html->add( `
` ). + ri_html->add( '
' ). IF lines( mt_result ) = 0.