Update to Bootstrap 2.1.0

wiki/plugins/links/mdx/urlize.py

-"""A more liberal autolinker
+"""
+Code modified from:
+https://github.com/r0wb0t/markdown-urlize
+
+A more liberal autolinker
 
 Inspired by Django's urlize function.
 
@@ -39,10 +43,10 @@ import markdown
 
 # Global Vars
 URLIZE_RE = '(%s)' % '|'.join([
-    r'<(?:f|ht)tps?://[^>]*>',
-    r'\b(?:f|ht)tps?://[^)<>\s]+[^.,)<>\s]',
-    r'\bwww\.[^)<>\s]+[^.,)<>\s]',
-    r'[^(<\s"]+\.(?:com|net|org)\b',
+    r'<(?:f|ht)tps?://[^>\'"]*>',
+    r'\b(?:f|ht)tps?://[^)<>\s\'"]+[^.,)<>\s\'"]',
+    r'\bwww\.[^)<>\s]+[^.,)<>\s\'"]',
+    r'[^(<\s\'"]+\.(?:com|net|org)\b',
 ])
 
 class UrlizePattern(markdown.inlinepatterns.Pattern):

wiki/templates/wiki/article.html

@@ -10,9 +10,9 @@
 
 {% block wiki_contents %}
 
-  <div class="tabbable tabs-top" style="margin-top: 20px;">
-    <ul class="nav nav-tabs">
-      <li style="float: left">
+  <div class="" style="margin-top: 20px;">
+    <ul class="nav nav-pills" style="border-bottom: 1px solid #EEE;">
+      <li class="pull-left">
         <h1 style="margin-top: -10px;">
           {{ article.current_revision.title }}
           {% if urlpath and urlpath.parent %}
@@ -22,7 +22,7 @@
       </li>
       {% include "wiki/includes/article_menu.html" %}
     </ul>
-    <div class="tab-content">
+    <div>
       {% block wiki_contents_tab %}
       {% wiki_render article %}
       {% endblock %}

wiki/templates/wiki/base.html

@@ -85,7 +85,7 @@
     {% block wiki_body %}
     
     {% block navbar %}
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-fixed-top navbar-inverse">
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -99,7 +99,7 @@
             <ul class="nav">
               {% include "wiki/plugins/notifications/menubaritem.html" %}
               <li class="dropdown">
-                <a href="#" class="dropdown-toggle label label-inverse" data-toggle="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                   <span class="icon-user"></span>
                   {{ user }}
                   <b class="caret"></b>

wiki/templates/wiki/includes/editor_sidebar.html

@@ -6,7 +6,7 @@
     
     <div class="accordion-heading">
       <a class="accordion-toggle" href="#collapse_{{ plugin.slug }}" data-toggle="collapse">
-        <h2>{{ plugin.sidebar.headline }} <span class="{{ plugin.sidebar.icon_class }}"></span></h2>
+        <h3 style="margin: 0;">{{ plugin.sidebar.headline }} <span class="{{ plugin.sidebar.icon_class }}"></span></h3>
       </a>
     </div>