vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: responsiveness of address and contact list

Browse source
This commit is contained in:
barredterra 2023-08-31 12:04:04 +02:00
parent 9436c14265
commit b312629b4b
3 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frappe/public/js/frappe/form/templates/address_list.html
View file

@ -1,19 +1,22 @@
<div class="clearfix"></div>
{% for(var i=0, l=addr_list.length; i<l; i++) { %}
<div class="address-box">
<p class="h6">
{%= i+1 %}. {%= addr_list[i].address_title %}{% if(addr_list[i].address_type!="Other") { %}
<span class="text-muted">({%= __(addr_list[i].address_type) %})</span>{% } %}
<a href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs edit-btn">
{%= __("Edit") %}</a>
<p class="h6 flex flex-wrap">
{%= i+1 %}. {%= addr_list[i].address_title %}
{% if(addr_list[i].address_type!="Other") { %}
&#183;&nbsp;<span class="text-muted">{%= __(addr_list[i].address_type) %}</span>
{% } %}
{% if(addr_list[i].is_primary_address) { %}
<span class="text-muted">({%= __("Primary") %})</span>{% } %}
&#183;&nbsp;<span class="text-muted">{%= __("Primary") %}</span>
{% } %}
{% if(addr_list[i].is_shipping_address) { %}
<span class="text-muted">({%= __("Shipping") %})</span>{% } %}
&#183;&nbsp;<span class="text-muted">{%= __("Shipping") %}</span>
{% } %}
{% if(addr_list[i].disabled) { %}
<span class="text-muted">({%= __("Disabled") %})</span>{% } %}
<a href="/app/Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs pull-right"
style="margin-top:-3px; margin-right: -5px;">
{%= __("Edit") %}</a>
&#183;&nbsp;<span class="text-muted">{%= __("Disabled") %}</span>
{% } %}
</p>
<p>{%= addr_list[i].display %}</p>
</div>

14
frappe/public/js/frappe/form/templates/contact_list.html
View file

@ -1,18 +1,18 @@
<div class="clearfix"></div>
{% for(const contact of contact_list) { %}
<div class="address-box">
<p class="h6 flex align-center">
<a href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
class="btn btn-xs btn-default edit-btn">
{%= __("Edit") %}
</a>
<p class="h6 flex flex-wrap">
{%= contact.first_name %} {%= contact.last_name %}
{% if(contact.is_primary_contact) { %}
<span class="text-muted">&nbsp;({%= __("Primary") %})</span>
&#183;&nbsp;<span class="text-muted">{%= __("Primary Contact") %}</span>
{% } %}
{% if(contact.designation){ %}
<span class="text-muted">&ndash; {%= contact.designation %}</span>
&#183;&nbsp;<span class="text-muted"> {%= contact.designation %}</span>
{% } %}
<a href="/app/Form/Contact/{%= encodeURIComponent(contact.name) %}"
class="btn btn-xs btn-default ml-auto">
{%= __("Edit") %}
</a>
</p>
{% if (contact.phone || contact.mobile_no || contact.phone_nos.length > 0) { %}
<p>

6
frappe/public/scss/common/controls.scss
View file

@ -149,9 +149,15 @@ select.form-control {
border-radius: var(--border-radius);
font-size: var(--text-sm);
word-wrap: break-word;
position: relative;
p:last-child {
margin-bottom: 0;
}
.edit-btn {
position: absolute;
top: 5px;
right: 5px;
}
}
.action-btn {
position: absolute;