Merge lp:~vauxoo/tools-openerp-vauxoo/vauxoomin3 into lp:tools-openerp-vauxoo

[Nhomar - Vauxoo]

Agregado el concepto de Vauxoomin.

Unmerged revisions

92. By Nhomar - Vauxoo on 2012-02-26

[add] Profit conect concept

91. By Vauxoo on 2012-02-24

[IMP] Frist part of fancy logs, added widget

90. By Vauxoo on 2012-02-24

[IMP] Frist part of fancy logs

89. By Vauxoo on 2012-02-24

[IMP] Improving widgetMessage to allow have several message from action at same time.

88. By Vauxoo on 2012-02-24

[IMP] Improving widgetMessage to allow have several message from action at same time.

87. By Vauxoo on 2012-02-24

[IMP] Starting openerp from vauxoomin ready, left some generic work, but it is working.

86. By Vauxoo on 2012-02-23

[IMP] Start server working

85. By Vauxoo on 2012-02-22

[INIT] Start Server action

84. By Vauxoo on 2012-02-21

[FIX] moving nohup to correct place

83. By Vauxoo on 2012-02-21

[FIX] Taking of some echo strings

=== modified file 'list_db.py'
--- list_db.py	2012-02-19 18:35:01 +0000
+++ list_db.py	2012-03-21 00:56:22 +0000
@@ -1,38 +1,28 @@
-import gtk
+#import gtk
 import xmlrpclib
-import logging
+#import logging
 import socket
 import cPickle
 import os
 import re
 import sys
 import socket
-import ConfigParser
-import optparse
+#import ConfigParser
+#import optparse
 
 #socket://localhost:8070'
 DNS_CACHE = {}
 
 
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
 
 class list_db(object):
-    
-    if __name__=='__main__':
-        url = 'socket://localhost:8070'
-        resource = 'db'
-        method = 'list'
-        
-        
-    def __init__(self):
-        print "Parametros \n"
-        print "url = Ej: socket://localhost:8070"
-        print "resource = db"
-        print "method = list"
-        print "Realizar llamado al metodo principal conect_to_port"
-    
+
+
     def conect_to_port(self,url, resource='db', method='list', *args):
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+        print dir(sock)
         if m.group(1) == 'http://' or m.group(1) == 'https://':
             sock = xmlrpclib.ServerProxy(url + '/xmlrpc/' + resource)
             return getattr(sock, method)(*args)
@@ -42,6 +32,7 @@
             res = self.send_db()
             return res
 
+
     def connect(self, host, port=False):
             if not port:
                 protocol, buf = host.split('//')
@@ -50,28 +41,37 @@
                 host = DNS_CACHE[host]
             sock.connect((host, int(port)))
             DNS_CACHE[host], port = sock.getpeername()
-            
+
+
     def mysend(self, msg, exception=False, traceback=None):
             msg = cPickle.dumps([msg,traceback])
             sock.sendall('%8d%s%s' % (len(msg), exception and "1" or "0", msg))
-            
+
+
     def send_db(self):
-            def read(socket, size):
-                buf=''
-                while len(buf) < size:
-                    chunk = sock.recv(size - len(buf))
-                    if chunk == '':
-                        raise RuntimeError, "socket connection broken"
-                    buf += chunk
-                return buf
-
-            size = int(read(sock, 8))
-            buf = read(sock, 1)
-            exception = buf != '0' and buf or False
-            res = cPickle.loads(read(sock, size))
-            if isinstance(res[0],Exception):
-                if exception:
-                    raise Myexception(str(res[0]), str(res[1]))
-                raise res[0]
-            else:
-                return res[0]
+        def read(socket, size):
+            buf=''
+            while len(buf) < size:
+                chunk = sock.recv(size - len(buf))
+                if chunk == '':
+                    raise RuntimeError, "socket connection broken"
+                buf += chunk
+            return buf
+        size = int(read(sock, 8))
+        buf = read(sock, 1)
+        exception = buf != '0' and buf or False
+        res = cPickle.loads(read(sock, size))
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+if __name__=='__main__':
+    url = 'socket://localhost:8070'
+    resource = 'db'
+    method = 'list'
+    l=list_db()
+    print l.conect_to_port(url)

=== added directory 'scripts_openerp'
=== added directory 'scripts_openerp/backup_automatic'
=== added file 'scripts_openerp/backup_automatic/backup_pg.sh'
--- scripts_openerp/backup_automatic/backup_pg.sh	1970-01-01 00:00:00 +0000
+++ scripts_openerp/backup_automatic/backup_pg.sh	2012-03-21 00:56:22 +0000
@@ -0,0 +1,205 @@
+#! /bin/bash
+### SETTING PRIVILEGES TO ALLOW DUMPING WITH HASSLES
+# To avoid being asked for password when doing the dumping of the database and therefore make this script quite automatic
+# set the following in:
+# sudo nano /etc/postgresql/8.3/main/pg_hba.conf
+# host all all 127.0.0.1/32 trust
+# Stop and Start your postgres service
+# sudo /etc/init.d/postgresql-8.3 stop && sudo /etc/init.d/postgresql-8.3 start
+
+#SETTING AUTOMATIC AUTHENTICATION 
+#create a file in the postgres home, usually, /var/lib/postgresql
+#this file must be named .pgpass
+#this file must have 0600 permission, in order to only postgres can read it. 
+#chmod 0600 .pgpass
+#this file must contain this information:
+# dbhost:5432:dbname:username:password, (dbhost is your porstgresql server's IP, so in this program,
+# the .pgpass would look like this: 192.168.1.200:5432:dbname:username:password
+#192.168.1.200:5432:dbname:username:password
+#*:*:*:*:CLAVE_DEL_ROOT_USER_o_sudoer   #please remove 
+
+### SETTING PRIVILEGES TO THE FOLDER WHERE DUMPS WILL BE SAVED
+# To allow the user under which the cron is run create, read, write, and erase
+# set the following privileges to the folder where the dumps will be saved
+# sudo chown postgres:postgres /home/backup/ -R
+
+### ESTABLISHING LOCATION AND PRIVILEGES TO THIS SCRIPT
+# Put this file in /usr/local/bin
+# then set privileges to the user in the crontab
+# sudo chown postgres:postgres /usr/local/bin/backup_pg.sh
+# sudo chmod 755 /usr/local/bin/backup_pg.sh
+
+### SETTING CRONTAB TO RUN THE SCRIPT
+# AFAIK I am paranoic and this setting will reflect my paranoic behavoir toward backups
+# and so in the forecoming updates which in my wishlist spam through sending this to
+# backups to another server be it ftp, sftp, or a cloud storage like dropbox (c) or spideroak(c)
+# (marks and trademarks are copyrights of their owners).
+#
+# m     h       dom mon dow user    command
+# 30    *       *   *   *   postgres    backup_pg.sh
+# this command will be run at the thirty (30) min of each hour (paranoic mode)
+
+# TESTING SCRIPT WITH POSTGRES USER
+#sudo su postgres 
+#sh /usr/local/bin/backup_pg.sh
+#if this command does not work please check again the privilegies  "SETTING PRIVILEGES TO THE FOLDER WHERE DUMPS WILL BE SAVED"
+
+### FEATURES:
+# - Automatic backup of Postgresql database
+# - Daily, weekly, monthly
+# - Rotation of backup files
+
+# Credits:
+# The credit for this work goes to those who made it possible, this script (original one)
+# can be found at:
+# http://linux2.arinet.org/index.php?option=com_content&task=view&id=125&Itemid=35
+# I just made some tweaks to adjust it to my needs, hope it be useful
+
+# This program is based on automatic MySQL backup script by Harley
+# (wipe_out at users.sourceforge.net). Thanks Harley, your script is really nice.
+# So, therefore, this program is also released under the GPL which can be obtain
+# from http://www.fsf.org
+# A little background:
+# This program is emerged from the need to have an automatic backup process for
+# postgresql database server. After some extensive searching on Google, I came
+# across Harley's script. It's for MySQL though. Well, I'm not a bash scriptter,
+# so, after some discussion in few lists and experimenting, I managed to get this
+# works.
+
+### THIS IS THE ORIGINAL DOCUMENTATION SO AVOID,
+# WITH PREVIOUS ESTABLISHED SETTING THIS SCRIPT SHOULD WORK
+# Note on postgresql settings:
+# By default, postgresql setting is not open, which means we must set the authentication
+# method for the client first. It is done in /var/lib/pgsql/data/pg_hba.conf file.
+# In order to use this program, we can set the method like this:
+# host all all 192.168.1.100/32 md5
+# where 192.168.1.100 is your backup machine IP.
+# There is also one trick in order to be able to do automatic backup.
+# Postgresql use it's build-in tools to backup, that is: pg_dump and pg_dumpall.
+# Because of it's security measure, we cannot specify the password in the pg_dump option.
+# There is a way though, we can create a file called .pgpass in user directory who runs
+# this script, with this content:
+# dbhost:5432:dbname:username:password, (dbhost is your porstgresql server's IP, so in this program,
+# the .pgpass would look like this: 192.168.1.200:5432:dbname:username:password
+# Don't forget to chmod the file 600.
+
+#!/bin/bash
+
+USERNAME=practica2        # username for the connection. Avoid leaving spaces between the equal sign and databaseusername
+DBHOST=localhost          # match your pgsql server IP.
+DBNAMES=islr              # the database names to be backup the list must be separated by an "\n" character, <enter> keys
+BACKUPDIR="/backup/db"    # the location to put the backup files. postgres debe tener permisos para escribir.
+COMP=gzip                 # razon de compresion
+OPT="all"
+
+# What do we want to backup. OPT
+# "all" = schema + data
+# "schema" = schema
+# "data" = data
+
+SEPDIR="yes"                    #Crear directorios separados para cada BD.
+
+DATE=`date +%Y-%m-%d_%Hh%Mm`    # Datestamp  2006-03-21  #como se nombra el archivo
+DOW=`date +%A`                  # Day of the week, Sunday, Monday, ...  # dia de la semana
+
+
+LOGFILE=$BACKUPDIR/$DBHOST-`date +%N`.log       # logfile name
+LOGERR=$BACKUPDIR/ERRORS_$DBHOST-`date +%N`.log # error logfile name
+BACKUPFILES=""
+OPT=""
+if [ ! -e "$BACKUPDIR" ] # Chequea si el directorio existe
+then
+mkdir -p "$BACKUPDIR"
+fi
+
+if [ ! -e "$BACKUPDIR/daily" ] # Chequea si el directorio daily existe.
+then
+mkdir -p "$BACKUPDIR/daily"
+fi
+
+touch $LOGFILE   #crea el archivo logfile
+exec 6>&1
+exec > $LOGFILE # Link file descriptor #6 with stdout.
+# Saves stdout.
+
+touch $LOGERR
+exec 7>&2 # Link file descriptor #7 with stderr.
+# Saves stderr.
+exec 2> $LOGERR # stderr replaced with file $LOGERR.
+
+
+if [ "$OPT" = "all" ]; then
+OPT = ""
+elif [ "OPT" = "data" ]; then
+OPT = "-a"
+elif [ "OPT" = "schema" ]; then
+OPT = "-s"
+fi
+
+# Database dump function
+dbdump () {
+pg_dump $OPT -U $USERNAME -h $DBHOST $1 > $2   #comando de respaldo de sql
+return 0
+}
+
+# Compression function plus latest copy
+SUFFIX=""
+compression () {
+if [ "$COMP" = "gzip" ]; then
+gzip -f "$1"                    #comando para comprimir el archivo
+echo
+echo Backup Information for "$1"
+gzip -l "$1.gz"
+SUFFIX=".gz"
+elif [ "$COMP" = "bzip2" ]; then
+echo Compression information for "$1.bz2"
+bzip2 -f -v $1 2>&1
+SUFFIX=".bz2"
+else
+echo "No compression option set, check advanced settings"
+fi
+return 0
+}
+
+# Hostname for LOG information
+if [ "$DBHOST" = "localhost" ]; then
+HOST=`hostname`
+if [ "$SOCKET" ]; then
+OPT="$OPT --socket=$SOCKET"
+fi
+else
+HOST=$DBHOST
+fi
+
+
+# Test if separate DB backups are required
+if [ "$SEPDIR" = "yes" ]; then  #directorios separados para cada BD
+echo Backup Start Time `date`
+echo ======================================================================
+
+for DB in $DBNAMES
+do
+# Prepare $DB for using
+DB="`echo $DB | sed 's/%/ /g'`"
+
+
+if [ ! -e "$BACKUPDIR/daily/$DB" ] # Check Daily DB Directory exists.
+then
+mkdir -p "$BACKUPDIR/daily/$DB"
+fi
+echo Daily Backup of Database \( $DB \)
+echo
+dbdump "$DB" "$BACKUPDIR/daily/$DB/${DB}_$DATE.$DOW.sql"
+compression "$BACKUPDIR/daily/$DB/${DB}_$DATE.$DOW.sql"
+BACKUPFILES="$BACKUPFILES $BACKUPDIR/daily/$DB/${DB}_$DATE.$DOW.sql$SUFFIX"   #PENDIENTE BORRAR Y PROBAR
+echo ----------------------------------------------------------------------
+done
+
+echo Backup End `date`
+echo ======================================================================
+echo Total disk space used for backup storage..
+echo Size - Location
+echo `du -hs "$BACKUPDIR"`
+echo
+fi
+

=== added file 'scripts_openerp/backup_automatic/crontab'
--- scripts_openerp/backup_automatic/crontab	1970-01-01 00:00:00 +0000
+++ scripts_openerp/backup_automatic/crontab	2012-03-21 00:56:22 +0000
@@ -0,0 +1,6 @@
+# Paranoic backup
+
+00    *       *   *   *   postgres    backup_pg.sh
+15    *       *   *   *   postgres    backup_pg.sh
+30    *       *   *   *   postgres    backup_pg.sh
+45    *       *   *   *   postgres    backup_pg.sh

=== added file 'scripts_openerp/backup_automatic/pgpass'
--- scripts_openerp/backup_automatic/pgpass	1970-01-01 00:00:00 +0000
+++ scripts_openerp/backup_automatic/pgpass	2012-03-21 00:56:22 +0000
@@ -0,0 +1,18 @@
+#Este archivo debe llamarse .pgpass, se ha nombrado sin el punto
+#para que vd. lo pueda ver, dado que todo archivo que comience con
+#un punto (.) en Unix/Linux es un archivo invisible.
+#Este archivo debe tener permisos 0600 luego de que ha puesto en 
+#funcionamiento, para que nadie mas que postgres lo pueda leer,
+
+#chmod 0600 .pgpass
+
+#este archivo debe estar ubicado en el home del usuario postgres
+#/var/lib/postgresql
+
+
+# dbhost:5432:dbname:username:password, (dbhost is your porstgresql server's IP, so in this program,
+# the .pgpass would look like this: 192.168.1.200:5432:dbname:username:password
+
+
+#192.168.1.200:5432:dbname:username:password
+*:*:*:*:CLAVE_DEL_ROOT_USER_o_sudoer

=== added file 'scripts_openerp/openerp-server.sh'
--- scripts_openerp/openerp-server.sh	1970-01-01 00:00:00 +0000
+++ scripts_openerp/openerp-server.sh	2012-03-21 00:56:22 +0000
@@ -0,0 +1,148 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:      openerp
+# Required-Start:  $local_fs $remote_fs
+# Required-Stop:   $local_fs $remote_fs
+# Should-Start:    $syslog
+# Should-Stop:     $syslog
+# Default-Start:   3 5
+# Default-Stop:    0 1 6
+# Short-Description: Start or stop OpenERP 5.0
+# Made by Netquatro
+### END INIT INFO
+
+NAME="openerp"
+DESC="OpenERP"
+OPTIONS=""
+ENABLED=1
+echo ">>>>>>>>>>>Running as "$USER
+PARAM="$4 $5 $6 $7 $8"
+USERTOLOAD=$3
+CONTROL=$2
+DIRCONFIG='/home/'$USERTOLOAD'/config'
+#Ensuring all minimal parameters are loaded.
+if [ "$USERTOLOAD" = "" ] ; then
+    echo "You must provide instance(s) and user something like: ./openerp-server.sh start all user"
+    exit
+fi
+#Ensuring you are loading YOUR instance, if you aren't root you just can run your instance.
+if [ "$USERTOLOAD" != "$USER" ] ; then
+    if [ "$USER" != "root" ] ; then
+        echo "Ensuring you are loading YOUR instance, if you aren't root you just can run your instance."
+        exit
+    fi
+fi
+#Function to evaluate if we will run all or just ona instance.
+startopenerp() {
+  if [ "$CONTROL" = "all" ]; then
+    while read line
+    do 
+        SERVER="$line"
+        if [ "$SERVER" = "" ]; then
+            echo "I found and empty Line on servers.txt"
+        else
+            DIR='/home/'$USERTOLOAD'/instancias/'$SERVER'/server'
+            CONFIGFILE=$DIRCONFIG/$SERVER'_oerp.conf'
+            if [ -f $DIRCONFIG/$SERVER'_oerp.conf' ]; then
+              if [ -d $DIR ]; then
+                COMMAND="python $DIR/bin/openerp-server.py -c $CONFIGFILE &"
+                if [ "$USER"="root" ]; then
+                    su -c nohup "$COMMAND" - $USERTOLOAD
+                else
+                    nohup $COMMAND
+                fi
+              else
+                echo "directorio $DIR no encontrado corrija el Script o verifique la ruta"
+              fi
+            else
+                echo "fichero $DIRCONFIG/$SERVER_oerp.conf no encontrado"
+            fi
+        fi
+    done < $DIRCONFIG/servers.txt
+  else
+    SERVER=$CONTROL
+    DIR='/home/'$USERTOLOAD'/instancias/'$SERVER'/server'
+    CONFIGFILE=$DIRCONFIG/$SERVER"_oerp.conf"
+    if [ -f $DIRCONFIG/$SERVER'_oerp.conf' ]; then
+      if [ -d $DIR ]; then                
+        COMMAND="python $DIR/bin/openerp-server.py -c $CONFIGFILE &"
+        if [ "$USER" = "root" ]; then
+          su -c nohup "$COMMAND" - $USERTOLOAD
+        else
+          echo "runing as Limited usertoload\n"
+          echo "nohup $COMMAND"
+          
+        fi
+      else
+        echo "directorio $DIR no encontrado corrija el Script o verifique la ruta"
+      fi
+    else
+        echo "fichero $DIRCONFIG/$SERVER_oerp.conf no encontrado"
+    fi
+  fi
+}
+
+killopenerp()
+{
+  if [ "$CONTROL" = "all" ]; then
+    while read line
+    do 
+        SERVER="$line"
+        DIR="/home/$USERTOLOAD/instancias/$SERVER/server"
+        CONFIGFILE=$DIRCONFIG/$SERVER'_oerp.conf'
+        echo $CONFIGFILE
+        for X in `ps xa|grep openerp-server.py|grep python|grep "$CONFIGFILE"|awk '{print $1}'`; do
+        `kill -9 $X`
+        done
+    done < $DIRCONFIG/servers.txt
+  else
+        SERVER=$CONTROL
+        DIR="/home/$USERTOLOAD/instancias/$SERVER/server"
+        CONFIGFILE=$DIRCONFIG/$SERVER"_oerp.conf"
+    for X in `ps xa|grep openerp-server.py|grep python|grep "$CONFIGFILE"|awk '{print $1}'`; do
+    `kill -9 $X`
+    done
+  fi
+}
+
+statusopenerp() {
+  ps xa|grep openerp-server.py|grep python
+}
+
+
+if [ "x$OPTIONS" != "x" ]; then
+  OPTIONS="-- $OPTIONS"
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+set -e
+
+case "$1" in
+  start)
+    echo -n "Starting $DESC: "
+    startopenerp
+    ;;
+  stop)
+    echo -n "Stopping $DESC: "
+    killopenerp
+    echo "Done."
+    ;;
+  force-reload|restart)
+    echo -n "Restarting $DESC: "
+    killopenerp
+    sleep 1
+    startopenerp
+    ;;
+  status)
+    echo "Status $DESC: "
+    statusopenerp
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|force-reload|restart|status} [server] [usertoload] [openerp params...]" >&2
+    exit 1
+    ;;
+esac
+
+exit 0

=== added file 'scripts_openerp/openerp-web.sh'
--- scripts_openerp/openerp-web.sh	1970-01-01 00:00:00 +0000
+++ scripts_openerp/openerp-web.sh	2012-03-21 00:56:22 +0000
@@ -0,0 +1,135 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          etiny
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $syslog
+# Should-Stop:       $syslog
+# Default-Start:     3 5
+# Default-Stop:      0 1 6
+# Short-Description: Start or stop server-client web eTiny for OpenERP
+# Made by Netquatro
+### END INIT INFO
+
+NAME="openerpweb"
+DESC="OpenERP web client (eTiny)"
+OPTIONS=""
+ENABLED=1
+
+PARAM="$3 $4 $5 $6 $7 $8"
+
+if [ "$2" = "" ]; then
+  SERVER="produccion"
+    CONTROL="todos"
+    echo -e $CONTROL
+else
+  SERVER="$2"
+fi
+
+##Defino el directorio de trabajo
+DIR='/home/openerp/instancias/'$SERVER'/client-web'
+DIRCONFIG="/home/openerp/config"
+CONFIGSERVERS="/home/openerp/config"
+
+startetiny() {
+    if [ "$CONTROL" = "todos" ]; then
+        while read line
+        do 
+            SERVER="$line"
+            echo "Abriendo "$SERVER
+            DIR='/home/openerp/instancias/'$SERVER'/client-web'
+            cd $DIR
+                if [ -f $DIRCONFIG/$SERVER'-web.cfg' ]; then
+                    if [ -d $DIR ]; then
+                        echo iniciando con configuracion $DIRCONFIG/$SERVER'-web.cfg'
+                        cd $DIR
+                        echo en $DIR
+                        echo instancia $SERVER
+                        nohup ./openerp-web.py --config=$DIRCONFIG/$SERVER'-web.cfg' $SERVER > nohup-web.out &
+                    else
+                        echo directorio $DIR no encontrado corrija el Script o verifique la ruta
+                    fi
+                else
+                        echo fichero $DIRCONFIG/openerp-web.cfg no encontrado
+                fi
+        done < $CONFIGSERVERS/servers.txt
+    else
+            cd $DIR
+                if [ -f $DIRCONFIG/$SERVER'-web.cfg' ]; then
+                    if [ -d $DIR ]; then
+                        echo iniciando con configuracion $DIRCONFIG/$SERVER'-web.cfg'
+                        cd $DIR
+                        echo en $DIR
+                        echo instancia $SERVER
+                        nohup ./openerp-web.py --config=$DIRCONFIG/$SERVER'-web.cfg' $SERVER > nohup-web.out &
+                    else
+                        echo directorio $DIR no encontrado corrija el Script o verifique la ruta
+                    fi
+                else
+                        echo fichero $DIRCONFIG/$SERVER'-web.cfg' no encontrado
+                fi
+    fi
+}
+
+killetiny()
+{
+  # Detiene servidor-client eTiny
+   if [ "$CONTROL" = "todos" ]; then
+        while read line
+        do 
+          SERVER="$line"
+          echo "Cerrando "$SERVER
+          for X in `ps xa|grep openerp-web|grep python|grep "$SERVER"|awk '{print $1}'`; do
+            echo "Killing "$X
+            kill -9 $X
+          done
+        done < $CONFIGSERVERS/servers.txt
+    else
+          for X in `ps xa|grep openerp-web|grep python|grep "$SERVER"|awk '{print $1}'`; do
+            echo "Killing "$X
+            kill -9 $X
+          done
+    fi
+}
+
+statusetiny() {
+  ps xa|grep start-openerp-web|grep python
+}
+
+
+if [ "x$OPTIONS" != "x" ]; then
+  OPTIONS="-- $OPTIONS"
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+set -e
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: "
+        startetiny
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+        killetiny
+        echo "Done."
+        ;;
+  force-reload|restart)
+        echo -n "Restarting $DESC: "
+        killetiny
+        sleep 1
+        startetiny
+        ;;
+  status)
+        echo "Status $DESC: "
+        statusetiny
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|force-reload|restart|status} [params]" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

=== added file 'scripts_openerp/respaldo.sh'
--- scripts_openerp/respaldo.sh	1970-01-01 00:00:00 +0000
+++ scripts_openerp/respaldo.sh	2012-03-21 00:56:22 +0000
@@ -0,0 +1,30 @@
+### BEGIN INIT INFO
+# Provides:          openerp
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $syslog
+# Should-Stop:       $syslog
+# Default-Start:     3 5
+# Default-Stop:      0 1 6
+# Short-Description: BackUP of OpenERP
+# Made by Netquatro
+### END INIT INFO
+NAME="backup"
+DESC="BackUP"
+PARAM="$1 $2 $3"
+FECHA=`date +"%H%M%S--%m%d-%y"`
+TMP_PATH="/tmp/backup$FECHA.sql"
+BKP_PATH="/home/openerp/backups/backup$FECHA.sql"
+echo "Voy a exportar $1"
+PROD_BD=$1
+PRUEBA_BD=$2
+pg_dump $PROD_BD > $TMP_PATH
+echo "Creado el Respaldo"
+#####CAMBIAR EL USUARIO
+createdb -O openerp -E UTF8 -T template0 respaldo$FECHA
+echo "Creada la BD"
+cp $TMP_PATH $BKP_PATH
+echo "Creado el Respaldo"
+psql -f $BKP_PATH -d respaldo$FECHA 
+echo "Subida la BD"
+echo "Estoy como postgres  Y TODO BIEN $FECHA"

=== modified file 'vauxoomin/main/action.py'
--- vauxoomin/main/action.py	2012-02-13 13:34:37 +0000
+++ vauxoomin/main/action.py	2012-03-21 00:56:22 +0000
@@ -4,18 +4,127 @@
 from bzrlib.log import Logger
 import ConfigParser as CP
 import server
-from distutils.dir_util import copy_tree
-
-
-def copy_instance(instance,user,relative_path):
-    orig=server.get_instance_path(instance,user,relative_path)
-    if os.path.isdir(orig):
-        return "This instance already exists"
-    dest=server.get_instance_path(instance,user,relative_path)+"_cloned"
-    res=copy_tree(orig,dest)
-    return "Already copied %s files \n from %s to %s" % (len(res),orig,dest)
-
+from distutils.dir_util import copy_tree, mkpath
+import commands
+import subprocess
+
+
+SCRIPT_PATH=""
+
+class logger_action(object):
+    def __init__(self,action):
+        self.msg=action
+    def __call__(self, *args):
+        """
+        TODO: Create Logger write action.
+        """
+        return self.msg(len(args)==1 and args[0] or args)
+
+
+@logger_action
+def copy_instance(instance_info):
+    '''
+    :instance_info: Dict with 'instance' string 'user' and 'relative_path' to be able to use logger
+    '''
+    #TODO Make generic
+    if type(instance_info) is dict:
+        orig=server.get_instance_path(instance_info.get('instance'),
+                                  instance_info.get('user'),
+                                  instance_info.get('relative_path'))
+    else:
+        return {'message':"Error on type sent to copy_instance",
+                'use':'errorBox'}
+    res = {}
+    if not os.path.isdir(orig):
+        res={'message':"This instance already exists or you are trying to use some incorrect instance already copied",
+            'use':'errorBox'}
+        return res
+    dest=server.get_instance_path(instance_info.get('instance'),
+                                  instance_info.get('user'),
+                                  instance_info.get('relative_path'))+"_cloned"
+    res_=copy_tree(orig,dest,preserve_symlinks=True)
+    res={'message': "Already copied %s files \n from %s to %s" % (len(res_),orig,dest),
+        'use': 'successBox' }
+    return res
+
+
+@logger_action
 def clone_main_db(db_name):
+    #TODO Make generic and document
     os.popen("pg_dump %s > db.sql" % db_name)
-    return "pg_dump %s > db.sql " % db_name
+    return {'use':'successBox',
+            'message':"pg_dump %s > db.sql " % db_name}
+
+
+def create_log_folder(instance):
+    path_to_log="/home/%s/%s"  % (instance.get('user'),instance.get('path_to_log'))
+    if os.path.isdir(path_to_log):
+        return False
+    else:
+        return mkpath(path_to_log,verbose=1)
+
+@logger_action
+def create_log(instance):
+    #TODO Make generic and document
+    log_folder=create_log_folder(instance)
+    path_to_log="/home/%s/%s/%s_oerp.log" % (instance.get('user'),instance.get('path_to_log'),instance.get('instance'))
+    if os.path.isfile(path_to_log):
+        return {'use':'infoBox',
+            'message':'Log file already exists, we can not overwrite it do it manually </br> %s' % path_to_log}
+    else:
+        os.popen('touch %s' % path_to_log)
+        return {'use':'successBox',
+            'message':'Log file create succesfully </br> %s %s' % (path_to_log, log_folder and log_folder or '')}
+    return {'use':'errorBox',
+            'message':'Houston we have a problem to make this action or the rocket is not already to be launched'}
+
+
+@logger_action
+def create_config(instance):
+    #TODO Make generic and DOcument
+    path_to_config="/home/nhomar/config/%s_oerp.conf" % instance
+    path_to_instance = server.get_instance_path(instance,'nhomar','instancias')
+    server_dir=os.path.isdir(path_to_instance+'/server') and path_to_instance+'/server' or path_to_instance+'/openobject-server' 
+    command='cd %s/bin && python openerp-server.py --stop-after-init -s --config=%s' % (server_dir,
+                                                                                        path_to_config)
+    if os.path.isfile(path_to_config):
+        return {'use':'infoBox',
+                'message':'Log file already exists, we can not overwrite it do it manually </br> %s' % path_to_log}
+    else:
+        if os.path.isdir(server_dir):
+            os.popen(command)
+            return {'use':'successBox',
+                    'message':'Log file create succesfully </br> %s' % path_to_config}
+    return {'use':'errorBox',
+            'message':'Houston we have a problem to make this action or the rocket is not already to be launched, you must to have a "server" or "openobject-server" already downloaded on %s to be able to create a config file for it' % command}
+
+
+def start_server(instance):
+    '''
+    :instance: Dict with this information
+    path_to_instance, path_to_config, instance, name_server_folder
+    '''
+    wherepython="/usr/bin/python"
+    wherescript="%s/main/manageopenerp.py" % os.getcwd()
+    gip=server.get_instance_path(instance.get('instance'),
+                                instance.get('user'),
+                                instance.get('relative_path'))
+    gcd=server.get_configdir(instance.get('user'),
+                             instance.get('base_config_path'))
+    subprocess.Popen([wherepython,
+                        wherescript,
+                        gip,
+                        gcd,
+                        instance.get('instance'),
+                        instance.get('name_server')],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        stdin=subprocess.PIPE)
+    return [{'use':'infoBox','message':"I ran: %s" % " ".join([wherepython,
+                             wherescript,
+                             gip,
+                             gcd,
+                             instance.get('instance'),
+                             instance.get('name_server')])},
+                    server.get_status(instance.get('instance'))]
 

=== added file 'vauxoomin/main/list_db.py'
--- vauxoomin/main/list_db.py	1970-01-01 00:00:00 +0000
+++ vauxoomin/main/list_db.py	2012-03-21 00:56:22 +0000
@@ -0,0 +1,72 @@
+#import gtk
+import xmlrpclib
+#import logging
+import socket
+import cPickle
+import os
+import re
+import sys
+import socket
+#import ConfigParser
+#import optparse
+
+#socket://localhost:8070'
+DNS_CACHE = {}
+
+
+class list_db(object):
+    def __init__(self):
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        super(list_db,self).__init__()
+    def conect_to_port(self,url, resource='db', method='list', *args):
+        m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
+        if m.group(1) == 'http://' or m.group(1) == 'https://':
+            self.sock = xmlrpclib.ServerProxy(url + '/xmlrpc/' + resource)
+            return getattr(self.sock, method)(*args)
+        else:
+            self.connect(m.group(2), int(m.group(3)))
+            self.mysend((resource, method)+args)
+            res = self.send_db()
+            return res
+
+    def connect(self, host, port=False):
+        if not port:
+            protocol, buf = host.split('//')
+            host, port = buf.split(':')
+        if host in DNS_CACHE:
+            host = DNS_CACHE[host]
+        self.sock.connect((host, int(port)))
+        DNS_CACHE[host], port = self.sock.getpeername()
+            
+    def mysend(self, msg, exception=False, traceback=None):
+        msg = cPickle.dumps([msg,traceback])
+        self.sock.sendall('%8d%s%s' % (len(msg), exception and "1" or "0", msg))
+            
+    def send_db(self):
+        def read(socket, size):
+            buf=''
+            while len(buf) < size:
+                chunk = self.sock.recv(size - len(buf))
+                if chunk == '':
+                    raise RuntimeError, "socket connection broken"
+                buf += chunk
+            return buf
+
+        size = int(read(self.sock, 8))
+        buf = read(self.sock, 1)
+        exception = buf != '0' and buf or False
+        res = cPickle.loads(read(self.sock, size))
+        if isinstance(res[0],Exception):
+            if exception:
+                raise Myexception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+
+if __name__=='__main__':
+    url = 'socket://localhost:8070'
+    resource = 'db'
+    method = 'list'
+    l=list_db()
+    print l.conect_to_port(url)

=== added file 'vauxoomin/main/manageopenerp.py'
--- vauxoomin/main/manageopenerp.py	1970-01-01 00:00:00 +0000
+++ vauxoomin/main/manageopenerp.py	2012-03-21 00:56:22 +0000
@@ -0,0 +1,33 @@
+import subprocess
+import sys
+import time
+import os
+
+
+def start_server(path_to_instance, path_to_config, instance, name_server_folder):
+    '''
+    :path_to_instance:
+    :path_to_config:
+    :instance:
+    :name_server_folder:
+    '''
+    outputshell=subprocess.Popen(["%s/%s/bin/openerp-server.py" % (path_to_instance, name_server_folder),
+                        "--config",
+                        "%s/%s_oerp.conf" % (path_to_config, instance)], 
+                        stdout=subprocess.PIPE, 
+                        stderr=subprocess.PIPE, 
+                        stdin=subprocess.PIPE)
+
+if len(sys.argv)!=5:
+    print "Usage: path_to_instance path_to_config instance name_server_folder Son 4"
+    sys.exit(0)
+if os.fork()==0:
+   os.setsid()
+   sys.stdout=open("/dev/null", 'w')
+   sys.stdin=open("/dev/null", 'r')
+   if os.fork()==0:
+       start_server(sys.argv[1],
+                   sys.argv[2],
+                   sys.argv[3],
+                   sys.argv[4])
+       sys.exit(0)

=== added file 'vauxoomin/main/markdown.py'
--- vauxoomin/main/markdown.py	1970-01-01 00:00:00 +0000
+++ vauxoomin/main/markdown.py	2012-03-21 00:56:22 +0000
@@ -0,0 +1,1877 @@
+#!/usr/bin/env python
+# Copyright (c) 2007-2008 ActiveState Corp.
+# License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+r"""A fast and complete Python implementation of Markdown.
+
+[from http://daringfireball.net/projects/markdown/]
+> Markdown is a text-to-HTML filter; it translates an easy-to-read /
+> easy-to-write structured text format into HTML.  Markdown's text
+> format is most similar to that of plain text email, and supports
+> features such as headers, *emphasis*, code blocks, blockquotes, and
+> links.
+>
+> Markdown's syntax is designed not as a generic markup language, but
+> specifically to serve as a front-end to (X)HTML. You can use span-level
+> HTML tags anywhere in a Markdown document, and you can use block level
+> HTML tags (like <div> and <table> as well).
+
+Module usage:
+
+    >>> import markdown2
+    >>> markdown2.markdown("*boo!*")  # or use `html = markdown_path(PATH)`
+    u'<p><em>boo!</em></p>\n'
+
+    >>> markdowner = Markdown()
+    >>> markdowner.convert("*boo!*")
+    u'<p><em>boo!</em></p>\n'
+    >>> markdowner.convert("**boom!**")
+    u'<p><strong>boom!</strong></p>\n'
+
+This implementation of Markdown implements the full "core" syntax plus a
+number of extras (e.g., code syntax coloring, footnotes) as described on
+<http://code.google.com/p/python-markdown2/wiki/Extras>.
+"""
+
+cmdln_desc = """A fast and complete Python implementation of Markdown, a
+text-to-HTML conversion tool for web writers.
+"""
+
+# Dev Notes:
+# - There is already a Python markdown processor
+#   (http://www.freewisdom.org/projects/python-markdown/).
+# - Python's regex syntax doesn't have '\z', so I'm using '\Z'. I'm
+#   not yet sure if there implications with this. Compare 'pydoc sre'
+#   and 'perldoc perlre'.
+
+__version_info__ = (1, 0, 1, 14) # first three nums match Markdown.pl
+__version__ = '1.0.1.14'
+__author__ = "Trent Mick"
+
+import os
+import sys
+from pprint import pprint
+import re
+import logging
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+import optparse
+from random import random
+import codecs
+
+
+
+#---- Python version compat
+
+if sys.version_info[:2] < (2,4):
+    from sets import Set as set
+    def reversed(sequence):
+        for i in sequence[::-1]:
+            yield i
+    def _unicode_decode(s, encoding, errors='xmlcharrefreplace'):
+        return unicode(s, encoding, errors)
+else:
+    def _unicode_decode(s, encoding, errors='strict'):
+        return s.decode(encoding, errors)
+
+
+#---- globals
+
+DEBUG = False
+log = logging.getLogger("markdown")
+
+DEFAULT_TAB_WIDTH = 4
+
+# Table of hash values for escaped characters:
+def _escape_hash(s):
+    # Lame attempt to avoid possible collision with someone actually
+    # using the MD5 hexdigest of one of these chars in there text.
+    # Other ideas: random.random(), uuid.uuid()
+    #return md5(s).hexdigest()   # Markdown.pl effectively does this.
+    return 'md5-'+md5(s).hexdigest()
+g_escape_table = dict([(ch, _escape_hash(ch))
+                       for ch in '\\`*_{}[]()>#+-.!'])
+
+
+
+#---- exceptions
+
+class MarkdownError(Exception):
+    pass
+
+
+
+#---- public api
+
+def markdown_path(path, encoding="utf-8",
+                  html4tags=False, tab_width=DEFAULT_TAB_WIDTH,
+                  safe_mode=None, extras=None, link_patterns=None,
+                  use_file_vars=False):
+    text = codecs.open(path, 'r', encoding).read()
+    return Markdown(html4tags=html4tags, tab_width=tab_width,
+                    safe_mode=safe_mode, extras=extras,
+                    link_patterns=link_patterns,
+                    use_file_vars=use_file_vars).convert(text)
+
+def markdown(text, html4tags=False, tab_width=DEFAULT_TAB_WIDTH,
+             safe_mode=None, extras=None, link_patterns=None,
+             use_file_vars=False):
+    return Markdown(html4tags=html4tags, tab_width=tab_width,
+                    safe_mode=safe_mode, extras=extras,
+                    link_patterns=link_patterns,
+                    use_file_vars=use_file_vars).convert(text)
+
+class Markdown(object):
+    # The dict of "extras" to enable in processing -- a mapping of
+    # extra name to argument for the extra. Most extras do not have an
+    # argument, in which case the value is None.
+    #
+    # This can be set via (a) subclassing and (b) the constructor
+    # "extras" argument.
+    extras = None
+
+    urls = None
+    titles = None
+    html_blocks = None
+    html_spans = None
+    html_removed_text = "[HTML_REMOVED]"  # for compat with markdown.py
+
+    # Used to track when we're inside an ordered or unordered list
+    # (see _ProcessListItems() for details):
+    list_level = 0
+
+    _ws_only_line_re = re.compile(r"^[ \t]+$", re.M)
+
+    def __init__(self, html4tags=False, tab_width=4, safe_mode=None,
+                 extras=None, link_patterns=None, use_file_vars=False):
+        if html4tags:
+            self.empty_element_suffix = ">"
+        else:
+            self.empty_element_suffix = " />"
+        self.tab_width = tab_width
+
+        # For compatibility with earlier markdown2.py and with
+        # markdown.py's safe_mode being a boolean, 
+        #   safe_mode == True -> "replace"
+        if safe_mode is True:
+            self.safe_mode = "replace"
+        else:
+            self.safe_mode = safe_mode
+
+        if self.extras is None:
+            self.extras = {}
+        elif not isinstance(self.extras, dict):
+            self.extras = dict([(e, None) for e in self.extras])
+        if extras:
+            if not isinstance(extras, dict):
+                extras = dict([(e, None) for e in extras])
+            self.extras.update(extras)
+        assert isinstance(self.extras, dict)
+        self._instance_extras = self.extras.copy()
+        self.link_patterns = link_patterns
+        self.use_file_vars = use_file_vars
+        self._outdent_re = re.compile(r'^(\t|[ ]{1,%d})' % tab_width, re.M)
+
+    def reset(self):
+        self.urls = {}
+        self.titles = {}
+        self.html_blocks = {}
+        self.html_spans = {}
+        self.list_level = 0
+        self.extras = self._instance_extras.copy()
+        if "footnotes" in self.extras:
+            self.footnotes = {}
+            self.footnote_ids = []
+
+    def convert(self, text):
+        """Convert the given text."""
+        # Main function. The order in which other subs are called here is
+        # essential. Link and image substitutions need to happen before
+        # _EscapeSpecialChars(), so that any *'s or _'s in the <a>
+        # and <img> tags get encoded.
+
+        # Clear the global hashes. If we don't clear these, you get conflicts
+        # from other articles when generating a page which contains more than
+        # one article (e.g. an index page that shows the N most recent
+        # articles):
+        self.reset()
+
+        if not isinstance(text, unicode):
+            #TODO: perhaps shouldn't presume UTF-8 for string input?
+            text = unicode(text, 'utf-8')
+
+        if self.use_file_vars:
+            # Look for emacs-style file variable hints.
+            emacs_vars = self._get_emacs_vars(text)
+            if "markdown-extras" in emacs_vars:
+                splitter = re.compile("[ ,]+")
+                for e in splitter.split(emacs_vars["markdown-extras"]):
+                    if '=' in e:
+                        ename, earg = e.split('=', 1)
+                        try:
+                            earg = int(earg)
+                        except ValueError:
+                            pass
+                    else:
+                        ename, earg = e, None
+                    self.extras[ename] = earg
+
+        # Standardize line endings:
+        text = re.sub("\r\n|\r", "\n", text)
+
+        # Make sure $text ends with a couple of newlines:
+        text += "\n\n"
+
+        # Convert all tabs to spaces.
+        text = self._detab(text)
+
+        # Strip any lines consisting only of spaces and tabs.
+        # This makes subsequent regexen easier to write, because we can
+        # match consecutive blank lines with /\n+/ instead of something
+        # contorted like /[ \t]*\n+/ .
+        text = self._ws_only_line_re.sub("", text)
+
+        if self.safe_mode:
+            text = self._hash_html_spans(text)
+
+        # Turn block-level HTML blocks into hash entries
+        text = self._hash_html_blocks(text, raw=True)
+
+        # Strip link definitions, store in hashes.
+        if "footnotes" in self.extras:
+            # Must do footnotes first because an unlucky footnote defn
+            # looks like a link defn:
+            #   [^4]: this "looks like a link defn"
+            text = self._strip_footnote_definitions(text)
+        text = self._strip_link_definitions(text)
+
+        text = self._run_block_gamut(text)
+
+        if "footnotes" in self.extras:
+            text = self._add_footnotes(text)
+
+        text = self._unescape_special_chars(text)
+
+        if self.safe_mode:
+            text = self._unhash_html_spans(text)
+
+        text += "\n"
+        return text
+
+    _emacs_oneliner_vars_pat = re.compile(r"-\*-\s*([^\r\n]*?)\s*-\*-", re.UNICODE)
+    # This regular expression is intended to match blocks like this:
+    #    PREFIX Local Variables: SUFFIX
+    #    PREFIX mode: Tcl SUFFIX
+    #    PREFIX End: SUFFIX
+    # Some notes:
+    # - "[ \t]" is used instead of "\s" to specifically exclude newlines
+    # - "(\r\n|\n|\r)" is used instead of "$" because the sre engine does
+    #   not like anything other than Unix-style line terminators.
+    _emacs_local_vars_pat = re.compile(r"""^
+        (?P<prefix>(?:[^\r\n|\n|\r])*?)
+        [\ \t]*Local\ Variables:[\ \t]*
+        (?P<suffix>.*?)(?:\r\n|\n|\r)
+        (?P<content>.*?\1End:)
+        """, re.IGNORECASE | re.MULTILINE | re.DOTALL | re.VERBOSE)
+
+    def _get_emacs_vars(self, text):
+        """Return a dictionary of emacs-style local variables.
+
+        Parsing is done loosely according to this spec (and according to
+        some in-practice deviations from this):
+        http://www.gnu.org/software/emacs/manual/html_node/emacs/Specifying-File-Variables.html#Specifying-File-Variables
+        """
+        emacs_vars = {}
+        SIZE = pow(2, 13) # 8kB
+
+        # Search near the start for a '-*-'-style one-liner of variables.
+        head = text[:SIZE]
+        if "-*-" in head:
+            match = self._emacs_oneliner_vars_pat.search(head)
+            if match:
+                emacs_vars_str = match.group(1)
+                assert '\n' not in emacs_vars_str
+                emacs_var_strs = [s.strip() for s in emacs_vars_str.split(';')
+                                  if s.strip()]
+                if len(emacs_var_strs) == 1 and ':' not in emacs_var_strs[0]:
+                    # While not in the spec, this form is allowed by emacs:
+                    #   -*- Tcl -*-
+                    # where the implied "variable" is "mode". This form
+                    # is only allowed if there are no other variables.
+                    emacs_vars["mode"] = emacs_var_strs[0].strip()
+                else:
+                    for emacs_var_str in emacs_var_strs:
+                        try:
+                            variable, value = emacs_var_str.strip().split(':', 1)
+                        except ValueError:
+                            log.debug("emacs variables error: malformed -*- "
+                                      "line: %r", emacs_var_str)
+                            continue
+                        # Lowercase the variable name because Emacs allows "Mode"
+                        # or "mode" or "MoDe", etc.
+                        emacs_vars[variable.lower()] = value.strip()
+
+        tail = text[-SIZE:]
+        if "Local Variables" in tail:
+            match = self._emacs_local_vars_pat.search(tail)
+            if match:
+                prefix = match.group("prefix")
+                suffix = match.group("suffix")
+                lines = match.group("content").splitlines(0)
+                #print "prefix=%r, suffix=%r, content=%r, lines: %s"\
+                #      % (prefix, suffix, match.group("content"), lines)
+
+                # Validate the Local Variables block: proper prefix and suffix
+                # usage.
+                for i, line in enumerate(lines):
+                    if not line.startswith(prefix):
+                        log.debug("emacs variables error: line '%s' "
+                                  "does not use proper prefix '%s'"
+                                  % (line, prefix))
+                        return {}
+                    # Don't validate suffix on last line. Emacs doesn't care,
+                    # neither should we.
+                    if i != len(lines)-1 and not line.endswith(suffix):
+                        log.debug("emacs variables error: line '%s' "
+                                  "does not use proper suffix '%s'"
+                                  % (line, suffix))
+                        return {}
+
+                # Parse out one emacs var per line.
+                continued_for = None
+                for line in lines[:-1]: # no var on the last line ("PREFIX End:")
+                    if prefix: line = line[len(prefix):] # strip prefix
+                    if suffix: line = line[:-len(suffix)] # strip suffix
+                    line = line.strip()
+                    if continued_for:
+                        variable = continued_for
+                        if line.endswith('\\'):
+                            line = line[:-1].rstrip()
+                        else:
+                            continued_for = None
+                        emacs_vars[variable] += ' ' + line
+                    else:
+                        try:
+                            variable, value = line.split(':', 1)
+                        except ValueError:
+                            log.debug("local variables error: missing colon "
+                                      "in local variables entry: '%s'" % line)
+                            continue
+                        # Do NOT lowercase the variable name, because Emacs only
+                        # allows "mode" (and not "Mode", "MoDe", etc.) in this block.
+                        value = value.strip()
+                        if value.endswith('\\'):
+                            value = value[:-1].rstrip()
+                            continued_for = variable
+                        else:
+                            continued_for = None
+                        emacs_vars[variable] = value
+
+        # Unquote values.
+        for var, val in emacs_vars.items():
+            if len(val) > 1 and (val.startswith('"') and val.endswith('"')
+               or val.startswith('"') and val.endswith('"')):
+                emacs_vars[var] = val[1:-1]
+
+        return emacs_vars
+
+    # Cribbed from a post by Bart Lateur:
+    # <http://www.nntp.perl.org/group/perl.macperl.anyperl/154>
+    _detab_re = re.compile(r'(.*?)\t', re.M)
+    def _detab_sub(self, match):
+        g1 = match.group(1)
+        return g1 + (' ' * (self.tab_width - len(g1) % self.tab_width))
+    def _detab(self, text):
+        r"""Remove (leading?) tabs from a file.
+
+            >>> m = Markdown()
+            >>> m._detab("\tfoo")
+            '    foo'
+            >>> m._detab("  \tfoo")
+            '    foo'
+            >>> m._detab("\t  foo")
+            '      foo'
+            >>> m._detab("  foo")
+            '  foo'
+            >>> m._detab("  foo\n\tbar\tblam")
+            '  foo\n    bar blam'
+        """
+        if '\t' not in text:
+            return text
+        return self._detab_re.subn(self._detab_sub, text)[0]
+
+    _block_tags_a = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del'
+    _strict_tag_block_re = re.compile(r"""
+        (                       # save in \1
+            ^                   # start of line  (with re.M)
+            <(%s)               # start tag = \2
+            \b                  # word break
+            (.*\n)*?            # any number of lines, minimally matching
+            </\2>               # the matching end tag
+            [ \t]*              # trailing spaces/tabs
+            (?=\n+|\Z)          # followed by a newline or end of document
+        )
+        """ % _block_tags_a,
+        re.X | re.M)
+
+    _block_tags_b = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math'
+    _liberal_tag_block_re = re.compile(r"""
+        (                       # save in \1
+            ^                   # start of line  (with re.M)
+            <(%s)               # start tag = \2
+            \b                  # word break
+            (.*\n)*?            # any number of lines, minimally matching
+            .*</\2>             # the matching end tag
+            [ \t]*              # trailing spaces/tabs
+            (?=\n+|\Z)          # followed by a newline or end of document
+        )
+        """ % _block_tags_b,
+        re.X | re.M)
+
+    def _hash_html_block_sub(self, match, raw=False):
+        html = match.group(1)
+        if raw and self.safe_mode:
+            html = self._sanitize_html(html)
+        key = _hash_text(html)
+        self.html_blocks[key] = html
+        return "\n\n" + key + "\n\n"
+
+    def _hash_html_blocks(self, text, raw=False):
+        """Hashify HTML blocks
+
+        We only want to do this for block-level HTML tags, such as headers,
+        lists, and tables. That's because we still want to wrap <p>s around
+        "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+        phrase emphasis, and spans. The list of tags we're looking for is
+        hard-coded.
+
+        @param raw {boolean} indicates if these are raw HTML blocks in
+            the original source. It makes a difference in "safe" mode.
+        """
+        if '<' not in text:
+            return text
+
+        # Pass `raw` value into our calls to self._hash_html_block_sub.
+        hash_html_block_sub = _curry(self._hash_html_block_sub, raw=raw)
+
+        # First, look for nested blocks, e.g.:
+        #   <div>
+        #       <div>
+        #       tags for inner block must be indented.
+        #       </div>
+        #   </div>
+        #
+        # The outermost tags must start at the left margin for this to match, and
+        # the inner nested divs must be indented.
+        # We need to do this before the next, more liberal match, because the next
+        # match will start at the first `<div>` and stop at the first `</div>`.
+        text = self._strict_tag_block_re.sub(hash_html_block_sub, text)
+
+        # Now match more liberally, simply from `\n<tag>` to `</tag>\n`
+        text = self._liberal_tag_block_re.sub(hash_html_block_sub, text)
+
+        # Special case just for <hr />. It was easier to make a special
+        # case than to make the other regex more complicated.   
+        if "<hr" in text:
+            _hr_tag_re = _hr_tag_re_from_tab_width(self.tab_width)
+            text = _hr_tag_re.sub(hash_html_block_sub, text)
+
+        # Special case for standalone HTML comments:
+        if "<!--" in text:
+            start = 0
+            while True:
+                # Delimiters for next comment block.
+                try:
+                    start_idx = text.index("<!--", start)
+                except ValueError, ex:
+                    break
+                try:
+                    end_idx = text.index("-->", start_idx) + 3
+                except ValueError, ex:
+                    break
+
+                # Start position for next comment block search.
+                start = end_idx
+
+                # Validate whitespace before comment.
+                if start_idx:
+                    # - Up to `tab_width - 1` spaces before start_idx.
+                    for i in range(self.tab_width - 1):
+                        if text[start_idx - 1] != ' ':
+                            break
+                        start_idx -= 1
+                        if start_idx == 0:
+                            break
+                    # - Must be preceded by 2 newlines or hit the start of
+                    #   the document.
+                    if start_idx == 0:
+                        pass
+                    elif start_idx == 1 and text[0] == '\n':
+                        start_idx = 0  # to match minute detail of Markdown.pl regex
+                    elif text[start_idx-2:start_idx] == '\n\n':
+                        pass
+                    else:
+                        break
+
+                # Validate whitespace after comment.
+                # - Any number of spaces and tabs.
+                while end_idx < len(text):
+                    if text[end_idx] not in ' \t':
+                        break
+                    end_idx += 1
+                # - Must be following by 2 newlines or hit end of text.
+                if text[end_idx:end_idx+2] not in ('', '\n', '\n\n'):
+                    continue
+
+                # Escape and hash (must match `_hash_html_block_sub`).
+                html = text[start_idx:end_idx]
+                if raw and self.safe_mode:
+                    html = self._sanitize_html(html)
+                key = _hash_text(html)
+                self.html_blocks[key] = html
+                text = text[:start_idx] + "\n\n" + key + "\n\n" + text[end_idx:]
+
+        if "xml" in self.extras:
+            # Treat XML processing instructions and namespaced one-liner
+            # tags as if they were block HTML tags. E.g., if standalone
+            # (i.e. are their own paragraph), the following do not get 
+            # wrapped in a <p> tag:
+            #    <?foo bar?>
+            #
+            #    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter_1.md"/>
+            _xml_oneliner_re = _xml_oneliner_re_from_tab_width(self.tab_width)
+            text = _xml_oneliner_re.sub(hash_html_block_sub, text)
+
+        return text
+
+    def _strip_link_definitions(self, text):
+        # Strips link definitions from text, stores the URLs and titles in
+        # hash references.
+        less_than_tab = self.tab_width - 1
+    
+        # Link defs are in the form:
+        #   [id]: url "optional title"
+        _link_def_re = re.compile(r"""
+            ^[ ]{0,%d}\[(.+)\]: # id = \1
+              [ \t]*
+              \n?               # maybe *one* newline
+              [ \t]*
+            <?(.+?)>?           # url = \2
+              [ \t]*
+            (?:
+                \n?             # maybe one newline
+                [ \t]*
+                (?<=\s)         # lookbehind for whitespace
+                ['"(]
+                ([^\n]*)        # title = \3
+                ['")]
+                [ \t]*
+            )?  # title is optional
+            (?:\n+|\Z)
+            """ % less_than_tab, re.X | re.M | re.U)
+        return _link_def_re.sub(self._extract_link_def_sub, text)
+
+    def _extract_link_def_sub(self, match):
+        id, url, title = match.groups()
+        key = id.lower()    # Link IDs are case-insensitive
+        self.urls[key] = self._encode_amps_and_angles(url)
+        if title:
+            self.titles[key] = title.replace('"', '&quot;')
+        return ""
+
+    def _extract_footnote_def_sub(self, match):
+        id, text = match.groups()
+        text = _dedent(text, skip_first_line=not text.startswith('\n')).strip()
+        normed_id = re.sub(r'\W', '-', id)
+        # Ensure footnote text ends with a couple newlines (for some
+        # block gamut matches).
+        self.footnotes[normed_id] = text + "\n\n"
+        return ""
+
+    def _strip_footnote_definitions(self, text):
+        """A footnote definition looks like this:
+
+            [^note-id]: Text of the note.
+
+                May include one or more indented paragraphs.
+
+        Where,
+        - The 'note-id' can be pretty much anything, though typically it
+          is the number of the footnote.
+        - The first paragraph may start on the next line, like so:
+            
+            [^note-id]:
+                Text of the note.
+        """
+        less_than_tab = self.tab_width - 1
+        footnote_def_re = re.compile(r'''
+            ^[ ]{0,%d}\[\^(.+)\]:   # id = \1
+            [ \t]*
+            (                       # footnote text = \2
+              # First line need not start with the spaces.
+              (?:\s*.*\n+)
+              (?:
+                (?:[ ]{%d} | \t)  # Subsequent lines must be indented.
+                .*\n+
+              )*
+            )
+            # Lookahead for non-space at line-start, or end of doc.
+            (?:(?=^[ ]{0,%d}\S)|\Z)
+            ''' % (less_than_tab, self.tab_width, self.tab_width),
+            re.X | re.M)
+        return footnote_def_re.sub(self._extract_footnote_def_sub, text)
+
+
+    _hr_res = [
+        re.compile(r"^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$", re.M),
+        re.compile(r"^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$", re.M),
+        re.compile(r"^[ ]{0,2}([ ]?\_[ ]?){3,}[ \t]*$", re.M),
+    ]
+
+    def _run_block_gamut(self, text):
+        # These are all the transformations that form block-level
+        # tags like paragraphs, headers, and list items.
+
+        text = self._do_headers(text)
+
+        # Do Horizontal Rules:
+        hr = "\n<hr"+self.empty_element_suffix+"\n"
+        for hr_re in self._hr_res:
+            text = hr_re.sub(hr, text)
+
+        text = self._do_lists(text)
+
+        if "pyshell" in self.extras:
+            text = self._prepare_pyshell_blocks(text)
+
+        text = self._do_code_blocks(text)
+
+        text = self._do_block_quotes(text)
+
+        # We already ran _HashHTMLBlocks() before, in Markdown(), but that
+        # was to escape raw HTML in the original Markdown source. This time,
+        # we're escaping the markup we've just created, so that we don't wrap
+        # <p> tags around block-level tags.
+        text = self._hash_html_blocks(text)
+
+        text = self._form_paragraphs(text)
+
+        return text
+
+    def _pyshell_block_sub(self, match):
+        lines = match.group(0).splitlines(0)
+        _dedentlines(lines)
+        indent = ' ' * self.tab_width
+        s = ('\n' # separate from possible cuddled paragraph
+             + indent + ('\n'+indent).join(lines)
+             + '\n\n')
+        return s
+        
+    def _prepare_pyshell_blocks(self, text):
+        """Ensure that Python interactive shell sessions are put in
+        code blocks -- even if not properly indented.
+        """
+        if ">>>" not in text:
+            return text
+
+        less_than_tab = self.tab_width - 1
+        _pyshell_block_re = re.compile(r"""
+            ^([ ]{0,%d})>>>[ ].*\n   # first line
+            ^(\1.*\S+.*\n)*         # any number of subsequent lines
+            ^\n                     # ends with a blank line
+            """ % less_than_tab, re.M | re.X)
+
+        return _pyshell_block_re.sub(self._pyshell_block_sub, text)
+
+    def _run_span_gamut(self, text):
+        # These are all the transformations that occur *within* block-level
+        # tags like paragraphs, headers, and list items.
+    
+        text = self._do_code_spans(text)
+    
+        text = self._escape_special_chars(text)
+    
+        # Process anchor and image tags.
+        text = self._do_links(text)
+    
+        # Make links out of things like `<http://example.com/>`
+        # Must come after _do_links(), because you can use < and >
+        # delimiters in inline links like [this](<url>).
+        text = self._do_auto_links(text)
+
+        if "link-patterns" in self.extras:
+            text = self._do_link_patterns(text)
+    
+        text = self._encode_amps_and_angles(text)
+    
+        text = self._do_italics_and_bold(text)
+    
+        # Do hard breaks:
+        text = re.sub(r" {2,}\n", " <br%s\n" % self.empty_element_suffix, text)
+    
+        return text
+
+    # "Sorta" because auto-links are identified as "tag" tokens.
+    _sorta_html_tokenize_re = re.compile(r"""
+        (
+            # tag
+            </?         
+            (?:\w+)                                     # tag name
+            (?:\s+(?:[\w-]+:)?[\w-]+=(?:".*?"|'.*?'))*  # attributes
+            \s*/?>
+            |
+            # auto-link (e.g., <http://www.activestate.com/>)
+            <\w+[^>]*>
+            |
+            <!--.*?-->      # comment
+            |
+            <\?.*?\?>       # processing instruction
+        )
+        """, re.X)
+    
+    def _escape_special_chars(self, text):
+        # Python markdown note: the HTML tokenization here differs from
+        # that in Markdown.pl, hence the behaviour for subtle cases can
+        # differ (I believe the tokenizer here does a better job because
+        # it isn't susceptible to unmatched '<' and '>' in HTML tags).
+        # Note, however, that '>' is not allowed in an auto-link URL
+        # here.
+        escaped = []
+        is_html_markup = False
+        for token in self._sorta_html_tokenize_re.split(text):
+            if is_html_markup:
+                # Within tags/HTML-comments/auto-links, encode * and _
+                # so they don't conflict with their use in Markdown for
+                # italics and strong.  We're replacing each such
+                # character with its corresponding MD5 checksum value;
+                # this is likely overkill, but it should prevent us from
+                # colliding with the escape values by accident.
+                escaped.append(token.replace('*', g_escape_table['*'])
+                                    .replace('_', g_escape_table['_']))
+            else:
+                escaped.append(self._encode_backslash_escapes(token))
+            is_html_markup = not is_html_markup
+        return ''.join(escaped)
+
+    def _hash_html_spans(self, text):
+        # Used for safe_mode.
+
+        def _is_auto_link(s):
+            if ':' in s and self._auto_link_re.match(s):
+                return True
+            elif '@' in s and self._auto_email_link_re.match(s):
+                return True
+            return False
+
+        tokens = []
+        is_html_markup = False
+        for token in self._sorta_html_tokenize_re.split(text):
+            if is_html_markup and not _is_auto_link(token):
+                sanitized = self._sanitize_html(token)
+                key = _hash_text(sanitized)
+                self.html_spans[key] = sanitized
+                tokens.append(key)
+            else:
+                tokens.append(token)
+            is_html_markup = not is_html_markup
+        return ''.join(tokens)
+
+    def _unhash_html_spans(self, text):
+        for key, sanitized in self.html_spans.items():
+            text = text.replace(key, sanitized)
+        return text
+
+    def _sanitize_html(self, s):
+        if self.safe_mode == "replace":
+            return self.html_removed_text
+        elif self.safe_mode == "escape":
+            replacements = [
+                ('&', '&amp;'),
+                ('<', '&lt;'),
+                ('>', '&gt;'),
+            ]
+            for before, after in replacements:
+                s = s.replace(before, after)
+            return s
+        else:
+            raise MarkdownError("invalid value for 'safe_mode': %r (must be "
+                                "'escape' or 'replace')" % self.safe_mode)
+
+    _tail_of_inline_link_re = re.compile(r'''
+          # Match tail of: [text](/url/) or [text](/url/ "title")
+          \(            # literal paren
+            [ \t]*
+            (?P<url>            # \1
+                <.*?>
+                |
+                .*?
+            )
+            [ \t]*
+            (                   # \2
+              (['"])            # quote char = \3
+              (?P<title>.*?)
+              \3                # matching quote
+            )?                  # title is optional
+          \)
+        ''', re.X | re.S)
+    _tail_of_reference_link_re = re.compile(r'''
+          # Match tail of: [text][id]
+          [ ]?          # one optional space
+          (?:\n[ ]*)?   # one optional newline followed by spaces
+          \[
+            (?P<id>.*?)
+          \]
+        ''', re.X | re.S)
+
+    def _do_links(self, text):
+        """Turn Markdown link shortcuts into XHTML <a> and <img> tags.
+
+        This is a combination of Markdown.pl's _DoAnchors() and
+        _DoImages(). They are done together because that simplified the
+        approach. It was necessary to use a different approach than
+        Markdown.pl because of the lack of atomic matching support in
+        Python's regex engine used in $g_nested_brackets.
+        """
+        MAX_LINK_TEXT_SENTINEL = 3000  # markdown2 issue 24
+
+        # `anchor_allowed_pos` is used to support img links inside
+        # anchors, but not anchors inside anchors. An anchor's start
+        # pos must be `>= anchor_allowed_pos`.
+        anchor_allowed_pos = 0
+
+        curr_pos = 0
+        while True: # Handle the next link.
+            # The next '[' is the start of:
+            # - an inline anchor:   [text](url "title")
+            # - a reference anchor: [text][id]
+            # - an inline img:      ![text](url "title")
+            # - a reference img:    ![text][id]
+            # - a footnote ref:     [^id]
+            #   (Only if 'footnotes' extra enabled)
+            # - a footnote defn:    [^id]: ...
+            #   (Only if 'footnotes' extra enabled) These have already
+            #   been stripped in _strip_footnote_definitions() so no
+            #   need to watch for them.
+            # - a link definition:  [id]: url "title"
+            #   These have already been stripped in
+            #   _strip_link_definitions() so no need to watch for them.
+            # - not markup:         [...anything else...
+            try:
+                start_idx = text.index('[', curr_pos)
+            except ValueError:
+                break
+            text_length = len(text)
+
+            # Find the matching closing ']'.
+            # Markdown.pl allows *matching* brackets in link text so we
+            # will here too. Markdown.pl *doesn't* currently allow
+            # matching brackets in img alt text -- we'll differ in that
+            # regard.
+            bracket_depth = 0
+            for p in range(start_idx+1, min(start_idx+MAX_LINK_TEXT_SENTINEL, 
+                                            text_length)):
+                ch = text[p]
+                if ch == ']':
+                    bracket_depth -= 1
+                    if bracket_depth < 0:
+                        break
+                elif ch == '[':
+                    bracket_depth += 1
+            else:
+                # Closing bracket not found within sentinel length.
+                # This isn't markup.
+                curr_pos = start_idx + 1
+                continue
+            link_text = text[start_idx+1:p]
+
+            # Possibly a footnote ref?
+            if "footnotes" in self.extras and link_text.startswith("^"):
+                normed_id = re.sub(r'\W', '-', link_text[1:])
+                if normed_id in self.footnotes:
+                    self.footnote_ids.append(normed_id)
+                    result = '<sup class="footnote-ref" id="fnref-%s">' \
+                             '<a href="#fn-%s">%s</a></sup>' \
+                             % (normed_id, normed_id, len(self.footnote_ids))
+                    text = text[:start_idx] + result + text[p+1:]
+                else:
+                    # This id isn't defined, leave the markup alone.
+                    curr_pos = p+1
+                continue
+
+            # Now determine what this is by the remainder.
+            p += 1
+            if p == text_length:
+                return text
+
+            # Inline anchor or img?
+            if text[p] == '(': # attempt at perf improvement
+                match = self._tail_of_inline_link_re.match(text, p)
+                if match:
+                    # Handle an inline anchor or img.
+                    is_img = start_idx > 0 and text[start_idx-1] == "!"
+                    if is_img:
+                        start_idx -= 1
+
+                    url, title = match.group("url"), match.group("title")
+                    if url and url[0] == '<':
+                        url = url[1:-1]  # '<url>' -> 'url'
+                    # We've got to encode these to avoid conflicting
+                    # with italics/bold.
+                    url = url.replace('*', g_escape_table['*']) \
+                             .replace('_', g_escape_table['_'])
+                    if title:
+                        title_str = ' title="%s"' \
+                            % title.replace('*', g_escape_table['*']) \
+                                   .replace('_', g_escape_table['_']) \
+                                   .replace('"', '&quot;')
+                    else:
+                        title_str = ''
+                    if is_img:
+                        result = '<img src="%s" alt="%s"%s%s' \
+                            % (url, link_text.replace('"', '&quot;'),
+                               title_str, self.empty_element_suffix)
+                        curr_pos = start_idx + len(result)
+                        text = text[:start_idx] + result + text[match.end():]
+                    elif start_idx >= anchor_allowed_pos:
+                        result_head = '<a href="%s"%s>' % (url, title_str)
+                        result = '%s%s</a>' % (result_head, link_text)
+                        # <img> allowed from curr_pos on, <a> from
+                        # anchor_allowed_pos on.
+                        curr_pos = start_idx + len(result_head)
+                        anchor_allowed_pos = start_idx + len(result)
+                        text = text[:start_idx] + result + text[match.end():]
+                    else:
+                        # Anchor not allowed here.
+                        curr_pos = start_idx + 1
+                    continue
+
+            # Reference anchor or img?
+            else:
+                match = self._tail_of_reference_link_re.match(text, p)
+                if match:
+                    # Handle a reference-style anchor or img.
+                    is_img = start_idx > 0 and text[start_idx-1] == "!"
+                    if is_img:
+                        start_idx -= 1
+                    link_id = match.group("id").lower()
+                    if not link_id:
+                        link_id = link_text.lower()  # for links like [this][]
+                    if link_id in self.urls:
+                        url = self.urls[link_id]
+                        # We've got to encode these to avoid conflicting
+                        # with italics/bold.
+                        url = url.replace('*', g_escape_table['*']) \
+                                 .replace('_', g_escape_table['_'])
+                        title = self.titles.get(link_id)
+                        if title:
+                            title = title.replace('*', g_escape_table['*']) \
+                                         .replace('_', g_escape_table['_'])
+                            title_str = ' title="%s"' % title
+                        else:
+                            title_str = ''
+                        if is_img:
+                            result = '<img src="%s" alt="%s"%s%s' \
+                                % (url, link_text.replace('"', '&quot;'),
+                                   title_str, self.empty_element_suffix)
+                            curr_pos = start_idx + len(result)
+                            text = text[:start_idx] + result + text[match.end():]
+                        elif start_idx >= anchor_allowed_pos:
+                            result = '<a href="%s"%s>%s</a>' \
+                                % (url, title_str, link_text)
+                            result_head = '<a href="%s"%s>' % (url, title_str)
+                            result = '%s%s</a>' % (result_head, link_text)
+                            # <img> allowed from curr_pos on, <a> from
+                            # anchor_allowed_pos on.
+                            curr_pos = start_idx + len(result_head)
+                            anchor_allowed_pos = start_idx + len(result)
+                            text = text[:start_idx] + result + text[match.end():]
+                        else:
+                            # Anchor not allowed here.
+                            curr_pos = start_idx + 1
+                    else:
+                        # This id isn't defined, leave the markup alone.
+                        curr_pos = match.end()
+                    continue
+
+            # Otherwise, it isn't markup.
+            curr_pos = start_idx + 1
+
+        return text 
+
+
+    _setext_h_re = re.compile(r'^(.+)[ \t]*\n(=+|-+)[ \t]*\n+', re.M)
+    def _setext_h_sub(self, match):
+        n = {"=": 1, "-": 2}[match.group(2)[0]]
+        demote_headers = self.extras.get("demote-headers")
+        if demote_headers:
+            n = min(n + demote_headers, 6)
+        return "<h%d>%s</h%d>\n\n" \
+               % (n, self._run_span_gamut(match.group(1)), n)
+
+    _atx_h_re = re.compile(r'''
+        ^(\#{1,6})  # \1 = string of #'s
+        [ \t]*
+        (.+?)       # \2 = Header text
+        [ \t]*
+        (?<!\\)     # ensure not an escaped trailing '#'
+        \#*         # optional closing #'s (not counted)
+        \n+
+        ''', re.X | re.M)
+    def _atx_h_sub(self, match):
+        n = len(match.group(1))
+        demote_headers = self.extras.get("demote-headers")
+        if demote_headers:
+            n = min(n + demote_headers, 6)
+        return "<h%d>%s</h%d>\n\n" \
+               % (n, self._run_span_gamut(match.group(2)), n)
+
+    def _do_headers(self, text):
+        # Setext-style headers:
+        #     Header 1
+        #     ========
+        #  
+        #     Header 2
+        #     --------
+        text = self._setext_h_re.sub(self._setext_h_sub, text)
+
+        # atx-style headers:
+        #   # Header 1
+        #   ## Header 2
+        #   ## Header 2 with closing hashes ##
+        #   ...
+        #   ###### Header 6
+        text = self._atx_h_re.sub(self._atx_h_sub, text)
+
+        return text
+
+
+    _marker_ul_chars  = '*+-'
+    _marker_any = r'(?:[%s]|\d+\.)' % _marker_ul_chars
+    _marker_ul = '(?:[%s])' % _marker_ul_chars
+    _marker_ol = r'(?:\d+\.)'
+
+    def _list_sub(self, match):
+        lst = match.group(1)
+        lst_type = match.group(3) in self._marker_ul_chars and "ul" or "ol"
+        result = self._process_list_items(lst)
+        if self.list_level:
+            return "<%s>\n%s</%s>\n" % (lst_type, result, lst_type)
+        else:
+            return "<%s>\n%s</%s>\n\n" % (lst_type, result, lst_type)
+
+    def _do_lists(self, text):
+        # Form HTML ordered (numbered) and unordered (bulleted) lists.
+
+        for marker_pat in (self._marker_ul, self._marker_ol):
+            # Re-usable pattern to match any entire ul or ol list:
+            less_than_tab = self.tab_width - 1
+            whole_list = r'''
+                (                   # \1 = whole list
+                  (                 # \2
+                    [ ]{0,%d}
+                    (%s)            # \3 = first list item marker
+                    [ \t]+
+                  )
+                  (?:.+?)
+                  (                 # \4
+                      \Z
+                    |
+                      \n{2,}
+                      (?=\S)
+                      (?!           # Negative lookahead for another list item marker
+                        [ \t]*
+                        %s[ \t]+
+                      )
+                  )
+                )
+            ''' % (less_than_tab, marker_pat, marker_pat)
+        
+            # We use a different prefix before nested lists than top-level lists.
+            # See extended comment in _process_list_items().
+            #
+            # Note: There's a bit of duplication here. My original implementation
+            # created a scalar regex pattern as the conditional result of the test on
+            # $g_list_level, and then only ran the $text =~ s{...}{...}egmx
+            # substitution once, using the scalar as the pattern. This worked,
+            # everywhere except when running under MT on my hosting account at Pair
+            # Networks. There, this caused all rebuilds to be killed by the reaper (or
+            # perhaps they crashed, but that seems incredibly unlikely given that the
+            # same script on the same server ran fine *except* under MT. I've spent
+            # more time trying to figure out why this is happening than I'd like to
+            # admit. My only guess, backed up by the fact that this workaround works,
+            # is that Perl optimizes the substition when it can figure out that the
+            # pattern will never change, and when this optimization isn't on, we run
+            # afoul of the reaper. Thus, the slightly redundant code to that uses two
+            # static s/// patterns rather than one conditional pattern.
+
+            if self.list_level:
+                sub_list_re = re.compile("^"+whole_list, re.X | re.M | re.S)
+                text = sub_list_re.sub(self._list_sub, text)
+            else:
+                list_re = re.compile(r"(?:(?<=\n\n)|\A\n?)"+whole_list,
+                                     re.X | re.M | re.S)
+                text = list_re.sub(self._list_sub, text)
+
+        return text
+    
+    _list_item_re = re.compile(r'''
+        (\n)?               # leading line = \1
+        (^[ \t]*)           # leading whitespace = \2
+        (%s) [ \t]+         # list marker = \3
+        ((?:.+?)            # list item text = \4
+         (\n{1,2}))         # eols = \5
+        (?= \n* (\Z | \2 (%s) [ \t]+))
+        ''' % (_marker_any, _marker_any),
+        re.M | re.X | re.S)
+
+    _last_li_endswith_two_eols = False
+    def _list_item_sub(self, match):
+        item = match.group(4)
+        leading_line = match.group(1)
+        leading_space = match.group(2)
+        if leading_line or "\n\n" in item or self._last_li_endswith_two_eols:
+            item = self._run_block_gamut(self._outdent(item))
+        else:
+            # Recursion for sub-lists:
+            item = self._do_lists(self._outdent(item))
+            if item.endswith('\n'):
+                item = item[:-1]
+            item = self._run_span_gamut(item)
+        self._last_li_endswith_two_eols = (len(match.group(5)) == 2)
+        return "<li>%s</li>\n" % item
+
+    def _process_list_items(self, list_str):
+        # Process the contents of a single ordered or unordered list,
+        # splitting it into individual list items.
+    
+        # The $g_list_level global keeps track of when we're inside a list.
+        # Each time we enter a list, we increment it; when we leave a list,
+        # we decrement. If it's zero, we're not in a list anymore.
+        #
+        # We do this because when we're not inside a list, we want to treat
+        # something like this:
+        #
+        #       I recommend upgrading to version
+        #       8. Oops, now this line is treated
+        #       as a sub-list.
+        #
+        # As a single paragraph, despite the fact that the second line starts
+        # with a digit-period-space sequence.
+        #
+        # Whereas when we're inside a list (or sub-list), that line will be
+        # treated as the start of a sub-list. What a kludge, huh? This is
+        # an aspect of Markdown's syntax that's hard to parse perfectly
+        # without resorting to mind-reading. Perhaps the solution is to
+        # change the syntax rules such that sub-lists must start with a
+        # starting cardinal number; e.g. "1." or "a.".
+        self.list_level += 1
+        self._last_li_endswith_two_eols = False
+        list_str = list_str.rstrip('\n') + '\n'
+        list_str = self._list_item_re.sub(self._list_item_sub, list_str)
+        self.list_level -= 1
+        return list_str
+
+    def _get_pygments_lexer(self, lexer_name):
+        try:
+            from pygments import lexers, util
+        except ImportError:
+            return None
+        try:
+            return lexers.get_lexer_by_name(lexer_name)
+        except util.ClassNotFound:
+            return None
+
+    def _color_with_pygments(self, codeblock, lexer, **formatter_opts):
+        import pygments
+        import pygments.formatters
+
+        class HtmlCodeFormatter(pygments.formatters.HtmlFormatter):
+            def _wrap_code(self, inner):
+                """A function for use in a Pygments Formatter which
+                wraps in <code> tags.
+                """
+                yield 0, "<code>"
+                for tup in inner:
+                    yield tup 
+                yield 0, "</code>"
+
+            def wrap(self, source, outfile):
+                """Return the source with a code, pre, and div."""
+                return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
+
+        formatter = HtmlCodeFormatter(cssclass="codehilite", **formatter_opts)
+        return pygments.highlight(codeblock, lexer, formatter)
+
+    def _code_block_sub(self, match):
+        codeblock = match.group(1)
+        codeblock = self._outdent(codeblock)
+        codeblock = self._detab(codeblock)
+        codeblock = codeblock.lstrip('\n')  # trim leading newlines
+        codeblock = codeblock.rstrip()      # trim trailing whitespace
+
+        if "code-color" in self.extras and codeblock.startswith(":::"):
+            lexer_name, rest = codeblock.split('\n', 1)
+            lexer_name = lexer_name[3:].strip()
+            lexer = self._get_pygments_lexer(lexer_name)
+            codeblock = rest.lstrip("\n")   # Remove lexer declaration line.
+            if lexer:
+                formatter_opts = self.extras['code-color'] or {}
+                colored = self._color_with_pygments(codeblock, lexer,
+                                                    **formatter_opts)
+                return "\n\n%s\n\n" % colored
+
+        codeblock = self._encode_code(codeblock)
+        return "\n\n<pre><code>%s\n</code></pre>\n\n" % codeblock
+
+    def _do_code_blocks(self, text):
+        """Process Markdown `<pre><code>` blocks."""
+        code_block_re = re.compile(r'''
+            (?:\n\n|\A)
+            (               # $1 = the code block -- one or more lines, starting with a space/tab
+              (?:
+                (?:[ ]{%d} | \t)  # Lines must start with a tab or a tab-width of spaces
+                .*\n+
+              )+
+            )
+            ((?=^[ ]{0,%d}\S)|\Z)   # Lookahead for non-space at line-start, or end of doc
+            ''' % (self.tab_width, self.tab_width),
+            re.M | re.X)
+
+        return code_block_re.sub(self._code_block_sub, text)
+
+
+    # Rules for a code span:
+    # - backslash escapes are not interpreted in a code span
+    # - to include one or or a run of more backticks the delimiters must
+    #   be a longer run of backticks
+    # - cannot start or end a code span with a backtick; pad with a
+    #   space and that space will be removed in the emitted HTML
+    # See `test/tm-cases/escapes.text` for a number of edge-case
+    # examples.
+    _code_span_re = re.compile(r'''
+            (?<!\\)
+            (`+)        # \1 = Opening run of `
+            (?!`)       # See Note A test/tm-cases/escapes.text
+            (.+?)       # \2 = The code block
+            (?<!`)
+            \1          # Matching closer
+            (?!`)
+        ''', re.X | re.S)
+
+    def _code_span_sub(self, match):
+        c = match.group(2).strip(" \t")
+        c = self._encode_code(c)
+        return "<code>%s</code>" % c
+
+    def _do_code_spans(self, text):
+        #   *   Backtick quotes are used for <code></code> spans.
+        # 
+        #   *   You can use multiple backticks as the delimiters if you want to
+        #       include literal backticks in the code span. So, this input:
+        #     
+        #         Just type ``foo `bar` baz`` at the prompt.
+        #     
+        #       Will translate to:
+        #     
+        #         <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
+        #     
+        #       There's no arbitrary limit to the number of backticks you
+        #       can use as delimters. If you need three consecutive backticks
+        #       in your code, use four for delimiters, etc.
+        #
+        #   *   You can use spaces to get literal backticks at the edges:
+        #     
+        #         ... type `` `bar` `` ...
+        #     
+        #       Turns to:
+        #     
+        #         ... type <code>`bar`</code> ...
+        return self._code_span_re.sub(self._code_span_sub, text)
+
+    def _encode_code(self, text):
+        """Encode/escape certain characters inside Markdown code runs.
+        The point is that in code, these characters are literals,
+        and lose their special Markdown meanings.
+        """
+        replacements = [
+            # Encode all ampersands; HTML entities are not
+            # entities within a Markdown code span.
+            ('&', '&amp;'),
+            # Do the angle bracket song and dance:
+            ('<', '&lt;'),
+            ('>', '&gt;'),
+            # Now, escape characters that are magic in Markdown:
+            ('*', g_escape_table['*']),
+            ('_', g_escape_table['_']),
+            ('{', g_escape_table['{']),
+            ('}', g_escape_table['}']),
+            ('[', g_escape_table['[']),
+            (']', g_escape_table[']']),
+            ('\\', g_escape_table['\\']),
+        ]
+        for before, after in replacements:
+            text = text.replace(before, after)
+        return text
+
+    _strong_re = re.compile(r"(\*\*|__)(?=\S)(.+?[*_]*)(?<=\S)\1", re.S)
+    _em_re = re.compile(r"(\*|_)(?=\S)(.+?)(?<=\S)\1", re.S)
+    _code_friendly_strong_re = re.compile(r"\*\*(?=\S)(.+?[*_]*)(?<=\S)\*\*", re.S)
+    _code_friendly_em_re = re.compile(r"\*(?=\S)(.+?)(?<=\S)\*", re.S)
+    def _do_italics_and_bold(self, text):
+        # <strong> must go first:
+        if "code-friendly" in self.extras:
+            text = self._code_friendly_strong_re.sub(r"<strong>\1</strong>", text)
+            text = self._code_friendly_em_re.sub(r"<em>\1</em>", text)
+        else:
+            text = self._strong_re.sub(r"<strong>\2</strong>", text)
+            text = self._em_re.sub(r"<em>\2</em>", text)
+        return text
+    
+
+    _block_quote_re = re.compile(r'''
+        (                           # Wrap whole match in \1
+          (
+            ^[ \t]*>[ \t]?          # '>' at the start of a line
+              .+\n                  # rest of the first line
+            (.+\n)*                 # subsequent consecutive lines
+            \n*                     # blanks
+          )+
+        )
+        ''', re.M | re.X)
+    _bq_one_level_re = re.compile('^[ \t]*>[ \t]?', re.M);
+
+    _html_pre_block_re = re.compile(r'(\s*<pre>.+?</pre>)', re.S)
+    def _dedent_two_spaces_sub(self, match):
+        return re.sub(r'(?m)^  ', '', match.group(1))
+
+    def _block_quote_sub(self, match):
+        bq = match.group(1)
+        bq = self._bq_one_level_re.sub('', bq)  # trim one level of quoting
+        bq = self._ws_only_line_re.sub('', bq)  # trim whitespace-only lines
+        bq = self._run_block_gamut(bq)          # recurse
+
+        bq = re.sub('(?m)^', '  ', bq)
+        # These leading spaces screw with <pre> content, so we need to fix that:
+        bq = self._html_pre_block_re.sub(self._dedent_two_spaces_sub, bq)
+
+        return "<blockquote>\n%s\n</blockquote>\n\n" % bq
+
+    def _do_block_quotes(self, text):
+        if '>' not in text:
+            return text
+        return self._block_quote_re.sub(self._block_quote_sub, text)
+
+    def _form_paragraphs(self, text):
+        # Strip leading and trailing lines:
+        text = text.strip('\n')
+
+        # Wrap <p> tags.
+        grafs = re.split(r"\n{2,}", text)
+        for i, graf in enumerate(grafs):
+            if graf in self.html_blocks:
+                # Unhashify HTML blocks
+                grafs[i] = self.html_blocks[graf]
+            else:
+                # Wrap <p> tags.
+                graf = self._run_span_gamut(graf)
+                grafs[i] = "<p>" + graf.lstrip(" \t") + "</p>"
+
+        return "\n\n".join(grafs)
+
+    def _add_footnotes(self, text):
+        if self.footnotes:
+            footer = [
+                '<div class="footnotes">',
+                '<hr' + self.empty_element_suffix,
+                '<ol>',
+            ]
+            for i, id in enumerate(self.footnote_ids):
+                if i != 0:
+                    footer.append('')
+                footer.append('<li id="fn-%s">' % id)
+                footer.append(self._run_block_gamut(self.footnotes[id]))
+                backlink = ('<a href="#fnref-%s" '
+                    'class="footnoteBackLink" '
+                    'title="Jump back to footnote %d in the text.">'
+                    '&#8617;</a>' % (id, i+1))
+                if footer[-1].endswith("</p>"):
+                    footer[-1] = footer[-1][:-len("</p>")] \
+                        + '&nbsp;' + backlink + "</p>"
+                else:
+                    footer.append("\n<p>%s</p>" % backlink)
+                footer.append('</li>')
+            footer.append('</ol>')
+            footer.append('</div>')
+            return text + '\n\n' + '\n'.join(footer)
+        else:
+            return text
+
+    # Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
+    #   http://bumppo.net/projects/amputator/
+    _ampersand_re = re.compile(r'&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)')
+    _naked_lt_re = re.compile(r'<(?![a-z/?\$!])', re.I)
+    _naked_gt_re = re.compile(r'''(?<![a-z?!/'"-])>''', re.I)
+
+    def _encode_amps_and_angles(self, text):
+        # Smart processing for ampersands and angle brackets that need
+        # to be encoded.
+        text = self._ampersand_re.sub('&amp;', text)
+    
+        # Encode naked <'s
+        text = self._naked_lt_re.sub('&lt;', text)
+
+        # Encode naked >'s
+        # Note: Other markdown implementations (e.g. Markdown.pl, PHP
+        # Markdown) don't do this.
+        text = self._naked_gt_re.sub('&gt;', text)
+        return text
+
+    def _encode_backslash_escapes(self, text):
+        for ch, escape in g_escape_table.items():
+            text = text.replace("\\"+ch, escape)
+        return text
+
+    _auto_link_re = re.compile(r'<((https?|ftp):[^\'">\s]+)>', re.I)
+    def _auto_link_sub(self, match):
+        g1 = match.group(1)
+        return '<a href="%s">%s</a>' % (g1, g1)
+
+    _auto_email_link_re = re.compile(r"""
+          <
+           (?:mailto:)?
+          (
+              [-.\w]+
+              \@
+              [-\w]+(\.[-\w]+)*\.[a-z]+
+          )
+          >
+        """, re.I | re.X | re.U)
+    def _auto_email_link_sub(self, match):
+        return self._encode_email_address(
+            self._unescape_special_chars(match.group(1)))
+
+    def _do_auto_links(self, text):
+        text = self._auto_link_re.sub(self._auto_link_sub, text)
+        text = self._auto_email_link_re.sub(self._auto_email_link_sub, text)
+        return text
+
+    def _encode_email_address(self, addr):
+        #  Input: an email address, e.g. "[e-mail]"
+        #
+        #  Output: the email address as a mailto link, with each character
+        #      of the address encoded as either a decimal or hex entity, in
+        #      the hopes of foiling most address harvesting spam bots. E.g.:
+        #
+        #    <a href="&#x6D;&#97;&#105;&#108;&#x74;&#111;:&#102;&#111;&#111;&#64;&#101;
+        #       x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;">&#102;&#111;&#111;
+        #       &#64;&#101;x&#x61;&#109;&#x70;&#108;&#x65;&#x2E;&#99;&#111;&#109;</a>
+        #
+        #  Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
+        #  mailing list: <http://tinyurl.com/yu7ue>
+        chars = [_xml_encode_email_char_at_random(ch)
+                 for ch in "mailto:" + addr]
+        # Strip the mailto: from the visible part.
+        addr = '<a href="%s">%s</a>' \
+               % (''.join(chars), ''.join(chars[7:]))
+        return addr
+    
+    def _do_link_patterns(self, text):
+        """Caveat emptor: there isn't much guarding against link
+        patterns being formed inside other standard Markdown links, e.g.
+        inside a [link def][like this].
+
+        Dev Notes: *Could* consider prefixing regexes with a negative
+        lookbehind assertion to attempt to guard against this.
+        """
+        link_from_hash = {}
+        for regex, repl in self.link_patterns:
+            replacements = []
+            for match in regex.finditer(text):
+                if hasattr(repl, "__call__"):
+                    href = repl(match)
+                else:
+                    href = match.expand(repl)
+                replacements.append((match.span(), href))
+            for (start, end), href in reversed(replacements):
+                escaped_href = (
+                    href.replace('"', '&quot;')  # b/c of attr quote
+                        # To avoid markdown <em> and <strong>:
+                        .replace('*', g_escape_table['*'])
+                        .replace('_', g_escape_table['_']))
+                link = '<a href="%s">%s</a>' % (escaped_href, text[start:end])
+                hash = md5(link).hexdigest()
+                link_from_hash[hash] = link
+                text = text[:start] + hash + text[end:]
+        for hash, link in link_from_hash.items():
+            text = text.replace(hash, link)
+        return text
+    
+    def _unescape_special_chars(self, text):
+        # Swap back in all the special characters we've hidden.
+        for ch, hash in g_escape_table.items():
+            text = text.replace(hash, ch)
+        return text
+
+    def _outdent(self, text):
+        # Remove one level of line-leading tabs or spaces
+        return self._outdent_re.sub('', text)
+
+
+class MarkdownWithExtras(Markdown):
+    """A markdowner class that enables most extras:
+
+    - footnotes
+    - code-color (only has effect if 'pygments' Python module on path)
+
+    These are not included:
+    - pyshell (specific to Python-related documenting)
+    - code-friendly (because it *disables* part of the syntax)
+    - link-patterns (because you need to specify some actual
+      link-patterns anyway)
+    """
+    extras = ["footnotes", "code-color"]
+
+
+#---- internal support functions
+
+# From http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52549
+def _curry(*args, **kwargs):
+    function, args = args[0], args[1:]
+    def result(*rest, **kwrest):
+        combined = kwargs.copy()
+        combined.update(kwrest)
+        return function(*args + rest, **combined)
+    return result
+
+# Recipe: regex_from_encoded_pattern (1.0)
+def _regex_from_encoded_pattern(s):
+    """'foo'    -> re.compile(re.escape('foo'))
+       '/foo/'  -> re.compile('foo')
+       '/foo/i' -> re.compile('foo', re.I)
+    """
+    if s.startswith('/') and s.rfind('/') != 0:
+        # Parse it: /PATTERN/FLAGS
+        idx = s.rfind('/')
+        pattern, flags_str = s[1:idx], s[idx+1:]
+        flag_from_char = {
+            "i": re.IGNORECASE,
+            "l": re.LOCALE,
+            "s": re.DOTALL,
+            "m": re.MULTILINE,
+            "u": re.UNICODE,
+        }
+        flags = 0
+        for char in flags_str:
+            try:
+                flags |= flag_from_char[char]
+            except KeyError:
+                raise ValueError("unsupported regex flag: '%s' in '%s' "
+                                 "(must be one of '%s')"
+                                 % (char, s, ''.join(flag_from_char.keys())))
+        return re.compile(s[1:idx], flags)
+    else: # not an encoded regex
+        return re.compile(re.escape(s))
+
+# Recipe: dedent (0.1.2)
+def _dedentlines(lines, tabsize=8, skip_first_line=False):
+    """_dedentlines(lines, tabsize=8, skip_first_line=False) -> dedented lines
+    
+        "lines" is a list of lines to dedent.
+        "tabsize" is the tab width to use for indent width calculations.
+        "skip_first_line" is a boolean indicating if the first line should
+            be skipped for calculating the indent width and for dedenting.
+            This is sometimes useful for docstrings and similar.
+    
+    Same as dedent() except operates on a sequence of lines. Note: the
+    lines list is modified **in-place**.
+    """
+    DEBUG = False
+    if DEBUG: 
+        print "dedent: dedent(..., tabsize=%d, skip_first_line=%r)"\
+              % (tabsize, skip_first_line)
+    indents = []
+    margin = None
+    for i, line in enumerate(lines):
+        if i == 0 and skip_first_line: continue
+        indent = 0
+        for ch in line:
+            if ch == ' ':
+                indent += 1
+            elif ch == '\t':
+                indent += tabsize - (indent % tabsize)
+            elif ch in '\r\n':
+                continue # skip all-whitespace lines
+            else:
+                break
+        else:
+            continue # skip all-whitespace lines
+        if DEBUG: print "dedent: indent=%d: %r" % (indent, line)
+        if margin is None:
+            margin = indent
+        else:
+            margin = min(margin, indent)
+    if DEBUG: print "dedent: margin=%r" % margin
+
+    if margin is not None and margin > 0:
+        for i, line in enumerate(lines):
+            if i == 0 and skip_first_line: continue
+            removed = 0
+            for j, ch in enumerate(line):
+                if ch == ' ':
+                    removed += 1
+                elif ch == '\t':
+                    removed += tabsize - (removed % tabsize)
+                elif ch in '\r\n':
+                    if DEBUG: print "dedent: %r: EOL -> strip up to EOL" % line
+                    lines[i] = lines[i][j:]
+                    break
+                else:
+                    raise ValueError("unexpected non-whitespace char %r in "
+                                     "line %r while removing %d-space margin"
+                                     % (ch, line, margin))
+                if DEBUG:
+                    print "dedent: %r: %r -> removed %d/%d"\
+                          % (line, ch, removed, margin)
+                if removed == margin:
+                    lines[i] = lines[i][j+1:]
+                    break
+                elif removed > margin:
+                    lines[i] = ' '*(removed-margin) + lines[i][j+1:]
+                    break
+            else:
+                if removed:
+                    lines[i] = lines[i][removed:]
+    return lines
+
+def _dedent(text, tabsize=8, skip_first_line=False):
+    """_dedent(text, tabsize=8, skip_first_line=False) -> dedented text
+
+        "text" is the text to dedent.
+        "tabsize" is the tab width to use for indent width calculations.
+        "skip_first_line" is a boolean indicating if the first line should
+            be skipped for calculating the indent width and for dedenting.
+            This is sometimes useful for docstrings and similar.
+    
+    textwrap.dedent(s), but don't expand tabs to spaces
+    """
+    lines = text.splitlines(1)
+    _dedentlines(lines, tabsize=tabsize, skip_first_line=skip_first_line)
+    return ''.join(lines)
+
+
+class _memoized(object):
+   """Decorator that caches a function's return value each time it is called.
+   If called later with the same arguments, the cached value is returned, and
+   not re-evaluated.
+
+   http://wiki.python.org/moin/PythonDecoratorLibrary
+   """
+   def __init__(self, func):
+      self.func = func
+      self.cache = {}
+   def __call__(self, *args):
+      try:
+         return self.cache[args]
+      except KeyError:
+         self.cache[args] = value = self.func(*args)
+         return value
+      except TypeError:
+         # uncachable -- for instance, passing a list as an argument.
+         # Better to not cache than to blow up entirely.
+         return self.func(*args)
+   def __repr__(self):
+      """Return the function's docstring."""
+      return self.func.__doc__
+
+
+def _xml_oneliner_re_from_tab_width(tab_width):
+    """Standalone XML processing instruction regex."""
+    return re.compile(r"""
+        (?:
+            (?<=\n\n)       # Starting after a blank line
+            |               # or
+            \A\n?           # the beginning of the doc
+        )
+        (                           # save in $1
+            [ ]{0,%d}
+            (?:
+                <\?\w+\b\s+.*?\?>   # XML processing instruction
+                |
+                <\w+:\w+\b\s+.*?/>  # namespaced single tag
+            )
+            [ \t]*
+            (?=\n{2,}|\Z)       # followed by a blank line or end of document
+        )
+        """ % (tab_width - 1), re.X)
+_xml_oneliner_re_from_tab_width = _memoized(_xml_oneliner_re_from_tab_width)
+
+def _hr_tag_re_from_tab_width(tab_width):
+     return re.compile(r"""
+        (?:
+            (?<=\n\n)       # Starting after a blank line
+            |               # or
+            \A\n?           # the beginning of the doc
+        )
+        (                       # save in \1
+            [ ]{0,%d}
+            <(hr)               # start tag = \2
+            \b                  # word break
+            ([^<>])*?           # 
+            /?>                 # the matching end tag
+            [ \t]*
+            (?=\n{2,}|\Z)       # followed by a blank line or end of document
+        )
+        """ % (tab_width - 1), re.X)
+_hr_tag_re_from_tab_width = _memoized(_hr_tag_re_from_tab_width)
+
+
+def _xml_encode_email_char_at_random(ch):
+    r = random()
+    # Roughly 10% raw, 45% hex, 45% dec.
+    # '@' *must* be encoded. I [John Gruber] insist.
+    # Issue 26: '_' must be encoded.
+    if r > 0.9 and ch not in "@_":
+        return ch
+    elif r < 0.45:
+        # The [1:] is to drop leading '0': 0x63 -> x63
+        return '&#%s;' % hex(ord(ch))[1:]
+    else:
+        return '&#%s;' % ord(ch)
+
+def _hash_text(text):
+    return 'md5:'+md5(text.encode("utf-8")).hexdigest()
+
+
+#---- mainline
+
+class _NoReflowFormatter(optparse.IndentedHelpFormatter):
+    """An optparse formatter that does NOT reflow the description."""
+    def format_description(self, description):
+        return description or ""
+
+def _test():
+    import doctest
+    doctest.testmod()
+
+def main(argv=None):
+    if argv is None:
+        argv = sys.argv
+    if not logging.root.handlers:
+        logging.basicConfig()
+
+    usage = "usage: %prog [PATHS...]"
+    version = "%prog "+__version__
+    parser = optparse.OptionParser(prog="markdown2", usage=usage,
+        version=version, description=cmdln_desc,
+        formatter=_NoReflowFormatter())
+    parser.add_option("-v", "--verbose", dest="log_level",
+                      action="store_const", const=logging.DEBUG,
+                      help="more verbose output")
+    parser.add_option("--encoding",
+                      help="specify encoding of text content")
+    parser.add_option("--html4tags", action="store_true", default=False, 
+                      help="use HTML 4 style for empty element tags")
+    parser.add_option("-s", "--safe", metavar="MODE", dest="safe_mode",
+                      help="sanitize literal HTML: 'escape' escapes "
+                           "HTML meta chars, 'replace' replaces with an "
+                           "[HTML_REMOVED] note")
+    parser.add_option("-x", "--extras", action="append",
+                      help="Turn on specific extra features (not part of "
+                           "the core Markdown spec). Supported values: "
+                           "'code-friendly' disables _/__ for emphasis; "
+                           "'code-color' adds code-block syntax coloring; "
+                           "'link-patterns' adds auto-linking based on patterns; "
+                           "'footnotes' adds the footnotes syntax;"
+                           "'xml' passes one-liner processing instructions and namespaced XML tags;"
+                           "'pyshell' to put unindented Python interactive shell sessions in a <code> block.")
+    parser.add_option("--use-file-vars",
+                      help="Look for and use Emacs-style 'markdown-extras' "
+                           "file var to turn on extras. See "
+                           "<http://code.google.com/p/python-markdown2/wiki/Extras>.")
+    parser.add_option("--link-patterns-file",
+                      help="path to a link pattern file")
+    parser.add_option("--self-test", action="store_true",
+                      help="run internal self-tests (some doctests)")
+    parser.add_option("--compare", action="store_true",
+                      help="run against Markdown.pl as well (for testing)")
+    parser.set_defaults(log_level=logging.INFO, compare=False,
+                        encoding="utf-8", safe_mode=None, use_file_vars=False)
+    opts, paths = parser.parse_args()
+    log.setLevel(opts.log_level)
+
+    if opts.self_test:
+        return _test()
+
+    if opts.extras:
+        extras = {}
+        for s in opts.extras:
+            splitter = re.compile("[,;: ]+")
+            for e in splitter.split(s):
+                if '=' in e:
+                    ename, earg = e.split('=', 1)
+                    try:
+                        earg = int(earg)
+                    except ValueError:
+                        pass
+                else:
+                    ename, earg = e, None
+                extras[ename] = earg
+    else:
+        extras = None
+
+    if opts.link_patterns_file:
+        link_patterns = []
+        f = open(opts.link_patterns_file)
+        try:
+            for i, line in enumerate(f.readlines()):
+                if not line.strip(): continue
+                if line.lstrip().startswith("#"): continue
+                try:
+                    pat, href = line.rstrip().rsplit(None, 1)
+                except ValueError:
+                    raise MarkdownError("%s:%d: invalid link pattern line: %r"
+                                        % (opts.link_patterns_file, i+1, line))
+                link_patterns.append(
+                    (_regex_from_encoded_pattern(pat), href))
+        finally:
+            f.close()
+    else:
+        link_patterns = None
+
+    from os.path import join, dirname, abspath, exists
+    markdown_pl = join(dirname(dirname(abspath(__file__))), "test",
+                       "Markdown.pl")
+    for path in paths:
+        if opts.compare:
+            print "==== Markdown.pl ===="
+            perl_cmd = 'perl %s "%s"' % (markdown_pl, path)
+            o = os.popen(perl_cmd)
+            perl_html = o.read()
+            o.close()
+            sys.stdout.write(perl_html)
+            print "==== markdown2.py ===="
+        html = markdown_path(path, encoding=opts.encoding,
+                             html4tags=opts.html4tags,
+                             safe_mode=opts.safe_mode,
+                             extras=extras, link_patterns=link_patterns,
+                             use_file_vars=opts.use_file_vars)
+        sys.stdout.write(
+            html.encode(sys.stdout.encoding or "utf-8", 'xmlcharrefreplace'))
+        if opts.compare:
+            test_dir = join(dirname(dirname(abspath(__file__))), "test")
+            if exists(join(test_dir, "test_markdown2.py")):
+                sys.path.insert(0, test_dir)
+                from test_markdown2 import norm_html_from_html
+                norm_html = norm_html_from_html(html)
+                norm_perl_html = norm_html_from_html(perl_html)
+            else:
+                norm_html = html
+                norm_perl_html = perl_html
+            print "==== match? %r ====" % (norm_perl_html == norm_html)
+
+
+if __name__ == "__main__":
+    sys.exit( main(sys.argv) )
+

=== modified file 'vauxoomin/main/server.py'
--- vauxoomin/main/server.py	2012-02-12 18:28:58 +0000
+++ vauxoomin/main/server.py	2012-03-21 00:56:22 +0000
@@ -3,7 +3,8 @@
 from bzrlib.branch import Branch
 from bzrlib.log import Logger
 import ConfigParser as CP
-
+from markdown import markdown
+from list_db import list_db
 
 def get_dirs(project=None,user='nhomar',relative_path='instancias'):
     '''
@@ -49,13 +50,18 @@
             try:
                 res.append(parse_text(Branch.open(path+"/"+p)))
             except Exception as inst:
-                print "Error WIth branch" % inst
+                print "Error With branch" % inst
                 res.append("Error WIth branch" % inst)
     return res
     
     
 def get_status(instance):
-    return "Running"
+    estatus=os.popen("ps aux | grep openerp-server | grep %s" % instance)
+    if len(estatus.readlines())>1:
+        return {'use':'successBox','message':'Server Is running normally for %s  Press F5 if you want the las status.' % instance}
+    else:
+        return {'use':'errorBox','message':'Server Is down in this instance %s Press F5 if you want the las status.' % instance}
+
 
 def get_config(instance,user='nhomar',relative_path='instancias',base_config_path='config'):
     oerp_config = CP.ConfigParser()
@@ -71,5 +77,48 @@
             r_opts[o]=oerp_config.get('options',o)
     return r_opts
 
+def get_configdir(user='nhomar', base_config_path='config'):
+    return "/home/%s/%s/" % (user,base_config_path)
+
+def preprocess_logs(logs_):
+    if type(logs_) is dict:
+        return logs_
+    else:
+        #TODO: Pre process with fancy html feature
+        return " ".join(logs_)
+
 def get_logs(instance):
-    return "Tail -f 20 from log"
+    path_to_log="/home/nhomar/log_openerp/%s_oerp.log" % instance #TODO: Put this general
+    if os.path.isfile(path_to_log):
+        log_file=open(path_to_log,"r")
+        html=[l for l in log_file.readlines()]
+        return html
+    else:
+        return {'use': 'warningBox',
+                'message': '''Log file doesn`t found for this instance, please verify your 
+                config file on <b>logfile</b> entry</br><a href="/action/%s/create_log" title="Create a log file.">Click here</a> to try solve the problem''' % instance}
+
+def get_quality(instance):
+    return {'use': 'warningBox',
+             'message': ''' Here we will link this this in a cool way with runbot.openerp.com
+             '''}
+
+def get_dblist(instance):
+    #TODO: Make this generic enought
+    url = 'socket://localhost:%s' % get_config(instance).get('netrpc_port') 
+    try:
+        return tuple(list_db().conect_to_port(url))
+    except:
+        return tuple([])
+
+
+def get_paranoic(instance):
+    '''
+    Get all backups made by paranoic backups script on lp:TODO#Put here the branch
+    '''
+    return ['bkp1','bkp2']
+
+
+def get_backups(instance):
+    return tuple(get_paranoic(instance))
+

=== modified file 'vauxoomin/static/css/all.css'
--- vauxoomin/static/css/all.css	2012-02-16 01:42:34 +0000
+++ vauxoomin/static/css/all.css	2012-03-21 00:56:22 +0000
@@ -704,4 +704,14 @@
 	float:right;
 	color:#fff;
 }
-/*LOGIN END*/
\ No newline at end of file
+/*LOGIN END*/
+/*CODE BEGIN*/
+pre {
+    padding: 1em;
+    border: 1px dashed #2F6FAB;
+    color: black;
+    background-color: #F9F9F9;
+    line-height: 1.05em;
+    font-family: monospace,"Courier New";
+}
+/*CODE END*/

=== added file 'vauxoomin/static/img/icons/browse_1.png'
Binary files vauxoomin/static/img/icons/browse_1.png	1970-01-01 00:00:00 +0000 and vauxoomin/static/img/icons/browse_1.png	2012-03-21 00:56:22 +0000 differ
=== modified file 'vauxoomin/templates/action.html'
--- vauxoomin/templates/action.html	2012-02-13 13:34:37 +0000
+++ vauxoomin/templates/action.html	2012-03-21 00:56:22 +0000
@@ -1,11 +1,14 @@
 {% autoescape None %}
-{% extends "main.html" %}
+{% extends "base_themed.html" %}
 
-{% block body %}
-  <p>I will {{ action }} from {{ instance }}</p>
-  copy {{ cp_msg }}
-    <ul class="green">
-  <li><a class="current" href="/{{ instance }}">
-    <span>Back to Instance</span></a>
-  </li>
+{% block contentWrapMain %}
+<div class="home">
+</div>
+    {% if type(cp_msg) is list %}
+        {% for c in cp_msg %}
+            {{ modules.WarningWidget(c.get('use'),c.get('message')) }}
+        {% end %}
+    {% else %}
+        {{ modules.WarningWidget(cp_msg.get('use'),cp_msg.get('message')) }}
+    {% end %}
 {% end %}

=== modified file 'vauxoomin/templates/base.html'
--- vauxoomin/templates/base.html	2012-02-13 11:19:02 +0000
+++ vauxoomin/templates/base.html	2012-03-21 00:56:22 +0000
@@ -7,7 +7,6 @@
     <link rel="stylesheet" href="{{ static_url("buttons.css") }}" type="text/css"/>
     <link rel="stylesheet" href="{{ static_url("sliding.css") }}" type="text/css"/>
     <link rel="alternate" href="/feed" type="application/atom+xml" title="{{ escape(handler.settings["title"]) }}"/>
-    {% block head %}{% end %}
   </head>
   <body>
     <div id="body">

=== added file 'vauxoomin/templates/base_themed.html'
--- vauxoomin/templates/base_themed.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/base_themed.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,93 @@
+{% autoescape None %}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>{{ escape(handler.settings["title"]) }}</title>
+<style media="all" type="text/css">@import "/static/css/all.css";</style>
+<style media="all" type="text/css">@import "/static/css/custom-theme/jquery-ui-1.7.2.custom.css";</style>
+<style media="all" type="text/css">@import "/static/css/jquery.wysiwyg.css";</style>
+<style media="all" type="text/css">@import "/static/css/visualize.css";</style>
+<style media="all" type="text/css">@import "/static/css/colorbox.css";</style>
+<!--[if IE 6]>
+    <style media="all" type="text/static/css">@import "css/ie6.css";</style>
+    <style media="all" type="text/static/css">@import "css/colorbox-ie.csss";</style>
+<![endif]-->
+<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="/static/js/jquery-ui-1.7.2.custom.min.js"></script>
+<script type="text/javascript" src="/static/js/jquery.wysiwyg.js"></script>
+<script type="text/javascript" src="/static/js/excanvas.js"></script>
+<script type="text/javascript" src="/static/js/visualize.jQuery.js"></script>
+<script type="text/javascript" src="/static/js/jquery.colorbox-min.js"></script>
+<script type="text/javascript" src="/static/js/custom.js"></script>
+<!--[if lt IE 9]>
+    <script src="http://ie7-js.googlecode.com/svn/version/2.1(beta3)/IE9.js">
+    IE7_PNG_SUFFIX=".png";
+    </script>
+<![endif]-->
+</head>
+<body id="loggedInBody">
+    <div id="mainWrap">
+        <div id="headerWrap">
+            <div id="systemMenu">
+                {{ modules.TopMenu("") }}
+            </div>
+            <div id="logo">
+                {{ modules.Logo("") }}
+            </div>
+            <div id="topNavigationWrap">
+                  <ul class="dropdown">
+                        {% block topNavigation %}{% end %}
+<!--                  Here will be the main menu-->
+                </ul>
+            </div>
+        </div>
+        <!--Rounded Corners For The Top - START-->
+        <div id="contentWrapTop">
+            <div id="contentWrapTopLeft">
+                {% block contentWrapTopLeft %}{% end %}
+            </div>
+            <div id="contentWrapTopRight">
+                {% block contentWrapTopRight %}{% end %}
+            </div>
+        </div>    
+        <!--Rounded Corners For The Top - END-->
+        <!--contentWrap START-->
+        <div id="contentWrap">
+                {% block contentWrap %}{% end %}
+            <!--contentWrapSidebar START-->
+            <div id="contentWrapSidebar">
+                {% block contentWrapSidebar %}{% end %}
+            </div>
+            <!--contentWrapSidebar END-->
+            <!--contentWrapMain START-->
+            <div id="contentWrapMain">
+                {% block contentWrapMain %}{% end %}
+                <div id="contentTitleWrap">
+                {% block contentTitleWrap %}{% end %}
+                </div>
+                <div id="contentWrapMainBottomSpacer">
+                {% block contentWrapMainBottomSpacer %}{% end %}
+                </div>
+            </div>
+            <!--contentWrapMain END-->
+        </div>
+        <!--contentWrap END-->
+    
+        <div id="contentWrapBottom">
+                {% block contentWrapBottom %}{% end %}
+            <div id="contentWrapBottomLeft">
+                {% block contentWrapBottomLeft %}{% end %}
+            </div>
+            <div id="contentWrapBottomRight">
+                {% block contentWrapBottomRight %}{% end %}
+            </div>
+        </div>
+        
+        <div id="footerWrap">
+                {% block footerWrap %}{% end %}
+        </div>
+    </div>
+    <!--mainWrap END-->
+</body>
+</html>

=== added directory 'vauxoomin/templates/controls'
=== modified file 'vauxoomin/templates/home.html'
--- vauxoomin/templates/home.html	2012-02-13 13:34:37 +0000
+++ vauxoomin/templates/home.html	2012-03-21 00:56:22 +0000
@@ -1,13 +1,16 @@
 {% autoescape None %}
-{% extends "base.html" %}
-
-{% block body %}
+{% extends "base_themed.html" %}
+
+{% block contentWrapSidebar %}
+    {{ modules.Twitter() }}
+{% end %}
+
+{% block contentWrapMain %}
 <div class="home">
-<span>{{ _('Your instances availables.') }}</span>
     <ul class="red">
-      {% for p in projects %}
-        {{ modules.Project(p) }}
-      {% end %}
+    {{ modules.DashBlock(projects,"Tus Projectos") }}
     </ul>
 </div>
+    {{ modules.WarningWidget('warningBox',"sented below is provided to assist you understand our licensing regime and the ways in which you may use the products which are available for sale on ThemeForest. This information does not form part of the license terms. In the event there is any inconsistency between the license terms and the following information then the license terms will prevail and will be what regulates your use of the product you buy.") }}
+    {{ modules.ImageGallery() }}
 {% end %}

=== added file 'vauxoomin/templates/home_profit.html'
--- vauxoomin/templates/home_profit.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/home_profit.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,15 @@
+{% autoescape None %}
+{% extends "base_themed.html" %}
+
+{% block contentWrapSidebar %}
+    {{ modules.Twitter() }}
+{% end %}
+
+{% block contentWrapMain %}
+<div class="home">
+    <ul class="red">
+    {{ modules.ListDbs(projects) }}
+    </ul>
+</div>
+    {{ modules.ImageGallery() }}
+{% end %}

=== added file 'vauxoomin/templates/home_project.html'
--- vauxoomin/templates/home_project.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/home_project.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,18 @@
+{% autoescape None %}
+{% extends "base_themed.html" %}
+{% block contentWrapSidebar %}
+    {{ modules.Acordion(project) }}
+{% end %}
+
+{% block contentWrapMain %}
+    {% if not config %}
+        {{ modules.WarningWidget('errorBox','Config file not found <a href="/action/%s/create_config">do you want create one?' % project) }}
+    {% end %}
+<div class="home">
+    <ul class="red">
+    {{ modules.DashBranches(branches,"Tus Branches on: %s" % project) }}
+    </ul>
+</div>
+{% from main import server %}
+    {{ modules.TabedMenu('Log Information',[{'id':'log','title':'log','content':server.preprocess_logs(server.get_logs(project)) },{'id':'runing','title':'Services Running','content':server.get_status(project)},{'id':'quality','title':'Quality','content':server.get_quality(project)},{'id':'dblist','title':'DB List','content':server.get_dblist(project)},{'id':'backup','title':'Manage Backups','content':server.get_backups(project)}]) }}
+{% end %}

=== modified file 'vauxoomin/templates/index.html'
--- vauxoomin/templates/index.html	2012-02-16 12:15:10 +0000
+++ vauxoomin/templates/index.html	2012-03-21 00:56:22 +0000
@@ -1,3 +1,4 @@
+{% autoescape None %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -9,7 +10,7 @@
 <style media="all" type="text/css">@import "/static/css/visualize.css";</style>
 <style media="all" type="text/css">@import "/static/css/colorbox.css";</style>
 <!--[if IE 6]>
-	<style media="all" type="text/static/css">@import "css/ie6.css";</style>
+    <style media="all" type="text/static/css">@import "css/ie6.css";</style>
     <style media="all" type="text/static/css">@import "css/colorbox-ie.csss";</style>
 <![endif]-->
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
@@ -26,598 +27,52 @@
 <![endif]-->
 </head>
 <body id="loggedInBody">
-	<div id="mainWrap">
-		<div id="headerWrap">
-			<div id="systemMenu">
-				<ul>
-					<li>Welcome John Doe</li>
-					<li class="seperator"><a href="#">My Account</a></li><!--seperator class is used for adding the seperator background between items-->
-					<li class="seperator"><a href="#">Logout</a></li>
-				</ul>				
-			</div>
-			<div id="logo">
-				<img src="/static/img/logo.png" alt="logo" />
-			</div>
-			<div id="topNavigationWrap">	
-  		    	<ul class="dropdown">
-					<li class="current">
-                    	<a href="#">Dashboard</a>
-                        <ul class="sub_menu">
-                             <li><a href="#">Sub-Menu-1</a></li>
-                             <li>
-                                <a href="#">Sub-Menu-2</a>
-                                <ul>
-                                    <li><a href="#">Sub-Menu-2-1</a></li>
-        
-                                    <li><a href="#">Sub-Menu-2-2</a></li>
-                                </ul>
-                             </li>
-                             <li><a href="#">Sub-Menu-3</a></li>
-                             <li><a href="#">Sub-Menu-4</a></li>
-                        </ul>
-                    </li>
-                    
-					<li>
-                    	<a href="#">Products</a>
-                        <ul class="sub_menu">
-                             <li><a href="#">Sub-Menu-1</a></li>
-                             <li>
-                                <a href="#">Sub-Menu-2</a>
-                                <ul>
-                                    <li><a href="#">Sub-Menu-2-1</a></li>
-        
-                                    <li><a href="#">Sub-Menu-2-2</a></li>
-                                </ul>
-                             </li>
-                             <li><a href="#">Sub-Menu-3</a></li>
-                             <li><a href="#">Sub-Menu-4</a></li>
-                        </ul>
-                    </li>
-                    
-					<li>
-                    	<a href="#">Orders</a>
-                        <ul class="sub_menu">
-                             <li><a href="#">Sub-Menu-1</a></li>
-                             <li>
-                                <a href="#">Sub-Menu-2</a>
-                                <ul>
-                                    <li><a href="#">Sub-Menu-2-1</a></li>
-        
-                                    <li><a href="#">Sub-Menu-2-2</a></li>
-                                </ul>
-                             </li>
-                             <li><a href="#">Sub-Menu-3</a></li>
-                             <li><a href="#">Sub-Menu-4</a></li>
-                        </ul>
-                    </li>
-					<li><a href="#">Members</a></li>
-					<li><a href="#">Settings</a></li>
-				</ul>
-			</div>
-		</div>
-        
-        <!--Rounded Corners For The Top - START-->	
-		<div id="contentWrapTop">
-			<div id="contentWrapTopLeft"></div>
-			<div id="contentWrapTopRight"></div>			
-		</div>	
-        <!--Rounded Corners For The Top - END-->	
-        
+    <div id="mainWrap">
+        <div id="headerWrap">
+            <div id="systemMenu">
+                {{ modules.TopMenu("") }}
+            </div>
+            <div id="logo">
+                {{ modules.Logo("") }}
+            </div>
+            <div id="topNavigationWrap">
+                  <ul class="dropdown">
+<!--                  Here will be the main menu-->
+                </ul>
+            </div>
+        </div>
+        
+        <!--Rounded Corners For The Top - START-->
+        <div id="contentWrapTop">
+            <div id="contentWrapTopLeft"></div>
+            <div id="contentWrapTopRight"></div>
+        </div>    
+        <!--Rounded Corners For The Top - END-->
         <!--contentWrap START-->
-		<div id="contentWrap">
-        	
-            <!--contentWrapSidebar START-->	
-			<div id="contentWrapSidebar">
-            
-				<div id="searchBox">
-					<fieldset>
-                        <legend>Search</legend>
-                        <input size="15" class="formSmall" type="text" /> <input value="Go" class="button" type="submit" />
-                        <h6>(<a href="#" id="advancedSearchLink">advanced search options</a>)</h6>
-                        <div id="advancedSearchWrap">
-                            <select name="listmenu">
-                                <option selected="selected">Select Category</option>
-                                <option>Orders</option>
-                                <option>Members</option>
-                            </select>
-                            <fieldset class="labelRadioCheckbox">
-                                <legend>Include Archives</legend>	
-                                <label for="yes" class="labelRadioCheckbox"><input name="gender" id="yes" value="Yes" type="radio" />Yes</label>
-                                <label for="no" class="labelRadioCheckbox"><input name="gender" id="no" value="No" checked="checked" type="radio" />No</label>
-                            </fieldset>
-                        </div>
-					</fieldset>
-				</div>
-                
-                <fieldset>
-					<legend>Calendar</legend>
-            		<div id="datepicker"></div>
-                </fieldset>
-
-
-            
-            	<!--accordion START-->
-                <fieldset>
-                    <legend>Accordion Menu</legend>
-                    <div id="accordion"><!--The ID accordion is defined inside includes/static/js/custom.js. To create new accordion elements, a similar function inside "custom.js" must be added.-->											
-                        <h3><a href="#">Section 1</a></h3>
-                        <div>
-                            <ul>
-                                <li>List item one</li>
-                                <li>List item two</li>
-                                <li>List item three</li>
-                            </ul>
-                        </div>
-                        <h3><a href="#">Section 2</a></h3>
-                        <div>
-                            <p>
-                            Sed non urna.
-                            </p>
-                        </div>
-                        <h3><a href="#">Section 3</a></h3>
-                        <div>
-                            <ul>
-                                <li>List item one</li>
-                                <li>List item two</li>
-                                <li>List item three</li>
-                            </ul>
-                        </div>
-                        <h3><a href="#">Section 4</a></h3>
-                        <div>
-                            <p>
-                            Cras dictum.
-                            </p>
-                        </div>
-                    </div>																
-                </fieldset>	
-                <!--accordion END-->   
-			</div>
+        <div id="contentWrap">
+            <!--contentWrapSidebar START-->
+            <div id="contentWrapSidebar">
+            </div>
             <!--contentWrapSidebar END-->
-            
             <!--contentWrapMain START-->
-			<div id="contentWrapMain">			
-                <div id="crumbsWrap">
-                    <ul id="crumbs">
-                        <li><a href="#">Home</a></li>
-                        <li><a href="#">Orders</a></li>
-                        <li><a href="#">List Orders</a></li>
-                        <li class="bold">Approved Orders</li>
-                    </ul>
-                </div>
-                        
-                
-                <div class="warningBox">You have 1 unread messages.</div>
-                <h1>Dashboard</h1>
-                <div id="dashboardWrap">
-                    <ul>
-                        <li>
-                            <h3 class="noMargin">Users</h3>
-                            <p>1316 approved, 23 un-approved users.</p>
-                        </li>
-                        <li>
-                            <h3 class="noMargin">Orders</h3>
-                            <p>18 approved, 5 un-approved and 3 un-sent orders.</p>
-                        </li>
-                        <li>
-                            <h3 class="noMargin">Products</h3>
-                            <p>121 active products and 3 passive products.</p>
-                        </li>
-                        <li>
-                            <h3 class="noMargin">Categories</h3>
-                            <p>8 main and 35 sub-categories.</p>
-                        </li>
-                        <li>
-                            <h3 class="noMargin">Users</h3>
-                            <p>1316 approved, 23 un-approved users.</p>
-                        </li>
-                    </ul>				
-                </div>
-                
-                
-                <!--Charts START-->
-                <!--visualize and accessHide classes are required - visualize class is for styling the chart, accessHide is for hiding the original table - the id="chart" is defined in js/custom.js. For creating more charts a new similar function must be added to custom.js-->
-                <table id="chart" class="visualize accessHide">
-                    <caption>Sales Report</caption>
-                    <thead>
-                        <tr>
-                            <td></td>
-                            <th scope="col">Jan 2010</th>
-                            <th scope="col">Feb 2010</th>
-                
-                            <th scope="col">Mar 2010</th>
-                            <th scope="col">Apr 2010</th>
-                            <th scope="col">May 2010</th>
-                            <th scope="col">June 2010</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <th scope="row">Product 1</th>
-                            <td>190</td>
-                            <td>160</td>
-                            <td>40</td>
-                            <td>120</td>
-                
-                            <td>30</td>
-                            <td>70</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Product 2</th>
-                            <td>3</td>
-                            <td>40</td>
-                
-                            <td>30</td>
-                            <td>45</td>
-                            <td>35</td>
-                            <td>49</td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Product 3</th>
-                
-                            <td>10</td>
-                            <td>180</td>
-                            <td>10</td>
-                            <td>85</td>
-                            <td>25</td>
-                            <td>79</td>
-                
-                        </tr>
-                        <tr>
-                            <th scope="row">Product 4</th>
-                            <td>40</td>
-                            <td>80</td>
-                            <td>90</td>
-                            <td>25</td>
-                
-                            <td>15</td>
-                            <td>119</td>
-                        </tr>		
-                    </tbody>
-                </table>
-                <!--Charts END-->	    
-                
-                
-                
-
-                <div class="titleWrap">
-                    <h1>Approved Orders</h1>
-                    <ul>
-                        <li class="standardForm">
-                            <select name="listmenu">
-                                <option selected="selected">Bulk Actions</option>
-                                <option>Delete Selected</option>
-                                <option>Edit Selected</option>
-                            </select>
-                        </li>
-                        <li class="seperator"><img src="/static/img/icons/add.png" alt="add" /> <a href="#">Add New</a></li>
-                    </ul>
-                </div>
-                <table class="listing fluid" cellpadding="0" cellspacing="0">
-                  <tbody>
-                    <tr>
-                      <th class="left"><input type="checkbox" name="checkbox2" value="checkbox" /></th>
-                      <th>Name Surname <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
-                      <th>City <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
-                      <th>Country <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
-                      <th>Age <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
-                      <th>Actions</th>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox2" value="checkbox" /></td>
-                      <td>- John Doe </td>
-                      <td>Washington DC </td>
-                      <td>USA</td>
-                      <td>32</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row2">
-                      <td><input type="checkbox" name="checkbox2" value="checkbox" /></td>
-                      <td>- Thierry Mugler </td>
-                      <td>Paris</td>
-                      <td>France</td>
-                      <td>28</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox3" value="checkbox" /></td>
-                      <td>- Jose Manta </td>
-                      <td>Madrid</td>
-                      <td>Spain</td>
-                      <td>21</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row2">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Michael Luvsum </td>
-                      <td>Berlin</td>
-                      <td>Germany</td>
-                      <td>22</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Adrian Tamoe</td>
-                      <td>Zurich</td>
-                      <td>Switzerland</td>
-                      <td>30</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row2">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- George Rusen</td>
-                      <td>Bucharest</td>
-                      <td>Romania</td>
-                      <td>26</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Rodney Mullen</td>
-                      <td>San Francisco</td>
-                      <td>USA</td>
-                      <td>39</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row2">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Michael Luvsum </td>
-                      <td>Berlin</td>
-                      <td>Germany</td>
-                      <td>22</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Adrian Tamoe</td>
-                      <td>Zurich</td>
-                      <td>Switzerland</td>
-                      <td>30</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row2">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- George Rusen</td>
-                      <td>Bucharest</td>
-                      <td>Romania</td>
-                      <td>26</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                    <tr class="row1">
-                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
-                      <td>- Rodney Mullen</td>
-                      <td>San Francisco</td>
-                      <td>USA</td>
-                      <td>39</td>
-                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
-                    </tr>
-                  </tbody>
-                </table>
-                <div class="paginationWrap">
-                    <ul>
-                        <li class="previous-off">&laquo;Previous</li>
-                        <li class="active">1</li>
-                        <li><a href="?page=2">2</a></li>
-                        <li><a href="?page=3">3</a></li>
-                        <li><a href="?page=4">4</a></li>
-                        <li><a href="?page=5">5</a></li>
-                        <li><a href="?page=6">6</a></li>
-                        <li><a href="?page=7">7</a></li>
-                        <li class="next"><a href="?page=8">Next &raquo;</a></li>
-                    </ul>
-                </div>
-			
-			
-                <!--Tabbed Menu - START-->
-                <h1>Tabbed Menu</h1>
-                <div id="tabs"><!--The ID tabs is defined inside includes/static/js/custom.js. To create new tabbed menus, a similar function inside "custom.js" must be added.-->	
-                    <ul>
-                        <li><a href="#tabs-1">Nunc tincidunt</a></li>
-                        <li><a href="#tabs-2">Proin dolor</a></li>
-                        <li><a href="#tabs-3">Aenean lacinia</a></li>
-                    </ul>
-                    <div id="tabs-1">
-                        <p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>
-                    </div>
-                    <div id="tabs-2">
-                        <p>Morbi tincidunt, dui sit amet facilisis feugiat, odio metus gravida ante, ut pharetra massa metus id nunc. Duis scelerisque molestie turpis. Sed fringilla, massa eget luctus malesuada, metus eros molestie lectus, ut tempus eros massa ut dolor. Aenean aliquet fringilla sem. Suspendisse sed ligula in ligula suscipit aliquam. Praesent in eros vestibulum mi adipiscing adipiscing. Morbi facilisis. Curabitur ornare consequat nunc. Aenean vel metus. Ut posuere viverra nulla. Aliquam erat volutpat. Pellentesque convallis. Maecenas feugiat, tellus pellentesque pretium posuere, felis lorem euismod felis, eu ornare leo nisi vel felis. Mauris consectetur tortor et purus.</p>
-                    </div>
-                    <div id="tabs-3">
-                        <p>Mauris eleifend est et turpis. Duis id erat. Suspendisse potenti. Aliquam vulputate, pede vel vehicula accumsan, mi neque rutrum erat, eu congue orci lorem eget lorem. Vestibulum non ante. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Fusce sodales. Quisque eu urna vel enim commodo pellentesque. Praesent eu risus hendrerit ligula tempus pretium. Curabitur lorem enim, pretium nec, feugiat nec, luctus a, lacus.</p>
-                        <p>Duis cursus. Maecenas ligula eros, blandit nec, pharetra at, semper at, magna. Nullam ac lacus. Nulla facilisi. Praesent viverra justo vitae neque. Praesent blandit adipiscing velit. Suspendisse potenti. Donec mattis, pede vel pharetra blandit, magna ligula faucibus eros, id euismod lacus dolor eget odio. Nam scelerisque. Donec non libero sed nulla mattis commodo. Ut sagittis. Donec nisi lectus, feugiat porttitor, tempor ac, tempor vitae, pede. Aenean vehicula velit eu tellus interdum rutrum. Maecenas commodo. Pellentesque nec elit. Fusce in lacus. Vivamus a libero vitae lectus hendrerit hendrerit.</p>
-                    </div>
-                </div>
-                <!--Tabbed Menu - END-->
-                
-                <!--Accordion - START-->
-                <h1>Accordion</h1>
-                <div class="accordionWrap">
-                    <div id="accordion2" class="acco"><!--The ID accordion2 is defined inside includes/static/js/custom.js. To create new accordion elements, a similar function inside "custom.js" must be added.-->												
-                        <h3><a href="#">Section 1</a></h3>
-                        <div>
-                            <p>
-                            Mauris
-                            </p>
-                        </div>
-                        <h3><a href="#">Section 2</a></h3>
-                        <div>
-                            <p>
-                            Sed non urna.
-                            </p>
-                        </div>
-                        <h3><a href="#">Section 3</a></h3>
-                        <div>
-                            <ul>
-                                <li>List item one</li>
-                                <li>List item two</li>
-                                <li>List item three</li>
-                            </ul>
-                        </div>
-                        <h3><a href="#">Section 4</a></h3>
-                        <div>
-                            <p>
-                            Cras dictum.
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <!--Accordion - END-->			
-                    
-					
-				<!--Form - START-->	
-                <h1>New User</h1>
-                <div class="standardForm">	
-                    <form action="index.html" method="post">				
-                        <label for="name">Name</label>
-                        <input id="name" type="text" />
-                        <label for="username">Username</label>
-                        <input id="username" type="text" /> <span class="formError">Username can't be blank!</span>
-                        <label for="shortInfo">Short Info</label>
-                        <textarea rows="8" cols="1" class="formHuge" id="shortInfo"></textarea>
-                        <div><!--We place fieldsets with display-inline inside div to better position them-->
-                            <fieldset class="formHuge labelRadioCheckbox">
-                                <legend>Gender</legend>	
-                                <label for="male" class="labelRadioCheckbox"><input name="gender" id="male" value="Male" type="radio" />Male</label>
-                                <label for="female" class="labelRadioCheckbox"><input name="gender" id="female" value="Female" checked="checked" type="radio" />Female</label>
-                            </fieldset> <span class="formError">Gender must be selected!</span>
-                        </div>
-                        <label for="address">Address</label>
-                        <input id="address" class="formHuge" type="text" />
-                        <div> <!--We place fieldsets with display-inline inside div to better position them-->
-                            <fieldset class="formHuge labelRadioCheckbox">
-                                <legend>Age:</legend>	
-                                <label for="y18-25"><input name="18-25" id="y18-25" value="18-25" type="checkbox" />18-25</label>
-                                <label for="y25-30"><input name="25-30" id="y25-30" value="25-30" type="checkbox" />25-30</label>
-                                <label for="y30-40"><input name="30-40" id="y30-40" value="30-40" type="checkbox" />30-40 (if more, please select this)</label>
-                            </fieldset>
-                        </div>
-                        <label for="password">Password</label>
-                        <input id="password" type="password" /><br />
-                        <div><!--We need to use this div to keep the "submit button" and the "loader image" together.-->
-                            <input type="submit" value="Submit" class="formButton" /> <img src="/static/img/ajax-loader.gif" alt="Ajax Loader" />
-                        </div>
-                    </form>
-                </div>
-                <!--Form - END-->	
-                
-    
-                <div class="infoBox">Info message</div>
-                <div class="successBox">Successful operation message</div>
-                <div class="warningBox">Warning message</div>
-                <div class="errorBox">Error message</div>
-                    
-    			
-                <!--Images - START-->	
-                <div class="titleWrap">
-                    <h1>Images</h1>
-                    <ul>
-                        <li><img src="/static/img/icons/add.png" alt="add" /> <a href="#">Add New</a></li>
-                    </ul>
-                </div>
-                <div class="imagesWrap">
-                    <div class="imagesListed">
-                        <ul>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <!--In order to display images inside the Lightbox, simply add them the class "colorBoxElement" (can be customized from "inc/static/js/custom.js"), mention the original image inside the "href" and use the "title" information for displaying info about the image.-->
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>
-                            <li>
-                                <p class="imageInfo">
-                                    textimage.png (18.4kb)
-                                </p>
-                                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
-                                    <p class="imageActions">
-                                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
-                                    </p>
-                            </li>                            
-                            
-                        </ul>							
-                    </div>
-                    <div class="paginationWrap">
-                        <ul class="pagination">
-                            <li class="previous-off">&laquo;Previous</li>
-                            <li class="active">1</li>
-                            <li><a href="?page=2">2</a></li>
-                            <li><a href="?page=3">3</a></li>
-                            <li><a href="?page=4">4</a></li>
-                            <li><a href="?page=5">5</a></li>
-                            <li><a href="?page=6">6</a></li>
-                            <li><a href="?page=7">7</a></li>
-                            <li class="next"><a href="?page=8">Next &raquo;</a></li>
-                        </ul>
-                    </div>
-                </div>
-                <!--Images - END-->
-
-			
+            <div id="contentWrapMain">
                 <div id="contentTitleWrap">
-                    <h1>h1 - Hello There</h1>
-                    <h2>h2 - Hello There</h2>
-                    <h3>h3 - Hello There</h3>
-                    <h4>h4 - Hello There</h4>
-                    <h5>h5 - Hello There</h5>
-                    <h6>h6 - Hello There</h6>
-                </div>				
-                    
-
+                </div>
                 <div id="contentWrapMainBottomSpacer"></div>
             </div>
-            <!--contentWrapMain END-->															
+            <!--contentWrapMain END-->
         </div>
-        <!--contentWrap END-->															
+        <!--contentWrap END-->
     
         <div id="contentWrapBottom">
             <div id="contentWrapBottomLeft"></div>
-            <div id="contentWrapBottomRight"></div>		
+            <div id="contentWrapBottomRight"></div>
         </div>
         
         <div id="footerWrap">
             2009-2010 Admin Templates
         </div>
-        
-    </div>																
+    </div>
     <!--mainWrap END-->
-	
 </body>
 </html>

=== modified file 'vauxoomin/templates/modules/left.html'
--- vauxoomin/templates/modules/left.html	2012-02-13 13:34:37 +0000
+++ vauxoomin/templates/modules/left.html	2012-03-21 00:56:22 +0000
@@ -1,4 +1,4 @@
-        <li><a class="current"href="/action/{{ instance }}/copy_instance" title="Make a copy of the _main_ db 'produccion' by default"><span>Clone Instance</span></a></li>
+        <li></li>
         <li><a class="current"href="/action/{{ instance }}/clone_main_db" title="With this you will create an exact copy of this instance (Ports and modules will be configures automatically)"><span>Clone Main DB</span></a></li>
         <li><a class="current" href="" title="It will stop this server"><span>Stop Server</span></a></li>
         <li><a class="current" href="" title="It will restart this server"><span>ReStart Server</span></a></li>

=== modified file 'vauxoomin/templates/notfound.html'
--- vauxoomin/templates/notfound.html	2012-02-12 16:53:59 +0000
+++ vauxoomin/templates/notfound.html	2012-03-21 00:56:22 +0000
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
-{% block body %}
+{% extends "base_themed.html" %}
+{% block contentWrapMain %}
 <div class="notfound"><a href="/"><img src="/static/images/404.png"></img></a></div>
 {% end %}

=== added file 'vauxoomin/templates/templateAreas.png'
Binary files vauxoomin/templates/templateAreas.png	1970-01-01 00:00:00 +0000 and vauxoomin/templates/templateAreas.png	2012-03-21 00:56:22 +0000 differ
=== added directory 'vauxoomin/templates/widgets'
=== added file 'vauxoomin/templates/widgets/acordion_menu.html'
--- vauxoomin/templates/widgets/acordion_menu.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/acordion_menu.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,37 @@
+<fieldset>
+    <legend>{{ menu }}</legend>
+    <div id="accordion"><!--The ID accordion is defined inside includes/static/js/custom.js. To create new accordion elements, a similar function inside "custom.js" must be added.-->
+<!--        <h3><a href="#">Section 1</a></h3>-->
+<!--        <div>-->
+<!--            <ul>-->
+<!--                <li>List item one</li>-->
+<!--                <li>List item two</li>-->
+<!--                <li>List item three</li>-->
+<!--            </ul>-->
+<!--        </div>-->
+        <h3><a href="#">Actions on Server</a></h3>
+        <div>
+            <ul>
+                <li><a href="/action/{{ menu }}/copy_instance" title="Make a copy of the _main_ db 'produccion' by default">Clone Instance</a></li>
+                <li><a href="" title="It will stop this server"><span>Stop</span></a></li>
+                <li><a href="" title="It will restart this server"><span>ReStart</span></a></li>
+                <li><a href="/action/{{ menu }}/start_server" title="It will start this server"><span>Start</span></a></li>
+                <li><a href="" title="It will start this server updating a module"><span>Start and Update</span></a></li>
+            </ul>
+        </div>
+        <h3><a href="#">Configs</a></h3>
+        <div>
+            {% for s in submenus %}
+            <p>
+                <b>{{ s }}</b>:{{ submenus[s] }}
+            </p>
+            {% end %}
+        </div>
+<!--        <h3><a href="#">Section 4</a></h3>-->
+<!--        <div>-->
+<!--            <p>-->
+<!--            Cras dictum.-->
+<!--            </p>-->
+<!--        </div>-->
+    </div>
+</fieldset>

=== added file 'vauxoomin/templates/widgets/acordion_wrap.html'
--- vauxoomin/templates/widgets/acordion_wrap.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/acordion_wrap.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,31 @@
+                <h1>Accordion</h1>
+                <div class="accordionWrap">
+                    <div id="accordion2" class="acco"><!--The ID accordion2 is defined inside includes/static/js/custom.js. To create new accordion elements, a similar function inside "custom.js" must be added.-->                                                
+                        <h3><a href="#">Section 1</a></h3>
+                        <div>
+                            <p>
+                            Mauris
+                            </p>
+                        </div>
+                        <h3><a href="#">Section 2</a></h3>
+                        <div>
+                            <p>
+                            Sed non urna.
+                            </p>
+                        </div>
+                        <h3><a href="#">Section 3</a></h3>
+                        <div>
+                            <ul>
+                                <li>List item one</li>
+                                <li>List item two</li>
+                                <li>List item three</li>
+                            </ul>
+                        </div>
+                        <h3><a href="#">Section 4</a></h3>
+                        <div>
+                            <p>
+                            Cras dictum.
+                            </p>
+                        </div>
+                    </div>
+                </div>

=== added file 'vauxoomin/templates/widgets/calendar.html'
--- vauxoomin/templates/widgets/calendar.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/calendar.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,4 @@
+<fieldset>
+    <legend>Calendar</legend>
+    <div id="datepicker"></div>
+</fieldset>

=== added file 'vauxoomin/templates/widgets/chart.html'
--- vauxoomin/templates/widgets/chart.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/chart.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,59 @@
+<!--visualize and accessHide classes are required - visualize class is for styling the chart, accessHide is for hiding the original table - the id="chart" is defined in js/custom.js. For creating more charts a new similar function must be added to custom.js-->
+<table id="chart" class="visualize accessHide">
+    <caption>Sales Report</caption>
+    <thead>
+        <tr>
+            <td></td>
+            <th scope="col">Jan 2010</th>
+            <th scope="col">Feb 2010</th>
+
+            <th scope="col">Mar 2010</th>
+            <th scope="col">Apr 2010</th>
+            <th scope="col">May 2010</th>
+            <th scope="col">June 2010</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <th scope="row">Product 1</th>
+            <td>190</td>
+            <td>160</td>
+            <td>40</td>
+            <td>120</td>
+
+            <td>30</td>
+            <td>70</td>
+        </tr>
+        <tr>
+            <th scope="row">Product 2</th>
+            <td>3</td>
+            <td>40</td>
+
+            <td>30</td>
+            <td>45</td>
+            <td>35</td>
+            <td>49</td>
+        </tr>
+        <tr>
+            <th scope="row">Product 3</th>
+
+            <td>10</td>
+            <td>180</td>
+            <td>10</td>
+            <td>85</td>
+            <td>25</td>
+            <td>79</td>
+
+        </tr>
+        <tr>
+            <th scope="row">Product 4</th>
+            <td>40</td>
+            <td>80</td>
+            <td>90</td>
+            <td>25</td>
+
+            <td>15</td>
+            <td>119</td>
+        </tr>        
+    </tbody>
+</table>

=== added file 'vauxoomin/templates/widgets/code.html'
--- vauxoomin/templates/widgets/code.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/code.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,3 @@
+{% autoescape None %}
+<!--Use==> warningBox, infoBox, successBox, errorBox-->
+<pre class="code">{{ message }}</pre>

=== added file 'vauxoomin/templates/widgets/crumbs.html'
--- vauxoomin/templates/widgets/crumbs.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/crumbs.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,8 @@
+<div id="crumbsWrap">
+    <ul id="crumbs">
+        <li><a href="#">Home</a></li>
+        <li><a href="#">Orders</a></li>
+        <li><a href="#">List Orders</a></li>
+        <li class="bold">Approved Orders</li>
+    </ul>
+</div>

=== added file 'vauxoomin/templates/widgets/dash_blocks.html'
--- vauxoomin/templates/widgets/dash_blocks.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/dash_blocks.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,12 @@
+<h1>{{ context_message }}</h1>
+<div id="dashboardWrap">
+    <ul>
+        {% for p in elements %}
+        <li>
+            <h3 class="noMargin">{{ p }}</h3>
+            <p>{{ p }}</p>
+            <a href="/{{ p }}" title="Go to {{ p }} details"><img src="/static/img/icons/browse_1.png" alt="edit" width="16" height="16" /> </a>
+        </li>
+        {% end %}
+    </ul>
+</div>

=== added file 'vauxoomin/templates/widgets/dash_branches.html'
--- vauxoomin/templates/widgets/dash_branches.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/dash_branches.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,13 @@
+<h1>{{ context_message }}</h1>
+<div id="dashboardWrap">
+    <ul>
+        {% for p in elements %}
+        <li>
+            <h3 class="noMargin">{{ p[1] }}</h3>
+            <p>{{ p[0] }}</p>
+            <p>{{ p[2] }}</p>
+            <a href="{{ p[3] }}" title="Go to {{ p[0] }} details"><img src="/static/img/icons/browse_1.png" alt="edit" width="16" height="16" /> </a>
+        </li>
+        {% end %}
+    </ul>
+</div>

=== added file 'vauxoomin/templates/widgets/form.html'
--- vauxoomin/templates/widgets/form.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/form.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,33 @@
+                <h1>New User</h1>
+                <div class="standardForm">    
+                    <form action="index.html" method="post">                
+                        <label for="name">Name</label>
+                        <input id="name" type="text" />
+                        <label for="username">Username</label>
+                        <input id="username" type="text" /> <span class="formError">Username can't be blank!</span>
+                        <label for="shortInfo">Short Info</label>
+                        <textarea rows="8" cols="1" class="formHuge" id="shortInfo"></textarea>
+                        <div><!--We place fieldsets with display-inline inside div to better position them-->
+                            <fieldset class="formHuge labelRadioCheckbox">
+                                <legend>Gender</legend>    
+                                <label for="male" class="labelRadioCheckbox"><input name="gender" id="male" value="Male" type="radio" />Male</label>
+                                <label for="female" class="labelRadioCheckbox"><input name="gender" id="female" value="Female" checked="checked" type="radio" />Female</label>
+                            </fieldset> <span class="formError">Gender must be selected!</span>
+                        </div>
+                        <label for="address">Address</label>
+                        <input id="address" class="formHuge" type="text" />
+                        <div> <!--We place fieldsets with display-inline inside div to better position them-->
+                            <fieldset class="formHuge labelRadioCheckbox">
+                                <legend>Age:</legend>    
+                                <label for="y18-25"><input name="18-25" id="y18-25" value="18-25" type="checkbox" />18-25</label>
+                                <label for="y25-30"><input name="25-30" id="y25-30" value="25-30" type="checkbox" />25-30</label>
+                                <label for="y30-40"><input name="30-40" id="y30-40" value="30-40" type="checkbox" />30-40 (if more, please select this)</label>
+                            </fieldset>
+                        </div>
+                        <label for="password">Password</label>
+                        <input id="password" type="password" /><br />
+                        <div><!--We need to use this div to keep the "submit button" and the "loader image" together.-->
+                            <input type="submit" value="Submit" class="formButton" /> <img src="/static/img/ajax-loader.gif" alt="Ajax Loader" />
+                        </div>
+                    </form>
+                </div>

=== added file 'vauxoomin/templates/widgets/image_gallery.html'
--- vauxoomin/templates/widgets/image_gallery.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/image_gallery.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,81 @@
+<div class="titleWrap">
+    <h1>Images</h1>
+    <ul>
+        <li><img src="/static/img/icons/add.png" alt="add" /> <a href="#">Add New</a></li>
+    </ul>
+</div>
+<div class="imagesWrap">
+    <div class="imagesListed">
+        <ul>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <!--In order to display images inside the Lightbox, simply add them the class "colorBoxElement" (can be customized from "inc/static/js/custom.js"), mention the original image inside the "href" and use the "title" information for displaying info about the image.-->
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>
+            <li>
+                <p class="imageInfo">
+                    textimage.png (18.4kb)
+                </p>
+                <a href="/static/img/image-placeholder-big.gif" title="Original Image" class="colorBoxElement"><img src="/static/img/image-placeholder.gif" alt="image" /></a>
+                    <p class="imageActions">
+                        <img src="/static/img/icons/page_white_go.png" alt="details" width="16" height="16" /> Details <img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> Edit <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /> Delete
+                    </p>
+            </li>                            
+            
+        </ul>                            
+    </div>
+    <div class="paginationWrap">
+        <ul class="pagination">
+            <li class="previous-off">&laquo;Previous</li>
+            <li class="active">1</li>
+            <li><a href="?page=2">2</a></li>
+            <li><a href="?page=3">3</a></li>
+            <li><a href="?page=4">4</a></li>
+            <li><a href="?page=5">5</a></li>
+            <li><a href="?page=6">6</a></li>
+            <li><a href="?page=7">7</a></li>
+            <li class="next"><a href="?page=8">Next &raquo;</a></li>
+        </ul>
+    </div>
+</div>

=== added file 'vauxoomin/templates/widgets/img_logo.html'
--- vauxoomin/templates/widgets/img_logo.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/img_logo.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,1 @@
+<img src="/static/img/logo.png" alt="logo" />

=== added file 'vauxoomin/templates/widgets/list_db.html'
--- vauxoomin/templates/widgets/list_db.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/list_db.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,46 @@
+{% autoescape None %}
+{% if not len(databases) %}
+    {{ modules.WarningWidget('errorBox','there are problem to get data bases or you are not created anyone or we have socket problems, verify ports of your config file (For now we have implemented just netrpc protocol.)') }}
+{% end %}
+<div class="titleWrap">
+    <h1>Data Base List for this instance</h1>
+    <ul>
+        <li class="standardForm">
+            <select name="listmenu">
+                <option selected="selected">Clone Selected</option>
+                <option>Delete Selected</option>
+                <option>Edit Selected</option>
+            </select>
+        </li>
+        <li class="seperator"><img src="/static/img/icons/add.png" alt="add" /> <a href="#">Add New</a></li>
+    </ul>
+</div>
+<table class="listing fluid" cellpadding="0" cellspacing="0">
+  <tbody>
+    <tr>
+      <th class="left"><input type="checkbox" name="checkbox2" value="checkbox" /></th>
+      <th>Name<img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
+      <th>Actions</th>
+    </tr>
+    {% for d in databases %}
+    <tr class="{{ d }}">
+      <td><input type="checkbox" name="checkbox2" value="checkbox" /></td>
+      <td>{{ d }}</td>
+      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+    </tr>
+    {% end %}
+  </tbody>
+</table>
+<div class="paginationWrap">
+    <ul>
+        <li class="previous-off">&laquo;Previous</li>
+        <li class="active">1</li>
+        <li><a href="?page=2">2</a></li>
+        <li><a href="?page=3">3</a></li>
+        <li><a href="?page=4">4</a></li>
+        <li><a href="?page=5">5</a></li>
+        <li><a href="?page=6">6</a></li>
+        <li><a href="?page=7">7</a></li>
+        <li class="next"><a href="?page=8">Next &raquo;</a></li>
+    </ul>
+</div>

=== added file 'vauxoomin/templates/widgets/list_paged.html'
--- vauxoomin/templates/widgets/list_paged.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/list_paged.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,126 @@
+                <div class="titleWrap">
+                    <h1>Approved Orders</h1>
+                    <ul>
+                        <li class="standardForm">
+                            <select name="listmenu">
+                                <option selected="selected">Bulk Actions</option>
+                                <option>Delete Selected</option>
+                                <option>Edit Selected</option>
+                            </select>
+                        </li>
+                        <li class="seperator"><img src="/static/img/icons/add.png" alt="add" /> <a href="#">Add New</a></li>
+                    </ul>
+                </div>
+                <table class="listing fluid" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <th class="left"><input type="checkbox" name="checkbox2" value="checkbox" /></th>
+                      <th>Name Surname <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
+                      <th>City <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
+                      <th>Country <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
+                      <th>Age <img src="/static/img/icons/arrow_down.png" alt="down" /><img src="/static/img/icons/arrow_up.png" alt="up" /></th>
+                      <th>Actions</th>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox2" value="checkbox" /></td>
+                      <td>- John Doe </td>
+                      <td>Washington DC </td>
+                      <td>USA</td>
+                      <td>32</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row2">
+                      <td><input type="checkbox" name="checkbox2" value="checkbox" /></td>
+                      <td>- Thierry Mugler </td>
+                      <td>Paris</td>
+                      <td>France</td>
+                      <td>28</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox3" value="checkbox" /></td>
+                      <td>- Jose Manta </td>
+                      <td>Madrid</td>
+                      <td>Spain</td>
+                      <td>21</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row2">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Michael Luvsum </td>
+                      <td>Berlin</td>
+                      <td>Germany</td>
+                      <td>22</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Adrian Tamoe</td>
+                      <td>Zurich</td>
+                      <td>Switzerland</td>
+                      <td>30</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row2">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- George Rusen</td>
+                      <td>Bucharest</td>
+                      <td>Romania</td>
+                      <td>26</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Rodney Mullen</td>
+                      <td>San Francisco</td>
+                      <td>USA</td>
+                      <td>39</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row2">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Michael Luvsum </td>
+                      <td>Berlin</td>
+                      <td>Germany</td>
+                      <td>22</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Adrian Tamoe</td>
+                      <td>Zurich</td>
+                      <td>Switzerland</td>
+                      <td>30</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row2">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- George Rusen</td>
+                      <td>Bucharest</td>
+                      <td>Romania</td>
+                      <td>26</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                    <tr class="row1">
+                      <td><input type="checkbox" name="checkbox4" value="checkbox" /></td>
+                      <td>- Rodney Mullen</td>
+                      <td>San Francisco</td>
+                      <td>USA</td>
+                      <td>39</td>
+                      <td><img src="/static/img/icons/page_edit.png" alt="edit" width="16" height="16" /> <img src="/static/img/icons/add.png" alt="add" width="16" height="16" /> <img src="/static/img/icons/delete.png" alt="delete" width="16" height="16" /></td>
+                    </tr>
+                  </tbody>
+                </table>
+                <div class="paginationWrap">
+                    <ul>
+                        <li class="previous-off">&laquo;Previous</li>
+                        <li class="active">1</li>
+                        <li><a href="?page=2">2</a></li>
+                        <li><a href="?page=3">3</a></li>
+                        <li><a href="?page=4">4</a></li>
+                        <li><a href="?page=5">5</a></li>
+                        <li><a href="?page=6">6</a></li>
+                        <li><a href="?page=7">7</a></li>
+                        <li class="next"><a href="?page=8">Next &raquo;</a></li>
+                    </ul>
+                </div>

=== added file 'vauxoomin/templates/widgets/main_menu.html'
--- vauxoomin/templates/widgets/main_menu.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/main_menu.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,52 @@
+                    <li class="current">
+                        <a href="#">Dashboard</a>
+                        <ul class="sub_menu">
+                             <li><a href="#">Sub-Menu-1</a></li>
+                             <li>
+                                <a href="#">Sub-Menu-2</a>
+                                <ul>
+                                    <li><a href="#">Sub-Menu-2-1</a></li>
+        
+                                    <li><a href="#">Sub-Menu-2-2</a></li>
+                                </ul>
+                             </li>
+                             <li><a href="#">Sub-Menu-3</a></li>
+                             <li><a href="#">Sub-Menu-4</a></li>
+                        </ul>
+                    </li>
+                    
+                    <li>
+                        <a href="#">Products</a>
+                        <ul class="sub_menu">
+                             <li><a href="#">Sub-Menu-1</a></li>
+                             <li>
+                                <a href="#">Sub-Menu-2</a>
+                                <ul>
+                                    <li><a href="#">Sub-Menu-2-1</a></li>
+        
+                                    <li><a href="#">Sub-Menu-2-2</a></li>
+                                </ul>
+                             </li>
+                             <li><a href="#">Sub-Menu-3</a></li>
+                             <li><a href="#">Sub-Menu-4</a></li>
+                        </ul>
+                    </li>
+                    
+                    <li>
+                        <a href="#">Orders</a>
+                        <ul class="sub_menu">
+                             <li><a href="#">Sub-Menu-1</a></li>
+                             <li>
+                                <a href="#">Sub-Menu-2</a>
+                                <ul>
+                                    <li><a href="#">Sub-Menu-2-1</a></li>
+        
+                                    <li><a href="#">Sub-Menu-2-2</a></li>
+                                </ul>
+                             </li>
+                             <li><a href="#">Sub-Menu-3</a></li>
+                             <li><a href="#">Sub-Menu-4</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="#">Members</a></li>
+                    <li><a href="#">Settings</a></li>

=== added file 'vauxoomin/templates/widgets/search_box.html'
--- vauxoomin/templates/widgets/search_box.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/search_box.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,19 @@
+<div id="searchBox">
+    <fieldset>
+        <legend>Search</legend>
+        <input size="15" class="formSmall" type="text" /> <input value="Go" class="button" type="submit" />
+        <h6>(<a href="#" id="advancedSearchLink">advanced search options</a>)</h6>
+        <div id="advancedSearchWrap">
+            <select name="listmenu">
+                <option selected="selected">Select Category</option>
+                <option>Orders</option>
+                <option>Members</option>
+            </select>
+            <fieldset class="labelRadioCheckbox">
+                <legend>Include Archives</legend>    
+                <label for="yes" class="labelRadioCheckbox"><input name="gender" id="yes" value="Yes" type="radio" />Yes</label>
+                <label for="no" class="labelRadioCheckbox"><input name="gender" id="no" value="No" checked="checked" type="radio" />No</label>
+            </fieldset>
+        </div>
+    </fieldset>
+</div>

=== added file 'vauxoomin/templates/widgets/tabed_menu.html'
--- vauxoomin/templates/widgets/tabed_menu.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/tabed_menu.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,27 @@
+{% autoescape None %}
+                <h1>{{title}}</h1>
+                <div id="tabs"><!--The ID tabs is defined inside includes/static/js/custom.js. To create new tabbed menus, a similar function inside "custom.js" must be added.-->    
+                    <ul>
+                        {% for t in tabs %}
+                        <li><a href="#{{ t['id'] }}">{{ t['title'] }}</a></li>
+                        {% end %}
+                    </ul>
+                        {% for t in tabs %}
+                    <div id="{{ t['id'] }}">
+                            {% if type(t['content']) is list %}
+                                {% for l in t['content'] %}
+                                    <p>{{ escape(l) }}</p>
+                                {% end %}
+                            {% end %}
+                            {% if type(t['content']) is dict %}
+                                <p>{{ modules.WarningWidget(t['content'].get('use','warningBox'),t['content'].get('message','Bad Format for Dict'))}}</p>
+                            {% end %}
+                            {% if type(t['content']) is str %}
+                                <p>{{ modules.WarningCode(t['content']) }}</p>
+                            {% end %}
+                            {% if type(t['content']) is tuple %}
+                                {{ modules.ListDbs(t['content'])}}
+                            {% end %}
+                    </div>
+                        {% end %}
+                </div>

=== added file 'vauxoomin/templates/widgets/top_menu.html'
--- vauxoomin/templates/widgets/top_menu.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/top_menu.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,5 @@
+<ul>
+    <li>Welcome John Doe</li>
+    <li class="seperator"><a href="#">My Account</a></li><!--seperator class is used for adding the seperator background between items-->
+    <li class="seperator"><a href="#">Logout</a></li>
+</ul>

=== added file 'vauxoomin/templates/widgets/twitter.html'
--- vauxoomin/templates/widgets/twitter.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/twitter.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,30 @@
+<script charset="utf-8" src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'search',
+  search: 'openerp',
+  interval: 30000,
+  title: 'OpenERP',
+  subject: 'Todo lo que se Habla',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#677075',
+      color: '#ffffff'
+    },
+    tweets: {
+      background: '#ffffff',
+      color: '#444444',
+      links: '#1985b5'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: true,
+    live: true,
+    behavior: 'default'
+  }
+}).render().start();
+</script>

=== added file 'vauxoomin/templates/widgets/warning_message.html'
--- vauxoomin/templates/widgets/warning_message.html	1970-01-01 00:00:00 +0000
+++ vauxoomin/templates/widgets/warning_message.html	2012-03-21 00:56:22 +0000
@@ -0,0 +1,3 @@
+{% autoescape None %}
+<!--Use==> warningBox, infoBox, successBox, errorBox-->
+<div class="{{ use }}">{{ message }}</div>

=== modified file 'vauxoomin/vauxomin.cfg'
--- vauxoomin/vauxomin.cfg	2012-02-12 18:28:58 +0000
+++ vauxoomin/vauxomin.cfg	2012-03-21 00:56:22 +0000
@@ -1,2 +1,7 @@
+title="Vauxoo Info Admin Server"
 port=12222
 user="nhomar"
+name_server="server"
+path_to_log="log_openerp"
+relative_path="instancias"
+config_path="config"

=== modified file 'vauxoomin/vauxomin.py'
--- vauxoomin/vauxomin.py	2012-02-16 12:15:10 +0000
+++ vauxoomin/vauxomin.py	2012-03-21 00:56:22 +0000
@@ -5,7 +5,7 @@
 # Licensed under the Afero GNU License, Version 3.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,6 +22,7 @@
 #Importing vauxoomin stuff
 from main import server
 from main import action
+from main import markdown
 
 
 define("port", default=8888, help="run on the given port", type=int)
@@ -32,7 +33,8 @@
 define("user", default="openerp", help="Posix user wher you save all your work, and this user will run all instances")
 define("maindb", default="precision", help="Main db for this user, generally is produccion")
 define("demo", default=False, help="Just to load original demo info for template (for development purpose)")
-
+define("name_server", default='server', help="how you will call server on your instance")
+define("path_to_log", default='log_openerp', help="where will be logs on openerp")
 class Application(tornado.web.Application):
     '''
     Initial instanciation for TornadoWeb application
@@ -43,6 +45,7 @@
     '''
     def __init__(self):
         handlers = [
+                (r"/profit", ProfitHandler),
                 (r"/", HomeHandler),
                 (r"/([^/]+)", BranchHandler),
                 (r"/action/([^/]+)/([^/]+)", ActionHandler),
@@ -53,7 +56,27 @@
                 ui_modules={"Project": ProjectModule,
                             "Branch": BranchModule,
                             "Config": ConfigModule,
-                            "Action": ActionModule},
+                            "Action": ActionModule,
+                            #Widgets
+                            "TopMenu": TopMenu,
+                            "Logo": Logo,
+                            "MainMenu": MainMenu,
+                            "SearchBox": SearchBox,
+                            "Calendar": Calendar,
+                            "Acordion": Acordion,
+                            "Crumbs": Crumbs,
+                            "WarningWidget": WarningWidget,
+                            "DashBlock": DashBlock,
+                            "Chart": Chart,
+                            "ListPaged": ListPaged,
+                            "ListDbs": ListDbs,
+                            "TabedMenu": TabedMenu,
+                            "AcordionWrap": AcordionWrap,
+                            "Form": Form,
+                            "ImageGallery": ImageGallery,
+                            "Twitter": Twitter,
+                            "DashBranches": DashBranches,
+                            "WarningCode": WarningCode},
                 static_path=os.path.join(os.path.dirname(__file__), "static"),
                 title=options.title,
                        )
@@ -66,10 +89,23 @@
     '''
     def get(self):
         if not options.demo:
-            self.render('index.html',projects=server.get_dirs())
-        else:
-            self.render('demo_theme.html',projects=server.get_dirs())
-
+            self.render('home.html',projects=server.get_dirs())
+        else:
+            self.render('demo_theme.html',projects=server.get_dirs())
+
+class ProfitHandler(tornado.web.RequestHandler):
+    '''
+    Manage preparation to show home with list of projects
+    '''
+    def profit_get(self):
+    
+        return ['Hola','MUndo']
+
+    def get(self):
+        if not options.demo:
+            self.render('home_profit.html',projects=self.profit_get())
+        else:
+            self.render('demo_theme.html',projects=server.get_dirs())
 
 class BranchHandler(HomeHandler):
     '''
@@ -82,7 +118,7 @@
         status=server.get_status(slug)
         config=server.get_config(slug)
         log_file=server.get_logs(slug)
-        self.render("main.html", branches=[s for s in show if type(s) is not str],project=slug,config=config,status=status,log=log_file)
+        self.render("home_project.html", branches=[s for s in show if type(s) is not str],project=slug,config=config,status=status,log=log_file)
 
 
 #All actions Handlers availables on Action Module
@@ -94,10 +130,27 @@
         status=server.get_status(instance)
         config=server.get_config(instance)
         log_file=server.get_logs(instance)
+        cp_msg={'use':'errorBox',
+            'message':'Houston we have a problem to make this action or the rocket is not already to be launched'}
         if slug=='copy_instance':
-            cp_msg=action.copy_instance(instance,options.user,options.relative_path)
+            cp_msg=action.copy_instance({'instance':instance,
+                                        'user':options.user,
+                                        'relative_path':options.relative_path,
+                                        'name_server':options.name_server})
         if slug=='clone_main_db':
             cp_msg=action.clone_main_db(options.maindb)
+        if slug=='create_log':
+            cp_msg=action.create_log({'instance':instance,
+                                       'path_to_log':options.path_to_log,
+                                       'user':options.user})
+        if slug=='create_config':
+            cp_msg=action.create_config(instance)
+        if slug=='start_server':
+            cp_msg=action.start_server({'instance':instance,
+                                        'user':options.user,
+                                        'relative_path':options.relative_path,
+                                        'base_config_path':options.config_path,
+                                        'name_server':options.name_server})
         self.render('action.html',action=slug, project=instance, 
         instance=instance, log=log_file, config=config,status=status,
         cp_msg=cp_msg)
@@ -124,8 +177,9 @@
     '''
     Manage show list of configuration on your Project
     '''
-    def render(self, config, value):
-        return self.render_string("modules/right.html", config=config, value=value)
+    def render(self, project):
+        configs=server.get_config(project)
+        return self.render_string("widgets/acordion_menu.html", configs=configs, description='HEllo', menu=project)
 
 
 class ActionModule(tornado.web.UIModule):
@@ -135,6 +189,199 @@
     def render(self, status, instance):
         return self.render_string("modules/left.html", status=status, instance=instance)
 
+
+class TopMenu(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your user
+    '''
+    def render(self, status):
+        return self.render_string("widgets/top_menu.html", status=status)
+
+
+class Logo(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self, path_logo):
+        return self.render_string("widgets/img_logo.html", path_logo=path_logo)
+
+
+class MainMenu(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self, menus):
+        return self.render_string("widgets/main_menu.html", menus=menus)
+
+
+class SearchBox(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        return self.render_string("widgets/search_box.html")
+
+
+class Calendar(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        return self.render_string("widgets/calendar.html")
+
+
+class Acordion(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self, project):
+        configs=server.get_config(project)
+        return self.render_string("widgets/acordion_menu.html", submenus=configs, description='HEllo', menu=project)
+
+class Crumbs(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        return self.render_string("widgets/crumbs.html")
+
+
+class WarningWidget(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,use="warningBox",message="Be Carefull Something goes wrong"):
+        '''
+        use: warningBox, infoBox, successBox, errorBox-->
+        message: Message to render
+        '''
+        return self.render_string("widgets/warning_message.html",use=use,message=message)
+
+
+class DashBlock(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,elements,context_message):
+        '''
+        use: warningBox, infoBox, successBox, errorBox-->
+        message: Message to render
+        '''
+        return self.render_string("widgets/dash_blocks.html", elements=elements,context_message=context_message)
+
+
+class DashBranches(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,elements,context_message):
+        '''
+        use: warningBox, infoBox, successBox, errorBox-->
+        message: Message to render
+        '''
+        return self.render_string("widgets/dash_branches.html", elements=elements,context_message=context_message)
+
+class Chart(tornado.web.UIModule):
+    '''
+    TODO: See what we will do with it
+    '''
+    def render(self):
+        '''
+        use: warningBox, infoBox, successBox, errorBox-->
+        message: Message to render
+        '''
+        return self.render_string("widgets/chart.html")
+
+
+class ListPaged(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/list_paged.html")
+
+
+class ListDbs(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,databases):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/list_db.html",databases=databases)
+
+class TabedMenu(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,title,tabs):
+        '''
+        Standarized the use of this widget
+        :title: title on tabs groups
+        :tabs: List of dictionaries, [{'id':'String','content':'html string','title':'string with title'}]
+        '''
+        return self.render_string("widgets/tabed_menu.html",title=title,tabs=tabs,server=server)
+        
+
+class AcordionWrap(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/acordion_wrap.html")
+
+
+class Form(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/form.html")
+
+
+class ImageGallery(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/image_gallery.html")
+
+
+class Twitter(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/twitter.html")
+
+
+class WarningCode(tornado.web.UIModule):
+    '''
+    Manage show list of actions availables on your logo
+    '''
+    def render(self,html):
+        '''
+        TODO: Standarize the use of this widget
+        '''
+        return self.render_string("widgets/code.html",message=html)
+
+
 #HandleErrors
 class NotFoundHandler(HomeHandler):
     def prepare(self):