Permalink
Browse files

Fixed a few styles in com_content

  • Loading branch information...
1 parent fb54e91 commit 8505459eb49054f52bf83175f942411521874ddf @antonydoyle committed Oct 2, 2012
View
@@ -32,23 +32,41 @@ article header {
.actions ul, ul.actions {
list-style:none;
width:200px;
+ display:inline-block;
+ clear:both;
}
.actions ul li, ul.actions li {
display:inline-block;
}
.article-meta {
-
+ width:200px;
+ color:#222;
+ clear:both;
+ display:inline-block;
}
.article-footer ul {
list-style:none;
}
dl.article-info {
- width:240px;
- background: none repeat scroll 0 0 #F2F2F2;
- border: 1px solid #E6E6E6;
- margin: 0 0 22px;
- padding: 20px;
- float:right;
+
+}
+.details {
+ padding:9.5px 35px !important;
+}
+.article-details {
+ padding:5px;
+}
+.detailsDrop li{
+ color:#111 !important;
+ text-size:12px;
+ padding:5px 3px !important;
+}
+.article-details ul {
+ list-style:none;
+ display:inline-block;
+ margin-bottom:0;
+ margin-top:0;
+ line-height:0.5em;
}
.article-info dt {
font-weight:bold;
@@ -82,7 +100,7 @@ text-align:right;
margin-bottom:25px;
}
.button.dropdown ul.no-hover.show-dropdown {
- top:28px !important;
+ top:28px;
}
ul.pagenav, ul.pagenav li {
margin: 0;
View
@@ -36,6 +36,7 @@
}
+// Count Modules & Stuff
$logo = (int) ($this->countModules('logo') > 0);
$menu = (int) ($this->countModules('menu') > 0);
@@ -77,7 +78,7 @@
$menuModTitle = $this->params->get('menuModTitle');
-// Get the column widths
+// Get the column widths: There's probably a neater way to do it.
if (($right == "0") && ($left == "0")) {
$mainWidth = 'twelve columns';
@@ -92,6 +93,9 @@
elseif (($right != "0") && ($left != "0")) {
$mainWidth = 'eight columns'; $leftWidth = 'two columns'; $rightWidth = 'two columns';
}
+
+//Peripheral module logic.
+
// Top Module Logic
$top = compact( 'top1', 'top2', 'top3' );//get modules into array
sort( $top );//sort array so it is in numerical order
@@ -158,7 +162,6 @@
}
-
#----------------------------- Construct Code Snippets-----------------------------#
// GPL code taken from Construct template framework by Matt Thomas http://construct-framework.com/
@@ -193,7 +196,6 @@
$doc->addStyleSheet($template.'/css/templateCore.css');
$doc->addCustomTag('<script src="'.$template.'/js/modernizr.foundation.js"></script>');
-
if ($minFound > 0) {
$doc->addCustomTag('<script src="'.$template.'/js/foundation.js"></script>');
}
@@ -49,109 +49,115 @@
</h1>
</header>
<?php endif; ?>
+<section class="article-details panel">
+<ul>
+<li>
<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
- <section class="actions">
- <ul class="link-list">
+ <ul class="button-group">
<?php if (!$this->print) : ?>
<?php if ($params->get('show_print_icon')) : ?>
- <li class="print-icon">
+ <li class="print-icon button small">
<?php echo JHtml::_('icon.print_popup', $this->item, $params); ?>
</li>
<?php endif; ?>
<?php if ($params->get('show_email_icon')) : ?>
- <li class="email-icon">
+ <li class="email-icon button small">
<?php echo JHtml::_('icon.email', $this->item, $params); ?>
</li>
<?php endif; ?>
<?php if ($canEdit) : ?>
- <li class="edit-icon">
+ <li class="edit-icon button small">
<?php echo JHtml::_('icon.edit', $this->item, $params); ?>
</li>
<?php endif; ?>
<?php else : ?>
- <li>
+ <li class="button small">
<?php echo JHtml::_('icon.print_screen', $this->item, $params); ?>
</li>
<?php endif; ?>
+<?php endif; ?>
+<?php $useDefList = (($params->get('show_author')) or ($params->get('show_category')) or ($params->get('show_parent_category'))
+ or ($params->get('show_create_date')) or ($params->get('show_modify_date')) or ($params->get('show_publish_date'))
+ or ($params->get('show_hits'))); ?>
+<li>
+<?php if ($useDefList) : ?>
+<div href="#" class="button dropdown details"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+
+<ul class="detailsDrop">
+<?php if ($params->get('show_category')) : ?>
+ <li class="category-name">
+ <?php $title = $this->escape($this->item->category_title);
+ $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)).'">'.$title.'</a>';?>
+ <?php if ($params->get('link_category') AND $this->item->catslug) : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+ <?php else : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+ <?php endif; ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_create_date')) : ?>
+ <li class="create">
+ <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date',$this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_modify_date')) : ?>
+ <li class="modified">
+ <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date',$this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_publish_date')) : ?>
+ <li class="published">
+ <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE', JHtml::_('date',$this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+ <li class="createdby">
+ <?php $author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
+ <?php if (!empty($this->item->contactid) && $params->get('link_author') == true): ?>
+ <?php
+ $needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid;
+ $item = JSite::getMenu()->getItems('link', $needle, true);
+ $cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
+ ?>
+ <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', JRoute::_($cntlink), $author)); ?>
+ <?php else: ?>
+ <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+ <?php endif; ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_hits')) : ?>
+ <li class="hits">
+ <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+ </li>
+ <?php endif; ?>
+</ul>
+</div>
+</li>
</ul>
- </section>
+</li>
+
+</ul>
<?php endif; ?>
-<?php if (!$params->get('show_intro')) :
+
+</section>
+ <section class="actions">
+
+
+ <?php if (!$params->get('show_intro')) :
echo $this->item->event->afterDisplayTitle;
endif; ?>
<?php echo $this->item->event->beforeDisplayContent; ?>
-<?php $useDefList = (($params->get('show_author')) or ($params->get('show_category')) or ($params->get('show_parent_category'))
- or ($params->get('show_create_date')) or ($params->get('show_modify_date')) or ($params->get('show_publish_date'))
- or ($params->get('show_hits'))); ?>
-<?php if ($useDefList) : ?>
+
<aside class="article-meta">
- <dl class="article-info">
- <dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
-<?php if ($params->get('show_parent_category') && $this->item->parent_slug != '1:root') : ?>
- <dd class="parent-category-name">
- <?php $title = $this->escape($this->item->parent_title);
- $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)).'">'.$title.'</a>';?>
- <?php if ($params->get('link_parent_category') AND $this->item->parent_slug) : ?>
- <?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
- <?php else : ?>
- <?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
- <?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_category')) : ?>
- <dd class="category-name">
- <?php $title = $this->escape($this->item->category_title);
- $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)).'">'.$title.'</a>';?>
- <?php if ($params->get('link_category') AND $this->item->catslug) : ?>
- <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
- <?php else : ?>
- <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
- <?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_create_date')) : ?>
- <dd class="create">
- <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date',$this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_modify_date')) : ?>
- <dd class="modified">
- <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date',$this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_publish_date')) : ?>
- <dd class="published">
- <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE', JHtml::_('date',$this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
- <dd class="createdby">
- <?php $author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
- <?php if (!empty($this->item->contactid) && $params->get('link_author') == true): ?>
- <?php
- $needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid;
- $item = JSite::getMenu()->getItems('link', $needle, true);
- $cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
- ?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', JRoute::_($cntlink), $author)); ?>
- <?php else: ?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
- <?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_hits')) : ?>
- <dd class="hits">
- <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
- </dd>
-<?php endif; ?>
- </dl>
+
</aside>
-<?php endif; ?>
+ </section>
+
<?php if (isset ($this->item->toc)) : ?>
<?php echo $this->item->toc; ?>
<?php endif; ?>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -92,7 +92,7 @@
</div>
<?php endif; ?>
<?php if ($top3 > 0) : ?>
- <div class="<?php echo $topWidth ?> last">
+ <div class="<?php echo $topWidth ?>">
<jdoc:include type="modules" name="top3" style="html5" />
</div>
<?php endif; ?>
@@ -119,7 +119,7 @@
</div>
<?php endif; ?>
<?php if ($above3 > 0) : ?>
- <div class="<?php echo $aboveWidth ?> last">
+ <div class="<?php echo $aboveWidth ?>">
<jdoc:include type="modules" name="above3" style="html5" />
</div>
<?php endif; ?>
@@ -138,7 +138,7 @@
</div>
<?php endif; ?>
<?php if ($below3 > 0) : ?>
- <div class="<?php echo $belowWidth ?> last">
+ <div class="<?php echo $belowWidth ?>">
<jdoc:include type="modules" name="below3" style="html5" />
</div>
<?php endif; ?>
@@ -149,9 +149,6 @@
<jdoc:include type="modules" name="right" style="html5" />
</div>
<?php endif; ?>
-
-
-
</div>
<!--Bottom Row -->
@@ -167,7 +164,7 @@
</div>
<?php endif; ?>
<?php if ($bottom3 > 0) : ?>
- <div class="<?php echo $bottomWidth ?> last">
+ <div class="<?php echo $bottomWidth ?>">
<jdoc:include type="modules" name="bottom3" style="html5" />
</div>
<?php endif; ?>
@@ -186,12 +183,12 @@
</div>
<?php endif; ?>
<?php if ($footerTop3 > 0) : ?>
- <div class="<?php echo $footerTopWidth ?> last">
+ <div class="<?php echo $footerTopWidth ?>">
<jdoc:include type="modules" name="footerTop3" style="html5" />
</div>
<?php endif; ?>
<?php if ($footerTop4 > 0) : ?>
- <div class="<?php echo $footerTopWidth ?> last">
+ <div class="<?php echo $footerTopWidth ?>">
<jdoc:include type="modules" name="footerTop4" style="html5" />
</div>
<?php endif; ?>
@@ -210,16 +207,12 @@
</div>
<?php endif; ?>
<?php if ($footer3 > 0) : ?>
- <div class="<?php echo $footerWidth ?> last">
+ <div class="<?php echo $footerWidth ?>">
<jdoc:include type="modules" name="footer3" style="html5" />
</div>
<?php endif; ?>
</div>
-
-
-
-
<!-- Initialize JS Plugins -->
<script src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/js/app.js"></script>

0 comments on commit 8505459

Please sign in to comment.