From: <pk...@us...> - 2008-05-24 05:40:07
|
Revision: 12960 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12960&view=rev Author: pkdille Date: 2008-05-23 22:40:09 -0700 (Fri, 23 May 2008) Log Message: ----------- [MOD] some other code unduplication Modified Paths: -------------- branches/1.10/pics/icons/chart_curve.png branches/1.10/templates/tiki-edit_templates.tpl branches/1.10/templates/tiki-list_quizzes.tpl branches/1.10/templates/tiki-quiz_stats.tpl branches/1.10/templates/tiki-referer_stats.tpl branches/1.10/templates/tiki-search_stats.tpl Modified: branches/1.10/pics/icons/chart_curve.png =================================================================== (Binary files differ) Modified: branches/1.10/templates/tiki-edit_templates.tpl =================================================================== --- branches/1.10/templates/tiki-edit_templates.tpl 2008-05-23 22:09:43 UTC (rev 12959) +++ branches/1.10/templates/tiki-edit_templates.tpl 2008-05-24 05:40:09 UTC (rev 12960) @@ -23,18 +23,13 @@ <tr> <td class="heading">{tr}Template{/tr}</td> </tr> +{cycle values="odd,even" print=false} {section name=user loop=$files} -{if $smarty.section.user.index % 2} -<tr> -<td class="odd"><a class="link" href="tiki-edit_templates.php?template={$files[user]}">{$files[user]}</a></td> -</tr> -{else} -<tr> -<td class="even"><a class="link" href="tiki-edit_templates.php?template={$files[user]}">{$files[user]}</a></td> -</tr> -{/if} + <tr> + <td class="{cycle}"><a class="link" href="tiki-edit_templates.php?template={$files[user]}">{$files[user]}</a></td> + </tr> {sectionelse} -<tr><td colspan="2" class="odd">{tr}No records found{/tr}</td></tr> + <tr><td colspan="2" class="{cycle}">{tr}No records found{/tr}</td></tr> {/section} </table> {/if} Modified: branches/1.10/templates/tiki-list_quizzes.tpl =================================================================== --- branches/1.10/templates/tiki-list_quizzes.tpl 2008-05-23 22:09:43 UTC (rev 12959) +++ branches/1.10/templates/tiki-list_quizzes.tpl 2008-05-24 05:40:09 UTC (rev 12960) @@ -58,39 +58,26 @@ <td class="heading">{tr}Questions{/tr}</td> </tr> +{cycle values="odd,even" print=false} {section name=user loop=$channels} -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_take_quiz eq 'y') or ($channels[user].individual_tiki_p_take_quiz eq 'y')} -{if $smarty.section.user.index % 2} -<tr> -<td class="odd"> -<a class="tablename" href="tiki-take_quiz.php?quizId={$channels[user].quizId}">{$channels[user].name}</a> -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_admin_quizzes eq 'y') or ($channels[user].individual_tiki_p_admin_quizzes eq 'y')} (<a class="link" href="tiki-edit_quiz.php?quizId={$channels[user].quizId}"> -<small>adm</small> -</a>){/if} -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_view_quiz_stats eq 'y') or ($channels[user].individual_tiki_p_view_quiz_stats eq 'y')} (<a class="link" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}"> -<small>stats</small></a>){/if} -</td> -<td class="odd">{$channels[user].description}</td> -<td class="odd">{$channels[user].timeLimited} {if $channels[user].timeLimited eq 'y'}({$channels[user].timeLimit} mins){/if}</td> -<td class="odd">{$channels[user].questions}</td> -</tr> -{else} -<tr> -<td class="even"><a class="tablename" href="tiki-take_quiz.php?quizId={$channels[user].quizId}">{$channels[user].name}</a> -{* -here's the bit on the adm and stats, it would be nice if there was a direct link to edit here -*} -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_admin_quizzes eq 'y') or ($channels[user].individual_tiki_p_admin_quizzes eq 'y')} (<a class="link" href="tiki-edit_quiz.php?quizId={$channels[user].quizId}"><small>adm</small></a>){/if} -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_view_quiz_stats eq 'y') or ($channels[user].individual_tiki_p_view_quiz_stats eq 'y')} (<a class="link" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}"><small>stats</small></a>){/if} -</td> -<td class="even">{$channels[user].description}</td> -<td class="even">{$channels[user].timeLimited} {if $channels[user].timeLimited eq 'y'}({$channels[user].timeLimit} mins){/if}</td> -<td class="even">{$channels[user].questions}</td> -</tr> -{/if} -{/if} + {if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_take_quiz eq 'y') or ($channels[user].individual_tiki_p_take_quiz eq 'y')} + <tr> + <td class="{cycle advance=false}"> + <a class="tablename" href="tiki-take_quiz.php?quizId={$channels[user].quizId}">{$channels[user].name}</a> + {if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_admin_quizzes eq 'y') or ($channels[user].individual_tiki_p_admin_quizzes eq 'y')} + <a class="link" href="tiki-edit_quiz.php?quizId={$channels[user].quizId}">{icon _id='page_edit' alt='{tr}Edit{/tr}'}</a> + {/if} + {if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_view_quiz_stats eq 'y') or ($channels[user].individual_tiki_p_view_quiz_stats eq 'y')} + <a class="link" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}">{icon _id='chart_curve' alt='{tr}Stats{/tr}'}</a> + {/if} + </td> + <td class="{cycle advance=false}">{$channels[user].description}</td> + <td class="{cycle advance=false}">{$channels[user].timeLimited} {if $channels[user].timeLimited eq 'y'}({$channels[user].timeLimit} mins){/if}</td> + <td class="{cycle}">{$channels[user].questions}</td> + </tr> + {/if} {sectionelse} -<tr><td class="odd" colspan="4">{tr}No records.{/tr}</td></tr> + <tr><td class="{cycle}" colspan="4">{tr}No records.{/tr}</td></tr> {/section} </table> Modified: branches/1.10/templates/tiki-quiz_stats.tpl =================================================================== --- branches/1.10/templates/tiki-quiz_stats.tpl 2008-05-23 22:09:43 UTC (rev 12959) +++ branches/1.10/templates/tiki-quiz_stats.tpl 2008-05-24 05:40:09 UTC (rev 12960) @@ -14,7 +14,7 @@ </div> <h2>{tr}Quizzes{/tr}</h2> -<! -- begin find field ---!> +<!-- begin find field --> <div align="center"> {if $channels} <table class="findtable"> @@ -42,26 +42,18 @@ </td> <td class="heading"><a class="tableheading" href="tiki-quiz_stats.php?offset={$offset}&sort_mode={if $sort_mode eq 'avgtime_desc'}avgtime_asc{else}avgtime_desc{/if}">{tr}Av time{/tr}</a></td> </tr> -{section name=user loop=$channels} -{if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_view_quiz_stats eq 'y') or ($channels[user].individual_tiki_p_view_quiz_stats eq 'y')} -{if $smarty.section.user.index % 2} -<tr> -<td class="odd"><a class="tablename" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}">{$channels[user].quizName}</a></td> -<td class="odd">{$channels[user].timesTaken}</td> -<td class="odd">{$channels[user].avgavg}%</td> -<td class="odd">{$channels[user].avgtime} secs</td> -</tr> -{else} -<tr> -<td class="even"><a class="tablename" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}">{$channels[user].quizName}</a></td> -<td class="even">{$channels[user].timesTaken}</td> -<td class="even">{$channels[user].avgavg}%</td> -<td class="even">{$channels[user].avgtime} secs</td> -</tr> + {cycle values="odd,even" print=false} + {section name=user loop=$channels} + {if ($tiki_p_admin eq 'y') or ($channels[user].individual eq 'n' and $tiki_p_view_quiz_stats eq 'y') or ($channels[user].individual_tiki_p_view_quiz_stats eq 'y')} + <tr> + <td class="{cycle advance=false}"><a class="tablename" href="tiki-quiz_stats_quiz.php?quizId={$channels[user].quizId}">{$channels[user].quizName}</a></td> + <td class="{cycle advance=false}">{$channels[user].timesTaken}</td> + <td class="{cycle advance=false}">{$channels[user].avgavg}%</td> + <td class="{cycle}">{$channels[user].avgtime} secs</td> + </tr> {/if} -{/if} {sectionelse} -<tr><td class="odd" colspan="4">{tr}No records{/tr}</td></tr> +<tr><td class="{cycle}" colspan="4">{tr}No records{/tr}</td></tr> {/section} </table> <div class="mini"> Modified: branches/1.10/templates/tiki-referer_stats.tpl =================================================================== --- branches/1.10/templates/tiki-referer_stats.tpl 2008-05-23 22:09:43 UTC (rev 12959) +++ branches/1.10/templates/tiki-referer_stats.tpl 2008-05-24 05:40:09 UTC (rev 12960) @@ -29,20 +29,13 @@ <td class="heading"><a class="tableheading" href="tiki-referer_stats.php?offset={$offset}&sort_mode={if $sort_mode eq 'hits_desc'}hits_asc{else}hits_desc{/if}">{tr}Hits{/tr}</a></td> <td class="heading"><a class="tableheading" href="tiki-referer_stats.php?offset={$offset}&sort_mode={if $sort_mode eq 'last_desc'}last_asc{else}last_desc{/if}">{tr}Last{/tr}</a></td> </tr> +{cycle values="odd,even" print=false} {section name=user loop=$channels} -{if $smarty.section.user.index % 2} -<tr> -<td class="odd">{$channels[user].referer}</td> -<td class="odd">{$channels[user].hits}</td> -<td class="odd">{$channels[user].last|tiki_short_datetime}</td> -</tr> -{else} -<tr> -<td class="even">{$channels[user].referer}</td> -<td class="even">{$channels[user].hits}</td> -<td class="even">{$channels[user].last|tiki_short_datetime}</td> -</tr> -{/if} + <tr> + <td class="{cycle advance=false}">{$channels[user].referer}</td> + <td class="{cycle advance=false}">{$channels[user].hits}</td> + <td class="{cycle}">{$channels[user].last|tiki_short_datetime}</td> + </tr> {/section} </table> <br /> Modified: branches/1.10/templates/tiki-search_stats.tpl =================================================================== --- branches/1.10/templates/tiki-search_stats.tpl 2008-05-23 22:09:43 UTC (rev 12959) +++ branches/1.10/templates/tiki-search_stats.tpl 2008-05-24 05:40:09 UTC (rev 12960) @@ -36,18 +36,12 @@ <!-- How can we increase the number of items displayed on a page? --> </tr> +{cycle values="odd,even" print=false} {section name=user loop=$channels} -{if $smarty.section.user.index % 2} -<tr> -<td class="odd">{$channels[user].term}</td> -<td class="odd">{$channels[user].hits}</td> -</tr> -{else} -<tr> -<td class="even">{$channels[user].term}</td> -<td class="even">{$channels[user].hits}</td> -</tr> -{/if} + <tr> + <td class="{cycle advance=false}">{$channels[user].term}</td> + <td class="{cycle}">{$channels[user].hits}</td> + </tr> {/section} </table> <br /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |