#26 - notes: removing summary field

modules/base/text/classes/BxBaseModTextFormEntry.php

@@ -29,13 +29,6 @@ class BxBaseModTextFormEntry extends BxBaseModGeneralFormEntry
             );            
         }
 
-        if (isset($this->aInputs[$CNF['FIELD_SUMMARY']])) {
-            $this->aInputs[$CNF['FIELD_SUMMARY']]['attrs'] = array_merge (
-                array ('id' => $CNF['FIELD_SUMMARY_ID']),
-                is_array($this->aInputs[$CNF['FIELD_SUMMARY']]['attrs']) ? $this->aInputs[$CNF['FIELD_SUMMARY']]['attrs'] : array ()
-            );            
-        }
-
         if (isset($this->aInputs[$CNF['FIELD_PHOTO']])) {
             $this->aInputs[$CNF['FIELD_PHOTO']]['storage_object'] = $CNF['OBJECT_STORAGE'];
             $this->aInputs[$CNF['FIELD_PHOTO']]['uploaders'] = array('sys_simple', 'sys_html5');
@@ -67,7 +60,6 @@ class BxBaseModTextFormEntry extends BxBaseModGeneralFormEntry
                 'name' => $this->aInputs[$CNF['FIELD_PHOTO']]['name'],
                 'content_id' => $this->aInputs[$CNF['FIELD_PHOTO']]['content_id'],
                 'editor_id' => $CNF['FIELD_TEXT_ID'],
-                'summary_id' => $CNF['FIELD_SUMMARY_ID'],
                 'thumb_id' => isset($aContentInfo[$CNF['FIELD_THUMB']]) ? $aContentInfo[$CNF['FIELD_THUMB']] : 0,
                 'bx_if:set_thumb' => array (
                     'condition' => CHECK_ACTION_RESULT_ALLOWED === $this->_oModule->checkAllowedSetThumb(),

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -53,18 +53,9 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
             $oProfile = BxDolProfileUndefined::getInstance();
         }
 
-        $sSummary = $aData[$CNF['FIELD_SUMMARY']];
-        if (!$sSummary) {
-			$iLimitChars = (int)getParam($CNF['PARAM_CHARS_SUMMARY']);
-			$sSummary = trim(strip_tags($aData[$CNF['FIELD_TEXT']]));
-            $sLinkMore = '';
-            if (mb_strlen($sSummary) > $iLimitChars) {
-                $sSummary = mb_substr($sSummary, 0, $iLimitChars);
-                $sLinkMore = ' <a title="' . bx_html_attribute(_t('_sys_read_more', $aData[$CNF['FIELD_TITLE']])) . '" href="' . $sUrl . '"><i class="sys-icon ellipsis-horizontal"></i></a>';
-            }
-            $sSummary = htmlspecialchars_adv($sSummary) . $sLinkMore;
-        }
-
+        // get summary
+        $sLinkMore = ' <a title="' . bx_html_attribute(_t('_sys_read_more', $aData[$CNF['FIELD_TITLE']])) . '" href="' . $sUrl . '"><i class="sys-icon ellipsis-horizontal"></i></a>';
+        $sSummary = strmaxtextlen($aData[$CNF['FIELD_TEXT']], (int)getParam($CNF['PARAM_CHARS_SUMMARY']), $sLinkMore);
         $sSummaryPlain = BxTemplFunctions::getInstance()->getStringWithLimitedLength(strip_tags($sSummary), (int)getParam($CNF['PARAM_CHARS_SUMMARY_PLAIN']));
 
         // generate html

modules/base/text/js/forms.js

@@ -9,9 +9,9 @@ function bx_base_text_select_thumb(eCheckbox) {
     });
 }
 
-function bx_base_text_delete_ghost (iFileId, sFileUrl, sFileIcon, sEditorId, sSummaryId, oUploaderInstance) {
+function bx_base_text_delete_ghost (iFileId, sFileUrl, sFileIcon, aEditors, oUploaderInstance) {
     bx_editor_remove_img (
-        [sEditorId, sSummaryId], 
+        aEditors,
         ['img[src="' + sFileIcon + '"]', 'img[src="' + sFileUrl + '"]', '.bx-base-text-img-' + iFileId, '.bx-base-text-icon-' + iFileId]
     );
     oUploaderInstance.deleteGhost(iFileId);

modules/base/text/template/form_ghost_template.html

@@ -11,7 +11,7 @@
         <span id="bx-base-text-intert-to-post-link-{file_id}" style="display:none;">
             <a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onclick="bx_base_text_insert_to_post('{file_id}', '{file_url}', '__editor_id__');"><bx_text:_sys_txt_form_entry_input_picture_insert /></a>
         </span>
-        <a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onclick="bx_base_text_delete_ghost('{file_id}', '{file_url}', '{file_icon}', '__editor_id__', '__summary_id__', {js_instance_name});"><bx_text:_sys_txt_form_entry_input_picture_delete /></a>
+        <a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onclick="bx_base_text_delete_ghost('{file_id}', '{file_url}', '{file_icon}', ['__editor_id__'], {js_instance_name});"><bx_text:_sys_txt_form_entry_input_picture_delete /></a>
 
         <bx_if:set_thumb>
             <span class="bx-base-text-use-as-thumb">

modules/boonex/convos/classes/BxCnvConfig.php

@@ -30,8 +30,6 @@ class BxCnvConfig extends BxBaseModTextConfig
             'FIELD_TITLE' => '',
             'FIELD_TEXT' => 'text',
             'FIELD_TEXT_ID' => 'convo-text',
-            'FIELD_SUMMARY' => '',
-            'FIELD_SUMMARY_ID' => '',
             'FIELD_ALLOW_VIEW_TO' => '',
             'FIELD_PHOTO' => 'attachments',
             'FIELD_THUMB' => '',

modules/boonex/notes/classes/BxNotesConfig.php

@@ -30,8 +30,6 @@ class BxNotesConfig extends BxBaseModTextConfig
             'FIELD_TITLE' => 'title',
             'FIELD_TEXT' => 'text',
             'FIELD_TEXT_ID' => 'note-text',
-            'FIELD_SUMMARY' => 'summary',
-            'FIELD_SUMMARY_ID' => 'note-summary',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',

modules/boonex/notes/classes/BxNotesSearchResult.php

@@ -21,7 +21,7 @@ class BxNotesSearchResult extends BxBaseModTextSearchResult
             'name' => 'bx_notes',
             'title' => _t('_bx_notes_page_title_browse'),
             'table' => 'bx_notes_posts',
-            'ownFields' => array('id', 'title', 'text', 'summary', 'thumb', 'author', 'added'),
+            'ownFields' => array('id', 'title', 'text', 'thumb', 'author', 'added'),
             'searchFields' => array('title', 'text'),
             'restriction' => array(
                 'author' => array('value' => '', 'field' => 'author', 'operator' => '='),

modules/boonex/notes/install/langs/en.xml

@@ -21,9 +21,6 @@
 	<string name="_bx_notes_form_entry_input_sys_text"><![CDATA[Text]]></string>
 	<string name="_bx_notes_form_entry_input_text"><![CDATA[Text]]></string>
 	<string name="_bx_notes_form_entry_input_text_err"><![CDATA[Text field can't be empty]]></string>
-	<string name="_bx_notes_form_entry_input_sys_summary"><![CDATA[Summary]]></string>
-	<string name="_bx_notes_form_entry_input_summary"><![CDATA[Summary]]></string>
-	<string name="_bx_notes_form_entry_input_summary_info"><![CDATA[Summary is automatically generated if left blank]]></string>
 	<string name="_bx_notes_form_entry_input_sys_delete_confirm"><![CDATA[Delete confirmation]]></string>
 	<string name="_bx_notes_form_entry_input_delete_confirm"><![CDATA[I am sure I want to delete this note]]></string>
 	<string name="_bx_notes_form_entry_input_delete_confirm_info"><![CDATA[This action can not be undone]]></string>

modules/boonex/notes/install/sql/install.sql

@@ -9,7 +9,6 @@ CREATE TABLE IF NOT EXISTS `bx_notes_posts` (
   `thumb` int(11) NOT NULL,
   `title` varchar(255) NOT NULL,
   `text` text NOT NULL,
-  `summary` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',
@@ -115,7 +114,6 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_notes', 'bx_notes', 'do_submit', '_bx_notes_form_entry_input_do_submit', '', 0, 'submit', '_bx_notes_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_notes', 'bx_notes', 'title', '', '', 0, 'text', '_bx_notes_form_entry_input_sys_title', '_bx_notes_form_entry_input_title', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_notes_form_entry_input_title_err', 'Xss', '', 1, 0),
 ('bx_notes', 'bx_notes', 'text', '', '', 0, 'textarea', '_bx_notes_form_entry_input_sys_text', '_bx_notes_form_entry_input_text', '', 1, 0, 2, '', '', '', 'Avail', '', '_bx_notes_form_entry_input_text_err', 'XssHtml', '', 1, 0),
-('bx_notes', 'bx_notes', 'summary', '', '', 0, 'textarea', '_bx_notes_form_entry_input_sys_summary', '_bx_notes_form_entry_input_summary', '_bx_notes_form_entry_input_summary_info', 0, 0, 3, '', '', '', '', '', '', 'XssHtml', '', 1, 0),
 ('bx_notes', 'bx_notes', 'pictures', '', '', 0, 'files', '_bx_notes_form_entry_input_sys_pictures', '_bx_notes_form_entry_input_pictures', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_notes', 'bx_notes', 'allow_view_to', '', '', 0, 'custom', '_bx_notes_form_entry_input_sys_allow_view_to', '_bx_notes_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 0, 0);
 
@@ -124,7 +122,6 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_notes_entry_add', 'title', 2147483647, 1, 2),
 ('bx_notes_entry_add', 'text', 2147483647, 1, 3),
 ('bx_notes_entry_add', 'pictures', 2147483647, 1, 4),
-('bx_notes_entry_add', 'summary', 2147483647, 1, 5),
 ('bx_notes_entry_add', 'allow_view_to', 2147483647, 1, 6),
 ('bx_notes_entry_add', 'do_submit', 2147483647, 1, 7),
 
@@ -132,14 +129,12 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_notes_entry_edit', 'title', 2147483647, 1, 2),
 ('bx_notes_entry_edit', 'text', 2147483647, 1, 3),
 ('bx_notes_entry_edit', 'pictures', 2147483647, 1, 4),
-('bx_notes_entry_edit', 'summary', 2147483647, 1, 5),
 ('bx_notes_entry_edit', 'allow_view_to', 2147483647, 1, 6),
 ('bx_notes_entry_edit', 'do_submit', 2147483647, 1, 7),
 
 ('bx_notes_entry_view', 'delete_confirm', 2147483647, 0, 0),
 ('bx_notes_entry_view', 'allow_view_to', 2147483647, 0, 0),
 ('bx_notes_entry_view', 'do_submit', 2147483647, 0, 0),
-('bx_notes_entry_view', 'summary', 2147483647, 0, 0),
 ('bx_notes_entry_view', 'text', 2147483647, 0, 0),
 ('bx_notes_entry_view', 'title', 2147483647, 0, 0),
 ('bx_notes_entry_view', 'pictures', 2147483647, 0, 0),
@@ -148,7 +143,6 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('bx_notes_entry_delete', 'do_submit', 2147483647, 1, 2),
 ('bx_notes_entry_delete', 'allow_view_to', 2147483647, 0, 0),
 ('bx_notes_entry_delete', 'pictures', 2147483647, 0, 0),
-('bx_notes_entry_delete', 'summary', 2147483647, 0, 0),
 ('bx_notes_entry_delete', 'text', 2147483647, 0, 0),
 ('bx_notes_entry_delete', 'title', 2147483647, 0, 0);
 

modules/boonex/notes/js/forms.js

@@ -1,23 +0,0 @@
-
-function bx_notes_select_thumb(eCheckbox) {
-    var eCont = $(eCheckbox).parents('.bx-form-input-files-result');
-    if (!eCont.length)
-        return;
-    eCont.find('.bx-notes-use-as-thumb input:checked').each (function () {        
-        if ($(this).attr('id') != $(eCheckbox).attr('id'))
-            $(this).css('border', '1px solid red').attr('checked', false);
-    });
-}
-
-function bx_notes_delete_ghost (iFileId, sFileUrl, sFileIcon, sEditorId, sSummaryId, oUploaderInstance) {
-    bx_editor_remove_img (
-        [sEditorId, sSummaryId], 
-        ['img[src="' + sFileIcon + '"]', 'img[src="' + sFileUrl + '"]', '.bx-notes-img-' + iFileId, '.bx-notes-icon-' + iFileId]
-    );
-    oUploaderInstance.deleteGhost(iFileId);
-}
-
-function bx_notes_insert_to_post (iFileId, sFileUrl, sEditorId) {
-    bx_editor_insert_img (sEditorId, 'bx-notes-img-' + iFileId, sFileUrl, 'bx-notes-img');
-}
-