X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fsrc%2Fstexaminer.tt;h=f4acca326293ed25a952b4e910d10d696e293d36;hb=917bee1c66759cddcec3b5389a4de3b647b91f84;hp=63505f7e4ed059b3de09853d5dbfe391fff2f5dd;hpb=2fd8f80c65551396fb3d98443916e9872cae376b;p=scpubgit%2Fstemmaweb.git

diff --git a/root/src/stexaminer.tt b/root/src/stexaminer.tt
index 63505f7..f4acca3 100644
--- a/root/src/stexaminer.tt
+++ b/root/src/stexaminer.tt
@@ -1,20 +1,32 @@
 [% WRAPPER header.tt
-	pagetitle = "Stexaminer - $text_title"
-	applicationjs = c.uri_for('/js/stexaminer.js')
-	applicationstyle = c.uri_for('/css/stexaminer.css')
+    pagetitle = "Stexaminer - $text_title"
+    applicationjs = c.uri_for('/js/stexaminer.js')
+    applicationstyle = c.uri_for('/css/stexaminer.css')
 %]
 <script type="text/javascript">
+var baseurl = "[% c.uri_for( '/stexaminer/' ) %]";
+var textid = '[% text_id %]';
+var original_svg = '[% svg %]';
+[% IF error -%]
+var readingstats = [];
+[% ELSE -%]
 var readingstats = [% reading_statistics %];
+[% END -%]
 var graphdot = '[% graphdot %]';
 </script>
 [% END -%]
-	<div id="topbanner">
-		<div id="bannerinfo">
-			<a href="help" title="Stexaminer help" class="navlink" id="aboutlink">Help / About</a>
-		</div>
-	    <h1>Stexaminer</h1>
-    	<h2>[% text_title %]</h2>
-    	<p><span class="navlink" onClick="$('#options').dialog('open')">Analysis options</span></p>
+  <div id="main_page" class="clearfix">
+    <div id="topbanner">
+        <span class="mainnav">
+            <a href="help" title="Stexaminer help" class="navlink" id="aboutlink">Help / About</a> | <a href="[% c.uri_for( '/' ) %]?withtradition=[% text_id %]" title="Index" class="navlink">Return to index</a>
+        </span>
+        <h1>Stexaminer</h1>
+        <h2>[% text_title %]</h2>
+    </div>
+    <div id="status">
+[% IF error -%]
+        <span class="error">[% error %]</span>
+[% END -%]
     </div>
     <div id="variants_table">
       <table>
@@ -24,52 +36,67 @@ var graphdot = '[% graphdot %]';
      </table>
     </div>
     <div>
-		<div id="stemma_graph">
-		  [% svg %]
-		</div>
-		<div id="row_statistics">
-		  <h3>Aggregate text statistics</h3>
-		  <ul>
-			<li>Total number of variant locations analyzed: [% total %]</li>
-			<li>Number of fully genealogical locations: [% genealogical %]</li>
-			<li>Number of readings that conflict with the stemma: [% conflict %]</li>
-			<li>Genealogical reading transitions by relationship type: [% todo %]</li>
-		  </ul>
-		  <p>(Choose a row in the table to display statistics about individual readings.)</p>
-		</div>
+        <div id="stemma_graph">
+        </div>
+        <div id="row_statistics">
+          <h3 id="stats_title">Aggregate text statistics</h3>
+          <div id="options_button_container">
+            <div id="options_button" class="button" onClick="$('#options').dialog('open')">
+                  <span>Analysis options</span>
+            </div>
+          </div>
+          <div id="stats_container">
+			  <ul id="aggregates">
+				<li>Total number of variant locations analyzed: [% total %]</li>
+				<li>Number of fully genealogical locations: [% genealogical %]</li>
+				<li>Number of readings that conflict with the stemma: [% conflict %]</li>
+				<li>Genealogical reading transitions by relationship type: [% todo %]</li>
+			  </ul>
+			  <p>(Choose a row in the table to display statistics about individual readings.)</p>
+		  </div>
+        </div>
     </div>
     
     <div id="stats_template" class="template">
-	    <h3>Statistics for readings at <span id="statrank"></span>:</h3>
-	    <!-- reading_template will be appended here for each reading -->
+        <!-- reading_template will be appended here for each reading -->
+        <span class="solutionstatus"></span>
     </div>
     
-	<div id="reading_template" class="template">
-		<div class="reading_statistics">
-			<span class="readinglabel"></span> - copied <span class="reading_copied"></span> time(s), changed <span class="reading_changed"></span> time(s)<br/>
-			Reading root(s) at <span class="readingroots"></span><br/>
-			<!-- reading_parent_template will be appended here if there are parents -->
-		</div>
+    <div id="reading_template" class="template">
+        <div class="reading_statistics">
+            <span class="readinglabel"></span> - copied <span class="reading_copied"></span> time(s), changed <span class="reading_changed"></span> time(s)<br/>
+            Reading root(s) at <span class="readingroots"></span><br/>
+            <span class="readingreversions">Reading reversion(s) at <span class="reversionroots"></span><br/></span>
+            <!-- source_parent_template will be appended here if there are parents -->
+            <!-- reversion_parent_template will be appended here if there are reversions -->
+        </div>
     </div>
     
-	<div id="reading_parent_template" class="template">
-		<div class="parent_statistics">
-			Reading parent(s):
-			<ul class="reading_parent_list"></ul>
-		</div>
-	</div>
-	
-	<div id="options" title="Analysis options...">
-    	<form id="use_variants_form" name="use_variants_form">
-    		<fieldset>
-    			<input type="radio" name="ignore_variant" value="none" [% 'checked="true"' IF ignore_variant == 'none' %]>Analyze all variation</input><br/>
-	    		<input type="radio" name="ignore_variant" value="orthographic" [% 'checked="true"' IF ignore_variant == 'orthographic' %]>Ignore orthographic variation</input><br/>
-    			<input type="radio" name="ignore_variant" value="spelling" [% 'checked="true"' IF ignore_variant == 'spelling' %]>Ignore orthographic and spelling variation</input>
-    		</fieldset>
-    		<fieldset>
-    			<input type="checkbox" name="show_type1" [% 'checked="true"' IF show_type1 %]>Include type-1 variation</input>
-    		</fieldset>
-     	</form>
+    <div id="reading_source_template" class="template">
+        <div class="parent_statistics">
+            Reading parent(s):
+            <ul class="reading_source_list"></ul>
+        </div>
+    </div>
+    <div id="reading_reversion_template" class="template">
+        <div class="parent_statistics">
+            Reverted reading parent(s):
+            <ul class="reading_reversion_list"></ul>
+        </div>
+    </div>
+  </div> <!-- main_page -->
+    
+    <div id="options" title="Analysis options...">
+        <form id="use_variants_form" name="use_variants_form">
+            <fieldset>
+                <input type="radio" name="ignore_variant" value="none" [% 'checked="true"' IF !ignore_variant %]>Analyze all variation</input><br/>
+                <input type="radio" name="ignore_variant" value="orthographic" [% 'checked="true"' IF ignore_variant == 'orthographic' %]>Ignore orthographic variation</input><br/>
+                <input type="radio" name="ignore_variant" value="spelling" [% 'checked="true"' IF ignore_variant == 'spelling' %]>Ignore orthographic and spelling variation</input>
+            </fieldset>
+            <fieldset>
+                <input type="checkbox" name="show_type1" [% 'checked="true"' IF show_type1 %]>Include type-1 variation</input>
+            </fieldset>
+         </form>
     </div>
 
 
@@ -77,17 +104,16 @@ var graphdot = '[% graphdot %]';
     
 
 [% BLOCK variantrow -%]
-[% SET rowclass = 'class="genealogical"' IF row.genealogical -%]
-[% SET rowclass = 'class="coincidental"' UNLESS row.genealogical -%]
-        <tr [% rowclass %]>
+[% SET rowclass = 'coincidental' -%]
+[% SET rowclass = 'genealogical' IF row.genealogical -%]
+[% SET rowclass = "$rowclass unsolved" IF row.unsolved -%]
+        <tr class="[% rowclass %]">
           <th><span class="rowid" onclick="handle_row_click($(this))">[% row.id %]</span></th>
 [% FOREACH reading IN row.readings -%]
-[% SET cellclass = 'clickable conflict' IF reading.conflict -%]
-[% SET cellclass = 'clickable' IF !reading.conflict -%]
+[% SET cellclass = 'clickable' -%]
+[% SET cellclass = 'clickable reversion' IF reading.is_reverted -%]
+[% SET cellclass = 'clickable conflict' IF reading.is_conflict -%]
           <td class="[% cellclass %]"><span onclick="color_nodes($(this).parent().index(), [% reading.group %], [% row.missing %]);$(this).parents('tr').addClass('active_variant_row');$(this).parent().addClass('active_variant_cell cellb'+($(this).parent().index()-1))">[% reading.text %]</span></td>
 [% END -%]
-[% FILTER repeat( row.empty ) -%]
-          <td/>
-[% END -%]
         </tr>
 [% END -%]