Merge branch 'master' of git://github.com/flinkIBE/flink into ui

Author: Eugene Baumstein

README.md

@@ -1,36 +1,69 @@
-To install:
+# Flink
 
-    # On some systems, easy_install might be easy_install.py
-    $ sudo easy_install fabric 
-    # If asked about facebook-sdk, say wipe(w) to proceed
-    $ fab setup
+This is intended to be deployed on a *nix system.
+
+All commands starting with 'fab' use python fabric and run the method
+('setup', 'deploy', etc.) that is in fabfile.py. You will need an internet
+connection to install the app's dependencies.
+
+## Dependencies
+Installing dependencies for your system varies by package manager. Yum, Apt, 
+Pacman, etc. are a few you can use. Some of the more important dependencies that 
+need to be installed on your *nix system:
 
-Dependencies that need to be installed:
+    * python 2.7+
+    * not django (the app will take care of installing a specific version of 
+      django on your system: 1.3rc1)
+    * Firefox 3.6+.
+    * python-dev (aka python-devel in some repos) 
     * ffmpeg
       This might require the use of 3rd party repos. Fedora, for example, will
       only have packages in the official repo that are completely open source.
       The RPM Fusion repository comes in useful here. Ubuntu makes this easier.
     * libvorbis
     * libtheora
+    
+    Video conversion will not be handled correctly if ffmpeg, libvorbis and
+    libtheora aren't installed. 
+
+## Install
+
+    # On some systems, easy_install might be easy_install.py
+    $ sudo easy_install fabric
+    
+    # If asked about facebook-sdk, say wipe(w) to proceed
+    # If prompted to create a superuser, it is not necessary.
+    $ fab setup
+
+## Deploy
 
-To deploy:
     $ fab deploy
 
-Then go to http://localhost:8000, or whatever server it started, in your 
-browser.	
+Then go to http://localhost:8000, or whatever server it started, in your browser.
 Not a bug: when you signup, the app tries to send a confirmation email.
-if your laptop isnt running a mailserver, it will fail, but just ignore it:
-Your account has been successfully created
+If your laptop isnt running a mailserver, it will fail, but just ignore it:
+Your account has been successfully created.
 
-Testing:
+There is test media (such as pictures, audio and video) in the test-media directory
+that you can use to upload to the app.
+
+## Testing
 
 To load the test data:
+    
     $ python manage.py loaddata app/fixtures/test_fixture.json 
+
 Unit tests will load the test data on its own, but you can load the test data to probe the database.
 
 To just run the unit tests + selenium test:
+    
     $ fab test
 
 To get the coverage report for the unit test only:
+
 	$ coverage run --source=app/lib.py,app/views.py,app/decorators.py,urls.py ./manage.py test app.PeopleHandlerTest app.ProfileHandlerTest app.PosterboardHandlerTest app.ElementHandlerTest
-	$ coverage report
+	$ coverage report
+	 
+## TODO
+
+See TODO.txt. There are a bunch of features needed to be implemented in there.

TODO.txt

@@ -1,20 +1,14 @@
 Modify this list with updated information.
 
-* Make rest of the models and forms.
-* Add in functionality for orientation of images.
+* Timeline functionality.
+* Add in functionality for orientation of images and opacity possibly?
 * Defaults! And adjusting defaults and settings.
     * Grid size (gridArray variable in posterboards/show should not be hardcoded
       but should comprise template variables that are pulled from the DB).
     * Default layout
-* User Home Page
-    * On PB Creation, user adds it to a location on the home page.
 * Comments    
 * Details
    * Timestamps for posterboards
-   * LOTS of validation... what if a user tries adding 50 objects to a 
-     posterboard? We should limit that right? Refer to the design doc and spec.
-     What if the user tries making the grid size 1x1 pixels... that's not good,
-     neither is 500x500 pixels.
    * Use Amazon S3 to store content such as images, audio, video and retrieve 
      the content properly.
       * Use django plugins to help with this, or their native implementation 
@@ -24,10 +18,11 @@ Modify this list with updated information.
      with a second level of hashes for the actual posterboard, so as to 
      preserve privacy of private posterboards. Use a secret key hashed with 
      user id and posterboard id.
+   * More client-side and server-side validation.
 * Web page styling
    * Right now, the website looks pretty ugly. It needs to look much better.
    * Make posterboard page shinier. Editing toolbar needs to look better.
    * Header and footer especially.
-* Patch vlprocess for pad options.
-* Patch django_cron for syncdb errors.
-* ***********TESTS!!!!!****************
+* Patch vlprocess for pad options (done in our app, pull request?).
+* Patch django_cron for syncdb errors (done in our app, pull request?).
+* ***********MORE TESTS!!!!!****************

fabfile.py

@@ -21,7 +21,6 @@ def saml():
 # setup
 def setup():
     local('sudo easy_install pip')
-    local('sudo apt-get install python-dev')
     local('sudo pip install -r requirements.txt')
     local('mkdir -p logs')
     local('python manage.py syncdb')

static/css/editbar.css

@@ -2,7 +2,7 @@
     color:#FFFFFF;
     font-family:arial;
     font-size:12px;
-    text-align:left;
+    text-align:center;
 }
 
 #editbar h2{
@@ -15,6 +15,7 @@
 #editbar a{
     color:#FFFFFF;
     text-decoration:none;
+    outline: none;
 }
 
 #editbar h2 span{
@@ -34,9 +35,11 @@
 
 #edit_toggle{
     float:right;
-    height:350px;
+    height:342px;
     width:25px;
-    border:0;
+    background-attachment: scroll;
+    background-color: #330000;
+    border: 4px outset #330000;
 }
 
 #edit_toggle_img{

templates/posterboards/show.html

@@ -82,6 +82,18 @@
             $(document).ready(function(){
 
                 {% if blog_owner %}
+                
+                /*
+                 * Editbar
+                 */
+                
+                $(sidebartab_id).mousedown(function(){
+                   $(sidebartab_id).css('border-style','inset'); 
+                });
+                $(sidebartab_id).mouseup(function(){
+                   $(sidebartab_id).css('border-style','outset'); 
+                });
+                
                 $(sidebartab_id).click(function(){
                     $(sidebarcontent_id).animate({ "width":"toggle"},{duration:400,queue:false});