From 31c8f3b5e96e43400b5837b537b4222e71032e64 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 7 Feb 2013 01:13:16 +0400
Subject: [PATCH] updated todo...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 TODO.otl    | 13 +++++--------
 index.html  |  8 ++++----
 magazine.js |  8 ++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/TODO.otl b/TODO.otl
index 4b712a1..90672da 100755
--- a/TODO.otl
+++ b/TODO.otl
@@ -14,8 +14,13 @@
 			[_] dark
 		[_] Editor: add toggleEditiorMode to all editables in all versions...
 		| text areas, inputs, ...
+		[_] Editor: make the editor switchable...
+		| if it is imported it should be able to switch on and off on demand...
 		[_] add global credits and copyright page...
 		| list and link all the used software and authors...
+		[_] add default empty state to viewer, magazine and article...
+		| use it to trigger a "New Magazine", "New Cover"/"New Article" and
+		| "New Cover"/"New Page" actions...
 		[_] add transition-duration editors to config page (a-la PAGES_IN_RIBBON)...
 		| will help tuning the system,,,
 		[_] EXPERIMENT: Try using scroll instead of left of .magazine....
@@ -48,19 +53,11 @@
 			[X] (i) info
 			[_] (+) new
 			[_] (x) remove
-		[_] add default empty state to viewer, magazine and article...
-		| use it to trigger a "New Magazine", "New Cover"/"New Article" and
-		| "New Cover"/"New Page" actions...
-		[_] Editor: make the editor switchable...
-		| if it is imported it should be able to switch on and off on demand...
 		[_] Editor: make empty magazine and article visible in the editor...
 		[_] 0% populate an example issue
 			[_] template photo page
 			[_] template 3x3 grid
 			[_] template two column text
-		[_] add separate history manager...
-		| might be a virtual history rather than browser history which 
-		| tends to slow things down -- just a simple stack...
 		[_] make layer default state configurable...
 		| e.g. setting "shown"/"hidden" classes in HTML and adding 
 		| something like a page reset that will restore the default state,
diff --git a/index.html b/index.html
index 27ed972..b14e8fd 100755
--- a/index.html
+++ b/index.html
@@ -514,28 +514,28 @@ $(document).ready(function(){
 			</div>
 			<div class="page no-resize page-align-left">
 				<div class="content" style="background:gold">
-					Page
+					Left-aligned page...
 
 					<div class="page-number-text">[PAGE NUMBER]</div>
 				</div>
 			</div>
 			<div class="page no-resize page-align-center">
 				<div class="content" style="background:yellow; width: 600px">
-					Page
+					Center-aligned page...
 
 					<div class="page-number-text">[PAGE NUMBER]</div>
 				</div>
 			</div>
 			<div class="page no-resize page-align-right">
 				<div class="content" style="background:gold; width: 400px">
-					Page
+					Right-aligned page...
 
 					<div class="page-number-text">[PAGE NUMBER]</div>
 				</div>
 			</div>
 			<div class="page no-resize page-align-right">
 				<div class="content" style="background:orange; width: 200px">
-					Page
+					Right-aligned page...
 
 					<div class="page-number-text">[PAGE NUMBER]</div>
 				</div>
diff --git a/magazine.js b/magazine.js
index 5e94df7..dce1137 100755
--- a/magazine.js
+++ b/magazine.js
@@ -114,10 +114,13 @@ function isPageResizable(page){
 	}
 
 	var mag = $('.magazine')
+	var set = page.parents('.page-set').first()
 	var article = page.parents('.article').first()
 
 	// first check the page...
 	return (page.hasClass('no-resize') ? false 
+			// then the page-set...
+			: set.hasClass('no-resize') ? false
 			// then the article...
 			: article.hasClass('no-resize') ? false
 			// then the magazine...
@@ -140,12 +143,17 @@ function getPageAlign(page){
 	}
 
 	var mag = $('.magazine')
+	var set = page.parents('.page-set').first()
 	var article = page.parents('.article').first()
 
 	// first check the page...
 	return (page.hasClass('page-align-center') ? 'center' 
 			: page.hasClass('page-align-left') ? 'left' 
 			: page.hasClass('page-align-right') ? 'right' 
+			// then the page-set...
+			: set.hasClass('page-align-center') ? 'center' 
+			: set.hasClass('page-align-left') ? 'left' 
+			: set.hasClass('page-align-right') ? 'right' 
 			// then the article...
 			: article.hasClass('page-align-center') ? 'center' 
 			: article.hasClass('page-align-left') ? 'left'