Malachi/Component-Builder-fork
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Fixed the css missing fields from field area

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2018-04-11 23:04:10 +02:00
parent 802554e7a9
commit 51d13b75f0
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
14 changed files with 237 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.7.2 + *Version*: 2.7.2
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **189480** + *Line count*: **189536**
+ *Field count*: **1012** + *Field count*: **1012**
+ *File count*: **1199** + *File count*: **1200**
+ *Folder count*: **193** + *Folder count*: **193**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

4
admin/README.txt
View File

@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env
+ *Version*: 2.7.2 + *Version*: 2.7.2
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **189480** + *Line count*: **189536**
+ *Field count*: **1012** + *Field count*: **1012**
+ *File count*: **1199** + *File count*: **1200**
+ *Folder count*: **193** + *Folder count*: **193**
> This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

8
admin/layouts/field/data_base_left.php
View File

@ -33,12 +33,8 @@ $fields = $displayData->get('fields') ?: array(
'datatype', 'datatype',
'datalenght', 'datalenght',
'datalenght_other', 'datalenght_other',
'css_views', 'datadefault',
'datadefault_other', 'datadefault_other'
'add_css_view',
'css_view',
'add_css_views',
'datadefault'
); );
$hiddenFields = $displayData->get('hidden_fields') ?: array(); $hiddenFields = $displayData->get('hidden_fields') ?: array();

57
admin/layouts/field/scripts_left.php Normal file
View File

@ -0,0 +1,57 @@
<?php
/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/
__ __ _ _____ _ _ __ __ _ _ _
\ \ / / | | | __ \ | | | | | \/ | | | | | | |
\ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| |
\ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
\ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| |
\/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_|
| |
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.7.x
@created 30th April, 2015
@package Component Builder
@subpackage scripts_left.php
@author Llewellyn van der Merwe <http://joomlacomponentbuilder.com>
@github Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
@copyright Copyright (C) 2015. All Rights Reserved
@license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
Builds Complex Joomla Components
/-----------------------------------------------------------------------------------------------------------------------------*/
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
'add_css_view',
'css_view',
'add_css_views',
'css_views'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();
foreach ($fields as $field)
{
$field = is_array($field) ? $field : array($field);
foreach ($field as $f)
{
if ($form->getField($f))
{
if (in_array($f, $hiddenFields))
{
$form->setFieldAttribute($f, 'type', 'hidden');
}
echo $form->renderField($f);
break;
}
}
}

10
admin/layouts/fieldtype/fields_fullwidth.php
View File

@ -61,10 +61,10 @@ $can = ComponentbuilderHelper::getActions('field');
<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'); ?>
</th> </th>
<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text"> <th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
</th> </th>
<th data-breakpoints="all" data-type="html" data-sort-use="text"> <th data-breakpoints="all" data-type="html" data-sort-use="text">
<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
</th> </th>
<th width="10" data-breakpoints="xs sm md"> <th width="10" data-breakpoints="xs sm md">
<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?> <?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?>
@ -104,9 +104,6 @@ $can = ComponentbuilderHelper::getActions('field');
<td> <td>
<?php echo JText::_($item->null_switch); ?> <?php echo JText::_($item->null_switch); ?>
</td> </td>
<td>
<?php echo JText::_($item->store); ?>
</td>
<td class="nowrap"> <td class="nowrap">
<?php if ($user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?> <?php if ($user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?>
<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fields"><?php echo $displayData->escape($item->category_title); ?></a> <a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fields"><?php echo $displayData->escape($item->category_title); ?></a>
@ -114,6 +111,9 @@ $can = ComponentbuilderHelper::getActions('field');
<?php echo $displayData->escape($item->category_title); ?> <?php echo $displayData->escape($item->category_title); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td>
<?php echo JText::_($item->store); ?>
</td>
<?php if ($item->published == 1):?> <?php if ($item->published == 1):?>
<td class="center" data-sort-value="1"> <td class="center" data-sort-value="1">
<span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>"> <span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>">

24
admin/models/field.php
View File

@ -106,6 +106,12 @@ class ComponentbuilderModelField extends JModelAdmin
$item->xml = json_decode($item->xml); $item->xml = json_decode($item->xml);
} }
if (!empty($item->javascript_view_footer))
{
// base64 Decode javascript_view_footer.
$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
}
if (!empty($item->css_views)) if (!empty($item->css_views))
{ {
// base64 Decode css_views. // base64 Decode css_views.
@ -118,12 +124,6 @@ class ComponentbuilderModelField extends JModelAdmin
$item->css_view = base64_decode($item->css_view); $item->css_view = base64_decode($item->css_view);
} }
if (!empty($item->javascript_view_footer))
{
// base64 Decode javascript_view_footer.
$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
}
if (!empty($item->javascript_views_footer)) if (!empty($item->javascript_views_footer))
{ {
// base64 Decode javascript_views_footer. // base64 Decode javascript_views_footer.
@ -931,6 +931,12 @@ class ComponentbuilderModelField extends JModelAdmin
$data['xml'] = (string) json_encode($data['xml']); $data['xml'] = (string) json_encode($data['xml']);
} }
// Set the javascript_view_footer string to base64 string.
if (isset($data['javascript_view_footer']))
{
$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
}
// Set the css_views string to base64 string. // Set the css_views string to base64 string.
if (isset($data['css_views'])) if (isset($data['css_views']))
{ {
@ -943,12 +949,6 @@ class ComponentbuilderModelField extends JModelAdmin
$data['css_view'] = base64_encode($data['css_view']); $data['css_view'] = base64_encode($data['css_view']);
} }
// Set the javascript_view_footer string to base64 string.
if (isset($data['javascript_view_footer']))
{
$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
}
// Set the javascript_views_footer string to base64 string. // Set the javascript_views_footer string to base64 string.
if (isset($data['javascript_views_footer'])) if (isset($data['javascript_views_footer']))
{ {

22
admin/models/fields.php
View File

@ -49,10 +49,10 @@ class ComponentbuilderModelFields extends JModelList
'a.datatype','datatype', 'a.datatype','datatype',
'a.indexes','indexes', 'a.indexes','indexes',
'a.null_switch','null_switch', 'a.null_switch','null_switch',
'a.store','store',
'c.title','category_title', 'c.title','category_title',
'c.id', 'category_id', 'c.id', 'category_id',
'a.catid', 'catid' 'a.catid', 'catid',
'a.store','store'
); );
} }
@ -88,9 +88,6 @@ class ComponentbuilderModelFields extends JModelList
$null_switch = $this->getUserStateFromRequest($this->context . '.filter.null_switch', 'filter_null_switch'); $null_switch = $this->getUserStateFromRequest($this->context . '.filter.null_switch', 'filter_null_switch');
$this->setState('filter.null_switch', $null_switch); $this->setState('filter.null_switch', $null_switch);
$store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store');
$this->setState('filter.store', $store);
$category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category'); $category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
$this->setState('filter.category', $category); $this->setState('filter.category', $category);
@ -98,7 +95,10 @@ class ComponentbuilderModelFields extends JModelList
$this->setState('filter.category_id', $categoryId); $this->setState('filter.category_id', $categoryId);
$catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid'); $catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
$this->setState('filter.catid', $catid); $this->setState('filter.catid', $catid);
$store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store');
$this->setState('filter.store', $store);
$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int'); $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
$this->setState('filter.sorting', $sorting); $this->setState('filter.sorting', $sorting);
@ -313,7 +313,7 @@ class ComponentbuilderModelFields extends JModelList
else else
{ {
$search = $db->quote('%' . $db->escape($search) . '%'); $search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.store LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.')'); $query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.' OR a.xml LIKE '.$search.')');
} }
} }
@ -431,12 +431,12 @@ class ComponentbuilderModelFields extends JModelList
continue; continue;
} }
// decode javascript_view_footer
$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
// decode css_views // decode css_views
$item->css_views = base64_decode($item->css_views); $item->css_views = base64_decode($item->css_views);
// decode css_view // decode css_view
$item->css_view = base64_decode($item->css_view); $item->css_view = base64_decode($item->css_view);
// decode javascript_view_footer
$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
// decode javascript_views_footer // decode javascript_views_footer
$item->javascript_views_footer = base64_decode($item->javascript_views_footer); $item->javascript_views_footer = base64_decode($item->javascript_views_footer);
// unset the values we don't want exported. // unset the values we don't want exported.
@ -504,10 +504,10 @@ class ComponentbuilderModelFields extends JModelList
$id .= ':' . $this->getState('filter.datatype'); $id .= ':' . $this->getState('filter.datatype');
$id .= ':' . $this->getState('filter.indexes'); $id .= ':' . $this->getState('filter.indexes');
$id .= ':' . $this->getState('filter.null_switch'); $id .= ':' . $this->getState('filter.null_switch');
$id .= ':' . $this->getState('filter.store');
$id .= ':' . $this->getState('filter.category'); $id .= ':' . $this->getState('filter.category');
$id .= ':' . $this->getState('filter.category_id'); $id .= ':' . $this->getState('filter.category_id');
$id .= ':' . $this->getState('filter.catid'); $id .= ':' . $this->getState('filter.catid');
$id .= ':' . $this->getState('filter.store');
return parent::getStoreId($id); return parent::getStoreId($id);
} }

248
admin/models/forms/field.xml
View File

@ -183,21 +183,18 @@
<option value="NOT NULL"> <option value="NOT NULL">
COM_COMPONENTBUILDER_FIELD_NOT_NULL</option> COM_COMPONENTBUILDER_FIELD_NOT_NULL</option>
</field> </field>
<!-- Datadefault_other Field. Type: Text. (joomla) --> <!-- Javascript_view_footer Field. Type: Textarea. (joomla) -->
<field <field
type="text" type="textarea"
name="datadefault_other" name="javascript_view_footer"
label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL" label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
size="10" rows="30"
maxlength="50" cols="15"
description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
class="text_area" class="text_area span12"
readonly="false" filter="raw"
disabled="false" hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
required="true" required="true"
filter="STRING"
message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT"
/> />
<!-- Css_views Field. Type: Textarea. (joomla) --> <!-- Css_views Field. Type: Textarea. (joomla) -->
<field <field
@ -212,24 +209,6 @@
hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT" hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT"
required="true" required="true"
/> />
<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
<field
type="radio"
name="add_javascript_views_footer"
label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
class="btn-group btn-group-yesno"
default="0"
required="true">
<!-- Option Set. -->
<option value="1">
COM_COMPONENTBUILDER_FIELD_YES</option>
<option value="0">
COM_COMPONENTBUILDER_FIELD_NO</option>
</field>
<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) --> <!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
<field <field
type="radio" type="radio"
@ -244,6 +223,58 @@
<option value="0"> <option value="0">
COM_COMPONENTBUILDER_FIELD_NO</option> COM_COMPONENTBUILDER_FIELD_NO</option>
</field> </field>
<!-- Css_view Field. Type: Textarea. (joomla) -->
<field
type="textarea"
name="css_view"
label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
rows="30"
cols="15"
description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
required="true"
/>
<!-- Add_css_views Field. Type: Radio. (joomla) -->
<field
type="radio"
name="add_css_views"
label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
class="btn-group btn-group-yesno"
default="0"
required="true">
<!-- Option Set. -->
<option value="1">
COM_COMPONENTBUILDER_FIELD_YES</option>
<option value="0">
COM_COMPONENTBUILDER_FIELD_NO</option>
</field>
<!-- Catid Field. Type: Category. (joomla) -->
<field
type="category"
name="catid"
label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
extension="com_componentbuilder.fields"
description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
class="inputbox"
/>
<!-- Add_css_view Field. Type: Radio. (joomla) -->
<field
type="radio"
name="add_css_view"
label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
class="btn-group btn-group-yesno"
default="0"
required="true">
<!-- Option Set. -->
<option value="1">
COM_COMPONENTBUILDER_FIELD_YES</option>
<option value="0">
COM_COMPONENTBUILDER_FIELD_NO</option>
</field>
<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
<!-- Store Field. Type: List. (joomla) --> <!-- Store Field. Type: List. (joomla) -->
<field <field
type="list" type="list"
@ -269,34 +300,61 @@
<option value="4"> <option value="4">
COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option> COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option>
</field> </field>
<!-- Add_css_view Field. Type: Radio. (joomla) --> <!-- Datadefault_other Field. Type: Text. (joomla) -->
<field <field
type="radio" type="text"
name="add_css_view" name="datadefault_other"
label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL" label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL"
class="btn-group btn-group-yesno" size="10"
default="0" maxlength="50"
required="true"> description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION"
<!-- Option Set. --> class="text_area"
<option value="1"> readonly="false"
COM_COMPONENTBUILDER_FIELD_YES</option> disabled="false"
<option value="0"> required="true"
COM_COMPONENTBUILDER_FIELD_NO</option> filter="STRING"
</field> message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
<!-- Not_required Field. Type: Hidden. (joomla) --> hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT"
<field
type="hidden"
name="not_required"
default="[]"
/> />
<!-- Catid Field. Type: Category. (joomla) --> <!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
<!-- Datadefault Field. Type: List. (joomla) -->
<field <field
type="category" type="list"
name="catid" name="datadefault"
label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL" label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
extension="com_componentbuilder.fields" description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION" class="btn-group"
class="inputbox" multiple="false">
<!-- Option Set. -->
<option value="">
COM_COMPONENTBUILDER_FIELD_NONE</option>
<option value="0">
COM_COMPONENTBUILDER_FIELD_ZERO</option>
<option value="1">
COM_COMPONENTBUILDER_FIELD_ONE</option>
<option value="CURRENT_TIMESTAMP">
COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
<option value="DATETIME">
COM_COMPONENTBUILDER_FIELD_DATETIME</option>
<option value="Other">
COM_COMPONENTBUILDER_FIELD_OTHER</option>
</field>
<!-- Datalenght_other Field. Type: Text. (joomla) -->
<field
type="text"
name="datalenght_other"
label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
class="text_area"
readonly="false"
disabled="false"
required="true"
filter="STRING"
message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
/> />
<!-- Datalenght Field. Type: List. (joomla) --> <!-- Datalenght Field. Type: List. (joomla) -->
<field <field
@ -332,55 +390,11 @@
<option value="Other"> <option value="Other">
COM_COMPONENTBUILDER_FIELD_OTHER</option> COM_COMPONENTBUILDER_FIELD_OTHER</option>
</field> </field>
<!-- Css_view Field. Type: Textarea. (joomla) --> <!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
<field
type="textarea"
name="css_view"
label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
rows="30"
cols="15"
description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
required="true"
/>
<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
<!-- Datalenght_other Field. Type: Text. (joomla) -->
<field
type="text"
name="datalenght_other"
label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
class="text_area"
readonly="false"
disabled="false"
required="true"
filter="STRING"
message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
/>
<!-- Javascript_view_footer Field. Type: Textarea. (joomla) -->
<field
type="textarea"
name="javascript_view_footer"
label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
rows="30"
cols="15"
description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
required="true"
/>
<!-- Add_css_views Field. Type: Radio. (joomla) -->
<field <field
type="radio" type="radio"
name="add_css_views" name="add_javascript_views_footer"
label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL" label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
class="btn-group btn-group-yesno" class="btn-group btn-group-yesno"
default="0" default="0"
required="true"> required="true">
@ -390,6 +404,8 @@
<option value="0"> <option value="0">
COM_COMPONENTBUILDER_FIELD_NO</option> COM_COMPONENTBUILDER_FIELD_NO</option>
</field> </field>
<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
<!-- Javascript_views_footer Field. Type: Textarea. (joomla) --> <!-- Javascript_views_footer Field. Type: Textarea. (joomla) -->
<field <field
type="textarea" type="textarea"
@ -403,28 +419,12 @@
hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT" hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT"
required="true" required="true"
/> />
<!-- Datadefault Field. Type: List. (joomla) --> <!-- Not_required Field. Type: Hidden. (joomla) -->
<field <field
type="list" type="hidden"
name="datadefault" name="not_required"
label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL" default="[]"
description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION" />
class="btn-group"
multiple="false">
<!-- Option Set. -->
<option value="">
COM_COMPONENTBUILDER_FIELD_NONE</option>
<option value="0">
COM_COMPONENTBUILDER_FIELD_ZERO</option>
<option value="1">
COM_COMPONENTBUILDER_FIELD_ONE</option>
<option value="CURRENT_TIMESTAMP">
COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
<option value="DATETIME">
COM_COMPONENTBUILDER_FIELD_DATETIME</option>
<option value="Other">
COM_COMPONENTBUILDER_FIELD_OTHER</option>
</field>
<!-- Xml Field. Type: Hidden. (joomla) --> <!-- Xml Field. Type: Hidden. (joomla) -->
<field <field
type="hidden" type="hidden"

14
admin/sql/install.mysql.utf8.sql
View File

@ -731,15 +731,15 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
KEY `idx_datatype` (`datatype`), KEY `idx_datatype` (`datatype`),
KEY `idx_indexes` (`indexes`), KEY `idx_indexes` (`indexes`),
KEY `idx_null_switch` (`null_switch`), KEY `idx_null_switch` (`null_switch`),
KEY `idx_datadefault_other` (`datadefault_other`),
KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
KEY `idx_add_css_view` (`add_css_view`),
KEY `idx_catid` (`catid`),
KEY `idx_datalenght` (`datalenght`),
KEY `idx_datalenght_other` (`datalenght_other`),
KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_css_views` (`add_css_views`),
KEY `idx_datadefault` (`datadefault`) KEY `idx_catid` (`catid`),
KEY `idx_add_css_view` (`add_css_view`),
KEY `idx_datadefault_other` (`datadefault_other`),
KEY `idx_datadefault` (`datadefault`),
KEY `idx_datalenght_other` (`datalenght_other`),
KEY `idx_datalenght` (`datalenght`),
KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`)
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` (

5
admin/views/field/tmpl/edit.php
View File

@ -86,7 +86,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
<?php echo JHtml::_('bootstrap.addTab', 'fieldTab', 'scripts', JText::_('COM_COMPONENTBUILDER_FIELD_SCRIPTS', true)); ?> <?php echo JHtml::_('bootstrap.addTab', 'fieldTab', 'scripts', JText::_('COM_COMPONENTBUILDER_FIELD_SCRIPTS', true)); ?>
<div class="row-fluid form-horizontal-desktop"> <div class="row-fluid form-horizontal-desktop">
<div class="span12"> <div class="span6">
<?php echo JLayoutHelper::render('field.scripts_left', $this); ?>
</div>
<div class="span6">
<?php echo JLayoutHelper::render('field.scripts_right', $this); ?> <?php echo JLayoutHelper::render('field.scripts_right', $this); ?>
</div> </div>
</div> </div>

6
admin/views/fields/tmpl/default_body.php
View File

@ -104,9 +104,6 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
<td class="hidden-phone"> <td class="hidden-phone">
<?php echo JText::_($item->null_switch); ?> <?php echo JText::_($item->null_switch); ?>
</td> </td>
<td class="hidden-phone">
<?php echo JText::_($item->store); ?>
</td>
<td class="nowrap"> <td class="nowrap">
<?php if ($this->user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?> <?php if ($this->user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?>
<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fields"><?php echo $this->escape($item->category_title); ?></a> <a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fields"><?php echo $this->escape($item->category_title); ?></a>
@ -114,6 +111,9 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
<?php echo $this->escape($item->category_title); ?> <?php echo $this->escape($item->category_title); ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="hidden-phone">
<?php echo JText::_($item->store); ?>
</td>
<td class="center"> <td class="center">
<?php if ($canDo->get('field.edit.state')) : ?> <?php if ($canDo->get('field.edit.state')) : ?>
<?php if ($item->checked_out) : ?> <?php if ($item->checked_out) : ?>

6
admin/views/fields/tmpl/default_head.php
View File

@ -58,12 +58,12 @@ defined('_JEXEC') or die('Restricted access');
<th class="nowrap hidden-phone" > <th class="nowrap hidden-phone" >
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL', 'null_switch', $this->listDirn, $this->listOrder); ?> <?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL', 'null_switch', $this->listDirn, $this->listOrder); ?>
</th> </th>
<th class="nowrap hidden-phone" >
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_STORE_LABEL', 'store', $this->listDirn, $this->listOrder); ?>
</th>
<th class="nowrap" > <th class="nowrap" >
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY', 'catid', $this->listDirn, $this->listOrder); ?> <?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY', 'catid', $this->listDirn, $this->listOrder); ?>
</th> </th>
<th class="nowrap hidden-phone" >
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_STORE_LABEL', 'store', $this->listDirn, $this->listOrder); ?>
</th>
<?php if ($this->canState): ?> <?php if ($this->canState): ?>
<th width="10" class="nowrap center" > <th width="10" class="nowrap center" >
<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_STATUS', 'published', $this->listDirn, $this->listOrder); ?> <?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_FIELD_STATUS', 'published', $this->listDirn, $this->listOrder); ?>

2
admin/views/fields/view.html.php
View File

@ -377,8 +377,8 @@ class ComponentbuilderViewFields extends JViewLegacy
'a.datatype' => JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL'), 'a.datatype' => JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL'),
'a.indexes' => JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL'), 'a.indexes' => JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL'),
'a.null_switch' => JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'), 'a.null_switch' => JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'),
'a.store' => JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'),
'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'), 'c.category_title' => JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'),
'a.store' => JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'),
'a.id' => JText::_('JGRID_HEADING_ID') 'a.id' => JText::_('JGRID_HEADING_ID')
); );
} }

8
script.php
View File

@ -3428,9 +3428,9 @@ class com_componentbuilderInstallerScript
$field->type_title = 'Componentbuilder Field'; $field->type_title = 'Componentbuilder Field';
$field->type_alias = 'com_componentbuilder.field'; $field->type_alias = 'com_componentbuilder.field';
$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","store":"store","add_css_view":"add_css_view","not_required":"not_required","datalenght":"datalenght","css_view":"css_view","datalenght_other":"datalenght_other","javascript_view_footer":"javascript_view_footer","add_css_views":"add_css_views","javascript_views_footer":"javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","javascript_view_footer":"javascript_view_footer","css_views":"css_views","add_javascript_view_footer":"add_javascript_view_footer","css_view":"css_view","add_css_views":"add_css_views","add_css_view":"add_css_view","store":"store","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
$field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_views_footer","add_javascript_view_footer","store","add_css_view","not_required","catid","add_css_views"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_view_footer","add_css_views","catid","add_css_view","store","add_javascript_views_footer","not_required"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
// Set the object into the content types table. // Set the object into the content types table.
$field_Inserted = $db->insertObject('#__content_types', $field); $field_Inserted = $db->insertObject('#__content_types', $field);
@ -4037,9 +4037,9 @@ class com_componentbuilderInstallerScript
$field->type_title = 'Componentbuilder Field'; $field->type_title = 'Componentbuilder Field';
$field->type_alias = 'com_componentbuilder.field'; $field->type_alias = 'com_componentbuilder.field';
$field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; $field->table = '{"special": {"dbtable": "#__componentbuilder_field","key": "id","type": "Field","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
$field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","datadefault_other":"datadefault_other","css_views":"css_views","add_javascript_views_footer":"add_javascript_views_footer","add_javascript_view_footer":"add_javascript_view_footer","store":"store","add_css_view":"add_css_view","not_required":"not_required","datalenght":"datalenght","css_view":"css_view","datalenght_other":"datalenght_other","javascript_view_footer":"javascript_view_footer","add_css_views":"add_css_views","javascript_views_footer":"javascript_views_footer","datadefault":"datadefault","xml":"xml"}}'; $field->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "catid","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","fieldtype":"fieldtype","datatype":"datatype","indexes":"indexes","null_switch":"null_switch","javascript_view_footer":"javascript_view_footer","css_views":"css_views","add_javascript_view_footer":"add_javascript_view_footer","css_view":"css_view","add_css_views":"add_css_views","add_css_view":"add_css_view","store":"store","datadefault_other":"datadefault_other","datadefault":"datadefault","datalenght_other":"datalenght_other","datalenght":"datalenght","add_javascript_views_footer":"add_javascript_views_footer","javascript_views_footer":"javascript_views_footer","not_required":"not_required","xml":"xml"}}';
$field->router = 'ComponentbuilderHelperRoute::getFieldRoute'; $field->router = 'ComponentbuilderHelperRoute::getFieldRoute';
$field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_views_footer","add_javascript_view_footer","store","add_css_view","not_required","catid","add_css_views"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}'; $field->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/field.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required","xml"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","fieldtype","add_javascript_view_footer","add_css_views","catid","add_css_view","store","add_javascript_views_footer","not_required"],"displayLookup": [{"sourceColumn": "catid","targetTable": "#__categories","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "fieldtype","targetTable": "#__componentbuilder_fieldtype","targetColumn": "id","displayColumn": "name"}]}';
// Check if field type is already in content_type DB. // Check if field type is already in content_type DB.
$field_id = null; $field_id = null;