Django

Code

Changeset 8468

Show
Ignore:
Timestamp:
08/22/08 14:20:07 (3 months ago)
Author:
jacob
Message:

[djangoproject.com] Various template tweaks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • djangoproject.com/djangodocs/settings.py

    r8453 r8468  
    55TEMPLATE_DIRS = [os.path.join(os.path.dirname(__file__), "templates")] + TEMPLATE_DIRS 
    66ROOT_URLCONF = 'djangodocs.urls' 
     7CACHE_MIDDLEWARE_KEY_PREFIX = 'djangodocs' 
    78 
    89if DEVELOPMENT_MODE: 
  • djangoproject.com/django_website/apps/contact/forms.py

    r7899 r8468  
    1212 
    1313    def message(self): 
    14         body = "\n".join(textwrap.wrap(self.cleaned_data["body"], 76)) 
    15         return "From: %s <%s>\n\n%s" % (self.cleaned_data["name"], self.cleaned_data["email"], body) 
     14        return "From: %(name)s <%(email)s>\n\n%(body)s" % self.cleaned_data 
    1615 
    1716class FoundationContactForm(BaseContactForm): 
  • djangoproject.com/django_website/templates/base_foundation.html

    r7895 r8468  
    33{% block content-related %} 
    44<h2>Support Django</h2> 
    5 <script type="text/javascript">  
    6 function validateAmount(amount){ 
    7         if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ 
    8                 return true; 
    9         }else{ 
    10                 alert('You must enter a valid donation.'); 
    11                 amount.focus(); 
    12                 return false; 
    13         } 
    14 
    15 </script> 
    16 <form action="https://checkout.google.com/cws/v2/Donations/404630304217012/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)"> 
    17     <input name="item_name_1" type="hidden" value="Support the Django Software Foundation!"/> 
    18     <input name="item_description_1" type="hidden" value="Thanks for your help! Your money will directly support the development of Django by sponsoring developer meetings, user conferences, and other community activities."/> 
    19     <input name="item_quantity_1" type="hidden" value="1"/> 
    20     <input name="item_currency_1" type="hidden" value="USD"/> 
    21     <input name="item_is_modifiable_1" type="hidden" value="true"/> 
    22     <input name="item_min_price_1" type="hidden" value="0.0"/> 
    23     <input name="item_max_price_1" type="hidden" value="25000.0"/> 
    24     <input name="_charset_" type="hidden" value="utf-8"/> 
    25     <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="20.00"/> 
    26     <input type="submit" name="submit" value="Donate" id="submit"> 
    27 </form> 
     5<p> 
     6  <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> 
     7    <input type="hidden" name="cmd" value="_donations"> 
     8    <input type="hidden" name="business" value="jacob@djangoproject.com"> 
     9    <input type="hidden" name="item_name" value="Django Software Foundation"> 
     10    <input type="hidden" name="item_number" value="donation"> 
     11    <input type="hidden" name="no_shipping" value="1"> 
     12    <input type="hidden" name="return" value="http://www.djangoproject.com/foundation/donate/thanks/"> 
     13    <input type="hidden" name="cancel_return" value="http://www.djangoproject.com/foundation/donate/"> 
     14    <input type="hidden" name="no_note" value="1"> 
     15    <input type="hidden" name="currency_code" value="USD"> 
     16    <input type="hidden" name="tax" value="0"> 
     17    <input type="hidden" name="lc" value="US"> 
     18    <input type="hidden" name="bn" value="PP-DonationsBF"> 
     19    <label for="amount" style="font-size: 14px;">$</label> <input type="text" name="amount" value="25.00" size="5" style="font-size: 14px; margin-right: 4px;"> 
     20    <input type="image" align="top" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> 
     21    <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"> 
     22  </form> 
     23</p> 
    2824 
    29 <h3>Questions?</h3> 
    3025<p>Read more about <a href="/foundation/donate/">donating to the DSF</a>. 
    3126   
    3227<h2>Licensing &amp; Trademarks</h2>   
    3328<ul> 
    34   <li>Django licensing policies</li> 
    35   <li>Contributor license agreements</li> 
     29  <li><a href="/foundation/cla/">Contributor license agreements</a></li> 
    3630</ul> 
    3731 
    3832<h2>About the foundation</h2> 
    3933<ul> 
    40   <li>FAQ</li> 
    41   <li>Records</li> 
    42   <li>Board meeting minutes</li> 
    43   <li>Board resolutions</li> 
     34  <li><a href="/foundation/faq/">FAQ</a></li> 
     35  <li><a href="/foundation/records">Records</a></li> 
     36  <li><a href="/contact/foundation/">Contact us</a></li> 
    4437</ul> 
    4538{% endblock %} 
  • djangoproject.com/django_website/templates/base.html

    r7892 r8468  
    2727                        <h1 id="logo"><a href="/"><img src="http://media.djangoproject.com/img/site/hdr_logo.gif" alt="Django" /></a></h1> 
    2828                        <ul id="nav-global"> 
    29                                 <li id="nav-homepage"><a href="/">Home</a></li> 
    30                                 <li id="nav-download"><a href="/download/">Download</a></li> 
    31                                 <li id="nav-documentation"><a href="/documentation/">Documentation</a></li> 
    32                                 <li id="nav-weblog"><a href="/weblog/">Weblog</a></li> 
    33                                 <li id="nav-community"><a href="/community/">Community</a></li> 
     29                                <li id="nav-homepage"><a href="http://www.djangoproject.com/">Home</a></li> 
     30                                <li id="nav-download"><a href="http://www.djangoproject.com/download/">Download</a></li> 
     31                                <li id="nav-documentation"><a href="http://www.djangoproject.com/documentation/">Documentation</a></li> 
     32                                <li id="nav-weblog"><a href="http://www.djangoproject.com/weblog/">Weblog</a></li> 
     33                                <li id="nav-community"><a href="http://www.djangoproject.com/community/">Community</a></li> 
    3434                                <li id="nav-code"><a href="http://code.djangoproject.com/">Code</a></li> 
    3535                        </ul> 
  • djangoproject.com/django_website/templates/docs/index.html

    r7892 r8468  
    4848<li>Templates: <a href="templates/">Guide for HTML authors</a> | <a href="templates_python/">Guide for Python programmers</a></li> 
    4949 
    50 <li><a href="newforms/">The newforms library</a> | <a href="forms/">The old forms and manipulators library</a></li> 
    51 <li><strong>New:</strong> <a href="upload_handling/">File uploads</a></li> 
     50<li><a href="forms/">Forms</a></li> 
     51<li><strong>New:</strong> Files: <a href="files/">file handling</a> | <a href="upload_handling/">file uploads</a></li> 
    5252<li><a href="testing/">Testing Django applications</a></li> 
    5353<li><a href="sessions/">Sessions</a></li> 
     
    6767<li><a href="add_ons/">The django.contrib add-ons</a> 
    6868    <ul> 
     69    <li><a href="admin/">The automatic admin interface</a> (<code>django.contrib.admin</code>)</li> 
    6970    <li><a href="contenttypes/">Contenttypes Framework</a> (<code>django.contrib.contenttypes</code>)</li> 
    7071    <li><a href="csrf/">Cross Site Request Forgery protection</a> (<code>django.contrib.csrf</code>)</li> 
     
    111112<h2>Release notes</h2> 
    112113<ul> 
     114<li><a href="release_notes_1.0_alpha/">Version 1.0 Alpha</a></li> 
    113115<li><a href="release_notes_0.96/">Version 0.96</a></li> 
    114116<li><a href="release_notes_0.95/">Version 0.95</a></li> 
  • djangoproject.com/django_website/templates/flatpages/foundation.html

    r7896 r8468  
    66      border: 0px none;  
    77      background-color: transparent; 
    8       color: transparent; 
     8      overflow:hidden; 
     9      text-indent: -999px; 
    910      background-image: url(https://checkout.google.com/buttons/donateNow.gif?merchant_id=404630304217012&w=115&h=50&style=trans&variant=text&loc=en_US); 
    1011      background-position: 0px 3px;