Mercurial > hg > bts-webui

changeset 22:5d3a35a1234b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added simple search capabilities Made "Search" the default page
author marga
date Sat, 04 Aug 2007 23:20:20 +0000
parents 60c62b3f6403
children 022d55f2a0d0
files bts_webui/amancay/bts_queries.py bts_webui/amancay/static/amancay.css bts_webui/amancay/static/amancay_interface.js bts_webui/amancay/templates/base.html bts_webui/amancay/urls.py
diffstat 5 files changed, 69 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/bts_webui/amancay/bts_queries.py
+++ b/bts_webui/amancay/bts_queries.py
@@ -31,6 +31,9 @@
 #server.config.dumpSOAPOut = 1
 #server.config.dumpSOAPIn = 1
 
+# Import sets, for uniting lists of bugs
+from sets import Set
+
 class soap_queries(bts_queries):
 	def __init__(self):
 		self.url = 'http://bugs.debian.org/cgi-bin/soap.cgi'
@@ -59,6 +62,14 @@
 		result = self.server.get_bugs("maint",emails)
 		return result
 	
+	def get_all_packages_bugs(self, packages):
+		pkg = self.server.get_bugs("package",packages)
+		src = self.server.get_bugs("src",packages)
+		# Unite this, and return the union.
+		result = Set(pkg)
+		result.update(src)
+		return list(result)
+	
 	def get_bug_log(self, bug):
 		result = self.server.get_bug_log(bug)
 		return result
--- a/bts_webui/amancay/static/amancay.css
+++ b/bts_webui/amancay/static/amancay.css
@@ -234,13 +234,14 @@
 }
 
 div.main { 
-	position: absolute;
+/*	position: absolute;*/
 /*	float: right;
 	clear: both;*/
 	width: auto;
 	height: auto; 
-	top: 2em;
-	left: 12em;
+	margin-top: 2em;
+	margin-left: 12em;
+	margin-right: 0.5em;
 }
 
 div.footer
@@ -293,7 +294,7 @@
 border-collapse: collapse;
 font-family: sans-serif;
 font-size: small;
-/*width: 98%;*/
+width: 100%;
 }
 
 table.bugs th {
@@ -452,7 +453,51 @@
 	padding: 0.4em;
 }
 
-
+/* Search */
+div.search_form {
+	width: 100%;
+	margin-bottom: 0.5em;
+}
+fieldset.search_form {
+	margin: 0.2em 0 0 0;  
+	padding: 0.2em; 
+}
+legend.search_title {
+	font-size: normal;
+	font-weight: bold;
+	color: #4ea385;
+	padding-right: 1em;
+	padding-left: 1em;
+}
+ol.search_form {
+	margin-bottom: 0.5em;
+	margin-left: 1em;
+	margin-right: 1em;
+	margin-top: 0.3em;
+	padding: 0;  
+	list-style: none; 
+}
+ol.search_form li {
+	padding-right: 0.5em;
+	display: inline;
+	margin: 0;
+	white-space: nowrap;
+	font-size: small;
+}
+input.search_field {
+	color: #4ea385;
+	font-size: small;
+	font-weight: bold;
+	background: #defcf4;
+	border: 1px solid #4ea385;
+	width: 25em;
+	padding-left: 0.2em;
+}
+input.submit_search {
+	color: #000;
+	background: rgb(135,202,214);
+	border: 2px outset #d7b9c9
+}
 
 /* Registration */
 div.account_form {
--- a/bts_webui/amancay/static/amancay_interface.js
+++ b/bts_webui/amancay/static/amancay_interface.js
@@ -144,10 +144,10 @@
 	load_toolbox("/tagged_bugs_toolbox/");
 	load_bugs(evt,"/tagged_bugs_table/");
 }
-function get_search_form(evt) {
+/*function get_search_form(evt) {
 	load_toolbox("/search_form_toolbox/");
 	load_bugs(evt,"/search_form/");
-}
+}*/
 
 function toolboxConnect() {
 	var item_add = document.getElementById("add_item");
@@ -176,8 +176,8 @@
 	link = document.getElementById("tagged_bugs_link");
     MochiKit.Signal.connect( link, 'onclick', get_tagged_bugs );
 
-	link = document.getElementById("search_link");
-    MochiKit.Signal.connect( link, 'onclick', get_search_form );
+	/*link = document.getElementById("search_link");
+    MochiKit.Signal.connect( link, 'onclick', get_search_form );*/
 }
 
 /*connect our event handlers right off*/
--- a/bts_webui/amancay/templates/base.html
+++ b/bts_webui/amancay/templates/base.html
@@ -44,12 +44,12 @@
 		{% block sidebar %}
 		<h3 class="sidebar_title">Bugs</h3>
 		<ul>
+			<li><a id="search_link" href="/search">Search</a></li>
 			<li><a id="selected_bugs_link" href="/selected_bugs">Selected</a></li>
 			<li><a id="tagged_bugs_link" href="/tagged_bugs">Tagged</a></li>
 			<li><a id="submitted_bugs_link" href="/submitted_bugs">Latest Submitted</a></li>
 			<li><a id="received_bugs_link" href="/received_bugs">Latest Received</a></li>
 			<li><a id="package_bugs_link" href="/package_bugs">Selected Packages</a></li>
-			<li><a id="search_link" href="/search">Search</a></li>
 		</ul>
 		{% endblock %}
 		</div>
--- a/bts_webui/amancay/urls.py
+++ b/bts_webui/amancay/urls.py
@@ -3,8 +3,8 @@
 urlpatterns = patterns('',
 
 	# Normal pages
-	(r'^$', 'bts_webui.amancay.views.index',),
-	(r'^index', 'bts_webui.amancay.views.index',),
+	(r'^$', 'bts_webui.amancay.search.search',),
+	(r'^index', 'bts_webui.amancay.search.search',),
 
 	# Toolboxes
 	(r'toolbox', 'bts_webui.amancay.toolbox.render_toolbox',),
@@ -15,7 +15,7 @@
 	(r'^package_bugs', 'bts_webui.amancay.tables.package_bugs',),
 	(r'^selected_bugs', 'bts_webui.amancay.tables.selected_bugs',),
 	(r'^tagged_bugs', 'bts_webui.amancay.tables.tagged_bugs',),
-	(r'^search', 'bts_webui.amancay.forms.search',),
+	(r'^search', 'bts_webui.amancay.search.search',),
 
 	# Inside pages
 	(r'^package/(?P<package_name>\w+)', 'bts_webui.amancay.views.package',),