Skip to content

Commit bd4934f

Browse files
ankush-maherwalankush-maherwal
authored
Merge pull request #141 from techjoomla/release-3.0.2
Release 3.0.2
2 parents b11c8b0 + c3cbcf3 commit bd4934f

File tree

13 files changed

+614
-275
lines changed

13 files changed

+614
-275
lines changed

‎src/com_tjnotifications/admin/sql/updates/mysql/1.0.6.sql‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
----Change table Key;
2-
3-
ALTER TABLE `#__tj_notification_user_exclusions` DROP INDEX `client1`;
4-
ALTER TABLE `#__tj_notification_user_exclusions` ADD INDEX `client1` (`client`(100), `provider`(50), `key`(100));

‎src/com_tjnotifications/admin/views/notifications/tmpl/default_bs5.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
{
5757
?>
5858
<div class="clearfix">&nbsp;</div>
59-
<div class="alert alert-no-items">
59+
<div class="alert alert-info">
6060
<?php echo Text::_("COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_NO_MATCHING_RESULTS"); ?>
6161
</div>
6262
<?php

‎src/com_tjnotifications/admin/views/subscription/tmpl/edit.php‎

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,11 @@
1010
// No direct access
1111
defined('_JEXEC') or die('Restricted access');
1212

13-
use Joomla\CMS\Language\Text;
14-
use Joomla\CMS\HTML\HTMLHelper;
15-
use Joomla\CMS\Factory;
16-
use Joomla\CMS\Router\Route;
17-
use Joomla\CMS\Uri\Uri;
18-
19-
HTMLHelper::_('behavior.keepalive');
20-
HTMLHelper::_('behavior.formvalidator');
21-
HTMLHelper::_('formbehavior.chosen', 'select');
22-
HTMLHelper::_('bootstrap.tooltip');
23-
24-
$doc = Factory::getDocument();
25-
26-
$script = "
27-
Joomla.submitbutton = function (task) {
28-
if (task == 'subscription.cancel') {
29-
Joomla.submitform(task, document.getElementById('subscription-form'));
30-
}
31-
else {
32-
if (task != 'subscription.cancel' && document.formvalidator.isValid(document.id('subscription-form'))) {
33-
Joomla.submitform(task, document.getElementById('subscription-form'));
34-
}
35-
else {
36-
alert(Joomla.Text._('JGLOBAL_VALIDATION_FORM_FAILED'));
37-
}
38-
}
39-
}
40-
";
41-
42-
$doc->addScriptDeclaration($script);
43-
44-
Text::script('JGLOBAL_VALIDATION_FORM_FAILED');
45-
?>
46-
47-
<div class="subscription-edit row-fluid">
48-
<form
49-
action="<?php echo Route::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id) . '&extension=' . $this->extension; ?>"
50-
method="post" enctype="multipart/form-data" name="adminForm" id="subscription-form" class="form-validate form-horizontal">
51-
52-
<div class="row-fluid">
53-
<?php echo $this->form->renderField('title'); ?>
54-
<?php echo $this->form->renderField('user_id'); ?>
55-
<?php echo $this->form->renderField('backend'); ?>
56-
<?php echo $this->form->renderField('address'); ?>
57-
<?php echo $this->form->renderField('device_id'); ?>
58-
<?php echo $this->form->renderField('platform'); ?>
59-
<?php echo $this->form->renderField('state'); ?>
60-
<?php echo $this->form->renderField('is_confirmed'); ?>
61-
</div>
62-
63-
<input type="hidden" name="extension" value="<?php echo $this->extension; ?>"/>
64-
<input type="hidden" name="jform[id]" value="<?php echo $this->item->id; ?>" />
65-
<input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" />
66-
<input type="hidden" name="jform[checked_out]" value="<?php echo $this->item->checked_out; ?>" />
67-
<input type="hidden" name="jform[checked_out_time]" value="<?php echo $this->item->checked_out_time; ?>" />
68-
<input type="hidden" name="task" value=""/>
69-
70-
<?php echo HTMLHelper::_('form.token'); ?>
71-
</form>
72-
</div>
13+
if (JVERSION < '4.0.0')
14+
{
15+
echo $this->loadTemplate('bs2');
16+
}
17+
else
18+
{
19+
echo $this->loadTemplate('bs5');
20+
}

‎src/com_tjnotifications/admin/views/subscription/tmpl/edit_bs2.php‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
/**
3+
* @package Tjnotifications
4+
* @subpackage com_tjnotifications
5+
*
6+
* @copyright Copyright (C) 2009 - 2020 Techjoomla. All rights reserved.
7+
* @license http:/www.gnu.org/licenses/gpl-2.0.html GNU/GPL
8+
*/
9+
10+
// No direct access
11+
defined('_JEXEC') or die('Restricted access');
12+
13+
use Joomla\CMS\Language\Text;
14+
use Joomla\CMS\HTML\HTMLHelper;
15+
use Joomla\CMS\Factory;
16+
use Joomla\CMS\Router\Route;
17+
use Joomla\CMS\Uri\Uri;
18+
19+
HTMLHelper::_('behavior.keepalive');
20+
HTMLHelper::_('behavior.formvalidator');
21+
HTMLHelper::_('formbehavior.chosen', 'select');
22+
HTMLHelper::_('bootstrap.tooltip');
23+
24+
$doc = Factory::getDocument();
25+
26+
$script = "
27+
Joomla.submitbutton = function (task) {
28+
if (task == 'subscription.cancel') {
29+
Joomla.submitform(task, document.getElementById('subscription-form'));
30+
}
31+
else {
32+
if (task != 'subscription.cancel' && document.formvalidator.isValid(document.getElementById('subscription-form'))) {
33+
Joomla.submitform(task, document.getElementById('subscription-form'));
34+
}
35+
else {
36+
alert(Joomla.Text._('JGLOBAL_VALIDATION_FORM_FAILED'));
37+
}
38+
}
39+
}
40+
";
41+
42+
$doc->addScriptDeclaration($script);
43+
44+
Text::script('JGLOBAL_VALIDATION_FORM_FAILED');
45+
?>
46+
47+
<div class="subscription-edit row-fluid">
48+
<form
49+
action="<?php echo Route::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id) . '&extension=' . $this->extension; ?>"
50+
method="post" enctype="multipart/form-data" name="adminForm" id="subscription-form" class="form-validate form-horizontal">
51+
52+
<div class="row-fluid">
53+
<?php echo $this->form->renderField('title'); ?>
54+
<?php echo $this->form->renderField('user_id'); ?>
55+
<?php echo $this->form->renderField('backend'); ?>
56+
<?php echo $this->form->renderField('address'); ?>
57+
<?php echo $this->form->renderField('device_id'); ?>
58+
<?php echo $this->form->renderField('platform'); ?>
59+
<?php echo $this->form->renderField('state'); ?>
60+
<?php echo $this->form->renderField('is_confirmed'); ?>
61+
</div>
62+
63+
<input type="hidden" name="extension" value="<?php echo $this->extension; ?>"/>
64+
<input type="hidden" name="jform[id]" value="<?php echo $this->item->id; ?>" />
65+
<input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" />
66+
<input type="hidden" name="jform[checked_out]" value="<?php echo $this->item->checked_out; ?>" />
67+
<input type="hidden" name="jform[checked_out_time]" value="<?php echo $this->item->checked_out_time; ?>" />
68+
<input type="hidden" name="task" value=""/>
69+
70+
<?php echo HTMLHelper::_('form.token'); ?>
71+
</form>
72+
</div>

‎src/com_tjnotifications/admin/views/subscription/tmpl/edit_bs5.php‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?php
2+
/**
3+
* @package Tjnotifications
4+
* @subpackage com_tjnotifications
5+
*
6+
* @copyright Copyright (C) 2009 - 2020 Techjoomla. All rights reserved.
7+
* @license http:/www.gnu.org/licenses/gpl-2.0.html GNU/GPL
8+
*/
9+
10+
// No direct access
11+
defined('_JEXEC') or die('Restricted access');
12+
13+
use Joomla\CMS\Language\Text;
14+
use Joomla\CMS\HTML\HTMLHelper;
15+
use Joomla\CMS\Factory;
16+
use Joomla\CMS\Router\Route;
17+
use Joomla\CMS\Uri\Uri;
18+
19+
HTMLHelper::_('behavior.keepalive');
20+
HTMLHelper::_('behavior.formvalidator');
21+
HTMLHelper::_('bootstrap.tooltip');
22+
23+
$doc = Factory::getDocument();
24+
25+
$script = "
26+
Joomla.submitbutton = function (task) {
27+
if (task == 'subscription.cancel') {
28+
Joomla.submitform(task, document.getElementById('subscription-form'));
29+
}
30+
else {
31+
if (task != 'subscription.cancel' && document.formvalidator.isValid(document.getElementById('subscription-form'))) {
32+
Joomla.submitform(task, document.getElementById('subscription-form'));
33+
}
34+
else {
35+
alert(Joomla.Text._('JGLOBAL_VALIDATION_FORM_FAILED'));
36+
}
37+
}
38+
}
39+
";
40+
41+
$doc->addScriptDeclaration($script);
42+
43+
Text::script('JGLOBAL_VALIDATION_FORM_FAILED');
44+
?>
45+
46+
<div class="subscription-edit row-fluid tjBs5">
47+
<form
48+
action="<?php echo Route::_('index.php?option=com_tjnotifications&layout=edit&id=' . (int) $this->item->id) . '&extension=' . $this->extension; ?>"
49+
method="post" enctype="multipart/form-data" name="adminForm" id="subscription-form" class="form-validate form-horizontal">
50+
51+
<div class="row-fluid">
52+
<?php echo $this->form->renderField('title'); ?>
53+
<?php echo $this->form->renderField('user_id'); ?>
54+
<?php echo $this->form->renderField('backend'); ?>
55+
<?php echo $this->form->renderField('address'); ?>
56+
<?php echo $this->form->renderField('device_id'); ?>
57+
<?php echo $this->form->renderField('platform'); ?>
58+
<?php echo $this->form->renderField('state'); ?>
59+
<?php echo $this->form->renderField('is_confirmed'); ?>
60+
</div>
61+
62+
<input type="hidden" name="extension" value="<?php echo $this->extension; ?>"/>
63+
<input type="hidden" name="jform[id]" value="<?php echo $this->item->id; ?>" />
64+
<input type="hidden" name="jform[state]" value="<?php echo $this->item->state; ?>" />
65+
<input type="hidden" name="jform[checked_out]" value="<?php echo $this->item->checked_out; ?>" />
66+
<input type="hidden" name="jform[checked_out_time]" value="<?php echo $this->item->checked_out_time; ?>" />
67+
<input type="hidden" name="task" value=""/>
68+
69+
<?php echo HTMLHelper::_('form.token'); ?>
70+
</form>
71+
</div>

0 commit comments

Comments
 (0)