Using the new ste:else in ste:foreach feature.

5 files changed, 60 insertions, 87 deletions

diff --git a/ratatoeskr/templates/src/systemtemplates/articles.html b/ratatoeskr/templates/src/systemtemplates/articles.html
index 764ac40..2970b7c 100644
--- a/ratatoeskr/templates/src/systemtemplates/articles.html
+++ b/ratatoeskr/templates/src/systemtemplates/articles.html
@@ -37,32 +37,27 @@
 				</th>
 			</tr></thead>
 			<tbody>
-				<ste:set var="articles_n"><ste:arraylen array="articles" /></ste:set>
-				<ste:if>~{$articles_n|gt|0}
-					<ste:then>
-						<ste:foreach array="articles" value="article">
-							<tr>
-								<td><input type="checkbox" name="article_multiselect[]" value="$article[urlname]" /></td>
-								<td><a href="$rel_path_to_root/backend/content/write/$article[urlname]">$article[urlname]</a></td>
-								<td>
-									<ste:foreach array="article[languages]" value="lang" counter="i">
-										?{~{$i|eq|0}||, }<a href="$rel_path_to_root/backend/content/write/$article[urlname]/$lang">$lang</a>
-									</ste:foreach>
-								</td>
-								<td><ste:date timestamp="$article[date]">%Y-%m-%d %H:%M:%S</ste:date></td>
-								<td>
-									<ste:foreach array="article[tags]" value="tag" counter="i">
-										?{~{$i|eq|0}||, } <ste:escape>$tag</ste:escape>
-									</ste:foreach>
-								</td>
-								<td><ste:escape>$article[section][name]</ste:escape></td>
-							</tr>
-						</ste:foreach>
-					</ste:then>
+				<ste:foreach array="articles" value="article">
+					<tr>
+						<td><input type="checkbox" name="article_multiselect[]" value="$article[urlname]" /></td>
+						<td><a href="$rel_path_to_root/backend/content/write/$article[urlname]">$article[urlname]</a></td>
+						<td>
+							<ste:foreach array="article[languages]" value="lang" counter="i">
+								?{~{$i|eq|0}||, }<a href="$rel_path_to_root/backend/content/write/$article[urlname]/$lang">$lang</a>
+							</ste:foreach>
+						</td>
+						<td><ste:date timestamp="$article[date]">%Y-%m-%d %H:%M:%S</ste:date></td>
+						<td>
+							<ste:foreach array="article[tags]" value="tag" counter="i">
+								?{~{$i|eq|0}||, } <ste:escape>$tag</ste:escape>
+							</ste:foreach>
+						</td>
+						<td><ste:escape>$article[section][name]</ste:escape></td>
+					</tr>
 					<ste:else>
 						<tr><td colspan="6" style="text-align: center;"><em><ste:get_translation for="no_articles" /></em></td></tr>
 					</ste:else>
-				</ste:if>
+				</ste:foreach>
 			</tbody>
 		</table>
 		<div>
diff --git a/ratatoeskr/templates/src/systemtemplates/comments_list.html b/ratatoeskr/templates/src/systemtemplates/comments_list.html
index 5c86a8e..8bbcda8 100644
--- a/ratatoeskr/templates/src/systemtemplates/comments_list.html
+++ b/ratatoeskr/templates/src/systemtemplates/comments_list.html
@@ -39,26 +39,21 @@
 				</tr>
 			</thead>
 			<tbody>
-				<ste:set var="comments_n"><ste:arraylen array="comments" /></ste:set>
-				<ste:if>~{$comments_n|gt|0}
-					<ste:then>
-						<ste:foreach array="comments" value="comment">
-							<tr>
-								<td><input type="checkbox" name="comment_multiselect[]" value="$comment[id]" /></td>
-								<td>?{$comment[read_by_admin]|<ste:get_translation for="yes" />|<strong><ste:get_translation for="no" /></strong>}</td>
-								<td>?{$comment[visible]|<ste:get_translation for="yes" />|<ste:get_translation for="no" />}</td>
-								<td><em><ste:escape>$comment[excerpt]</ste:escape>...</em> <a href="$rel_path_to_root/backend/content/comments/$comment[id]"><ste:get_translation for="read_more" /></a></td>
-								<td>$comment[language]</td>
-								<td><ste:escape>$comment[author]</ste:escape></td>
-								<td><ste:date timestamp="$comment[date]">%Y-%m-%d %H:%M:%S</ste:date></td>
-								<td><a href="$rel_path_to_root/backend/content/write/<ste:escape>$comment[article]</ste:escape>"><ste:escape>$comment[article]</ste:escape></a></td>
-							</tr>
-						</ste:foreach>
-					</ste:then>
+				<ste:foreach array="comments" value="comment">
+					<tr>
+						<td><input type="checkbox" name="comment_multiselect[]" value="$comment[id]" /></td>
+						<td>?{$comment[read_by_admin]|<ste:get_translation for="yes" />|<strong><ste:get_translation for="no" /></strong>}</td>
+						<td>?{$comment[visible]|<ste:get_translation for="yes" />|<ste:get_translation for="no" />}</td>
+						<td><em><ste:escape>$comment[excerpt]</ste:escape>...</em> <a href="$rel_path_to_root/backend/content/comments/$comment[id]"><ste:get_translation for="read_more" /></a></td>
+						<td>$comment[language]</td>
+						<td><ste:escape>$comment[author]</ste:escape></td>
+						<td><ste:date timestamp="$comment[date]">%Y-%m-%d %H:%M:%S</ste:date></td>
+						<td><a href="$rel_path_to_root/backend/content/write/<ste:escape>$comment[article]</ste:escape>"><ste:escape>$comment[article]</ste:escape></a></td>
+					</tr>
 					<ste:else>
 						<tr><td colspan="8" style="text-align: center"><em><ste:get_translation for="no_comments" /></em></td></tr>
 					</ste:else>
-				</ste:if>
+				</ste:foreach>
 			</tbody>
 		</table>
 		<div>
diff --git a/ratatoeskr/templates/src/systemtemplates/image_list.html b/ratatoeskr/templates/src/systemtemplates/image_list.html
index fe600aa..0674f94 100644
--- a/ratatoeskr/templates/src/systemtemplates/image_list.html
+++ b/ratatoeskr/templates/src/systemtemplates/image_list.html
@@ -26,24 +26,19 @@
 						<th><ste:get_translation for="image_getmarkup" /></th>
 					</tr></thead>
 					<tbody>
-						<ste:set var="images_n"><ste:arraylen array="images" /></ste:set>
-						<ste:if>~{$images_n|gt|0}
-							<ste:then>
-								<ste:foreach array="images" value="image">
-									<tr>
-										<td><input type="checkbox" name="image_multiselect[]" value="$image[id]" /></td>
-										<td><img src="$rel_path_to_root/images/previews/${image[id]}.png" alt="" /></td>
-										<td><a href="$rel_path_to_root/images/$image[file]"><ste:escape>$image[name]</ste:escape></a></td>
-										<td>
-											<a href="$rel_path_to_root/backend/content/images/$image[id]/markdown">Markdown</a> - <a href="$rel_path_to_root/backend/content/images/$image[id]/html">HTML</a> - <a href="$rel_path_to_root/backend/content/images/$image[id]/ste">STE</a>
-										</td>
-									</tr>
-								</ste:foreach>
-							</ste:then>
+						<ste:foreach array="images" value="image">
+							<tr>
+								<td><input type="checkbox" name="image_multiselect[]" value="$image[id]" /></td>
+								<td><img src="$rel_path_to_root/images/previews/${image[id]}.png" alt="" /></td>
+								<td><a href="$rel_path_to_root/images/$image[file]"><ste:escape>$image[name]</ste:escape></a></td>
+								<td>
+									<a href="$rel_path_to_root/backend/content/images/$image[id]/markdown">Markdown</a> - <a href="$rel_path_to_root/backend/content/images/$image[id]/html">HTML</a> - <a href="$rel_path_to_root/backend/content/images/$image[id]/ste">STE</a>
+								</td>
+							</tr>
 							<ste:else>
 								<tr><td colspan="5" style="text-align: center;"><em><ste:get_translation for="no_images" /></em></td></tr>
 							</ste:else>
-						</ste:if>
+						</ste:foreach>
 					</tbody>
 				</table>
 				<div>
diff --git a/ratatoeskr/templates/src/systemtemplates/pluginlist.html b/ratatoeskr/templates/src/systemtemplates/pluginlist.html
index 5d88fb4..85ad71a 100644
--- a/ratatoeskr/templates/src/systemtemplates/pluginlist.html
+++ b/ratatoeskr/templates/src/systemtemplates/pluginlist.html
@@ -19,27 +19,21 @@
 				</tr>
 			</thead>
 			<tbody>
-				<ste:set var="plugins_n"><ste:arraylen array="plugins" /></ste:set>
-				<ste:if>
-					~{$plugins_n|gt|0}
-					<ste:then>
-						<ste:foreach array="plugins" value="p">
-							<tr>
-								<td><input type="checkbox" name="plugins_multiselect[]" value="$p[id]" /></td>
-								<td><ste:escape>$p[name]</ste:escape></td>
-								<td><ste:escape>$p[versiontext]</ste:escape></td>
-								<td>?{$p[active]|<strong><ste:get_translation for="yes" />|<ste:get_translation for="no" />}</td>
-								<td><ste:escape>$p[description]</ste:escape></td>
-								<td><ste:escape>$p[author]</ste:escape></td>
-								<td>?{$p[web]|<a href="<ste:escape>$p[web]</ste:escape>"><ste:escape>$p[web]</ste:escape></a>|}</td>
-								<td>?{$p[help]|<a href="$rel_path_to_root/backend/plugin/help/$p[id]"><ste:get_translation for="plugin_help" /></a>|}</td>
-							</tr>
-						</ste:foreach>
-					</ste:then>
+				<ste:foreach array="plugins" value="p">
+					<tr>
+						<td><input type="checkbox" name="plugins_multiselect[]" value="$p[id]" /></td>
+						<td><ste:escape>$p[name]</ste:escape></td>
+						<td><ste:escape>$p[versiontext]</ste:escape></td>
+						<td>?{$p[active]|<strong><ste:get_translation for="yes" />|<ste:get_translation for="no" />}</td>
+						<td><ste:escape>$p[description]</ste:escape></td>
+						<td><ste:escape>$p[author]</ste:escape></td>
+						<td>?{$p[web]|<a href="<ste:escape>$p[web]</ste:escape>"><ste:escape>$p[web]</ste:escape></a>|}</td>
+						<td>?{$p[help]|<a href="$rel_path_to_root/backend/plugin/help/$p[id]"><ste:get_translation for="plugin_help" /></a>|}</td>
+					</tr>
 					<ste:else>
 						<tr><td colspan="8" style="text-align: center;"><em><ste:get_translation for="no_plugins" /></em></td></tr>
 					</ste:else>
-				</ste:if>
+				</ste:foreach>
 			</tbody>
 		</table>
 		<div>
diff --git a/ratatoeskr/templates/src/systemtemplates/repos.html b/ratatoeskr/templates/src/systemtemplates/repos.html
index 31de6a5..1da92ea 100644
--- a/ratatoeskr/templates/src/systemtemplates/repos.html
+++ b/ratatoeskr/templates/src/systemtemplates/repos.html
@@ -23,25 +23,19 @@
 				</tr>
 			</thead>
 			<tbody>
-				<ste:set var="repos_n"><ste:arraylen array="repos" /></ste:set>
-				<ste:if>
-					~{$repos_n|gt|0}
-					<ste:then>
-						<ste:foreach array="repos" value="repo">
-							<tr>
-								<td><input type="checkbox" name="repos_multiselect[]" value="$repo[id]" /></td>
-								<td><ste:escape>$repo[name]</ste:escape></td>
-								<td><ste:escape>$repo[description]</ste:escape></td>
-								<td><ste:escape>$repo[baseurl]</ste:escape></td>
-							</tr>
-						</ste:foreach>
-					</ste:then>
+				<ste:foreach array="repos" value="repo">
+					<tr>
+						<td><input type="checkbox" name="repos_multiselect[]" value="$repo[id]" /></td>
+						<td><ste:escape>$repo[name]</ste:escape></td>
+						<td><ste:escape>$repo[description]</ste:escape></td>
+						<td><ste:escape>$repo[baseurl]</ste:escape></td>
+					</tr>
 					<ste:else>
 						<tr>
 							<td colspan="4" style="font-style: italic; text-align: center;"><ste:get_translation for="no_repos" /></td>
 						</tr>
 					</ste:else>
-				</ste:if>
+				</ste:foreach>
 			</tbody>
 		</table>
 		<div>