[cvs-annodex] commit (/annodex): Anode/trunk/acidfree/class_annodex.inc

[ctford]

Update of /annodex (new revision 1903)

Modified files:
   Anode/trunk/acidfree/class_annodex.inc

Log Message:
*Add pager.
*Don't delegate to form outputting to class_video.inc.

Modified: Anode/trunk/acidfree/class_annodex.inc
===================================================================
--- Anode/trunk/acidfree/class_annodex.inc	2006-01-31 09:11:24 UTC (rev 1902)
+++ Anode/trunk/acidfree/class_annodex.inc	2006-01-31 21:22:39 UTC (rev 1903)
@@ -73,8 +73,34 @@
 
 //FIXME Maybe allow CMML upload?
 function _class_annodex_form($op, &$node, $name_prefix='') {
-	$output .= _class_video_form($op, $node, $name_prefix); 
-	return $output;
+    switch ($op) {
+    case 'new':
+        $nailer = variable_get('acidfree_video_thumbnailer', 'none');
+        $output = '';
+        switch ($nailer) {
+        case 'none':
+            $output .= form_textfield(t('Video width'), $name_prefix.'videox', 320, 10, 10);
+            $output .= form_textfield(t('Video height'), $name_prefix.'videoy', 240, 10, 10);
+            break;
+        case 'user':
+            $output .= form_file(t('Video thumbnail'), $name_prefix.'userthumb', 50, NULL, true);
+            break;
+        case 'mplayer':
+            // possibly allow them to choose frame number? too complex?
+            // too much decoding time -- no option to tell where to start decoding...
+            break;
+        }
+        break;
+	
+    	case 'preview':
+        	$output .= form_hidden('thumb', is_object($node->thumb)?$node->thumb->fid:$node->thumb);
+        	break;
+    	case 'update':
+        	$output .= form_hidden('thumb', is_object($node->thumb)?$node->thumb->fid:$node->thumb);
+        	break;
+    }
+    return $output;
+
 }
 
 function _class_annodex_destroy(&$node) {
@@ -88,8 +114,12 @@
 function theme_acidfree_print_full_annodex(&$node) {
     if (!$node->large)
         return '';
+    if ($node->page)
+        $output = acidfree_pager_creator($node);
 
-    return theme_annodex_control( &$node );
+    $output .= theme_annodex_control( &$node );
+
+    return $output;
 }
 
 function theme_acidfree_print_thumb_annodex(&$node, $parent=null) {


-- 
ctford