Skip to content

Commit

Permalink
style fix for admin view and lang for menu module
Browse files Browse the repository at this point in the history
  • Loading branch information
@shamsbd71
shamsbd71 committed Sep 3, 2020
1 parent 8902d1d commit a74906c
Show file tree
Hide file tree
Showing 13 changed files with 372 additions and 348 deletions.
9 changes: 4 additions & 5 deletions src/com_digicom/admin/layouts/edit/bundle.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,17 @@ function jRemveProduct(id){
$bundle_source = $form_data->get('bundle_source');
?>

<fieldset class="adminform">

<legend><?php echo JText::_('COM_DIGICOM_PRODUCT_BUNDLE_FILES');?></legend>
<fieldset class="adminform panel-box">

<h3><?php echo JText::_('COM_DIGICOM_PRODUCT_BUNDLE_FILES');?></h3>
<div class="alert alert-info">
<?php echo JText::_("COM_DIGICOM_PRODUCT_BUNDLE_HEADER_NOTICE"); ?>
</div>

<?php echo $form->renderField('bundle_source'); ?>
<br>


<hr>

<div class="bundle_source_option <?php echo ($bundle_source == 'category' ? '' : ' hide');?>" id="bundle_source_category_option">
<?php echo $form->renderField('bundle_category'); ?>
</div>
Expand Down
252 changes: 127 additions & 125 deletions src/com_digicom/admin/views/categories/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,142 +46,144 @@
<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table table-striped" id="categoryList">
<thead>
<tr>
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" class="nowrap center">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
</th>
<th width="76%">
<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
<?php if ($this->assoc) : ?>
<th width="5%" class="hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th width="5%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
<th width="1%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($this->items as $i => $item) : ?>
<?php
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
$canEdit = $user->authorise('core.edit', $extension . '.category.' . $item->id);
$canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
$canEditOwn = $user->authorise('core.edit.own', $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
$canChange = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
<div class="panel">
<table class="table table-striped" id="categoryList">
<thead>
<tr>
<th width="1%" class="nowrap center hidden-phone">
<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
<th width="1%" class="center">
<?php echo JHtml::_('grid.checkall'); ?>
</th>
<th width="1%" class="nowrap center">
<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
</th>
<th width="76%">
<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
<?php if ($this->assoc) : ?>
<th width="5%" class="hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th width="5%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
<th width="1%" class="nowrap hidden-phone">
<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tbody>
<?php foreach ($this->items as $i => $item) : ?>
<?php
$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
$canEdit = $user->authorise('core.edit', $extension . '.category.' . $item->id);
$canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
$canEditOwn = $user->authorise('core.edit.own', $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
$canChange = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;

// Get the parents of item for sorting
if ($item->level > 1)
{
$parentsStr = "";
$_currentParentId = $item->parent_id;
$parentsStr = " " . $_currentParentId;
for ($i2 = 0; $i2 < $item->level; $i2++)
// Get the parents of item for sorting
if ($item->level > 1)
{
foreach ($this->ordering as $k => $v)
$parentsStr = "";
$_currentParentId = $item->parent_id;
$parentsStr = " " . $_currentParentId;
for ($i2 = 0; $i2 < $item->level; $i2++)
{
$v = implode("-", $v);
$v = "-" . $v . "-";
if (strpos($v, "-" . $_currentParentId . "-") !== false)
foreach ($this->ordering as $k => $v)
{
$parentsStr .= " " . $k;
$_currentParentId = $k;
break;
$v = implode("-", $v);
$v = "-" . $v . "-";
if (strpos($v, "-" . $_currentParentId . "-") !== false)
{
$parentsStr .= " " . $k;
$_currentParentId = $k;
break;
}
}
}
}
}
else
{
$parentsStr = "";
}
?>
<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id ?>" parents="<?php echo $parentsStr ?>" level="<?php echo $item->level ?>">
<td class="order nowrap center hidden-phone">
<?php
$iconClass = '';
if (!$canChange)
{
$iconClass = ' inactive';
}
elseif (!$saveOrder)
{
$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
?>
<span class="sortable-handler<?php echo $iconClass ?>">
<i class="icon-menu"></i>
</span>
<?php if ($canChange && $saveOrder) : ?>
<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
<?php endif; ?>
</td>
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'categories.', $canChange); ?>
</td>
<td>
<?php echo str_repeat('<span class="gi">&mdash;</span>', $item->level - 1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_digicom&task=category.edit&id=' . $item->id . '&extension=' . $extension); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
<?php endif; ?>
<span class="small" title="<?php echo $this->escape($item->path); ?>">
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
<?php else : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
else
{
$parentsStr = "";
}
?>
<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id ?>" parents="<?php echo $parentsStr ?>" level="<?php echo $item->level ?>">
<td class="order nowrap center hidden-phone">
<?php
$iconClass = '';
if (!$canChange)
{
$iconClass = ' inactive';
}
elseif (!$saveOrder)
{
$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
?>
<span class="sortable-handler<?php echo $iconClass ?>">
<i class="icon-menu"></i>
</span>
<?php if ($canChange && $saveOrder) : ?>
<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
<?php endif; ?>
</span>
</td>
<td class="small hidden-phone">
<?php echo $this->escape($item->access_level); ?>
</td>
<?php if ($this->assoc) : ?>
<td class="center hidden-phone">
<?php if ($item->association): ?>
<?php echo JHtml::_('CategoriesAdministrator.association', $item->id, $extension); ?>
</td>
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'categories.', $canChange); ?>
</td>
<td>
<?php echo str_repeat('<span class="gi">&mdash;</span>', $item->level - 1) ?>
<?php if ($item->checked_out) : ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<a href="<?php echo JRoute::_('index.php?option=com_digicom&task=category.edit&id=' . $item->id . '&extension=' . $extension); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>
<?php endif; ?>
<span class="small" title="<?php echo $this->escape($item->path); ?>">
<?php if (empty($item->note)) : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
<?php else : ?>
<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
<?php endif; ?>
</span>
</td>
<?php endif; ?>
<td class="small nowrap hidden-phone">
<?php if ($item->language == '*') : ?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else: ?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<td class="small hidden-phone">
<?php echo $this->escape($item->access_level); ?>
</td>
<?php if ($this->assoc) : ?>
<td class="center hidden-phone">
<?php if ($item->association): ?>
<?php echo JHtml::_('CategoriesAdministrator.association', $item->id, $extension); ?>
<?php endif; ?>
</td>
<?php endif; ?>
</td>
<td class="center hidden-phone">
<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
<?php echo (int) $item->id; ?></span>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<td class="small nowrap hidden-phone">
<?php if ($item->language == '*') : ?>
<?php echo JText::alt('JALL', 'language'); ?>
<?php else: ?>
<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
<?php endif; ?>
</td>
<td class="center hidden-phone">
<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
<?php echo (int) $item->id; ?></span>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<div class="pagination-centered">
<?php echo $this->pagination->getListFooter(); ?>
</div>
Expand Down
9 changes: 5 additions & 4 deletions src/com_digicom/admin/views/customers/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</div>
</div>

<div id="editcell" >
<div id="editcell" class="panel">

<table class="adminlist table">
<thead>
Expand Down Expand Up @@ -113,12 +113,13 @@
<?php endif; ?>
</tbody>
</table>
<div class="pagination-centered">

</div>

<div class="pagination-centered">
<?php echo $this->pagination->getListFooter(); ?>
</div>

</div>

<input type="hidden" name="option" value="com_digicom" />
<input type="hidden" name="view" value="customers" />
<input type="hidden" name="task" value="" />
Expand Down
7 changes: 4 additions & 3 deletions src/com_digicom/admin/views/discounts/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else: ?>
<div id="editcell" >
<div id="editcell" class="panel">
<table class="adminlist table">
<thead>

Expand Down Expand Up @@ -199,10 +199,11 @@

</table>

<div class="pagination-centered">

</div>
<div class="pagination-centered">
<?php echo $this->pagination->getListFooter(); ?>
</div>
</div>
<?php endif; ?>
<input type="hidden" name="option" value="com_digicom" />
<input type="hidden" name="task" value="" />
Expand Down
7 changes: 4 additions & 3 deletions src/com_digicom/admin/views/licenses/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else: ?>
<div id="editcell" >
<div id="editcell" class="panel">
<table class="adminlist table">
<thead>

Expand Down Expand Up @@ -197,10 +197,11 @@

</table>

<div class="pagination-centered">

</div>
<div class="pagination-centered">
<?php echo $this->pagination->getListFooter(); ?>
</div>
</div>
<?php endif; ?>
<input type="hidden" name="option" value="com_digicom" />
<input type="hidden" name="task" value="" />
Expand Down
Loading

0 comments on commit a74906c

Please sign in to comment.