Commits

Luke Hatcher committed ad0cc70

update starter projects to bootstrap 2.0.1

  • Participants
  • Parent commits 525b2ea

Comments (0)

Files changed (6)

File pinax/projects/account_project/requirements/base.txt

 python-openid==2.2.5
 metron==0.1
 
-pinax-theme-bootstrap==0.1.5
+pinax-theme-bootstrap==2.0.1

File pinax/projects/account_project/templates/homepage.html

     
     {% if user.is_authenticated %}
         {% url what_next as what_next_url %}
-        <p class="what_next">{% blocktrans %}Wondering <a href="{{ what_next_url }}" class="btn primary large">What Next</a>?{% endblocktrans %}</p>
+        <p class="what_next">{% blocktrans %}Wondering <a href="{{ what_next_url }}" class="btn btn-primary btn-large">What Next</a>?{% endblocktrans %}</p>
     {% else %}
         {% url acct_login as login_url %}
         {% ifsetting ACCOUNT_OPEN_SIGNUP %}
             {% url acct_signup as signup_url %}
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
+            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn btn-primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
         {% else %}
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
+            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn btn-primary btn-large">Log In</a> to try out the site.{% endblocktrans %}</p>
         {% endifsetting %}
     {% endif %}
 {% endblock %}

File pinax/projects/basic_project/requirements/base.txt

 idios==0.2a1
 metron==0.1
 
-pinax-theme-bootstrap==0.1.5
+pinax-theme-bootstrap==2.0.1

File pinax/projects/basic_project/templates/homepage.html

         {% url acct_login as login_url %}
         {% ifsetting ACCOUNT_OPEN_SIGNUP %}
             {% url acct_signup as signup_url %}
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
+            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn btn-primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
         {% else %}
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
+            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn btn-primary btn-large">Log In</a> to try out the site.{% endblocktrans %}</p>
         {% endifsetting %}
     {% endif %}
 {% endblock %}

File pinax/projects/zero_project/requirements/base.txt

 django-staticfiles==1.2.1
 django_compressor==1.1.2
 
-pinax-theme-bootstrap==0.1.5
+pinax-theme-bootstrap==2.0.1

File pinax/projects/zero_project/templates/homepage.html

         {% endblocktrans %}
     </p>
     
-    <p><a href="http://pinaxproject.com/" class="btn primary large">{% trans "Learn more &raquo;" %}</a></p>
+    <p><a href="http://pinaxproject.com/" class="btn btn-primary btn-large">{% trans "Learn more &raquo;" %}</a></p>
 {% endblock %}