Question Kunena 1.6.0-RC1 to 1.6.0-RC2 template changes

Index: default/loginbox/logout.php =================================================================== --- default/loginbox/logout.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/loginbox/logout.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -56,8 +56,12 @@ <form action="<?php echo KUNENA_LIVEURLREL ?>" method="post" name="login"> <input type="submit" name="submit" class="kbutton" value="<?php echo JText::_('COM_KUNENA_PROFILEBOX_LOGOUT'); ?>" /> <input type="hidden" name="option" value="<?php echo $logout['option']; ?>" /> + <?php if (!empty($logout['view'])) : ?> + <input type="hidden" name="view" value="<?php echo $logout['view']; ?>" /> + <?php endif; ?> <input type="hidden" name="task" value="<?php echo $logout['task']; ?>" /> <input type="hidden" name="<?php echo $logout['field_return']; ?>" value="<?php echo $return; ?>" /> + <?php echo JHTML::_ ( 'form.token' ); ?> </form> </li> <?php endif; ?> Index: default/loginbox/login.php =================================================================== --- default/loginbox/login.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/loginbox/login.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -48,8 +48,12 @@ <?php endif; ?> <input type="submit" name="submit" class="kbutton" value="<?php echo JText::_('COM_KUNENA_PROFILEBOX_LOGIN'); ?>" /> <input type="hidden" name="option" value="<?php echo $login['option']; ?>" /> + <?php if (!empty($login['view'])) : ?> + <input type="hidden" name="view" value="<?php echo $login['view']; ?>" /> + <?php endif; ?> <input type="hidden" name="task" value="<?php echo $login['task']; ?>" /> - <input type="hidden" name="<?php echo $login['field_return']; ?>" value="<?php echo $return; ?>" /> <?php echo JHTML::_ ( 'form.token' ); ?> + <input type="hidden" name="<?php echo $login['field_return']; ?>" value="<?php echo $return; ?>" /> + <?php echo JHTML::_ ( 'form.token' ); ?> </span> </div> <div class="klink-block"> Index: default/language/en-GB/en-GB.com_kunena.tpl_default.ini =================================================================== --- default/language/en-GB/en-GB.com_kunena.tpl_default.ini (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/language/en-GB/en-GB.com_kunena.tpl_default.ini (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -7,20 +7,20 @@ COM_KUNENA_TEMPLATE_ANNOUNCEMENT_HEADER_BACKGROUND="Announcement Header Background" COM_KUNENA_TEMPLATE_ANNOUNCEMENT_BOX_BACKGROUND="Announcement Box Background" COM_KUNENA_TEMPLATE_FRONTSTATS_HEADER_BACKGROUND="Frontstats Header Background" -COM_KUNENA_TEMPLATE_WHOISONLINE_HEADER_BACKGROUND="WhoIsOnline Header Background" -COM_KUNENA_TEMPLATE_HEADER_BACKGROUND_COLOR_DESC="Insert HEX code (#FF0000) or text code (red) color to change background of specific header in your forum" +COM_KUNENA_TEMPLATE_WHOISONLINE_HEADER_BACKGROUND="Who is Online Header Background" +COM_KUNENA_TEMPLATE_HEADER_BACKGROUND_COLOR_DESC="Insert the HEX code (#FF0000) or text code (red) to change the background of your forum header" COM_KUNENA_TEMPLATE_EDITOR_ICON_SET="Editor Icon Set" -COM_KUNENA_TEMPLATE_EDITOR_ICON_SET_DESC="Choose Editor Icon Set (BBCode) to show in your forum" +COM_KUNENA_TEMPLATE_EDITOR_ICON_SET_DESC="Choose the Editor Icon Set (BBCode) to display in your forum" COM_KUNENA_TEMPLATE_PROFILE_ICON_SET="Profile Icon Set" -COM_KUNENA_TEMPLATE_PROFILE_ICON_SET_DESC="Choose Profile Icon Set to show in your forum" +COM_KUNENA_TEMPLATE_PROFILE_ICON_SET_DESC="Choose the Profile Icon Set to display in your forum" COM_KUNENA_TEMPLATE_BUTTON_SET="Button Set" -COM_KUNENA_TEMPLATE_BUTTON_SET_DESC="Choose button set to show in your forum" +COM_KUNENA_TEMPLATE_BUTTON_SET_DESC="Choose the button set to display in your forum" COM_KUNENA_TEMPLATE_BUTTON_SET_DTP2DEFAULT="dtp2.nl Default" COM_KUNENA_TEMPLATE_BUTTON_SET_DTP2HIGHBACK="dtp2.nl High Contrast" COM_KUNENA_TEMPLATE_DEFAULT="Default" -COM_KUNENA_TEMPLATE_DEFAULT_TEMPLATE_DESC="Blue Eagle is the new default template by Kunena Team. It is free for public. This template comes with default Kunena installation. For additional information visit the http://www.kunena.com" +COM_KUNENA_TEMPLATE_DEFAULT_TEMPLATE_DESC="Blue Eagle is the new default template by Kunena Team. This template comes with the default Kunena installation. For more information, visit http://www.kunena.com." COM_KUNENA_TEMPLATE_PROFILE_POSITION="Profile Position" -COM_KUNENA_TEMPLATE_PROFILEPOSITION_DESC="You can change position of the profile avatar on the thread page. Default is <em>Right</em>" +COM_KUNENA_TEMPLATE_PROFILEPOSITION_DESC="You can change the position of the profile avatar on the thread page. Default is <em>Right</em>" COM_KUNENA_TEMPLATE_TOP="Top" COM_KUNENA_TEMPLATE_BOTTOM="Bottom" COM_KUNENA_TEMPLATE_LEFT="Left" Index: default/editor/form.php =================================================================== --- default/editor/form.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/editor/form.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -62,7 +62,8 @@ </tr> <?php endif; ?> - <tr class="krow<?php echo 1 + $this->k^=1 ?>" id="kanynomous_check_name" <?php if (!$this->allow_anonymous && $this->catid != 0 || !$this->cat_default_allow ): ?>style="display:none;"<?php endif; ?>> + <tr class="krow<?php echo 1 + $this->k^=1 ?>" id="kanynomous_check_name" + <?php if ($this->my->id && ((!$this->allow_anonymous && $this->catid != 0) || !$this->cat_default_allow) ): ?>style="display:none;"<?php endif; ?>> <td class="kcol-first"> <strong><?php echo JText::_('COM_KUNENA_GEN_NAME'); ?></strong> </td> @@ -98,7 +99,7 @@ </td> </tr> - <?php if ($this->parent == 0 && $this->config->topicicons) : ?> + <?php if (($this->allow_topic_icons && $this->config->topicicons) || ($this->catid == 0 && $this->config->topicicons)) : ?> <tr class="krow<?php echo 1 + $this->k^=1 ?>"> <td class="kcol-first"> <strong><?php echo JText::_('COM_KUNENA_GEN_TOPIC_ICON'); ?></strong> @@ -182,13 +183,13 @@ ?> <tr id="kpost-buttons_tr" class="krow1"> <td id="kpost-buttons" colspan="2"> + <input type="submit" name="ksubmit" class="kbutton" + value="<?php echo (' ' . JText::_('COM_KUNENA_GEN_CONTINUE') . ' ');?>" + title="<?php echo (JText::_('COM_KUNENA_EDITOR_HELPLINE_SUBMIT'));?>" /> <input type="button" name="cancel" class="kbutton" value="<?php echo (' ' . JText::_('COM_KUNENA_GEN_CANCEL') . ' ');?>" onclick="javascript:window.history.back();" title="<?php echo (JText::_('COM_KUNENA_EDITOR_HELPLINE_CANCEL'));?>" /> - <input type="submit" name="ksubmit" class="kbutton" - value="<?php echo (' ' . JText::_('COM_KUNENA_GEN_CONTINUE') . ' ');?>" - title="<?php echo (JText::_('COM_KUNENA_EDITOR_HELPLINE_SUBMIT'));?>" /> </td> </tr> Index: default/css/kunena.forum.css =================================================================== --- default/css/kunena.forum.css (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/css/kunena.forum.css (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -1816,6 +1816,7 @@ list-style-type: none; display:block; padding-bottom: 1px; + text-align:center !important; } #Kunena ul#kpost-profile li.kpost-username {font-size: 1.333em;} @@ -3390,7 +3391,10 @@ /* for form-validation ------------------------------------------------------ */ -#Kunena #kpost-message .invalid { border: 1px solid red !important; } +#Kunena #kpost-message .invalid { + border: 1px solid red !important; + background-color: #FFDDDD !important; +} /* SLIMBOX */ @@ -3566,8 +3570,11 @@ .kgooglemap { width: 100%; background-color:#E5E3DF; - display:inline-block; + display:block; height:480px; overflow:hidden; position:relative; } +.kgooglemap img { + max-width:auto; +} Index: default/css/kunena.forum.ie7.css =================================================================== --- default/css/kunena.forum.ie7.css (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/css/kunena.forum.ie7.css (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -65,3 +65,4 @@ #Kunena .kattachment-remove,#Kunena .kattachment-insert { padding: 8px 6px 0px;} #Kunena .kattachment-remove:hover,#Kunena .kattachment-insert:hover { padding: 8px 6px 0px;} #Kunena div.kmsgbody div.kmsgtext { overflow:hidden; } +#Kunena #ktop { overflow:hidden; } Index: default/threads/flat_cats.php =================================================================== --- default/threads/flat_cats.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/threads/flat_cats.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -22,8 +22,6 @@ // Dont allow direct linking defined( '_JEXEC' ) or die(); -global $kunena_icons; - // url of current page that user will be returned to after bulk operation $kuri = JURI::getInstance (); $Breturn = $kuri->toString ( array ('path', 'query', 'fragment' ) ); Index: default/threads/latestx.php =================================================================== --- default/threads/latestx.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/threads/latestx.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -42,6 +42,7 @@ <?php if ($this->func != 'mylatest' && $this->func != 'noreplies') : ?> <td class="klist-times-all"> + <form id="timeselect" name="timeselect" method="post" target="_self" action="<?php echo JURI::getInstance()->toString();?>"> <?php // make the select list for time $timesel[] = JHTML::_('select.option', 0, JText::_('COM_KUNENA_SHOW_LASTVISIT')); @@ -54,9 +55,9 @@ $timesel[] = JHTML::_('select.option', 720, JText::_('COM_KUNENA_SHOW_MONTH')); $timesel[] = JHTML::_('select.option', 8760, JText::_('COM_KUNENA_SHOW_YEAR')); // build the html select list - // FIXME: time selection does not work - echo JHTML::_('select.genericlist', $timesel, 'ktime-selection', 'class="inputboxusl" onchange="document.location.href=this.options[this.selectedIndex].value;" size="1"', 'value', 'text', $this->escape($this->show_list_time)); + echo JHTML::_('select.genericlist', $timesel, 'sel', 'class="inputboxusl" onchange="this.form.submit()" size="1"', 'value', 'text', $this->escape($this->show_list_time)); ?> + </form> </td> <?php endif; ?> Index: default/threads/flat.php =================================================================== --- default/threads/flat.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/threads/flat.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -29,7 +29,7 @@ ?> <div class="kblock kflat"> <div class="kheader"> - <?php if (CKunenaTools::isModerator($this->my->id)) : ?> + <?php if (count($this->actionDropdown) > 1) : ?> <?php if ($this->func == 'favorites' || $this->func == 'subscriptions') { ?> <span class="kcheckbox select-toggle"><input id="kcbcheckall_<?php echo $this->func ?>" type="checkbox" name="toggle" value="" /></span> <?php } else { ?> @@ -105,7 +105,7 @@ ?> <?php if ($leaf->unread) { - echo CKunenaLink::GetThreadPageLink ( 'view', intval($leaf->catid), intval($leaf->id), $unreadPage, intval($this->config->messages_per_page), '<sup class="knewchar">(' . intval($leaf->unread) . ' ' . JText::_('COM_KUNENA_A_GEN_NEWCHAR') . ')</sup>', intval($leaf->lastread) ); + echo CKunenaLink::GetThreadPageLink ( 'view', intval($leaf->catid), intval($leaf->id), $unreadPage, intval($this->config->messages_per_page), '<sup dir="ltr" class="knewchar">(' . intval($leaf->unread) . ' ' . JText::_('COM_KUNENA_A_GEN_NEWCHAR') . ')</sup>', intval($leaf->lastread) ); } if ($leaf->locked != 0) { echo CKunenaTools::showIcon ( 'ktopiclocked', JText::_('COM_KUNENA_GEN_LOCKED_TOPIC') ); @@ -204,7 +204,7 @@ </div> </td> - <?php if (CKunenaTools::isModerator ( $this->my->id, $this->catid )) : ?> + <?php if (count($this->actionDropdown) > 1) : ?> <td class="kcol-mid ktopicmoderation"> <?php if ($this->func == 'favorites' || $this->func == 'subscriptions') { ?> <input class ="kDelete_bulkcheckboxes_<?php echo $this->func ?>" type="checkbox" name="cb[<?php echo intval($leaf->id)?>]" value="0" /> @@ -216,24 +216,19 @@ </tr> <?php } ?> - <?php if ( CKunenaTools::isModerator ( $this->my->id, $this->catid ) ) : ?> - <!-- Actions --> + <?php if ( count($this->actionDropdown) > 1 || $this->embedded ) : ?> + <!-- Bulk Actions --> <tr class="krow1"> <td colspan="7" class="kcol-first krowmoderation"> - <select name="do" id="kBulkChooseActions" class="inputbox"> - <option value="">&nbsp;</option> - <option value="bulkDel"><?php echo JText::_('COM_KUNENA_DELETE_SELECTED'); ?></option> - <option value="bulkMove"><?php echo JText::_('COM_KUNENA_MOVE_SELECTED'); ?></option> - <?php if ( $this->func == 'favorites' ) : ?> - <option value="bulkFavorite"><?php echo JText::_('COM_KUNENA_DELETE_FAVORITE'); ?></option> - <?php elseif ( $this->func == 'subscriptions' ) : ?> - <option value="bulkSub"><?php echo JText::_('COM_KUNENA_DELETE_SUBSCRIPTION'); ?></option> + <?php if ($this->embedded) echo CKunenaLink::GetShowLatestLink(JText::_('COM_KUNENA_MORE'), $this->func , 'follow'); ?> + <?php if (count($this->actionDropdown) > 1) : ?> + <?php echo JHTML::_('select.genericlist', $this->actionDropdown, 'do', 'class="inputbox" size="1"', 'value', 'text', 0, 'kBulkChooseActions'); ?> + <?php if ($this->actionMove) CKunenaTools::showBulkActionCats (); ?> + <input type="submit" name="kBulkActionsGo" class="kbutton" value="<?php echo JText::_('COM_KUNENA_GO') ?>" /> <?php endif; ?> - </select> - <?php CKunenaTools::showBulkActionCats (); ?> - <input type="submit" name="kBulkActionsGo" class="kbutton" value="<?php echo JText::_('COM_KUNENA_GO'); ?>" /></td> + </td> </tr> - <!-- /Actions --> + <!-- /Bulk Actions --> <?php endif; ?> </table> <input type="hidden" name="option" value="com_kunena" /> Index: default/threads/posts.php =================================================================== --- default/threads/posts.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/threads/posts.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -30,9 +30,6 @@ <form action="index.php" method="post" name="kBulkActionForm"> <div class="kblock"> <div class="kheader"> - <?php if (CKunenaTools::isModerator($this->my->id)) { ?> - <span class="kcheckbox select-toggle"><input id="kcbcheckall_<?php echo $this->func ?>" type="checkbox" name="toggle" value="" /></span> - <?php } ?> <h2><span><?php if (!empty($this->header)) echo $this->escape($this->header); ?></span></h2> </div> <div class="kcontainer"> @@ -151,29 +148,17 @@ <!-- /By --> </div> </td> - - <?php if (CKunenaTools::isModerator ( $this->my->id, $this->catid )) : ?> - <td class="kcol-mid ktopicmoderation"> - <input class ="kDelete_bulkcheckboxes_<?php echo $this->func ?>" type="checkbox" name="cb[<?php echo intval($message->id) ?>]" value="0" /> - </td> - <?php endif; ?> </tr> <?php } ?> - <?php if ( CKunenaTools::isModerator ( $this->my->id, $this->catid ) ) : ?> - <!-- Moderator Bulk Actions --> + <?php if ( $this->embedded ) : ?> + <!-- Bulk Actions --> <tr class="krow1"> <td colspan="7" class="kcol-first krowmoderation"> - <select name="do" id="kBulkChooseActions" class="inputbox"> - <option value="">&nbsp;</option> - <option value="bulkDel"><?php echo JText::_('COM_KUNENA_DELETE_SELECTED'); ?></option> - <option value="bulkMove"><?php echo JText::_('COM_KUNENA_MOVE_SELECTED'); ?></option> - </select> - <?php CKunenaTools::showBulkActionCats (); ?> - <input type="submit" name="kBulkActionsGo" class="kbutton" value="<?php echo JText::_('COM_KUNENA_GO') ?>" /> + <?php echo CKunenaLink::GetShowLatestLink(JText::_('COM_KUNENA_MORE'), $this->func , 'follow'); ?> </td> </tr> - <!-- /Moderator Bulk Actions --> + <!-- /Bulk Actions --> <?php endif; ?> </table> </div> Index: default/threads/showcat.php =================================================================== --- default/threads/showcat.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/threads/showcat.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -125,7 +125,7 @@ <?php echo '' . JText::_('COM_KUNENA_GEN_MODERATORS') . ": "; foreach ( $this->modslist as $mod ) { - echo CKunenaLink::GetProfileLink ( intval($mod->userid), $this->escape($mod->username) ) . '&nbsp; '; + echo CKunenaLink::GetProfileLink ( intval($mod->userid) ) . '&nbsp; '; } ?> </div> Index: default/announcement/show.php =================================================================== --- default/announcement/show.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/announcement/show.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -17,7 +17,16 @@ ?> <div class="kblock"> <div class="kheader"> - <h2><span><?php echo $this->app->getCfg('sitename'); ?> <?php echo JText::_('COM_KUNENA_ANN_ANNOUNCEMENTS'); ?> | <?php echo CKunenaLink::GetAnnouncementLink('add', NULL, JText::_('COM_KUNENA_ANN_ADD'), JText::_('COM_KUNENA_ANN_ADD')); ?></span></h2> + <h2> + <span> + <?php echo $this->app->getCfg('sitename'); ?> + <?php echo JText::_('COM_KUNENA_ANN_ANNOUNCEMENTS'); ?> + <?php + if ($this->canEdit) + echo "| " . CKunenaLink::GetAnnouncementLink('add', NULL, JText::_('COM_KUNENA_ANN_ADD'), JText::_('COM_KUNENA_ANN_ADD')); + ?> + </span> + </h2> </div> <div class="kcontainer"> <div class="kbody"> @@ -27,9 +36,11 @@ <th class="kcol-annid"><?php echo JText::_('COM_KUNENA_ANN_ID'); ?></th> <th class="kcol-anndate"><?php echo JText::_('COM_KUNENA_ANN_DATE'); ?></th> <th class="kcol-anntitle"><?php echo JText::_('COM_KUNENA_ANN_TITLE'); ?></th> - <th class="kcol-annpublish"><?php echo JText::_('COM_KUNENA_ANN_PUBLISH'); ?></th> - <th class="kcol-annedit"><?php echo JText::_('COM_KUNENA_ANN_EDIT'); ?></th> - <th class="kcol-anndelete"><?php echo JText::_('COM_KUNENA_ANN_DELETE'); ?></th> + <?php if ($this->canEdit): ?> + <th class="kcol-annpublish"><?php echo JText::_('COM_KUNENA_ANN_PUBLISH'); ?></th> + <th class="kcol-annedit"><?php echo JText::_('COM_KUNENA_ANN_EDIT'); ?></th> + <th class="kcol-anndelete"><?php echo JText::_('COM_KUNENA_ANN_DELETE'); ?></th> + <?php endif; ?> </tr> <?php @@ -44,6 +55,7 @@ <td class="kcol-mid kcol-anntitle"> <div class="overflow"><?php echo CKunenaLink::GetAnnouncementLink('read', intval($ann->id), KunenaParser::parseText ($ann->title), KunenaParser::parseText ($ann->title), 'follow'); ?></div> </td> + <?php if ($this->canEdit): ?> <td class="kcol-mid kcol-annpublish"> <?php if ($ann->published > 0) { @@ -59,6 +71,7 @@ <td class="kcol-mid kcol-anndelete"> <?php echo CKunenaLink::GetAnnouncementLink('delete', intval($ann->id), JText::_('COM_KUNENA_ANN_DELETE'), JText::_('COM_KUNENA_ANN_DELETE')); ?> </td> + <?php endif; ?> </tr> <?php endforeach; ?> </tbody> Index: default/announcement/box.php =================================================================== --- default/announcement/box.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/announcement/box.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -36,7 +36,7 @@ <div class="anndesc"> <?php echo KunenaParser::parseBBCode($this->announcement->sdescription); ?> <?php if (!empty($this->announcement->description)) : ?> - &nbsp;&nbsp;<?php echo CKunenaLink::GetAnnouncementLink( 'read', $this->id, JText::_('COM_KUNENA_ANN_READMORE'), JText::_('COM_KUNENA_ANN_READMORE'),'follow'); ?> + ...<br /><?php echo CKunenaLink::GetAnnouncementLink( 'read', $this->id, JText::_('COM_KUNENA_ANN_READMORE'), JText::_('COM_KUNENA_ANN_READMORE'),'follow'); ?> <?php endif; ?> </div> <?php endif; ?> Index: default/plugin/stats/frontstats.php =================================================================== --- default/plugin/stats/frontstats.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/plugin/stats/frontstats.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -53,7 +53,7 @@ </ul> <ul id="kstatslistleft" class="fltlft"> <li><?php echo JText::_('COM_KUNENA_STAT_TOTAL_MESSAGES'); ?>: <strong> <?php echo intval($this->totalmsgs); ?></strong> <span class="divider">|</span> <?php echo JText::_('COM_KUNENA_STAT_TOTAL_SUBJECTS'); ?>: <strong><?php echo intval($this->totaltitles); ?></strong></li> - <li><?php echo JText::_('COM_KUNENA_STAT_TOTAL_SECTIONS'); ?>: <strong><?php echo intval($this->totalcats); ?></strong> <span class="divider-stat">|</span> <?php echo JText::_('COM_KUNENA_STAT_TOTAL_CATEGORIES'); ?>: <strong><?php echo intval($this->totalsections); ?></strong></li> + <li><?php echo JText::_('COM_KUNENA_STAT_TOTAL_SECTIONS'); ?>: <strong><?php echo intval($this->totalcats); ?></strong> <span class="divider">|</span> <?php echo JText::_('COM_KUNENA_STAT_TOTAL_CATEGORIES'); ?>: <strong><?php echo intval($this->totalsections); ?></strong></li> <li><?php echo JText::_('COM_KUNENA_STAT_TODAY_OPEN_THREAD'); ?>: <strong><?php echo intval($this->todayopen); ?></strong> <span class="divider">|</span> <?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_OPEN_THREAD'); ?>: <strong><?php echo intval($this->yesterdayopen); ?></strong></li> <li><?php echo JText::_('COM_KUNENA_STAT_TODAY_TOTAL_ANSWER'); ?>: <strong><?php echo intval($this->todayanswer); ?></strong> <span class="divider">|</span> <?php echo JText::_('COM_KUNENA_STAT_YESTERDAY_TOTAL_ANSWER'); ?>: <strong><?php echo intval($this->yesterdayanswer); ?></strong></li> </ul> Index: default/profile/summary.php =================================================================== --- default/profile/summary.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/profile/summary.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -49,7 +49,7 @@ <li><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_TIMEZONE'); ?>:</strong> GMT <?php echo CKunenaTimeformat::showTimezone($this->timezone); ?></li> <li><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_LOCAL_TIME'); ?>:</strong> <?php echo CKunenaTimeformat::showDate('now', 'time', 'utc', $this->timezone); ?></li> <?php if (!empty($this->posts)): ?><li><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_POSTS'); ?>:</strong> <?php echo intval($this->posts); ?></li><?php endif; ?> - <?php if (!empty($this->userpoints)): ?><li><strong><?php echo JText::_('COM_KUNENA_AUP_POINTS'); ?>:</strong> <?php echo intval($this->userpoints); ?></li><?php endif; ?> + <?php if (!empty($this->userpoints)): ?><li><strong><?php echo JText::_('COM_KUNENA_AUP_POINTS'); ?></strong> <?php echo intval($this->userpoints); ?></li><?php endif; ?> <?php if (!empty($this->usermedals)) : ?><li><?php foreach ( $this->usermedals as $medal ) : echo $medal,' '; endforeach ?></li><?php endif ?> <li><strong><?php echo JText::_('COM_KUNENA_MYPROFILE_PROFILEVIEW'); ?>:</strong> <?php echo intval($this->profile->uhits); ?></li> <li><?php echo $this->displayKarma(); ?></li> Index: default/moderate/moderate_messages.php =================================================================== --- default/moderate/moderate_messages.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/moderate/moderate_messages.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -89,6 +89,7 @@ } ?> <tr class="krow1"> <td colspan="7" class="kcol-first krowmoderation"> + <?php if ($this->embedded) echo CKunenaLink::GetReviewLink(JText::_('COM_KUNENA_MORE')); ?> <select name="do" id="kApproveChooseActions" class="inputbox"> <option value="">&nbsp;</option> <option value="modapprove"><?php echo JText::_('COM_KUNENA_APPROVE_SELECTED'); ?></option> Index: default/icons.php =================================================================== --- default/icons.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/icons.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -24,7 +24,7 @@ $topic_emoticons [0] = 'topic-default.gif'; $topic_emoticons [1] = 'topic-exclamation.png'; $topic_emoticons [2] = 'topic-question.png'; -$topic_emoticons [3] = 'topic-arrow.png'; +$topic_emoticons [3] = 'topic-mark.png'; $topic_emoticons [4] = 'topic-love.png'; $topic_emoticons [5] = 'topic-grin.png'; $topic_emoticons [6] = 'topic-shock.png'; Index: default/search/advsearch.php =================================================================== --- default/search/advsearch.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/search/advsearch.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -178,8 +178,8 @@ </tr> <tr> <td colspan="2"> + <input class="kbutton ks" type="submit" value="<?php echo JText::_('COM_KUNENA_SEARCH_SEND'); ?>"/> <input class="kbutton ks" type="reset" value="<?php echo JText::_('COM_KUNENA_SEARCH_CANCEL'); ?>" onclick="window.location='<?php echo CKunenaLink::GetKunenaURL();?>';"/> - <input class="kbutton ks" type="submit" value="<?php echo JText::_('COM_KUNENA_SEARCH_SEND'); ?>"/> </td> </tr> </tbody> Index: default/userlist/userlist.php =================================================================== --- default/userlist/userlist.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/userlist/userlist.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -194,7 +194,7 @@ </table> <input type="hidden" name="option" value="<?php echo $option; ?>"> <input type="hidden" name="filter_order" value="<?php echo intval($this->order); ?>" /> - <input type="hidden" name="filter_order_dir" value="<?php echo intval($this->order_dir); ?>" /> + <input type="hidden" name="filter_order_Dir" value="<?php echo intval($this->order_dir); ?>" /> </form> <form name="usrlform" method="post" action="<?php echo CKunenaLink::GetUserlistURL(); ?>" onsubmit="return false;"> <table class="kblocktable" id="kuserlist-bottom"> Index: default/view/message.attachments.php =================================================================== --- default/view/message.attachments.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/view/message.attachments.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -21,7 +21,7 @@ <li> <?php echo $attachment->thumblink; ?> <span> - <?php echo CKunenaLink::GetAttachmentLink($this->escape($attachment->folder),$this->escape($attachment->filename),$this->escape($attachment->shortname),$this->escape($attachment->filename), 'nofollow').' ('.number_format(intval($attachment->size)/1024,0,'',',').'KB)'; ?> + <?php echo $attachment->textLink; ?> </span> </li> <?php endforeach; ?> Index: default/view/message.contents.php =================================================================== --- default/view/message.contents.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/view/message.contents.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -35,8 +35,8 @@ <?php endif; ?> <input type="text" name="subject" size="35" class="inputbox" maxlength="<?php echo intval($this->config->maxsubject); ?>" value="<?php echo $this->escape($this->resubject) ?>" /><br /> <textarea class="inputbox" name="message" rows="6" cols="60"></textarea><br /> - <input type="reset" class="kbutton kreply-cancel" name="cancel" value="<?php echo JText::_('COM_KUNENA_CANCEL') ?>" /> - <input type="submit" class="kbutton kreply-submit" name="submit" value="<?php echo JText::_('COM_KUNENA_GEN_CONTINUE') ?>" /> + <input type="submit" class="kbutton kreply-submit" name="submit" value="<?php echo JText::_('COM_KUNENA_GEN_CONTINUE') ?>" title="<?php echo (JText::_('COM_KUNENA_EDITOR_HELPLINE_SUBMIT'));?>" /> + <input type="reset" class="kbutton kreply-cancel" name="cancel" value="<?php echo JText::_('COM_KUNENA_CANCEL') ?>" title="<?php echo (JText::_('COM_KUNENA_EDITOR_HELPLINE_CANCEL'));?>" /> <small><?php echo JText::_('COM_KUNENA_QMESSAGE_NOTE') ?></small> </form> </div> Index: default/view/message.actions.php =================================================================== --- default/view/message.actions.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/view/message.actions.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -27,7 +27,7 @@ </div> <div class="kmessage-editmarkup-cover"> <?php if ($this->msg->modified_by) : ?> - <span class="kmessage-editmarkup" <?php echo $datehover ?>"> + <span class="kmessage-editmarkup" <?php echo $datehover ?>> <?php echo JText::_('COM_KUNENA_EDITING_LASTEDIT') . ': ' . $dateshown . JText::_('COM_KUNENA_BY') . ' ' . ($this->config->username ? $this->escape ( $this->msg->modified_username ) : $this->escape ( $this->msg->modified_name ) ) . '.'; ?> <?php if ($this->msg->modified_reason) echo JText::_('COM_KUNENA_REASON') . ': ' . $this->escape ( $this->msg->modified_reason ); ?> </span> Index: default/view/profile.horizontal.php =================================================================== --- default/view/profile.horizontal.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/view/profile.horizontal.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -40,9 +40,11 @@ </li> <?php endif ?> <?php endif; ?> + <?php if ($this->avatar): ?> <li class="kpost-avatar"> <?php echo CKunenaLink::GetProfileLink ( intval($this->profile->userid), $this->avatar ); ?> </li> + <?php endif; ?> <li class="kpost-username"> <?php echo CKunenaLink::GetProfileLink ( intval($this->profile->userid), $this->escape($this->username) ); ?> </li> Index: default/view/profile.vertical.php =================================================================== --- default/view/profile.vertical.php (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/view/profile.vertical.php (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -24,9 +24,11 @@ <span class = "kmsgusertype">( <?php echo $this->escape($this->usertype) ?> )</span> </li> <?php endif ?> + <?php if ($this->avatar) : ?> <li class="kpost-avatar"> <?php echo CKunenaLink::GetProfileLink ( intval($this->profile->userid), $this->avatar ); ?> </li> + <?php endif; ?> <?php if ($this->profile->userid): ?> <li><span class="kicon-button kbuttononline-<?php echo $this->profile->isOnline(true) ?>"><span class="online-<?php echo $this->profile->isOnline(true) ?>"><span><?php echo $this->profile->isOnline() ? JText::_('COM_KUNENA_ONLINE') : JText::_('COM_KUNENA_OFFLINE'); ?></span></span></span></li> Index: default/js/editor.js =================================================================== --- default/js/editor.js (.../1.6.0rc1/components/com_kunena/template) (revision 3443) +++ default/js/editor.js (.../1.6.0rc2/components/com_kunena/template) (revision 3443) @@ -33,13 +33,12 @@ var scroll_top = this.scrollTop; + this.focus(); if(Browser.Engine.trident) { - this.focus(); var range = document.selection.createRange(); range.text = wrapperLeft + newtext + wrapperRight; if(isLast) { range.select(); - this.scrollTop = scroll_top; } } else { @@ -52,10 +51,9 @@ else { var position = originalStart + newtext.length + wrapperLeft.length + wrapperRight.length; this.setSelectionRange(position, position); - this.scrollTop = scroll_top; } - this.focus(); } + this.scrollTop = scroll_top; }, replaceSelectedText: function(newtext, isLast) {