done zooming...

still need to replace ui button for zooming

single image view still broken...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

ui/TODO.otl

@@ -1,5 +1,5 @@
 Priority work
-	[_] 12% Preview II
+	[_] 15% Preview II
 		[_] 0% sorted images in ribbons
 		| and correct positioning on promote/demote
 		|
@@ -37,7 +37,12 @@ Priority work
 			| - center current-image in current ribbon
 			| - vertically center the current ribbon (negative margin?)
 				[X] prototype and basic API
-				[_] migrate main code to the new system
+				[_] 60% migrate main code to the new system
+					[X] basic navigation
+					[X] basic actions
+					[X] zooming
+					[_] cleanup legacy workarounds
+					[_] ui.js, gallery-prototype.js either merge or revise split logic
 		[_] 0% correct zooming and modes
 			[_] zooming in ribbon view
 			[_] zoom presets for ribbon view

ui/gallery-prototype.js

@@ -54,6 +54,7 @@ function setupControlElements(){
 	$('.demote').click(shiftImageUp)
 	$('.promote').click(shiftImageDown)
 	$('.toggle-wide').click(toggleWideView)
+	// XXX need to update this to real zooming...
 	$('.toggle-single').click(toggleRibbonView)
 }
 
@@ -90,6 +91,9 @@ function setCurrentImage(){
 
 	// position the field and ribbons...
 	centerSquare()
+
+	// center other ribbons relative to current image...
+	// XXX
 }
 
 

ui/gallery.html

@@ -85,12 +85,20 @@ $(document).ready(setup);
 	<button onclick="nextImage()">next (right)</button>
 	<button onclick="lastImage()">last (end)</button>
 
-	<br><br>
-
+	<!--br><br>
+	LEGACY:
 	<button onclick="showSingle()">single</button>
 	<button onclick="showRibbon()">ribbon</button>
 	<button onclick="toggleRibbonView()">toggle ribbon view (f)</button>
 
+	<br><br-->
+
+	<button onclick="zoomContainerBy(2)">Zoom in</button>
+	<button onclick="zoomContainerBy(0.5)">Zoom out</button>
+	<button onclick="setContainerZoom(1)">Original</button>
+	<button onclick="fitImage()">Image</button>
+	<button onclick="fitThreeImages()">Three</button>
+
 	<br><br>
 
 	<button onclick="toggleWideView()">toggle wide view</button>