Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix seq widgets #123

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix seq widgets #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
673c191
Fix sequence widgets
krysros Jun 12, 2022
59d87e3
Port panels to cards
krysros Jun 12, 2022
f03efa8
Replace card bg- with card border-
krysros Jun 12, 2022
252ca57
Fix and simplify card-header
krysros Jun 12, 2022
a23d717
Update CONTRIBUTORS.txt
krysros Jun 12, 2022
97d1cd7
Update CHANGES.txt
krysros Jun 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
- Remove spurious styles definition
https://github.com/Pylons/deform/pull/504 [lelit]

- Fix sequence item and replace panels (Bootstrap 3) by cards (Bootstrap 4)
https://github.com/Pylons/deform/pull/518 [krysros]

.. _2.0.15:

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,4 @@ Contributors
- Steve Piercy 2020/05/11
- John Haiducek 2020/06/20
- Maksym Shalenyi 2020/06/20
- Krystian Rosiński 2022/06/12
27 changes: 10 additions & 17 deletions deformdemo/templates/form.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,24 @@
</div>


<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Demo: ${title}</h3>
</div>
<div class="panel-body">
<div class="card border-primary">
<div class="card-header">Demo: ${title}</div>
<div class="card-body">
<div id="form" tal:content="structure form"/>
</div>
</div>

<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">Captured submission</h3>
</div>
<div class="panel-body">
<div class="card border-info">
<div class="card-header">Captured submission</div>
<div class="card-body">
<pre style="border: none; background-color: #FFF" class="highlight" id="captured" tal:content="structure captured"/>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Code <a href="${request.resource_url(request.root, 'allcode', query={'start':start, 'end':end}, anchor='line-%s' % start)}"><small>
(click to show in context)</small></a>
</h3>
</div>
<div class="panel-body highlight">
<div class="card">
<div class="card-header">Code <a href="${request.resource_url(request.root, 'allcode', query={'start':start, 'end':end}, anchor='line-%s' % start)}"><small>
(click to show in context)</small></a></div>
<div class="card-body highlight">
<pre style="border: none; background-color: #FFF" tal:content="structure code"/>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions deformdemo/templates/popup_example.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

<div metal:fill-slot="main">

<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Demo: ${title}</h3>
<div class="card border-primary">
<div class="card-header">
<h3 class="card-title">Demo: ${title}</h3>
</div>

<div id="opener">
Expand All @@ -41,22 +41,22 @@

</div>

<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">Captured submission</h3>
<div class="card border-info">
<div class="card-header">
<h3 class="card-title">Captured submission</h3>
</div>
<div class="panel-body">
<div class="card-body">
<pre style="border: none; background-color: #FFF" class="highlight" id="captured" tal:content="structure captured"/>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Code <a href="${request.resource_url(request.root, 'allcode', query={'start':start, 'end':end}, anchor='line-%s' % start)}"><small>
<div class="card">
<div class="card-header">
<h3 class="card-title">Code <a href="${request.resource_url(request.root, 'allcode', query={'start':start, 'end':end}, anchor='line-%s' % start)}"><small>
(click to show in context)</small></a>
</h3>
</div>
<div class="panel-body highlight">
<div class="card-body highlight">
<pre style="border: none; background-color: #FFF" tal:content="structure code"/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion deformdemo/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3371,7 +3371,7 @@ def test_submit_complex_interaction(self):
seq_height = findcss(".deform-seq-item").size["height"]

persons = findxpaths(
'//div[@class="panel-heading"][contains(text(), "Person")]'
'//div[@class="card-header"][contains(text(), "Person")]'
)

# Move item 3 up two
Expand Down