dwoo support and tidying: fixing r0,r1 properly

htdocs/artefact/blog/theme/raw/bloglist.tpl

   {foreach from=$blogs->data item=blog}
-    <tr class="{cycle name=rows values=r1,r0}">
+    <tr class="{cycle name=rows values='r0,r1'}">
       <td>
         <div><strong><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->title|escape}</a></strong></div>
         <div>{$blog->description|clean_html}</div>

htdocs/artefact/blog/theme/raw/render/blogpost_renderfull.tpl

@@ -10,7 +10,7 @@
       <tr><th colspan="2">{str tag=attachedfiles section=artefact.blog}:</th></tr>
   {if $artefact->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>{/if}
   {foreach from=$attachments item=item}
-      <tr class="r{cycle values=1,0}">
+      <tr class="{cycle values='r0,r1'}">
         {if $icons}<td style="width: 22px;"><img src="{$item->iconpath|escape}" alt=""></td>{/if}
         <td><a href="{$item->viewpath|escape}">{$item->title|escape}</a> ({$item->size|escape}) - <strong><a href="{$item->downloadpath|escape}">{str tag=Download section=artefact.file}</a></strong>
         <br>{$item->description|escape}</td>

htdocs/artefact/file/export/html/theme/raw/index.tpl

@@ -19,7 +19,7 @@
         <th>{str tag=Date section=artefact.file}</th>
     </tr>
 {if $folder != '/'}
-    <tr class="r{cycle values='0,1'}">
+    <tr class="{cycle values='r0,r1'}">
         <td><img src="{$rootpath}static/file/theme/default/static/images/folder.gif" alt="{str tag=Folder section=artefact.file}"></td>
         <td><a href="../index.html">{str tag=parentfolder section=artefact.file}</a></td>
         <td>{str tag=parentfolder section=artefact.file}</td>
@@ -28,7 +28,7 @@
     </tr>
 {/if}
 {foreach from=$folders item=folder}
-    <tr class="r{cycle values='0,1'}">
+    <tr class="{cycle values='r0,r1'}">
         <td><img src="{$rootpath}static/file/theme/default/static/images/folder.gif" alt="{str tag=Folder section=artefact.file}"></td>
         <td><a href="{$folder.path|rawurlencode|escape}/index.html">{$folder.title|escape}</a></td>
         <td>{$folder.description|escape}</td>
@@ -37,7 +37,7 @@
     </tr>
 {/foreach}
 {foreach from=$files item=file}
-    <tr class="r{cycle values='0,1'}">
+    <tr class="{cycle values='r0,r1'}">
         <td><img src="{$rootpath}static/file/theme/default/static/images/file.gif" alt="{str tag=File section=artefact.file}"></td>
         <td><a href="{$file.path|rawurlencode|escape}">{$file.title|escape}</a></td>
         <td>{$file.description|escape}</td>

htdocs/artefact/file/theme/raw/folder_render_self.tpl

@@ -18,7 +18,7 @@
     </thead>
     <tbody>
     {foreach from=$children item=child}
-      <tr class="{cycle values=r1,r0}">
+      <tr class="{cycle values='r0,r1'}">
         <td><img src="{$child->iconsrc|escape}" border="0" alt="{$child->artefacttype|escape}"></td>
         <td><a href="{$WWWROOT}view/artefact.php?artefact={$child->id|escape}&amp;view={$viewid|escape}" title="{$child->hovertitle|escape}">{$child->title|escape}</a></td>
         <td>{$child->description|escape}</td>

htdocs/artefact/file/theme/raw/form/filelist.tpl

@@ -15,7 +15,7 @@
  <tbody>
   {foreach from=$filelist item=file}
     {if !$publishing || !$file->permissions || $file->can_republish}{assign var=publishable value=1}{else}{assign var=publishable value=0}{/if}
-  <tr id="file:{$file->id}" class="r{cycle values='0,1'} directory-item{if $file->isparent} parentfolder{/if}{if $file->artefacttype == 'folder'} folder{/if}{if $highlight && $highlight == $file->id} highlight-file{/if}{if $edit == $file->id} hidden{/if}{if !$publishable && $file->artefacttype != 'folder'} disabled{/if}" {if !$publishable && $file->artefacttype != 'folder'} title="{str tag=notpublishable section=artefact.file}"{/if}>
+  <tr id="file:{$file->id}" class="{cycle values='r0,r1'} directory-item{if $file->isparent} parentfolder{/if}{if $file->artefacttype == 'folder'} folder{/if}{if $highlight && $highlight == $file->id} highlight-file{/if}{if $edit == $file->id} hidden{/if}{if !$publishable && $file->artefacttype != 'folder'} disabled{/if}" {if !$publishable && $file->artefacttype != 'folder'} title="{str tag=notpublishable section=artefact.file}"{/if}>
     <td>
       {if $editable}
       <div{if !$file->isparent} class="icon-drag" id="drag:{$file->id}"{/if}>

htdocs/artefact/file/theme/raw/form/selectedlist.tpl

@@ -11,7 +11,7 @@
  <tbody>
   {foreach from=$selectedlist item=file}
     {assign var=displaytitle value=$file->title|str_shorten_text:34|escape}
-  <tr class="r{cycle values='0,1'}{if $highlight && $highlight == $file->id} highlight-file{/if}">
+  <tr class="{cycle values='r0,r1'}{if $highlight && $highlight == $file->id} highlight-file{/if}">
     <td>
       <img src="{if $file->artefacttype == 'image'}{$WWWROOT}artefact/file/download.php?file={$file->id}&size=20x20{else}{theme_url filename=images/`$file->artefacttype`.gif}{/if}">
     </td>

htdocs/artefact/resume/theme/raw/fragments/book.tpl

@@ -18,7 +18,7 @@
     </thead>
     <tbody>
         {foreach from=$rows item=row}
-        <tr class="r{cycle values='0,1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>{$row->date|escape}</td>
             <td><div class="jstitle">{$row->title|escape}</div><div class="jsdescription">{$row->description|escape}</div></td>
         </tr>

htdocs/artefact/resume/theme/raw/fragments/certification.tpl

@@ -18,7 +18,7 @@
     </thead>
     <tbody>
         {foreach from=$rows item=row}
-        <tr class="r{cycle values='0,1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>{$row->date|escape}</td>
             <td><div class="jstitle">{$row->title|escape}</div><div class="jsdescription">{$row->description|escape}</div></td>
         </tr>

htdocs/artefact/resume/theme/raw/fragments/educationhistory.tpl

@@ -19,7 +19,7 @@
     </thead>
     <tbody>
         {foreach from=$rows item=row}
-        <tr class="r{cycle values='0,1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>{$row->startdate|escape}</td>
             <td>{$row->enddate|escape}</td>
             <td><div class="jstitle">{$row->qualification|escape}</div><div class="jsdescription">{$row->qualdescription|escape}</div></td>

htdocs/artefact/resume/theme/raw/fragments/employmenthistory.tpl

@@ -19,7 +19,7 @@
     </thead>
     <tbody>
         {foreach from=$rows item=row}
-        <tr class="r{cycle values='0,1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>{$row->startdate|escape}</td>
             <td>{$row->enddate|escape}</td>
             <td><div class="jstitle">{$row->jobtitle|escape}: {$row->employer|escape}</div>

htdocs/artefact/resume/theme/raw/fragments/membership.tpl

@@ -19,7 +19,7 @@
     </thead>
     <tbody>
         {foreach from=$rows item=row}
-        <tr class="r{cycle values='0,1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>{$row->startdate|escape}</td>
             <td>{$row->enddate|escape}</td>
             <td><div class="jstitle">{$row->title|escape}</div><div class="jsdescription">{$row->description|escape}</div></td>

htdocs/blocktype/myfriends/theme/raw/myfriends.tpl

@@ -4,7 +4,7 @@
     {foreach from=$friends item=row}
         <tr>
         {foreach from=$row item=friend}
-            <td class="r{cycle values='0,1'} friendcell">
+            <td class="{cycle values='r0,r1'} friendcell">
                 <a href="{$WWWROOT}user/view.php?id={$friend}">
                    <img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=60&amp;maxheight=60&amp;id={$friend}" alt="">
                 </a>

htdocs/blocktype/mygroups/theme/raw/mygroups.tpl

@@ -2,7 +2,7 @@
 <table id="usergroupstable" class="fullwidth">
 {foreach from=$USERGROUPS item=item}
     <tr>
-        <td class="r{cycle values='0,1'}">
+        <td class="{cycle values='r0,r1'}">
             <h4><a href="{$WWWROOT}group/view.php?id={$item->id}">{$item->name|escape}</a> - {$item->roledisplay|escape}</h4>
             {if $item->description}
                 {$item->description}

htdocs/blocktype/myviews/theme/raw/myviews.tpl

@@ -2,7 +2,7 @@
     <table id="userviewstable">
     {foreach from=$VIEWS item=item name=view}
         <tr>
-            <td class="r{cycle values='0,1'}">
+            <td class="{cycle values='r0,r1'}">
                 <h4><a href="{$WWWROOT}view/view.php?id={$item->id}">{$item->title|escape}</a></h4>
                 {if $item->description}
                   <div>{$item->description}</div>

htdocs/interaction/forum/theme/raw/index.tpl

@@ -22,7 +22,7 @@
 		<th></th>
 	</tr>
     {foreach from=$forums item=forum}
-    <tr class="r{cycle values='0,1'}">
+    <tr class="{cycle values='r0,r1'}">
         <td>
             {if $admin}
             <div class="fr btn-spacer s">

htdocs/interaction/forum/theme/raw/topics.tpl

@@ -2,7 +2,7 @@
 {if $sticky}
 <tr class="stickytopic">
 {else}
-<tr class="r{cycle values='0,1'}">
+<tr class="{cycle values='r0,r1'}">
 {/if}
     <td>
     {if $topic->closed}<img src="{$closedicon|escape}" alt="{str tag="Closed" section="interaction.forum"}">{/if}

htdocs/theme/raw/templates/group/find.tpl

@@ -2,7 +2,7 @@
 {$form}
 {if $groups}
 {foreach from=$groups item=group}
-            <div class="r{cycle values='r0,r1'} listing">
+            <div class="{cycle values='r0,r1'} listing">
                 <div class="fr">
                      {include file="group/groupuserstatus.tpl" group=$group returnto='find'}
                 </div>

htdocs/theme/raw/templates/group/membersearchresults.tpl

 {if $results.data}
         {foreach from=$results.cdata item=row}
-          <tr class="r{cycle values='r0,r1'}">
+          <tr class="{cycle values='r0,r1'}">
             {foreach from=$row item=r}
             <td>
               <div class="fl"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=40&amp;id={$r.id|escape}" alt=""></div>

htdocs/theme/raw/templates/group/mygroups.tpl

@@ -5,7 +5,7 @@
 {$form}
 {if $groups}
 {foreach from=$groups item=group}
-            <div class="r{cycle values='r0,r1'} listing">
+            <div class="{cycle values='r0,r1'} listing">
                 <div class="fr">
                      {include file="group/groupuserstatus.tpl" group=$group returnto='find'}
                 </div>

htdocs/theme/raw/templates/group/view.tpl

@@ -16,7 +16,7 @@
     {if $foruminfo}
         <table class="fullwidth s">
         {foreach from=$foruminfo item=postinfo}
-            <tr class="r{cycle values='r0,r1'}">
+            <tr class="{cycle values='r0,r1'}">
                 <td><strong><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic|escape}#post{$postinfo->id|escape}">{$postinfo->topicname|escape}</a></strong></td>
                 <td>{$postinfo->body|str_shorten_html:100:true}</td>
                 <td><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$postinfo->poster|escape}" alt="">
@@ -36,7 +36,7 @@
     <p>
     <table class="fullwidth">
     {foreach from=$sharedviews item=view}
-        <tr class="r{cycle values='r0,r1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>
                 <a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title|escape}</a>
                 {if $view.sharedby}
@@ -67,7 +67,7 @@
     <p>
     <table class="fullwidth">
     {foreach from=$submittedviews item=view}
-        <tr class="r{cycle values='r0,r1'}">
+        <tr class="{cycle values='r0,r1'}">
             <td>
                 <a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title|escape}</a>
                 {if $view.sharedby}

htdocs/theme/raw/templates/user/myfriends.tpl

@@ -4,7 +4,7 @@
 {if $users}
     <table id="friendslist" class="fullwidth listing">
     {foreach from=$users item=user}
-        <tr class="r{cycle values='r0,r1'}">
+        <tr class="{cycle values='r0,r1'}">
         {include file="user/user.tpl" user=$user page='myfriends'}
         </tr>
     {/foreach}

htdocs/theme/raw/templates/user/userresults.tpl

 {if $data}
 {foreach from=$data item=user}
-                    <tr class="r{cycle values='r0,r1'}">
+                    <tr class="{cycle values='r0,r1'}">
 {include file="user/user.tpl" user=$user page=$page}
                     </tr>
 {/foreach}

htdocs/theme/raw/templates/view/sharedviews.tpl

@@ -4,7 +4,7 @@
     <table class="fullwidth">
     {foreach from=$views item=view}
         <tr>
-            <td class="r{cycle values='r0,r1'}">
+            <td class="{cycle values='r0,r1'}">
                 <h5><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title|escape}</a> {str tag=by section=view}
                     <a href="{$WWWROOT}{if $view.group}group{else}user{/if}/view.php?id={if $view.group}{$view.group}{else}{$view.owner}{/if}">{if $view.sharedby}{$view.sharedby}{else}{$groupname}{/if}</a>
                 </h5>

htdocs/theme/raw/templates/view/templatesearchresults.tpl

@@ -9,7 +9,7 @@
   <tbody>
 {if $results}
 {foreach from=$results item=row}
-    <tr class="r{cycle values='r0,r1'}">
+    <tr class="{cycle values='r0,r1'}">
       <td>
         <a class="viewlink" href="{$WWWROOT}view/view.php?id={$row.id|escape}" target="_blank">{$row.title|escape}</a>
       </td>