Changeset 1:4d91cbed8dad

Timestamp:

07/03/08 19:50:28 (21 months ago)

Author:

Dimitris Glezos <dimitris@…>

Branch:

default

Message:

Added search, tags and fixed tab spacing according to PEP 8

Files:

• projects/models.py (modified) (1 diff)
• projects/urls.py (modified) (1 diff)
• projects/views.py (modified) (1 diff)
• site_media/css/base.css (modified) (6 diffs)
• site_media/css/icons.css (modified) (1 diff)
• site_media/images/icons/add.png (added)
• site_media/images/icons/lightbulb.png (added)
• site_media/images/icons/tag_blue.png (added)
• templates/base.html (modified) (3 diffs)
• templates/index.html (modified) (1 diff)
• templates/projects/project_detail.html (modified) (2 diffs)
• templates/projects/project_list.html (modified) (1 diff)
• templates/search.html (added)
• views.py (modified) (1 diff)

projects/models.py

@@ -1 +1 @@
 from django.db import models
 from django.db.models import permalink
+import tagging
+from tagging.fields import TagField
+from tagging.models import Tag
+
 
 class Project(models.Model):
-  """ A project is a resource holding some content """
-  name = models.CharField(max_length=255)
-  description = models.CharField(max_length=255)
-  long_description = models.TextField(null=True, max_length=1000)
-  slug = models.SlugField(prepopulate_from=("name",), unique=True)
+    """ A project is a resource holding some content """
+    name = models.CharField(max_length=255)
+    description = models.CharField(max_length=255)
+    long_description = models.TextField(null=True, max_length=1000)
+    slug = models.SlugField(prepopulate_from=("name",), unique=True)
 
-  homepage = models.CharField(blank=True, max_length=255)
-  feed = models.CharField(blank=True, max_length=255)
+    homepage = models.CharField(blank=True, max_length=255)
+    feed = models.CharField(blank=True, max_length=255)
+      
+    repository = models.CharField(blank=True, max_length=255)
+    repository_type = models.CharField(blank=True, max_length=10)
+    repository_web = models.CharField(blank=True, null=True, max_length=255)
+    branches = models.CharField(blank=True, max_length=255)
+    report_bugs = models.CharField(blank=True, max_length=255)
+    added = models.DateField(blank=True, null=True)
+    last_updated = models.DateField(blank=True, null=True)
+    tags = TagField()
+    
+    class Meta:
+        ordering = ('name',)
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return u'%s' % self.full_name
   
-  repository = models.CharField(blank=True, max_length=255)
-  repository_type = models.CharField(blank=True, max_length=10)
-  repository_web = models.CharField(blank=True, null=True, max_length=255)
-  branches = models.CharField(blank=True, max_length=255)
-  report_bugs = models.CharField(blank=True, max_length=255)
-  added = models.DateField(blank=True, null=True)
-  last_updated = models.DateField(blank=True, null=True)
+    @property
+    def full_name(self):
+        return u'%s' % (self.name)
   
-  class Meta:
-    ordering = ('name',)
+    @permalink
+    def get_absolute_url(self):
+        return ('project_detail', None, { 'slug': self.slug })
 
-  class Admin:
-    pass
+    def set_tags(self, tags):
+        Tag.objects.update_tags(self, tags)
 
-  def __unicode__(self):
-    return u'%s' % self.full_name
-  
-  @property
-  def full_name(self):
-    return u'%s' % (self.name)
-  
-  @permalink
-  def get_absolute_url(self):
-    return ('project_detail', None, { 'slug': self.slug })
+    def get_tags(self):
+        return Tag.objects.get_for_object(self)
+    
+# Tagging
+
+tagging.register(Project)

projects/urls.py

@@ -4 +4 @@
 
 project_list = {
-  'queryset': Project.objects.all(),
+    'queryset': Project.objects.all(),
 }
 
 
 urlpatterns = patterns('',
-  url(
-    regex   = '^(?P<slug>[-\w]+)/$',
-    view    = 'django.views.generic.list_detail.object_detail',
-    kwargs  = project_list,
-    name    = 'project_detail',
-  ),
-  url (
-    regex   = '^$',
-    view    = 'django.views.generic.list_detail.object_list',
-    kwargs  = project_list,
-    name    = 'project_list',
-  ),
+    url(
+        regex = '^(?P<slug>[-\w]+)/$',
+        view = 'django.views.generic.list_detail.object_detail',
+        kwargs = project_list,
+        name = 'project_detail',
+        ),
+     url (
+       regex = '^(?P<slug>[-\w]+)/add$',
+       view = 'django.views.generic.create_update.create_object',
+       kwargs = project_list,
+       name = 'project_add',
+     ),
+     url (
+       regex = '^$',
+       view = 'django.views.generic.list_detail.object_list',
+       kwargs = project_list,
+       name = 'project_list',
+     ),
 )
 

projects/views.py

@@ -1 @@
-# Create your views here.
+from django.newforms import ModelForm
+from models import Project
+
+class ProjectForm(ModelForm):
+    class Meta:
+        model = Project

site_media/css/base.css

@@ -50 +50 @@
 /* Content */
 
+div#breadcrumbs {
+  margin: 1em 3em;
+}
+
 div#content-all {
   background-color: #ebf2f8;
@@ -68 +72 @@
 
 div.content-main {
+  clear: both;
   background-color: white;
   -moz-border-radius: 5px;
@@ -87 +92 @@
 /* Projects */
 
+div.content_head_sec {
+  float:right;
+  margin: 0 2em 0.5em 0; 
+}
+
 div.project_list div.project_info {
   border-bottom: 3px solid #eee;
@@ -95 +105 @@
 }
 
-div.project_list h3.name {
+div.project_list h3.name,
+div.project_list h4.name {
   font-weight: normal;
   font-size: 140%;
@@ -105 +116 @@
 }
 
-div.project_list h3,
-div.project_details h3 {
+div.content-main h3 {
   color: #b65d0e;
 }
@@ -133 +143 @@
 }
 
+/* Search */
+
+div.searchform.content_head_prim {
+  margin-left: 3em;
+}
+
+div.searchform label {
+  font-size: 90%;
+  font-color: gray;
+  margin-left: 0.5em;
+}
+
+div.searchform input.query {
+  height: 1.2em;
+  font-size: 1.2em;
+  padding-left: 0.5em;
+}
+
+div.searchform input.submit {
+  border-color: #4f87bd;
+  height: 1.5em;
+}
+
 /* Other elements */
 

site_media/css/icons.css

@@ -22 +22 @@
 /* Various icons */
 
+.i16.add { background-image: url('../images/icons/add.png'); }
 .i16.branch { background-image: url('../images/icons/arrow_branch.png'); }
 .i16.homepage { background-image: url('../images/icons/house.png'); }
+.i16.idea { background-image: url('../images/icons/lightbulb.png'); }
 .i16.language { background-image: url('../images/icons/comment.png'); }
+.i16.link { background-image: url('../images/icons/world_link.png'); }
 .i16.repository { background-image: url('../images/icons/drive_network.png'); }
-.i16.link { background-image: url('../images/icons/world_link.png'); }
+.i16.tag { background-image: url('../images/icons/tag_blue.png'); }

templates/base.html

@@ -5 +5 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <title>{% block title %}{% endblock %}</title>
-        {# FIXME: decouple from /site_media #}
-    <link media="screen" href="{{ MEDIA_URL }}/css/base.css" type="text/css" rel="stylesheet" />
+        <title>{% block title %}Transifex{% endblock %}</title>
+    <link media="screen" href="/site_media/css/base.css" type="text/css" rel="stylesheet" />
     <link media="screen" href="/site_media/css/icons.css" type="text/css" rel="stylesheet" />
     <meta content="text/html; charset=utf-8" http-equiv="content-type" />
@@ -16 +15 @@
     <div id="header">
       <div id="logo">
-        <img src="/site_media/images/tx-logo.png" alt="Transifex logo" />
+        <a href="{% url home %}"><img border="0" src="/site_media/images/tx-logo.png" alt="Transifex logo" /></a>
       </div>
       <div id="navmenu">
         <a href="{% url project_list %}">Projects</a>
+        | <a href="{% url search %}">Search</a>
       </div>
       {% comment %}
@@ -35 +35 @@
     <div id="content-all">
     {% block body %}
+      <div id="breadcrumbs">
+        {% block breadcrumb %}{% endblock %}
+      </div>
       <div>
         {% block content_title %}{% endblock %}
       </div>
+     <div class="content-header">
+        {% block content-header %}{% endblock %}
+     </div>
      <div class="content-main">
         {% block content %}{% endblock %}

templates/index.html

@@ -9 +9 @@
 
 {% block content %}
-  <p>Please visit the <a href="{% url project_list %}">Project list</a> page. </p>
 {% endblock %}

templates/projects/project_detail.html

@@ -1 @@
-{% extends "projects/base_projects.html" %}
+{% extends "projects/base.html" %}
 
+{% block title %}{{ block.super }} | {{ object.full_name }}{% endblock %}
 
-{% block title %}{{ object.full_title }}{% endblock %}
-
+{% block breadcrumb %}{{ block.super }} » {{ object.name }}{% endblock %}
 
 {% block content %}
@@ -43 +43 @@
         {% endif %}
         <tr>
+          <th class="i16 tag">Tags:</th>
+          <td>{% for tag in object.get_tags %}{{tag}} {%endfor%}</td>
+        </tr>
+        <tr>
           <th class="i16 link">External resources:</th>
           <td><ul>

templates/projects/project_list.html

@@ -1 @@
-{% extends "projects/base_projects.html" %}
-
-
-{% block title %}Projects{% endblock %}
-
+{% extends "projects/base.html" %}
 
 {% block content_title %}
-  <h2 class="pagetitle">Find a project</h2>
+  <h2 class="pagetitle">Projects on Transifex</h2>
 {% endblock %}
 
+{% block content-header %}
+<div class="addproject content_head_sec">
+  <span class="i16 add"><a href="{% url add_project %}">Add a new project</a></span>
+</div>
+{% endblock %}
   
 {% block content %}

views.py

@@ +1 @@
+from django.db.models import Q
+from django.shortcuts import render_to_response
+from txc.projects.models import Project
+
+def search(request):
+    query = request.GET.get('q', '')
+    if query:
+        qset = (
+            Q(name__icontains=query)
+            | Q(description__icontains=query)
+#            | Q(tags__last_name__icontains=query)
+        )
+        results = Project.objects.filter(qset).distinct()
+    else:
+        results = []
+    return render_to_response("search.html", {
+        "results": results,
+        "query": query
+    })