Skip to content

Commit 22cb126

Browse files
shamsbd71shamsbd71
committed
Merge branch 'master' of github.com:t3framework/t3
2 parents b511515 + 67a221e commit 22cb126

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1442
-198
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
<h2>Version: 2.6.4 (05/05/2017)</h2>
2+
<h3>Fix bugs</h3>
3+
- Update compatiable with Joomla 3.7 | <a href="https://github.com/t3framework/t3/commit/439a9550fc81c3a7d0f4275e7ce68a99f9f8a541">Link</a><br/>
4+
- Select box displays error in template manager | <a
5+
href="https://github.com/t3framework/t3/commit/862fe1936cc26749307043f8e93b2d026f29b7c0">Link</a><br/>
6+
- Select the checked options on radio button group | <a href="https://github.com/t3framework/t3/commit/0ac5c9f0fd5ec5a1e7b0a3897cd85708a50cc131">Link</a><br/>
7+
- Improve style for the front-end edit layout | <a href="https://github.com/t3framework/t3/commit/aab66e905a0303adf5315fe20b23a4b378f68c76">Link</a><br/>
8+
- Update override to compatible with Joomla latest version | <a
9+
href="https://github.com/t3framework/t3/commit/e22d22960e2956753b558ddb0e1cad69974a540b">Link</a><br/>
10+
- Menu selection displays ugly after upgrade J3.7.0 | <a href="https://github.com/t3framework/t3/commit/9d6d023bf8e2a6c12b19aa9a9607db20dd792fff">Link</a><br/>
11+
- Rel attribute does not work for menu item | <a
12+
href="https://github.com/t3framework/t3/commit/ef1c16221cf2b756f55b7a8db9c40b3b8e9b50b8">Link</a><br/>
13+
- Got js error when enable optimize js | <a href="https://github.com/t3framework/t3/commit/871e2c5322b3df872f7dfa70fa4653dbaf1ade3b">Link</a><br/>
14+
- Add recaptcha for article front-end edit | <a href="https://github.com/t3framework/t3/commit/4db877eec422bc732684796ca50c12b2b75fced6">Link</a><br/>
15+
116
<h2>Version: 2.6.3 (01/03/2017)</h2>
217
<h3>Fix bugs</h3>
318
- Can not hide menu item in megamenu | <a href="https://github.com/t3framework/t3/commit/aac8d8ac5fe3857c509ee120a60a82dd61974591">Link</a>

‎pkg_t3.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<extension type="package" version="2.5" method="upgrade">
33
<name>T3 Framework Package</name>
44
<packagename>t3</packagename>
5-
<version>2.6.3</version>
5+
<version>2.6.4</version>
66
<url>http://www.t3-framework.org</url>
7-
<creationDate>March 01, 2017</creationDate>
7+
<creationDate>May 05, 2017</creationDate>
88
<copyright>(C) 2012 - 2017. All rights reserved.</copyright>
99
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
1010
<authorEmail>[email protected]</authorEmail>

‎source/plg_system_t3/admin/css/admin.css

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ button.btn-primary:active {
11171117
border-radius: 0;
11181118
border: 1px solid #ccc;
11191119
box-shadow: none;
1120-
height: 23px;
1120+
height: auto;
11211121
line-height: 24px;
11221122
padding: 4px 0 4px 8px;
11231123
color: #555;
@@ -1464,6 +1464,14 @@ button.btn-primary:active {
14641464
margin-left: -10px;
14651465
}
14661466

1467+
.t3-admin-assignment #menu-assignment .menu-links {
1468+
column-count: 1;
1469+
}
1470+
1471+
.t3-admin-assignment #menu-assignment .menu-links > li.span3 {
1472+
width: 22.9282%;
1473+
}
1474+
14671475
.t3-admin-assignment .thumbnail {
14681476
box-shadow: none;
14691477
border-radius: 0;
@@ -1628,4 +1636,8 @@ button.btn-primary:active {
16281636
float: none;
16291637
}
16301638

1631-
}
1639+
.t3-admin-assignment #menu-assignment .menu-links > li.span3 {
1640+
width: 100%;
1641+
}
1642+
1643+
}

‎source/plg_system_t3/base-bs3/html/com_contact/contact/default.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
defined('_JEXEC') or die;
1111

1212
$cparams = JComponentHelper::getParams('com_media');
13-
13+
$tparams = $this->params;
1414
jimport('joomla.html.html.bootstrap');
1515
?>
1616
<div class="contact<?php echo $this->pageclass_sfx?>" itemscope itemtype="http://schema.org/Person">
@@ -42,6 +42,9 @@
4242
</span>
4343
</h3>
4444
<?php endif; ?>
45+
46+
<?php echo $this->item->event->afterDisplayTitle; ?>
47+
4548
<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
4649
<form action="#" method="get" name="selectForm" id="selectForm">
4750
<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
@@ -54,6 +57,8 @@
5457
<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
5558
<?php endif; ?>
5659

60+
<?php echo $this->item->event->beforeDisplayContent; ?>
61+
5762
<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
5863
<div class="panel-group" id="slide-contact">
5964
<div class="panel panel-default">
@@ -205,6 +210,11 @@
205210
</div>
206211
<?php endif; ?>
207212
<?php endif; ?>
213+
214+
<?php if ($tparams->get('show_user_custom_fields') && $this->contactUser) : ?>
215+
<?php echo $this->loadTemplate('user_custom_fields'); ?>
216+
<?php endif; ?>
217+
208218
<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
209219
<?php if ($this->params->get('presentation_style')=='sliders'):?>
210220
<div class="panel panel-default">
@@ -258,4 +268,5 @@
258268
<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
259269
</div>
260270
<?php endif; ?>
271+
<?php echo $this->item->event->afterDisplayContent; ?>
261272
</div>

‎source/plg_system_t3/base-bs3/html/com_content/article/default.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<?php echo JLayoutHelper::render('joomla.content.item_title', array('item' => $this->item, 'params' => $params, 'title-tag'=>'h1')); ?>
5252
<?php endif; ?>
5353

54+
<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
55+
<?php echo $this->item->event->afterDisplayTitle; ?>
56+
5457
<!-- Aside -->
5558
<?php if ($topInfo || $icons) : ?>
5659
<aside class="article-aside clearfix">

‎source/plg_system_t3/base-bs3/html/com_content/form/edit.php

Lines changed: 37 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @package Joomla.Site
44
* @subpackage com_content
55
*
6-
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
6+
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

@@ -12,7 +12,7 @@
1212
JHtml::_('behavior.tabstate');
1313
JHtml::_('behavior.keepalive');
1414
JHtml::_('behavior.calendar');
15-
JHtml::_('behavior.formvalidation');
15+
JHtml::_('behavior.formvalidator');
1616

1717
if(version_compare(JVERSION, '3.0', 'ge')){
1818
JHtml::_('formbehavior.chosen', 'select');
@@ -82,6 +82,9 @@
8282
<?php if ($params->get('show_urls_images_frontend') ) : ?>
8383
<li><a href="#images" data-toggle="tab"><?php echo JText::_('COM_CONTENT_IMAGES_AND_URLS') ?></a></li>
8484
<?php endif; ?>
85+
<?php foreach ($this->form->getFieldsets('params') as $name => $fieldSet) : ?>
86+
<li><a href="#params-<?php echo $name; ?>" data-toggle="tab"><?php echo JText::_($fieldSet->label); ?></a></li>
87+
<?php endforeach; ?>
8588
<li><a href="#publishing" data-toggle="tab"><?php echo JText::_('COM_CONTENT_PUBLISHING') ?></a></li>
8689
<li><a href="#language" data-toggle="tab"><?php echo JText::_('JFIELD_LANGUAGE_LABEL') ?></a></li>
8790
<li><a href="#metadata" data-toggle="tab"><?php echo JText::_('COM_CONTENT_METADATA') ?></a></li>
@@ -91,20 +94,22 @@
9194
<div class="tab-pane active" id="editor">
9295

9396
<div class="form-group">
94-
<?php echo $this->form->getLabel('title'); ?>
95-
<?php echo $this->form->getInput('title'); ?>
97+
<?php echo $this->form->renderField('title'); ?>
9698
</div>
9799

98100
<?php if (is_null($this->item->id)) : ?>
99101
<div class="form-group">
100-
<?php echo $this->form->getLabel('alias'); ?>
101-
<?php echo $this->form->getInput('alias'); ?>
102+
<?php echo $this->form->renderField('alias'); ?>
102103
</div>
103104
<?php endif; ?>
104105

105106
<div class="form-group">
106107
<?php echo $this->form->getInput('articletext'); ?>
107108
</div>
109+
110+
<?php if ($this->captchaEnabled) : ?>
111+
<?php echo $this->form->renderField('captcha'); ?>
112+
<?php endif; ?>
108113
</div>
109114

110115
<?php if(count($extrafields)) : ?>
@@ -128,81 +133,67 @@
128133
<div class="tab-pane" id="images">
129134

130135
<div class="form-group">
131-
<?php echo $this->form->getLabel('image_intro', 'images'); ?>
132-
<?php echo $this->form->getInput('image_intro', 'images'); ?>
136+
<?php echo $this->form->renderField('image_intro', 'images'); ?>
133137
</div>
134138

135139
<div class="form-group">
136-
<?php echo $this->form->getLabel('image_intro_alt', 'images'); ?>
137-
<?php echo $this->form->getInput('image_intro_alt', 'images'); ?>
140+
<?php echo $this->form->renderField('image_intro_alt', 'images'); ?>
138141
</div>
139142

140143
<div class="form-group">
141-
<?php echo $this->form->getLabel('image_intro_caption', 'images'); ?>
142-
<?php echo $this->form->getInput('image_intro_caption', 'images'); ?>
144+
<?php echo $this->form->renderField('image_intro_caption', 'images'); ?>
143145
</div>
144146

145147
<div class="form-group">
146-
<?php echo $this->form->getLabel('float_intro', 'images'); ?>
147-
<?php echo $this->form->getInput('float_intro', 'images'); ?>
148+
<?php echo $this->form->renderField('float_intro', 'images'); ?>
148149
</div>
149150

150151
<div class="form-group">
151-
<?php echo $this->form->getLabel('image_fulltext', 'images'); ?>
152-
<?php echo $this->form->getInput('image_fulltext', 'images'); ?>
152+
<?php echo $this->form->renderField('image_fulltext', 'images'); ?>
153153
</div>
154154

155155
<div class="form-group">
156-
<?php echo $this->form->getLabel('image_fulltext_alt', 'images'); ?>
157-
<?php echo $this->form->getInput('image_fulltext_alt', 'images'); ?>
156+
<?php echo $this->form->renderField('image_fulltext_alt', 'images'); ?>
158157
</div>
159158

160159
<div class="form-group">
161-
<?php echo $this->form->getLabel('image_fulltext_caption', 'images'); ?>
162-
<?php echo $this->form->getInput('image_fulltext_caption', 'images'); ?>
160+
<?php echo $this->form->renderField('image_fulltext_caption', 'images'); ?>
163161
</div>
164162

165163
<div class="form-group">
166-
<?php echo $this->form->getLabel('float_fulltext', 'images'); ?>
167-
<?php echo $this->form->getInput('float_fulltext', 'images'); ?>
164+
<?php echo $this->form->renderField('float_fulltext', 'images'); ?>
168165
</div>
169166

170167
<div class="form-group">
171-
<?php echo $this->form->getLabel('urla', 'urls'); ?>
172-
<?php echo $this->form->getInput('urla', 'urls'); ?>
168+
<?php echo $this->form->renderField('urla', 'urls'); ?>
173169
</div>
174170

175171
<div class="form-group">
176-
<?php echo $this->form->getLabel('urlatext', 'urls'); ?>
177-
<?php echo $this->form->getInput('urlatext', 'urls'); ?>
172+
<?php echo $this->form->renderField('urlatext', 'urls'); ?>
178173
</div>
179174

180175
<div class="form-group">
181176
<?php echo $this->form->getInput('targeta', 'urls'); ?>
182177
</div>
183178

184179
<div class="form-group">
185-
<?php echo $this->form->getLabel('urlb', 'urls'); ?>
186-
<?php echo $this->form->getInput('urlb', 'urls'); ?>
180+
<?php echo $this->form->renderField('urlb', 'urls'); ?>
187181
</div>
188182

189183
<div class="form-group">
190-
<?php echo $this->form->getLabel('urlbtext', 'urls'); ?>
191-
<?php echo $this->form->getInput('urlbtext', 'urls'); ?>
184+
<?php echo $this->form->renderField('urlbtext', 'urls'); ?>
192185
</div>
193186

194187
<div class="form-group">
195188
<?php echo $this->form->getInput('targetb', 'urls'); ?>
196189
</div>
197190

198191
<div class="form-group">
199-
<?php echo $this->form->getLabel('urlc', 'urls'); ?>
200-
<?php echo $this->form->getInput('urlc', 'urls'); ?>
192+
<?php echo $this->form->renderField('urlc', 'urls'); ?>
201193
</div>
202194

203195
<div class="form-group">
204-
<?php echo $this->form->getLabel('urlctext', 'urls'); ?>
205-
<?php echo $this->form->getInput('urlctext', 'urls'); ?>
196+
<?php echo $this->form->renderField('urlctext', 'urls'); ?>
206197
</div>
207198

208199
<div class="form-group">
@@ -214,52 +205,43 @@
214205

215206
<div class="tab-pane" id="publishing">
216207
<div class="form-group">
217-
<?php echo $this->form->getLabel('catid'); ?>
218-
<?php echo $this->form->getInput('catid'); ?>
208+
<?php echo $this->form->renderField('catid'); ?>
219209
</div>
220210

221211
<div class="form-group">
222-
<?php echo $this->form->getLabel('tags'); ?>
223-
<?php echo str_replace('span12', '', $this->form->getInput('tags')); ?>
212+
<?php echo $this->form->renderField('tags'); ?>
224213
</div>
225214

226215
<?php if ($params->get('save_history', 0)) : ?>
227216
<div class="form-group">
228-
<?php echo $this->form->getLabel('version_note'); ?>
229-
<?php echo $this->form->getInput('version_note'); ?>
217+
<?php echo $this->form->renderField('version_note'); ?>
230218
</div>
231219
<?php endif; ?>
232220

233221
<div class="form-group">
234-
<?php echo $this->form->getLabel('created_by_alias'); ?>
235-
<?php echo $this->form->getInput('created_by_alias'); ?>
222+
<?php echo $this->form->renderField('created_by_alias'); ?>
236223
</div>
237224

238225
<?php if ($this->item->params->get('access-change')) : ?>
239226
<div class="form-group">
240-
<?php echo $this->form->getLabel('state'); ?>
241-
<?php echo $this->form->getInput('state'); ?>
227+
<?php echo $this->form->renderField('state'); ?>
242228
</div>
243229

244230
<div class="form-group">
245-
<?php echo $this->form->getLabel('featured'); ?>
246-
<?php echo $this->form->getInput('featured'); ?>
231+
<?php echo $this->form->renderField('featured'); ?>
247232
</div>
248233

249234
<div class="form-group">
250-
<?php echo $this->form->getLabel('publish_up'); ?>
251-
<?php echo str_replace('class="btn"', 'class="btn btn-default"', $this->form->getInput('publish_up')); ?>
235+
<?php echo $this->form->renderField('publish_up'); ?>
252236
</div>
253237

254238
<div class="form-group">
255-
<?php echo $this->form->getLabel('publish_down'); ?>
256-
<?php echo str_replace('class="btn"', 'class="btn btn-default"', $this->form->getInput('publish_down')); ?>
239+
<?php echo $this->form->renderField('publish_down'); ?>
257240
</div>
258241
<?php endif; ?>
259242

260243
<div class="form-group">
261-
<?php echo $this->form->getLabel('access'); ?>
262-
<?php echo $this->form->getInput('access'); ?>
244+
<?php echo $this->form->renderField('access'); ?>
263245
</div>
264246

265247
<?php if (is_null($this->item->id)):?>
@@ -271,27 +253,21 @@
271253

272254
<div class="tab-pane" id="language">
273255
<div class="form-group">
274-
<?php echo $this->form->getLabel('language'); ?>
275-
<?php echo $this->form->getInput('language'); ?>
256+
<?php echo $this->form->renderField('language'); ?>
276257
</div>
277258
</div>
278259

279260
<div class="tab-pane" id="metadata">
280261
<div class="form-group">
281-
<?php echo $this->form->getLabel('metadesc'); ?>
282-
<?php echo $this->form->getInput('metadesc'); ?>
262+
<?php echo $this->form->renderField('metadesc'); ?>
283263
</div>
284264

285265
<div class="form-group">
286-
<?php echo $this->form->getLabel('metakey'); ?>
287-
<?php echo $this->form->getInput('metakey'); ?>
266+
<?php echo $this->form->renderField('metakey'); ?>
288267
</div>
289268

290269
<input type="hidden" name="task" value="" />
291270
<input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
292-
<?php if ($this->params->get('enable_category', 0) == 1) :?>
293-
<input type="hidden" name="jform[catid]" value="<?php echo $this->params->get('catid', 1); ?>" />
294-
<?php endif; ?>
295271
</div>
296272
</div>
297273
<div class="btn-toolbar">

‎source/plg_system_t3/base-bs3/js/frontend-edit.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,18 @@
4141
input.prop('checked', true).trigger('change');
4242
}
4343
});
44+
45+
$(".btn-group input[checked=checked]").each(function()
46+
{
47+
if ($(this).val() == '') {
48+
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-primary');
49+
} else if ($(this).val() == 0) {
50+
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-danger');
51+
} else {
52+
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
53+
}
54+
});
4455

4556
});
4657

47-
}(jQuery);
58+
}(jQuery);

0 commit comments

Comments
 (0)