From 1ca9b73832c1ca685fdba85f2be354e855bc0b5c Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Wed, 19 Nov 2008 08:31:45 -0500
Subject: Updated Bugs-Everywhere-Web to work with new architecture.

---
 Bugs-Everywhere-Web/beweb/templates/bugs.kid     | 2 +-
 Bugs-Everywhere-Web/beweb/templates/edit_bug.kid | 6 +++---
 Bugs-Everywhere-Web/beweb/templates/projects.kid | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Bugs-Everywhere-Web/beweb/templates')
diff --git a/Bugs-Everywhere-Web/beweb/templates/bugs.kid b/Bugs-Everywhere-Web/beweb/templates/bugs.kid
index 376e77b..198aa94 100644
--- a/Bugs-Everywhere-Web/beweb/templates/bugs.kid
+++ b/Bugs-Everywhere-Web/beweb/templates/bugs.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-from libbe.cmdutil import unique_name
+from libbe.names import unique_name
 from beweb.controllers import bug_url, project_url, bug_list_url
 from beweb.model import people_map
 people = people_map()
diff --git a/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid b/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid
index 34fcb99..276f610 100644
--- a/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid
+++ b/Bugs-Everywhere-Web/beweb/templates/edit_bug.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-from libbe.bugdir import severity_levels, active_status, inactive_status, thread_comments
+from libbe.bug import severity_values, status_values, thread_comments
 from libbe.utility import time_to_str 
 from beweb.controllers import bug_list_url, comment_url
 from beweb.formatting import comment_body_xhtml, select_among
@@ -20,14 +20,14 @@ people = people_map()
 <form method="post" action=".">
 <table>
 <tr><td>Status</td><td>Severity</td><td>Assigned To</td><td>Summary</td></tr>
-<tr><td>${select_among("status", active_status+inactive_status, bug.status)}</td><td>${select_among("severity", severity_levels, bug.severity)}</td>
+<tr><td>${select_among("status", status_values, bug.status)}</td><td>${select_among("severity", severity_values, bug.severity)}</td>
 <td>${select_among("assigned", people.keys()+[None], bug.assigned, people)}</td><td><input name="summary" value="${bug.summary}" size="80" /></td></tr>
 </table>
 <div py:def="show_comment(comment, children)" class="comment">
     <insetbox>
     <table>
         <tr><td>From</td><td>${comment.From}</td></tr>
-        <tr><td>Date</td><td>${time_to_str(comment.date)}</td></tr>
+        <tr><td>Date</td><td>${time_to_str(comment.time)}</td></tr>
     </table>
     <div py:content="comment_body_xhtml(comment)" py:strip="True"></div>
     <a href="${comment_url(project_id, bug.uuid, comment.uuid)}">Edit</a>
diff --git a/Bugs-Everywhere-Web/beweb/templates/projects.kid b/Bugs-Everywhere-Web/beweb/templates/projects.kid
index 09bde77..d5f9fd3 100644
--- a/Bugs-Everywhere-Web/beweb/templates/projects.kid
+++ b/Bugs-Everywhere-Web/beweb/templates/projects.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-from libbe.bugdir import severity_levels
+from libbe.bug import severity_values
 def select_among(name, options, default):
     output = ['<select name="%s">' % name]
     for option in options:
-- 
cgit 


From 0e57e0c247f7499f5d54e135d116c2a30a74146e Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Wed, 19 Nov 2008 12:02:23 -0500
Subject: Some more fixes to get BE-Web working with libbe changes.

---
 Bugs-Everywhere-Web/beweb/templates/edit_comment.kid | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Bugs-Everywhere-Web/beweb/templates')

diff --git a/Bugs-Everywhere-Web/beweb/templates/edit_comment.kid b/Bugs-Everywhere-Web/beweb/templates/edit_comment.kid
index 551db9d..2b522d4 100644
--- a/Bugs-Everywhere-Web/beweb/templates/edit_comment.kid
+++ b/Bugs-Everywhere-Web/beweb/templates/edit_comment.kid
@@ -1,6 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-from libbe.bugdir import severity_levels
 from libbe.utility import time_to_str 
 from beweb.controllers import bug_list_url, bug_url
 ?>
@@ -17,7 +16,7 @@ from beweb.controllers import bug_list_url, bug_url
 <form method="post">
 <table>
     <tr><td>From</td><td>${comment.From}</td></tr>
-    <tr><td>Date</td><td>${time_to_str(comment.date)}</td></tr>
+    <tr><td>Date</td><td>${time_to_str(comment.time)}</td></tr>
 </table>
 <insetbox><textarea rows="15" cols="80" py:content="comment.body" name="comment_body" style="border-style: none"/></insetbox>
 <p><input type="submit" name="action" value="Update"/></p>
-- 
cgit 


Status	Severity	Assigned To	Summary
${select_among("status", active_status+inactive_status, bug.status)}	${select_among("severity", severity_levels, bug.severity)}
${select_among("status", status_values, bug.status)}	${select_among("severity", severity_values, bug.severity)}	${select_among("assigned", people.keys()+[None], bug.assigned, people)}
From	${comment.From}
Date	${time_to_str(comment.date)}
Date	${time_to_str(comment.time)}