From c03bb681b31070abbe173a2d901510222e4ff16c Mon Sep 17 00:00:00 2001 From: Alexander Tsybulsky Date: Wed, 6 Mar 2019 10:49:04 +0200 Subject: [PATCH] Offline icons (#2454) * font * css fix and icon rendering * assets and font link in html head * more icons * more css fixes * replace icon names * dev docs * Fonts update * icons rename * doc update * linter fixes * fix for abapmerge --- .gitignore | 1 + README.md | 4 ++ docs/collections/_development/adding-icons.md | 24 +++++++++ src/ui/zabapgit_css_common.w3mi.data.css | 9 ++-- src/ui/zabapgit_css_common.w3mi.xml | 2 +- src/ui/zabapgit_icon_font.w3mi.data.woff | Bin 0 -> 3300 bytes src/ui/zabapgit_icon_font.w3mi.xml | 29 ++++++++++ src/ui/zabapgit_icon_font_css.w3mi.data.css | 51 ++++++++++++++++++ src/ui/zabapgit_icon_font_css.w3mi.xml | 29 ++++++++++ .../zcl_abapgit_gui_asset_manager.clas.abap | 25 ++++++++- src/ui/zcl_abapgit_gui_chunk_lib.clas.abap | 18 +++---- src/ui/zcl_abapgit_gui_page.clas.abap | 25 ++++----- src/ui/zcl_abapgit_gui_page_main.clas.abap | 4 +- .../zcl_abapgit_gui_page_repo_over.clas.abap | 2 +- src/ui/zcl_abapgit_gui_view_repo.clas.abap | 13 ++--- .../zcl_abapgit_gui_view_tutorial.clas.abap | 3 +- src/ui/zcl_abapgit_html.clas.abap | 11 ++-- src/ui/zcl_abapgit_html_toolbar.clas.abap | 3 +- src/utils/zcl_abapgit_log.clas.abap | 10 ++-- 19 files changed, 209 insertions(+), 54 deletions(-) create mode 100644 docs/collections/_development/adding-icons.md create mode 100644 src/ui/zabapgit_icon_font.w3mi.data.woff create mode 100644 src/ui/zabapgit_icon_font.w3mi.xml create mode 100644 src/ui/zabapgit_icon_font_css.w3mi.data.css create mode 100644 src/ui/zabapgit_icon_font_css.w3mi.xml diff --git a/.gitignore b/.gitignore index 2f926b631..f570ed72c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ package-lock.json zabapgit.abap +.vscode diff --git a/README.md b/README.md index 6109fa056..9f16d83f7 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,7 @@ See [dotabap.org](http://dotabap.org) For questions/comments/bugs/feature requests/wishes please create an [issue](https://github.com/larshp/abapGit/issues) ![abapgit](http://docs.abapgit.org/img/abapgit_1_73_0.png) + +## Credits and references + +Icons used in abapGit are created from [Font Awesome](https://fontawesome.com/) free icon set ([CC BY 4.0 License](https://fontawesome.com/license/free)). diff --git a/docs/collections/_development/adding-icons.md b/docs/collections/_development/adding-icons.md new file mode 100644 index 000000000..4bd4baf1f --- /dev/null +++ b/docs/collections/_development/adding-icons.md @@ -0,0 +1,24 @@ +--- +title: Adding icons +order: 90 +--- + +abapGit uses SIL and MIT licensed fonts, they are included in the distribution as a MIME object. This includes MIME objects: + +- ZABAPGIT_ICON_FONT - font in WOFF format containing the custom icon set. WOFF is used due to compatibility, SAP GUI for Windows reuse IE (11) +- ZABAPGIT_ICON_FONT_CSS - CSS icon map + +To add an icon to the icon set follow the next procedure: + +1. You need `nodejs` installed (version 10 at the time of this doc creation) +2. Download this repo https://github.com/sbcgua/abapgit-icon-font +3. Run `npm install` +4. Download Font Awesome free version from [here](https://fontawesome.com/download) +5. Copy new SVGs to `svg` folder of the repo +6. Run `npm run build`, this will generate `woff` and `css` files in the `build` dir +7. Upload them to the system via SMW0 to the respective objects +8. Preferable commit the change in a separate commit + +Please **mind the licensing** when adding icons not from Font Awesome + +P.S. Alternatively you can use [w3mipoller](https://github.com/sbcgua/abap_w3mi_poller) for upload step diff --git a/src/ui/zabapgit_css_common.w3mi.data.css b/src/ui/zabapgit_css_common.w3mi.data.css index f985ad8cc..f72eb2a53 100644 --- a/src/ui/zabapgit_css_common.w3mi.data.css +++ b/src/ui/zabapgit_css_common.w3mi.data.css @@ -141,7 +141,7 @@ div.log { border-radius: 4px; } div.log > span { display:block; } -div.log .octicon { padding-right: 6px; } +div.log .icon { padding-right: 6px; } /* REPOSITORY */ div.repo { @@ -165,9 +165,8 @@ div.repo { font-size: 12pt; margin-left: 0.5em; } -.repo_name img { - vertical-align: baseline; - margin: 0 5px 0 5px; +.repo_name .icon { + padding-right: 4px; } .repo_attr { color: grey; @@ -784,7 +783,7 @@ div.tutorial h2 { /* icons - text-align strictly left - otherwise look ugly + bite a bit of left padding for nicer look + forbids item text wrapping (maybe can be done differently) */ -.nav-container ul ul li a .octicon { +.nav-container ul ul li a .icon { padding-right: 10px; margin-left: -3px; } diff --git a/src/ui/zabapgit_css_common.w3mi.xml b/src/ui/zabapgit_css_common.w3mi.xml index cbea95037..a2bc2ab9d 100644 --- a/src/ui/zabapgit_css_common.w3mi.xml +++ b/src/ui/zabapgit_css_common.w3mi.xml @@ -21,7 +21,7 @@ MI ZABAPGIT_CSS_COMMON mimetype - text/css + text/plain diff --git a/src/ui/zabapgit_icon_font.w3mi.data.woff b/src/ui/zabapgit_icon_font.w3mi.data.woff new file mode 100644 index 0000000000000000000000000000000000000000..2cbd09bac46e05f6e443787973d5e5fb66e57cc1 GIT binary patch literal 3300 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 J^$0QI{0~WE1Udi! literal 0 HcmV?d00001 diff --git a/src/ui/zabapgit_icon_font.w3mi.xml b/src/ui/zabapgit_icon_font.w3mi.xml new file mode 100644 index 000000000..2aee1fbf2 --- /dev/null +++ b/src/ui/zabapgit_icon_font.w3mi.xml @@ -0,0 +1,29 @@ + + + + + ZABAPGIT_ICON_FONT + Icon set for abapgit + + + MI + ZABAPGIT_ICON_FONT + fileextension + .woff + + + MI + ZABAPGIT_ICON_FONT + filename + ag-icons.woff + + + MI + ZABAPGIT_ICON_FONT + mimetype + font/woff + + + + + diff --git a/src/ui/zabapgit_icon_font_css.w3mi.data.css b/src/ui/zabapgit_icon_font_css.w3mi.data.css new file mode 100644 index 000000000..011d4dfca --- /dev/null +++ b/src/ui/zabapgit_icon_font_css.w3mi.data.css @@ -0,0 +1,51 @@ +@font-face { + font-family: "ag-icons"; + font-weight: normal; + font-style: normal; + src: url("../font/ag-icons.woff") format("woff"); +} + +.icon { + line-height: 1; +} + +.icon:before { + font-family: ag-icons !important; + font-style: normal; + font-weight: normal !important; + + display: inline-block; + text-decoration: none; + text-align: center; + vertical-align: text-top; + width: 1em; + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; +} + +.icon.large { font-size: 200%; } + +.icon-arrow-circle-up:before { content: "\f101"; } +.icon-bars:before { content: "\f102"; } +.icon-bolt:before { content: "\f103"; } +.icon-box:before { content: "\f104"; } +.icon-briefcase:before { content: "\f105"; } +.icon-check:before { content: "\f106"; } +.icon-cloud-upload-alt:before { content: "\f107"; } +.icon-code-branch:before { content: "\f108"; } +.icon-cog:before { content: "\f109"; } +.icon-exclamation-circle:before { content: "\f10a"; } +.icon-exclamation-triangle:before { content: "\f10b"; } +.icon-file-alt:before { content: "\f10c"; } +.icon-file-code:before { content: "\f10d"; } +.icon-file-image:before { content: "\f10e"; } +.icon-file:before { content: "\f10f"; } +.icon-fire-alt:before { content: "\f110"; } +.icon-folder:before { content: "\f111"; } +.icon-lock:before { content: "\f112"; } +.icon-plug:before { content: "\f113"; } +.icon-sliders-h:before { content: "\f114"; } +.icon-snowflake:before { content: "\f115"; } +.icon-star:before { content: "\f116"; } diff --git a/src/ui/zabapgit_icon_font_css.w3mi.xml b/src/ui/zabapgit_icon_font_css.w3mi.xml new file mode 100644 index 000000000..f8b4a21d5 --- /dev/null +++ b/src/ui/zabapgit_icon_font_css.w3mi.xml @@ -0,0 +1,29 @@ + + + + + ZABAPGIT_ICON_FONT_CSS + Icon set for abapgit, css map + + + MI + ZABAPGIT_ICON_FONT_CSS + fileextension + .css + + + MI + ZABAPGIT_ICON_FONT_CSS + filename + ag-icons.css + + + MI + ZABAPGIT_ICON_FONT_CSS + mimetype + text/plain + + + + + diff --git a/src/ui/zcl_abapgit_gui_asset_manager.clas.abap b/src/ui/zcl_abapgit_gui_asset_manager.clas.abap index d004bd029..5123f3162 100644 --- a/src/ui/zcl_abapgit_gui_asset_manager.clas.abap +++ b/src/ui/zcl_abapgit_gui_asset_manager.clas.abap @@ -202,13 +202,30 @@ CLASS ZCL_ABAPGIT_GUI_ASSET_MANAGER IMPLEMENTATION. rs_asset-subtype = 'javascript'. lv_mime_name = 'ZABAPGIT_JS_COMMON'. " @@abapmerge include zabapgit_js_common.w3mi.data.js > _inline '$$'. + WHEN 'css/ag-icons.css'. + rs_asset-url = iv_asset_url. + rs_asset-type = 'text'. + rs_asset-subtype = 'css'. + lv_mime_name = 'ZABAPGIT_ICON_FONT_CSS'. + " @@abapmerge include zabapgit_icon_font_css.w3mi.data.css > _inline '$$'. + WHEN 'font/ag-icons.woff'. + rs_asset-url = iv_asset_url. + rs_asset-type = 'font'. + rs_asset-subtype = 'woff'. + lv_mime_name = 'ZABAPGIT_ICON_FONT'. + " @@abapmerge include-base64 zabapgit_icon_font.w3mi.data.woff > _inline '$$'. WHEN OTHERS. zcx_abapgit_exception=>raise( |No inline resource: { iv_asset_url }| ). ENDCASE. IF lt_data IS NOT INITIAL. - CONCATENATE LINES OF lt_data INTO lv_str SEPARATED BY zif_abapgit_definitions=>c_newline. - rs_asset-content = zcl_abapgit_string_utils=>string_to_xstring( lv_str ). + IF rs_asset-type = 'text'. " TODO refactor + CONCATENATE LINES OF lt_data INTO lv_str SEPARATED BY zif_abapgit_definitions=>c_newline. + rs_asset-content = zcl_abapgit_string_utils=>string_to_xstring( lv_str ). + ELSE. + CONCATENATE LINES OF lt_data INTO lv_str. + rs_asset-content = zcl_abapgit_string_utils=>base64_to_xstring( lv_str ). + ENDIF. ELSE. rs_asset-content = get_mime_asset( lv_mime_name ). ENDIF. @@ -230,6 +247,10 @@ CLASS ZCL_ABAPGIT_GUI_ASSET_MANAGER IMPLEMENTATION. APPEND ls_asset TO rt_assets. ls_asset = get_textlike_asset( 'js/common.js' ). APPEND ls_asset TO rt_assets. + ls_asset = get_textlike_asset( 'css/ag-icons.css' ). + APPEND ls_asset TO rt_assets. + ls_asset = get_textlike_asset( 'font/ag-icons.woff' ). + APPEND ls_asset TO rt_assets. lt_assets = get_inline_images( ). APPEND LINES OF lt_assets TO rt_assets. diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap index 793d41867..485222f2c 100644 --- a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap +++ b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap @@ -102,7 +102,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. CREATE OBJECT ro_html. ro_html->add( || ). - ro_html->add_icon( iv_name = 'git-branch/darkgrey' iv_hint = 'Current branch' ). + ro_html->add_icon( iv_name = 'code-branch/grey70' iv_hint = 'Current branch' ). IF iv_interactive = abap_true. ro_html->add_a( iv_act = |{ zif_abapgit_definitions=>c_action-git_branch_switch }?{ io_repo->get_key( ) }| iv_txt = lv_text ). @@ -147,7 +147,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. ENDIF. ro_html->add( '
' ). - ro_html->add( |{ zcl_abapgit_html=>icon( 'alert/red' ) } Error: { lv_error }| ). + ro_html->add( |{ zcl_abapgit_html=>icon( 'exclamation-circle/red' ) } Error: { lv_error }| ). ro_html->add( '
' ). ENDMETHOD. @@ -239,7 +239,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. IF iv_hint IS NOT INITIAL. ro_html->add( '
' - && zcl_abapgit_html=>icon( iv_name = 'alert' iv_class = 'pad-right' ) + && zcl_abapgit_html=>icon( iv_name = 'exclamation-triangle' iv_class = 'pad-right' ) && iv_hint && '
' ). ENDIF. @@ -297,7 +297,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. METHOD render_js_error_banner. CREATE OBJECT ro_html. ro_html->add( '
' ). - ro_html->add( |{ zcl_abapgit_html=>icon( 'alert/red' ) }| && + ro_html->add( |{ zcl_abapgit_html=>icon( 'exclamation-triangle/red' ) }| && ' If this does not disappear soon,' && ' then there is a JS init error, please log an issue' ). ro_html->add( '
' ). @@ -366,7 +366,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. lv_icon = 'plug/darkgrey' ##NO_TEXT. lv_hint = 'Offline repository' ##NO_TEXT. ELSE. - lv_icon = 'cloud-upload/blue' ##NO_TEXT. + lv_icon = 'cloud-upload-alt/blue' ##NO_TEXT. lv_hint = 'On-line repository' ##NO_TEXT. ENDIF. @@ -390,9 +390,9 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. " News IF io_news IS BOUND AND io_news->has_news( ) = abap_true. IF io_news->has_updates( ) = abap_true. - lv_icon = 'arrow-up/warning'. + lv_icon = 'arrow-circle-up/warning'. ELSE. - lv_icon = 'arrow-up/grey80'. + lv_icon = 'arrow-circle-up/grey80'. ENDIF. ro_html->add_a( iv_act = |toggleDisplay('news')| iv_typ = zif_abapgit_definitions=>c_action_type-onclick @@ -422,7 +422,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. " Write protect IF io_repo->get_local_settings( )-write_protected = abap_true. - ro_html->add_icon( iv_name = 'lock/darkgrey' iv_hint = 'Locked from pulls' ). + ro_html->add_icon( iv_name = 'lock/grey70' iv_hint = 'Locked from pulls' ). ENDIF. " Branch @@ -443,7 +443,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. " Package IF iv_show_package = abap_true. - ro_html->add_icon( iv_name = 'package/darkgrey' iv_hint = 'SAP package' ). + ro_html->add_icon( iv_name = 'box/grey70' iv_hint = 'SAP package' ). ro_html->add( '' ). ro_html->add_a( iv_txt = io_repo->get_package( ) iv_act = |{ zif_abapgit_definitions=>c_action-jump_pkg }?{ io_repo->get_package( ) }| ). diff --git a/src/ui/zcl_abapgit_gui_page.clas.abap b/src/ui/zcl_abapgit_gui_page.clas.abap index 610db07d9..2057c126f 100644 --- a/src/ui/zcl_abapgit_gui_page.clas.abap +++ b/src/ui/zcl_abapgit_gui_page.clas.abap @@ -77,13 +77,7 @@ ENDCLASS. -CLASS zcl_abapgit_gui_page IMPLEMENTATION. - - METHOD constructor. - - mo_settings = zcl_abapgit_persist_settings=>get_instance( )->read( ). - - ENDMETHOD. +CLASS ZCL_ABAPGIT_GUI_PAGE IMPLEMENTATION. METHOD add_hotkeys. @@ -138,6 +132,13 @@ CLASS zcl_abapgit_gui_page IMPLEMENTATION. ENDMETHOD. + METHOD constructor. + + mo_settings = zcl_abapgit_persist_settings=>get_instance( )->read( ). + + ENDMETHOD. + + METHOD footer. CREATE OBJECT ro_html. @@ -184,17 +185,9 @@ CLASS zcl_abapgit_gui_page IMPLEMENTATION. ro_html->add( 'abapGit' ). "#EC NOTEXT ro_html->add( '' ). + ro_html->add( '' ). ro_html->add( '' ). "#EC NOTEXT - IF mo_settings->get_octicons_disabled( ) = abap_false. - - lv_font = |'. "#EC NOTEXT - ro_html->add( lv_font ). " Web fonts - - ENDIF. - ro_html->add( '' ). "#EC NOTEXT ENDMETHOD. diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.abap b/src/ui/zcl_abapgit_gui_page_main.clas.abap index 6feb8483d..3c5bcc2a2 100644 --- a/src/ui/zcl_abapgit_gui_page_main.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_main.clas.abap @@ -200,7 +200,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MAIN IMPLEMENTATION. IF lo_repo->is_offline( ) = abap_true. lv_icon = 'plug/darkgrey'. ELSE. - lv_icon = 'cloud-upload/blue'. + lv_icon = 'cloud-upload-alt/blue'. ENDIF. lo_allbar->add( iv_txt = lv_repo_title @@ -238,7 +238,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MAIN IMPLEMENTATION. ro_html->add( '' ). ro_html->add( lo_allbar->render_as_droplist( - iv_label = zcl_abapgit_html=>icon( iv_name = 'three-bars/blue' ) + iv_label = zcl_abapgit_html=>icon( iv_name = 'bars/blue' ) iv_action = c_actions-overview iv_right = abap_true iv_sort = abap_true ) ). diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap index cc7b10a89..8243bef7f 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap @@ -454,7 +454,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_OVER IMPLEMENTATION. IF -type = abap_true. lv_type_icon = 'plug/darkgrey'. ELSE. - lv_type_icon = 'cloud-upload/blue'. + lv_type_icon = 'cloud-upload-alt/darkgrey'. ENDIF. IF -favorite = abap_true. diff --git a/src/ui/zcl_abapgit_gui_view_repo.clas.abap b/src/ui/zcl_abapgit_gui_view_repo.clas.abap index 4cc5a2606..50768d3ca 100644 --- a/src/ui/zcl_abapgit_gui_view_repo.clas.abap +++ b/src/ui/zcl_abapgit_gui_view_repo.clas.abap @@ -26,6 +26,7 @@ CLASS zcl_abapgit_gui_view_repo DEFINITION RAISING zcx_abapgit_exception . + PROTECTED SECTION. PRIVATE SECTION. DATA: mo_repo TYPE REF TO zcl_abapgit_repo, @@ -285,7 +286,7 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. io_sub = lo_tb_advanced ) ##NO_TEXT. ro_toolbar->add( iv_txt = 'Refresh' iv_act = |{ zif_abapgit_definitions=>c_action-repo_refresh }?{ lv_key }| ). - ro_toolbar->add( iv_txt = zcl_abapgit_html=>icon( iv_name = 'settings/grey70' ) + ro_toolbar->add( iv_txt = zcl_abapgit_html=>icon( iv_name = 'cog/grey70' ) io_sub = build_grid_menu( ) ). ENDMETHOD. @@ -295,7 +296,7 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. IF is_item-inactive = abap_true. rv_inactive_html_code = zcl_abapgit_html=>icon( - iv_name = 'zap/orange' + iv_name = 'bolt/orange' iv_hint = 'Object or object part is inactive' iv_class = 'inactive' ). ENDIF. @@ -360,15 +361,15 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. WHEN 'PROG' OR 'CLAS' OR 'FUGR'. rv_html = zcl_abapgit_html=>icon( 'file-code/darkgrey' ). WHEN 'W3MI' OR 'W3HT'. - rv_html = zcl_abapgit_html=>icon( 'file-binary/darkgrey' ). + rv_html = zcl_abapgit_html=>icon( 'file-image/darkgrey' ). WHEN ''. rv_html = space. " no icon WHEN OTHERS. - rv_html = zcl_abapgit_html=>icon( 'file/darkgrey' ). + rv_html = zcl_abapgit_html=>icon( 'file-alt/darkgrey' ). ENDCASE. IF is_item-is_dir = abap_true. - rv_html = zcl_abapgit_html=>icon( 'file-directory/darkgrey' ). + rv_html = zcl_abapgit_html=>icon( 'folder/darkgrey' ). ENDIF. ENDMETHOD. @@ -639,7 +640,7 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_REPO IMPLEMENTATION. CREATE OBJECT ro_html. ro_html->add( '' ). - ro_html->add( |{ zcl_abapgit_html=>icon( 'dir' ) }| ). + ro_html->add( |{ zcl_abapgit_html=>icon( 'folder' ) }| ). ro_html->add( |{ build_dir_jump_link( '..' ) }| ). IF mo_repo->has_remote_source( ) = abap_true. ro_html->add( || ). " Dummy for online diff --git a/src/ui/zcl_abapgit_gui_view_tutorial.clas.abap b/src/ui/zcl_abapgit_gui_view_tutorial.clas.abap index df2a5a44c..d4121bbe0 100644 --- a/src/ui/zcl_abapgit_gui_view_tutorial.clas.abap +++ b/src/ui/zcl_abapgit_gui_view_tutorial.clas.abap @@ -5,6 +5,7 @@ CLASS zcl_abapgit_gui_view_tutorial DEFINITION PUBLIC FINAL CREATE PUBLIC. INTERFACES zif_abapgit_gui_page_hotkey. ALIASES render FOR zif_abapgit_gui_page~render. + PROTECTED SECTION. PRIVATE SECTION. METHODS render_content RETURNING VALUE(ro_html) TYPE REF TO zcl_abapgit_html. @@ -45,7 +46,7 @@ CLASS ZCL_ABAPGIT_GUI_VIEW_TUTORIAL IMPLEMENTATION. ro_html->add( '

Repository list and favorites

' ). ro_html->add( '

    ' ). ro_html->add( |
  • To choose a repo press { - zcl_abapgit_html=>icon( 'three-bars/blue' ) } at the favorite bar.
    • | ). + zcl_abapgit_html=>icon( 'bars/blue' ) } at the favorite bar.| ). ro_html->add( |
  • To favorite a repo click { zcl_abapgit_html=>icon( 'star/darkgrey' ) } icon at repo toolbar.
    • | ). ro_html->add( '

' ). diff --git a/src/ui/zcl_abapgit_html.clas.abap b/src/ui/zcl_abapgit_html.clas.abap index dd688f654..a7310e943 100644 --- a/src/ui/zcl_abapgit_html.clas.abap +++ b/src/ui/zcl_abapgit_html.clas.abap @@ -50,6 +50,7 @@ CLASS zcl_abapgit_html DEFINITION !iv_class TYPE string OPTIONAL RETURNING VALUE(rv_str) TYPE string . + PROTECTED SECTION. PRIVATE SECTION. CLASS-DATA: go_single_tags_re TYPE REF TO cl_abap_regex. @@ -90,7 +91,7 @@ ENDCLASS. -CLASS zcl_abapgit_html IMPLEMENTATION. +CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION. METHOD a. @@ -214,7 +215,7 @@ CLASS zcl_abapgit_html IMPLEMENTATION. lv_name TYPE string, lv_color TYPE string, lv_class TYPE string, - lv_octicon_class TYPE string, + lv_large_icon TYPE string, lv_xpixel TYPE i. SPLIT iv_name AT '/' INTO lv_name lv_color. @@ -231,12 +232,10 @@ CLASS zcl_abapgit_html IMPLEMENTATION. lv_xpixel = cl_gui_cfw=>compute_pixel_from_metric( x_or_y = 'X' in = 1 ). IF lv_xpixel >= 2. - lv_octicon_class = 'mega-octicon'. - ELSE. - lv_octicon_class = 'octicon'. + lv_large_icon = ' large'. ENDIF. - rv_str = ||. + rv_str = ||. ENDMETHOD. diff --git a/src/ui/zcl_abapgit_html_toolbar.clas.abap b/src/ui/zcl_abapgit_html_toolbar.clas.abap index fd71217b5..424815f0e 100644 --- a/src/ui/zcl_abapgit_html_toolbar.clas.abap +++ b/src/ui/zcl_abapgit_html_toolbar.clas.abap @@ -37,6 +37,7 @@ CLASS zcl_abapgit_html_toolbar DEFINITION RETURNING VALUE(ro_html) TYPE REF TO zcl_abapgit_html. + PROTECTED SECTION. PRIVATE SECTION. TYPES: BEGIN OF ty_item, @@ -68,7 +69,7 @@ ENDCLASS. -CLASS zcl_abapgit_html_toolbar IMPLEMENTATION. +CLASS ZCL_ABAPGIT_HTML_TOOLBAR IMPLEMENTATION. METHOD add. diff --git a/src/utils/zcl_abapgit_log.clas.abap b/src/utils/zcl_abapgit_log.clas.abap index be8ffcd28..e4f336c0b 100644 --- a/src/utils/zcl_abapgit_log.clas.abap +++ b/src/utils/zcl_abapgit_log.clas.abap @@ -57,11 +57,13 @@ CLASS zcl_abapgit_log DEFINITION METHODS prepare_log_for_display RETURNING VALUE(rt_log_out) TYPE zcl_abapgit_log=>tty_log_out . + + PRIVATE SECTION. ENDCLASS. -CLASS zcl_abapgit_log IMPLEMENTATION. +CLASS ZCL_ABAPGIT_LOG IMPLEMENTATION. METHOD add. @@ -216,13 +218,13 @@ CLASS zcl_abapgit_log IMPLEMENTATION. LOOP AT mt_log ASSIGNING . CASE -type. WHEN 'W'. - lv_icon = 'alert'. + lv_icon = 'attention'. lv_class = 'warning'. WHEN 'E'. - lv_icon = 'flame'. + lv_icon = 'error'. lv_class = 'error'. WHEN OTHERS. " ??? unexpected - lv_icon = 'flame'. + lv_icon = 'error'. lv_class = 'error'. ENDCASE.