Skip to content
Browse files

# [#27557] Code style fix and Hathor CSS fixes to Extensions/Installer.

Thanks Andrea.
  • Loading branch information...
1 parent 6d2f192 commit 9f7cc71f8fc857fe564fbf6f80e2be0753aa3f05 @andreatarr andreatarr committed with infograf768
View
47 administrator/components/com_installer/views/database/tmpl/default.php
@@ -30,34 +30,35 @@
<?php $panelName = JText::plural('COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL', $errors); ?>
<?php echo JHtml::_('sliders.panel', $panelName, 'error-panel'); ?>
- <fieldset class="panelform">
- <ul>
- <?php if (!strncmp($this->schemaVersion, JVERSION, 5) === 0) : ?>
- <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR', $this->schemaVersion, JVERSION); ?></li>
- <?php endif; ?>
-
- <?php foreach($this->errors as $line => $error) : ?>
- <?php $key = 'COM_INSTALLER_MSG_DATABASE_' . $error->queryType;
- $msgs = $error->msgElements;
- $file = basename($error->file);
- $msg0 = (isset($msgs[0])) ? $msgs[0] : ' ';
- $msg1 = (isset($msgs[1])) ? $msgs[1] : ' ';
- $msg2 = (isset($msgs[2])) ? $msgs[2] : ' ';
- $message = JText::sprintf($key, $file, $msg0, $msg1, $msg2); ?>
- <li><?php echo $message; ?></li>
- <?php endforeach; ?></ul>
+ <fieldset class="panelform">
+ <ul>
+ <?php if (!strncmp($this->schemaVersion, JVERSION, 5) === 0) : ?>
+ <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR', $this->schemaVersion, JVERSION); ?></li>
+ <?php endif; ?>
+
+ <?php foreach($this->errors as $line => $error) : ?>
+ <?php $key = 'COM_INSTALLER_MSG_DATABASE_' . $error->queryType;
+ $msgs = $error->msgElements;
+ $file = basename($error->file);
+ $msg0 = (isset($msgs[0])) ? $msgs[0] : ' ';
+ $msg1 = (isset($msgs[1])) ? $msgs[1] : ' ';
+ $msg2 = (isset($msgs[2])) ? $msgs[2] : ' ';
+ $message = JText::sprintf($key, $file, $msg0, $msg1, $msg2); ?>
+ <li><?php echo $message; ?></li>
+ <?php endforeach; ?>
+ </ul>
</fieldset>
<?php endif; ?>
<?php echo JHtml::_('sliders.panel', JText::_('COM_INSTALLER_MSG_DATABASE_INFO'), 'furtherinfo-pane'); ?>
<fieldset class="panelform">
-<ul>
- <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION', $this->schemaVersion); ?></li>
- <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_DRIVER', JFactory::getDbo()->name); ?></li>
- <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_CHECKED_OK', count($this->results['ok'])); ?></li>
- <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SKIPPED', count($this->results['skipped'])); ?></li>
-</ul>
-</fieldset>
+ <ul>
+ <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION', $this->schemaVersion); ?></li>
+ <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_DRIVER', JFactory::getDbo()->name); ?></li>
+ <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_CHECKED_OK', count($this->results['ok'])); ?></li>
+ <li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SKIPPED', count($this->results['skipped'])); ?></li>
+ </ul>
+ </fieldset>
<?php echo JHtml::_('sliders.end'); ?>
<div class="clr"> </div>
View
14 administrator/templates/hathor/css/template.css
@@ -141,6 +141,10 @@ span.unwritable { color: #a20000;}
.pointer { cursor: pointer;}
.nowrap { white-space: nowrap; }
+p.nowarning, p.warning {
+ padding: 5px 10px;
+}
+
/* end new styles */
/**
@@ -2629,3 +2633,13 @@ span.update-badge {
.unotes p {
padding-bottom: 10px;
}
+
+/* com-install styling */
+div#database-sliders {
+ margin: 10px;
+}
+
+fieldset.uploadform {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
View
4 administrator/templates/hathor/html/com_installer/discover/default.php
@@ -63,10 +63,10 @@
<?php echo $this->pagination->getListFooter(); ?>
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
<?php else : ?>
- <p>
+ <p class="nowarning">
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
</p>
- <p>
+ <p class="nowarning">
<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSION'); ?>
</p>
<?php endif; ?>
View
1 installation/CHANGELOG
@@ -28,6 +28,7 @@ $ -> Language fix or change
21-Jan-2012 Jean-Marie Simonet
$ Updating installation ini files tr-TR, ur-PK
+ # [#27557] Code style fix and Hathor CSS fixes to Extensions/Installer. Thanks Andrea.
21-Jan-2012 Christophe Demko
# [#27798] Tracker #27896 messed up CSS in Hathor control panel (Andrea Tarr)

0 comments on commit 9f7cc71

Please sign in to comment.
Something went wrong with that request. Please try again.