-
Notifications
You must be signed in to change notification settings - Fork 442
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate project package table to bootstrap.
The project show view get migrated to bootstrap. The package table is a partial of it. In order to get this done and to serve it to the beta users, the table needs to be moved to bootstrap.
- Loading branch information
1 parent
39fd89a
commit 94aad6a
Showing
5 changed files
with
74 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/api/app/views/webui2/webui/project/_project_inherited_packages.html.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
.card-body | ||
- if inherited_packages.present? | ||
.obs-dataTable | ||
%table.table.table-fixed.table-striped.table-bordered#inherited-packages-table | ||
%thead | ||
%tr | ||
%th.w-75 Name | ||
%th From | ||
%tbody | ||
- inherited_packages.each do |package| | ||
%tr | ||
%td | ||
= link_to(package.first, package_show_path(package: package.first, project: package.second)) | ||
%td | ||
= package.second |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
.card-body | ||
- if packages.present? | ||
.obs-dataTable | ||
%table.table.table-fixed.table-striped.table-bordered#packages-table | ||
%thead | ||
%tr | ||
%th.w-75 Name | ||
%th.w-25 Changed | ||
%tbody | ||
- packages.each do |package| | ||
%tr | ||
%td | ||
= link_to(package.first, package_show_path(package: package.first, project: project)) | ||
%td | ||
= time_ago_in_words(Time.at(package.second.to_i)) | ||
- else | ||
%p This project does not contain any packages | ||
|
||
- if User.current.can_modify?(project) | ||
- if show_package_actions? | ||
.pt-4 | ||
%ul.list-inline | ||
%li.list-inline-item | ||
= link_to(project_new_package_path(project: project)) do | ||
%i.fas.fa-plus-circle.text-primary | ||
Create package | ||
%li.list-inline-item | ||
= link_to(project_new_package_branch_path(project: project)) do | ||
%i.fas.fa-code-branch.text-primary | ||
Branch existing package |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,16 +39,26 @@ | |
= render partial: 'webui2/shared/buildresult_box', locals: { project: @project.name } | ||
.list | ||
.card | ||
%h5.card-header | ||
Packages | ||
= "(#{@packages.length})" | ||
= render partial: 'project_packages' | ||
.bg-light | ||
%ul.nav.nav-tabs.pt-2.px-3.flex-nowrap#packages-tabs{ role: 'tablist' } | ||
%li.nav-item | ||
%a.nav-link.active#packages-tab{ href: '#packages', role: 'tab', data: { toggle: 'tab' }, | ||
aria: { controls: 'packages', selected: 'true' } } | ||
Packages (#{@packages.length}) | ||
- if @ipackages.present? | ||
%li.nav-item | ||
%a.nav-link#inherited-packages-tab{ href: '#inherited-packages', role: 'tab', data: { toggle: 'tab' }, | ||
aria: { controls: 'inherited-packages', selected: 'false' } } | ||
Inherited Packages (#{@ipackages.length}) | ||
.tab-content#packages-tabs-content | ||
.tab-pane.fade.show.active#packages{ role: 'tabpanel', aria: { labelledby: 'packages-tab' } } | ||
= render partial: 'project_packages', locals: { project: @project, packages: @packages } | ||
.tab-pane.fade#inherited-packages{ role: 'tabpanel', aria: { labelledby: 'inherited-packages-tab' } } | ||
= render partial: 'project_inherited_packages', locals: { inherited_packages: @ipackages } | ||
.comments | ||
.card | ||
%h5.card-header | ||
Comments for | ||
= @project | ||
(#{ @comments.length}) | ||
Comments for #{@project} (#{@comments.length}) | ||
.card-body#comments | ||
= render partial: 'webui2/webui/comment/show', locals: { commentable: @project } | ||
|
||
|
@@ -67,3 +77,6 @@ | |
- elsif [email protected]_locked? | ||
= render partial: 'webui2/webui/request/add_role_request_dialog', locals: { project: @project } | ||
= render partial: 'webui2/webui/request/delete_request_dialog', locals: { project: @project } | ||
|
||
= content_for :ready_function do | ||
initializeDataTable('#packages-table, #inherited-packages-table'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters