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

[4.0] [com_associations] Improving display of the sidebyside page #27111

Merged
merged 4 commits into from
Nov 30, 2019
Merged

[4.0] [com_associations] Improving display of the sidebyside page #27111

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
01abeac
[4.0] [com_associations] Improving display of the sidebyside page
infograf768 Nov 21, 2019
e02b392
taking off margin-top in mobile view
infograf768 Nov 23, 2019
d0f20dd
change max-width, add margin-top
infograf768 Nov 29, 2019
bb40f8c
Merge branch '4.0-dev' into 4.0_sidebyside_display
infograf768 Nov 29, 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: 2 additions & 2 deletions administrator/components/com_associations/Field/Modal/AssociationField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ protected function getInput()
// The active item id field.
$value = (int) $this->value > 0 ? (int) $this->value : '';

Factory::getDocument()->addScriptOptions('modal-associations', ['itemId' => $value]);
HTMLHelper::_('script', 'com_associations/modal-associations.min.js', ['version' => 'auto', 'relative' => true]);
Factory::getDocument()->addScriptOptions('admin_associations_modal', ['itemId' => $value]);
HTMLHelper::_('script', 'com_associations/admin_associations_modal.min.js', ['version' => 'auto', 'relative' => true]);

// Setup variables for display.
$html = array();
Expand Down
9 changes: 5 additions & 4 deletions administrator/components/com_associations/tmpl/association/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@
<div class="outer-panel" id="right-panel">
<div class="inner-panel">
<div class="language-selector">
<h3 class="target-text"><?php echo Text::_('COM_ASSOCIATIONS_ASSOCIATED_ITEM'); ?></h3>
<?php echo $this->form->getInput('modalassociation'); ?>
<?php echo $this->form->getInput('itemlanguage'); ?>
<div class="clearfix">
<h3 class="target-text"><?php echo Text::_('COM_ASSOCIATIONS_ASSOCIATED_ITEM'); ?></h3>
</div>
<div class="langtarget"><?php echo $this->form->getInput('itemlanguage'); ?></div>
<div class="modaltarget"><?php echo $this->form->getInput('modalassociation'); ?></div>
</div>
<iframe id="target-association" name="target-association" title="target-association"
src="<?php echo $this->defaultTargetSrc; ?>"
Expand All @@ -72,7 +74,6 @@
</iframe>
</div>
</div>

</div>

<input type="hidden" name="task" value="">
Expand Down
60 changes: 58 additions & 2 deletions build/media_source/com_associations/css/sidebyside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,26 @@
border: 0 !important;
}

.sidebyside .langtarget {
float: left;
}

.sidebyside .modaltarget {
float: left;
margin-left: .5rem;
}

.sidebyside #target-association {
margin-top: .5rem;
}

.sidebyside #reference-association {
margin-top: 3.35rem;
}

.target-text {
float: left;
width: 30%;
width: auto;
}

/* RTL overrides */
Expand All @@ -54,17 +71,56 @@ html[dir=rtl] .sidebyside .full-width .inner-panel {
padding: 0 !important;
}

html[dir=rtl] .sidebyside .langtarget {
float: right;
}

html[dir=rtl] .sidebyside .modaltarget {
float: right;
margin-left: 0;
margin-right: .5rem;
}

html[dir=rtl] .target-text {
float: right;
}

/* Responsive layout */
@media (max-width: 767px) {
@media (max-width: 1140px) {
.sidebyside #reference-association {
margin-top: 6.2rem;
}

.sidebyside .langtarget {
float: none;
}

.sidebyside .modaltarget {
float: left;
margin-left: 0;
}

html[dir=rtl] .sidebyside .langtarget {
float: none;
}

html[dir=rtl] .sidebyside .modaltarget {
float: right;
margin-left: 0;
margin-right: 0;
}
}

@media (max-width: 767.98px) {
.sidebyside .outer-panel {
float: none;
width: 100%;
}

.sidebyside #reference-association {
margin-top: 0;
}

.sidebyside #left-panel .inner-panel {
padding: 0;
}
Expand Down