From da1e8b3580d7146fe0b82342f933c045279a8fa4 Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Mon, 25 Apr 2011 14:54:29 +0800
Subject: [PATCH] version 1.2.1. Updated readme and comments in Gemfile

---
 Gemfile | 19 ++++++++++++-------
 README  | 31 ++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4ce1bab..6ee77ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,16 +4,23 @@ gem 'rails'
 
 gem 'mime-types', :require => 'mime/types'
 gem "carrierwave", :git => 'git://github.com/jnicklas/carrierwave.git'
+
+# -- Database
+# SQLite
+gem 'sqlite3-ruby'
 # MySQL:
 #gem 'mysql2'
 # PostgreSQL:
 #gem 'pg'
-# SQLite
-gem 'sqlite3-ruby'
 
-# S3 support
+# -- Cloud storage
+# AWS S3 support. Can be disabled if using local file system instead of cloud storage.
 gem 'fog'
 
+# -- Photo resizing
+# MiniMagick
+gem "mini_magick"
+
 # ImageMagick:
 #gem "rmagick", :require => 'RMagick'
 
@@ -21,8 +28,6 @@ gem 'fog'
 #gem "RubyInline"
 #gem "image_science", :git => 'git://github.com/perezd/image_science.git'
 
-# MiniMagick
-gem "mini_magick"
-
-# Mini exif tool
+# -- EXIF
+# Mini exif tool. Can be disabled. Remove exif_read and exif_write filters in photo model
 gem "mini_exiftool"
\ No newline at end of file
diff --git a/README b/README
index 70555cb..ae87b73 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 
 Made by Espen Antonsen.
 
-Version 1.2.0 for Rails3
+Version 1.2.1 for Rails3. See the rails2 branch for previous version.
 
 http://balderapp.com
 
@@ -27,18 +27,14 @@ Free for personal use. Contact me for commercial license.
 Rails 3.0
 
 Software
-- ImageMagicK (required for Carrierwave resizing). Can also use ImageScience and MiniMagick
-- ExifTool (required for Mini_EfixTool). Can be disabled.
-
-Ruby Gems
-- AuthLogic
-- Mime-Types
-- Carrierwave
-- Mini_Exiftool (to read exif info to database and write exif to original file. See photo.rb model). Can be disabled.
+Default:
+- ExifTool (required for Mini_EfixTool). Can be disabled. Default is to read EXIF tags but not write them to the file when database is updated as writing EXIF is slow. To enable just uncomment exif_write in photo.rb
+- ImageMagicK. Carrierwave can use either RMagicK or MiniMagicK (default). To change resize option the correct gem must be used (specified in Gemfile) and change included setting for Carrierwave in file_uploader.rb
 Optional:
-	- AWS/S3 (if saving to Amazon s3)
-	
-	
+- ImageScience.
+
+Ruby Gems: See Gemfile
+
 == Configuration
 
 config/balder.rb has the following adjustable settings:
@@ -74,7 +70,7 @@ http://blog.inspired.no/rails-photo-gallery-balder-on-heroku-and-s3-726
 
 === Optional: add photos directly to disk
 
-The gallery has a web-based upload tool. Alternatively you can upload files directly by doing this:
+The gallery has a web-based upload tool. Alternatively you can upload files directly to the upload folder. This means you can import an existing folder based photo collection to Balder.
 
 Put photos in containing folders(albums) in the specified gallery folder.
 Hierarchy of folders is not fully supported.
@@ -91,6 +87,9 @@ Every time you manually add photos to disk you must scan by visiting /photos/sca
 
 == Version history
 
+1.2.1
+- Using plupupload instead of uploadify for non-flash upload options. Can now use html5, normal form, silverlight, gears and browserplus for photo upload.
+
 1.2.0
 - New storage path: "/uploads/files/" instead of "/uploads/". Make sure you move your photos or adjust the storage path.
 
@@ -98,6 +97,12 @@ Every time you manually add photos to disk you must scan by visiting /photos/sca
 
 - Testing...
 
+== IDEAS
+- Themes
+- Improved UX
+- Mobile/Tablet friendly display using CSS media queries
+Patches welcome!
+
 == Copyright and license info
 
 This code is copyrighted by Espen Antonsen. The source code is available free under the GNU General Public License version 3 (GPLv3).