diff --git a/resources/views/themes/admin/collection_regexes-edit.tpl b/resources/views/themes/admin/collection_regexes-edit.tpl
index fcd0eaf49..b26183426 100644
--- a/resources/views/themes/admin/collection_regexes-edit.tpl
+++ b/resources/views/themes/admin/collection_regexes-edit.tpl
@@ -1,80 +1,155 @@
-
-
Go back
-
+
+
+
+
+ {if isset($error) && $error != ''}
+
{$error}
+ {/if}
+
+
+ {{csrf_field()}}
+
+
+
+
+ Group:
+
+
+
+
+
+
+
+ Regex to match against a group or multiple groups.
+ Delimiters are already added, and PCRE_CASELESS is added after for case insensitivity.
+ An example of matching a single group: alt\.binaries\.example
+ An example of matching multiple groups: alt\.binaries.*
+
+
+
+
+
+
+ Regex:
+
+
+
+
+ {$regex.regex|escape:html}
+
+
+ The regex to use when matching (grouping) collections.
+ The regex delimiters are not added, you MUST add them. See this page.
+ To make the regex case insensitive, add i after the last delimiter.
+ You MUST include at least one regex capture group.
+ You MUST name your regex capture groups (the ones you want to be included).
+ A string will be created from your matched capture groups.
+ The string will form part of a "collection hash".
+ The collection hash is used to group many parts together, to form the finalized release.
+ The usenet group and name of the poster are added automatically when hashing.
+ Capture groups are sorted alphabetically (by capture group name) when concatenating the string.
+
+
+
+
+
+
+ Description:
+
+
+
+
+ {$regex.description|escape:html}
+
+
+ Description for this regex.
+ You can include an example usenet subject this regex would match on.
+
+
+
+
+
+
+ Ordinal:
+
+
+
+
+
+
+
+ The order to run this regex in.
+ Must be a number, 0 or higher.
+ If multiple regex have the same ordinal, MySQL will randomly sort them.
+
+
+
+
+
+
+ Active:
+
+
+
+ {html_radios id="status" name='status' values=$status_ids output=$status_names selected=$regex.status separator='
'}
+
+
Only active regex are used during the collection matching process.
+
+
+
+
+
+
+
+
diff --git a/resources/views/themes/admin/collection_regexes-list.tpl b/resources/views/themes/admin/collection_regexes-list.tpl
index 59c67bdf3..78247e3b4 100644
--- a/resources/views/themes/admin/collection_regexes-list.tpl
+++ b/resources/views/themes/admin/collection_regexes-list.tpl
@@ -1,50 +1,173 @@
-
{$title}
-
-
This page lists regex used for grouping usenet collections.
-
+
+
-
- {{csrf_field()}}
- Search a group:
-
-
-
-
- {if $regex}
-
{$regex->onEachSide(5)->links()}
-
-
- id
- group
- edit
- description
- delete
- ordinal
- status
- regex
-
- {foreach from=$regex item=row}
-
- {$row.id}
- {$row.group_regex}
- Edit
- {$row.description|truncate:50:"...":true}
- Delete
-
- {$row.ordinal}
- {if $row.status==1}
- Active
- {else}
- Disabled
- {/if}
- {$row.regex|escape:html|truncate:50:"...":true}
-
-
- {/foreach}
-
-
{$regex->onEachSide(5)->links()}
- {/if}
-
+
+
This page lists regex used for grouping usenet collections.
+
+
+
+ {{csrf_field()}}
+
+
+
+ {if $regex}
+
+
+
+
+ ID
+ Group
+ Description
+ Ordinal
+ Status
+ Regex
+ Actions
+
+
+
+ {foreach from=$regex item=row}
+
+ {$row.id}
+ {$row.group_regex}
+ {$row.description|truncate:50:"...":true}
+ {$row.ordinal}
+
+ {if $row.status==1}
+ Active
+ {else}
+ Disabled
+ {/if}
+
+ {$row.regex|escape:html|truncate:50:"...":true}
+
+
+
+
+ {/foreach}
+
+
+
+
+
+ {$regex->onEachSide(5)->links()}
+
+ {else}
+
+ No regex rules found matching your criteria.
+
+ {/if}
+
+
+
+
+
+
+
+
diff --git a/resources/views/themes/admin/collection_regexes-test.tpl b/resources/views/themes/admin/collection_regexes-test.tpl
index a5aac3dab..746afb05c 100644
--- a/resources/views/themes/admin/collection_regexes-test.tpl
+++ b/resources/views/themes/admin/collection_regexes-test.tpl
@@ -1,45 +1,156 @@
-
{$title}
-
-
This page is used for testing regex for grouping usenet collections. Enter the group name to test and a
- regex. Limit is how many collections to show max on the page, 0 for no limit(slow).
+
+
-
- {{csrf_field()}}
- Group:
-
- Regex:
-
- Limit:
-
-
-
- {if isset($data)}
+
+
This page is used for testing regex for grouping usenet collections. Enter the group name to test and a regex. Limit is how many collections to show max on the page, 0 for no limit (slow).
- {foreach from=$data key=hash item=collection}
-
-
- {$hash} Current Files: {count($collection)}
-
-
-
-
- name
- current parts
- total parts
- poster
- old hash
-
- {foreach from=$collection item=row}
-
- {$row.file_name}
- {$row.file_current_parts}
- {$row.file_total_parts}
- {$row.collection_poster}
- {$row.old_collection_hash}
-
- {/foreach}
-
- {/foreach}
- {/if}
+
+ {{csrf_field()}}
-
+
+
+ Group:
+
+
+
+
+
+
+
The newsgroup to test against (e.g., alt.binaries.example)
+
+
+
+
+
+ Regex:
+
+
+
+
+
+
+
The regex pattern to test (include delimiters and modifiers)
+
+
+
+
+
+ Limit:
+
+
+
+
+
+
+
Maximum number of collections to display (use 0 for no limit, but this may be slow)
+
+
+
+
+
+
+
+
+ {if isset($data)}
+
+ {foreach from=$data key=hash item=collection}
+
+
+
+
+
+
+
+ Name
+ Current Parts
+ Total Parts
+ Poster
+ Old Hash
+
+
+
+ {foreach from=$collection item=row}
+
+ {$row.file_name}
+ {$row.file_current_parts}
+ {$row.file_total_parts}
+ {$row.collection_poster}
+ {$row.old_collection_hash}
+
+ {/foreach}
+
+
+
+
+
+ {/foreach}
+
+ {/if}
+
+