Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #764 from coder4life/master

Mirage: Some template improvements. Added/Edited some missing CSS classes in views.
  • Loading branch information...
commit dbc5ccfb1e7bb38fc3e306e6489590e87ae74414 2 parents 3a6adc7 + 713949b
@mahagr mahagr authored
Showing with 512 additions and 144 deletions.
  1. +181 −26 components/com_kunena/template/mirage/css/position.css
  2. +13 −0 components/com_kunena/template/mirage/css/style.css
  3. +49 −25 components/com_kunena/template/mirage/html/announcement/edit.php
  4. +24 −22 components/com_kunena/template/mirage/html/announcement/list.php
  5. +16 −16 components/com_kunena/template/mirage/html/announcement/list_item.php
  6. +6 −6 components/com_kunena/template/mirage/html/category/list_category.php
  7. +1 −1  components/com_kunena/template/mirage/html/category/list_section.php
  8. +1 −1  components/com_kunena/template/mirage/html/statistics/default.php
  9. +2 −2 components/com_kunena/template/mirage/html/topic/edit_form.php
  10. 0  components/com_kunena/template/mirage/html/{ → topic}/indented_bottom.php
  11. +3 −3 components/com_kunena/template/mirage/html/topics/default_row.php
  12. +2 −2 components/com_kunena/template/mirage/html/user/default_summary.php
  13. +1 −1  components/com_kunena/template/mirage/html/user/edit_settings.php
  14. +3 −3 components/com_kunena/template/mirage/html/user/edit_user.php
  15. +36 −1 components/com_kunena/template/mirage/html/user/list.php
  16. 0  components/com_kunena/template/mirage/html/user/{list_row.php → list_block_row.php}
  17. +95 −35 components/com_kunena/template/mirage/html/user/list_list.php
  18. +79 −0 components/com_kunena/template/mirage/html/user/list_list_row.php
View
207 components/com_kunena/template/mirage/css/position.css
@@ -167,6 +167,10 @@
margin-left: 37px;
}
+#kunena.layout .kcontent-36 {
+ margin-left: 41px;
+}
+
#kunena.layout .kcontent-48 {
margin-left: 53px;
}
@@ -475,6 +479,11 @@
padding: 0px 10px 0px 10px;
}
+#kunena.layout .innerspacer-horizontal-inline {
+ /*padding: 5px 10px 10px 10px;*/
+ padding: 0px 20px 0px 20px;
+}
+
#kunena.layout div.modbox {
overflow: hidden;
float: right;
@@ -916,31 +925,31 @@
* START ANNOUNCEMENT LIST *
***************************/
-#kunena.layout ul.announcement-list {
+#kunena.layout ul.announcements-list {
display: block;
list-style-type: none;
margin: 0px;
padding: 0px;
}
-#kunena.layout ul.announcement-list div.header {
+#kunena.layout ul.announcements-list div.header {
clear: both;
display: block;
position: relative;
vertical-align: bottom;
}
-/*#kunena.layout ul.announcement-list > li {
+#kunena.layout ul.announcements-list > li {
clear: both;
display: block;
position: relative;
vertical-align: bottom;
margin: 0;
overflow: hidden;
- padding: 1px 0 0;
-}*/
+ padding: 0;
+}
-#kunena.layout ul.announcement-list li.announcements-row dl, ul.announcement-list li.header {
+#kunena.layout ul.announcements-list li.announcements-row dl, ul.announcements-list li.header {
float: none !important;
height: auto;
width: auto;
@@ -960,10 +969,10 @@
/*position: relative;
}*/
-#kunena.layout ul.announcement-list li.header dd {
+#kunena.layout ul.announcements-list li.header dd {
display: block;
float: left;
- margin: 0px;
+ margin: 0;
/*padding: 2px 5px;*/
}
@@ -972,7 +981,7 @@
float: left;
margin: 0px;*/
/*padding: 2px 0;*/
-}
+/*}*/
/*#kunena.layout ul.topic-list li.topics-row dl {
display: block;
@@ -985,15 +994,7 @@
margin: 0px;
}*/
-#kunena.layout ul.announcement-list dd.announcement-checkbox {
- padding: 0;
- margin: 0;
- text-align: center;
- vertical-align: middle;
- width: 5%;
-}
-
-#kunena.layout ul.announcement-list dd.announcement-id {
+#kunena.layout dl.announcements-list dd.announcements-id {
padding: 0;
margin: 0;
text-align: center;
@@ -1001,7 +1002,7 @@
width: 5%;
}
-#kunena.layout ul.announcement-list dd.announcement-date {
+#kunena.layout dl.announcements-list dd.announcements-date {
padding: 0;
margin: 0;
text-align: left;
@@ -1009,7 +1010,7 @@
width: 10%;
}
-#kunena.layout ul.announcement-list dd.announcement-author {
+#kunena.layout dl.announcements-list dd.announcements-author {
padding: 0;
margin: 0;
text-align: left;
@@ -1017,7 +1018,7 @@
width: 15%;
}
-#kunena.layout ul.announcement-list dd.announcement-title {
+#kunena.layout dl.announcements-list dd.announcements-title {
padding: 0;
margin: 0;
text-align: left;
@@ -1025,7 +1026,7 @@
width: 45%;
}
-#kunena.layout ul.announcement-list dd.announcement-publish {
+#kunena.layout dl.announcements-list dd.announcements-publish {
padding: 0;
margin: 0;
text-align: center;
@@ -1033,7 +1034,7 @@
width: 10%;
}
-#kunena.layout ul.announcement-list dd.announcement-edit {
+#kunena.layout dl.announcements-list dd.announcements-edit {
padding: 0;
margin: 0;
text-align: center;
@@ -1041,7 +1042,15 @@
width: 5%;
}
-#kunena.layout ul.announcement-list dd.announcement-delete {
+#kunena.layout dl.announcements-list dd.announcements-delete {
+ padding: 0;
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 5%;
+}
+
+#kunena.layout dl.announcements-list dd.announcements-checkbox {
padding: 0;
margin: 0;
text-align: center;
@@ -1215,7 +1224,7 @@
vertical-align: bottom;
margin: 0;
overflow: hidden;
- padding: 1px 0 0;
+ padding: 0;
}
#kunena.layout ul.category-list li.row dl, ul.category-list li.header {
@@ -1765,7 +1774,7 @@
}
#kunena.layout div.common-statistics-kbox .statistics-totals {
- padding: 5px 10px 10px 10px;
+ padding: 5px 10px 5px 10px;
line-height: 20px;
/*min-height: 80px;*/
width: 25%;
@@ -2073,6 +2082,152 @@
* START USER LIST *
*******************/
+#kunena.layout ul.user-list {
+ display: block;
+ list-style-type: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+#kunena.layout ul.user-list div.header {
+ clear: both;
+ display: block;
+ position: relative;
+ vertical-align: bottom;
+}
+
+#kunena.layout ul.user-list > li {
+ clear: both;
+ display: block;
+ position: relative;
+ vertical-align: bottom;
+ margin: 0;
+ overflow: hidden;
+ padding: 1px 0 0;
+}
+
+#kunena.layout ul.user-list li.user-row dl, ul.user-list li.header {
+ float: none !important;
+ height: auto;
+ width: auto;
+}
+
+/*#kunena.layout ul.banmanager-list li.banmanager-row {
+ margin: 0px;
+ padding: 0px;
+ overflow: hidden;
+}*/
+
+/*#kunena.layout ul.banmanager-list li.banmanager-row dd {
+ display: block;
+ float: left;
+ margin: 0px;*/
+ /*padding: 10px 5px;*/
+ /*position: relative;
+}*/
+
+#kunena.layout ul.user-list li.header dd {
+ display: block;
+ float: left;
+ margin: 0px;
+ /*padding: 2px 5px;*/
+}
+
+/*#kunena.layout ul.banmanager-list dd {
+ display: block;
+ float: left;
+ margin: 0px;*/
+ /*padding: 2px 0;*/
+/*}*/
+
+/*#kunena.layout ul.topic-list li.topics-row dl {
+ display: block;
+ position: relative;
+}*/
+
+/*#kunena.layout ul.banmanager-list li.banmanager-row dd {
+ display: block;
+ float: left;
+ margin: 0px;
+}*/
+
+#kunena.layout dl.user-list dd.user-id {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 5%;
+}
+
+#kunena.layout dl.user-list dd.user-online {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 10%;
+}
+
+#kunena.layout dl.user-list dd.user-avatar {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 10%;
+}
+
+#kunena.layout dl.user-list dd.user-username, #kunena.layout dl.user-list dd.user-realname {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 24%;
+}
+
+#kunena.layout dl.user-list dd.user-posts {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 7%;
+}
+
+#kunena.layout dl.user-list dd.user-karma {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 7%;
+}
+
+#kunena.layout dl.user-list dd.user-email {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 15%;
+}
+
+#kunena.layout dl.user-list dd.user-usertype {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 10%;
+}
+
+#kunena.layout dl.user-list dd.user-joindate {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 15%;
+}
+
+#kunena.layout dl.user-list dd.user-lastvisitdate {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 15%;
+}
+
+#kunena.layout dl.user-list dd.user-hits {
+ margin: 0;
+ text-align: center;
+ vertical-align: middle;
+ width: 7%;
+}
+
#kunena.layout .userlist-items {
padding-left: 10px;
}
View
13 components/com_kunena/template/mirage/css/style.css
@@ -798,6 +798,19 @@
#kunena.layout .kuser-user:hover { color: var(styleForumLegendUsercolorText) !important; }
#kunena.layout .kuser-guest:hover { color: var(styleForumLegendGuestcolorText) !important; }
+#kunena.layout ul.category-list li.category-row-odd-red dl.category-list { background-color: rgba(255, 175, 175, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-red dl.category-list { background-color: rgba(255, 175, 175, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-odd-orange dl.category-list { background-color: rgba(255, 211, 175, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-orage dl.category-list { background-color: rgba(255, 211, 175, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-odd-yellow dl.category-list { background-color: rgba(255, 255, 170, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-yellow dl.category-list { background-color: rgba(255, 255, 170, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-odd-green dl.category-list { background-color: rgba(191, 229, 199, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-green dl.category-list { background-color: rgba(191, 229, 199, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-odd-blue dl.category-list { background-color: rgba(177, 227, 255, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-blue dl.category-list { background-color: rgba(177, 227, 255, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-odd-purple dl.category-list { background-color: rgba(255, 175, 255, 0.25) !important; }
+#kunena.layout ul.category-list li.category-row-even-purple dl.category-list { background-color: rgba(255, 175, 255, 0.25) !important; }
+
#kunena.layout .file-input-button, #kunena.layout .file-input-button:hover, #kunena.layout .file-input-button:focus {
background-color: #F2F1EE;
border-color: #999999;
View
74 components/com_kunena/template/mirage/html/announcement/edit.php
@@ -37,65 +37,89 @@ function kunenaValidate(f) { return document.formvalidator.isValid(f); }
<?php echo $this->displayInput('id') ?>
<?php echo JHtml::_( 'form.token' ) ?>
- <ul class="list-unstyled kform announcement-list clearfix">
+ <ul class="announcements-list list-unstyled kform">
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_TITLE') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_TITLE') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('title', 'class="kbox-width inputbox required"') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('title', 'class="kbox-width inputbox required"') ?>
+ </div>
</div>
</li>
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_SORTTEXT') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_SORTTEXT') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('sdescription', 'class="kbox-width textbox required" rows="80" cols="4"') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('description', 'class="kbox-width txtarea hasTip required" rows="80" cols="4"') ?>
+ </div>
</div>
</li>
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_LONGTEXT') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_LONGTEXT') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('description', 'class="kbox-width textbox" rows="80" cols="16"') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('description', 'class="kbox-width txtarea hasTip" rows="80" cols="16"') ?>
+ </div>
</div>
</li>
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_DATE') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_DATE') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('created', 'addcreated', 'kanncreated') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('created', 'addcreated', 'kanncreated') ?>
+ </div>
</div>
</li>
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_SHOWDATE') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_SHOWDATE') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('showdate') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('showdate') ?>
+ </div>
</div>
</li>
<li class="announcement-row kbox-hover kbox-hover_list-row">
<div class="form-label">
- <label>
- <?php echo JText::_('COM_KUNENA_ANN_PUBLISH') ?>:
- </label>
+ <div class="innerspacer-left kbox-full">
+ <label>
+ <?php echo JText::_('COM_KUNENA_ANN_PUBLISH') ?>:
+ </label>
+ </div>
</div>
<div class="form-field">
- <?php echo $this->displayInput('published') ?>
+ <div class="innerspacer kbox-full">
+ <?php echo $this->displayInput('published') ?>
+ </div>
</div>
</li>
</ul>
View
46 components/com_kunena/template/mirage/html/announcement/list.php
@@ -31,55 +31,57 @@
<input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="task" value="" />
<?php echo JHTML::_( 'form.token' ) ?>
- <ul class="list-unstyled announcement-list">
+ <ul class="announcements-list list-unstyled list-header">
<li class="header kbox-hover_header-row">
- <dl>
- <?php if ($this->actions): ?>
- <dd class="announcement-checkbox">
- <div class="innerspacer-header">#</div>
- </dd>
- <?php endif ?>
- <dd class="announcement-id">
+ <dl class="announcements-list list-unstyled">
+ <dd class="announcements-id">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_ID') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_ID') ?></span>
</div>
</dd>
- <dd class="announcement-date">
+ <dd class="announcements-date">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_DATE') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_DATE') ?></span>
</div>
</dd>
- <dd class="announcement-author">
+ <dd class="announcements-author">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_AUTHOR') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_AUTHOR') ?></span>
</div>
</dd>
- <dd class="announcement-title">
+ <dd class="announcements-title">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_TITLE') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_TITLE') ?></span>
</div>
</dd>
<?php if ($this->actions): ?>
- <dd class="announcement-publish">
+ <dd class="announcements-publish">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_PUBLISH') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_PUBLISH') ?></span>
</div>
</dd>
- <dd class="announcement-edit">
+ <dd class="announcements-edit">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_EDIT') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_EDIT') ?></span>
</div>
</dd>
- <dd class="announcement-delete">
+ <dd class="announcements-delete">
<div class="innerspacer-header">
- <span><?php echo JText::_('COM_KUNENA_ANN_DELETE') ?></span>
+ <span class="bold"><?php echo JText::_('COM_KUNENA_ANN_DELETE') ?></span>
</div>
</dd>
<?php endif ?>
+ <?php if ($this->actions): ?>
+ <dd class="announcements-checkbox">
+ <div class="innerspacer-header">
+ <span class="bold">#</span>
+ </div>
+ </dd>
+ <?php endif ?>
</dl>
</li>
</ul>
- <ul class="list-unstyled announcement-list">
+ <ul class="list-unstyled announcements-list">
<?php $this->displayItems() ?>
</ul>
</form>
View
32 components/com_kunena/template/mirage/html/announcement/list_item.php
@@ -10,51 +10,51 @@
**/
defined ( '_JEXEC' ) or die ();
?>
-<li class="announcements-row kbox-hover kbox-hover_list-row">
- <dl class="list-unstyled list-column">
- <?php if ($this->actions): ?>
- <dd class="announcement-checkbox item-column">
- <div class="innerspacer-column">
- <?php echo JHTML::_('kunenagrid.id', $this->row, $this->announcement->id) ?>
- </div>
- </dd>
- <?php endif ?>
- <dd class="announcement-id item-column">
+<li class="announcements-row kbox-hover kbox-hover_list-row kbox-full">
+ <dl class="announcements-list list-unstyled list-column">
+ <dd class="announcements-id item-column">
<div class="innerspacer-column">
<?php echo $this->displayField('id') ?>
</div>
</dd>
- <dd class="announcement-date item-column">
+ <dd class="announcements-date item-column">
<div class="innerspacer-column">
<?php echo $this->displayField('created') ?>
</div>
</dd>
- <dd class="announcement-author item-column">
+ <dd class="announcements-author item-column">
<div class="innerspacer-column">
<?php echo $this->displayField('created_by') ?>
</div>
</dd>
- <dd class="announcement-title item-column">
+ <dd class="announcements-title item-column">
<div class="innerspacer-column">
<?php echo JHtml::_('kunenaforum.link', $this->announcement->getUri(), $this->displayField('title'), null, 'follow') ?>
</div>
</dd>
<?php if ($this->actions): ?>
- <dd class="announcement-publish item-column">
+ <dd class="announcements-publish item-column">
<div class="innerspacer-column">
<?php if ($this->canPublish()) echo JHTML::_('kunenagrid.published', $this->row, $this->announcement->published) ?>
</div>
</dd>
- <dd class="announcement-edit item-column">
+ <dd class="announcements-edit item-column">
<div class="innerspacer-column">
<?php if ($this->canEdit()) echo JHTML::_('kunenagrid.task', $this->row, 'tick.png', JText::_('COM_KUNENA_ANN_EDIT'), 'edit') ?>
</div>
</dd>
- <dd class="announcement-delete item-column">
+ <dd class="announcements-delete item-column">
<div class="innerspacer-column">
<?php if ($this->canDelete()) echo JHTML::_('kunenagrid.task', $this->row, 'publish_x.png', JText::_('COM_KUNENA_ANN_DELETE'), 'delete') ?>
</div>
</dd>
<?php endif ?>
+ <?php if ($this->actions): ?>
+ <dd class="announcements-checkbox item-column">
+ <div class="innerspacer-column">
+ <?php echo JHTML::_('kunenagrid.id', $this->row, $this->announcement->id) ?>
+ </div>
+ </dd>
+ <?php endif ?>
</dl>
</li>
View
12 components/com_kunena/template/mirage/html/category/list_category.php
@@ -13,8 +13,8 @@
$this->k ^= 1;
?>
-<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 list-column 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="category-list list-unstyled list-column kbox-full">
<!--<dd class="category-icon">
</dd>-->
<dd class="category-subject item-column">
@@ -43,13 +43,13 @@
<dd class="category-topics item-column">
<div class="innerspacer-column">
<span class="number"><?php echo $this->formatLargeNumber($this->category->getTopics()); ?></span><br />
- <span class="bold"><?php echo JText::_('COM_KUNENA_TOPICS') ?></span>
+ <span class=""><?php echo JText::_('COM_KUNENA_TOPICS') ?></span>
</div>
</dd>
<dd class="category-replies item-column">
<div class="innerspacer-column">
<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=""><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div>
</dd>
<!-- td class="kcategory-subs">944 <span>Subscribers</span></td -->
@@ -57,7 +57,7 @@
<div class="innerspacer-column">
<?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 ?>
- <ul class="kcontent-32 list-unstyled">
+ <ul class="kcontent-36 list-unstyled">
<?php //TODO: Fix KunenaHtmlParser function reference. ?>
<li class="category-lastpost-topic"><?php echo $this->getLastPostLink($this->category, null, KunenaHtmlParser::parseText($this->category->getLastTopic()->subject, 40), 'link') ?></li>
<li class="category-lastpost-author"><?php echo JText::_('COM_KUNENA_BY').' '.$this->lastUser->getLink($this->lastUserName) ?></li>
@@ -72,7 +72,7 @@
</dd>
</dl>
<?php if ($this->subcategories) : ?>
- <div class="innerspacer-horizontal">
+ <div class="innerspacer-horizontal-inline">
<div class="divider-horizontal-inline divider-horizontal-inline-dotted"></div>
</div>
<div class="innerspacer-column kbox-full">
View
2  components/com_kunena/template/mirage/html/category/list_section.php
@@ -34,7 +34,7 @@
<div class="category detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow" id="category-<?php echo intval($this->section->id) ?>">
<ul class="category-list list-unstyled list-header">
<li class="header kbox-hover_header-row">
- <dl class="list-unstyled">
+ <dl class="category-list list-unstyled">
<!--<dd class="category-icon">
</dd>-->
<dd class="category-subject">
View
2  components/com_kunena/template/mirage/html/statistics/default.php
@@ -64,7 +64,7 @@
<?php foreach ($this->top as $top) : ?>
- <div class="kbox-module statistics-default">
+ <div class="kmodule statistics-default">
<div class="kbox-wrapper kbox-full">
<div class="statistics-default-kbox kbox kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
<div class="headerbox-wrapper kbox-full">
View
4 components/com_kunena/template/mirage/html/topic/edit_form.php
@@ -230,10 +230,10 @@
<button class="kbutton button-type-comm button-type-standard hasTip" type="submit" title="<?php echo JText::_('COM_KUNENA_SUBMIT').' :: '.JText::_('COM_KUNENA_EDITOR_HELPLINE_SUBMIT') ?>"><span><?php echo JText::_('COM_KUNENA_SUBMIT') ?></span></button>
</li>
<li class="item-button">
- <button class="kbutton hasTip" type="button" title="<?php echo JText::_('COM_KUNENA_PREVIEW').' :: '.JText::_('COM_KUNENA_EDITOR_HELPLINE_PREVIEW') ?>" onclick="kToggleOrSwapPreview('kbbcode-preview-bottom')"><span><?php echo JText::_('COM_KUNENA_PREVIEW') ?></span></button>
+ <button class="kbutton button-type-user hasTip" type="button" title="<?php echo JText::_('COM_KUNENA_PREVIEW').' :: '.JText::_('COM_KUNENA_EDITOR_HELPLINE_PREVIEW') ?>" onclick="kToggleOrSwapPreview('kbbcode-preview-bottom')"><span><?php echo JText::_('COM_KUNENA_PREVIEW') ?></span></button>
</li>
<li class="item-button">
- <button class="kbutton hasTip" type="button" title="<?php echo JText::_('COM_KUNENA_CANCEL').' :: '.JText::_('COM_KUNENA_EDITOR_HELPLINE_CANCEL') ?>" onclick="javascript:window.history.back();"><span><?php echo JText::_('COM_KUNENA_CANCEL') ?></span></button>
+ <button class="kbutton button-type-standard hasTip" type="button" title="<?php echo JText::_('COM_KUNENA_CANCEL').' :: '.JText::_('COM_KUNENA_EDITOR_HELPLINE_CANCEL') ?>" onclick="javascript:window.history.back();"><span><?php echo JText::_('COM_KUNENA_CANCEL') ?></span></button>
</li>
</ul>
</div>
View
0  .../template/mirage/html/indented_bottom.php → ...ate/mirage/html/topic/indented_bottom.php
File renamed without changes
View
6 components/com_kunena/template/mirage/html/topics/default_row.php
@@ -48,20 +48,20 @@
<dd class="topic-replies item-column">
<div class="innerspacer-column">
<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=""><?php echo JText::_('COM_KUNENA_GEN_REPLIES') ?></span>
</div>
</dd>
<dd class="topic-views item-column">
<div class="innerspacer-column">
<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=""><?php echo JText::_('COM_KUNENA_GEN_HITS') ?></span>
</div>
</dd>
<!-- td class="ktopic-subs">22 <span>Subscribers</span></td -->
<dd class="topic-lastpost item-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 ?>
- <ul class="kcontent-32 list-unstyled">
+ <ul class="kcontent-36 list-unstyled">
<li class="topic-lastpost-post"><?php echo $this->getTopicLink ( $this->topic, 'last', 'Last post' ) ?></li>
<li class="topic-author-post"><?php echo JText::_('COM_KUNENA_BY').' '.$this->lastPostAuthor->getLink($this->lastUserName) ?></li>
<li class="topic-date-post"><?php echo JText::sprintf('COM_KUNENA_ON_DATE', "[K=DATE:{$this->lastPostTime}]") ?></li>
View
4 components/com_kunena/template/mirage/html/user/default_summary.php
@@ -47,7 +47,7 @@
</ul>
<?php endif ?>
</div>
- <div class="clrline"></div>
+ <!--<div class="clrline"></div>-->
<div id="kprofile-rightcoltop">
<div class="kprofile-rightcol2">
<div class="kiconrow">
@@ -84,7 +84,7 @@
</ul>
</div>
</div>
- <div class="clrline"></div>
+ <!--<div class="clrline"></div>-->
<div id="kprofile-rightcolbot">
<div class="kprofile-rightcol2">
<ul>
View
2  components/com_kunena/template/mirage/html/user/edit_settings.php
@@ -10,7 +10,7 @@
**/
defined ( '_JEXEC' ) or die ();
?>
-<div class="kbox-module user-edit_settings">
+<div class="kmodule user-edit_settings">
<div class="kbox-wrapper kbox-full">
<div class="user-edit_settings-kbox kbox kbox-full kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
<div class="headerbox-wrapper kbox-full">
View
6 components/com_kunena/template/mirage/html/user/edit_user.php
@@ -91,9 +91,9 @@
</div>
<?php if(!empty($this->userparameters)) : ?>
-<div class="kbox-module">
- <div class="block-wrapper kbox-color kbox-border kbox-border_radius">
- <div class="edituser block">
+<div class="kmodule user-edit_user">
+ <div class="kbox-wrapper kbox-fuls">
+ <div class="user-edit_user-kbox kbox kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
<div class="headerbox-wrapper kbox-full">
<div class="header">
<h2 class="header"><a rel="kflattable"><?php echo JText::_('COM_KUNENA_GLOBAL_SETTINGS'); ?></a></h2>
View
37 components/com_kunena/template/mirage/html/user/list.php
@@ -11,4 +11,39 @@
defined ( '_JEXEC' ) or die ();
$this->displayTemplateFile('user', 'list', 'actions');
-$this->displayTemplateFile('user', 'list', 'list');
+
+if ($this->me->exists()) {
+ $this->document->addScriptDeclaration( "// <![CDATA[
+document.addEvent('domready', function() {
+ // Attach auto completer to the following ids:
+ new Autocompleter.Request.JSON('kusersearch', '".KunenaRoute::_('index.php?option=com_kunena&view=user&layout=list&format=raw')."', { 'postVar': 'search' });
+});
+// ]]>");
+}
+?>
+
+<div class="search-user">
+ <form action="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=user&layout=list') ?>" name="usrlform" method="post">
+ <input type="hidden" name="view" value="user" />
+ <?php echo JHTML::_( 'form.token' ); ?>
+
+ <input id="kusersearch" type="text" name="search" class="inputbox" value="<?php echo $this->escape($this->state->get('list.search', JText::_('COM_KUNENA_USRL_SEARCH'))); ?>" onblur="if(this.value=='') this.value='<?php echo $this->escape(JText::_('COM_KUNENA_USRL_SEARCH')); ?>';" onfocus="if(this.value=='<?php echo $this->escape(JText::_('COM_KUNENA_USRL_SEARCH')); ?>') this.value='';" />
+ <input type="image" src="<?php echo $this->ktemplate->getImagePath('usl_search_icon.png') ?>" alt="<?php echo JText::_('COM_KUNENA_USRL_SEARCH'); ?>" style="border: 0px;" />
+ </form>
+</div>
+<div class="kmodule user-list_list">
+ <div class="kbox-wrapper kbox-full">
+ <div class="user-list_list-kbox kbox kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
+ <div class="headerbox-wrapper kbox-full">
+ <div class="header fl">
+ <h2 class="header"><a href="#" class="ksection-headericon"><?php echo $this->getImage('icon-whosonline-sm.png') ?></a><a href="#" rel="ksection-detailsbox"><?php echo JText::_('COM_KUNENA_USRL_USERLIST') ?></a></h2>
+ </div>
+ </div>
+ <div class="detailsbox-wrapper innerspacer kbox-full">
+ <div class="user detailsbox kbox-full kbox-border kbox-border_radius kbox-shadow">
+ <?php $this->displayTemplateFile('user', 'list', 'list'); ?>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
View
0  ...na/template/mirage/html/user/list_row.php → ...plate/mirage/html/user/list_block_row.php
File renamed without changes
View
130 components/com_kunena/template/mirage/html/user/list_list.php
@@ -9,39 +9,99 @@
* @link http://www.kunena.org
**/
defined ( '_JEXEC' ) or die ();
-
-if ($this->me->exists()) {
- $this->document->addScriptDeclaration( "// <![CDATA[
-document.addEvent('domready', function() {
- // Attach auto completer to the following ids:
- new Autocompleter.Request.JSON('kusersearch', '".KunenaRoute::_('index.php?option=com_kunena&view=user&layout=list&format=raw')."', { 'postVar': 'search' });
-});
-// ]]>");
-}
?>
-<div class="search-user">
- <form action="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=user&layout=list') ?>" name="usrlform" method="post">
- <input type="hidden" name="view" value="user" />
- <?php echo JHTML::_( 'form.token' ); ?>
-
- <input id="kusersearch" type="text" name="search" class="inputbox" value="<?php echo $this->escape($this->state->get('list.search', JText::_('COM_KUNENA_USRL_SEARCH'))); ?>" onblur="if(this.value=='') this.value='<?php echo $this->escape(JText::_('COM_KUNENA_USRL_SEARCH')); ?>';" onfocus="if(this.value=='<?php echo $this->escape(JText::_('COM_KUNENA_USRL_SEARCH')); ?>') this.value='';" />
- <input type="image" src="<?php echo $this->ktemplate->getImagePath('usl_search_icon.png') ?>" alt="<?php echo JText::_('COM_KUNENA_USRL_SEARCH'); ?>" style="border: 0px;" />
- </form>
-</div>
-<div class="kmodule user-list_list">
- <div class="kbox-wrapper kbox-full">
- <div class="user-list_list-kbox kbox kbox-color kbox-border kbox-border_radius kbox-border_radius-vchild kbox-shadow">
- <div class="headerbox-wrapper kbox-full">
- <div class="header">
- <a href="#" class="ksection-headericon"><?php echo $this->getImage('icon-whosonline-sm.png') ?></a>
- <h2 class="header"><a href="#" rel="ksection-detailsbox"><?php echo JText::_('COM_KUNENA_USRL_USERLIST') ?></a></h2>
- </div>
- </div>
- <div class="detailsbox-wrapper kbox-full">
- <div class="kuserlist-items">
- <?php foreach ($this->users as $user) { $this->displayUserRow($user); } ?>
- </div>
- </div>
- </div>
- </div>
-</div>
+<form action="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=user&layout=list') ?>" method="post" id="adminForm" name="adminForm">
+ <input type="hidden" name="filter_order" value="<?php echo $this->state->get('list.ordering'); ?>" />
+ <input type="hidden" name="filter_order_Dir" value="<?php echo $this->state->get('list.direction'); ?>" />
+ <?php echo JHTML::_( 'form.token' ); ?>
+ <ul class="user-list list-unstyled list-header">
+ <li class="header kbox-hover_header-row">
+ <dl class="user-list list-unstyled">
+ <dd class="user-id">
+ <div class="innerspacer-header">
+ <span class="bold"><a>#</a></span>
+ </div>
+ </dd>
+ <?php if ($this->config->userlist_online) : ?>
+ <dd class="user-online">
+ <div class="innerspacer-header">
+ <span class="bold"><a><?php echo JText::_('COM_KUNENA_USRL_ONLINE') ?></a></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_avatar) : ?>
+ <dd class="user-avatar">
+ <div class="innerspacer-header">
+ <span class="bold"><a><?php echo JText::_('COM_KUNENA_USRL_AVATAR') ?></a></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->username) : ?>
+ <dd class="user-username">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USERNAME', 'username', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php else : ?>
+ <dd class="user-realname">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_REALNAME', 'name', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_posts) : ?>
+ <dd class="user-posts">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_POSTS', 'posts', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_karma) : ?>
+ <dd class="user-karma">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_KARMA', 'karma', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_email) : ?>
+ <dd class="user-email">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_EMAIL', 'email', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_usertype) : ?>
+ <dd class="user-usertype">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_USERTYPE', 'usertype', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_joindate) : ?>
+ <dd class="user-joindate">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_JOIN_DATE', 'registerDate', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_lastvisitdate) : ?>
+ <dd class="user-lastvisitdate">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_LAST_LOGIN', 'lastvisitDate', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($this->config->userlist_userhits) : ?>
+ <dd class="user-hits">
+ <div class="innerspacer-header">
+ <span class="bold"><?php echo JHTML::_( 'grid.sort', 'COM_KUNENA_USRL_HITS', 'uhits', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?></span>
+ </div>
+ </dd>
+ <?php endif; ?>
+ </dl>
+ </li>
+ </ul>
+ <ul class="category-list">
+ <?php foreach ($this->users as $user) { $this->displayUserRow($user); } ?>
+ </ul>
+</form>
View
79 components/com_kunena/template/mirage/html/user/list_list_row.php
@@ -0,0 +1,79 @@
+<dl class="user-list list-unstyled list-column kbox-full">
+ <dd class="user-id item-column"><?php echo $nr; ?></dd>
+
+ <?php if ($this->config->userddst_onddne) : ?>
+ <dd class="user-online item-column">
+ <div class="innerspacer-column">
+ <span class="kicon-button kbuttononddne-<?php echo $profile->isOnddne('yes', 'no') ?>"><span class="onddne-<?php echo $profile->isOnddne('yes', 'no') ?>"><span><?php echo $profile->isOnddne(JText::_('COM_KUNENA_ONddNE'), JText::_('COM_KUNENA_OFFddNE')); ?></span></span></span>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_avatar) : ?>
+ <dd class="user-avatar item-column">
+ <div class="innerspacer-column">
+ <?php echo !empty($uslavatar) ? $profile->getddnk($uslavatar) : '&nbsp;' ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <dd class="user-username user-realname item-column">
+ <div class="innerspacer-column">
+ <?php echo $profile->getddnk(); ?>
+ </div>
+ </dd>
+ <?php if ($this->config->userddst_posts) : ?>
+ <dd class="user-posts item-column">
+ <div class="innerspacer-column">
+ <?php echo intval($user->posts); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_karma) : ?>
+ <dd class="user-karma item-column">
+ <div class="innerspacer-column">
+ <?php echo intval($user->karma); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_email) : ?>
+ <dd class="user-email item-column">
+ <div class="innerspacer-column">
+ <?php echo $user->email ? JHTML::_('email.cloak', $user->email) : '' ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_usertype) : ?>
+ <dd class="user-usertype item-column">
+ <div class="innerspacer-column">
+ <?php echo $this->escape($user->usertype) ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_joindate) : ?>
+ <dd class="user-joindate item-column" title="<?php echo KunenaDate::getInstance($user->registerDate)->toKunena('ago') ?>">
+ <div class="innerspacer-column">
+ <?php echo KunenaDate::getInstance($user->registerDate)->toKunena('datetime_today') ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_lastvisiddate) : ?>
+ <dd class="user-lastvisitdate item-column" title="<?php echo KunenaDate::getInstance($lastvisiddate)->toKunena('ago') ?>">
+ <div class="innerspacer-column">
+ <?php echo KunenaDate::getInstance($lastvisiddate)->toKunena('datetime_today') ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($this->config->userddst_userhits) : ?>
+ <dd class="user-hits item-column">
+ <div class="innerspacer-column">
+ <?php echo $this->escape($profile->uhits) ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+</dl>
Please sign in to comment.
Something went wrong with that request. Please try again.