Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:daylightstudio/FUEL-CMS into dev…
Browse files Browse the repository at this point in the history 
…elop
  • Loading branch information
David McReynolds committed Sep 29, 2014
2 parents 122c88c + 1ded5b9 commit 9514908
Show file tree
Hide file tree
Showing 9 changed files with 440 additions and 426 deletions.
245 changes: 95 additions & 150 deletions fuel/modules/fuel/config/custom_fields.php
View file
Original file line number Diff line number Diff line change
@@ -1,242 +1,187 @@
<?php

// datetime field
// Datetime field
$fields['datetime'] = array(
'css_class' => 'datepicker',
'js_function' => 'fuel.fields.datetime_field',
// 'js_params' => array('format' => 'mm-dd-yyyy'),
'represents' => 'datetime|timestamp',
'represents' => 'datetime|timestamp'
);

// date field
// Date field
$fields['date'] = array(
'css_class' => 'datepicker',
'js_function' => 'fuel.fields.datetime_field',
'js_function' => 'fuel.fields.datetime_field'
);

// multi field
// Multi field
$fields['multi'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'multi',
// 'js' => array(
// FUEL_FOLDER => array(
// 'jquery/plugins/jquery.selso',
// 'jquery/plugins/jquery.disable.text.select.pack',
// 'jquery/plugins/jquery.supercomboselect',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'multi',
'js_function' => 'fuel.fields.multi_field',
//'css' => array(FUEL_FOLDER => 'jquery.supercomboselect'),
'represents' => 'array',
'represents' => 'array'
);

// multi field
// Asset field
$fields['asset'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'asset',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'jquery/plugins/jqModal',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'asset',
'filepath' => '',
'js_function' => 'fuel.fields.asset_field',
'represents' => array('name' => '.*image\]?$|.*img\]?$'),
);

// wysiwyg field
// Wysiwyg field
$fields['wysiwyg'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'wysiwyg',
'filepath' => '',
'js' => array(
FUEL_FOLDER => array(
'editors/markitup/jquery.markitup',
'editors/markitup/jquery.markitup.set',
'editors/ckeditor/ckeditor.js',
'editors/ckeditor/config.js',
)
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'wysiwyg',
'filepath' => '',
'js' => array(
FUEL_FOLDER => array(
'editors/markitup/jquery.markitup',
'editors/markitup/jquery.markitup.set',
'editors/ckeditor/ckeditor.js',
'editors/ckeditor/config.js',
)
),
//'css' => array(FUEL_FOLDER => 'markitup'),
'js_function' => 'fuel.fields.wysiwyg_field',
'represents' => array('text', 'textarea', 'longtext', 'mediumtext'),
'represents' => array('text', 'textarea', 'longtext', 'mediumtext')
);

// file field
// File field
$fields['file'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'file',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'jquery/plugins/jquery.MultiFile',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'file',
'filepath' => '',
'js_function' => 'fuel.fields.file_upload_field',
'represents' => 'blob',

'represents' => 'blob'
);

// inline edit filed
$fields['inline_edit'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'inline_edit',
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'inline_edit',
'js_function' => 'fuel.fields.inline_edit_field',
'represents' => array('select'),
);

// linked field
// Linked field
$fields['linked'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'linked',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'fuel/linked_field_formatters',
// )
// ),
'js_function' => 'fuel.fields.linked_field',

'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'linked',
'filepath' => '',
'js_function' => 'fuel.fields.linked_field'
);

// template field
// Template field
$fields['template'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'template',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER =>
// 'jquery/plugins/jquery.repeatable',
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'template',
'filepath' => '',
'js_function' => 'fuel.fields.template_field',
'js_exec_order' => 0, // must be set to 0 so that the node clone will get raw nodes before other js is executed
'js_exec_order' => 0 // Must be set to 0 so that the node clone will get raw nodes before other js is executed
);

// number field
// Number field
$fields['number'] = array(
//'js' => array(FUEL_FOLDER => 'jquery/plugins/jquery.numeric'),
'js_function' => 'fuel.fields.number_field',
'represents' => array('int', 'smallint', 'mediumint', 'bigint'),
);

// currency field
// Currency field
$fields['currency'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'currency',
'filepath' => '',
'js' => array(FUEL_FOLDER => 'jquery/plugins/jquery.autoNumeric'),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'currency',
'filepath' => '',
'js' => array(FUEL_FOLDER => 'jquery/plugins/jquery.autoNumeric'),
'js_function' => 'fuel.fields.currency_field',
'represents' => array('name' => 'price')
);

// state field
// State field
$fields['state'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'state',
'filepath' => '',
'represents' => array('name' => 'state'),

'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'state',
'filepath' => '',
'represents' => array('name' => 'state')
);

// slug field
// Slug field
$fields['slug'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'slug',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'fuel/linked_field_formatters',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'slug',
'filepath' => '',
'js_function' => 'fuel.fields.linked_field',
'represents' => array('name' => 'slug|permalink'),
'represents' => array('name' => 'slug|permalink')
);

// list items
// List items
$fields['list_items'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'list_items',
'filepath' => '',
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'list_items',
'filepath' => ''
);

// url field
// URL field
$fields['url'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'url',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'jquery/plugins/jqModal',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'url',
'filepath' => '',
'js_function' => 'fuel.fields.url_field',
'represents' => array('name' => 'url|link'),
'represents' => array('name' => 'url|link')
);

// language field
// Language field
$fields['language'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'language',
'filepath' => '',
'represents' => array('name' => 'language'),
'represents' => array('name' => 'language')
);

// keyval field
// Keyval field
$fields['keyval'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'keyval',
'filepath' => '',
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'keyval',
'filepath' => ''
);

// block field
// Block field
$fields['block'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'block',
'filepath' => '',
'js_function' => 'fuel.fields.block_field',

'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'block',
'filepath' => '',
'js_function' => 'fuel.fields.block_field'
);


// toggler field
// Toggler field
$fields['toggler'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'toggler',
'filepath' => '',
'js_function' => 'fuel.fields.toggler_field',

'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'toggler',
'filepath' => '',
'js_function' => 'fuel.fields.toggler_field'
);

// color picker field
// Color picker field
$fields['colorpicker'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'colorpicker',
'filepath' => '',
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'colorpicker',
'filepath' => '',
'js_function' => 'fuel.fields.colorpicker_field',
'js' => array(
FUEL_FOLDER => array(
'jquery/plugins/colorpicker',
)
'js' => array(
FUEL_FOLDER => array(
'jquery/plugins/colorpicker',
)
),
'css' => array(FUEL_FOLDER => 'colorpicker'),
);

// dependent field
// Dependent field
$fields['dependent'] = array(
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'dependent',
'filepath' => '',
// 'js' => array(
// FUEL_FOLDER => array(
// 'jquery/plugins/jquery.selso',
// 'jquery/plugins/jquery.disable.text.select.pack',
// 'jquery/plugins/jquery.supercomboselect',
// )
// ),
'class' => array(FUEL_FOLDER => 'Fuel_custom_fields'),
'function' => 'dependent',
'filepath' => '',
'css' => array(FUEL_FOLDER => 'jquery.supercomboselect'),

'js_function' => 'fuel.fields.dependent_field',

'js_function' => 'fuel.fields.dependent_field'
);

/* End of file custom_fields.php */
Expand Down
21 changes: 11 additions & 10 deletions fuel/modules/fuel/config/form_builder.php
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?php
$config['js'][] = array(FUEL_FOLDER => array(
'jquery/plugins/jquery-migrate-1.1.1.js',
'jquery/plugins/jquery.formbuilder',
'fuel/custom_fields.js',
)
);
'jquery/plugins/jquery-migrate-1.1.1.js',
'jquery/plugins/jquery.formbuilder',
'fuel/custom_fields.js'
)
);

$config['required_text'] = '<span class="required">{required_indicator}</span> '.lang('required_text');

$config['representatives'] = array(
'number' => array('int', 'smallint', 'mediumint', 'bigint'),
'password' => array('name' => array('pwd', 'passwd')),
);



'password' => array(
'name' => array('pwd', 'passwd')
)
);

/* End of file form_builder.php */
/* Location: ./application/config/form_builder.php */
Loading

0 comments on commit 9514908

Please sign in to comment.