From 75322b8a3ed05d13b1c1ded78a9d59c112639d51 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Wed, 25 Jun 2008 16:00:17 -0400 Subject: [PATCH] Put the <%%> tags in the templates --- templates/bugfield_input_checkbox.tpl | 8 +- templates/bugfield_input_text.tpl | 8 +- templates/bugfield_select_single.tpl | 8 +- templates/bugfield_static_text.tpl | 8 +- templates/editattach.tpl | 24 +++--- templates/editcomment.tpl | 22 +++--- templates/explain_automation.tpl | 14 ++-- templates/explain_product.tpl | 16 ++-- templates/explain_row.tpl | 6 +- templates/favorites.tpl | 18 ++--- templates/footer.tpl | 2 +- templates/header.tpl | 22 +++--- templates/headinclude.tpl | 2 +- templates/help_link.tpl | 2 +- templates/help_window.tpl | 12 +-- templates/history.tpl | 14 ++-- templates/history_bit.tpl | 12 +-- templates/list_head.tpl | 2 +- templates/login.tpl | 8 +- templates/lostpassword.tpl | 8 +- templates/newattach.tpl | 30 +++---- templates/newreport.tpl | 56 ++++++------- templates/pagenav.tpl | 8 +- templates/pagenav_bit.tpl | 2 +- templates/passwordreset.tpl | 16 ++-- templates/quicksearch.tpl | 16 ++-- templates/register.tpl | 22 +++--- templates/search.tpl | 30 +++---- templates/search_results.tpl | 28 +++---- templates/search_save.tpl | 18 ++--- templates/search_update.tpl | 28 +++---- templates/selectoptgroup.tpl | 4 +- templates/selectoption.tpl | 2 +- templates/showreport.tpl | 86 ++++++++++---------- templates/showreport_attachment.tpl | 6 +- templates/showreport_comment.tpl | 22 +++--- templates/std_error.tpl | 18 ++--- templates/std_message.tpl | 28 +++---- templates/std_redirect.tpl | 22 +++--- templates/trackerhome.tpl | 24 +++--- templates/trackerhome_bits.tpl | 6 +- templates/userctrl.tpl | 108 +++++++++++++------------- templates/userctrl_column.tpl | 4 +- templates/userctrl_search.tpl | 8 +- templates/username_display.tpl | 2 +- 45 files changed, 405 insertions(+), 405 deletions(-) diff --git a/templates/bugfield_input_checkbox.tpl b/templates/bugfield_input_checkbox.tpl index acad0e0..88aa131 100644 --- a/templates/bugfield_input_checkbox.tpl +++ b/templates/bugfield_input_checkbox.tpl @@ -1,6 +1,6 @@ - +
- $field[name] $help[field$field[fieldid]] -
+ <%- $field[name] %> <%- $help['field' . $field['fieldid']] %> +
/>
- \ No newline at end of file + \ No newline at end of file diff --git a/templates/bugfield_input_text.tpl b/templates/bugfield_input_text.tpl index 576fc8f..b7f26d7 100644 --- a/templates/bugfield_input_text.tpl +++ b/templates/bugfield_input_text.tpl @@ -1,6 +1,6 @@ - +
- $field[name] $help[field$field[fieldid]] -
maxlength="$field[maxlength]" />
+ <%- $field['name'] %> <%- $help['field' . $field['fieldid']] %> +
maxlength="<%- $field['maxlength'] %>" />
- + diff --git a/templates/bugfield_select_single.tpl b/templates/bugfield_select_single.tpl index 919adab..bf3048f 100644 --- a/templates/bugfield_select_single.tpl +++ b/templates/bugfield_select_single.tpl @@ -1,6 +1,6 @@ - +
- $field[name] $help[field$field[fieldid]] -
+ <%- $field['name'] %> <%- $help['field' . $field['fieldid']] %> +
- \ No newline at end of file + \ No newline at end of file diff --git a/templates/bugfield_static_text.tpl b/templates/bugfield_static_text.tpl index 617bcda..a968534 100644 --- a/templates/bugfield_static_text.tpl +++ b/templates/bugfield_static_text.tpl @@ -1,6 +1,6 @@ - +
- $field[name] $help[field$field[fieldid]] -
$field[value]
+ <%- $field['name'] %> <%- $help['field' . $field['fieldid']] %> +
<%- $field['value'] %>
- + diff --git a/templates/editattach.tpl b/templates/editattach.tpl index bfffd9e..9335e4e 100644 --- a/templates/editattach.tpl +++ b/templates/editattach.tpl @@ -1,31 +1,31 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - $attachment[filename] - $bug[summary] + <%- $attachment['filename'] %> - <%- $bug['summary'] %> -$header +<%- $header %>
- +
-
+
{@"Attachment #%1$s for Bug #%2$s %3$s"}
-
-
{@"Attachment"}: {@"View"} [$attachment[filename]]
+
+
{@"Attachment"}: {@"View"} [<%- $attachment['filename'] %>]
-
-
{@"Description"}:
+
+
{@"Description"}:
{@"Obsolete"}: checked="checked" />
@@ -36,7 +36,7 @@ $header - +
diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl index 570e8f4..62d2332 100644 --- a/templates/editcomment.tpl +++ b/templates/editcomment.tpl @@ -1,7 +1,7 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> <lang 1="$comment[commentid]">{@"Edit Comment %1$s"}</lang> - $bug[summary] @@ -11,27 +11,27 @@ $headinclude $header -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
- +
-
+
{@"Comment #%1$s in bug #%2$s %3$s"}
-
{@"Posted on %1$s by %2$s"}
+
{@"Posted on %1$s by %2$s"}
-
+
style="color: red">{@"Hidden"}: checked="checked" />
{@"Parse Links in the Comment"}: checked="checked" />
- +
@@ -40,7 +40,7 @@ $header
- +
$footer \ No newline at end of file diff --git a/templates/explain_automation.tpl b/templates/explain_automation.tpl index 79029e8..38b6bcc 100644 --- a/templates/explain_automation.tpl +++ b/templates/explain_automation.tpl @@ -1,18 +1,18 @@ -$doctype - +<%- $doctype %> + -$headinclude - {bugdar::$options['trackertitle']} - {@"Automations"} +<%- $headinclude %> + <%- bugdar::$options['trackertitle'] %> - {@"Automations"} -$header +<%- $header %>

{@"Explication of Automations"}

-$automations +<%- $automations %>
-$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/explain_product.tpl b/templates/explain_product.tpl index ce78cb4..3741601 100644 --- a/templates/explain_product.tpl +++ b/templates/explain_product.tpl @@ -1,13 +1,13 @@ -$doctype - +<%- $doctype %> + -$headinclude - {bugdar::$options['trackertitle']} - {@"Products"} +<%- $headinclude %> + <%- bugdar::$options['trackertitle'] %> - {@"Products"} -$header +<%- $header %>

{@"Explication of Products"}

@@ -19,7 +19,7 @@ $header {@"These versions are avaliable for every product, component, and version."} - $globalversions + <%- $globalversions %> @@ -29,7 +29,7 @@ $header {@"Products (components are in white)"} -$productlist +<%- $productlist %> -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/explain_row.tpl b/templates/explain_row.tpl index 4eb5af7..07691a5 100644 --- a/templates/explain_row.tpl +++ b/templates/explain_row.tpl @@ -1,4 +1,4 @@ - - $left - $right +> + <%- $left %> + <%- $right %> diff --git a/templates/favorites.tpl b/templates/favorites.tpl index b2505aa..2388ec6 100644 --- a/templates/favorites.tpl +++ b/templates/favorites.tpl @@ -1,27 +1,27 @@ -$doctype - +<%- $doctype %> + -$headinclude - {bugdar::$options['trackertitle']} - {@"My Favorite Bugs"} +<%- $headinclude %> + <%- bugdar::$options['trackertitle'] %> - {@"My Favorite Bugs"} -$header +<%- $header %> -$headers +<%- $headers %> -$bugs +<%- $bugs %>
-$pagenav +<%- $pagenav %>
-$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/footer.tpl b/templates/footer.tpl index 139f555..b69d338 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -1,7 +1,7 @@
diff --git a/templates/header.tpl b/templates/header.tpl index 0151efb..62162a4 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -1,15 +1,15 @@ @@ -19,25 +19,25 @@ diff --git a/templates/headinclude.tpl b/templates/headinclude.tpl index 339ec1a..2b3a169 100644 --- a/templates/headinclude.tpl +++ b/templates/headinclude.tpl @@ -1,5 +1,5 @@ - + diff --git a/templates/help_link.tpl b/templates/help_link.tpl index 67ad92e..d095604 100644 --- a/templates/help_link.tpl +++ b/templates/help_link.tpl @@ -1 +1 @@ -? \ No newline at end of file +? \ No newline at end of file diff --git a/templates/help_window.tpl b/templates/help_window.tpl index 181aa55..a23a393 100644 --- a/templates/help_window.tpl +++ b/templates/help_window.tpl @@ -1,19 +1,19 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {@"Help"} - $topic[title] + {@"Help"} - <%- $topic['title'] %>
-
{@"Help"} : $topic[title]
+
{@"Help"} : <%- $topic['title'] %>
- $topic[body] + <%- $topic['body'] %>
diff --git a/templates/history.tpl b/templates/history.tpl index 88add76..0310543 100644 --- a/templates/history.tpl +++ b/templates/history.tpl @@ -1,13 +1,13 @@ -$doctype - +<%- $doctype %> + -$headinclude - {@"Bug History"} - $bug[summary] +<%- $headinclude %> + {@"Bug History"} - <%- $bug['summary'] %> -$header +<%- $header %>

{@"History for %1$s (bugid: %2$s)"}

@@ -19,7 +19,7 @@ $header {@"Old Value"} {@"New Value"} -$history +<%- $history %> -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/history_bit.tpl b/templates/history_bit.tpl index 599b25c..7a5d7cb 100644 --- a/templates/history_bit.tpl +++ b/templates/history_bit.tpl @@ -1,7 +1,7 @@ - class="$bgcolor"> - $log[user]  - $log[date]  - $log[field] - $log[original] - $log[changed] + class="<%- $bgcolor %>"> + <%- $log['user'] %>  + <%- $log['date'] %>  + <%- $log['field'] %> + <%- $log['original'] %> + <%- $log['changed'] %> diff --git a/templates/list_head.tpl b/templates/list_head.tpl index 2c05ff5..6add150 100644 --- a/templates/list_head.tpl +++ b/templates/list_head.tpl @@ -1 +1 @@ - $name $image + <%- $name %> <%- $image %> diff --git a/templates/login.tpl b/templates/login.tpl index 747b9f8..99a1094 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -1,9 +1,9 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Login"} + <%- bugdar::$options['trackertitle'] %> - {@"Login"} diff --git a/templates/lostpassword.tpl b/templates/lostpassword.tpl index 2e6db04..48e8845 100644 --- a/templates/lostpassword.tpl +++ b/templates/lostpassword.tpl @@ -1,9 +1,9 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Lost Password"} + <%- bugdar::$options['trackertitle'] %> - {@"Lost Password"} diff --git a/templates/newattach.tpl b/templates/newattach.tpl index 99e6892..c545dbf 100644 --- a/templates/newattach.tpl +++ b/templates/newattach.tpl @@ -1,9 +1,9 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {@"New Attachment"} - $bug[summary] + {@"New Attachment"} - <%- $bug['summary'] %> @@ -11,39 +11,39 @@ $headinclude $header -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
- - + +
-
{@"New Attachment for Bug #%1$s %2$s"}
+
{@"New Attachment for Bug #%1$s %2$s"}
-
+
-
{@"Description"}:
+
{@"Description"}:
-
+
{@"Mark the Following Attachments Obsolete"}: - $obsoletes + <%- $obsoletes %>
-
+
{@"Add Comment"}:
- +
diff --git a/templates/newreport.tpl b/templates/newreport.tpl index 02afa56..96a29b3 100644 --- a/templates/newreport.tpl +++ b/templates/newreport.tpl @@ -1,10 +1,10 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {@"New Bug Report"} - {bugdar::$options['trackertitle']} + {@"New Bug Report"} - <%- bugdar::$options['trackertitle'] %> @@ -12,9 +12,9 @@ $headinclude $header -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
@@ -23,58 +23,58 @@ $header
-
+
- {@"Reporter"} $help[reporter] -
$reporter
+ {@"Reporter"} <%- $help['reporter'] %> +
<%- $reporter %>
- {@"Product/Version"} $help[product] -
+ {@"Product/Version"} <%- $help['product'] %> +
- {@"Status"} $help[status] -
+ {@"Status"} <%- $help['status'] %> +
- {@"Severity"} $help[severity] -
+ {@"Severity"} <%- $help['severity'] %> +
- $customfields[left] + <%- $customfields['left'] %>
-
+
- {@"Summary"} $help[summary] -
+ {@"Summary"} <%- $help['summary'] %> +
- {@"Assignment"} $help[assignedto] -
+ {@"Assignment"} <%- $help['assignedto'] %> +
@@ -82,8 +82,8 @@ $header
- {@"Resolution"} $help[resolution] -
+ {@"Resolution"} <%- $help['resolution'] %> +
@@ -91,13 +91,13 @@ $header
- {@"Priority"} $help[priority] -
+ {@"Priority"} <%- $help['priority'] %> +
- $customfields[right] + <%- $customfields['right'] %>
@@ -110,7 +110,7 @@ $header
{@"Description/Initial Report"} - +
checked="checked" /> {@"Parse Links in the Comment"}
@@ -129,4 +129,4 @@ $header -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/pagenav.tpl b/templates/pagenav.tpl index 9146ae9..1894b33 100644 --- a/templates/pagenav.tpl +++ b/templates/pagenav.tpl @@ -1,7 +1,7 @@
- {@"First"} ... - {@"Prev"} ... + {@"First"} ... + {@"Prev"} ... $pagebits - ... {@"Next"} - ... {@"Last"} + ... {@"Next"} + ... {@"Last"}
\ No newline at end of file diff --git a/templates/pagenav_bit.tpl b/templates/pagenav_bit.tpl index 5febc85..cbb24da 100644 --- a/templates/pagenav_bit.tpl +++ b/templates/pagenav_bit.tpl @@ -1 +1 @@ - $number$number \ No newline at end of file + <%- $number %><%- $number %> \ No newline at end of file diff --git a/templates/passwordreset.tpl b/templates/passwordreset.tpl index a21052f..68643af 100644 --- a/templates/passwordreset.tpl +++ b/templates/passwordreset.tpl @@ -1,23 +1,23 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Reset Password"} + <%- bugdar::$options['trackertitle'] %> - {@"Reset Password"} -$header +<%- $header %> - + -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
diff --git a/templates/quicksearch.tpl b/templates/quicksearch.tpl index c38fb43..8114cbf 100644 --- a/templates/quicksearch.tpl +++ b/templates/quicksearch.tpl @@ -1,22 +1,22 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Quick Search"} + <%- bugdar::$options['trackertitle'] %> - {@"Quick Search"} -$header +<%- $header %>
-
{@"Quick Search"}
+
{@"Quick Search"}
-
+
-
$error
+
$error
 diff --git a/templates/register.tpl b/templates/register.tpl index df88eca..b7bfa15 100644 --- a/templates/register.tpl +++ b/templates/register.tpl @@ -1,9 +1,9 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Register"} + <%- bugdar::$options['trackertitle'] %> - {@"Register"} @@ -11,9 +11,9 @@ $headinclude $header -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
@@ -25,13 +25,13 @@ $header
{@"Register"}
-
{@"Email"}:
-
{@"Confirm Email"}:
-
{@"Display Name"}:
+
{@"Email"}:
+
{@"Confirm Email"}:
+
{@"Display Name"}:
{@"Password"}:
{@"Confirm Password"}:
{@"Show My Email Publicly"}: checked="checked" /> {@"Yes"}
-
{@"Language"}:
+
{@"Language"}:
@@ -43,4 +43,4 @@ $header -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/search.tpl b/templates/search.tpl index 6f0e45c..690e125 100644 --- a/templates/search.tpl +++ b/templates/search.tpl @@ -1,19 +1,19 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Search"} + <%- bugdar::$options['trackertitle'] %> - {@"Search"} -$header +<%- $header %> -
-{@"Run Saved Search"}: + +{@"Run Saved Search"}:
@@ -51,21 +51,21 @@ $header
{@"Product / Version"} $help[product] -
+
{@"Status"} $help[status] -
+
{@"Priority"} $help[priority] -
+
@@ -88,7 +88,7 @@ $header - $customfields[left] + <%- $customfields['left'] %>
@@ -129,21 +129,21 @@ $header
{@"Assignment"} $help[assignedto] -
+
{@"Resolution"} $help[resolution] -
+
{@"Severity"} $help[severity] -
+
@@ -162,7 +162,7 @@ $header - $customfields[right] + <%- $customfields['right'] %>
diff --git a/templates/search_results.tpl b/templates/search_results.tpl index 52ea77a..b5a762b 100644 --- a/templates/search_results.tpl +++ b/templates/search_results.tpl @@ -1,39 +1,39 @@ -$doctype - +<%- $doctype %> + -$headinclude - {bugdar::$options['trackertitle']} - {@"Search Results"} +<%- $headinclude %> + <%- bugdar::$options['trackertitle'] %> - {@"Search Results"} -$header +<%- $header %> - +
-$columnHeads +<%- $columnHeads %> -$bugs +<%- $bugs %>
-
-$pagenav +
+<%- $pagenav %>
-$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/search_save.tpl b/templates/search_save.tpl index acc09fd..5ce0709 100644 --- a/templates/search_save.tpl +++ b/templates/search_save.tpl @@ -1,25 +1,25 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Save Search"} + <%- bugdar::$options['trackertitle'] %> - {@"Save Search"} -$header +<%- $header %> -
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
- +
@@ -31,7 +31,7 @@ $header

-
{@"Name"}:
+
{@"Name"}:
diff --git a/templates/search_update.tpl b/templates/search_update.tpl index 0f8cf1b..8f0cded 100644 --- a/templates/search_update.tpl +++ b/templates/search_update.tpl @@ -1,21 +1,21 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Mass Update"} + <%- bugdar::$options['trackertitle'] %> - {@"Mass Update"} -$header +<%- $header %>

{@"Any fields left blank or unselected will not be changed."}

- +
@@ -24,25 +24,25 @@ $header
{@"Product / Version"} $help[product] -
+
{@"Status"} $help[status] -
+
{@"Priority"} $help[priority] -
+
- $customfields[left] + <%- $customfields['left'] %>
@@ -53,21 +53,21 @@ $header
{@"Assignment"} $help[assignedto] -
+
{@"Resolution"} $help[resolution] -
+
{@"Severity"} $help[severity] -
+
@@ -86,7 +86,7 @@ $header - $customfields[right] + <%- $customfields[right] %>
diff --git a/templates/selectoptgroup.tpl b/templates/selectoptgroup.tpl index ca21403..e576fc0 100644 --- a/templates/selectoptgroup.tpl +++ b/templates/selectoptgroup.tpl @@ -1,3 +1,3 @@ - -$optbits + +<%- $optbits %> \ No newline at end of file diff --git a/templates/selectoption.tpl b/templates/selectoption.tpl index 5ee431c..3f01a50 100644 --- a/templates/selectoption.tpl +++ b/templates/selectoption.tpl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/showreport.tpl b/templates/showreport.tpl index 967e4eb..bb15123 100644 --- a/templates/showreport.tpl +++ b/templates/showreport.tpl @@ -1,11 +1,11 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - <lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary_title] + <lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - <%- $bug['summary_title'] %> @@ -14,17 +14,17 @@ $header - +
-
+
{@"Bug Id"} $help[bugid]
- $bug[bugid] + <%- $bug['bugid'] %> / @@ -34,9 +34,9 @@ $header / {@"Hidden Bug"} - / [{@"Show Bug History"}] - / [$favoritetext] - / [{@"Delete"}] + / [{@"Show Bug History"}] + / [<%- $favoritetext %>] + / [{@"Delete"}]
@@ -44,14 +44,14 @@ $header
{@"Reporter"} $help[reporter] -
$bug[userinfo]
+
<%- $bug['userinfo'] %>
{@"Product/Version"} $help[product] -
$bug[product] / $bug[component] / $bug[version]
+
<%- $bug['product'] %> / <%- $bug['component'] %> / <%- $bug['version'] %>
@@ -60,9 +60,9 @@ $header {@"Status"} $help[status]
- + - $bug[status] + <%- $bug['status'] %>
@@ -73,9 +73,9 @@ $header {@"Severity"} $help[severity]
- + - $bug[severity] + <%- $bug['severity'] %>
@@ -86,31 +86,31 @@ $header {@"Duplicate Of"} $help[duplicateof]
- $bug[duplicateof]" /> - $duplicate[bugid] + <%- $bug['duplicateof'] %>" /> + <%- $duplicate['bugid'] %> - $duplicateof[summary]{@"- none -"} + <%- $duplicateof['summary'] %>{@"- none -"}
- $customfields[left] + <%- $customfields['left'] %>
-
+
{@"Summary"} $help[summary]
- + - $bug[summary] + <%- $bug['summary'] %>
@@ -119,7 +119,7 @@ $header
{@"Report Time"} $help[dateline] -
$bug[datetime]
+
<%- $bug['datetime'] %>
@@ -128,9 +128,9 @@ $header {@"Assignment"} $help[assignedto]
- + - $bug[assigninfo]{@"- none -"} + <%- $bug['assigninfo'] %>{@"- none -"}
@@ -141,9 +141,9 @@ $header {@"Resolution"} $help[resolution]
- + - $bug[resolution] + <%- $bug['resolution'] %>
@@ -154,9 +154,9 @@ $header {@"Priority"} $help[priority]
- + - $bug[priority] + <%- $bug['priority'] %>
@@ -167,15 +167,15 @@ $header {@"Dependencies"} $help[dependency]
- $dependencies + <%- $dependencies %> - $dependencies{@"- none -"} + <%- $dependencies %>{@"- none -"}
- $customfields[right] + <%- $customfields['right'] %>
@@ -188,7 +188,7 @@ $header
- {@"New Reply"} : {@"Automation"} $help[newreply] + {@"New Reply"} : {@"Automation"} $help[newreply] @@ -214,11 +214,11 @@ $header -
+
- {@"Attachments"} : {@"New"} + {@"Attachments"} : {@"New"} - $attachments + <%- $attachments %>
@@ -229,9 +229,9 @@ $header
{@"Votes"} -
{@"For"}: $vote[votefor] ($vote[forpercent]%)
-
{@"Against"}: $vote[voteagainst] ($vote[againstpercent]%)
-
{@"Total"}: $vote[total]
+
{@"For"}: <%- $vote['votefor'] %> (<%- $vote['forpercent'] %>%)
+
{@"Against"}: <%- $vote['voteagainst'] %> (<%- $vote['againstpercent'] %>%)
+
{@"Total"}: <%- $vote['total'] %>
@@ -244,7 +244,7 @@ $header - + {@"Vote For (+1)"}
{@"Vote Against (-1)"}
@@ -261,6 +261,6 @@ $header
-$comments +<%- $comments %> -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/showreport_attachment.tpl b/templates/showreport_attachment.tpl index de4a24c..0f912b3 100644 --- a/templates/showreport_attachment.tpl +++ b/templates/showreport_attachment.tpl @@ -1,6 +1,6 @@ diff --git a/templates/showreport_comment.tpl b/templates/showreport_comment.tpl index 4821074..f3efa29 100644 --- a/templates/showreport_comment.tpl +++ b/templates/showreport_comment.tpl @@ -1,26 +1,26 @@ - +
-
- $comment[posttime] - $comment[postby] +
+ <%- $comment['posttime'] %> + <%- $comment['postby'] %>
-
- $comment[comment_parsed] +
+ <%- $comment['comment_parsed'] %>
-
- - [{@"Delete"}] - [{@"Edit Comment"}] +
+ + [{@"Delete"}] + [{@"Edit Comment"}] {@"Hidden"}{@"Visible"}
- +
diff --git a/templates/std_error.tpl b/templates/std_error.tpl index ef99bd2..05c602b 100644 --- a/templates/std_error.tpl +++ b/templates/std_error.tpl @@ -1,23 +1,23 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"Error"} + <%- bugdar::$options['trackertitle'] %> - {@"Error"} -$header +<%- $header %>
-
{@"Error"}
+
{@"Error"}
-
- $error +
+ <%- $error %>
-$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/std_message.tpl b/templates/std_message.tpl index c797ccb..ebabb79 100644 --- a/templates/std_message.tpl +++ b/templates/std_message.tpl @@ -1,35 +1,35 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - <if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if> + <%- bugdar::$options['trackertitle'] %> - <if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if> -$header +<%- $header %> - - -$extra + + +<%- $extra %>
-
{@"Confirm"}{@"Notice"}
+
{@"Confirm"}{@"Notice"}
-
- $message +
+ <%- $message %>

- - + +
@@ -40,4 +40,4 @@ $extra -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl index 78b781e..b5c1b39 100644 --- a/templates/std_redirect.tpl +++ b/templates/std_redirect.tpl @@ -1,29 +1,29 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - - {bugdar::$options['trackertitle']} - {@"Redirect..."} + + <%- bugdar::$options['trackertitle'] %> - {@"Redirect..."} -$header +<%- $header %>
-
{@"Redirect..."}
+
{@"Redirect..."}
-
- $message +
+ <%- $message %>

- {@"If you are not redirected in a few seconds, click here."} + {@"If you are not redirected in a few seconds, click here."}
-$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/trackerhome.tpl b/templates/trackerhome.tpl index 505067e..3487efa 100644 --- a/templates/trackerhome.tpl +++ b/templates/trackerhome.tpl @@ -1,26 +1,26 @@ -$doctype - +<%- $doctype %> + -$headinclude - {bugdar::$options['trackertitle']} - {@"Bug Listing"} +<%- $headinclude %> + <%- bugdar::$options['trackertitle'] %> - {@"Bug Listing"} -$header +<%- $header %> - $columnHeads -$bugs + <%- $columnHeads %> +<%- $bugs %>
- +<% if ($show['pagenav']): %> -
-$pagenav +
+<%- $pagenav %>
- +<% endif %> -$footer \ No newline at end of file +<%- $footer %> \ No newline at end of file diff --git a/templates/trackerhome_bits.tpl b/templates/trackerhome_bits.tpl index fbf436e..bc14a39 100644 --- a/templates/trackerhome_bits.tpl +++ b/templates/trackerhome_bits.tpl @@ -1,6 +1,6 @@ - - style="background-color: $bug[bgcolor]; font-style: italic" class="$bug[bgcolor]" style="font-style: italic"> + + style="background-color: <%- $bug['bgcolor'] %>; font-style: italic" class="<%- $bug['bgcolor'] %>" style="font-style: italic"> $fields - + diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl index 5f1e2a1..bfc4786 100644 --- a/templates/userctrl.tpl +++ b/templates/userctrl.tpl @@ -1,23 +1,23 @@ -$doctype - +<%- $doctype %> + -$headinclude +<%- $headinclude %> - {bugdar::$options['trackertitle']} - {@"User Options"} + <%- bugdar::$options['trackertitle'] %> - {@"User Options"} -$header +<%- $header %>
-
+
{@"The following errors occurred"}: - {$message->errorBox} + <%- $message->errorBox %>
@@ -26,13 +26,13 @@ $header
-
{@"User Options"}
+
{@"User Options"}
{@"Display Name"} - +
@@ -50,12 +50,12 @@ $header
{@"Language"} - +
{@"Timezone"} - +
@@ -70,7 +70,7 @@ $header
-
{@"Email Options"}
+
{@"Email Options"}
@@ -84,58 +84,58 @@ $header - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + +
{@"New bug is added"}{@"New bug is added"} value="1" />
{@"I am made the assignee"}{@"I am made the assignee"} value="1" />
{@"Status or resolution changes"}{@"Status or resolution changes"} value="1" /> value="1" /> value="1" /> value="1" /> value="1" />
{@"'Duplicates' field is changed"}{@"'Duplicates' field is changed"} value="1" /> value="1" /> value="1" /> value="1" /> value="1" />
{@"A new comment is added"}{@"A new comment is added"} value="1" /> value="1" /> value="1" /> value="1" /> value="1" />
{@"A new attachment is added"} value="1" /> value="1" /> value="1" /> value="1" /> value="1" />
{@"Any other field changes"} value="1" /> value="1" /> value="1" /> value="1" /> value="1" />
@@ -147,10 +147,10 @@ $header
-
{@"Saved Searches"}
+
{@"Saved Searches"}
- $searches + <%- $searches %>
@@ -161,7 +161,7 @@ $header
-
+
{@"Please enter your password to change these fields"}:
@@ -183,12 +183,12 @@ $header
{@"Email"} - +
{@"Confirm Email"} - +
@@ -199,28 +199,28 @@ $header
-
{@"Bug List Display Options"}
+
{@"Bug List Display Options"}
{@"Hidden Statuses on Bug Listing"} - +
{@"Default Sort Order Column"} - $defaultsortkey + <%- $defaultsortkey %>
{@"Default Sort Order Direction"} - $defaultsortas + <%- $defaultsortas %>
{@"Bug List Columns"} $help[columnorder] - $columnOptions + <%- $columnOptions %>
diff --git a/templates/userctrl_column.tpl b/templates/userctrl_column.tpl index e769cf0..36f5e38 100644 --- a/templates/userctrl_column.tpl +++ b/templates/userctrl_column.tpl @@ -1,4 +1,4 @@ - $name: - + <%- $name %>: + \ No newline at end of file diff --git a/templates/userctrl_search.tpl b/templates/userctrl_search.tpl index aa7b50d..bee018d 100644 --- a/templates/userctrl_search.tpl +++ b/templates/userctrl_search.tpl @@ -1,7 +1,7 @@
- - [{@"Run Search"}] - [{@"Delete"}] + + [{@"Run Search"}] + [{@"Delete"}] - $search[name] + <%- $search['name'] %>
\ No newline at end of file diff --git a/templates/username_display.tpl b/templates/username_display.tpl index a42ef53..34d9cf6 100644 --- a/templates/username_display.tpl +++ b/templates/username_display.tpl @@ -1 +1 @@ -{@"User ID: %1$s"}">$userinfo[displayname]$userinfo[displayname] \ No newline at end of file +{@"User ID: %1$s"}"><%- $userinfo['displayname'] %><%- $userinfo['displayname'] %> \ No newline at end of file -- 2.22.5