import from dev trunk:
- change link markdown syntax
- change link markdown syntax
- change sidebar_upper and sidebar_lower position in homepage
- remove sidebar_upper and sidebar_lower from question.html and questions.html
- typo in mysqlfulltext disable module

forum/registry.py

@@ -21,9 +21,6 @@ except:
     pass
 
 ui.register(ui.HEADER_LINKS,
-            ui.Link(_('faq'), ui.Url('faq'), weight=400, name='FAQ'),
-            ui.Link(_('about'), ui.Url('about'), weight=300, name='ABOUT'),
-
             ui.Link(
                     text=lambda u, c: u.is_authenticated() and _('logout') or _('login'),
                     url=lambda u, c: u.is_authenticated() and reverse('logout') or reverse('auth_signin'),

forum/skins/light/media/js/wmd/wmd.js

@@ -101,7 +101,7 @@ Attacklab.wmdBase = function(){
 	var pastePollInterval = 100;
 	
 	// The link and title for the help button
-	var helpLink = "http://daringfireball.net/projects/markdown/syntax";
+	var helpLink = "http://chiedi.ubuntu-it.org/markdown_help/";
 	var helpHoverTitle = "Sintassi MarkDown";
 	var helpTarget = "_blank";
 	

forum/skins/light/templates/index.html

@@ -18,20 +18,8 @@
     </style>
 {% endblock %}
 {% block sidebar %}
-    {% if not request.user.is_authenticated %}
-        {% if settings.SHOW_WELCOME_BOX %}
-            <div class="boxA">
-                <h3>{% trans "welcome to " %}{{ settings.APP_SHORT_NAME }}</h3>
-                <div class="body">
-                  {{ settings.APP_INTRO|safe }}
-                  <div class="more"><a href="{% url about %}">{% trans "about" %} </a></div>
-                  <div class="more"><a href="{% url faq %}">{% trans "faq" %} </a></div>
-                </div>
-            </div>
-        {% endif %}
-    {% endif %}
-    {% include "question_list/count.html" %}
     {% sidebar_upper %}
+    {% include "question_list/count.html" %}
     {% if request.user.is_authenticated %}
         {% tag_selector %}
     {% endif %}

forum/skins/light/templates/question.html

@@ -284,8 +284,6 @@
 
 {% markdown_help %}
 
-{% sidebar_upper %}
-
 {% cache 60 questions_tags settings.APP_URL question.id %}
 <div class="boxC">
     <p>
@@ -310,7 +308,6 @@
     </p>
 </div>
 {% endcache %}
-{% sidebar_lower %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Related questions" %}</h3>
     <div class="questions-related">

forum/skins/light/templates/questions.html

@@ -40,9 +40,7 @@
 
 {% block sidebar %}
     {% include "question_list/count.html" %}
-    {% sidebar_upper %}
     {% tag_selector %}
-    {% sidebar_lower %}
     {% question_list_related_tags questions.paginator.page %}
 
 {% endblock %}

settings_local.py

@@ -60,4 +60,4 @@ DJANGO_VERSION = 1.3
 OSQA_DEFAULT_SKIN = 'default'
 
 # disable mysqlfulltxt and local authentication (registrations users)
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth', 'oauthauth', 'facebookauth']
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltext', 'localauth', 'oauthauth', 'facebookauth']