Commits

Chris Moffitt committed 6d8bb4f

Some documentation updates.

Comments (0)

Files changed (5)

docs/new_installation.txt

 you have write access to. In the below example, we use :file:`/home/user/src`. You are expected to modify the path to fit your needs.
 
 .. warning::
-   You must have Django 1.3.1 properly installed.
+   You must have Django 1.3.1 or higher properly installed.
 
 A Quick Note About Installing Dependencies
 ------------------------------------------
 All of these will work fine with Satchmo, but in the interest of keeping this as
 straightforward as possible, we show how to install the packages with either:
 
-  - :command:`easy_install`, or
+  - :command:`pip`, or
   - :command:`python setup.py install` on a source code checkout (with mercurial)
 
 .. note::
 
 #. Install required dependencies (this may vary based on your OS of choice)::
 
-        easy_install pycrypto
-        easy_install http://www.satchmoproject.com/snapshots/trml2pdf-1.2.tar.gz
-        easy_install PyYAML
-
-   .. note::
-      If you have the old Python 2.4 installed, you should use also the old version
-      of python-yaml provided by your distribution, not the latest PyYAML from pipy.
-      If you have Python 2.4 installed, you will need to install elementtree also::
-
-        easy_install elementtree
+        pip install pycrypto
+        pip install http://www.satchmoproject.com/snapshots/trml2pdf-1.2.tar.gz
+        pip install pyyaml
 
 #. Install Python Imaging Library. There are multiple options for installing
    this application; please use one of the options below:
 
 #. Install Reportlab based on the description for your OS `here <http://www.reportlab.com/software/opensource/rl-toolkit/download/>`_
 
-#. Install django-threaded-multihost:
+#. Install django-threaded-multihost::
 
-   - Check out from source::
+        pip install django-threaded-multihost
 
-       hg clone http://bitbucket.org/bkroeze/django-threaded-multihost/
-       cd /path/to/django-threaded-multihost
-       python setup.py install
+#. Install django-app-plugins::
 
-#. Install django-app-plugins:
+        pip install django-app-plugins
 
-   - Check out the satchmo-enhanced version::
+#. Install sorl-thumbnail::
 
-       hg clone http://bitbucket.org/bkroeze/django-caching-app-plugins/
-       cd /path/to/django-caching-app-plugins
-       python setup.py install
+        pip install sorl-thumbnail
 
-#. Install sorl-thumbnail:
+#. Install signals-ahoy::
 
-   - Using pip::
-   
-       pip install sorl-thumbnail
+        pip install django-signals-ahoy
 
-#. Install signals-ahoy:
+#. Install livesettings::
 
-   - Check out from source::
+        pip install django-livesettings
 
-       hg clone http://bitbucket.org/bkroeze/django-signals-ahoy/
-       cd /path/to/django-signals-ahoy
-       python setup.py install
+#. Install keyedcache::
 
-#. Install livesettings:
-
-   - Check out from source::
-
-       hg clone http://bitbucket.org/bkroeze/django-livesettings/
-       cd /path/to/djang-livesettings
-       python setup.py install
-
-   .. versionadded:: 0.9.1
-
-#. Install keyedcache:
-
-   - Check out from source::
-
-       hg clone http://bitbucket.org/bkroeze/django-keyedcache/
-       cd /path/to/django-keyedcache
-       python setup.py install
+        pip install django-keyedcache
 
    .. versionadded:: 0.9.1
 
 
    You may choose to install these dependencies by running::
 
-     easy_install Sphinx
-     easy_install docutils
+        pip install sphinx
+        pip install docutils
 
 #. Satchmo also uses South for database migrations. You may also install it::
 
-     easy_install South
+        pip install South
 
    .. seealso::
 
 
 #. If you use the Fedex shipping module, you will need to install 2 additional modules::
 
-     easy_install fedex
-     easy_install suds
+        pip install fedex
+        pip install suds
 
 #. Install django-registration:
 
 Install Base Requirements
 -------------------------
 
-Ensure that python 2.4 or greater is installed. Mercurial must also be installed. 
+Ensure that python 2.5 or greater is installed. Mercurial must also be installed. 
 
 Next, install `python setuptools <http://pypi.python.org/pypi/setuptools>`_ 
 so that easy_install is available.

docs/release-notes-0-9-3.txt

 ------------
  * upgraded to use the latest Sorl Thumbnail code. Please review the migration notes
  * Added Paypal Payflowpro payment module
+ * Updated all templates to use `Django static files <https://docs.djangoproject.com/en/dev/howto/static-files/>`_
 
 Translations
 ------------
 This upgrade allows Satchmo to utilize all the latest features in Sorl. You are encouraged to read `Sorl's docs <http://thumbnail.sorl.net/index.html>`_ in order to determine 
 which ones you'd like to include in your store.
 
+Django Static Files
++++++++++++++++++++
+In `rev 2476 <https://bitbucket.org/chris1610/satchmo/changeset/3848d39b63c0>`_ Satchmo is updated to use Django's static files. If you have made any changes to templates, you'll need to make sure
+to replace references top media_url with STATIC_URL. Here is an example of the original template::
 
-
+    <script src="{{media_url}}js/jquery.cookie.js" type="text/javascript"></script>
+    
+Here is the new template::
+    
+    <script src="{{ STATIC_URL }}js/jquery.cookie.js" type="text/javascript"></script>
+    

docs/requirements.txt

 Django instance to use Satchmo.  The `Django installation guide`_ will step you
 through the process.
 
-You must use Django 1.2.3 or greater. Series 1.3.x is currently recommended.
-At final Satchmo 0.9.3 may be required Django 1.3.x or 1.4.
+You must use Django 1.3.1 or greater. 
 
 Satchmo requires Python 2.5 or later and a database supported by Django.
 
             (r'test/', include('simple.localsite.urls'))
         )
 
-
-3. Copy over the static directory::
-
-        python manage.py satchmo_copy_static
-
-4. Ensure that you have a template directory setup. You only need to place templates in the directory if you are
+3. Ensure that you have a template directory setup. You only need to place templates in the directory if you are
 overriding existing templates.
 
 After you have installed everything, you should have a directory structure that looks similar to this::