[Stack-cvs] stack-dev/opaque/moodleModule/stack styles.php, 1.2, 1.2.4.1 block_stack.php, 1.8, 1.8.4.1

[Ben H. <bdv...@us...>]

Update of /cvsroot/stack/stack-dev/opaque/moodleModule/stack
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29766/opaque/moodleModule/stack

Modified Files:
      Tag: question_reporting
	styles.php block_stack.php 
Log Message:
Merging from the current HEAD into question_reporting. Apologies in advance if this all goes horribly wrong.

Index: block_stack.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/moodleModule/stack/block_stack.php,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** block_stack.php	23 Jun 2009 16:18:28 -0000	1.8
--- block_stack.php	22 Nov 2010 23:05:47 -0000	1.8.4.1
***************
*** 67,70 ****
--- 67,76 ----
                  $this->content->icons[] = '<img src="'.$root.'/pix/i/switch.gif" class="icon" alt="Edit Question Options" />';
              }
+ 			/*
+             if (has_capability('moodle/question:viewmine', $context)) {
+                 $this->content->items[] = '<a href="'.$root.'/question/type/opaque/stack/soapPage.php?page=diagnostic">'.get_string('diagnostic', 'block_stack').'</a>';
+                 $this->content->icons[] = '<img src="'.$root.'/pix/i/outcomes.gif" class="icon" alt="Diagnostic Report" />';
+             }
+             */
          }
          else
***************
*** 86,88 ****
  
  }
! ?>
--- 92,94 ----
  
  }
! ?>
\ No newline at end of file

Index: styles.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/moodleModule/stack/styles.php,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** styles.php	23 Jun 2009 16:18:28 -0000	1.2
--- styles.php	22 Nov 2010 23:05:47 -0000	1.2.4.1
***************
*** 2,4 ****
--- 2,13 ----
  .submitbtns {
  	display: none;
+ }
+ 
+ /* 	Ensures that elements generated by jsMath don't overlap and
+ 	thus disable buttons whilst enabling embedded input fields.
+ 	Workaround from http://www.math.union.edu/~dpvc/jsMath/bugs.html
+ 	STACK bug #2890734 */
+ input {
+ 	z-index: 2;
+ 	position: relative;
  }
\ No newline at end of file