SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-02 13:03:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

stage: move filter right, fix stage tab width, css

Browse Source
This commit is contained in:
sbcgua 2017-02-18 11:20:23 +02:00
parent abead4084e
commit 12c3c3bbe1
2 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zabapgit_css_common.w3mi.data.css
View File

@ -47,7 +47,9 @@ input:focus, textarea:focus {
.crossout { text-decoration: line-through !important; } .crossout { text-decoration: line-through !important; }
.right { text-align:right; } .right { text-align:right; }
.paddings { padding: 0.5em 0.5em; } .paddings { padding: 0.5em 0.5em; }
.pad-sides { padding: 0 0.3em; } .pad-sides { padding-left: 0.3em; padding-right: 0.3em; }
.margin-v5 { margin-top: 0.5em; margin-bottom: 0.5em; }
.indent5em { padding-left: 0.5em; }
.pad4px { padding: 4px; } .pad4px { padding: 4px; }
.w100 { width: 100%; } .w100 { width: 100%; }
.w40 { width: 40%; } .w40 { width: 40%; }
@ -360,6 +362,9 @@ table.repo_tab {
} }
/* STAGE */ /* STAGE */
div.stage-container { width: 850px; }
input.stage-filter { width: 18em; }
.stage_tab { .stage_tab {
border: 1px solid #DDD; border: 1px solid #DDD;
background: #fff; background: #fff;
@ -388,6 +393,7 @@ table.repo_tab {
color: #444 !important; color: #444 !important;
font-weight: bold; font-weight: bold;
} }
.stage_tab td.cmd { cursor: pointer; } .stage_tab td.cmd { cursor: pointer; }
.stage_tab td.cmd a { padding: 0px 4px; } .stage_tab td.cmd a { padding: 0px 4px; }
.stage_tab th.cmd a { padding: 0px 4px; } .stage_tab th.cmd a { padding: 0px 4px; }

85
src/zabapgit_page_stage.prog.abap
View File

@ -31,22 +31,26 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
METHODS: METHODS:
render_list render_list
RETURNING VALUE(ro_html) TYPE REF TO lcl_html, RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
render_file render_file
IMPORTING iv_context TYPE string IMPORTING iv_context TYPE string
is_file TYPE ty_file is_file TYPE ty_file
is_item TYPE ty_item OPTIONAL is_item TYPE ty_item OPTIONAL
RETURNING VALUE(ro_html) TYPE REF TO lcl_html, RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
render_menu
render_actions
RETURNING VALUE(ro_html) TYPE REF TO lcl_html, RETURNING VALUE(ro_html) TYPE REF TO lcl_html,
read_last_changed_by read_last_changed_by
IMPORTING is_file TYPE ty_file IMPORTING is_file TYPE ty_file
RETURNING VALUE(rv_user) TYPE xubname. RETURNING VALUE(rv_user) TYPE xubname,
METHODS process_stage_list process_stage_list
IMPORTING it_postdata TYPE cnht_post_data_tab IMPORTING it_postdata TYPE cnht_post_data_tab
RAISING lcx_exception. RAISING lcx_exception,
METHODS build_menu
RETURNING VALUE(ro_menu) TYPE REF TO lcl_html_toolbar. build_menu
RETURNING VALUE(ro_menu) TYPE REF TO lcl_html_toolbar.
ENDCLASS. ENDCLASS.
@ -162,19 +166,21 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
CREATE OBJECT ro_html. CREATE OBJECT ro_html.
ro_html->add( '<table id="stageTab" class="stage_tab">' ). ro_html->add( '<table id="stageTab" class="stage_tab w100">' ).
" Local changes " Local changes
LOOP AT ms_files-local ASSIGNING <ls_local>. LOOP AT ms_files-local ASSIGNING <ls_local>.
AT FIRST. AT FIRST.
ro_html->add('<thead><tr class="local">'). ro_html->add( '<thead><tr class="local">' ).
ro_html->add('<th>Type</th>'). ro_html->add( '<th>Type</th>' ).
ro_html->add('<th>Files to add (click to see diff)</th>' ). ro_html->add( '<th>Files to add (click to see diff)</th>' ).
ro_html->add('<th>Changed by</th>'). ro_html->add( '<th>Changed by</th>' ).
ro_html->add('<th></th>' ). " Status ro_html->add( '<th></th>' ). " Status
ro_html->add('<th class="cmd">&#x2193;<a>add</a>/<a>reset</a>&#x2193;</th>' ). ro_html->add( '<th class="cmd">' ).
ro_html->add('</tr></thead>'). ro_html->add( '<a>add</a>&#x2193; <a>reset</a>&#x2193;' ).
ro_html->add('<tbody>'). ro_html->add( '</th>' ).
ro_html->add( '</tr></thead>' ).
ro_html->add( '<tbody>' ).
ENDAT. ENDAT.
ro_html->add( render_file( ro_html->add( render_file(
@ -194,8 +200,9 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
ro_html->add( '<th></th>' ). " Type ro_html->add( '<th></th>' ). " Type
ro_html->add( '<th colspan="2">Files to remove or non-code</th>' ). ro_html->add( '<th colspan="2">Files to remove or non-code</th>' ).
ro_html->add( '<th></th>' ). " Status ro_html->add( '<th></th>' ). " Status
ro_html->add( '<th class="cmd">' && ro_html->add( '<th class="cmd">' ).
'&#x2193;<a>ignore</a><a>remove</a><a>reset</a>&#x2193;</th>' ). ro_html->add( '<a>ignore</a>&#x2193; <a>remove</a>&#x2193; <a>reset</a>&#x2193;' ).
ro_html->add( '</th>' ).
ro_html->add( '</tr></thead>' ). ro_html->add( '</tr></thead>' ).
ro_html->add( '<tbody>' ). ro_html->add( '<tbody>' ).
ENDAT. ENDAT.
@ -252,38 +259,52 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
ro_html->add( '<div class="repo">' ). ro_html->add( '<div class="repo">' ).
ro_html->add( lcl_gui_chunk_lib=>render_repo_top( mo_repo ) ). ro_html->add( lcl_gui_chunk_lib=>render_repo_top( mo_repo ) ).
ro_html->add( lcl_gui_chunk_lib=>render_js_error_banner( ) ). ro_html->add( lcl_gui_chunk_lib=>render_js_error_banner( ) ).
ro_html->add( render_menu( ) ).
ro_html->add( '<div class="stage-container">' ).
ro_html->add( render_actions( ) ).
ro_html->add( render_list( ) ). ro_html->add( render_list( ) ).
ro_html->add( '</div>' ). ro_html->add( '</div>' ).
ro_html->add( '</div>' ).
ENDMETHOD. "render_content ENDMETHOD. "render_content
METHOD render_menu. METHOD render_actions.
DATA lv_local_count TYPE i. DATA: lv_local_count TYPE i,
lv_add_all_txt TYPE string.
CREATE OBJECT ro_html. CREATE OBJECT ro_html.
lv_local_count = lines( ms_files-local ). lv_local_count = lines( ms_files-local ).
IF lv_local_count > 0.
lv_add_all_txt = |Add all and commit ({ lv_local_count })|.
" Otherwise empty, but the element (id) is preserved for JS
ENDIF.
ro_html->add( '<div class="paddings">' ). ro_html->add( '<table class="w100 margin-v5"><tr>' ).
" Action buttons
ro_html->add( '<td class="indent5em">' ).
ro_html->add_a( iv_act = 'errorStub(event)' " Will be reinit by JS ro_html->add_a( iv_act = 'errorStub(event)' " Will be reinit by JS
iv_typ = gc_action_type-onclick iv_typ = gc_action_type-onclick
iv_id = 'commitButton' iv_id = 'commitButton'
iv_style = 'display: none' iv_style = 'display: none'
iv_txt = 'Commit (<span id="fileCounter"></span>)' iv_txt = 'Commit (<span id="fileCounter"></span>)'
iv_opt = gc_html_opt-strong ) ##NO_TEXT. iv_opt = gc_html_opt-strong ) ##NO_TEXT.
IF lv_local_count > 0. ro_html->add_a( iv_act = |{ c_action-stage_all }|
ro_html->add_a( iv_act = |{ c_action-stage_all }| iv_id = 'commitAllButton'
iv_id = 'commitAllButton' iv_txt = lv_add_all_txt ) ##NO_TEXT.
iv_txt = |Add all and commit ({ lv_local_count })| ) ##NO_TEXT. ro_html->add( '</td>' ).
ENDIF.
ro_html->add( '</div>' ).
ro_html->add( '<div>' ). " Filter bar
ro_html->add( '<input id="objectSearch" type="search" placeholder="Filter objects">' ). ro_html->add( '<td class="right">' ).
ro_html->add( '</div>' ). ro_html->add( '<input class="stage-filter" id="objectSearch"' &&
' type="search" placeholder="Filter objects">' ).
ro_html->add( '</td>' ).
ENDMETHOD. "render_menu ro_html->add( '</tr></table>' ).
ENDMETHOD. "render_actions
METHOD scripts. METHOD scripts.