From 99f2f532d8677fbf52b2dd4f16c25ee5c7984018 Mon Sep 17 00:00:00 2001
From: admin <admin@mocambos.net>
Date: Wed, 1 Feb 2012 01:35:33 +0100
Subject: [PATCH] Atualizando exemplos, script e INSTALL

---
 INSTALL                      | 19 ++++++++++++++++++-
 exemplos/settings.py         | 12 ++++++------
 exemplos/urls.py             |  8 ++++----
 script/install-django-env.sh |  4 +++-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/INSTALL b/INSTALL
index 288d729..2cad476 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,28 @@
 Para criar o ambiente rode o script "install-django-env.sh" que se encontra na pasta 
-"Mocambos_Portal_Local/script".
+"Mocambos_Portal_Local/script":
 
  ./install-django-env.sh
 
+Para ativar o ambiente:
+
+ source ~/VirtualEnvs/Mocambos_Portal/bin/activate
+
 Depois de ter ja criado e ativado o ambiente com virtualenv, crie uma aplicação django com o comando:
  python django-admin.py startproject NomeDoPortalLocal
 
 Copie e altere os arquivos "settings.py" e "urls.py" que encontra na pasta "Mocambos_Portal_Local/exemplos/" para
 a raiz da pasta que criou "NomeDoPortalLocal".
 
+Tem que verificar que todos os links estao certos.
+
+Agora precisa instalar os aplicativos especificos para entrar na rede de portais locais e compartilhar arquivos.
+Vamos instalar o "mmedia" e o "gitannex". Entre na pasta "~/VirtualEnvs/Mocambos_Portal/lib/python2.6/site-packages" e digite:
+ git clone https://20@github.com/20/mmedia.git
+ git clone https://20@github.com/20/gitannex.git
+
+Agora podem entrar na pasta do portal "NomeDoPortalLocal" e:
+criar a estrutura de pasta para os medias:
+ mkdir -p media/gitannex/taina.mocambos.net/serialized
+
+
+
diff --git a/exemplos/settings.py b/exemplos/settings.py
index 6f5f2d1..5b397c3 100644
--- a/exemplos/settings.py
+++ b/exemplos/settings.py
@@ -1,6 +1,6 @@
 # Django settings for Mocambos_Portal project.
-BASE_ROOT = '/home/befree/MocambosPortal1/'
-ROOT_URLCONF = 'MocambosPortal1.urls'
+BASE_ROOT = '/home/taina/CasaDeCulturaTaina/'
+ROOT_URLCONF = 'CasaDeCulturaTaina.urls'
 GITANNEX_DIR = 'gitannex'
 SERIALIZED_DIR = 'serialized'
 PORTAL_NAME = 'taina.mocambos.net'
@@ -87,7 +87,7 @@
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/home/befree/MocambosPortal1/static/sta',
+    '/home/taina/CasaDeCulturaTaina/static/sta',
 )
 
 # List of finder classes that know how to find static files in
@@ -137,9 +137,9 @@
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
 #    'polls',
-    'easy_thumbnails',
+#    'easy_thumbnails',
 #    'filer',
-    'grappelli',
+#    'grappelli',
 #    'filebrowser',
     'django.contrib.admin',
 #    'django_bfm',
@@ -194,7 +194,7 @@
         }
 }
 
-ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
+#ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
 
 ##############################################################################
 # LDAP Authentication Backend                              
diff --git a/exemplos/urls.py b/exemplos/urls.py
index 738f8fe..c45afc5 100644
--- a/exemplos/urls.py
+++ b/exemplos/urls.py
@@ -4,7 +4,7 @@
 #from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 ## For Django-Filebrowser >= 3.4.0
-from filebrowser.sites import site
+#from filebrowser.sites import site
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -21,13 +21,13 @@
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 #    # For Django-Grappelli
-    url(r'^grappelli/', include('grappelli.urls')),
+#    url(r'^grappelli/', include('grappelli.urls')),
     ## For Django-Filebrowser 3.4.0
-    url(r'^admin/filebrowser/', include(site.urls)),
+#    url(r'^admin/filebrowser/', include(site.urls)),
 #    # For Django-Filebrowser 3.3.0
 #    url(r'^admin/filebrowser/', include('filebrowser.urls')),
     # For django_bfm
-    url(r'^files/', include('django_bfm.urls')),
+#    url(r'^files/', include('django_bfm.urls')),
 )
 
 # For Django-Filer
diff --git a/script/install-django-env.sh b/script/install-django-env.sh
index 180877b..982053d 100755
--- a/script/install-django-env.sh
+++ b/script/install-django-env.sh
@@ -1,9 +1,11 @@
 # Pacotes necessarios 
 sudo apt-get install libldap2-dev libsasl2-dev libssl-dev python-virtualenv python2.6 python2.6-dev
 virtualenv -p /usr/bin/python2.6 --no-site-packages --distribute VirtualEnvs/Mocambos_Portal
-source VirtualEnvs/Mocambos_Portal/bin/activate
+source ~/VirtualEnvs/Mocambos_Portal/bin/activate
 pip install django==1.3.1
 pip install django-auth-ldap
+pip install python-ldap
+pip install pillow 
 
 # # Pacotes necessarios para django-filer
 # sudo apt-get install libfreetype6-dev liblcms1-dev libjpeg8-dev