From: <be...@us...> - 2014-06-22 09:30:03
|
Revision: 12630 http://sourceforge.net/p/xoops/svn/12630 Author: beckmi Date: 2014-06-22 09:29:57 +0000 (Sun, 22 Jun 2014) Log Message: ----------- Fixing couple of bugs related to blocks, code cosmetics Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-06-22 02:42:25 UTC (rev 12629) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php 2014-06-22 09:29:57 UTC (rev 12630) @@ -196,7 +196,7 @@ } $item['pdf'] = ''; - if ($this->publisher->getConfig('display_pdf')) { + if ($publisher->getConfig('display_pdf')) { if ($options[25] == 1) { $item['pdf'] = "<a href='" . PUBLISHER_URL . "/makepdf.php?itemid=" . $itemObj->itemid() . "' rel='nofollow'><img src='" . PUBLISHER_URL . "/assets/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "' /></a> "; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-06-22 02:42:25 UTC (rev 12629) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl 2014-06-22 09:29:57 UTC (rev 12630) @@ -65,7 +65,7 @@ <{if $block.template == 'slider1'}> -<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');<{* xoTheme->addScript('browse.php?Frameworks/jquery/jquery-migrate-1.2.1.js');*}> $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}> +<{php}>global $xoTheme;$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/publisher.css');<{/php}> <script type="text/javascript"> jQuery(document).ready(function() Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl 2014-06-22 02:42:25 UTC (rev 12629) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.tpl 2014-06-22 09:29:57 UTC (rev 12630) @@ -1,30 +1,54 @@ <{include file='db:publisher_header.tpl'}> -<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> +<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats + AND $display_category_summary is set to TRUE), let's display the summary table ! //--> +<{if $indexpage || $category.subcats || ($category && $display_category_summary)}> -<{if $collapsable_heading == 1}> -<div class="publisher_collaps_title"> - <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}> -</div> -<div id='toptable'> - <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}> + <{if $collapsable_heading == 1}> + <div class="publisher_collaps_title"> + <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"> + <img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/> + </a> + <{$lang_category_summary}> + </div> + <div id='toptable'> + <span class="publisher_collaps_info"> + <{$lang_category_summary}> + </span> + <!-- Content under the collapsable bar //--> + <{/if}> <{include file='db:publisher_categories_table.tpl'}> <{if $collapsable_heading == 1}> -</div> <{/if}> -<br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}><{if $items}> <{if $collapsable_heading == 1}> -<div class="publisher_collaps_title"> - <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_items_title}> -</div> -<div id='bottomtable'> - <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}> + </div> + <{/if}> + <br/> + <!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--> +<{/if}> +<{if $items}> + <{if $collapsable_heading == 1}> + <div class="publisher_collaps_title"> + <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";> + <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/> + </a> + <{$lang_items_title}> + </div> + <div id='bottomtable'> + <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> + <{/if}> <div align="right"><{$navbar}></div> - <!-- Start item loop --> <{foreach item=item from=$items}> <{include file="db:publisher_singleitem.tpl" item=$item}> <{/foreach}> <!-- End item loop --> + <!-- Start item loop --> + <{foreach item=item from=$items}> + <{include file="db:publisher_singleitem.tpl" item=$item}> + <{/foreach}> <!-- End item loop --> <div align="right"><{$navbar}></div> + <{if $collapsable_heading == 1}> -</div> <{/if}><!-- end of if $items --> <{/if}> + </div> + <{/if}><!-- end of if $items --> +<{/if}> <{include file='db:publisher_footer.tpl'}> Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl 2014-06-22 02:42:25 UTC (rev 12629) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.tpl 2014-06-22 09:29:57 UTC (rev 12630) @@ -1,60 +1,85 @@ <{include file='db:publisher_header.tpl'}> -<!-- if we are on the index page OR inside a category that has subcats OR (inside a category with no subcats AND $display_category_summary is set to TRUE), let's display the summary table ! //--><{if $indexpage || $category.subcats || ($category && $display_category_summary)}> +<!-- if we are on the index page OR inside a category that has subcats OR + (inside a category with no subcats AND $display_category_summary is set to TRUE), + let's display the summary table ! //--> +<{if $indexpage || $category.subcats || ($category && $display_category_summary)}> -<!-- let's begin the display of the other display type --> <{if $collapsable_heading == 1}> -<div class="publisher_collaps_title"> - <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}> -</div> -<div id='toptable'> - <span class="publisher_collaps_info""><{$lang_category_summary}></span> <!-- Content under the collapsable bar //--> <{/if}> + <!-- let's begin the display of the other display type --> + <{if $collapsable_heading == 1}> + <div class="publisher_collaps_title"> + <a href='javascript:;' onclick="toggle('toptable'); toggleIcon('toptableicon')"><img id='toptableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_category_summary}> + </div> + <div id='toptable'> + <span class="publisher_collaps_info""> + <{$lang_category_summary}> + </span> + <!-- Content under the collapsable bar //--> + <{/if}> <{include file='db:publisher_categories_table.tpl'}> <{if $collapsable_heading == 1}> -</div> <{/if}> -<br/><!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--><{/if}><{if $items}> <{if $collapsable_heading == 1}> -<div class="publisher_collaps_title"> - <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";><img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/></a> <{$lang_items_title}> -</div> -<div id='bottomtable'> - <span class="publisher_collaps_info"><{$smarty.const._MD_PUBLISHER_ITEMS_INFO}></span> <{/if}> + </div> + <{/if}> + <br/> + <!-- End of if !$category || $category.subcats || ($category && $display_category_summary) //--> +<{/if}> +<{if $items}> + <{if $collapsable_heading == 1}> + <div class="publisher_collaps_title"> + <a href='javascript:;' onclick="toggle('bottomtable'); toggleIcon('bottomtableicon')";> + <img id='bottomtableicon' src='<{$publisher_url}>/assets/images/links/close12.gif' alt=''/> + </a> <{$lang_items_title}> + </div> + <div id='bottomtable'> + <span class="publisher_collaps_info"> + <{$smarty.const._MD_PUBLISHER_ITEMS_INFO}> + </span> + <{/if}> <div align="right"><{$navbar}></div> <table border="0" width="90%" cellspacing="1" cellpadding="3" align="center" class="outer"> <tr> <td align="left" class="itemHead" width='60%'> - <strong><{$smarty.const._CO_PUBLISHER_TITLE}></strong></td> + <strong><{$smarty.const._CO_PUBLISHER_TITLE}></strong> + </td> <{if $display_date_col == 1}> - <td align="center" class="itemHead" width="30%"> - <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong></td> + <td align="center" class="itemHead" width="30%"> + <strong><{$smarty.const._MD_PUBLISHER_DATESUB}></strong> + </td> <{/if}> <{if $display_hits_col == 1}> - <td align="center" class="itemHead" width="10%"> - <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong></td> + <td align="center" class="itemHead" width="10%"> + <strong><{$smarty.const._MD_PUBLISHER_HITS}></strong> + </td> <{/if}> </tr> - <!-- Start item loop --> <{foreach item=item from=$items}> - <tr> - <td class="even" align="left"> - <strong><{$item.titlelink}></strong> - <{if $show_subtitle && $item.subtitle}> - <br /><em><{$item.subtitle}></em> + <!-- Start item loop --> + <{foreach item=item from=$items}> + <tr> + <td class="even" align="left"> + <strong><{$item.titlelink}></strong> + <{if $show_subtitle && $item.subtitle}> + <br/> + <em><{$item.subtitle}></em> + <{/if}> + </td> + <{if $display_date_col == 1}> + <td class="odd" align="left"> + <div align="center"><{$item.datesub}></div> + </td> + <{/if}> <{if $display_hits_col == 1}> + <td class="odd" align="left"> + <div align="center"><{$item.counter}></div> + </td> <{/if}> - </td> - <{if $display_date_col == 1}> - <td class="odd" align="left"> - <div align="center"><{$item.datesub}></div> - </td> - <{/if}> <{if $display_hits_col == 1}> - <td class="odd" align="left"> - <div align="center"><{$item.counter}></div> - </td> - <{/if}> - </tr> + </tr> <{/foreach}> <!-- End item loop --> <tr></tr> </table> <div align="right"><{$navbar}></div> <{if $collapsable_heading == 1}> -</div> <{/if}><!-- end of if $items --> <{/if}> + </div> + <{/if}><!-- end of if $items --> +<{/if}> <{include file='db:publisher_footer.tpl'}> |