summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/authopenid/complete.html2
-rwxr-xr-xtemplates/authopenid/signin.html10
-rwxr-xr-xtemplates/base.html190
3 files changed, 105 insertions, 97 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index efed74c7..1606cfc5 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -72,7 +72,7 @@ parameters:
<form name="fregister" action="{% url user_register %}" method="POST">
{% else %}
{% ifequal login_type 'facebook' %}
- <form name="fregister" action="{% url fb_user_register %}" method="POST">
+ <form name="fregister" action="" method="POST">
{% else %}
<form name="fregister" action="{% url user_signin %}" method="POST">
{% endifequal %}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index da1e5491..3d20d408 100755
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -64,7 +64,15 @@
</div>
</li>
<li title="Facebook Connect">
- <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>
+ {% if question %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin_new_question %}'"></fb:login-button>
+ {% else %}
+ {% if answer %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin_new_answer %}'"></fb:login-button>
+ {% else %}
+ <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>
+ {% endif %}
+ {% endif %}
</li>
</ul>
<ul class="providers">
diff --git a/templates/base.html b/templates/base.html
index befdc994..b28f919e 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,95 +1,95 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- template base.html -->
-{% load extra_filters %}
-{% load extra_tags %}
-{% load i18n %}
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml">
- <head>
- <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
- {% spaceless %}
- {% block meta %}{% endblock %}
- {% endspaceless %}
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- {% if settings.GOOGLE_SITEMAP_CODE %}
- <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
- {% endif %}
- <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
- <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
- <script src="http://www.google.com/jsapi" type="text/javascript"></script>
- <script type="text/javascript">google.load("jquery", "1.2.6");</script>
- <script type="text/javascript">
- var i18nLang = '{{settings.LANGUAGE_CODE}}';
- var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
- </script>
- <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
- <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
- <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
- <!--<script type="text/javascript">
- var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
- document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
- </script>
- <script type="text/javascript">
- UserVoice.Tab.show({
- key: 'cnprog',
- host: 'cnprog.uservoice.com',
- forum: 'general',
- alignment: 'left', /* 'left', 'right' */
- background_color:'#777',
- text_color: 'white', /* 'white', 'black' */
- hover_color: '#06C',
- lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
- })
- </script>-->
- <!-- todo move this to settings -->
- {% if user_messages %}
- <style type="text/css">
- body { margin-top:2.4em; }
- </style>
- <script type="text/javascript">
- $().ready(function() {
- $('#validate_email_alert').click(function(){notify.close(true)})
- notify.show();
- });
- </script>
- {% endif %}
-
- {% block forejs %}
- {% endblock %}
- </head>
- <body>
- <div class="notify" style="display:none">
- {% autoescape off %}
- {% if user_messages %}
- {% for message in user_messages %}
- <p class="darkred">{{ message }}<p>
- {% endfor %}
- {% endif %}
- {% endautoescape %}
- <a id="close-notify" onclick="notify.close(true)">&times;</a>
- </div>
- {% include "header.html" %}
- <div id="wrapper">
- <div id="room">
- <div id="CALeft">
- {% block content%}
- {% endblock%}
-
- </div>
- <div id="CARight">
- {% block sidebar%}
- {% endblock%}
-
- </div>
- <div id="tail" style="clear:both;">
- {% block tail %}
- {% endblock %}
- </div>
- </div>
- <div class="spacer3"></div>
- </div>
- {% include "footer.html" %}
- {% block endjs %}
- {% endblock %}
- </body>
-</html>
-<!-- end template base.html -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- template base.html -->
+{% load extra_filters %}
+{% load extra_tags %}
+{% load i18n %}
+<html xmlns="http://www.w3.org/1999/xhtml"{% if fb_api_key %} xmlns:fb="http://www.facebook.com/2008/fbml"{% endif %}>
+ <head>
+ <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
+ {% spaceless %}
+ {% block meta %}{% endblock %}
+ {% endspaceless %}
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ {% if settings.GOOGLE_SITEMAP_CODE %}
+ <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
+ {% endif %}
+ <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+ <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
+ <script src="http://www.google.com/jsapi" type="text/javascript"></script>
+ <script type="text/javascript">google.load("jquery", "1.2.6");</script>
+ <script type="text/javascript">
+ var i18nLang = '{{settings.LANGUAGE_CODE}}';
+ var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
+ </script>
+ <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+ <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
+ <!--<script type="text/javascript">
+ var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
+ document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
+ </script>
+ <script type="text/javascript">
+ UserVoice.Tab.show({
+ key: 'cnprog',
+ host: 'cnprog.uservoice.com',
+ forum: 'general',
+ alignment: 'left', /* 'left', 'right' */
+ background_color:'#777',
+ text_color: 'white', /* 'white', 'black' */
+ hover_color: '#06C',
+ lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
+ })
+ </script>-->
+ <!-- todo move this to settings -->
+ {% if user_messages %}
+ <style type="text/css">
+ body { margin-top:2.4em; }
+ </style>
+ <script type="text/javascript">
+ $().ready(function() {
+ $('#validate_email_alert').click(function(){notify.close(true)})
+ notify.show();
+ });
+ </script>
+ {% endif %}
+
+ {% block forejs %}
+ {% endblock %}
+ </head>
+ <body>
+ <div class="notify" style="display:none">
+ {% autoescape off %}
+ {% if user_messages %}
+ {% for message in user_messages %}
+ <p class="darkred">{{ message }}<p>
+ {% endfor %}
+ {% endif %}
+ {% endautoescape %}
+ <a id="close-notify" onclick="notify.close(true)">&times;</a>
+ </div>
+ {% include "header.html" %}
+ <div id="wrapper">
+ <div id="room">
+ <div id="CALeft">
+ {% block content%}
+ {% endblock%}
+
+ </div>
+ <div id="CARight">
+ {% block sidebar%}
+ {% endblock%}
+
+ </div>
+ <div id="tail" style="clear:both;">
+ {% block tail %}
+ {% endblock %}
+ </div>
+ </div>
+ <div class="spacer3"></div>
+ </div>
+ {% include "footer.html" %}
+ {% block endjs %}
+ {% endblock %}
+ </body>
+</html>
+<!-- end template base.html -->
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 20:47:08 +0000