second take on skins - quite a bit simpler

190 files changed, 146 insertions, 51 deletions

diff --git a/INSTALL b/INSTALL
index 72cc76bf..8a1deaad 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ A. PREREQUISITES
 B. INSTALLATION
    1. Settings file
    2. Database
-   3. Running CNPROG in the development server
+   3. Running OSQA in the development server
    4. Installation under Apache/WSGI
    5. Full text search
    6. Email subscriptions
@@ -56,7 +56,7 @@ Notice that you will need to register with recaptcha.net and receive
 recaptcha public and private keys that need to be saved in your
 settings_local.py file
 
-NOTES: django_authopenid is included into CNPROG code 
+NOTES: django_authopenid is included into OSQA code 
 and is significantly modified.  http://code.google.com/p/django-authopenid/
 no need to install this library
 
@@ -64,13 +64,13 @@ B. INSTALLATION
 -----------------------------------------------
 0. Make sure you have all above python libraries installed.
 
-   make cnprog installation server-readable on Linux command might be:
-   chown -R yourlogin:apache /path/to/CNPROG
+   make osqa installation server-readable on Linux command might be:
+   chown -R yourlogin:apache /path/to/OSQA
    
    directories templates/upfiles and log must be server writable
 
    on Linux type chmod
-   chmod -R g+w /path/to/CNPROG/upfiles
+   chmod -R g+w /path/to/OSQA/upfiles
    chmod -R g+w /path/to/log
 
    above it is assumed that webserver runs under group named "apache"
@@ -87,11 +87,11 @@ Section C explains configuration paramaters.
 Prepare your database by using the same database/account 
 configuration from above.
 e.g,
-create database cnprog DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
-grant all on cnprog.* to 'cnprog'@'localhost';
+create database osqa DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
+grant all on osqa.* to 'osqa'@'localhost';
 And then run "python manage.py syncdb" to synchronize your database.
 
-3. Running CNPROG on the development server 
+3. Running OSQA on the development server 
 
 Run "python manage.py runserver" to startup django 
 development environment.
@@ -112,8 +112,8 @@ import os
 import sys
 
 sys.path.insert(0,'/one/level/above') #insert to make sure that forum will be found
-sys.path.append('/one/level/above/CNPROG') #maybe this is not necessary
-os.environ['DJANGO_SETTINGS_MODULE'] = 'CNPROG.settings'
+sys.path.append('/one/level/above/OSQA') #maybe this is not necessary
+os.environ['DJANGO_SETTINGS_MODULE'] = 'OSQA.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
 -----------
@@ -138,26 +138,26 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
 #this allows "rooting" forum at http://example.com/forum, if you like
 <VirtualHost ...your ip...:80>
     ServerAdmin forum@example.com
-    DocumentRoot /path/to/cnprog
+    DocumentRoot /path/to/osqa-site
     ServerName example.com
 
     #run mod_wsgi process for django in daemon mode
     #this allows avoiding confused timezone settings when
     #another application runs in the same virtual host
-    WSGIDaemonProcess CNPROG 
-    WSGIProcessGroup CNPROG 
+    WSGIDaemonProcess OSQA 
+    WSGIProcessGroup OSQA 
 
     #force all content to be served as static files
     #otherwise django will be crunching images through itself wasting time
-    Alias /content/ /path/to/cnprog/templates/content/
-    AliasMatch /([^/]*\.css) /path/to/cnprog/templates/content/style/$1
-    <Directory /path/to/cnprog/templates/content>
+    Alias /media/ /path/to/osqa-site/forum/media/
+    Alias /ufiles/ /path/to/osqa-site/forum/upfiles/
+    <Directory /path/to/osqa-site/forum/media>
         Order deny,allow
         Allow from all
     </Directory>
 
     #this is your wsgi script described in the prev section
-    WSGIScriptAlias / /path/to/cnprog/cnprog.wsgi
+    WSGIScriptAlias / /path/to/osqa-site/osqa.wsgi
 
     #this will force admin interface to work only
     #through https (optional)
@@ -166,35 +166,39 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
         RewriteEngine on
         RewriteRule /nimda(.*)$ https://example.com/nimda$1 [L,R=301]
     </Location>
-    CustomLog /var/log/httpd/CNPROG/access_log common
-    ErrorLog /var/log/httpd/CNPROG/error_log
+    CustomLog /var/log/httpd/OSQA/access_log common
+    ErrorLog /var/log/httpd/OSQA/error_log
 </VirtualHost>
 #(optional) run admin interface under https
 <VirtualHost ..your ip..:443>
     ServerAdmin forum@example.com
-    DocumentRoot /path/to/cnrpog
+    DocumentRoot /path/to/osqa-site
     ServerName example.com
     SSLEngine on
     SSLCertificateFile /path/to/ssl-certificate/server.crt
     SSLCertificateKeyFile /path/to/ssl-certificate/server.key
-    WSGIScriptAlias / /path/to/cnprogcnprog.wsgi
-    CustomLog /var/log/httpd/CNPROG/access_log common
-    ErrorLog /var/log/httpd/CNPROG/error_log
+    WSGIScriptAlias / /path/to/osqa-site/osqa.wsgi
+    CustomLog /var/log/httpd/OSQA/access_log common
+    ErrorLog /var/log/httpd/OSQA/error_log
     DirectoryIndex index.html
 </VirtualHost>
 -------------
 
 5. Full text search (using sphinx search)
+
    Currently full text search works only with sphinx search engine
+   And builtin PostgreSQL (postgres only >= 8.3???)
+
+   5.1 Instructions for Sphinx search setup
    Sphinx at this time supports only MySQL and PostgreSQL databases
    to enable this, install sphinx search engine and djangosphinx
 
    configure sphinx, sample configuration can be found in
    sphinx/sphinx.conf file usually goes somewhere in /etc tree
 
-   build cnprog index first time manually
+   build osqa index first time manually
 
-   % indexer --config /path/to/sphinx.conf --index cnprog
+   % indexer --config /path/to/sphinx.conf --index osqa
 
    setup cron job to rebuild index periodically with command
    your crontab entry may be something like
@@ -249,8 +253,8 @@ DEBUG=False #set to True to enable debug mode
 
 #all forum parameters are set in file settings_local.py
 
-LOG_FILENAME = 'cnprog.log' #where logging messages should go
-DATABASE_NAME = 'cnprog'    # Or path to database file if using sqlite3.
+LOG_FILENAME = 'osqa.log' #where logging messages should go
+DATABASE_NAME = 'osqa'    # Or path to database file if using sqlite3.
 DATABASE_USER = ''          # Not used with sqlite3.
 DATABASE_PASSWORD = ''      # Not used with sqlite3.
 DATABASE_ENGINE = 'mysql'   #mysql, etc
@@ -258,19 +262,19 @@ SERVER_EMAIL = ''
 DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''    #not necessary if mailserver is run on local machine
-EMAIL_SUBJECT_PREFIX = '[CNPROG] '
-EMAIL_HOST='cnprog.com'
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.com'
 EMAIL_PORT='25'
 EMAIL_USE_TLS=False
 TIME_ZONE = 'America/Tijuana'
-APP_TITLE = u'CNPROG Q&A Forum' #title of your forum
-APP_KEYWORDS = u'CNPROG,forum,community' #keywords for search engines
+APP_TITLE = u'OSQA Q&A Forum' #title of your forum
+APP_KEYWORDS = u'OSQA,forum,community' #keywords for search engines
 APP_DESCRIPTION = u'Ask and answer questions.' #site description for searche engines 
 APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>' #slogan that goes to front page in logged out mode
 APP_COPYRIGHT = '' #copyright message
 
 #if you set FORUM_SCRIPT_ALIAS= 'forum/'
-#then CNPROG will run at url http://example.com/forum
+#then OSQA will run at url http://example.com/forum
 #FORUM_SCRIPT_ALIAS cannot have leading slash, otherwise it can be set to anything
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
@@ -278,7 +282,7 @@ LANGUAGE_CODE = 'en' #forum language (see language instructions on the wiki)
 EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False    #if True, email addresses must be unique in all accounts
-APP_URL = 'http://cnprog.com' #used by email notif system and RSS
+APP_URL = 'http://osqa.com' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = '' #code for google site crawler (look up google webmaster tools)
 GOOGLE_ANALYTICS_KEY = '' #key to enable google analytics on this site
 BOOKS_ON = False  #if True - books tab will be on
@@ -287,10 +291,10 @@ WIKI_ON = True  #if False - community wiki feature is disabled
 #experimental - allow password login through external site
 #must implement django_authopenid/external_login.py
 #included prototype external_login works with Mediawiki
-USE_EXTERNAL_LEGACY_LOGIN = True #if false CNPROG uses it's own login/password
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+USE_EXTERNAL_LEGACY_LOGIN = True #if false OSQA uses it's own login/password
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.com'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
 
 FEEDBACK_SITE_URL = None #None or url
 LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
@@ -303,7 +307,7 @@ D. Customization
 Other than settings_local.py the following will most likely need customization:
 * locale/*/django.po - language files that may also contain your site-specific messages
   if you want to start with english messages file - look for words like "forum" and
-  "CNPROG" in the msgstr lines
+  "OSQA" in the msgstr lines
 * templates/header.html and templates/footer.html may contain extra links
 * templates/about.html - a place to explain for is your forum for
 * templates/faq.html - put answers to users frequent questions
diff --git a/forum/skins.py b/forum/skins.py
new file mode 100644
index 00000000..2f0405d7
--- /dev/null
+++ b/forum/skins.py
@@ -0,0 +1,58 @@
+from django.conf import settings
+from django.template import loader
+from django.template.loaders import filesystem 
+from django.http import HttpResponse
+import os.path
+import logging
+APP_NAME = os.path.basename(os.path.dirname(__file__))
+
+#module for skinning osqa
+#at this point skin can be changed only in settings file
+#via OSQA_DEFAULT_SKIN variable
+
+#note - Django template loaders use method django.utils._os.safe_join
+#to work on unicode file paths
+#here it is ignored because it is assumed that we won't use unicode paths
+
+def load_template_source(name, dirs=None):
+    try:
+        tname = os.path.join(settings.OSQA_DEFAULT_SKIN,'templates',name)
+        return filesystem.load_template_source(tname,dirs)
+    except:
+        tname = os.path.join('default','templates',name)
+        return filesystem.load_template_source(tname,dirs)
+load_template_source.is_usable = True
+
+def find_media_source(url):
+    """returns url prefixed with the skin name
+    of the first skin that contains the file 
+    directories are searched in this order:
+    settings.OSQA_DEFAULT_SKIN, then 'default', then 'commmon'
+    if file is not found - returns None
+    and logs an error message
+    """
+    while url[0] == '/': url = url[1:]
+    d = os.path.dirname
+    n = os.path.normpath
+    j = os.path.join
+    f = os.path.isfile
+    skins = n(j(d(__file__),'skins'))
+    try:
+        media = os.path.join(skins, settings.OSQA_DEFAULT_SKIN, url)
+        assert(f(media))
+        use_skin = settings.OSQA_DEFAULT_SKIN
+    except:
+        try:
+            media = j(skins, 'default', url)
+            assert(f(media))
+            use_skin = 'default'
+        except:
+            media = j(skins, 'common', url)
+            try:
+                assert(f(media))
+                use_skin = 'common'
+            except:
+                logging.error('could not find media for %s' % url)
+                use_skin = ''
+                return None
+    return use_skin + '/' + url
diff --git a/forum/skins/README b/forum/skins/README
new file mode 100644
index 00000000..b2f32b77
--- /dev/null
+++ b/forum/skins/README
@@ -0,0 +1,23 @@
+this directory contains available skins
+
+1) default - default skin with templates
+2) common - this directory is to media directory common to all or many templates
+
+to create a new skin just create another directory under skins/
+and start populating it with templates named the same way as in 
+default/templates
+
+all paths must be the same except they will be under
+yourtemplate/templates
+
+media does not have to be composed of files named the same way as in default skin
+whatever media you link to from your templates - will be in operation
+
+templates are resolved in the following way:
+* check in skin named as in settings.OSQA_DEFAULT_SKIN
+* then skin named 'default'
+
+media is resolved with one extra option
+* settings.OSQA_DEFAULT_SKIN
+* 'default'
+* 'common'
diff --git a/forum/skins/common/media/README b/forum/skins/common/media/README
new file mode 100644
index 00000000..3376e754
--- /dev/null
+++ b/forum/skins/common/media/README
@@ -0,0 +1 @@
+directory for media common to all or many templates
diff --git a/forum/media/images/blue-up-arrow-h18px.png b/forum/skins/default/media/images/blue-up-arrow-h18px.png
index e1f29e86..e1f29e86 100644
--- a/forum/media/images/blue-up-arrow-h18px.png
+++ b/forum/skins/default/media/images/blue-up-arrow-h18px.png
diff --git a/forum/media/images/box-arrow.gif b/forum/skins/default/media/images/box-arrow.gif
index 89dcf5b3..89dcf5b3 100644
--- a/forum/media/images/box-arrow.gif
+++ b/forum/skins/default/media/images/box-arrow.gif
diff --git a/forum/media/images/bullet_green.gif b/forum/skins/default/media/images/bullet_green.gif
index fa530910..fa530910 100644
--- a/forum/media/images/bullet_green.gif
+++ b/forum/skins/default/media/images/bullet_green.gif
diff --git a/forum/media/images/cc-88x31.png b/forum/skins/default/media/images/cc-88x31.png
index 0f2a0f10..0f2a0f10 100644
--- a/forum/media/images/cc-88x31.png
+++ b/forum/skins/default/media/images/cc-88x31.png
diff --git a/forum/media/images/cc-wiki.png b/forum/skins/default/media/images/cc-wiki.png
index 3e680538..3e680538 100644
--- a/forum/media/images/cc-wiki.png
+++ b/forum/skins/default/media/images/cc-wiki.png
diff --git a/forum/media/images/close-small-dark.png b/forum/skins/default/media/images/close-small-dark.png
index 280c1fc7..280c1fc7 100644
--- a/forum/media/images/close-small-dark.png
+++ b/forum/skins/default/media/images/close-small-dark.png
diff --git a/forum/media/images/close-small-hover.png b/forum/skins/default/media/images/close-small-hover.png
index 7899aec7..7899aec7 100644
--- a/forum/media/images/close-small-hover.png
+++ b/forum/skins/default/media/images/close-small-hover.png
diff --git a/forum/media/images/close-small.png b/forum/skins/default/media/images/close-small.png
index 5a99d31f..5a99d31f 100644
--- a/forum/media/images/close-small.png
+++ b/forum/skins/default/media/images/close-small.png
diff --git a/forum/media/images/dash.gif b/forum/skins/default/media/images/dash.gif
index d1ddc507..d1ddc507 100644
--- a/forum/media/images/dash.gif
+++ b/forum/skins/default/media/images/dash.gif
diff --git a/forum/media/images/djangomade124x25_grey.gif b/forum/skins/default/media/images/djangomade124x25_grey.gif
index d34bb311..d34bb311 100644
--- a/forum/media/images/djangomade124x25_grey.gif
+++ b/forum/skins/default/media/images/djangomade124x25_grey.gif
diff --git a/forum/media/images/dot-g.gif b/forum/skins/default/media/images/dot-g.gif
index 5d6bb28e..5d6bb28e 100644
--- a/forum/media/images/dot-g.gif
+++ b/forum/skins/default/media/images/dot-g.gif
diff --git a/forum/media/images/dot-list.gif b/forum/skins/default/media/images/dot-list.gif
index f6a6b865..f6a6b865 100644
--- a/forum/media/images/dot-list.gif
+++ b/forum/skins/default/media/images/dot-list.gif
diff --git a/forum/media/images/edit.png b/forum/skins/default/media/images/edit.png
index dcb09be0..dcb09be0 100644
--- a/forum/media/images/edit.png
+++ b/forum/skins/default/media/images/edit.png
diff --git a/forum/media/images/expander-arrow-hide.gif b/forum/skins/default/media/images/expander-arrow-hide.gif
index feb6a618..feb6a618 100644
--- a/forum/media/images/expander-arrow-hide.gif
+++ b/forum/skins/default/media/images/expander-arrow-hide.gif
diff --git a/forum/media/images/expander-arrow-show.gif b/forum/skins/default/media/images/expander-arrow-show.gif
index 6825c56e..6825c56e 100644
--- a/forum/media/images/expander-arrow-show.gif
+++ b/forum/skins/default/media/images/expander-arrow-show.gif
diff --git a/forum/media/images/favicon.gif b/forum/skins/default/media/images/favicon.gif
index 910c2666..910c2666 100644
--- a/forum/media/images/favicon.gif
+++ b/forum/skins/default/media/images/favicon.gif
diff --git a/forum/media/images/feed-icon-small.png b/forum/skins/default/media/images/feed-icon-small.png
index b3c949d2..b3c949d2 100644
--- a/forum/media/images/feed-icon-small.png
+++ b/forum/skins/default/media/images/feed-icon-small.png
diff --git a/forum/media/images/gray-up-arrow-h18px.png b/forum/skins/default/media/images/gray-up-arrow-h18px.png
index 78767445..78767445 100644
--- a/forum/media/images/gray-up-arrow-h18px.png
+++ b/forum/skins/default/media/images/gray-up-arrow-h18px.png
diff --git a/forum/media/images/grippie.png b/forum/skins/default/media/images/grippie.png
index 6524d416..6524d416 100644
--- a/forum/media/images/grippie.png
+++ b/forum/skins/default/media/images/grippie.png
diff --git a/forum/media/images/indicator.gif b/forum/skins/default/media/images/indicator.gif
index 1c72ebb5..1c72ebb5 100644
--- a/forum/media/images/indicator.gif
+++ b/forum/skins/default/media/images/indicator.gif
diff --git a/forum/media/images/logo.gif b/forum/skins/default/media/images/logo.gif
index ab690de2..ab690de2 100644
--- a/forum/media/images/logo.gif
+++ b/forum/skins/default/media/images/logo.gif
diff --git a/forum/media/images/logo.png b/forum/skins/default/media/images/logo.png
index 6a250e35..6a250e35 100644
--- a/forum/media/images/logo.png
+++ b/forum/skins/default/media/images/logo.png
diff --git a/forum/media/images/logo1.png b/forum/skins/default/media/images/logo1.png
index d79a6271..d79a6271 100644
--- a/forum/media/images/logo1.png
+++ b/forum/skins/default/media/images/logo1.png
diff --git a/forum/media/images/logo2.png b/forum/skins/default/media/images/logo2.png
index bd3cccd9..bd3cccd9 100644
--- a/forum/media/images/logo2.png
+++ b/forum/skins/default/media/images/logo2.png
diff --git a/forum/media/images/medala.gif b/forum/skins/default/media/images/medala.gif
index 93dd1a39..93dd1a39 100644
--- a/forum/media/images/medala.gif
+++ b/forum/skins/default/media/images/medala.gif
diff --git a/forum/media/images/medala_on.gif b/forum/skins/default/media/images/medala_on.gif
index a18f9e85..a18f9e85 100644
--- a/forum/media/images/medala_on.gif
+++ b/forum/skins/default/media/images/medala_on.gif
diff --git a/forum/media/images/new.gif b/forum/skins/default/media/images/new.gif
index 8a220b53..8a220b53 100644
--- a/forum/media/images/new.gif
+++ b/forum/skins/default/media/images/new.gif
diff --git a/forum/media/images/nophoto.png b/forum/skins/default/media/images/nophoto.png
index 2daf0ffd..2daf0ffd 100644
--- a/forum/media/images/nophoto.png
+++ b/forum/skins/default/media/images/nophoto.png
diff --git a/forum/media/images/openid.gif b/forum/skins/default/media/images/openid.gif
index 8540e12b..8540e12b 100644
--- a/forum/media/images/openid.gif
+++ b/forum/skins/default/media/images/openid.gif
diff --git a/forum/media/images/openid/aol.gif b/forum/skins/default/media/images/openid/aol.gif
index decc4f12..decc4f12 100644
--- a/forum/media/images/openid/aol.gif
+++ b/forum/skins/default/media/images/openid/aol.gif
diff --git a/forum/media/images/openid/blogger.ico b/forum/skins/default/media/images/openid/blogger.ico
index 1b9730b0..1b9730b0 100644
--- a/forum/media/images/openid/blogger.ico
+++ b/forum/skins/default/media/images/openid/blogger.ico
diff --git a/forum/media/images/openid/claimid.ico b/forum/skins/default/media/images/openid/claimid.ico
index 2b80f491..2b80f491 100644
--- a/forum/media/images/openid/claimid.ico
+++ b/forum/skins/default/media/images/openid/claimid.ico
diff --git a/forum/media/images/openid/facebook.gif b/forum/skins/default/media/images/openid/facebook.gif
index b997b358..b997b358 100644
--- a/forum/media/images/openid/facebook.gif
+++ b/forum/skins/default/media/images/openid/facebook.gif
diff --git a/forum/media/images/openid/flickr.ico b/forum/skins/default/media/images/openid/flickr.ico
index 11f6e07f..11f6e07f 100644
--- a/forum/media/images/openid/flickr.ico
+++ b/forum/skins/default/media/images/openid/flickr.ico
diff --git a/forum/media/images/openid/google.gif b/forum/skins/default/media/images/openid/google.gif
index 1b6cd07b..1b6cd07b 100644
--- a/forum/media/images/openid/google.gif
+++ b/forum/skins/default/media/images/openid/google.gif
diff --git a/forum/media/images/openid/livejournal.ico b/forum/skins/default/media/images/openid/livejournal.ico
index f3d21ec5..f3d21ec5 100644
--- a/forum/media/images/openid/livejournal.ico
+++ b/forum/skins/default/media/images/openid/livejournal.ico
diff --git a/forum/media/images/openid/myopenid.ico b/forum/skins/default/media/images/openid/myopenid.ico
index ceb06e6a..ceb06e6a 100644
--- a/forum/media/images/openid/myopenid.ico
+++ b/forum/skins/default/media/images/openid/myopenid.ico
diff --git a/forum/media/images/openid/openid-inputicon.gif b/forum/skins/default/media/images/openid/openid-inputicon.gif
index cde836c8..cde836c8 100644
--- a/forum/media/images/openid/openid-inputicon.gif
+++ b/forum/skins/default/media/images/openid/openid-inputicon.gif
diff --git a/forum/media/images/openid/openid.gif b/forum/skins/default/media/images/openid/openid.gif
index c718b0e6..c718b0e6 100644
--- a/forum/media/images/openid/openid.gif
+++ b/forum/skins/default/media/images/openid/openid.gif
diff --git a/forum/media/images/openid/technorati.ico b/forum/skins/default/media/images/openid/technorati.ico
index fa1083c1..fa1083c1 100644
--- a/forum/media/images/openid/technorati.ico
+++ b/forum/skins/default/media/images/openid/technorati.ico
diff --git a/forum/media/images/openid/verisign.ico b/forum/skins/default/media/images/openid/verisign.ico
index 3953af93..3953af93 100644
--- a/forum/media/images/openid/verisign.ico
+++ b/forum/skins/default/media/images/openid/verisign.ico
diff --git a/forum/media/images/openid/vidoop.ico b/forum/skins/default/media/images/openid/vidoop.ico
index bbd9a0d5..bbd9a0d5 100644
--- a/forum/media/images/openid/vidoop.ico
+++ b/forum/skins/default/media/images/openid/vidoop.ico
diff --git a/forum/media/images/openid/wordpress.ico b/forum/skins/default/media/images/openid/wordpress.ico
index 31b7d2c2..31b7d2c2 100644
--- a/forum/media/images/openid/wordpress.ico
+++ b/forum/skins/default/media/images/openid/wordpress.ico
diff --git a/forum/media/images/openid/yahoo.gif b/forum/skins/default/media/images/openid/yahoo.gif
index 42adbfa5..42adbfa5 100644
--- a/forum/media/images/openid/yahoo.gif
+++ b/forum/skins/default/media/images/openid/yahoo.gif
diff --git a/forum/media/images/quest-bg.gif b/forum/skins/default/media/images/quest-bg.gif
index b7540238..b7540238 100644
--- a/forum/media/images/quest-bg.gif
+++ b/forum/skins/default/media/images/quest-bg.gif
diff --git a/forum/media/images/vote-accepted-on.png b/forum/skins/default/media/images/vote-accepted-on.png
index 2026f3bc..2026f3bc 100644
--- a/forum/media/images/vote-accepted-on.png
+++ b/forum/skins/default/media/images/vote-accepted-on.png
diff --git a/forum/media/images/vote-accepted.png b/forum/skins/default/media/images/vote-accepted.png
index ecd18551..ecd18551 100644
--- a/forum/media/images/vote-accepted.png
+++ b/forum/skins/default/media/images/vote-accepted.png
diff --git a/forum/media/images/vote-arrow-down-on.png b/forum/skins/default/media/images/vote-arrow-down-on.png
index 048dbb44..048dbb44 100644
--- a/forum/media/images/vote-arrow-down-on.png
+++ b/forum/skins/default/media/images/vote-arrow-down-on.png
diff --git a/forum/media/images/vote-arrow-down.png b/forum/skins/default/media/images/vote-arrow-down.png
index e4fdec0a..e4fdec0a 100644
--- a/forum/media/images/vote-arrow-down.png
+++ b/forum/skins/default/media/images/vote-arrow-down.png
diff --git a/forum/media/images/vote-arrow-up-on.png b/forum/skins/default/media/images/vote-arrow-up-on.png
index 56ad0c25..56ad0c25 100644
--- a/forum/media/images/vote-arrow-up-on.png
+++ b/forum/skins/default/media/images/vote-arrow-up-on.png
diff --git a/forum/media/images/vote-arrow-up.png b/forum/skins/default/media/images/vote-arrow-up.png
index 6e9a51c7..6e9a51c7 100644
--- a/forum/media/images/vote-arrow-up.png
+++ b/forum/skins/default/media/images/vote-arrow-up.png
diff --git a/forum/media/images/vote-favorite-off.png b/forum/skins/default/media/images/vote-favorite-off.png
index c1bef074..c1bef074 100644
--- a/forum/media/images/vote-favorite-off.png
+++ b/forum/skins/default/media/images/vote-favorite-off.png
diff --git a/forum/media/images/vote-favorite-on.png b/forum/skins/default/media/images/vote-favorite-on.png
index 1f9c14ab..1f9c14ab 100644
--- a/forum/media/images/vote-favorite-on.png
+++ b/forum/skins/default/media/images/vote-favorite-on.png
diff --git a/forum/media/jquery-openid/images/aol.gif b/forum/skins/default/media/jquery-openid/images/aol.gif
index decc4f12..decc4f12 100644
--- a/forum/media/jquery-openid/images/aol.gif
+++ b/forum/skins/default/media/jquery-openid/images/aol.gif
diff --git a/forum/media/jquery-openid/images/blogger-1.png b/forum/skins/default/media/jquery-openid/images/blogger-1.png
index 8b360ea5..8b360ea5 100644
--- a/forum/media/jquery-openid/images/blogger-1.png
+++ b/forum/skins/default/media/jquery-openid/images/blogger-1.png
diff --git a/forum/media/jquery-openid/images/blogger.ico b/forum/skins/default/media/jquery-openid/images/blogger.ico
index 1b9730b0..1b9730b0 100644
--- a/forum/media/jquery-openid/images/blogger.ico
+++ b/forum/skins/default/media/jquery-openid/images/blogger.ico
diff --git a/forum/media/jquery-openid/images/claimid-0.png b/forum/skins/default/media/jquery-openid/images/claimid-0.png
index 4a0ea1b3..4a0ea1b3 100644
--- a/forum/media/jquery-openid/images/claimid-0.png
+++ b/forum/skins/default/media/jquery-openid/images/claimid-0.png
diff --git a/forum/media/jquery-openid/images/claimid.ico b/forum/skins/default/media/jquery-openid/images/claimid.ico
index 2b80f491..2b80f491 100644
--- a/forum/media/jquery-openid/images/claimid.ico
+++ b/forum/skins/default/media/jquery-openid/images/claimid.ico
diff --git a/forum/media/jquery-openid/images/facebook.gif b/forum/skins/default/media/jquery-openid/images/facebook.gif
index b997b358..b997b358 100644
--- a/forum/media/jquery-openid/images/facebook.gif
+++ b/forum/skins/default/media/jquery-openid/images/facebook.gif
diff --git a/forum/media/jquery-openid/images/flickr.ico b/forum/skins/default/media/jquery-openid/images/flickr.ico
index 11f6e07f..11f6e07f 100644
--- a/forum/media/jquery-openid/images/flickr.ico
+++ b/forum/skins/default/media/jquery-openid/images/flickr.ico
diff --git a/forum/media/jquery-openid/images/flickr.png b/forum/skins/default/media/jquery-openid/images/flickr.png
index 142405a6..142405a6 100644
--- a/forum/media/jquery-openid/images/flickr.png
+++ b/forum/skins/default/media/jquery-openid/images/flickr.png
diff --git a/forum/media/jquery-openid/images/google.gif b/forum/skins/default/media/jquery-openid/images/google.gif
index 1b6cd07b..1b6cd07b 100644
--- a/forum/media/jquery-openid/images/google.gif
+++ b/forum/skins/default/media/jquery-openid/images/google.gif
diff --git a/forum/media/jquery-openid/images/livejournal-1.png b/forum/skins/default/media/jquery-openid/images/livejournal-1.png
index e6436081..e6436081 100644
--- a/forum/media/jquery-openid/images/livejournal-1.png
+++ b/forum/skins/default/media/jquery-openid/images/livejournal-1.png
diff --git a/forum/media/jquery-openid/images/livejournal.ico b/forum/skins/default/media/jquery-openid/images/livejournal.ico
index f3d21ec5..f3d21ec5 100644
--- a/forum/media/jquery-openid/images/livejournal.ico
+++ b/forum/skins/default/media/jquery-openid/images/livejournal.ico
diff --git a/forum/media/jquery-openid/images/myopenid-2.png b/forum/skins/default/media/jquery-openid/images/myopenid-2.png
index f64fb8e8..f64fb8e8 100644
--- a/forum/media/jquery-openid/images/myopenid-2.png
+++ b/forum/skins/default/media/jquery-openid/images/myopenid-2.png
diff --git a/forum/media/jquery-openid/images/myopenid.ico b/forum/skins/default/media/jquery-openid/images/myopenid.ico
index ceb06e6a..ceb06e6a 100644
--- a/forum/media/jquery-openid/images/myopenid.ico
+++ b/forum/skins/default/media/jquery-openid/images/myopenid.ico
diff --git a/forum/media/jquery-openid/images/openid-inputicon.gif b/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif
index cde836c8..cde836c8 100644
--- a/forum/media/jquery-openid/images/openid-inputicon.gif
+++ b/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif
diff --git a/forum/media/jquery-openid/images/openid.gif b/forum/skins/default/media/jquery-openid/images/openid.gif
index c718b0e6..c718b0e6 100644
--- a/forum/media/jquery-openid/images/openid.gif
+++ b/forum/skins/default/media/jquery-openid/images/openid.gif
diff --git a/forum/media/jquery-openid/images/openidico.png b/forum/skins/default/media/jquery-openid/images/openidico.png
index ab622669..ab622669 100644
--- a/forum/media/jquery-openid/images/openidico.png
+++ b/forum/skins/default/media/jquery-openid/images/openidico.png
diff --git a/forum/media/jquery-openid/images/openidico16.png b/forum/skins/default/media/jquery-openid/images/openidico16.png
index ad718ac5..ad718ac5 100644
--- a/forum/media/jquery-openid/images/openidico16.png
+++ b/forum/skins/default/media/jquery-openid/images/openidico16.png
diff --git a/forum/media/jquery-openid/images/technorati-1.png b/forum/skins/default/media/jquery-openid/images/technorati-1.png
index f7195240..f7195240 100644
--- a/forum/media/jquery-openid/images/technorati-1.png
+++ b/forum/skins/default/media/jquery-openid/images/technorati-1.png
diff --git a/forum/media/jquery-openid/images/technorati.ico b/forum/skins/default/media/jquery-openid/images/technorati.ico
index fa1083c1..fa1083c1 100644
--- a/forum/media/jquery-openid/images/technorati.ico
+++ b/forum/skins/default/media/jquery-openid/images/technorati.ico
diff --git a/forum/media/jquery-openid/images/verisign-2.png b/forum/skins/default/media/jquery-openid/images/verisign-2.png
index c1467008..c1467008 100644
--- a/forum/media/jquery-openid/images/verisign-2.png
+++ b/forum/skins/default/media/jquery-openid/images/verisign-2.png
diff --git a/forum/media/jquery-openid/images/verisign.ico b/forum/skins/default/media/jquery-openid/images/verisign.ico
index 3953af93..3953af93 100644
--- a/forum/media/jquery-openid/images/verisign.ico
+++ b/forum/skins/default/media/jquery-openid/images/verisign.ico
diff --git a/forum/media/jquery-openid/images/vidoop.ico b/forum/skins/default/media/jquery-openid/images/vidoop.ico
index bbd9a0d5..bbd9a0d5 100644
--- a/forum/media/jquery-openid/images/vidoop.ico
+++ b/forum/skins/default/media/jquery-openid/images/vidoop.ico
diff --git a/forum/media/jquery-openid/images/vidoop.png b/forum/skins/default/media/jquery-openid/images/vidoop.png
index 032c9e98..032c9e98 100644
--- a/forum/media/jquery-openid/images/vidoop.png
+++ b/forum/skins/default/media/jquery-openid/images/vidoop.png
diff --git a/forum/media/jquery-openid/images/wordpress.ico b/forum/skins/default/media/jquery-openid/images/wordpress.ico
index 31b7d2c2..31b7d2c2 100644
--- a/forum/media/jquery-openid/images/wordpress.ico
+++ b/forum/skins/default/media/jquery-openid/images/wordpress.ico
diff --git a/forum/media/jquery-openid/images/wordpress.png b/forum/skins/default/media/jquery-openid/images/wordpress.png
index ee29f0cf..ee29f0cf 100644
--- a/forum/media/jquery-openid/images/wordpress.png
+++ b/forum/skins/default/media/jquery-openid/images/wordpress.png
diff --git a/forum/media/jquery-openid/images/yahoo.gif b/forum/skins/default/media/jquery-openid/images/yahoo.gif
index 42adbfa5..42adbfa5 100644
--- a/forum/media/jquery-openid/images/yahoo.gif
+++ b/forum/skins/default/media/jquery-openid/images/yahoo.gif
diff --git a/forum/media/jquery-openid/jquery.openid.js b/forum/skins/default/media/jquery-openid/jquery.openid.js
index 8d1cd204..8d1cd204 100644
--- a/forum/media/jquery-openid/jquery.openid.js
+++ b/forum/skins/default/media/jquery-openid/jquery.openid.js
diff --git a/forum/media/jquery-openid/openid.css b/forum/skins/default/media/jquery-openid/openid.css
index 1b7aaf82..1b7aaf82 100644
--- a/forum/media/jquery-openid/openid.css
+++ b/forum/skins/default/media/jquery-openid/openid.css
diff --git a/forum/media/js/com.cnprog.admin.js b/forum/skins/default/media/js/com.cnprog.admin.js
index 39dff48c..39dff48c 100644
--- a/forum/media/js/com.cnprog.admin.js
+++ b/forum/skins/default/media/js/com.cnprog.admin.js
diff --git a/forum/media/js/com.cnprog.editor.js b/forum/skins/default/media/js/com.cnprog.editor.js
index 18cc5166..18cc5166 100644
--- a/forum/media/js/com.cnprog.editor.js
+++ b/forum/skins/default/media/js/com.cnprog.editor.js
diff --git a/forum/media/js/com.cnprog.i18n.js b/forum/skins/default/media/js/com.cnprog.i18n.js
index da9bf396..da9bf396 100644
--- a/forum/media/js/com.cnprog.i18n.js
+++ b/forum/skins/default/media/js/com.cnprog.i18n.js
diff --git a/forum/media/js/com.cnprog.post.js b/forum/skins/default/media/js/com.cnprog.post.js
index 5469a374..5469a374 100644
--- a/forum/media/js/com.cnprog.post.js
+++ b/forum/skins/default/media/js/com.cnprog.post.js
diff --git a/forum/media/js/com.cnprog.tag_selector.js b/forum/skins/default/media/js/com.cnprog.tag_selector.js
index 5cfc3561..5cfc3561 100644
--- a/forum/media/js/com.cnprog.tag_selector.js
+++ b/forum/skins/default/media/js/com.cnprog.tag_selector.js
diff --git a/forum/media/js/com.cnprog.utils.js b/forum/skins/default/media/js/com.cnprog.utils.js
index 7d8ea1f8..7d8ea1f8 100644
--- a/forum/media/js/com.cnprog.utils.js
+++ b/forum/skins/default/media/js/com.cnprog.utils.js
diff --git a/forum/media/js/compress.bat b/forum/skins/default/media/js/compress.bat
index 5b2673cf..5b2673cf 100644
--- a/forum/media/js/compress.bat
+++ b/forum/skins/default/media/js/compress.bat
diff --git a/forum/media/js/excanvas.pack.js b/forum/skins/default/media/js/excanvas.pack.js
index 71d6fbd9..71d6fbd9 100644
--- a/forum/media/js/excanvas.pack.js
+++ b/forum/skins/default/media/js/excanvas.pack.js
diff --git a/forum/media/js/flot-build.bat b/forum/skins/default/media/js/flot-build.bat
index f9f32cb7..f9f32cb7 100644
--- a/forum/media/js/flot-build.bat
+++ b/forum/skins/default/media/js/flot-build.bat
diff --git a/forum/media/js/jquery-1.2.6.js b/forum/skins/default/media/js/jquery-1.2.6.js
index 88e661ee..88e661ee 100644
--- a/forum/media/js/jquery-1.2.6.js
+++ b/forum/skins/default/media/js/jquery-1.2.6.js
diff --git a/forum/media/js/jquery-1.2.6.min.js b/forum/skins/default/media/js/jquery-1.2.6.min.js
index 82b98e1d..82b98e1d 100644
--- a/forum/media/js/jquery-1.2.6.min.js
+++ b/forum/skins/default/media/js/jquery-1.2.6.min.js
diff --git a/forum/media/js/jquery.ajaxfileupload.js b/forum/skins/default/media/js/jquery.ajaxfileupload.js
index 75292776..75292776 100644
--- a/forum/media/js/jquery.ajaxfileupload.js
+++ b/forum/skins/default/media/js/jquery.ajaxfileupload.js
diff --git a/forum/media/js/jquery.flot.js b/forum/skins/default/media/js/jquery.flot.js
index 83b61929..83b61929 100644
--- a/forum/media/js/jquery.flot.js
+++ b/forum/skins/default/media/js/jquery.flot.js
diff --git a/forum/media/js/jquery.flot.pack.js b/forum/skins/default/media/js/jquery.flot.pack.js
index a5714f12..a5714f12 100644
--- a/forum/media/js/jquery.flot.pack.js
+++ b/forum/skins/default/media/js/jquery.flot.pack.js
diff --git a/forum/media/js/jquery.form.js b/forum/skins/default/media/js/jquery.form.js
index 443114fd..443114fd 100644
--- a/forum/media/js/jquery.form.js
+++ b/forum/skins/default/media/js/jquery.form.js
diff --git a/forum/media/js/jquery.i18n.js b/forum/skins/default/media/js/jquery.i18n.js
index 0a155a31..0a155a31 100644
--- a/forum/media/js/jquery.i18n.js
+++ b/forum/skins/default/media/js/jquery.i18n.js
diff --git a/forum/media/js/jquery.openid.js b/forum/skins/default/media/js/jquery.openid.js
index af7d8cb9..af7d8cb9 100644
--- a/forum/media/js/jquery.openid.js
+++ b/forum/skins/default/media/js/jquery.openid.js
diff --git a/forum/media/js/jquery.validate.pack.js b/forum/skins/default/media/js/jquery.validate.pack.js
index 49134500..49134500 100644
--- a/forum/media/js/jquery.validate.pack.js
+++ b/forum/skins/default/media/js/jquery.validate.pack.js
diff --git a/forum/media/js/se_hilite.js b/forum/skins/default/media/js/se_hilite.js
index 42e99c8e..42e99c8e 100644
--- a/forum/media/js/se_hilite.js
+++ b/forum/skins/default/media/js/se_hilite.js
diff --git a/forum/media/js/se_hilite_src.js b/forum/skins/default/media/js/se_hilite_src.js
index b604f156..b604f156 100644
--- a/forum/media/js/se_hilite_src.js
+++ b/forum/skins/default/media/js/se_hilite_src.js
diff --git a/forum/media/js/wmd/images/wmd-buttons.png b/forum/skins/default/media/js/wmd/images/wmd-buttons.png
index 50b37090..50b37090 100644
--- a/forum/media/js/wmd/images/wmd-buttons.png
+++ b/forum/skins/default/media/js/wmd/images/wmd-buttons.png
diff --git a/forum/media/js/wmd/showdown-min.js b/forum/skins/default/media/js/wmd/showdown-min.js
index 073613b1..073613b1 100644
--- a/forum/media/js/wmd/showdown-min.js
+++ b/forum/skins/default/media/js/wmd/showdown-min.js
diff --git a/forum/media/js/wmd/showdown.js b/forum/skins/default/media/js/wmd/showdown.js
index 3f4b9947..3f4b9947 100644
--- a/forum/media/js/wmd/showdown.js
+++ b/forum/skins/default/media/js/wmd/showdown.js
diff --git a/forum/media/js/wmd/wmd-min.js b/forum/skins/default/media/js/wmd/wmd-min.js
index aa643f1a..aa643f1a 100644
--- a/forum/media/js/wmd/wmd-min.js
+++ b/forum/skins/default/media/js/wmd/wmd-min.js
diff --git a/forum/media/js/wmd/wmd-test.html b/forum/skins/default/media/js/wmd/wmd-test.html
index d748501a..d748501a 100644
--- a/forum/media/js/wmd/wmd-test.html
+++ b/forum/skins/default/media/js/wmd/wmd-test.html
diff --git a/forum/media/js/wmd/wmd.css b/forum/skins/default/media/js/wmd/wmd.css
index 80c226c8..80c226c8 100644
--- a/forum/media/js/wmd/wmd.css
+++ b/forum/skins/default/media/js/wmd/wmd.css
diff --git a/forum/media/js/wmd/wmd.js b/forum/skins/default/media/js/wmd/wmd.js
index 6277de90..6277de90 100644
--- a/forum/media/js/wmd/wmd.js
+++ b/forum/skins/default/media/js/wmd/wmd.js
diff --git a/forum/media/js/yuicompressor-2.4.2.jar b/forum/skins/default/media/js/yuicompressor-2.4.2.jar
index c29470bd..c29470bd 100644
--- a/forum/media/js/yuicompressor-2.4.2.jar
+++ b/forum/skins/default/media/js/yuicompressor-2.4.2.jar
diff --git a/forum/media/style/default.css b/forum/skins/default/media/style/default.css
index 27da1dab..27da1dab 100644
--- a/forum/media/style/default.css
+++ b/forum/skins/default/media/style/default.css
diff --git a/forum/media/style/jquery.autocomplete.css b/forum/skins/default/media/style/jquery.autocomplete.css
index 3bf2c2d9..3bf2c2d9 100644
--- a/forum/media/style/jquery.autocomplete.css
+++ b/forum/skins/default/media/style/jquery.autocomplete.css
diff --git a/forum/media/style/openid.css b/forum/skins/default/media/style/openid.css
index 0d201df2..0d201df2 100644
--- a/forum/media/style/openid.css
+++ b/forum/skins/default/media/style/openid.css
diff --git a/forum/media/style/prettify.css b/forum/skins/default/media/style/prettify.css
index 10a37577..10a37577 100644
--- a/forum/media/style/prettify.css
+++ b/forum/skins/default/media/style/prettify.css
diff --git a/forum/media/style/style.css b/forum/skins/default/media/style/style.css
index 175fcb66..175fcb66 100644
--- a/forum/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
diff --git a/forum/templates/404.html b/forum/skins/default/templates/404.html
index 227de3ae..227de3ae 100644
--- a/forum/templates/404.html
+++ b/forum/skins/default/templates/404.html
diff --git a/forum/templates/500.html b/forum/skins/default/templates/500.html
index 51e73178..51e73178 100644
--- a/forum/templates/500.html
+++ b/forum/skins/default/templates/500.html
diff --git a/forum/templates/about.html b/forum/skins/default/templates/about.html
index 66dcc3fd..66dcc3fd 100644
--- a/forum/templates/about.html
+++ b/forum/skins/default/templates/about.html
diff --git a/forum/templates/answer_edit.html b/forum/skins/default/templates/answer_edit.html
index 2d736f30..2d736f30 100644
--- a/forum/templates/answer_edit.html
+++ b/forum/skins/default/templates/answer_edit.html
diff --git a/forum/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html
index c390da06..c390da06 100644
--- a/forum/templates/answer_edit_tips.html
+++ b/forum/skins/default/templates/answer_edit_tips.html
diff --git a/forum/templates/ask.html b/forum/skins/default/templates/ask.html
index 083b01d9..083b01d9 100644
--- a/forum/templates/ask.html
+++ b/forum/skins/default/templates/ask.html
diff --git a/forum/templates/authopenid/changeemail.html b/forum/skins/default/templates/authopenid/changeemail.html
index 94d1881c..94d1881c 100644
--- a/forum/templates/authopenid/changeemail.html
+++ b/forum/skins/default/templates/authopenid/changeemail.html
diff --git a/forum/templates/authopenid/changeopenid.html b/forum/skins/default/templates/authopenid/changeopenid.html
index d01788fb..d01788fb 100644
--- a/forum/templates/authopenid/changeopenid.html
+++ b/forum/skins/default/templates/authopenid/changeopenid.html
diff --git a/forum/templates/authopenid/changepw.html b/forum/skins/default/templates/authopenid/changepw.html
index 8b059544..8b059544 100644
--- a/forum/templates/authopenid/changepw.html
+++ b/forum/skins/default/templates/authopenid/changepw.html
diff --git a/forum/templates/authopenid/complete.html b/forum/skins/default/templates/authopenid/complete.html
index 62970e38..62970e38 100644
--- a/forum/templates/authopenid/complete.html
+++ b/forum/skins/default/templates/authopenid/complete.html
diff --git a/forum/templates/authopenid/confirm_email.txt b/forum/skins/default/templates/authopenid/confirm_email.txt
index 3a01f146..3a01f146 100644
--- a/forum/templates/authopenid/confirm_email.txt
+++ b/forum/skins/default/templates/authopenid/confirm_email.txt
diff --git a/forum/templates/authopenid/delete.html b/forum/skins/default/templates/authopenid/delete.html
index 0f9f1c60..0f9f1c60 100644
--- a/forum/templates/authopenid/delete.html
+++ b/forum/skins/default/templates/authopenid/delete.html
diff --git a/forum/templates/authopenid/email_validation.txt b/forum/skins/default/templates/authopenid/email_validation.txt
index 5b166a9b..5b166a9b 100644
--- a/forum/templates/authopenid/email_validation.txt
+++ b/forum/skins/default/templates/authopenid/email_validation.txt
diff --git a/forum/templates/authopenid/external_legacy_login_info.html b/forum/skins/default/templates/authopenid/external_legacy_login_info.html
index 3318499c..3318499c 100644
--- a/forum/templates/authopenid/external_legacy_login_info.html
+++ b/forum/skins/default/templates/authopenid/external_legacy_login_info.html
diff --git a/forum/templates/authopenid/failure.html b/forum/skins/default/templates/authopenid/failure.html
index d075d6b0..d075d6b0 100644
--- a/forum/templates/authopenid/failure.html
+++ b/forum/skins/default/templates/authopenid/failure.html
diff --git a/forum/templates/authopenid/sendpw.html b/forum/skins/default/templates/authopenid/sendpw.html
index 6241c811..6241c811 100644
--- a/forum/templates/authopenid/sendpw.html
+++ b/forum/skins/default/templates/authopenid/sendpw.html
diff --git a/forum/templates/authopenid/sendpw_email.txt b/forum/skins/default/templates/authopenid/sendpw_email.txt
index f044ca45..f044ca45 100644
--- a/forum/templates/authopenid/sendpw_email.txt
+++ b/forum/skins/default/templates/authopenid/sendpw_email.txt
diff --git a/forum/templates/authopenid/settings.html b/forum/skins/default/templates/authopenid/settings.html
index 66ea5953..66ea5953 100644
--- a/forum/templates/authopenid/settings.html
+++ b/forum/skins/default/templates/authopenid/settings.html
diff --git a/forum/templates/authopenid/signin.html b/forum/skins/default/templates/authopenid/signin.html
index 4e060d0f..4e060d0f 100755
--- a/forum/templates/authopenid/signin.html
+++ b/forum/skins/default/templates/authopenid/signin.html
diff --git a/forum/templates/authopenid/signup.html b/forum/skins/default/templates/authopenid/signup.html
index fdb236c2..fdb236c2 100644
--- a/forum/templates/authopenid/signup.html
+++ b/forum/skins/default/templates/authopenid/signup.html
diff --git a/forum/templates/authopenid/yadis.xrdf b/forum/skins/default/templates/authopenid/yadis.xrdf
index a9ed44fe..a9ed44fe 100644
--- a/forum/templates/authopenid/yadis.xrdf
+++ b/forum/skins/default/templates/authopenid/yadis.xrdf
diff --git a/forum/templates/badge.html b/forum/skins/default/templates/badge.html
index af6aa2a2..af6aa2a2 100644
--- a/forum/templates/badge.html
+++ b/forum/skins/default/templates/badge.html
diff --git a/forum/templates/badges.html b/forum/skins/default/templates/badges.html
index 8de93df5..8de93df5 100644
--- a/forum/templates/badges.html
+++ b/forum/skins/default/templates/badges.html
diff --git a/forum/templates/base.html b/forum/skins/default/templates/base.html
index 9fabe7a1..9fabe7a1 100755
--- a/forum/templates/base.html
+++ b/forum/skins/default/templates/base.html
diff --git a/forum/templates/base_content.html b/forum/skins/default/templates/base_content.html
index 7f1ddf22..7f1ddf22 100644
--- a/forum/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
diff --git a/forum/templates/book.html b/forum/skins/default/templates/book.html
index 683f13cf..683f13cf 100644
--- a/forum/templates/book.html
+++ b/forum/skins/default/templates/book.html
diff --git a/forum/templates/close.html b/forum/skins/default/templates/close.html
index d9e73507..d9e73507 100644
--- a/forum/templates/close.html
+++ b/forum/skins/default/templates/close.html
diff --git a/forum/templates/edit_user_email_feeds_form.html b/forum/skins/default/templates/edit_user_email_feeds_form.html
index 65902e7e..65902e7e 100644
--- a/forum/templates/edit_user_email_feeds_form.html
+++ b/forum/skins/default/templates/edit_user_email_feeds_form.html
diff --git a/forum/templates/faq.html b/forum/skins/default/templates/faq.html
index 236f4f76..236f4f76 100644
--- a/forum/templates/faq.html
+++ b/forum/skins/default/templates/faq.html
diff --git a/forum/templates/fbconnect/xd_receiver.html b/forum/skins/default/templates/fbconnect/xd_receiver.html
index a03c61bc..a03c61bc 100755
--- a/forum/templates/fbconnect/xd_receiver.html
+++ b/forum/skins/default/templates/fbconnect/xd_receiver.html
diff --git a/forum/templates/feedback.html b/forum/skins/default/templates/feedback.html
index 38bb48ff..38bb48ff 100644
--- a/forum/templates/feedback.html
+++ b/forum/skins/default/templates/feedback.html
diff --git a/forum/templates/feedback_email.txt b/forum/skins/default/templates/feedback_email.txt
index df768180..df768180 100644
--- a/forum/templates/feedback_email.txt
+++ b/forum/skins/default/templates/feedback_email.txt
diff --git a/forum/templates/feeds/rss_description.html b/forum/skins/default/templates/feeds/rss_description.html
index fa781907..fa781907 100644
--- a/forum/templates/feeds/rss_description.html
+++ b/forum/skins/default/templates/feeds/rss_description.html
diff --git a/forum/templates/feeds/rss_title.html b/forum/skins/default/templates/feeds/rss_title.html
index 7899fce3..7899fce3 100644
--- a/forum/templates/feeds/rss_title.html
+++ b/forum/skins/default/templates/feeds/rss_title.html
diff --git a/forum/templates/footer.html b/forum/skins/default/templates/footer.html
index 89d4801f..89d4801f 100644
--- a/forum/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
diff --git a/forum/templates/header.html b/forum/skins/default/templates/header.html
index 3afc46c5..3afc46c5 100644
--- a/forum/templates/header.html
+++ b/forum/skins/default/templates/header.html
diff --git a/forum/templates/index.html b/forum/skins/default/templates/index.html
index df2814d6..df2814d6 100644
--- a/forum/templates/index.html
+++ b/forum/skins/default/templates/index.html
diff --git a/forum/templates/logout.html b/forum/skins/default/templates/logout.html
index 650ba044..650ba044 100644
--- a/forum/templates/logout.html
+++ b/forum/skins/default/templates/logout.html
diff --git a/forum/templates/notarobot.html b/forum/skins/default/templates/notarobot.html
index 698c5696..698c5696 100644
--- a/forum/templates/notarobot.html
+++ b/forum/skins/default/templates/notarobot.html
diff --git a/forum/templates/pagesize.html b/forum/skins/default/templates/pagesize.html
index 5037f1f6..5037f1f6 100644
--- a/forum/templates/pagesize.html
+++ b/forum/skins/default/templates/pagesize.html
diff --git a/forum/templates/paginator.html b/forum/skins/default/templates/paginator.html
index 2fba5425..2fba5425 100644
--- a/forum/templates/paginator.html
+++ b/forum/skins/default/templates/paginator.html
diff --git a/forum/templates/post_contributor_info.html b/forum/skins/default/templates/post_contributor_info.html
index 9997be5f..9997be5f 100644
--- a/forum/templates/post_contributor_info.html
+++ b/forum/skins/default/templates/post_contributor_info.html
diff --git a/forum/templates/privacy.html b/forum/skins/default/templates/privacy.html
index e66086dd..e66086dd 100644
--- a/forum/templates/privacy.html
+++ b/forum/skins/default/templates/privacy.html
diff --git a/forum/templates/question.html b/forum/skins/default/templates/question.html
index 048c2d64..048c2d64 100644
--- a/forum/templates/question.html
+++ b/forum/skins/default/templates/question.html
diff --git a/forum/templates/question_edit.html b/forum/skins/default/templates/question_edit.html
index fe711849..fe711849 100644
--- a/forum/templates/question_edit.html
+++ b/forum/skins/default/templates/question_edit.html
diff --git a/forum/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index 4cabea79..4cabea79 100644
--- a/forum/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
diff --git a/forum/templates/question_retag.html b/forum/skins/default/templates/question_retag.html
index 03f3da04..03f3da04 100644
--- a/forum/templates/question_retag.html
+++ b/forum/skins/default/templates/question_retag.html
diff --git a/forum/templates/question_summary_list_roll.html b/forum/skins/default/templates/question_summary_list_roll.html
index 7312dca9..7312dca9 100644
--- a/forum/templates/question_summary_list_roll.html
+++ b/forum/skins/default/templates/question_summary_list_roll.html
diff --git a/forum/templates/questions.html b/forum/skins/default/templates/questions.html
index 77802efc..77802efc 100644
--- a/forum/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
diff --git a/forum/templates/reopen.html b/forum/skins/default/templates/reopen.html
index 37fb69c1..37fb69c1 100644
--- a/forum/templates/reopen.html
+++ b/forum/skins/default/templates/reopen.html
diff --git a/forum/templates/revisions_answer.html b/forum/skins/default/templates/revisions_answer.html
index b2e33dfe..b2e33dfe 100644
--- a/forum/templates/revisions_answer.html
+++ b/forum/skins/default/templates/revisions_answer.html
diff --git a/forum/templates/revisions_question.html b/forum/skins/default/templates/revisions_question.html
index 86d52a36..86d52a36 100644
--- a/forum/templates/revisions_question.html
+++ b/forum/skins/default/templates/revisions_question.html
diff --git a/forum/templates/tag_selector.html b/forum/skins/default/templates/tag_selector.html
index 7686d717..7686d717 100644
--- a/forum/templates/tag_selector.html
+++ b/forum/skins/default/templates/tag_selector.html
diff --git a/forum/templates/tags.html b/forum/skins/default/templates/tags.html
index 1bde187f..1bde187f 100644
--- a/forum/templates/tags.html
+++ b/forum/skins/default/templates/tags.html
diff --git a/forum/templates/user.html b/forum/skins/default/templates/user.html
index 5931f31c..5931f31c 100644
--- a/forum/templates/user.html
+++ b/forum/skins/default/templates/user.html
diff --git a/forum/templates/user_edit.html b/forum/skins/default/templates/user_edit.html
index 040ebff4..040ebff4 100644
--- a/forum/templates/user_edit.html
+++ b/forum/skins/default/templates/user_edit.html
diff --git a/forum/templates/user_email_subscriptions.html b/forum/skins/default/templates/user_email_subscriptions.html
index c0204cbc..c0204cbc 100644
--- a/forum/templates/user_email_subscriptions.html
+++ b/forum/skins/default/templates/user_email_subscriptions.html
diff --git a/forum/templates/user_favorites.html b/forum/skins/default/templates/user_favorites.html
index 9db01e9a..9db01e9a 100644
--- a/forum/templates/user_favorites.html
+++ b/forum/skins/default/templates/user_favorites.html
diff --git a/forum/templates/user_footer.html b/forum/skins/default/templates/user_footer.html
index ee347742..ee347742 100644
--- a/forum/templates/user_footer.html
+++ b/forum/skins/default/templates/user_footer.html
diff --git a/forum/templates/user_info.html b/forum/skins/default/templates/user_info.html
index c550e13f..c550e13f 100644
--- a/forum/templates/user_info.html
+++ b/forum/skins/default/templates/user_info.html
diff --git a/forum/templates/user_recent.html b/forum/skins/default/templates/user_recent.html
index b704ab25..b704ab25 100644
--- a/forum/templates/user_recent.html
+++ b/forum/skins/default/templates/user_recent.html
diff --git a/forum/templates/user_reputation.html b/forum/skins/default/templates/user_reputation.html
index 776935ae..776935ae 100644
--- a/forum/templates/user_reputation.html
+++ b/forum/skins/default/templates/user_reputation.html
diff --git a/forum/templates/user_responses.html b/forum/skins/default/templates/user_responses.html
index c4f4ffed..c4f4ffed 100644
--- a/forum/templates/user_responses.html
+++ b/forum/skins/default/templates/user_responses.html
diff --git a/forum/templates/user_stats.html b/forum/skins/default/templates/user_stats.html
index 933764d9..933764d9 100644
--- a/forum/templates/user_stats.html
+++ b/forum/skins/default/templates/user_stats.html
diff --git a/forum/templates/user_tabs.html b/forum/skins/default/templates/user_tabs.html
index 908e8430..908e8430 100644
--- a/forum/templates/user_tabs.html
+++ b/forum/skins/default/templates/user_tabs.html
diff --git a/forum/templates/user_votes.html b/forum/skins/default/templates/user_votes.html
index b56aab01..b56aab01 100644
--- a/forum/templates/user_votes.html
+++ b/forum/skins/default/templates/user_votes.html
diff --git a/forum/templates/users.html b/forum/skins/default/templates/users.html
index 3a59b0c0..3a59b0c0 100644
--- a/forum/templates/users.html
+++ b/forum/skins/default/templates/users.html
diff --git a/forum/templates/users_questions.html b/forum/skins/default/templates/users_questions.html
index eb1be4ee..eb1be4ee 100644
--- a/forum/templates/users_questions.html
+++ b/forum/skins/default/templates/users_questions.html
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index aa1a001f..3084c8c2 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -13,6 +13,7 @@ from forum.models import Question, Answer, QuestionRevision, AnswerRevision
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
 from django.conf import settings
+from forum import skins
 
 register = template.Library()
 
@@ -277,8 +278,10 @@ def get_latest_changed_timestamp():
 
 @register.simple_tag
 def media(url):
-    url = '///' + settings.FORUM_SCRIPT_ALIAS + '/' + url
-    return posixpath.normpath(url) + '?v=%d' % settings.RESOURCE_REVISION
+    url = skins.find_media_source(url)
+    if url:
+        url = '///' + settings.FORUM_SCRIPT_ALIAS + '/m/' + url
+        return posixpath.normpath(url) + '?v=%d' % settings.RESOURCE_REVISION
 
 class ItemSeparatorNode(template.Node):
     def __init__(self,separator):
@@ -327,13 +330,16 @@ class BlockMediaUrlNode(template.Node):
     def __init__(self,nodelist):
         self.items = nodelist 
     def render(self,context):
-        out = '///' + settings.FORUM_SCRIPT_ALIAS
+        prefix = '///' + settings.FORUM_SCRIPT_ALIAS + '/m/'
+        url = ''
         if self.items:
-            out += '/'     
+            url += '/'     
         for item in self.items:
-            bit = item.render(context)
-            out += bit
-        out = os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION
+            url += item.render(context)
+
+        url = skins.find_media_source(url)
+        url += prefix + url
+        out = posixpath.normpath(url) + '?v=%d' % settings.RESOURCE_REVISION
         return out.replace(' ','')
 
 @register.tag(name='blockmedia')
diff --git a/forum/urls.py b/forum/urls.py
index 19d97d00..f93d5151 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -5,6 +5,7 @@ from forum import views as app
 from forum.feed import RssLastestQuestionsFeed
 from forum.sitemap import QuestionsSitemap
 from django.utils.translation import ugettext as _
+import logging
 
 admin.autodiscover()
 feeds = {
@@ -14,17 +15,17 @@ sitemaps = {
     'questions': QuestionsSitemap
 }
 
-APP_PATH = os.path.dirname(os.path.dirname(__file__))
+APP_PATH = os.path.dirname(__file__)
 urlpatterns = patterns('',
     url(r'^$', app.index, name='index'),
     url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
-    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.ico'}),
-    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.gif'}),
-    (r'^media/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'media').replace('\\','/')}
+    #(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.ico'}),
+    #(r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/media/images/favicon.gif'}),
+    (r'^m/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH,'skins').replace('\\','/')}
     ),
     (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, '/upfiles').replace('\\','/')}
+        {'document_root': os.path.join(APP_PATH,'upfiles').replace('\\','/')}
     ),
     (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
     url(r'^%s$' % _('about/'), app.about, name='about'),
diff --git a/settings.py b/settings.py
index 087c9fd8..3ffc6d4f 100755
--- a/settings.py
+++ b/settings.py
@@ -11,6 +11,7 @@ SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
+    'forum.skins.load_template_source',
 #     'django.template.loaders.eggs.load_template_source',
 )
 
@@ -42,7 +43,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
-    os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
+    os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'),
 )
 
 #UPLOAD SETTINGS
diff --git a/settings_local.py.dist b/settings_local.py.dist
index c38e3dd8..09865857 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -102,6 +102,7 @@ SPHINX_PORT=3312
 #please get these at recaptcha.net
 RECAPTCHA_PRIVATE_KEY='...'
 RECAPTCHA_PUBLIC_KEY='...'
+OSQA_DEFAULT_SKIN = 'default'
 
 #Facebook settings
 USE_FB_CONNECT=True