Changeset 57f8ffa


Ignore:
Timestamp:
May 16, 2010, 2:44:43 AM (16 years ago)
Author:
Alex Dehnert <adehnert@…>
Branches:
master, fysm-4-1, iframe, space-access, stable, stage, test-hooks
Children:
a426f62
Parents:
1c853ea
git-author:
Alex Dehnert <adehnert@…> (05/16/10 02:44:43)
git-committer:
Alex Dehnert <adehnert@…> (05/16/10 02:44:43)
Message:

Add tag support (as not seen in c27da9e)

Location:
asadb
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • asadb/forms/models.py

    r1c853ea r57f8ffa  
    1414    description = models.TextField(help_text="Explain in about three or four sentences what your group does and why incoming freshmen should get involved.")
    1515    logo = models.ImageField(upload_to='fysm/logos', blank=True, )
    16     categories = models.ManyToManyField('FYSMCategory', blank=True, )
     16    tags = models.CharField(max_length=100, blank=True, help_text="Specify some free-form, comma-delimited tags for your group", )
     17    categories = models.ManyToManyField('FYSMCategory', blank=True, help_text="Put your group into whichever of our categories seem applicable.", )
    1718
    1819    class Meta:

  • asadb/forms/views.py

    rc27da9e r57f8ffa  
    9595            'description',
    9696            'logo',
     97            'tags',
    9798            'categories',
    9899        )

  • asadb/media/style/style.css

    r80194d8 r57f8ffa  
    137137}
    138138
     139.single-fysm-entry .fysm-body
     140{
     141    margin-bottom: 10px;
     142}
     143
    139144.single-fysm-entry .tags
    140145{
    141     margin: 10px 0px 0px;
    142146    background: #ddd;
    143147    border-top: 1px solid #666;
    144148    padding: 4px;
     149    margin: 0px;
    145150    text-align: center;
    146151    font-size: smaller;

  • asadb/template/fysm/fysm_listing.html

    r1c853ea r57f8ffa  
    2323<div class='single-fysm-entry'>
    2424    <h3><a href='{{fysm.website}}'>{{fysm.display_name}}</a></h3>
     25    <div class='fysm-body'>
    2526    <div class='logo'>
    2627        {% if fysm.logo %}
    … …  
    3233    <p class='data'>{{fysm.description}}</p>
    3334    <p class='join'><a href='{{fysm.join_url}}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
     35    </div>
     36    {% if fysm.tags %}
     37    <p class='tags'>tags: {{fysm.tags}}</p>
     38    {% endif %}
    3439    {% if fysm.categories.all %}
    3540    <p class='tags'>categories: {{fysm|format_categories:year}}</p>

  • asadb/template/fysm/update_email.txt

    rc27da9e r57f8ffa  
    1010Join URL:       {{fysm.join_url}}
    1111Contact email:  {{fysm.contact_email}}
     12Logo filename:  {{fysm.logo}}
     13Tags:           {{fysm.tags}}
    1214Categories:     {{fysm.categories.all}}
    1315
Note: See TracChangeset for help on using the changeset viewer.