From: Marc L. <ma...@ma...> - 2009-05-14 19:31:06
|
Congratulations! So much effort! Just today, you saved me time to make a button (which will be committed to trunk later) M ;-) On Thu, May 14, 2009 at 12:28 PM, <pk...@us...> wrote: > Revision: 18779 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18779&view=rev > Author: pkdille > Date: 2009-05-14 16:28:19 +0000 (Thu, 14 May 2009) > > Log Message: > ----------- > [MOD] button plugin......end of the deployment. > > Modified Paths: > -------------- > trunk/modules/mod-articles.php > trunk/modules/mod-last_articles.php > trunk/templates/modules/mod-articles.tpl > trunk/templates/modules/mod-last_articles.tpl > > Modified: trunk/modules/mod-articles.php > =================================================================== > --- trunk/modules/mod-articles.php 2009-05-14 16:19:07 UTC (rev 18778) > +++ trunk/modules/mod-articles.php 2009-05-14 16:28:19 UTC (rev 18779) > @@ -6,46 +6,27 @@ > } > global $smarty, $tikilib, $user; > > -$smarty->assign('module_title', isset($module_params["title"]) ? $module_params["title"] : tra("Articles")); > +$smarty->assign('module_title', isset($module_params['title']) ? $module_params['title'] : tra('Articles')); > +$urlParams = array( > + 'topicId' => 'topic', > + 'topic' => 'topicName', > + 'categId' => 'categId', > + 'type' => 'type', > + 'lang' => 'lang', > + 'start' => null, > + 'sort' => null > +); > > -if (isset($module_params["type"])) { > - $type = $module_params["type"]; > -} else { > - $type = ''; > +foreach ( $urlParams as $p => $v ) { > + if ( isset($$p) ) continue; > + $$p = isset($module_params[$p]) ? $module_params[$p] : ''; > } > -if (isset($module_params["topicId"])) { > - $topicId = $module_params["topicId"]; > -} else { > - $topicId = ''; > -} > -if (isset($module_params["topic"])) { > - $topic = $module_params["topic"]; > -} else { > - $topic = ''; > -} > -if (isset($module_params["start"])) { > - $start = $module_params["start"]; > -} else { > - $start = isset($start) ? $start : 0; > -} > -if (isset($module_params['sort'])) { > - $sort = $module_params['sort']; > -} else { > - $sort = 'publishDate_desc'; > -} > -if (isset($module_params['lang'])) { > - $lang = $module_params['lang']; > -} else { > - $lang = ''; > -} > -if (isset($module_params['categId'])) { > - $categId = $module_params['categId']; > -} else { > - $categId = ''; > -} > +if ( $start == '' ) $start = 0; > +if ( $sort == '' ) $sort = 'publishDate_desc'; > > $ranking = $tikilib->list_articles($start, $module_rows, $sort, '', '', '', $user, $type, $topicId, 'y', $topic, $categId, '', '', $lang); > > +$smarty->assign_by_ref('urlParams', $urlParams); > $smarty->assign('modArticles', $ranking["data"]); > if (isset($module_params['title'])) { > $smarty->assign('tpl_module_title', $module_params['title']); > > Modified: trunk/modules/mod-last_articles.php > =================================================================== > --- trunk/modules/mod-last_articles.php 2009-05-14 16:19:07 UTC (rev 18778) > +++ trunk/modules/mod-last_articles.php 2009-05-14 16:28:19 UTC (rev 18779) > @@ -27,37 +27,40 @@ > // Parameter absurl set if the last_article url is absolute or not [y|n]. > // If not set, default = relative > > -// filter for type, topicId or topic... > -// if ! is in front of type or topic, the result is inversed > -$mod_type = isset($module_params["type"]) ? $module_params["type"] : ''; > -$mod_topicId = isset($module_params["topicId"]) ? $module_params["topicId"] : ''; > -$mod_topic = isset($module_params["topic"]) ? $module_params["topic"] : ''; > -$smarty->assign('type',$mod_type); > -$smarty->assign('topicId',$mod_topicId); > -$categId = isset($module_params['categId']) ? $module_params['categId'] : ''; > -$l = isset($module_params['lang']) ? $module_params['lang'] : ''; > -if (isset($module_params['showImg'])) { > - $smarty->assign('showImg', $module_params['showImg']); > +$urlParams = array( > + 'topicId' => 'topic', > + 'topic' => 'topicName', > + 'categId' => 'categId', > + 'type' => 'type', > + 'lang' => 'lang', > + 'showImg' => NULL, > + 'showDate' => NULL, > + 'offset' => NULL, > + 'showHeading' => NULL, > + 'nonums' => NULL, > + 'absurl' => NULL > +); > + > +foreach ( $urlParams as $p => $v ) { > + if ( isset($$p) ) continue; > + $$p = isset($module_params[$p]) ? $module_params[$p] : ''; > } > -if (isset($module_params['showDate']) && $module_params['showDate'] == 'y') { > - $smarty->assign('showDate','y'); > -} > -$offset = isset($module_params['offset']) ? $module_params['offset']+0 : '0'; > -$smarty->assign('offset',$offset); > > -$ranking = $tikilib->list_articles($offset,$module_rows,'publishDate_desc', '', date("U"), '', $mod_type, $mod_topicId, 'y', $mod_topic, $categId, '', '', $l); > -if (isset($module_params['showHeading']) && $module_params['showHeading'] != 'n') { > - if ($module_params['showHeading'] == 'y') > - $module_params['showHeading'] = -1; > - $smarty->assign('showHeading',$module_params['showHeading']); > - foreach ($ranking['data'] as $key=>$article) { > +$offset = (int) $offset; > +if ( $absurl == '' ) $absurl = 'n'; > +if ( $nonums == '' ) $nonums = 'n'; > +if ( $showHeading != 'n') { > + if ( $showHeading == 'y' ) $showHeading = -1; > + foreach ( $ranking['data'] as $key => $article ) { > $ranking['data'][$key]['parsedHeading'] = $tikilib->parse_data($article['heading']); > } > } > -$smarty->assign('modLastArticles',$ranking["data"]); > -$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n'); > -$smarty->assign('absurl', isset($module_params["absurl"]) ? $module_params["absurl"] : 'n'); > -$module_rows = count($ranking["data"]); > + > +foreach ( $urlParams as $p => $v ) $smarty->assign($p, $$p); > + > +$ranking = $tikilib->list_articles($offset, $module_rows, 'publishDate_desc', '', date("U"), '', $type, $topicId, 'y', $topic, $categId, '', '', $lang); > + > + > +$module_rows = count($ranking['data']); > $smarty->assign('module_rows', $module_rows); > - > -?> > +$smarty->assign('modLastArticles', $ranking['data']); > > Modified: trunk/templates/modules/mod-articles.tpl > =================================================================== > --- trunk/templates/modules/mod-articles.tpl 2009-05-14 16:19:07 UTC (rev 18778) > +++ trunk/templates/modules/mod-articles.tpl 2009-05-14 16:28:19 UTC (rev 18779) > @@ -14,8 +14,14 @@ > {if $module_params.nonums != 'y'}</ol>{else}</ul>{/if} > {if $module_params.more eq 'y'} > <div class="more"> > - {assign var=sep value='?'} > - <span class="button2"><a href="tiki-view_articles.php{if $module_params.topicId}{$sep}topic={$module_params.topicId}{assign var=sep value='&'}{/if}{if $module_params.topic}{$sep}topicName={$module_params.topic|escape:url}{assign var=sep value='&'}{/if}{if $module_params.categId}{$sep}categId={$module_params.categId}{assign var=sep value='&'}{/if}{if $module_params.type}{$sep}type={$module_params.type|escape:url}{assign var=sep value='&'}{/if}{if $module_params.lang}{$sep}lang={$module_params.lang|escape:url}{assign var=sep value='&'}{/if}">{tr}More...{/tr}</a></span> > + {assign var=queryArgs value=''} > + {foreach from=$urlParams item=urlParam key=urlParamKey} > + {if !empty($urlParam) and !empty($module_params[$urlParamKey])} > + {if empty($queryArgs)}{assign var=queryArgs value='?'}{else}{assign var=queryArgs value="$queryArgs&"}{/if} > + {assign var=queryArgs value="$queryArgs$urlParam=`$module_params[$urlParamKey]`"} > + {/if} > + {/foreach} > + {button href="tiki-view_articles.php$queryArgs" _text="{tr}More...{/tr}"} > </div> > {/if} > {/tikimodule} > > Modified: trunk/templates/modules/mod-last_articles.tpl > =================================================================== > --- trunk/templates/modules/mod-last_articles.tpl 2009-05-14 16:19:07 UTC (rev 18778) > +++ trunk/templates/modules/mod-last_articles.tpl 2009-05-14 16:28:19 UTC (rev 18779) > @@ -41,8 +41,14 @@ > {if $nonums != 'y'}</ol>{else}</ul>{/if} > {if $module_params.more eq 'y'} > <div class="more"> > - {assign var=sep value='?'} > - <span class="button2"><a href="tiki-view_articles.php{if $module_params.topicId}{$sep}topic={$module_params.topicId}{assign var=sep value='&'}{/if}{if $module_params.topic}{$sep}topicName={$module_params.topic|escape:url}{assign var=sep value='&'}{/if}{if $module_params.categId}{$sep}categId={$module_params.categId}{assign var=sep value='&'}{/if}{if $module_params.type}{$sep}type={$module_params.type|escape:url}{assign var=sep value='&'}{/if}{if $module_params.lang}{$sep}lang={$module_params.lang|escape:url}{assign var=sep value='&'}{/if}">{tr}More...{/tr}</a></span> > + {assign var=queryArgs value=''} > + {foreach from=$urlParams item=urlParam key=urlParamKey} > + {if !empty($urlParam) and !empty($module_params[$urlParamKey])} > + {if empty($queryArgs)}{assign var=queryArgs value='?'}{else}{assign var=queryArgs value="$queryArgs&"}{/if} > + {assign var=queryArgs value="$queryArgs$urlParam=`$module_params[$urlParamKey]`"} > + {/if} > + {/foreach} > + {button href="tiki-view_articles.php$queryArgs" _text="{tr}More...{/tr}"} > </div> > {/if} > {/tikimodule} > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your > production scanning environment may not be a perfect world - but thanks to > Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 > Series Scanner you'll get full speed at 300 dpi even with all image > processing features enabled. http://p.sf.net/sfu/kodak-com > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net |