Merge branch 'release/2.7' of https://github.com/openwebwork/webwork2 …

…into release/2.7
aubreyja · Jun 2, 2013 · 61b52ed · 61b52ed
2 parents 38cc978 + 89b874a
commit 61b52ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/conf/defaults.config b/conf/defaults.config
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/conf/defaults.config,v 1.225 2010/05/18 18:03:31 apizer Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -962,7 +962,7 @@ $pg{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML=>'' };
 
 # To have the problem body indented and boxed, uncomment:
  $pg{specialPGEnvironmentVars}{problemPreamble}{HTML} = qq!<div id="problem-content" name="problem-content">\n!;
- $pg{specialPGEnvironmentVars}{problemPostamble}{HTML}= qq!</div>'\n!;
+ $pg{specialPGEnvironmentVars}{problemPostamble}{HTML}= qq!</div>\n!;
 
 # $pg{specialPGEnvironmentVars}{problemPreamble}{HTML} = '<BLOCKQUOTE>
 #     <TABLE BORDER=1 CELLSPACING=1 CELLPADDING=15 BGCOLOR=#E8E8E8><TR><TD>'; 

diff --git a/htdocs/themes/math4/math4.css b/htdocs/themes/math4/math4.css
@@ -316,7 +316,6 @@ input {
 #problem-content {
   margin-left:auto;
   margin-right:auto;
-  width: 90%;
   border: 2px solid black;
   padding: 10px;
 

diff --git a/htdocs/themes/math4/system.template b/htdocs/themes/math4/system.template
@@ -140,7 +140,7 @@ var tabberOptions = {manualStartup:true};
 	<!--#endif-->
 
 	 <!--#if can="output_problem_body"--> 
-		<!-- ==== in this case print body parts --ELSE-- print entire body -->		
+		<!-- ==== in this case print body parts --ELSE-- print entire body -->
 		  <div class="Body">
 
 			<!--#if can="output_custom_edit_message"-->
@@ -207,16 +207,17 @@ var tabberOptions = {manualStartup:true};
 				<!--#endif-->
 				</form>
 			<!--#endif-->
+
 		<!-- inserted problem piece by piece -->
+
 		<!--#if can="info"-->
 			<p>Form2</p>
 			<!--  styles could be different for different pages so they are not set here -->
 			<div id="info-panel-right" >
 			<!--#info-->
 			</div>
 		<!--#endif-->
-
-		</div>	  
+         </div>	  
 	<!-- ====  end printing body parts   -->
 	<!--#else-->
 	<!-- ==== couldn't print body parts so we'll print entire body -->