Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Input width horizontal scroll fix #1265

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Input width horizontal scroll fix #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec84f06
Input width
Nov 13, 2018
585698a
Only updating standard skin CSS, other skins may differ
Nov 13, 2018
f592c43
Merge branch 'develop' into input-width
simonschaufi Oct 28, 2019
c457129
Merge branch 'develop' into input-width
simonschaufi Nov 19, 2019
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
4 changes: 4 additions & 0 deletions skins/standard/floater.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
border: 3px double #bbb;
}

#floater_innerwrap .input-width {
width: calc(100% - 125px);
}

#floater_innerwrap select[disabled],
#floater_innerwrap input[disabled],
#floater_innerwrap button[disabled],
Expand Down
6 changes: 3 additions & 3 deletions templates/scripts/floaters/add_edit_activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<ul>
<li>
<label for="name"><?php echo $this->translate('activity') ?>:</label>
<?php echo $this->formText('name', $this->activity['name'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('name', $this->activity['name'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="defaultRate"><?php echo $this->translate('default_rate') ?>:</label>
Expand Down Expand Up @@ -118,7 +118,7 @@
'id' => 'activityGroups',
'multiple' => 'multiple',
'size' => 5,
'style' => 'width:620px'
'class' => 'input-width'
], $this->groups); ?>
</li>
</ul>
Expand All @@ -131,7 +131,7 @@
'cols' => 30,
'rows' => 5,
'class' => 'comment',
'style' => 'width:620px'
'class' => 'input-width'
]); ?>
</li>
</ul>
Expand Down
34 changes: 17 additions & 17 deletions templates/scripts/floaters/add_edit_customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
<ul>
<li>
<label for="name"><?php echo $this->translate('customer') ?>*:</label>
<?php echo $this->formText('name', $this->customer['name'], ['required' => 'required', 'style' => 'width:620px']); ?>
<?php echo $this->formText('name', $this->customer['name'], ['required' => 'required', 'class' => 'input-width']); ?>
</li>
<li>
<label for="vat"><?php echo $this->translate('vat') ?>:</label>
<?php echo $this->formText('vat', $this->customer['vat'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('vat', $this->customer['vat'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="visible"><?php echo $this->translate('visibility') ?>:</label>
Expand All @@ -65,46 +65,46 @@
<div class="multiFields">
<?php echo $this->formPassword('password', '', [
'disabled' => (!$this->customer['password']) ? 'disabled' : '',
'style' => 'width:620px'
'class' => 'input-width'
]); ?><br/>
<?php echo $this->formCheckbox('no_password', '1', ['class' => 'disableInput', 'checked' => !$this->customer['password']]);
echo $this->translate('nopassword') ?>
</div>
</li>
<li>
<label for="timezone"><?php echo $this->translate('timezone') ?>:</label>
<?php echo $this->timeZoneSelect('timezone', $this->customer['timezone'], ['style' => 'width:620px']); ?>
<?php echo $this->timeZoneSelect('timezone', $this->customer['timezone'], ['class' => 'input-width']); ?>
</li>
</ul>
</fieldset>
<fieldset id="address">
<ul>
<li>
<label for="company"><?php echo $this->translate('company') ?>:</label>
<?php echo $this->formText('company', $this->customer['company'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('company', $this->customer['company'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="contactPerson"><?php echo $this->translate('contactPerson') ?>:</label>
<?php echo $this->formText('contactPerson', $this->customer['contact'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('contactPerson', $this->customer['contact'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="street"><?php echo $this->translate('street') ?>:</label>
<?php echo $this->formText('street', $this->customer['street'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('street', $this->customer['street'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="zipcode"><?php echo $this->translate('zipcode') ?>:</label>
<?php echo $this->formText('zipcode', $this->customer['zipcode'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('zipcode', $this->customer['zipcode'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="city"><?php echo $this->translate('city') ?>:</label>
<?php echo $this->formText('city', $this->customer['city'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('city', $this->customer['city'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="country"><?php echo $this->translate('country') ?>:</label>
<?php echo $this->formSelect('country', $this->customer['country'], [
'class' => 'formfield',
'id' => 'country',
'style' => 'width:620px'
'class' => 'input-width'
], $this->countries); ?>
</li>
</ul>
Expand All @@ -113,23 +113,23 @@
<ul>
<li>
<label for="phone"><?php echo $this->translate('telephon') ?>:</label>
<?php echo $this->formText('phone', $this->customer['phone'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('phone', $this->customer['phone'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="fax"><?php echo $this->translate('fax') ?>:</label>
<?php echo $this->formText('fax', $this->customer['fax'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('fax', $this->customer['fax'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="mobile"><?php echo $this->translate('mobilephone') ?>:</label>
<?php echo $this->formText('mobile', $this->customer['mobile'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('mobile', $this->customer['mobile'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="mail"><?php echo $this->translate('mail') ?>:</label>
<?php echo $this->formText('mail', $this->customer['mail'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('mail', $this->customer['mail'], ['class' => 'input-width']); ?>
</li>
<li>
<label for="homepage"><?php echo $this->translate('homepage') ?>:</label>
<?php echo $this->formText('homepage', $this->customer['homepage'], ['style' => 'width:620px']); ?>
<?php echo $this->formText('homepage', $this->customer['homepage'], ['class' => 'input-width']); ?>
</li>
</ul>
</fieldset>
Expand All @@ -142,7 +142,7 @@
'id' => 'customerGroups',
'multiple' => 'multiple',
'size' => 5,
'style' => 'width:620px'
'class' => 'input-width'
], $this->groups); ?>
</li>
</ul>
Expand All @@ -155,7 +155,7 @@
'cols' => 30,
'rows' => 5,
'class' => 'comment',
'style' => 'width:620px'
'class' => 'input-width'
]); ?>
</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions templates/scripts/floaters/add_edit_project.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
<fieldset id="general">
<ul>
<li><label for="name"><?php echo $this->translate('project') ?>*:</label>
<?php echo $this->formText('name', $this->project['name'], ['required' => 'required', 'style' => 'width:620px']); ?>
<?php echo $this->formText('name', $this->project['name'], ['required' => 'required', 'class' => 'input-width']); ?>
</li>
<li><label for="customerID"><?php echo $this->translate('customer') ?>:</label>
<?php echo $this->formSelect('customerID', $this->project['customerID'], ['class' => 'formfield', 'style' => 'width:620px'], $this->customers); ?>
<?php echo $this->formSelect('customerID', $this->project['customerID'], ['class' => 'formfield', 'class' => 'input-width'], $this->customers); ?>
</li>
<li><label for="visible"><?php echo $this->translate('visibility') ?>:</label>
<?php echo $this->formCheckbox('visible', '1', ['checked' => $this->project['visible'] || !$this->id]); ?>
Expand Down Expand Up @@ -142,7 +142,7 @@
'id' => 'projectGroups',
'multiple' => 'multiple',
'size' => 5,
'style' => 'width:620px'
'class' => 'input-width'
], $this->groups); ?>
</li>
</ul>
Expand All @@ -154,7 +154,7 @@
'cols' => 30,
'rows' => 5,
'class' => 'comment',
'style' => 'width:620px'
'class' => 'input-width'
]); ?>
</li>
</ul>
Expand Down