@@ -49,8 +49,7 @@ |
||
49 | 49 | if ($item->base > 0) |
50 | 50 | { |
51 | 51 | $limit = 'limitstart.value=' . $item->base; |
52 | -} |
|
53 | -else |
|
52 | +} else |
|
54 | 53 | { |
55 | 54 | $limit = 'limitstart.value=0'; |
56 | 55 | } |
@@ -29,8 +29,7 @@ |
||
29 | 29 | if ($currentPage % $step == 0) |
30 | 30 | { |
31 | 31 | $range = ceil($currentPage / $step) + 1; |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | $range = ceil($currentPage / $step); |
36 | 35 | } |
@@ -29,8 +29,7 @@ |
||
29 | 29 | if ($currentPage % $step == 0) |
30 | 30 | { |
31 | 31 | $range = ceil($currentPage / $step) + 1; |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | $range = ceil($currentPage / $step); |
36 | 35 | } |
@@ -91,7 +91,7 @@ |
||
91 | 91 | . $item->prefix |
92 | 92 | . $limit |
93 | 93 | . '; Joomla.submitform(document.forms[\'' . $item->formName . '\'].task.value, document.forms[\'' . $item->formName . '\']);return false;"'; |
94 | - $href = '#'; |
|
94 | + $href = '#'; |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | else |
@@ -62,8 +62,7 @@ discard block |
||
62 | 62 | if ($item->base > 0) |
63 | 63 | { |
64 | 64 | $limit = 'limitstart.value=' . $item->base; |
65 | - } |
|
66 | - else |
|
65 | + } else |
|
67 | 66 | { |
68 | 67 | $limit = 'limitstart.value=0'; |
69 | 68 | } |
@@ -93,8 +92,7 @@ discard block |
||
93 | 92 | . '; Joomla.submitform(document.forms[\'' . $item->formName . '\'].task.value, document.forms[\'' . $item->formName . '\']);return false;"'; |
94 | 93 | $href = '#'; |
95 | 94 | } |
96 | -} |
|
97 | -else |
|
95 | +} else |
|
98 | 96 | { |
99 | 97 | $class = (property_exists($item, 'active') && $item->active) ? 'active' : 'disabled'; |
100 | 98 | } |
@@ -110,8 +108,11 @@ discard block |
||
110 | 108 | <?php echo $display; ?> |
111 | 109 | </a> |
112 | 110 | </li> |
113 | -<?php else : ?> |
|
114 | - <li class="<?php echo $class; ?>"> |
|
111 | +<?php else { |
|
112 | + : ?> |
|
113 | + <li class="<?php echo $class; |
|
114 | +} |
|
115 | +?>"> |
|
115 | 116 | <span><?php echo $display; ?></span> |
116 | 117 | </li> |
117 | 118 | <?php endif; |
@@ -95,8 +95,7 @@ discard block |
||
95 | 95 | $script[] = " var modalBody = $(this).find('.modal-body');"; |
96 | 96 | $script[] = " modalBody.find('iframe').remove();"; |
97 | 97 | $script[] = " modalBody.prepend('" . trim($iframeHtml) . "');"; |
98 | -} |
|
99 | -else |
|
98 | +} else |
|
100 | 99 | { |
101 | 100 | // Set modalTooltip container to modal ID (selector), and placement to top-left if no data attribute (bootstrap-tooltip-extended.js) |
102 | 101 | $script[] = " $('.modalTooltip').each(function(){;"; |
@@ -134,8 +133,7 @@ discard block |
||
134 | 133 | $script[] = " $('.modal-body').css({'max-height': maxModalBodyHeight, 'overflow-y': 'auto'});"; |
135 | 134 | $script[] = " $('.iframe').css('max-height', maxModalBodyHeight-modalBodyPadding);"; |
136 | 135 | $script[] = " }"; |
137 | -} |
|
138 | -else |
|
136 | +} else |
|
139 | 137 | { |
140 | 138 | // Set max-height for modal-body if needed, to adapt to viewport height. |
141 | 139 | $script[] = " if (modalHeight > maxModalHeight){;"; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | else |
45 | 45 | { |
46 | 46 | JHtml::_('rbootstrap.tooltip', '.hasTooltip'); |
47 | - $title = ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"'; |
|
47 | + $title = ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"'; |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 |
@@ -35,13 +35,11 @@ discard block |
||
35 | 35 | { |
36 | 36 | JHtml::_('rbootstrap.tooltip', '.hasTooltip'); |
37 | 37 | $title = ' title="' . RHtml::tooltipText(trim($text, ':'), $description, 0) . '"'; |
38 | - } |
|
39 | - elseif (version_compare(JVERSION, '3.0', '<')) |
|
38 | + } elseif (version_compare(JVERSION, '3.0', '<')) |
|
40 | 39 | { |
41 | 40 | JHTML::_('behavior.tooltip', '.hasTooltip', array('placement' => 'right')); |
42 | 41 | $title = ' title="' . (trim($text . '::' . $description)) . '"'; |
43 | - } |
|
44 | - else |
|
42 | + } else |
|
45 | 43 | { |
46 | 44 | JHtml::_('rbootstrap.tooltip', '.hasTooltip'); |
47 | 45 | $title = ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"'; |
@@ -54,6 +52,9 @@ discard block |
||
54 | 52 | } |
55 | 53 | |
56 | 54 | ?> |
57 | -<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) echo ' class="' . implode(' ', $classes) . '"'; ?><?php echo $title; ?><?php echo $position; ?>> |
|
55 | +<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) { |
|
56 | + echo ' class="' . implode(' ', $classes) . '"'; |
|
57 | +} |
|
58 | +?><?php echo $title; ?><?php echo $position; ?>> |
|
58 | 59 | <?php echo $text; ?><?php if ($required) : ?><span class="star"> *</span><?php endif; ?> |
59 | 60 | </label> |
@@ -65,12 +65,12 @@ |
||
65 | 65 | // Build the attributes array. |
66 | 66 | $attributes = array(); |
67 | 67 | |
68 | -empty($size) ? null : $attributes['size'] = $size; |
|
68 | +empty($size) ? null : $attributes['size'] = $size; |
|
69 | 69 | empty($maxlength) ? null : $attributes['maxlength'] = ' maxlength="' . $maxLength . '"'; |
70 | -empty($class) ? null : $attributes['class'] = $class; |
|
71 | -!$readonly ? null : $attributes['readonly'] = 'readonly'; |
|
72 | -!$disabled ? null : $attributes['disabled'] = 'disabled'; |
|
73 | -empty($onchange) ? null : $attributes['onchange'] = $onchange; |
|
70 | +empty($class) ? null : $attributes['class'] = $class; |
|
71 | +!$readonly ? null : $attributes['readonly'] = 'readonly'; |
|
72 | +!$disabled ? null : $attributes['disabled'] = 'disabled'; |
|
73 | +empty($onchange) ? null : $attributes['onchange'] = $onchange; |
|
74 | 74 | |
75 | 75 | if ($required) |
76 | 76 | { |
@@ -22,9 +22,7 @@ |
||
22 | 22 | { |
23 | 23 | $view = $data['view']; |
24 | 24 | $state = $view->getModel()->getState(); |
25 | -} |
|
26 | - |
|
27 | -else |
|
25 | +} else |
|
28 | 26 | { |
29 | 27 | throw new InvalidArgumentException('No View passed to the "search" layout.'); |
30 | 28 | } |
@@ -61,8 +61,7 @@ discard block |
||
61 | 61 | if ($option == 'com_redcore' && $view == 'config') |
62 | 62 | { |
63 | 63 | $componentUri = JRoute::_('index.php?option=' . $input->getString('component', $option)); |
64 | -} |
|
65 | -else |
|
64 | +} else |
|
66 | 65 | { |
67 | 66 | $componentUri = JRoute::_('index.php?option=' . $option); |
68 | 67 | } |
@@ -106,8 +105,7 @@ discard block |
||
106 | 105 | if (!empty($data['logoutReturnUri'])) |
107 | 106 | { |
108 | 107 | $logoutReturnUri = base64_encode($data['logoutReturnUri']); |
109 | -} |
|
110 | -else |
|
108 | +} else |
|
111 | 109 | { |
112 | 110 | $logoutReturnUri = base64_encode('index.php'); |
113 | 111 | } |