Home›Help›Trac

Changeset 15857 for trunk


Ignore:
Timestamp:
01/09/12 01:12:34 (5 months ago)
Author:
Anton Lesnikov
Message:
  1. Studio -> Form Builder.
  2. Added field type - text
Location:
trunk
Files:
31 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/inc/classes/BxDolGrid.php

    r15797 r15857  
    285285    } 
    286286 
     287    public function getObject() { 
     288        return $this->_sObject; 
     289    } 
     290 
    287291    protected function _getData ($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage) { 
    288292        $sFunc = '_getData' . $this->_aOptions['source_type']; 

  • trunk/install/sql/v70.sql

    r15853 r15857  
    43784378  `id` int(11) NOT NULL AUTO_INCREMENT, 
    43794379  `object` varchar(32) NOT NULL, 
     4380  `module` varchar(32) NOT NULL, 
    43804381  `title` varchar(255) NOT NULL, 
    43814382  `action` varchar(255) NOT NULL, 
    … …  
    45674568('sys_studio_nav_sets', 'Sql', 'SELECT * FROM `sys_menu_sets` WHERE 1 ', 'sys_menu_sets', 'set_name', '', '', '', 100, NULL, 'start', '', 'title', 'auto', '', 'BxTemplStudioNavigationSets', ''), 
    45684569('sys_studio_nav_items', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', 'order', 'active', '', 100, NULL, 'start_it', '', 'title,link', 'auto', '', 'BxTemplStudioNavigationItems', ''), 
    4569 ('sys_studio_nav_import', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', '', '', '', 5, NULL, 'start_im', '', 'title,link', 'auto', '', 'BxTemplStudioNavigationImport', ''); 
     4570('sys_studio_nav_import', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', '', '', '', 5, NULL, 'start_im', '', 'title,link', 'auto', '', 'BxTemplStudioNavigationImport', ''), 
     4571('sys_studio_forms', 'Sql', 'SELECT * FROM `sys_objects_form` WHERE 1 ', 'sys_objects_form', 'id', '', 'active', '', 100, NULL, 'start', '', 'title,module', 'auto', '', 'BxTemplStudioFormsForms', ''), 
     4572('sys_studio_forms_displays', 'Sql', 'SELECT `td`.`id` AS `id`, `td`.`display_name` AS `display_name`, `td`.`title` AS `title`, `td`.`module` AS `module`, `tf`.`title` AS `form_title` FROM `sys_form_displays` AS `td` LEFT JOIN `sys_objects_form` AS `tf` ON `td`.`object`=`tf`.`object` WHERE 1 ', 'sys_form_displays', 'id', '', '', '', 100, NULL, 'start', '', 'td`.`title,td`.`module', 'auto', '', 'BxTemplStudioFormsDisplays', ''), 
     4573('sys_studio_forms_fields', 'Sql', 'SELECT `tdi`.`id` AS `id`, `ti`.`caption` AS `title`, `ti`.`type` AS `type`, `ti`.`module` AS `module`, `tdi`.`active` AS `active`, `ti`.`editable` AS `editable`, `ti`.`deletable` AS `deletable`, `tdi`.`order` AS `order` FROM `sys_form_display_inputs` AS `tdi` LEFT JOIN `sys_form_inputs` AS `ti` ON `tdi`.`input_name`=`ti`.`name` WHERE 1 ', 'sys_form_display_inputs', 'id', 'order', 'active', '', 100, NULL, 'start', '', 'ti`.`type,ti`.`caption', 'auto', '', 'BxTemplStudioFormsFields', ''); 
    45704574 
    45714575 
    … …  
    46314635('sys_studio_nav_import', 'link', '_adm_nav_txt_items_link', '20%', '', '', 3), 
    46324636('sys_studio_nav_import', 'module', '_adm_nav_txt_items_module', '20%', '', '', 4), 
    4633 ('sys_studio_nav_import', 'actions', '', '20%', '', '', 5); 
     4637('sys_studio_nav_import', 'actions', '', '20%', '', '', 5), 
     4638('sys_studio_forms', 'switcher', '', '10%', '', '', 1), 
     4639('sys_studio_forms', 'title', '_adm_form_txt_forms_title', '40%', '38', '', 2), 
     4640('sys_studio_forms', 'module', '_adm_form_txt_forms_module', '15%', '13', '', 3), 
     4641('sys_studio_forms', 'displays', '_adm_form_txt_forms_displays', '15%', '13', '', 4), 
     4642('sys_studio_forms', 'actions', '', '20%', '', '', 5), 
     4643('sys_studio_forms_displays', 'title', '_adm_form_txt_displays_title', '30%', '48', '', 1), 
     4644('sys_studio_forms_displays', 'module', '_adm_form_txt_displays_module', '13%', '11', '', 2), 
     4645('sys_studio_forms_displays', 'form_title', '_adm_form_txt_displays_form', '24%', '22', '', 3), 
     4646('sys_studio_forms_displays', 'fields', '_adm_form_txt_displays_fields', '13%', '11', '', 4), 
     4647('sys_studio_forms_displays', 'actions', '', '20%', '', '', 5), 
     4648('sys_studio_forms_fields', 'order', '', '1%', '', '', 1), 
     4649('sys_studio_forms_fields', 'switcher', '', '9%', '', '', 2), 
     4650('sys_studio_forms_fields', 'title', '_adm_form_txt_fields_title', '40%', '53', '', 3), 
     4651('sys_studio_forms_fields', 'type', '_adm_form_txt_fields_type', '15%', '13', '', 4), 
     4652('sys_studio_forms_fields', 'module', '_adm_form_txt_fields_module', '15%', '13', '', 5), 
     4653('sys_studio_forms_fields', 'actions', '', '20%', '', '', 6); 
    46344654 
    46354655 
    … …  
    46714691('sys_studio_nav_items', 'single', 'hide_from', '_adm_nav_btn_items_hidden', '', 0, 3), 
    46724692('sys_studio_nav_import', 'single', 'import', '', 'tables__plus.png', 0, 1), 
    4673 ('sys_studio_nav_import', 'bulk', 'done', '_adm_nav_btn_items_done', '', 0, 1); 
    4674  
    4675  
     4693('sys_studio_nav_import', 'bulk', 'done', '_adm_nav_btn_items_done', '', 0, 1), 
     4694('sys_studio_forms', 'single', 'edit', '', 'document--pencil.png', 0, 1), 
     4695('sys_studio_forms_displays', 'single', 'edit', '', 'document--pencil.png', 0, 1), 
     4696('sys_studio_forms_fields', 'single', 'edit', '', 'document--pencil.png', 0, 1), 
     4697('sys_studio_forms_fields', 'single', 'delete', '', 'cross.png', 1, 2), 
     4698('sys_studio_forms_fields', 'independent', 'add', '_adm_form_btn_fields_create', '', 0, 1); 
    46764699-- -------------------------------------------------------- 
    46774700 

  • trunk/modules/boonex/english/install/data/langs/en.xml

    r15814 r15857  
    22292229    <string name="_adm_nav_err_items_hide_from"><![CDATA[Cannot update item]]></string> 
    22302230 
     2231    <string name="_adm_lmi_cpt_forms"><![CDATA[Forms]]></string> 
     2232    <string name="_adm_lmi_cpt_displays"><![CDATA[Displays]]></string> 
     2233    <string name="_adm_lmi_cpt_fields"><![CDATA[Fields]]></string> 
     2234    <string name="_adm_form_txt_all_modules"><![CDATA[All Modules]]></string> 
     2235    <string name="_adm_form_txt_all_forms"><![CDATA[All Forms]]></string> 
     2236    <string name="_adm_form_txt_select_display"><![CDATA[Select Display]]></string> 
     2237    <string name="_adm_form_err_cannot_process_action"><![CDATA[Cannot process action. It does not have an associated handler.]]></string> 
     2238    <string name="_adm_form_txt_forms_title"><![CDATA[Title]]></string> 
     2239    <string name="_adm_form_txt_forms_module"><![CDATA[Module]]></string> 
     2240    <string name="_adm_form_txt_forms_displays"><![CDATA[Displays]]></string> 
     2241    <string name="_adm_form_txt_displays_title"><![CDATA[Title]]></string> 
     2242    <string name="_adm_form_txt_displays_module"><![CDATA[Module]]></string> 
     2243    <string name="_adm_form_txt_displays_form"><![CDATA[Form]]></string> 
     2244    <string name="_adm_form_txt_displays_fields"><![CDATA[Fields]]></string> 
     2245    <string name="_adm_form_txt_fields_title"><![CDATA[Title]]></string> 
     2246    <string name="_adm_form_txt_fields_type"><![CDATA[Type]]></string> 
     2247    <string name="_adm_form_txt_fields_module"><![CDATA[Module]]></string> 
     2248    <string name="_adm_form_txt_forms_manage_displays"><![CDATA[Manage displays]]></string> 
     2249    <string name="_adm_form_txt_forms_n_displays"><![CDATA[{0} displays]]></string> 
     2250    <string name="_adm_form_txt_displays_manage_fields"><![CDATA[Manage fields]]></string> 
     2251    <string name="_adm_form_txt_forms_n_fields"><![CDATA[{0} fields]]></string> 
     2252    <string name="_adm_form_txt_fields_create_popup"><![CDATA[Add New Field]]></string> 
     2253    <string name="_adm_form_btn_fields_create"><![CDATA[Add New Field]]></string> 
     2254    <string name="_adm_form_txt_forms_title"><![CDATA[Title]]></string> 
     2255    <string name="_adm_form_dsc_forms_title"><![CDATA[You need to enter form title]]></string> 
     2256    <string name="_adm_form_err_forms_title"><![CDATA[Enter title, more then 3 characters]]></string> 
     2257    <string name="_adm_form_txt_forms_action"><![CDATA[Action]]></string> 
     2258    <string name="_adm_form_dsc_forms_action"><![CDATA[You need to enter action URL]]></string> 
     2259    <string name="_adm_form_err_forms_action"><![CDATA[Action URL should not be empty]]></string> 
     2260    <string name="_adm_form_txt_forms_table"><![CDATA[Table name]]></string> 
     2261    <string name="_adm_form_dsc_forms_table"><![CDATA[The DB table where data is stored]]></string> 
     2262    <string name="_adm_form_txt_forms_key"><![CDATA[Key]]></string> 
     2263    <string name="_adm_form_dsc_forms_key"><![CDATA[Key field name in table entered above]]></string> 
     2264    <string name="_adm_form_txt_forms_uri"><![CDATA[URI]]></string> 
     2265    <string name="_adm_form_dsc_forms_uri"><![CDATA[URI field name in table entered above]]></string> 
     2266    <string name="_adm_form_txt_forms_uri_title"><![CDATA[URI Title]]></string> 
     2267    <string name="_adm_form_dsc_forms_uri_title"><![CDATA[Title fields from which URI is generated]]></string> 
     2268    <string name="_adm_form_txt_forms_uri_submit_name"><![CDATA[Submit]]></string> 
     2269    <string name="_adm_form_dsc_forms_uri_submit_name"><![CDATA[Submit button name]]></string> 
     2270    <string name="_adm_form_btn_forms_add"><![CDATA[Add]]></string> 
     2271    <string name="_adm_form_btn_forms_save"><![CDATA[Save]]></string> 
     2272    <string name="_adm_form_btn_forms_cancel"><![CDATA[Cancel]]></string> 
     2273    <string name="_adm_form_txt_forms_edit_popup"><![CDATA[Edit "{0}" Form]]></string> 
     2274    <string name="_adm_form_err_forms_edit"><![CDATA[Cannot update form]]></string> 
     2275    <string name="_adm_form_txt_displays_title"><![CDATA[Title]]></string> 
     2276    <string name="_adm_form_dsc_displays_title"><![CDATA[You need to enter display title]]></string> 
     2277    <string name="_adm_form_err_displays_title"><![CDATA[Enter title, more then 3 characters]]></string> 
     2278    <string name="_adm_form_btn_displays_add"><![CDATA[Add]]></string> 
     2279    <string name="_adm_form_btn_displays_save"><![CDATA[Save]]></string> 
     2280    <string name="_adm_form_btn_displays_cancel"><![CDATA[Cancel]]></string> 
     2281    <string name="_adm_form_txt_displays_edit_popup"><![CDATA[Edit "{0}" Display]]></string> 
     2282    <string name="_adm_form_err_displays_edit"><![CDATA[Cannot update display]]></string> 
     2283    <string name="_adm_form_txt_field_add_popup"><![CDATA[Add New Field]]></string> 
     2284    <string name="_adm_form_err_field_add"><![CDATA[Cannot add new field]]></string> 
     2285    <string name="_adm_form_txt_field_edit_popup"><![CDATA[Edit "{0}" Field]]></string> 
     2286    <string name="_adm_form_err_field_edit"><![CDATA[Cannot update field]]></string> 
     2287    <string name="_adm_from_err_fields_delete"><![CDATA[Cannot delete field]]></string> 
     2288    <string name="_adm_form_btn_field_add"><![CDATA[Add]]></string> 
     2289    <string name="_adm_form_btn_field_save"><![CDATA[Save]]></string> 
     2290    <string name="_adm_form_btn_field_cancel"><![CDATA[Cancel]]></string> 
     2291    <string name="_adm_form_txt_field_type"><![CDATA[Type]]></string> 
     2292    <string name="_adm_form_txt_field_type_empty"><![CDATA[Select type]]></string> 
     2293    <string name="_adm_form_txt_field_type_text"><![CDATA[text]]></string> 
     2294    <string name="_adm_form_txt_field_name"><![CDATA[Name]]></string> 
     2295    <string name="_adm_form_dsc_field_name"><![CDATA[You need to enter field name]]></string> 
     2296    <string name="_adm_form_err_field_name"><![CDATA[Enter name, more then 3 characters]]></string> 
     2297    <string name="_adm_form_txt_field_caption"><![CDATA[Title]]></string> 
     2298    <string name="_adm_form_dsc_field_caption"><![CDATA[You need to enter field title]]></string> 
     2299    <string name="_adm_form_err_field_caption"><![CDATA[Enter title, more then 3 characters]]></string> 
     2300    <string name="_adm_form_txt_field_value"><![CDATA[Value]]></string> 
     2301    <string name="_adm_form_dsc_field_value"><![CDATA[Enter default value (optional)]]></string> 
     2302    <string name="_adm_form_txt_field_info"><![CDATA[Description]]></string> 
     2303    <string name="_adm_form_dsc_field_info"><![CDATA[Enter field description (optional)]]></string> 
     2304    <string name="_adm_form_txt_field_required"><![CDATA[Mandatory]]></string> 
     2305    <string name="_adm_form_dsc_field_required"><![CDATA[Check it if the field should have value]]></string> 
     2306 
     2307    <string name=""><![CDATA[]]></string> 
     2308    <string name=""><![CDATA[]]></string> 
     2309    <string name=""><![CDATA[]]></string> 
     2310    <string name=""><![CDATA[]]></string> 
     2311    <string name=""><![CDATA[]]></string> 
     2312    <string name=""><![CDATA[]]></string> 
     2313    <string name=""><![CDATA[]]></string> 
     2314    <string name=""><![CDATA[]]></string> 
     2315    <string name=""><![CDATA[]]></string> 
     2316    <string name=""><![CDATA[]]></string> 
     2317    <string name=""><![CDATA[]]></string> 
     2318    <string name=""><![CDATA[]]></string> 
     2319    <string name=""><![CDATA[]]></string> 
     2320    <string name=""><![CDATA[]]></string> 
     2321    <string name=""><![CDATA[]]></string> 
     2322    <string name=""><![CDATA[]]></string> 
     2323    <string name=""><![CDATA[]]></string> 
     2324    <string name=""><![CDATA[]]></string> 
     2325    <string name=""><![CDATA[]]></string> 
     2326    <string name=""><![CDATA[]]></string> 
     2327    <string name=""><![CDATA[]]></string> 
     2328    <string name=""><![CDATA[]]></string> 
     2329    <string name=""><![CDATA[]]></string> 
     2330    <string name=""><![CDATA[]]></string> 
     2331    <string name=""><![CDATA[]]></string> 
     2332    <string name=""><![CDATA[]]></string> 
     2333    <string name=""><![CDATA[]]></string> 
     2334    <string name=""><![CDATA[]]></string> 
     2335    <string name=""><![CDATA[]]></string> 
     2336    <string name=""><![CDATA[]]></string> 
     2337         
     2338 
    22312339    <string name="_adm_page_cpt_builder_mobile"><![CDATA[Mobile Builder]]></string> 
    22322340    <string name="_adm_wgt_cpt_builder_mobile"><![CDATA[Mobile]]></string> 

  • trunk/studio/classes/BxDolStudioGrid.php

    r15814 r15857  
    2929        return str_replace(' ', '_', strtolower($sValue)); 
    3030    } 
     31    function getClassName($sValue) { 
     32        return str_replace(' ', '', ucwords(str_replace('_', ' ', $sValue))); 
     33    } 
    3134} 
    3235/** @} */ 

  • trunk/studio/classes/BxDolStudioLanguagesUtils.php

    r15818 r15857  
    6666 
    6767            $aKeys = array(); 
    68             $iKeys = $this->oDb->getKeysBy(array('type' => 'by_language_id', 'value' => $aLanguage['id']), $aKeys); 
     68            $this->oDb->getKeysBy(array('type' => 'by_language_id', 'value' => $aLanguage['id']), $aKeys); 
    6969 
    7070            $sLanguageFile = "lang-" . $aLanguage['name'] . ".php"; 
    … …  
    256256 
    257257        $aKey = array(); 
    258         $iKey = $this->oDb->getKeysBy(array('type' => 'by_name', 'value' => $sKey), $aKey); 
    259         if($iKey != 1) 
    260             return false; 
     258        $this->oDb->getKeysBy(array('type' => 'by_name', 'value' => $sKey), $aKey); 
     259        if(empty($aKey)) 
     260            return $this->addLanguageString($sKey, $sString, $iLangId, BX_DOL_LANGUAGE_CATEGORY_SYSTEM, $bRecompile); 
    261261     
    262262        return $this->updateLanguageStringById($aKey['id'], $sString, $iLangId, $bRecompile); 

  • trunk/studio/templates/base/navigation.html

    r15820 r15857  
    1 <script defer type="text/javascript"> 
    2 var __js_object__ = new BxDolStudioNavigation({ 
    3     sActionUrl: '<bx_url_studio />navigation.php' 
    4 }); 
    5 </script> 
    61<bx_include_auto:page_blocks.html /> 

  • trunk/studio/templates/base/scripts/BxBaseStudioNavigation.php

    r15802 r15857  
    2020    } 
    2121    function getPageJs() { 
    22         return array_merge(parent::getPageJs(), array('navigation.js')); 
     22        return array_merge(parent::getPageJs(), array()); 
    2323    } 
    2424    function getPageJsObject() { 
    25         return 'oBxDolStudioNavigation'; 
     25        return ''; 
    2626    } 
    2727    function getPageMenu() { 

  • trunk/templates/base/scripts/BxBaseFormView.php

    r15855 r15857  
    838838            foreach ($aInput['values'] as $sValue => $sTitle) { 
    839839                if(is_array($sTitle)) { 
     840                    if(isset($sTitle['type'])) { 
     841                        switch($sTitle['type']) { 
     842                            case 'group_header': 
     843                                $sTitle = bx_process_output($sTitle['value']); 
     844                                $sOptions .= <<<BLAH 
     845                                    <optgroup label="$sTitle"> 
     846BLAH; 
     847                                break; 
     848                            case 'group_end': 
     849                                $sOptions .= <<<BLAH 
     850                                    </optgroup> 
     851BLAH; 
     852                                break; 
     853                        } 
     854                        continue; 
     855                    } 
     856 
    840857                    $sValue = $sTitle['key']; 
    841858                    $sTitle = $sTitle['value']; 
Note: See TracChangeset for help on using the changeset viewer.
 
 

Site Search

Market

Notes

Websites

About BoonEx• Contacts• © BoonEx (ACN 127966581)