first commit

joomla · Jul 12, 2017 · 8df31ae · 8df31ae
1 parent ea4b1e0
commit 8df31ae
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 32 deletions.
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
@@ -92,9 +92,11 @@
 								<th style="width:10%" class="nowrap hidden-sm-down text-center">
 									<?php echo JHtml::_('searchtools.sort',  'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap hidden-sm-down text-center">
-									<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
-								</th>
+								<?php if (JLanguageMultilang::isEnabled()) : ?>
+									<th style="width:10%" class="nowrap hidden-sm-down text-center">
+										<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+									</th>
+								<?php endif; ?>
 								<th style="width:10%" class="nowrap hidden-sm-down text-center">
 									<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 								</th>
@@ -199,9 +201,11 @@
 										<?php echo $this->escape($item->author_name); ?></a>
 									<?php endif; ?>
 								</td>
-								<td class="small hidden-sm-down text-center">
-									<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
-								</td>
+								<?php if (JLanguageMultilang::isEnabled()) : ?>
+									<td class="small hidden-sm-down text-center">
+										<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+									</td>
+								<?php endif; ?>
 								<td class="nowrap small hidden-sm-down text-center">
 									<?php
 									$date = $item->{$orderingColumn};

diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
@@ -79,9 +79,11 @@
 								<th style="width:10%" class="nowrap hidden-sm-down text-center">
 									<?php echo JHtml::_('searchtools.sort', 'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap hidden-sm-down text-center">
-									<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
-								</th>
+								<?php if (JLanguageMultilang::isEnabled()) : ?>
+									<th style="width:10%" class="nowrap hidden-sm-down text-center">
+										<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+									</th>
+								<?php endif; ?>
 								<th style="width:10%" class="nowrap hidden-sm-down text-center">
 									<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 								</th>
@@ -181,9 +183,11 @@
 										<?php echo $this->escape($item->author_name); ?>
 									<?php endif; ?>
 								</td>
-								<td class="small hidden-sm-down text-center">
-									<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
-								</td>
+								<?php if (JLanguageMultilang::isEnabled()) : ?>
+									<td class="small hidden-sm-down text-center">
+										<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+									</td>
+								<?php endif; ?>
 								<td class="nowrap small hidden-sm-down text-center">
 									<?php
 									$date = $item->{$orderingColumn};

diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php
@@ -14,35 +14,18 @@
 $app = JFactory::getApplication();
 
 // JLayout for standard handling of the details sidebar in administrator edit screens.
-$title = $displayData->getForm()->getValue('title');
 $published = $displayData->getForm()->getField('published');
 $saveHistory = $displayData->get('state')->get('params')->get('save_history', 0);
 ?>
-<div class="col-md-2">
-	<h4><?php echo JText::_('JDETAILS'); ?></h4>
-	<hr>
-	<fieldset class="form-vertical">
-		<?php if (empty($title)) : ?>
-			<div class="control-group">
-				<div class="controls">
-					<?php echo $displayData->getForm()->getValue('name'); ?>
-				</div>
-			</div>
-		<?php else : ?>
-			<div class="control-group">
-				<div class="controls">
-					<?php echo $displayData->getForm()->getValue('title'); ?>
-				</div>
-			</div>
-		<?php endif; ?>
-
+	<fieldset class="form-vertical form-no-margin">
 		<?php if ($published) : ?>
 			<?php echo $displayData->getForm()->renderField('published'); ?>
 		<?php else : ?>
 			<?php echo $displayData->getForm()->renderField('state'); ?>
 		<?php endif; ?>
 
 		<?php echo $displayData->getForm()->renderField('access'); ?>
+		<?php echo $displayData->getForm()->renderField('catid'); ?>
 		<?php echo $displayData->getForm()->renderField('featured'); ?>
 		<?php if (JLanguageMultilang::isEnabled()) : ?>
 			<?php echo $displayData->getForm()->renderField('language'); ?>
@@ -55,4 +38,3 @@
 			<?php echo $displayData->getForm()->renderField('version_note'); ?>
 		<?php endif; ?>
 	</fieldset>
-</div>
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
@@ -43,6 +43,7 @@
 	$hiddenFields[] = 'version_note';
 }
 
+
 $html   = array();
 $html[] = '<fieldset class="form-vertical form-no-margin">';