From 3765df8a5d32eadd0e19e9af108c3612066b5dd0 Mon Sep 17 00:00:00 2001 From: "robert%accettura.com" Date: Fri, 20 Jan 2006 05:05:25 +0000 Subject: [PATCH] Template changes weren't the ones I intended to land. Hopefully this fixes it. --- .../templates/{default => }/index.tpl | 0 .../templates/{default => }/login.tpl | 0 tools/reporter/templates/mozilla/index.tpl | 138 ------------------ tools/reporter/templates/mozilla/login.tpl | 26 ---- tools/reporter/templates/mozilla/query.tpl | 79 ---------- tools/reporter/templates/mozilla/report.tpl | 127 ---------------- tools/reporter/templates/mozilla/rss.tpl | 29 ---- tools/reporter/templates/mozilla/stats.tpl | 28 ---- .../templates/{default => }/query.tpl | 0 .../templates/{default => }/report.tpl | 0 .../templates/{default => }/stats.tpl | 0 11 files changed, 427 deletions(-) rename tools/reporter/templates/{default => }/index.tpl (100%) rename tools/reporter/templates/{default => }/login.tpl (100%) delete mode 100644 tools/reporter/templates/mozilla/index.tpl delete mode 100644 tools/reporter/templates/mozilla/login.tpl delete mode 100644 tools/reporter/templates/mozilla/query.tpl delete mode 100644 tools/reporter/templates/mozilla/report.tpl delete mode 100644 tools/reporter/templates/mozilla/rss.tpl delete mode 100644 tools/reporter/templates/mozilla/stats.tpl rename tools/reporter/templates/{default => }/query.tpl (100%) rename tools/reporter/templates/{default => }/report.tpl (100%) rename tools/reporter/templates/{default => }/stats.tpl (100%) diff --git a/tools/reporter/templates/default/index.tpl b/tools/reporter/templates/index.tpl similarity index 100% rename from tools/reporter/templates/default/index.tpl rename to tools/reporter/templates/index.tpl diff --git a/tools/reporter/templates/default/login.tpl b/tools/reporter/templates/login.tpl similarity index 100% rename from tools/reporter/templates/default/login.tpl rename to tools/reporter/templates/login.tpl diff --git a/tools/reporter/templates/mozilla/index.tpl b/tools/reporter/templates/mozilla/index.tpl deleted file mode 100644 index c8d612944b13..000000000000 --- a/tools/reporter/templates/mozilla/index.tpl +++ /dev/null @@ -1,138 +0,0 @@ -
- Look up Report -
-

- - - -

-
-
- - -
- Search for a Report -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Platform: - - - - -
-
-
-
-
-
- 		-
-
-
-
-
-
- -
-
Problem Type: -
- {html_radios name="report_problem_type" options=$problem_types selected=$report_problem_type separator="
"} -
Site requires login: - - - -
- -
- -
-
-
-{* -
- isLoggedIn()){ ?> - Welcome | Logout - - You are not logged in - -
-*} -

-
-

Wildcards

-

Description, Hostname, Useragent support wildcards.

-

% will search for 0+ characters, _ (underscore) is for a single character.

-
- diff --git a/tools/reporter/templates/mozilla/login.tpl b/tools/reporter/templates/mozilla/login.tpl deleted file mode 100644 index 86dc491ec384..000000000000 --- a/tools/reporter/templates/mozilla/login.tpl +++ /dev/null @@ -1,26 +0,0 @@ -
-
-
- Login - {if $error != ''} -

{$error}

- {/if} -
- - -
-
- - -
-
- -
-
-
-
-
-

If you need access to this system, contact Robert Accettura.

-

Login Access is only given in special circumstances.

-
-
\ No newline at end of file diff --git a/tools/reporter/templates/mozilla/query.tpl b/tools/reporter/templates/mozilla/query.tpl deleted file mode 100644 index c878b241d3fb..000000000000 --- a/tools/reporter/templates/mozilla/query.tpl +++ /dev/null @@ -1,79 +0,0 @@ -{if $error != ''} -
-

Error

-

{$error}. Back

-
-{else} -{if $notice != ''} -
-

Notice:

-

{$notice}

-
-{/if} - - - {section name=mysec loop=$column} - - {/section} - -{if $method == 'html'} - {section name=mysec2 loop=$row} - - {section name=col loop=$row[mysec2]} - - {/section} - - {/section} -{/if} -
{if $column[mysec].url != null}{/if}{$column[mysec].text}{if $column[mysec].url != null}{/if}
- {strip} - {if $row[mysec2][col].url != null} - - {/if} - {if $row[mysec2][col].col == 'report_url'} - {$row[mysec2][col].text|truncate:50} - {else} - {$row[mysec2][col].text|truncate:100} - {/if} - {if $row[mysec2][col].url != null} - - {/if} - {/strip} -
-{/if} - -{if $method == 'html'} - {if $count > $show} -
- {strip} - {if $page > 1} - < - {/if} - {/strip} - {section name=pageLoop start=$start loop=$start+$amt step=$step} - {strip}  {$smarty.section.pageLoop.index} - {/strip} - {/section} - {strip} - {if $page < $pages} -   > - {/if} - {/strip} - - {* - 
-            Count:    {$count}
-            Page:     {$page}
-            Show:     {$show}
-            Start:    {$start}
-            Max:      {$max}
-            TotPage:  {$pages}
-
- *} - -

Your query returned {$count} reports

-
- {/if} -{/if} \ No newline at end of file diff --git a/tools/reporter/templates/mozilla/report.tpl b/tools/reporter/templates/mozilla/report.tpl deleted file mode 100644 index f5397d3244c8..000000000000 --- a/tools/reporter/templates/mozilla/report.tpl +++ /dev/null @@ -1,127 +0,0 @@ -{if $error != ''} -
-

Error

-

{$error}. Back

-
-{else} -
-
Report RMO11301752363661
-
-
URL:
-
{$report_url|truncate:60}
-
-
-
Host:
-
Reports for {$host_hostname}
-
-
-
Problem Type:
-
{$report_problem_type}
-
-
-
Behind Login:
-
{$report_behind_login}
-
-
-
Product:
-
{$report_product}
-
-
-
Gecko Version:
-
{$report_gecko}
-
-
-
Platform:
-
{$report_platform}
-
-
-
OS/CPU:
-
{$report_oscpu}
-
-
-
Language:
-
{$report_language}
-
-
-
User Agent:
-
{$report_useragent}
-
-
-
Build Config:
-
{$report_buildconfig}
-
-{if $is_admin == true} -
-
Email:
-
{$report_email}  {*this space at the end fixes some formatting issues with no text in this optional field *}
-
-
-
IP Address:
-
{$report_ip}  {*this space at the end fixes some formatting issues with no text in this optional field *}
-
-{/if} -
-
Description:
-
{$report_description}  {*this space at the end fixes some formatting issues with no text in this optional field *}
-
-
-

- {if $showReportNavigation == true} - Report List ({$index+1} of {$total}):   - {strip} - {if $first_report != 'disable'} - - {/if} - First - {if $first_report != 'disable'} - - {/if} - {/strip} - - | - - {strip} - {if $previous_report != 'disable'} - - {/if} - Previous - {if $previous_report != 'disable'} - - {/if} - {/strip} - - | - - {strip} - {if $next_report != 'disable'} - - {/if} - Next - {if $next_report != 'disable'} - - {/if} - {/strip} - - | - - {strip} - {if $last_report != 'disable'} - - {/if} - Last - {if $last_report != 'disable'} - - {/if} - {/strip} - {/if} - - | - Back To List - - | - New Search -

-
-
-{/if} - diff --git a/tools/reporter/templates/mozilla/rss.tpl b/tools/reporter/templates/mozilla/rss.tpl deleted file mode 100644 index 112ff75662c3..000000000000 --- a/tools/reporter/templates/mozilla/rss.tpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - {$title} - {$url} - {description} - Mon, 16 Jan 2006 15:59:06 +0000 - Mozilla Reporter - - en - - {section name=mysec2 loop=$row} - - {$row[mysec2][report_id]} - {$row[mysec2][report_url]}/ - {$row[mysec2][report_file_date]} - {$row[mysec2][report_type]} - {$row[mysec2][report_url]} - - - {/section} - - diff --git a/tools/reporter/templates/mozilla/stats.tpl b/tools/reporter/templates/mozilla/stats.tpl deleted file mode 100644 index 2f95c7b21a7d..000000000000 --- a/tools/reporter/templates/mozilla/stats.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-
Statistics
-
-
Unique Users:
-
{$users_quant}
-
-
-
Total Reports:
-
{$reports_quant}
-
-
-
Reports/User:
-
{$avgRepPerUsr}
-
-
-
Hostnames:
-
{$hosts_quant}
-
-
-
Reports (24hr):
-
{$reports24}
-
-
-
Reports (7d):
-
{$last7days}
-
-
-
\ No newline at end of file diff --git a/tools/reporter/templates/default/query.tpl b/tools/reporter/templates/query.tpl similarity index 100% rename from tools/reporter/templates/default/query.tpl rename to tools/reporter/templates/query.tpl diff --git a/tools/reporter/templates/default/report.tpl b/tools/reporter/templates/report.tpl similarity index 100% rename from tools/reporter/templates/default/report.tpl rename to tools/reporter/templates/report.tpl diff --git a/tools/reporter/templates/default/stats.tpl b/tools/reporter/templates/stats.tpl similarity index 100% rename from tools/reporter/templates/default/stats.tpl rename to tools/reporter/templates/stats.tpl