diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:56:49 -0600 |
| commit | 81e2244eca04c02de0d7c32f0063f64f2ca3b1c4 (patch) | |
| tree | 1014127ab7b69d121aa2fe4ed80de5a43e7b078a /templates/base_content.html | |
| parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
| parent | 3e7c42f81352ad73a1395ed0601f2d4fdf9b5359 (diff) | |
| download | askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.gz askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.tar.bz2 askbot-81e2244eca04c02de0d7c32f0063f64f2ca3b1c4.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/management/commands/send_email_alerts.py
locale/en/LC_MESSAGES/django.mo
settings.py
templates/about.html
templates/authopenid/complete.html
templates/authopenid/external_legacy_login_info.html
templates/content/js/com.cnprog.post.js
templates/content/js/com.cnprog.utils.js
templates/content/style/style.css
templates/question.html
templates/questions.html
Diffstat (limited to 'templates/base_content.html')
| -rw-r--r-- | templates/base_content.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/base_content.html b/templates/base_content.html index 12297215..0ff4a9fd 100644 --- a/templates/base_content.html +++ b/templates/base_content.html @@ -10,7 +10,7 @@ <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" /> ======= {% if settings.GOOGLE_SITEMAP_CODE %} - <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" /> + <meta name="google-site-verification" content="{{ settings.GOOGLE_SITEMAP_CODE }}" /> {% endif %} >>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/base_content.html <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" /> @@ -56,7 +56,7 @@ body { margin-top:2.4em; } </style> <script type="text/javascript"> - $().ready(function() { + $(document).ready(function() { var element = $('#validate_email_alert') element.click(function(){notify.close(true);setTimeout(function(){},1000)}) notify.show(); @@ -72,7 +72,7 @@ {% autoescape off %} {% if user_messages %} {% for message in user_messages %} - <p class="darkred">{{ message }}<p> + <p class="darkred">{{ message }}</p> {% endfor %} {% endif %} {% endautoescape %} |