Merge branch 'master' of github.com:tla/stemmaweb

diff --git a/root/css/stexaminer.css b/root/css/stexaminer.css
index 68a5cc1..f6a9603 100644 (file)
--- a/root/css/stexaminer.css
+++ b/root/css/stexaminer.css
@@ -1,13 +1,3 @@
-#topbanner {
-       width: 100%;
-       height: 100px;
-       margin-top: 20px;
-}
-#bannerinfo {
-       float: right;
-       margin-right: 12%;
-       margin-top: 15px;
-}
 #variants_table {
     clear: both;
     width: 90%;
@@ -20,13 +10,14 @@
     height: 350px;
     clear: both;
     float: left;
-    width: 600px;
+    width: 50%;
     text-align: center;
     border: 1px #c6dcf1 solid;
 }
 #row_statistics {
        float: left;
-       padding: 30px;
+       padding-left: 30px;
+       width: 40%;
 }
 #statistics {
     font-style: italic;
@@ -121,4 +112,14 @@ html[xmlns] .clearfix {
  
 * html .clearfix {
        height: 1%;
+}
+
+#options_button_container {
+    height: 24px;
+}
+#options_button {
+    float: left;
+}
+#aggregates {
+    clear: left;
 }
\ No newline at end of file

diff --git a/root/css/style.css b/root/css/style.css
index ef7034b..2fd019f 100644 (file)
--- a/root/css/style.css
+++ b/root/css/style.css
@@ -170,13 +170,14 @@ div.pager_left_button.greyed_out, div.pager_left_button.greyed_out:hover {
        z-index: -100;
 }
 #textinfo_container_buttons {
+    width: 224px;
     float: right;
     left: -18px;
     position: relative;
     top: 15px;
 }
 #run_stexaminer, #run_relater, #open_stemma_add, #open_stemma_edit {
-    height: 18px;
+    height: 32px;
 }
 #stemma_pager {
     height: 38px;

diff --git a/root/src/stexaminer.tt b/root/src/stexaminer.tt
index ce7d92b..a3308bb 100644 (file)
--- a/root/src/stexaminer.tt
+++ b/root/src/stexaminer.tt
@@ -1,7 +1,7 @@
 [% 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/' ) %]";
@@ -15,17 +15,16 @@ var readingstats = [% reading_statistics %];
 var graphdot = '[% graphdot %]';
 </script>
 [% END -%]
-       <div id="topbanner">
-               <div id="bannerinfo">
-                       <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>
-               </div>
-           <h1>Stexaminer</h1>
-       <h2>[% text_title %]</h2>
-       <p><span class="navlink" onClick="$('#options').dialog('open')">Analysis options</span></p>
+    <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>
+        </div>
+        <h1>Stexaminer</h1>
+        <h2>[% text_title %]</h2>
     </div>
     <div id="status">
 [% IF error -%]
-           <span class="error">[% error %]</span>
+        <span class="error">[% error %]</span>
 [% END -%]
     </div>
     <div id="variants_table">
@@ -36,60 +35,65 @@ var graphdot = '[% graphdot %]';
      </table>
     </div>
     <div>
-               <div id="stemma_graph">
-               </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>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>
+          <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 id="stats_template" class="template">
-           <h3>Statistics for readings at <span id="statrank"></span>:</h3>
-           <!-- reading_template will be appended here for each reading -->
-           <span class="solutionstatus"></span>
+        <h3>Statistics for readings at <span id="statrank"></span>:</h3>
+        <!-- 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/>
-                       <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 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_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 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 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>