From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Tue, 16 Dec 2014 00:20:12 +0000 (+0100)
Subject: Fix titration curve face appearance
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=7dda45dd9ee73e722a19790b00ef4c460bc5e96e;p=Nine-Q.git

Fix titration curve face appearance
---

diff --git a/bin/styles/main.css b/bin/styles/main.css
index d369cee..918a599 100644
--- a/bin/styles/main.css
+++ b/bin/styles/main.css
@@ -6,11 +6,13 @@
 .answer_kind_good {
   color: #2a7c20;
   font-size: 14pt;
+  margin-left: 32px;
 }
 
 .answer_kind_bad {
   color: #fa0d0d;
   font-size: 14pt;
+  margin-left: 32px;
 }
 
 .assignment_hint {
@@ -46,6 +48,13 @@
   margin-bottom: 16px;
 }
 
+.caption_v2 {
+  font-size: 14pt;
+  margin-right: 32px;
+  margin-bottom: 16px;
+  font-style: italic;
+}
+
 .emphasis {
   font-style: italic;
 }
@@ -215,6 +224,11 @@ img.math_formula_multiline {
   margin-left: 32px;
 }
 
+img.titration_curve_image {
+  width: auto
+  display: block;
+  margin-left: 32px;
+}
 
 span.expand_section {
   float: right;
diff --git a/bin/templates/face_titration_curve.html b/bin/templates/face_titration_curve.html
index 348ec5b..fe6d8ca 100644
--- a/bin/templates/face_titration_curve.html
+++ b/bin/templates/face_titration_curve.html
@@ -2,7 +2,7 @@
   <div class="backgrounded_block">
     <div class="caption_v1">Zadání:</div>
     <div class="assignment_text"><span class="key_info">@_SAMPLE_VOLUME_INT_@,@_SAMPLE_VOLUME_DEC_@&nbsp;.&nbsp;10<span class="exponent">@_SAMPLE_VOLUME_EXP_@</span>&nbsp;dm<span class="exponent">3</span> dvojsytné @_SAMPLE_TYPE_@</span> o koncentraci <span class="key_info">@_SAMPLE_CONC_INT_@,@_SAMPLE_CONC_DEC_@&nbsp;.&nbsp;10<span class="exponent">@_SAMPLE_CONC_EXP_@</span>&nbsp;mol/L</span> o <span class="key_info">pKx1 = @_PKX1_INT_@,@_PKX1_DEC_@</span> a <span class="key_info">pKx2&nbsp;=&nbsp;@_PKX2_INT_@,@_PKX2_DEC_@</span> je titrováno odměrným roztokem jednosytné <span class="key_info">@_TITRANT_TYPE_@</span> o koncentraci <span class="key_info">@_TITRANT_CONC_INT_@,@_TITRANT_CONC_DEC_@&nbsp;.&nbsp;10<span class="exponent">@_TITRANT_CONC_EXP_@</span></span>&nbsp;mol/L. Spočítejte pH roztoku a objem přidaného titračního činidla v těchto bodech:
-      <div>
+      <div class="assignment_text">
         <ul>
           <li>Na počátku titrace</li>
           <li>V polovině první ekvivalence</li>
@@ -15,13 +15,17 @@
     <form class="problem_form" method="post" action="/check_answer" enctype="multipart/form-data">
 	<input type="hidden" name="@_RESERVED__PROBLEM_ID_@" value="@_RESERVED__PROBLEM_ID_VAL_@">
         <div class="form_line">
-          Počátek:
+          <span class="caption_v2">Počátek:</span>
+        </div>
+	<div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_START_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_START_@" maxlength="128" value="" />
 	</div>
 
         <div class="form_line">
-	  Polovina první ekvivalence:
+	  <span class="caption_v2">Polovina první ekvivalence:</span>
+        </div>
+        <div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_FIRST_HALF_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_FIRST_HALF_@" maxlength="128" value="" />
           <label class="form_label_ac" for="@_ANSWER_VOLUME_FIRST_HALF_@">Objem [mL]:</label>
@@ -29,7 +33,9 @@
 	</div>
 
         <div class="form_line">
-	  První ekvivalence:
+	  <span class="caption_v2">První ekvivalence:</span>
+	</div>
+        <div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_FIRST_EQUIV_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_FIRST_EQUIV_@" maxlength="128" value="" />
           <label class="form_label_ac" for="@_ANSWER_VOLUME_FIRST_EQUIV_@">Objem [mL]:</label>
@@ -37,7 +43,9 @@
 	</div>
 
         <div class="form_line">
-	  Polovina druhé ekvivalence:
+	  <span class="caption_v2">Polovina druhé ekvivalence:</span>
+	</div>
+        <div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_SECOND_HALF_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_SECOND_HALF_@" maxlength="128" value="" />
           <label class="form_label_ac" for="@_ANSWER_VOLUME_SECOND_HALF_@">Objem [mL]:</label>
@@ -45,7 +53,9 @@
 	</div>
 
         <div class="form_line">
-	  Druhá ekvivalence:
+	  <span class="caption_v2">Druhá ekvivalence:</span>
+	</div>
+        <div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_SECOND_EQUIV_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_SECOND_EQUIV_@" maxlength="128" value="" />
           <label class="form_label_ac" for="@_ANSWER_VOLUME_SECOND_EQUIV_@">Objem [mL]:</label>
@@ -53,10 +63,12 @@
 	</div>
 
         <div class="form_line">
-	  Nadbytek:
+	  <span class="caption_v2">Nadbytek:</span>
+	</div>
+        <div class="form_line">
 	  <label class="form_label_ac" for="@_ANSWER_PH_OVER_SECOND_EQUIV_@">pH:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_PH_OVER_SECOND_EQUIV_@" maxlength="128" value="" />
-          <label class="form_label_ac" for="@_ANSWER_VOLUME_OVER_SECOND_EQUIV_@">Objem [dm<span class="exponent">3</span>]:</label>
+          <label class="form_label_ac" for="@_ANSWER_VOLUME_OVER_SECOND_EQUIV_@">Objem [mL]:</label>
 	  <input class="form_input_ac" type="text" name="@_ANSWER_VOLUME_OVER_SECOND_EQUIV_@" maxlength="128" value="" />
 	</div>
 
@@ -80,6 +92,7 @@
     </div>
 
     <div class="backgrounded_block">
+      <div class="caption_v1">Pokračování:</div>
       <form class="problem_form" method="post" action="/next_problem" enctype="multipart/form-data">
 	<input type="hidden" name="@_RESERVED__PROBLEM_CATEGORY_@" value="@_RESERVED__PROBLEM_CATEGORY_VAL_@">
 	<div class="form_line">