From a74906c117a1e64d5c9d4f6703b63859de671a3d Mon Sep 17 00:00:00 2001 From: Abu Huraira Date: Thu, 3 Sep 2020 11:31:28 +0600 Subject: [PATCH] style fix for admin view and lang for menu module --- src/com_digicom/admin/layouts/edit/bundle.php | 9 +- .../admin/views/categories/tmpl/default.php | 252 ++++++------ .../admin/views/customers/tmpl/default.php | 9 +- .../admin/views/discounts/tmpl/default.php | 7 +- .../admin/views/licenses/tmpl/default.php | 7 +- .../admin/views/order/tmpl/edit.php | 385 +++++++++--------- .../admin/views/orders/tmpl/default.php | 3 +- .../admin/views/product/tmpl/edit.php | 34 +- .../admin/views/products/tmpl/default.php | 8 +- src/com_digicom/media/css/digicom-admin.css | 1 + src/com_digicom/media/less/digicom-admin.less | 3 +- .../language/en-GB/en-GB.mod_digicom_menu.ini | 1 + .../en-GB/en-GB.mod_digicom_menu.sys.ini | 1 + 13 files changed, 372 insertions(+), 348 deletions(-) diff --git a/src/com_digicom/admin/layouts/edit/bundle.php b/src/com_digicom/admin/layouts/edit/bundle.php index bd1dd432..0248b5fc 100644 --- a/src/com_digicom/admin/layouts/edit/bundle.php +++ b/src/com_digicom/admin/layouts/edit/bundle.php @@ -63,18 +63,17 @@ function jRemveProduct(id){ $bundle_source = $form_data->get('bundle_source'); ?> -
- +
+ +

renderField('bundle_source'); ?> +
- -
-
renderField('bundle_category'); ?>
diff --git a/src/com_digicom/admin/views/categories/tmpl/default.php b/src/com_digicom/admin/views/categories/tmpl/default.php index edcf3078..ff0b1330 100644 --- a/src/com_digicom/admin/views/categories/tmpl/default.php +++ b/src/com_digicom/admin/views/categories/tmpl/default.php @@ -46,142 +46,144 @@ - - - - - - - - - assoc) : ?> - - - - - - - - items as $i => $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; +
+
- - - - - - - - - - - - - state->get('list.direction'), $this->state->get('list.ordering')); ?> - - -
+ + + + + + + + assoc) : ?> + + + + + + + + items as $i => $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 = ""; - } - ?> - - - - - + - - assoc) : ?> - + + + - - + assoc) : ?> + - - - - - -
+ + + + + + + + + + + + + state->get('list.direction'), $this->state->get('list.ordering')); ?> + + +
- - - - - - - - - id); ?> - - published, $i, 'categories.', $canChange); ?> - - —', $item->level - 1) ?> - checked_out) : ?> - editor, $item->checked_out_time, 'categories.', $canCheckin); ?> - - - - escape($item->title); ?> - - escape($item->title); ?> - - - note)) : ?> - escape($item->alias)); ?> - - escape($item->alias), $this->escape($item->note)); ?> + else + { + $parentsStr = ""; + } + ?> +
+ + + + + + - - - escape($item->access_level); ?> - - association): ?> - id, $extension); ?> + + id); ?> + + published, $i, 'categories.', $canChange); ?> + + —', $item->level - 1) ?> + checked_out) : ?> + editor, $item->checked_out_time, 'categories.', $canCheckin); ?> + + + + escape($item->title); ?> + + escape($item->title); ?> + + note)) : ?> + escape($item->alias)); ?> + + escape($item->alias), $this->escape($item->note)); ?> + + - language == '*') : ?> - - - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + escape($item->access_level); ?> + + association): ?> + id, $extension); ?> + + - - id; ?> -
+ + language == '*') : ?> + + + language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + + + + id; ?> + + + + + +
pagination->getListFooter(); ?>
diff --git a/src/com_digicom/admin/views/customers/tmpl/default.php b/src/com_digicom/admin/views/customers/tmpl/default.php index c9740395..78390461 100644 --- a/src/com_digicom/admin/views/customers/tmpl/default.php +++ b/src/com_digicom/admin/views/customers/tmpl/default.php @@ -54,7 +54,7 @@ -
+
@@ -113,12 +113,13 @@
-
+ +
+ +
pagination->getListFooter(); ?>
-
- diff --git a/src/com_digicom/admin/views/discounts/tmpl/default.php b/src/com_digicom/admin/views/discounts/tmpl/default.php index 54995b53..af6597e6 100644 --- a/src/com_digicom/admin/views/discounts/tmpl/default.php +++ b/src/com_digicom/admin/views/discounts/tmpl/default.php @@ -79,7 +79,7 @@
-
+
@@ -199,10 +199,11 @@
-
+ +
+
pagination->getListFooter(); ?>
-
diff --git a/src/com_digicom/admin/views/licenses/tmpl/default.php b/src/com_digicom/admin/views/licenses/tmpl/default.php index c1ec07ed..9b2c1e47 100644 --- a/src/com_digicom/admin/views/licenses/tmpl/default.php +++ b/src/com_digicom/admin/views/licenses/tmpl/default.php @@ -64,7 +64,7 @@
-
+
@@ -197,10 +197,11 @@
-
+ +
+
pagination->getListFooter(); ?>
-
diff --git a/src/com_digicom/admin/views/order/tmpl/edit.php b/src/com_digicom/admin/views/order/tmpl/edit.php index 7a0658c8..4098fd55 100644 --- a/src/com_digicom/admin/views/order/tmpl/edit.php +++ b/src/com_digicom/admin/views/order/tmpl/edit.php @@ -48,213 +48,216 @@ id,$date,$order->status); ?>

- - - - - +
+
# - -
+ + + + + + + + + + + - - - - - - + - + products as $key=>$prod): + if(!isset($prod->id)) break; + //print_r($prod);die; + $id = $order->id; + + if (!isset($prod->currency)) { + $prod->currency = $configs->get('currency','USD'); + } + + $licenseid = $prod->id; + //print_r($prod);die; + $refund = DigiComHelperDigiCom::getRefunds($order->id, $prod->id); + $chargeback = DigiComHelperDigiCom::getChargebacks($order->id, $prod->id); + $cancelled = DigiComHelperDigiCom::isProductDeleted($prod->id);?> + + + + + - products as $key=>$prod): - if(!isset($prod->id)) break; - //print_r($prod);die; - $id = $order->id; + - if (!isset($prod->currency)) { - $prod->currency = $configs->get('currency','USD'); - } + - $licenseid = $prod->id; - //print_r($prod);die; - $refund = DigiComHelperDigiCom::getRefunds($order->id, $prod->id); - $chargeback = DigiComHelperDigiCom::getChargebacks($order->id, $prod->id); - $cancelled = DigiComHelperDigiCom::isProductDeleted($prod->id);?> - - - + + - + + + + + + + + + + + + 0):?> + + + + + + + 0):?> + + + + + + + 0):?> + + + + + + + + + - + + + + - - - + - - - - + + + + + + + + - - - - - - - - - - - 0):?> - - - - - - - 0):?> - - - - - - - 0):?> - - - - - - - - - - - - - - - - - - - - - - - - - - - + -
# + + + + + +
- - - -
+ name;?> + + quantity;?> + amount_paid - $refund - $chargeback; + echo DigiComHelperDigiCom::format_price($prod->price, $prod->currency, true, $configs); + $oll_courses_total += $price; + if ($refund > 0) + { + echo ' ('.JText::_("LICENSE_REFUND")." - ".DigiComHelperDigiCom::format_price($refund, $prod->currency, true, $configs).')'; + } + if ($chargeback > 0) + { + echo ' ('.JText::_("LICENSE_CHARGEBACK")." - ".DigiComHelperDigiCom::format_price($chargeback, $prod->currency, true, $configs).')'; + } ?> +
- name;?> +
+ price, $order->currency, true, $configs); + ?> - quantity;?> +
(promocode; ?>)discount, $order->currency, true, $configs);?>
tax, $order->currency, true, $configs);?>
currency, true, $configs); ?>
currency, true, $configs); ?>
currency, true, $configs); ?>
+ amount; + echo DigiComHelperDigiCom::format_price($value, $order->currency, true, $configs); + ?> amount_paid - $refund - $chargeback; - echo DigiComHelperDigiCom::format_price($prod->price, $prod->currency, true, $configs); - $oll_courses_total += $price; - if ($refund > 0) - { - echo ' ('.JText::_("LICENSE_REFUND")." - ".DigiComHelperDigiCom::format_price($refund, $prod->currency, true, $configs).')'; - } - if ($chargeback > 0) - { - echo ' ('.JText::_("LICENSE_CHARGEBACK")." - ".DigiComHelperDigiCom::format_price($chargeback, $prod->currency, true, $configs).')'; - } ?> +
+ amount_paid; + $value = $value - $refunds - $chargebacks; + echo DigiComHelperDigiCom::format_price($value, $order->currency, true, $configs); + ?>
- price, $order->currency, true, $configs); - ?> -
form->getLabel('status'); ?>form->getInput('status'); ?>
form->getLabel('amount_paid'); ?>form->getInput('amount_paid'); ?>
(promocode; ?>)discount, $order->currency, true, $configs);?>
tax, $order->currency, true, $configs);?>
currency, true, $configs); ?>
currency, true, $configs); ?>
currency, true, $configs); ?>
- amount; - echo DigiComHelperDigiCom::format_price($value, $order->currency, true, $configs); - ?> -
- amount_paid; - $value = $value - $refunds - $chargebacks; - echo DigiComHelperDigiCom::format_price($value, $order->currency, true, $configs); - ?> -
form->getLabel('status'); ?>form->getInput('status'); ?>
form->getLabel('amount_paid'); ?>form->getInput('amount_paid'); ?>
+ +
- - - - - - - - - - - - - - - logs as $key=>$log): ?> - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- id;?> - - type;?> - - message;?> - - status;?> - - created;?> - - ip;?> - - Show Logs -
+
+ + + + + + + + + + + + + + logs as $key=>$log): ?> + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ id;?> + + type;?> + + message;?> + + status;?> + + created;?> + + ip;?> + + Show Logs +
+
diff --git a/src/com_digicom/admin/views/orders/tmpl/default.php b/src/com_digicom/admin/views/orders/tmpl/default.php index 2e1314d0..ffb009b1 100644 --- a/src/com_digicom/admin/views/orders/tmpl/default.php +++ b/src/com_digicom/admin/views/orders/tmpl/default.php @@ -79,7 +79,7 @@ function OrderlistItemTask(id) { // Search tools bar echo JLayoutHelper::render('searchtools.orders', array('view' => $this)); ?> - +
@@ -233,6 +233,7 @@ function OrderlistItemTask(id) { ?>
+
pagination->getListFooter(); ?>
diff --git a/src/com_digicom/admin/views/product/tmpl/edit.php b/src/com_digicom/admin/views/product/tmpl/edit.php index 34e46e91..b872a109 100644 --- a/src/com_digicom/admin/views/product/tmpl/edit.php +++ b/src/com_digicom/admin/views/product/tmpl/edit.php @@ -93,17 +93,19 @@ 'general')); ?> +
+ + - - -
- form->getLabel('introtext'); ?> - form->getInput('introtext'); ?> -
+
+ form->getLabel('introtext'); ?> + form->getInput('introtext'); ?> +
-
- form->getLabel('fulltext'); ?> - form->getInput('fulltext'); ?> +
+ form->getLabel('fulltext'); ?> + form->getInput('fulltext'); ?> +
@@ -135,8 +137,16 @@
- - 'thumb-image')); ?> +
+
+ form->getControlGroup('image_intro'); ?> +
+
+
+ form->getControlGroup('image_full'); ?> +
+
+ diff --git a/src/com_digicom/admin/views/products/tmpl/default.php b/src/com_digicom/admin/views/products/tmpl/default.php index fe688d73..ded1b1d1 100644 --- a/src/com_digicom/admin/views/products/tmpl/default.php +++ b/src/com_digicom/admin/views/products/tmpl/default.php @@ -80,7 +80,7 @@ echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?> -
+
@@ -254,10 +254,12 @@
-
+ +
+ +
pagination->getListFooter(); ?>
-
diff --git a/src/com_digicom/media/css/digicom-admin.css b/src/com_digicom/media/css/digicom-admin.css index f05beb0d..a24889b2 100644 --- a/src/com_digicom/media/css/digicom-admin.css +++ b/src/com_digicom/media/css/digicom-admin.css @@ -149,6 +149,7 @@ ul.usergroups li { margin-top: 18px; } .js-stools { + height: 30px; margin-bottom: 10px; } .js-stools .clearfix:after { diff --git a/src/com_digicom/media/less/digicom-admin.less b/src/com_digicom/media/less/digicom-admin.less index 12352ff3..1a19a8e9 100644 --- a/src/com_digicom/media/less/digicom-admin.less +++ b/src/com_digicom/media/less/digicom-admin.less @@ -158,8 +158,9 @@ ul.usergroups li { margin-right: 52px; margin-top: 18px; } -// Search tools +// Search tools. .js-stools{ + height: 30px; margin-bottom: 10px; .clearfix:after{ clear: none; diff --git a/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.ini b/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.ini index 566c7d2e..321d55bb 100644 --- a/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.ini +++ b/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.ini @@ -3,6 +3,7 @@ ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM +COM_DIGICOM = "Digicom" MOD_DIGICOM_MENU="Administrator DigiCom Menu" MOD_DIGICOM_MENU_FIELD_SHOW_DIGICOM_MENU_LABEL="Show DigiCom Menu" MOD_DIGICOM_MENU_FIELD_SHOW_DIGICOM_MENU_DESC="Show or hide the DigiCom Menu on top while in editing sections" diff --git a/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.sys.ini b/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.sys.ini index edb6815e..18f8bf84 100644 --- a/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.sys.ini +++ b/src/mod_digicom_menu/language/en-GB/en-GB.mod_digicom_menu.sys.ini @@ -3,5 +3,6 @@ ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM +COM_DIGICOM = "Digicom" MOD_DIGICOM_MENU="Administrator DigiCom Menu" MOD_DIGICOM_MENU_XML_DESCRIPTION="DigiCom Administrator Menu Module"