diff --git a/src/components/com_tjucm/media/css/tjucm.css b/src/components/com_tjucm/media/css/tjucm.css index 49bcf13d..0425dfd9 100644 --- a/src/components/com_tjucm/media/css/tjucm.css +++ b/src/components/com_tjucm/media/css/tjucm.css @@ -7,6 +7,6 @@ margin-left:5px !important; width:200px !important; } -p.tj-wordwrap{ +.tjucm-wrapper .tj-wordwrap{ word-break: break-word; } diff --git a/src/components/com_tjucm/site/layouts/detail/fields.php b/src/components/com_tjucm/site/layouts/detail/fields.php index 180bf14d..33a6f8bd 100644 --- a/src/components/com_tjucm/site/layouts/detail/fields.php +++ b/src/components/com_tjucm/site/layouts/detail/fields.php @@ -63,6 +63,7 @@ $count++; $fieldCount = 0; ?> +
getFieldset($fieldset->name) as $field) @@ -162,7 +163,7 @@ $layoutToUse = (array_key_exists($field->type, $fieldLayout)) ? $fieldLayout[$field->type] : 'field'; ?>
-
+
label; ?>:
@@ -186,18 +187,20 @@ $layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields'); $output = $layout->render(array('fieldXml' => $xmlField, 'field' => $field)); - // To align text, textarea and textareacounter fields properly + // To align text, textarea, textareacounter and editor fields properly - if ($field->type == 'Textarea'|| $field->type == 'Textareacounter'|| $field->type == 'Text') + if ($field->type == 'Textarea'|| $field->type == 'Textareacounter'|| $field->type == 'Text' || $field->type == 'Editor') { ?> -

+

-

- +
@@ -207,5 +210,6 @@ } ?>
+
+ * @author TechJoomla * @copyright Copyright (c) 2009-2019 TechJoomla. All rights reserved. - * @license GNU General Public License version 2 or later; see LICENSE.txt + * @license GNU General Public License version 2 or later; see LICENSE.txt */ // No direct access @@ -51,7 +51,7 @@ $xmlFormObject = $displayData['xmlFormObject']; $formObject = $displayData['formObject']; $ucmTypeId = $displayData['ucmTypeId']; -$allowDraftSave= $displayData['ucmTypeParams']->allow_draft_save; +$allowDraftSave = $displayData['ucmTypeParams']->allow_draft_save; $appendUrl = ''; $csrf = "&" . Session::getFormToken() . '=1'; @@ -93,13 +93,16 @@ } ?> +
state)) { $class = ($canChange) ? 'active' : 'disabled'; ?> - + state == 1) { @@ -116,16 +119,21 @@ } ?> - + escape($item->id); ?> + { + ?> draft) ? Text::_('COM_TJUCM_DATA_STATUS_DRAFT') : Text::_('COM_TJUCM_DATA_STATUS_SAVE'); ?> field_values)) { foreach ($item->field_values as $key => $fieldValue) @@ -147,7 +155,11 @@ { $field = $formObject->getField($tjFieldsFieldTable->name); $field->setValue($fieldValue); - $layoutToUse = (array_key_exists(ucfirst($tjFieldsFieldTable->type), $fieldLayout)) ? $fieldLayout[ucfirst($tjFieldsFieldTable->type)] : 'field'; + $layoutToUse = ( + array_key_exists( + ucfirst($tjFieldsFieldTable->type), $fieldLayout + ) + ) ? $fieldLayout[ucfirst($tjFieldsFieldTable->type)] : 'field'; $layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields'); $output = $layout->render(array('fieldXml' => $fieldXml, 'field' => $field)); echo $output; @@ -156,22 +168,36 @@ - + + + - | + | + + - | + | + + @@ -180,3 +206,4 @@ } ?> +
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default.php b/src/components/com_tjucm/site/views/items/tmpl/default.php index 0b58f67c..85eca615 100644 --- a/src/components/com_tjucm/site/views/items/tmpl/default.php +++ b/src/components/com_tjucm/site/views/items/tmpl/default.php @@ -38,19 +38,22 @@ $fieldsData = array(); $statusColumnWidth = 0; ?> +
-items)) - { - ?> -
-

- title)." ".JText::_("COM_TJUCM_FORM_LIST"); ?> -

-

- loadTemplate('filters'); ?> -
+items)) + { + ?> +
+

+ title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?> +

+
loadTemplate('filters'); + ?> +
allowedToAdd) { @@ -61,7 +64,7 @@ -
+
@@ -70,92 +73,92 @@ if (!empty($this->showList)) { if (!empty($this->items)) - {?> - - - items[0]->state)) - { + { + ?> + + + items[0]->state)) + { ?> - + - + - - - - - ucmTypeParams->allow_draft_save) && $this->ucmTypeParams->allow_draft_save == 1) - { - $statusColumnWidth = 2; - ?> + } + ?> - + listcolumn)) - { - JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjfields/tables'); - $tjFieldsFieldTable = JTable::getInstance('field', 'TjfieldsTable'); + ucmTypeParams->allow_draft_save) && $this->ucmTypeParams->allow_draft_save == 1) + { + $statusColumnWidth = 2; + ?> + + + + listcolumn as $fieldId => $col_name) + if (!empty($this->listcolumn)) { - if (isset($fieldsData[$fieldId])) - { - $tjFieldsFieldTable = $fieldsData[$fieldId]; - } - else + JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjfields/tables'); + $tjFieldsFieldTable = JTable::getInstance('field', 'TjfieldsTable'); + + foreach ($this->listcolumn as $fieldId => $col_name) { + if (isset($fieldsData[$fieldId])) + { + $tjFieldsFieldTable = $fieldsData[$fieldId]; + } + else + { $tjFieldsFieldTable = JTable::getInstance('field', 'TjfieldsTable'); $tjFieldsFieldTable->load($fieldId); $fieldsData[$fieldId] = $tjFieldsFieldTable; } - ?> + } - - + if ($this->canEdit || $this->canDelete) + { + ?> + + - canEdit || $this->canDelete) { ?> - - - - - - - - items)) - { - ?> - + + + + items)) + { + ?> + - + pagination->getListFooter(); ?> - - - - showList)) - { + + + + showList)) + { if (!empty($this->items)) { $xmlFileName = explode(".", $this->client); @@ -177,7 +180,16 @@ { // Call the JLayout to render the fields in the details view $layout = new JLayoutFile('list.list', JPATH_ROOT . '/components/com_tjucm/'); - echo $layout->render(array('itemsData' => $item, 'created_by' => $this->created_by, 'client' => $this->client, 'xmlFormObject' => $formXml, 'ucmTypeId' => $this->ucmTypeId, 'ucmTypeParams' => $this->ucmTypeParams, 'fieldsData' => $fieldsData, 'formObject' => $formObject)); + echo $layout->render( + array('itemsData' => $item, + 'created_by' => $this->created_by, + 'client' => $this->client, + 'xmlFormObject' => $formXml, + 'ucmTypeId' => $this->ucmTypeId, + 'ucmTypeParams' => $this->ucmTypeParams, + 'fieldsData' => $fieldsData, + 'formObject' => $formObject) + ); } } else @@ -186,24 +198,26 @@
-
- - - -
+ } + else + { + ?> +
+ + + +
allowedToAdd) { ?> - + "/> +
canDelete) {