# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1337956396 -7200
# Node ID 7d56406068138382d20252b6647a9ef40c8bf27b
# Parent  383be02a85eb1e978aad0bcabdd99e8677a4c27b
add missing icons + correct virtualenv creation

diff -r 383be02a85eb -r 7d5640606813 sbin/sync/fabfile.py
--- a/sbin/sync/fabfile.py	Fri May 25 12:55:52 2012 +0200
+++ b/sbin/sync/fabfile.py	Fri May 25 16:33:16 2012 +0200
@@ -99,7 +99,7 @@
 def collectstatic(remotepath, remotevirtualenvpath):
     print("Collect static in %s with %s" % (remotepath, remotevirtualenvpath))
     activate_path = os.path.join(remotevirtualenvpath, "bin/activate")
-    with prefix("source %s" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(os.path.join(remotepath, env.platform_web_module)):
+    with prefix("source \"%s\"" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(os.path.join(remotepath, env.platform_web_module)):
         run("python manage.py collectstatic --noinput")
         
         
@@ -116,6 +116,7 @@
 
 def do_create_virtualenv(remote_venv_export_path, remotevirtualenvpath):
     print("Create virtualenv export_path : %s - remote venvpath : %s" % (remote_venv_export_path, remotevirtualenvpath))
+    activate_path = os.path.join(remotevirtualenvpath, "bin/activate")
     if "remote_baseline_venv" in env and env.remote_baseline_venv:
         prefix_str = os.path.join(env.remote_baseline_venv, "bin/activate")
     else:
@@ -123,7 +124,9 @@
     run("mkdir -p \"%s\"" % remotevirtualenvpath)
     with prefix(prefix_str), cd(os.path.join(remote_venv_export_path,"virtualenv","web")):
         run("python create_python_env.py")
-        run("python project-boot.py --unzip-setuptools --no-site-packages --clear --type-install=local \"%s\"" % remotevirtualenvpath)        
+        run("python project-boot.py --unzip-setuptools --no-site-packages --clear --type-install=local \"%s\"" % remotevirtualenvpath)
+    with prefix("source \"%s\"" % activate_path):
+        run("pip install -r \"%s\"" % os.path.join(remote_venv_export_path,"virtualenv","web","res","srvr_requirements.txt"))
 
 def do_sync_ldt(version, export_path):
     print("do_sync_ldt with version %s and path %s" % (version,export_path))
diff -r 383be02a85eb -r 7d5640606813 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Fri May 25 12:55:52 2012 +0200
+++ b/src/ldt/ldt/__init__.py	Fri May 25 16:33:16 2012 +0200
@@ -1,4 +1,4 @@
-VERSION = (1, 8, 0, "final", 0)
+VERSION = (1, 9, 0, "final", 0)
 
 
 def get_version():
diff -r 383be02a85eb -r 7d5640606813 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html	Fri May 25 12:55:52 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html	Fri May 25 16:33:16 2012 +0200
@@ -33,9 +33,9 @@
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
         <td class="cellimg">
         {% ifequal project.state 2 %}
-        <img src="{{ADMIN_MEDIA_PREFIX}}img/admin/icon-yes.gif" {% if project.change %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
+        <img src="{{LDT_MEDIA_PREFIX}}img/icon-yes.gif" {% if project.change %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
         {% else %}
-        <img src="{{ADMIN_MEDIA_PREFIX}}img/admin/icon-no.gif" {% if project.change %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
+        <img src="{{LDT_MEDIA_PREFIX}}img/icon-no.gif" {% if project.change %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
         {% endifequal %}
         </td>
         <td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %}&nbsp;{% endthumbnail %}</td>
diff -r 383be02a85eb -r 7d5640606813 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html	Fri May 25 12:55:52 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html	Fri May 25 16:33:16 2012 +0200
@@ -17,7 +17,7 @@
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
         <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
         <td class="cellimg">
-        <img src="{{ADMIN_MEDIA_PREFIX}}img/admin/icon-yes.gif" alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
+        <img src="{{LDT_MEDIA_PREFIX}}img/icon-yes.gif" alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
         </td>
         <td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %}&nbsp;{% endthumbnail %}</td>
         <td class="projecttitle">
diff -r 383be02a85eb -r 7d5640606813 src/ldt/ldt/static/ldt/img/icon-no.gif
Binary file src/ldt/ldt/static/ldt/img/icon-no.gif has changed
diff -r 383be02a85eb -r 7d5640606813 src/ldt/ldt/static/ldt/img/icon-yes.gif
Binary file src/ldt/ldt/static/ldt/img/icon-yes.gif has changed
diff -r 383be02a85eb -r 7d5640606813 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Fri May 25 12:55:52 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Fri May 25 16:33:16 2012 +0200
@@ -35,7 +35,9 @@
     'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.5.tar.gz', 'local':'pycrypto-2.5.tar.gz'},
     'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.13.tar.gz#md5=26800ef2c1ee3f185f48fd05258302f4', 'local':'ssh-1.7.13.tar.gz'},
     'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.1', 'local':'fabric-1.4.1.tar.gz'},
-    'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.1.2.tar.gz', 'local':'mercurial-2.1.2.tar.gz'},
+    'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.1.tar.gz', 'local':'mercurial-2.2.1.tar.gz'},
+    'MEMCHACHED': {'setup': 'python-memcached', 'url':'http://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz', 'local':'python-memcached-1.48.tar.gz'},
+    'UWSGI': {'setup': 'uwsgi', 'url': 'http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz', 'local':'uwsgi-1.2.3.tar.gz'}
 }
 
 if system_str == 'Windows':
diff -r 383be02a85eb -r 7d5640606813 virtualenv/res/src/mercurial-2.1.2.tar.gz
Binary file virtualenv/res/src/mercurial-2.1.2.tar.gz has changed
diff -r 383be02a85eb -r 7d5640606813 virtualenv/res/src/mercurial-2.2.1.tar.gz
Binary file virtualenv/res/src/mercurial-2.2.1.tar.gz has changed
diff -r 383be02a85eb -r 7d5640606813 virtualenv/res/src/python-memcached-1.48.tar.gz
Binary file virtualenv/res/src/python-memcached-1.48.tar.gz has changed
diff -r 383be02a85eb -r 7d5640606813 virtualenv/sync/res/res_create_env.py
--- a/virtualenv/sync/res/res_create_env.py	Fri May 25 12:55:52 2012 +0200
+++ b/virtualenv/sync/res/res_create_env.py	Fri May 25 16:33:16 2012 +0200
@@ -10,6 +10,7 @@
     ('PYCRYPTO', 'pip', None, None),
     ('SSH', 'pip', None, None),
     ('FABRIC', 'pip', None, None),
+    ('MERCURIAL', 'pip', None, None),
 ]
 
 def generate_install_methods(path_locations, src_base, Logger, call_subprocess):    
diff -r 383be02a85eb -r 7d5640606813 virtualenv/web/res/srvr_requirements.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/web/res/srvr_requirements.txt	Fri May 25 16:33:16 2012 +0200
@@ -0,0 +1,2 @@
+python-memcached
+uWSGI