Skip to content

Commit 443dc02

Browse files
hiteshaggarwalhiteshaggarwal
committed
V1.1.2
1 parent 505e640 commit 443dc02

Some content is hidden

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

65 files changed

+1094
-1200
lines changed

‎astroid/astroid-framework/assets/css/astroid-framework.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎astroid/astroid-framework/astroid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<libraryname>astroid</libraryname>
66
<author>JoomDev</author>
77
<creationDate>July 2018</creationDate>
8-
<version>1.1.1</version>
8+
<version>1.1.2</version>
99
<url>http://astroidframework.com</url>
1010
<copyright>Copyright (C) 2018 Joomdev, Inc. All rights reserved.</copyright>
1111
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎astroid/astroid-framework/framework/constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class AstroidFrameworkConstants {
1111

12-
public static $astroid_version = '1.1.1';
12+
public static $astroid_version = '1.1.2';
1313
public static $fontawesome_version = '5.1.0';
1414
public static $animatecss_version = '3.6';
1515
public static $animations = [

‎astroid/astroid-framework/framework/elements/banner/banner.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
}
3737
$style = !empty($style) ? 'style="' . implode(';', $style) . '"' : '';
3838
?>
39-
<div <?php echo $style; ?> class="<?php echo!empty($astroid_banner_class) ? ' ' . $astroid_banner_class : ''; ?>">
39+
<div <?php echo $style; ?> class="astroid-banner-inner <?php echo!empty($astroid_banner_class) ? ' ' . $astroid_banner_class : ''; ?>">
4040
<?php
4141
if (!empty($astroid_banner_wrapper)) {
42-
echo '<div class="astroid-banner ' . $astroid_banner_wrapper . '">';
42+
echo '<div class="' . $astroid_banner_wrapper . '">';
4343
}
4444
echo '<' . $astroid_banner_title_tag . ' class="astroid-banner-title">' . $astroid_banner_title . '</' . $astroid_banner_title_tag . '>';
4545
if (!empty($astroid_banner_subtitle)) {

‎astroid/astroid-framework/framework/elements/default.xml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22
<element>
33
<form>
44
<fields>
5-
<fieldset name="general-settings" label="ASTROID_ELEMENT_HEAD_GENERAL_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
5+
<fieldset name="general-settings" label="TPL_ASTROID_GENERAL_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
66
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_TITLE_LABEL" name="title"></field>
7-
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_CUSTOM_CLASS_LABEL" name="customclass"></field>
8-
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_CUSTOM_ID_LABEL" name="customid"></field>
7+
<field type="astroidtext" class="form-control" label="ASTROID_CUSTOM_CLASS" name="customclass"></field>
8+
<field type="astroidtext" class="form-control" label="ASTROID_CUSTOM_ID" name="customid"></field>
99
</fieldset>
1010
<fieldset name="design-settings" label="ASTROID_ELEMENT_HEAD_DESIGN_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
11+
<field name="animation" type="astroidanimations" label="ASTROID_ANIMATION" ></field>
1112
<field description="" name="background_settings" type="astroidheading" title="ASTROID_ELEMENT_HEAD_BACKGROUND_OPTIONS_LABEL" />
1213
<field description="" name="background" type="astroidtext" astroid-switch="true" default="0" label="ASTROID_ELEMENT_CUSTOM_BACKGROUND_LABEL" />
1314

14-
<field ngShow="background" description="ASTROID_ELEMNT_COLOR_PICKER_DESC" name="background_color" type="astroidcolor" default="" label="ASTROID_ELEMNT_COLOR_PICKER_LABEL" />
15+
<field ngShow="background" description="ASTROID_ELEMNT_COLOR_PICKER_DESC" name="background_color" type="astroidcolor" default="" label="TPL_ASTROID_BACKGROUND_COLOR_LABEL" />
1516

16-
<field ngShow="background" name="background_image" type="astroidmedia" label="ASTROID_ELEMNT_FILE_MANAGER_LABEL" description="ASTROID_ELEMNT_FILE_MANAGER_DESC"/>
17+
<field ngShow="background" name="background_image" type="astroidmedia" label="TPL_ASTROID_BACKGROUND_IMAGE_LABEL" description="ASTROID_ELEMNT_FILE_MANAGER_DESC"/>
1718

18-
<field ngShow="background" description="" name="background_repeat" type="astroidlist" default="" label="ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_LABEL" hint="Background Repeat">
19+
<field ngShow="background" description="" name="background_repeat" type="astroidlist" default="" label="TPL_ASTROID_BACKGROUND_REPEAT_LABEL" hint="Background Repeat">
1920
<option value="">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_INHERIT</option>
20-
<option value="no-repeat">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_NO_REPEAT</option>
21-
<option value="repeat-x">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_REPEAT_HORIZONTALLY</option>
22-
<option value="repeat-y">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_REPEAT_VERTICAL</option>
21+
<option value="no-repeat">TPL_ASTROID_BACKGROUND_NO_REPEAT_LABEL</option>
22+
<option value="repeat-x">TPL_ASTROID_BACKGROUND_REPEAT_HORIZONTALLY_LABEL</option>
23+
<option value="repeat-y">TPL_ASTROID_BACKGROUND_REPEAT_VERTICAL_LABEL</option>
2324
</field>
2425
<field ngShow="background" description="" name="background_size" type="astroidlist" default="" label="ASTROID_ELEMNT_ELEMENT_BACK_SIZE_LABEL">
2526
<option value="">ASTROID_ELEMNT_ELEMENT_BACK_SIZE_LABEL_OPTIONS_INHERI</option>
@@ -43,8 +44,8 @@
4344
<option value="center center">ASTROID_BASIC_BACKGROUND_POSITION_OPTIONS_CENTER_CENTER</option>
4445
<option value="center bottom">ASTROID_BASIC_BACKGROUND_POSITION_OPTIONS_CENTER_BOTTOM</option>
4546
</field>
46-
<field ngShow="background" name="background_video" type="astroidmedia" media="videos" label="ASTROID_BACKGROUND_VIDEO_LABEL" description="ASTROID_BACKGROUND_VIDEO_DESC"/>
47-
<field name="animation" type="astroidanimations" label="ASTROID_BACKGROUND_ANIMATION_LABEL" ></field>
47+
<field ngShow="background" name="background_video" type="astroidmedia" media="videos" label="TPL_ASTROID_BACKGROUND_VIDEO_LABEL" description="TPL_ASTROID_BACKGROUND_VIDEO_DESC"/>
48+
4849
</fieldset>
4950
<fieldset name="responsive-settings" label="ASTROID_ELEMENT_HEAD_RESPONSIVE_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
5051
<field description="" name="device_settings" type="astroidheading" title="ASTROID_ELEMENT_HEAD_DEVICE_VISIBILITY_LABEL" />

‎astroid/astroid-framework/framework/elements/module_position/module_position.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<element>
3-
<title>ASTROID_ELEMENT_MODULE_TITLE_LABEL</title>
3+
<title>TPL_ASTROID_MODULE_POSITION_LABEL</title>
44
<description>ASTROID_ELEMENT_MODULE_TITLE_DESC</description>
55
<icon>fa fa-cube</icon>
66
<color>#00B8D8</color>
77
<form>
88
<fields>
9-
<fieldset name="general-settings" label="ASTROID_ELEMENT_MODULE_GS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
10-
<field description="" name="position" type="astroidmodulesposition" class="form-control" default="" label="ASTROID_ELEMENT_MODULE_POSITION_LABEL"></field>
9+
<fieldset name="general-settings" label="TPL_ASTROID_GENERAL_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
10+
<field description="" name="position" type="astroidmodulesposition" class="form-control" default="" label="TPL_ASTROID_MODULE_POSITION_LABEL"></field>
1111
</fieldset>
1212
</fields>
1313
</form>

‎astroid/astroid-framework/framework/elements/section-default.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@
22
<element>
33
<form>
44
<fields>
5-
<fieldset name="general-settings" label="ASTROID_ELEMENT_HEAD_GENERAL_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
5+
<fieldset name="general-settings" label="TPL_ASTROID_GENERAL_SETTINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
66
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_TITLE_LABEL" name="title"></field>
7-
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_CUSTOM_CLASS_LABEL" name="customclass"></field>
8-
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_CUSTOM_ID_LABEL" name="customid"></field>
7+
<field type="astroidtext" class="form-control" label="ASTROID_CUSTOM_CLASS" name="customclass"></field>
8+
<field type="astroidtext" class="form-control" label="ASTROID_CUSTOM_ID" name="customid"></field>
99
<field description="" name="layout_type" type="astroidlist" default="" label="ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_LABEL" hint="Background Repeat">
1010
<option value="">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_CONTAINER</option>
1111
<option value="container-fluid">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_CONTAINER_FLUID</option>
1212
<option value="container-with-no-gutters">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_CONTAINER_WITH_NO_GUTTERS</option>
13-
<option value="container-fluid-with-no-gutters">Container Fluid with No gutters</option>
13+
<option value="container-fluid-with-no-gutters">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_CONTAINER_FLUID_WITH_NO_GUTTERS</option>
1414
<option value="no-container">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_WITHOUT_CONTAINER</option>
1515
<option value="custom-container">ASTROID_ELEMENT_LAYOUT_SECTION_LAYOUT_OPTIONS_CUSTOM</option>
1616
</field>
1717
<field type="astroidtext" class="form-control" label="ASTROID_ELEMENT_LAYOUT_CUSTOM_CLASS_LABEL" name="custom_container_class"></field>
1818
</fieldset>
1919
<fieldset name="design-settings" label="ASTROID_ELEMENT_HEAD_DESIGN_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
20+
<field name="animation" type="astroidanimations" label="ASTROID_ANIMATION" ></field>
2021
<field description="" name="background_settings" type="astroidheading" title="ASTROID_ELEMENT_HEAD_BACKGROUND_OPTIONS_LABEL" />
2122
<field description="" name="background" type="astroidtext" astroid-switch="true" default="0" label="ASTROID_ELEMENT_CUSTOM_BACKGROUND_LABEL" />
2223

23-
<field ngShow="background" description="ASTROID_ELEMNT_COLOR_PICKER_DESC" name="background_color" type="astroidcolor" default="" label="ASTROID_ELEMNT_COLOR_PICKER_LABEL" />
24+
<field ngShow="background" description="ASTROID_ELEMNT_COLOR_PICKER_DESC" name="background_color" type="astroidcolor" default="" label="TPL_ASTROID_BACKGROUND_COLOR_LABEL" />
2425

25-
<field ngShow="background" name="background_image" type="astroidmedia" label="ASTROID_ELEMNT_FILE_MANAGER_LABEL" description="ASTROID_ELEMNT_FILE_MANAGER_DESC"/>
26+
<field ngShow="background" name="background_image" type="astroidmedia" label="TPL_ASTROID_BACKGROUND_IMAGE_LABEL" description="ASTROID_ELEMNT_FILE_MANAGER_DESC"/>
2627

27-
<field ngShow="background" description="" name="background_repeat" type="astroidlist" default="" label="ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_LABEL" hint="Background Repeat">
28+
<field ngShow="background" description="" name="background_repeat" type="astroidlist" default="" label="TPL_ASTROID_BACKGROUND_REPEAT_LABEL" hint="Background Repeat">
2829
<option value="">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_INHERIT</option>
29-
<option value="no-repeat">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_NO_REPEAT</option>
30-
<option value="repeat-x">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_REPEAT_HORIZONTALLY</option>
31-
<option value="repeat-y">ASTROID_ELEMNT_ELEMENT_BACK_REPEAT_OPTIONS_REPEAT_VERTICAL</option>
30+
<option value="no-repeat">TPL_ASTROID_BACKGROUND_NO_REPEAT_LABEL</option>
31+
<option value="repeat-x">TPL_ASTROID_BACKGROUND_REPEAT_HORIZONTALLY_LABEL</option>
32+
<option value="repeat-y">TPL_ASTROID_BACKGROUND_REPEAT_VERTICAL_LABEL</option>
3233
</field>
3334
<field ngShow="background" description="" name="background_size" type="astroidlist" default="" label="ASTROID_ELEMNT_ELEMENT_BACK_SIZE_LABEL">
3435
<option value="">ASTROID_ELEMNT_ELEMENT_BACK_SIZE_LABEL_OPTIONS_INHERI</option>
@@ -52,8 +53,7 @@
5253
<option value="center center">ASTROID_BASIC_BACKGROUND_POSITION_OPTIONS_CENTER_CENTER</option>
5354
<option value="center bottom">ASTROID_BASIC_BACKGROUND_POSITION_OPTIONS_CENTER_BOTTOM</option>
5455
</field>
55-
<field ngShow="background" name="background_video" type="astroidmedia" media="videos" label="ASTROID_BACKGROUND_VIDEO_LABEL" description="ASTROID_BACKGROUND_VIDEO_DESC"/>
56-
<field name="animation" type="astroidanimations" label="ASTROID_BACKGROUND_ANIMATION_LABEL" ></field>
56+
<field ngShow="background" name="background_video" type="astroidmedia" media="videos" label="TPL_ASTROID_BACKGROUND_VIDEO_LABEL" description="TPL_ASTROID_BACKGROUND_VIDEO_DESC"/>
5757
</fieldset>
5858
<fieldset name="responsive-settings" label="ASTROID_ELEMENT_HEAD_RESPONSIVE_SEETINGS_LABEL" addfieldpath="/libraries/astroid/framework/fields">
5959
<field description="" name="device_settings" type="astroidheading" title="ASTROID_ELEMENT_HEAD_DEVICE_VISIBILITY_LABEL" />

‎astroid/astroid-framework/framework/helper.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,10 @@ public static function clearCache($template = '') {
359359
foreach ($styles as $style) {
360360
unlink($template_dir . '/' . $style);
361361
}
362+
$custom_styles = preg_grep('~^custom-.*\.(css)$~', scandir($template_dir));
363+
foreach ($custom_styles as $style) {
364+
unlink($template_dir . '/' . $style);
365+
}
362366
return $styles;
363367
}
364368

‎astroid/astroid-framework/framework/layouts/fields/astroidmedia.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<button ng-show="<?php echo $fieldname; ?> != ''" ng-click="selectMedia = true; getLibrary('','astroid-media-tab-library-<?php echo $id; ?>');" type="button" class="btn btn-white float-left btn-round astroid-fade-fast-animation"><?php echo JText::_('TPL_ASTROID_CHANGE_'.$mediaType); ?></button>
7676
</li>
7777
<li ng-show="<?php echo $fieldname; ?> != ''" class="list-inline-item astroid-fade-fast-animation">
78-
<button ng-click="clearImage('<?php echo $id; ?>');" type="button" class="btn btn-link float-left text-danger"><?php echo JText::_('TPL_ASTROID_CLEAR'); ?></button>
78+
<button ng-click="clearImage('<?php echo $id; ?>');" type="button" class="btn btn-link float-left text-danger"><?php echo JText::_('JCLEAR'); ?></button>
7979
</li>
8080
</ul>
8181

‎astroid/astroid-framework/framework/layouts/fields/astroidmenuoptions.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</div>
155155
</div>
156156
<div class="col-4">
157-
<label class="astroid-label" id="<?php echo $id; ?>_customclass-lbl" for="<?php echo $id; ?>_customclass"><?php echo JText::_('TPL_ASTROID_CUSTOM_CLASS'); ?></label>
157+
<label class="astroid-label" id="<?php echo $id; ?>_customclass-lbl" for="<?php echo $id; ?>_customclass"><?php echo JText::_('ASTROID_CUSTOM_CLASS'); ?></label>
158158
<input type="text" name="<?php echo $name; ?>[customclass]" id="<?php echo $id; ?>_customclass" class="form-control" value="<?php echo $customclass; ?>" />
159159
</div>
160160
</div>
@@ -176,9 +176,9 @@
176176
<i class="dropdown icon"></i>
177177
<div class="default text"><?php echo JText::_('TPL_ASTROID_MENU_OPTIONS_SELECT_ALIGNMENT'); ?></div>
178178
<div class="menu">
179-
<div class="item" data-value="left"><i class="fas fa-align-left"></i> <?php echo JText::_('TPL_ASTROID_LEFT'); ?></div>
180-
<div class="item" data-value="right"><i class="fas fa-align-right"></i> <?php echo JText::_('TPL_ASTROID_RIGHT'); ?></div>
181-
<div class="item" data-value="center"><i class="fas fa-align-center"></i> <?php echo JText::_('TPL_ASTROID_CENTER'); ?></div>
179+
<div class="item" data-value="left"><i class="fas fa-align-left"></i> <?php echo JText::_('JGLOBAL_LEFT'); ?></div>
180+
<div class="item" data-value="right"><i class="fas fa-align-right"></i> <?php echo JText::_('JGLOBAL_RIGHT'); ?></div>
181+
<div class="item" data-value="center"><i class="fas fa-align-center"></i> <?php echo JText::_('JGLOBAL_CENTER'); ?></div>
182182
</div>
183183
</div>
184184
</div>
@@ -189,9 +189,9 @@
189189
<i class="dropdown icon"></i>
190190
<div class="default text"><?php echo JText::_('TPL_ASTROID_MENU_OPTIONS_SELECT_DIRECTION'); ?></div>
191191
<div class="menu">
192-
<div class="item" data-value="left"><i class="fas fa-align-left"></i> <?php echo JText::_('TPL_ASTROID_LEFT'); ?></div>
193-
<div class="item" data-value="right"><i class="fas fa-align-right"></i> <?php echo JText::_('TPL_ASTROID_RIGHT'); ?></div>
194-
<div class="item" data-value="center"><i class="fas fa-align-center"></i> <?php echo JText::_('TPL_ASTROID_CENTER'); ?></div>
192+
<div class="item" data-value="left"><i class="fas fa-align-left"></i> <?php echo JText::_('JGLOBAL_LEFT'); ?></div>
193+
<div class="item" data-value="right"><i class="fas fa-align-right"></i> <?php echo JText::_('JGLOBAL_RIGHT'); ?></div>
194+
<div class="item" data-value="center"><i class="fas fa-align-center"></i> <?php echo JText::_('JGLOBAL_CENTER'); ?></div>
195195
<div class="item" data-value="full"><i class="fas fa-align-center"></i> <?php echo JText::_('TPL_ASTROID_FULL'); ?></div>
196196
</div>
197197
</div>
@@ -207,7 +207,7 @@
207207
<p><?php echo JText::_('TPL_ASTROID_MEGA_MENU_TEXT'); ?></p>
208208
<textarea style="display: none" name="<?php echo $name; ?>[rows]">{{ rows}}</textarea>
209209
<div class="row">
210-
<div class="col-12" style="padding: 0px 60px;">
210+
<div class="col-12" style="padding: 0 60px;">
211211
<div class="ezlb">
212212
<div class="ezlb-section row my-3">
213213
<div class="col-12 ezlb-content" ng-sortable="{draggable:'.ezlb-row', animation: 100, handle: '.ezlb-row-handle'}">

0 commit comments

Comments
 (0)