From: Tara L Andrews <tla@mit.edu>
Date: Thu, 12 Jul 2012 21:32:36 +0000 (+0200)
Subject: stemmaweb bugfixes and style fixes; add 'punctuation' relationship type
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e816672a0f95b5c53eeab884a870d0005f9c6531;p=scpubgit%2Fstemmaweb.git

stemmaweb bugfixes and style fixes; add 'punctuation' relationship type
---

diff --git a/lib/stemmaweb/Controller/Stexaminer.pm b/lib/stemmaweb/Controller/Stexaminer.pm
index e7eee1b..4b8bff6 100644
--- a/lib/stemmaweb/Controller/Stexaminer.pm
+++ b/lib/stemmaweb/Controller/Stexaminer.pm
@@ -43,7 +43,7 @@ sub index :Path :Args(1) {
 		# Get the analysis options
 		my( $use_type1, $ignore_sort ) = ( 0, 'none' );
 		if( $c->req->method eq 'POST' ) {
-			$use_type1 = $c->req->param( 'show_type1' ) eq 'on' ? 1 : 0;
+			$use_type1 = $c->req->param( 'show_type1' ) ? 1 : 0;
 			$ignore_sort = $c->req->param( 'ignore_variant' );
 		}
 		$c->stash->{'show_type1'} = $use_type1;
@@ -52,9 +52,9 @@ sub index :Path :Args(1) {
 		my %analysis_options;
 		$analysis_options{'exclude_type1'} = !$use_type1;
 		if( $ignore_sort eq 'spelling' ) {
-			$analysis_options{'collapse'} = [ qw/ spelling orthographic / ];
+			$analysis_options{'merge_types'} = [ qw/ spelling orthographic / ];
 		} elsif( $ignore_sort eq 'orthographic' ) {
-			$analysis_options{'collapse'} = 'orthographic';
+			$analysis_options{'merge_types'} = 'orthographic';
 		}
 			
 		my $t = run_analysis( $tradition, %analysis_options );
diff --git a/root/css/stexaminer.css b/root/css/stexaminer.css
index 5bf6401..1348dfa 100644
--- a/root/css/stexaminer.css
+++ b/root/css/stexaminer.css
@@ -1,3 +1,13 @@
+#topbanner {
+	width: 100%;
+	height: 100px;
+	margin-top: 20px;
+}
+#bannerinfo {
+	float: right;
+	margin-right: 12%;
+	margin-top: 15px;
+}
 #options {
 	position: relative;
 	border: 1px #c6dcf1 solid;
diff --git a/root/src/stexaminer.tt b/root/src/stexaminer.tt
index de72766..1f3a945 100644
--- a/root/src/stexaminer.tt
+++ b/root/src/stexaminer.tt
@@ -8,8 +8,13 @@ var readingstats = [% reading_statistics %];
 var graphdot = '[% graphdot %]';
 </script>
 [% END -%]
-    <h1>Stexaminer</h1>
-    <h2>[% text_title %]</h2>
+	<div id="topbanner">
+		<div id="bannerinfo">
+			<a href="help" title="Stexaminer help" class="helptag">Help / About</a>
+		</div>
+	    <h1>Stexaminer</h1>
+    	<h2>[% text_title %]</h2>
+    </div>
     <div id="options">
     	<h3>Analysis options:</h3>
     	<form id="use_variants_form" name="use_variants_form" class="clearfix" method="POST">