Changeset 75617ad


Ignore:
Timestamp:
06/24/11 18:43:07 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video
Children:
d4c2dd3, 37137fd
Parents:
2a5709c
git-author:
yomguy <yomguy@…> (06/24/11 18:43:07)
git-committer:
yomguy <yomguy@…> (06/24/11 18:43:07)
Message:

100 of last revisions in RSS, fix save buttons for item, remove TELEMETA_OAI_HOST_NAME global parameter, add TELEMETA_DESCRIPTION and parsing it to each page title

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • INSTALL.rst

    r3842ea4 r75617ad  
    167167    TELEMETA_ORGANIZATION =         name of the organization which hosts this installation 
    168168    TELEMETA_SUBJECTS =             tuple of subject keywords (used for Dublin Core), such as "Ethnology", etc... 
     169    TELEMETA_DESCRIPTION =          the description of the site 
    169170    TELEMETA_CACHE_DIR =            absolute path to the cache directory that you just created 
    170171    TELEMETA_GMAP_KEY =             your Google Map API key 
    … …  
    174175    EMAIL_HOST =                    your default SMTP server 
    175176    DEFAULT_FROM_EMAIL =            the default sending email address  
    176     TELEMETA_OAI_REPOSITORY_NAME =  the description of the OAI data provider 
    177177     
    178178Just paste the lines below:: 

  • example/sandbox/settings.py

    rb21dbf0 r75617ad  
    111111TELEMETA_ORGANIZATION = 'Parisson' 
    112112TELEMETA_SUBJECTS = ('test', 'telemeta', 'sandbox') 
     113TELEMETA_DESCRIPTION = "Telemeta TEST sandbox" 
    113114TELEMETA_GMAP_KEY = '***************************************************************************' 
    114115TELEMETA_DOWNLOAD_ENABLED = True 
    … …  
    116117TELEMETA_PUBLIC_ACCESS_PERIOD = 51 
    117118AUTH_PROFILE_MODULE = 'telemeta.userprofile' 
    118  
    119 TELEMETA_OAI_REPOSITORY_NAME = "Telemeta TEST sandbox" 
    120119 
    121120LOGIN_URL = '/login' 

  • telemeta/templates/telemeta_default/base.html

    rd0a44c8 r75617ad  
    88<head> 
    99<meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> 
    10 <title>{%block head_title %}{% organization %} - Telemeta{% endblock %}</title> 
     10<title>{%block head_title %}{% organization %} - Telemeta - {% description %}{% endblock %}</title> 
    1111 
    1212{% block stylesheets %} 

  • telemeta/templates/telemeta_default/collection_add.html

    r83c03be r75617ad  
    2525        {% endfor %} 
    2626        </table> 
    27         <div align="center"> 
     27        <div align="center" style="margin-top:3ex;"> 
    2828            <a href="{% url telemeta-collections %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 
    2929            <a href="#" class="component_icon button icon_save" 

  • telemeta/templates/telemeta_default/collection_edit.html

    r83c03be r75617ad  
    2424       {% endfor %} 
    2525       </table> 
    26         <div align="center"> 
     26        <div align="center" style="margin-top:3ex;"> 
    2727         <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 
    2828         <a href="#" class="component_icon button icon_save" 

  • telemeta/templates/telemeta_default/mediaitem_add.html

    r83c03be r75617ad  
    3232       {% endfor %} 
    3333       </table> 
    34        <div align="center"> 
     34       <div align="center" style="margin-top:3ex;"> 
    3535        <a href="{% url telemeta-items %}" 
    3636           class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 

  • telemeta/templates/telemeta_default/mediaitem_copy.html

    r83c03be r75617ad  
    4040       {% endfor %} 
    4141       </table> 
    42        <div align="center"> 
     42       <div align="center" style="margin-top:3ex;"> 
    4343           <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 
    4444         <a href="#" class="component_icon button icon_save" 

  • telemeta/templates/telemeta_default/mediaitem_edit.html

    r83c03be r75617ad  
    3838    {% endfor %} 
    3939    </table> 
    40     <div align="center"> 
     40    <div align="center" style="margin-top:3ex;"> 
    4141    <a href="{% url telemeta-item-detail item.public_id %}" 
    4242        class="component_icon button icon_cancel">{% trans "Cancel" %}</a> 

  • telemeta/templatetags/telemeta_utils.py

    rea7656e r75617ad  
    269269    return settings.TELEMETA_ORGANIZATION 
    270270 
     271@register.simple_tag 
     272def description(): 
     273    try: 
     274        description = settings.TELEMETA_OAI_REPOSITORY_NAME 
     275    except: 
     276        description = settings.TELEMETA_DESCRIPTION 
     277        pass 
     278    return description 
     279 
    271280class SetVarNode(template.Node): 
    272281  

  • telemeta/web/base.py

    ra0b0f45 r75617ad  
    11971197 
    11981198 
    1199  
    12001199class LastestRevisionsFeed(Feed): 
    12011200    "the RSS feed of the lastest revisions" 
    … …  
    12071206    link = "" 
    12081207    description = ' '.join([subject.decode('utf-8') for subject in subjects]) 
     1208    n_items = 100 
    12091209 
    12101210    def items(self): 
    1211         return get_revisions(25) 
     1211        return get_revisions(self.n_items) 
    12121212 
    12131213    def item_title(self, r): 
Note: See TracChangeset for help on using the changeset viewer.