Skip to content

Commit

Permalink
Mirage: Introduce new list-row and list-column layout control, and re…
Browse files Browse the repository at this point in the history 
…moved old individual rules.
  • Loading branch information
@coder4life
coder4life committed Apr 26, 2012
1 parent a73673d commit 3b020f2
Show file tree
Hide file tree
Showing 8 changed files with 361 additions and 142 deletions.
357 changes: 288 additions & 69 deletions components/com_kunena/template/mirage/css/position.css
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions components/com_kunena/template/mirage/html/announcement/list_item.php
View file
Expand Up @@ -11,46 +11,46 @@
defined ( '_JEXEC' ) or die (); defined ( '_JEXEC' ) or die ();
?> ?>
<li class="announcements-row kbox-hover kbox-hover_list-row"> <li class="announcements-row kbox-hover kbox-hover_list-row">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<?php if ($this->actions): ?> <?php if ($this->actions): ?>
<dd class="announcement-checkbox"> <dd class="announcement-checkbox item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo JHTML::_('kunenagrid.id', $this->row, $this->announcement->id) ?> <?php echo JHTML::_('kunenagrid.id', $this->row, $this->announcement->id) ?>
</div> </div>
</dd> </dd>
<?php endif ?> <?php endif ?>
<dd class="announcement-id"> <dd class="announcement-id item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo $this->displayField('id') ?> <?php echo $this->displayField('id') ?>
</div> </div>
</dd> </dd>
<dd class="announcement-date"> <dd class="announcement-date item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo $this->displayField('created') ?> <?php echo $this->displayField('created') ?>
</div> </div>
</dd> </dd>
<dd class="announcement-author"> <dd class="announcement-author item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo $this->displayField('created_by') ?> <?php echo $this->displayField('created_by') ?>
</div> </div>
</dd> </dd>
<dd class="announcement-title"> <dd class="announcement-title item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo JHtml::_('kunenaforum.link', $this->announcement->getUri(), $this->displayField('title'), null, 'follow') ?> <?php echo JHtml::_('kunenaforum.link', $this->announcement->getUri(), $this->displayField('title'), null, 'follow') ?>
</div> </div>
</dd> </dd>
<?php if ($this->actions): ?> <?php if ($this->actions): ?>
<dd class="announcement-publish"> <dd class="announcement-publish item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php if ($this->canPublish()) echo JHTML::_('kunenagrid.published', $this->row, $this->announcement->published) ?> <?php if ($this->canPublish()) echo JHTML::_('kunenagrid.published', $this->row, $this->announcement->published) ?>
</div> </div>
</dd> </dd>
<dd class="announcement-edit"> <dd class="announcement-edit item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php if ($this->canEdit()) echo JHTML::_('kunenagrid.task', $this->row, 'tick.png', JText::_('COM_KUNENA_ANN_EDIT'), 'edit') ?> <?php if ($this->canEdit()) echo JHTML::_('kunenagrid.task', $this->row, 'tick.png', JText::_('COM_KUNENA_ANN_EDIT'), 'edit') ?>
</div> </div>
</dd> </dd>
<dd class="announcement-delete"> <dd class="announcement-delete item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php if ($this->canDelete()) echo JHTML::_('kunenagrid.task', $this->row, 'publish_x.png', JText::_('COM_KUNENA_ANN_DELETE'), 'delete') ?> <?php if ($this->canDelete()) echo JHTML::_('kunenagrid.task', $this->row, 'publish_x.png', JText::_('COM_KUNENA_ANN_DELETE'), 'delete') ?>
</div> </div>
Expand Down
28 changes: 14 additions & 14 deletions components/com_kunena/template/mirage/html/category/default_list.php
View file
Expand Up @@ -30,40 +30,40 @@
</div> </div>
</div> </div>
<?php echo $this->displayCategoryActions(); ?> <?php echo $this->displayCategoryActions(); ?>
<div class="innerbox-wrapper innerspacer kbox-full"> <div class="innerbox-wrapper innerspacer-top kbox-full">
<?php echo $this->getPagination(7); ?> <?php echo $this->getPagination(7); ?>
</div> </div>
<div class="detailsbox-wrapper innerspacer kbox-full"> <div class="detailsbox-wrapper innerspacer kbox-full">
<div class="topic detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow"> <div class="topic detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow">
<ul class="list-unstyled topic-list"> <ul class="topic-list list-unstyled list-row">
<li class="header kbox-hover_header-row kbox-full"> <li class="header kbox-hover_header-row kbox-full item-row">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<!--<dd class="topic-icon"> <!--<dd class="topic-icon">
</dd>--> </dd>-->
<dd class="topic-subject"> <dd class="topic-subject item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<?php // FIXME: translate ?> <?php // FIXME: translate ?>
<span class="bold"><?php echo JText::_('Subject') ?></span> <span class="bold"><?php echo JText::_('Subject') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-replies"> <dd class="topic-replies item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-views"> <dd class="topic-views item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-lastpost"> <dd class="topic-lastpost item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<?php // FIXME: translate ?> <?php // FIXME: translate ?>
<span class="bold"><?php echo JText::_('Last Post') ?></span> <span class="bold"><?php echo JText::_('Last Post') ?></span>
</div> </div>
</dd> </dd>
<?php if ($this->topicActions) : ?> <?php if ($this->topicActions) : ?>
<dd class="topic-checkbox"> <dd class="topic-checkbox item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<input type="checkbox" value="0" name="" class="kcheckall moderate-topic-checkall" /> <input type="checkbox" value="0" name="" class="kcheckall moderate-topic-checkall" />
</div> </div>
Expand All @@ -72,11 +72,11 @@
</dl> </dl>
</li> </li>
</ul> </ul>
<ul class="list-unstyled topic-list"> <ul class="topic-list list-unstyled list-row">
<?php if (empty($this->topics) && !$this->category->isSection()) : ?> <?php if (empty($this->topics) && !$this->category->isSection()) : ?>
<li class="topics-row kbox-hover kbox-hover_list-row"> <li class="topics-row kbox-hover kbox-hover_list-row item-row">
<dl> <dl class="list-unstyled list-column">
<dd class="topic-none"> <dd class="topic-none item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo JText::_('COM_KUNENA_VIEW_CATEGORY_NO_TOPICS'); ?> <?php echo JText::_('COM_KUNENA_VIEW_CATEGORY_NO_TOPICS'); ?>
</div> </div>
Expand All @@ -90,7 +90,7 @@
<?php if ($this->topicActions) : ?> <?php if ($this->topicActions) : ?>
<div class="modbox-wrapper innerspacer-bottom"> <div class="modbox-wrapper innerspacer-bottom">
<div class="modbox"> <div class="modbox">
<button class="kbutton button-type-standard fr" type="submit"><span><?php echo JText::_('COM_KUNENA_TOPICS_MODERATION_PERFORM'); ?></span></button> <button class="kbutton button-type-mod fr" type="submit"><span><?php echo JText::_('COM_KUNENA_TOPICS_MODERATION_PERFORM'); ?></span></button>
<?php echo $this->displayTopicActions('class="inputbox form-horizontal fr" size="1"', 'kmoderate-select') ?> <?php echo $this->displayTopicActions('class="inputbox form-horizontal fr" size="1"', 'kmoderate-select') ?>
</div> </div>
</div> </div>
Expand Down
10 changes: 5 additions & 5 deletions components/com_kunena/template/mirage/html/category/list_category.php
View file
Expand Up @@ -14,10 +14,10 @@
?> ?>


<li class="category-row category-row-<?php echo $this->rowclass [$this->k], isset ( $this->category->class_sfx ) ? ' category-row-' . $this->escape($this->rowclass [$this->k]) . $this->escape($this->category->class_sfx) : '' ?> kbox-hover kbox-hover_list-row kbox-full"> <li class="category-row category-row-<?php echo $this->rowclass [$this->k], isset ( $this->category->class_sfx ) ? ' category-row-' . $this->escape($this->rowclass [$this->k]) . $this->escape($this->category->class_sfx) : '' ?> kbox-hover kbox-hover_list-row kbox-full">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<!--<dd class="category-icon"> <!--<dd class="category-icon">
</dd>--> </dd>-->
<dd class="category-subject"> <dd class="category-subject item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<a class="fl" href="<?php echo $this->category->getUrl() ?>" title="<?php echo JText::sprintf('COM_KUNENA_VIEW_CATEGORY_LIST_CATEGORY_TITLE', $this->escape($this->category->name)) ?>">[K=CATEGORY_ICON]</a> <a class="fl" href="<?php echo $this->category->getUrl() ?>" title="<?php echo JText::sprintf('COM_KUNENA_VIEW_CATEGORY_LIST_CATEGORY_TITLE', $this->escape($this->category->name)) ?>">[K=CATEGORY_ICON]</a>
<ul class="kcontent-32 list-unstyled"> <ul class="kcontent-32 list-unstyled">
Expand All @@ -40,20 +40,20 @@
</ul> </ul>
</div> </div>
</dd> </dd>
<dd class="category-topics"> <dd class="category-topics item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<span class="number"><?php echo $this->formatLargeNumber($this->category->getTopics()); ?></span><br /> <span class="number"><?php echo $this->formatLargeNumber($this->category->getTopics()); ?></span><br />
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_TOPICS') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_TOPICS') ?></span>
</div> </div>
</dd> </dd>
<dd class="category-replies"> <dd class="category-replies item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<span class="number"><?php echo $this->formatLargeNumber($this->category->getReplies()); ?></span><br /> <span class="number"><?php echo $this->formatLargeNumber($this->category->getReplies()); ?></span><br />
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div> </div>
</dd> </dd>
<!-- td class="kcategory-subs">944 <span>Subscribers</span></td --> <!-- td class="kcategory-subs">944 <span>Subscribers</span></td -->
<dd class="category-lastpost"> <dd class="category-lastpost item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php if ($this->lastPost) : ?> <?php if ($this->lastPost) : ?>
<?php if ( $this->config->avataroncat ) : ?><?php echo $this->lastUser->getLink($this->lastUser->getAvatarImage('klist-avatar kavatar kavatar-32 fl', 'list')) ?><?php endif ?> <?php if ( $this->config->avataroncat ) : ?><?php echo $this->lastUser->getLink($this->lastUser->getAvatarImage('klist-avatar kavatar kavatar-32 fl', 'list')) ?><?php endif ?>
Expand Down
24 changes: 12 additions & 12 deletions components/com_kunena/template/mirage/html/statistics/default.php
View file
Expand Up @@ -74,42 +74,42 @@
</div> </div>
<div class="detailsbox-wrapper innerspacer"> <div class="detailsbox-wrapper innerspacer">
<div class="statistics-details detailsbox kbox-full kbox-hover kbox-border kbox-border_radius kbox-shadow" id="statistics-detailsbox"> <div class="statistics-details detailsbox kbox-full kbox-hover kbox-border kbox-border_radius kbox-shadow" id="statistics-detailsbox">
<ul class="list-unstyled popsubstat-list"> <ul class="popsubstat-list list-unstyled list-row">
<li class="header kbox-hover_header-row"> <li class="header kbox-hover_header-row item-row">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<dd class="popsubstats-col1"> <dd class="popsubstats-col1 item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo $top[0]->titleName ?></span> <span class="bold"><?php echo $top[0]->titleName ?></span>
</div> </div>
</dd> </dd>
<dd class="popsubstats-col2"> <dd class="popsubstats-col2 item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold">&nbsp;</span> <span class="bold">&nbsp;</span>
</div> </div>
</dd> </dd>
<dd class="popsubstats-col3"> <dd class="popsubstats-col3 item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo $top[0]->titleCount ?></span> <span class="bold"><?php echo $top[0]->titleCount ?></span>
</div> </div>
</dd> </dd>
</dl> </dl>
</li> </li>
</ul> </ul>
<ul class="list-unstyled popsubstat-list"> <ul class="popsubstat-list list-unstyled list-row">
<?php foreach ($top as $id=>$item) : ?> <?php foreach ($top as $id=>$item) : ?>
<li class="popsubstats-row kbox-hover kbox-hover_list-row"> <li class="popsubstats-row kbox-hover kbox-hover_list-row item-row">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<dd class="popsubstats-col1"> <dd class="popsubstats-col1 item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo $item->link ?> <?php echo $item->link ?>
</div> </div>
</dd> </dd>
<dd class="popsubstats-col2"> <dd class="popsubstats-col2 item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<div class="stats-bar" style="width:<?php echo $item->percent ?>%"></div> <div class="stats-bar" style="width:<?php echo $item->percent ?>%"></div>
</div> </div>
</dd> </dd>
<dd class="popsubstats-col3"> <dd class="popsubstats-col3 item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php echo $item->count ?> <?php echo $item->count ?>
</div> </div>
Expand Down
18 changes: 9 additions & 9 deletions components/com_kunena/template/mirage/html/topics/default_list.php
View file
Expand Up @@ -24,35 +24,35 @@
</div> </div>
<div class="detailsbox-wrapper innerspacer kbox-full"> <div class="detailsbox-wrapper innerspacer kbox-full">
<div class="topics-default_list-detailsbox detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow"> <div class="topics-default_list-detailsbox detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow">
<ul class="list-unstyled topic-list"> <ul class="topic-list list-unstyled list-row">
<li class="header kbox-hover_header-row kbox-full"> <li class="header kbox-hover_header-row kbox-full item-row">
<dl class="list-unstyled list-unstyled"> <dl class="list-unstyled list-column">
<!--<dd class="topic-icon"> <!--<dd class="topic-icon">
</dd>--> </dd>-->
<dd class="topic-subject"> <dd class="topic-subject item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<?php //FIXME: Translate ?> <?php //FIXME: Translate ?>
<span class="bold"><?php echo JText::_('Subject') ?></span> <span class="bold"><?php echo JText::_('Subject') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-replies"> <dd class="topic-replies item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-views"> <dd class="topic-views item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-lastpost"> <dd class="topic-lastpost item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<?php //FIXME: Translate ?> <?php //FIXME: Translate ?>
<span class="bold"><?php echo JText::_('Last Post') ?></span> <span class="bold"><?php echo JText::_('Last Post') ?></span>
</div> </div>
</dd> </dd>
<?php if ($this->topicActions) : ?> <?php if ($this->topicActions) : ?>
<dd class="topic-checkbox"> <dd class="topic-checkbox item-column">
<div class="innerspacer-header"> <div class="innerspacer-header">
<span><input id="kcheckbox-all" type="checkbox" value="" name="toggle" class="kcheckall" /></span> <span><input id="kcheckbox-all" type="checkbox" value="" name="toggle" class="kcheckall" /></span>
</div> </div>
Expand All @@ -61,7 +61,7 @@
</dl> </dl>
</li> </li>
</ul> </ul>
<ul class="list-unstyled topic-list"> <ul class="topic-list list-unstyled">
<?php if (empty($this->topics )) : ?> <?php if (empty($this->topics )) : ?>
<li class="topic-row"> <li class="topic-row">
<dl class="list-unstyled"> <dl class="list-unstyled">
Expand Down
14 changes: 7 additions & 7 deletions components/com_kunena/template/mirage/html/topics/default_row.php
View file
Expand Up @@ -10,9 +10,9 @@
**/ **/
defined ( '_JEXEC' ) or die (); defined ( '_JEXEC' ) or die ();
?> ?>
<li class="topic-row kbox-hover kbox-hover_list-row box-full"> <li class="topic-row kbox-hover kbox-hover_list-row box-full item-row">
<dl class="list-unstyled"> <dl class="list-unstyled list-column">
<dd class="topic-subject"> <dd class="topic-subject item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php // FIXME: broken ?> <?php // FIXME: broken ?>
<?php echo $this->getTopicLink ( $this->topic, 'unread', '[K=TOPIC_ICON]', null, 'fl' ) ?> <?php echo $this->getTopicLink ( $this->topic, 'unread', '[K=TOPIC_ICON]', null, 'fl' ) ?>
Expand Down Expand Up @@ -45,20 +45,20 @@
</div> </div>
</dd> </dd>
<!-- <td class="ktopic-status-icons"><span class="ktopic-attach">Attachment</span><span class="ktopic-sticky">Sticky</span></td> --> <!-- <td class="ktopic-status-icons"><span class="ktopic-attach">Attachment</span><span class="ktopic-sticky">Sticky</span></td> -->
<dd class="topic-replies"> <dd class="topic-replies item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<span class="number"><?php echo $this->formatLargeNumber($this->topic->getReplies()); ?></span><br /> <span class="number"><?php echo $this->formatLargeNumber($this->topic->getReplies()); ?></span><br />
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div> </div>
</dd> </dd>
<dd class="topic-views"> <dd class="topic-views item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<span class="number"><?php echo $this->formatLargeNumber($this->topic->getHits()); ?></span><br /> <span class="number"><?php echo $this->formatLargeNumber($this->topic->getHits()); ?></span><br />
<span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span> <span class="bold"><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span>
</div> </div>
</dd> </dd>
<!-- td class="ktopic-subs">22 <span>Subscribers</span></td --> <!-- td class="ktopic-subs">22 <span>Subscribers</span></td -->
<dd class="topic-lastpost"> <dd class="topic-lastpost item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<?php if ( $this->config->avataroncat ) : ?><?php echo $this->lastPostAuthor->getLink($this->lastPostAuthor->getAvatarImage('klist-avatar kavatar kavatar-32 fl', 'list')) ?><?php endif ?> <?php if ( $this->config->avataroncat ) : ?><?php echo $this->lastPostAuthor->getLink($this->lastPostAuthor->getAvatarImage('klist-avatar kavatar kavatar-32 fl', 'list')) ?><?php endif ?>
<ul class="kcontent-32 list-unstyled"> <ul class="kcontent-32 list-unstyled">
Expand All @@ -69,7 +69,7 @@
</div> </div>
</dd> </dd>
<?php if ($this->topicActions) : ?> <?php if ($this->topicActions) : ?>
<dd class="topic-checkbox"> <dd class="topic-checkbox item-column">
<div class="innerspacer-column"> <div class="innerspacer-column">
<input type="checkbox" class="kcheck kmoderate-topic-checkbox" name="topics[<?php echo $this->topic->id?>]" value="1" /> <input type="checkbox" class="kcheck kmoderate-topic-checkbox" name="topics[<?php echo $this->topic->id?>]" value="1" />
</div> </div>
Expand Down

0 comments on commit 3b020f2

Please sign in to comment.