From: Tara L Andrews <tla\@mit.edu>
Date: Fri, 20 Jan 2012 10:30:03 +0000 (+0100)
Subject: start a real index page for traditions
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf9626aa522609c7905db938407b8ef41ab8c840;p=scpubgit%2Fstemmatology.git

start a real index page for traditions
---

diff --git a/lib/Text/Tradition/Directory.pm b/lib/Text/Tradition/Directory.pm
index f10fda6..20c3301 100644
--- a/lib/Text/Tradition/Directory.pm
+++ b/lib/Text/Tradition/Directory.pm
@@ -115,11 +115,11 @@ has +typemap => (
 
 has tradition_index => (
     traits => ['Hash'],
-    isa => 'HashRef[Str]',
+    isa => 'HashRef[HashRef[Str]]',
     handles => {
         add_index		=> 'set',
         del_index		=> 'delete',
-        name			=> 'get',
+        info			=> 'get',
         tradition_ids	=> 'keys',
     },
     default => sub { {} },
@@ -133,7 +133,8 @@ sub BUILD {
 		foreach my $obj ( $stream->items ) {
 			my $uuid = $self->object_to_id( $obj );
 			if( ref( $obj ) eq 'Text::Tradition' ) {
-				 $self->add_index( $uuid => $obj->name );
+				 $self->add_index( $uuid => { 'name' => $obj->name, 
+				 	'id' => $uuid, 'has_stemma' => $obj->has_stemma } );
 			} else {
 				warn "Found root object in DB that is not a Text::Tradition";
 			}
@@ -167,7 +168,8 @@ sub save {
 		return;
 	}
 	my $uuid = $self->store( $obj );
-	$self->add_index( $uuid => $obj->name ) if $uuid;
+	$self->add_index( $uuid => { 'name' => $obj->name, 
+				 	'id' => $uuid, 'has_stemma' => $obj->has_stemma } ) if $uuid;
 	return $uuid;
 }
 
diff --git a/stemmaweb/lib/stemmaweb/Controller/Root.pm b/stemmaweb/lib/stemmaweb/Controller/Root.pm
index 9d497c8..16075bd 100644
--- a/stemmaweb/lib/stemmaweb/Controller/Root.pm
+++ b/stemmaweb/lib/stemmaweb/Controller/Root.pm
@@ -51,17 +51,31 @@ sub directory :Local :Args(0) {
     my $user = $c->request->param( 'user' ) || 'ALL';
     my @textlist;
     foreach my $id ( $m->tradition_ids ) {
-    	my $data = { 
-    		'id' => $id,
-    		'name' => $m->name( $id ),
-    	};
-    	push( @textlist, $data );
+    	my $t = $m->info( $id );
+    	push( @textlist, $t );
     }
     
     $c->stash->{texts} = \@textlist;
 	$c->stash->{template} = 'directory.tt';
 }
 
+=head2 variantgraph
+
+ GET /variantgraph/$textid
+ 
+Returns the variant graph for the text specified at $textid, in SVG form.
+
+=cut
+
+sub variantgraph :Local :Args(1) {
+	my( $self, $c, $textid ) = @_;
+	my $m = $c->model('Directory');
+	my $collation = $m->tradition( $textid )->collation;
+
+	$c->stash->{'result'} = $collation->as_svg;
+	$c->forward('View::SVG');
+}
+	
 =head2 alignment
 
  GET /alignment/$textid
diff --git a/stemmaweb/root/css/style.css b/stemmaweb/root/css/style.css
index 02984af..3a04989 100644
--- a/stemmaweb/root/css/style.css
+++ b/stemmaweb/root/css/style.css
@@ -1,4 +1,6 @@
 <style type="text/css" media="screen">
+
+/* General site-wide layout */
 body { 
     margin: 0; 
     padding: 20px; 
@@ -6,12 +8,40 @@ body {
     font-size: 85%; 
     color: #666;
 }
-#svg_graph {
+h1 {
+    border-bottom: 1px solid #488dd2;
+    color: #488dd2;
+    font-size: 24px;
+    font-weight: 100;
+    margin: 0 0 17px;
+    padding: 0;
+    width: 650px;
+}
+h2 {
+    margin-top: 0px;
+} 
+
+/* Index page components */
+
+#directory {
+	float: left;
+	width: 300px;
+	height: 450px;
+	border: 1px #c6dcf1 solid;
+}
+#variant_graph {
+	clear: both;
+	width: 900px;
+	height: 400px;
+	border: 1px #c6dcf1 solid;	
+}
+#stemma_graph {
     float: left;
     width: 500px;
     height: 450px;
-    border-right: 1px #c6dcf1 solid;
+    border: 1px #c6dcf1 solid;
 }
+/* Additional components for the stexaminer */
 #variants_table {
     float: left;
     width: 450px;
@@ -26,18 +56,6 @@ body {
     position: relative;
     top: -15px;
 }
-h1 {
-    border-bottom: 1px solid #488dd2;
-    color: #488dd2;
-    font-size: 24px;
-    font-weight: 100;
-    margin: 0 0 17px;
-    padding: 0;
-    width: 280px;
-}
-h2 {
-    margin-top: 0px;
-} 
 .genealogical {
     background: #88ffaa;
 }
@@ -48,11 +66,11 @@ h2 {
     background: #ff6666;
 }
 .active_variant_row {
-    #background: #c6dcf1;
+    background: #c6dcf1;
     font-style: italic;
 }
 .active_variant_cell {
-    #background: #e8f1fe;
+    background: #e8f1fe;
 }
 .cellb0 {
     border-right: 20px solid #ffeeaa;
diff --git a/stemmaweb/root/js/componentload.js b/stemmaweb/root/js/componentload.js
new file mode 100644
index 0000000..c5e5d3c
--- /dev/null
+++ b/stemmaweb/root/js/componentload.js
@@ -0,0 +1,6 @@
+function loadTradition( textid ) {
+	$('#stemma_graph').load( "stemma/" + textid );
+	$('#stemma_graph > svg').width('485px');
+	$('#variant_graph').load( "variantgraph/" + textid );
+	$('#variant_graph > svg').height('300px');
+}
\ No newline at end of file
diff --git a/stemmaweb/root/js/interaction.js b/stemmaweb/root/js/stexaminer.js
similarity index 100%
rename from stemmaweb/root/js/interaction.js
rename to stemmaweb/root/js/stexaminer.js
diff --git a/stemmaweb/root/src/directory.tt b/stemmaweb/root/src/directory.tt
index 3c73f05..bf49c2c 100644
--- a/stemmaweb/root/src/directory.tt
+++ b/stemmaweb/root/src/directory.tt
@@ -3,10 +3,7 @@
       <ul>
 [% SET i = 0 -%]
 [% FOREACH t IN texts -%]
-        <li>[% t.name %] | <a href="relationships?textid=[% t.id %]">Relationship mapper</a>
-[% IF t.has_stemma -%]
-         | <a href="stexaminer?textid=[% t.id %]">Stexaminer</a>
-[% END -%]</li>
+        <li><span class="traditionname" onClick="loadTradition('[% t.id %]')">[% t.name %]</span></li>
 [% i = i + 1 -%]
 [% END -%]
      </table>
diff --git a/stemmaweb/root/src/footer.tt b/stemmaweb/root/src/footer.tt
new file mode 100644
index 0000000..b605728
--- /dev/null
+++ b/stemmaweb/root/src/footer.tt
@@ -0,0 +1,2 @@
+  </body>
+</html>
diff --git a/stemmaweb/root/src/header.tt b/stemmaweb/root/src/header.tt
new file mode 100644
index 0000000..24349eb
--- /dev/null
+++ b/stemmaweb/root/src/header.tt
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link type="text/css" href="[% c.uri_for('/css/cupertino/jquery-ui-1.8.13.custom.css') %]" rel="stylesheet" />
+    <link type="text/css" href="[% c.uri_for('/css/style.css') %]" rel="stylesheet" />
+    <script type="text/javascript" src="/js/jquery-1.4.4.min.js"></script>
+    <script type="text/javascript" src="/js/jquery-ui-1.8.10.custom.min.js"></script>
+    <script type="text/javascript" src="[% applicationjs %]"></script>
+    [% content %]
+    <title>[% pagetitle %]</title>
+  </head>
+  <body>
\ No newline at end of file
diff --git a/stemmaweb/root/src/index.tt b/stemmaweb/root/src/index.tt
index 13b612d..910b1d1 100644
--- a/stemmaweb/root/src/index.tt
+++ b/stemmaweb/root/src/index.tt
@@ -1,15 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <META http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link type="text/css" href="[% c.uri_for('css/cupertino/jquery-ui-1.8.13.custom.css') %]" rel="stylesheet" />
-    <link type="text/css" href="[% c.uri_for('css/style.css') %]" rel="stylesheet" />
-    <script type="text/javascript" src="js/jquery-1.4.4.min.js"></script>
-    <script type="text/javascript" src="js/jquery-ui-1.8.10.custom.min.js"></script>
-    <script type="text/javascript" src="js/interaction.js"></script>
-    <title>Text tradition tools</title>
-  </head>
-  <body>
-[% content %]
-  </body>
-</html>
+[% WRAPPER header.tt
+	pagetitle = "Stemmaweb - Text tradition tools"
+	applicationjs = "js/componentload.js"
+%]
+    <script type="text/javascript">
+$(document).ready(function() {
+    // call out to load the directory div
+    $('#directory').load( "[% c.uri_for( 'directory' ) %]" );
+});
+    </script>
+
+[% END %]
+
+    <div id="topbanner"><h1>Stemmaweb - a collection of tools for analysis of collated texts</h1></div>
+    <div id="directory"></div>
+    <div id="stemma_graph"></div>
+    <div id="variant_graph"></div>
+
+[% PROCESS footer.tt %]
\ No newline at end of file
diff --git a/stemmaweb/root/src/stexaminer.tt b/stemmaweb/root/src/stexaminer.tt
index d74d93d..3867a94 100644
--- a/stemmaweb/root/src/stexaminer.tt
+++ b/stemmaweb/root/src/stexaminer.tt
@@ -1,8 +1,24 @@
-[% BLOCK js %]
-    <script type="text/javascript" src="js/jquery-1.4.4.min.js"></script>
-    <script type="text/javascript" src="js/jquery-ui-1.8.10.custom.min.js"></script>
-    <script type="text/javascript" src="js/interaction.js"></script>
-[% END %]
+[% PROCESS header.tt
+	pagetitle = "Stexaminer - $text_title"
+	applicationjs = "/js/stexaminer.js"
+%]
+    <h1>Stexaminer</h1>
+    <h2>[% text_title %]</h2>
+    <div id="statistics">
+      <p>Analyzed [% total %] variant locations, of which [% genealogical %] entirely followed the stemma.  [% conflict %] readings conflicted with the stemma.</p>
+    </div>
+    <div id="stemma_graph">
+      [% svg %]
+    </div>
+    <div id="variants_table">
+      <table>
+[% FOREACH row IN variants -%]
+[% INCLUDE variantrow %]
+[% END -%]
+     </table>
+    </div>
+[% PROCESS footer.tt %]
+    
 
 [% BLOCK variantrow -%]
 [% SET rowclass = 'class="genealogical"' IF row.genealogical -%]
@@ -19,19 +35,3 @@
 [% END -%]
         </tr>
 [% END -%]
-    <h1>Stexaminer</h1>
-    <h2>[% text_title %]</h2>
-    <div id="statistics">
-      <p>Analyzed [% total %] variant locations, of which [% genealogical %] entirely followed the stemma.  [% conflict %] readings conflicted with the stemma.</p>
-    </div>
-    <div id="svg_graph">
-      [% svg %]
-    </div>
-    <div id="variants_table">
-      <table>
-[% FOREACH row IN variants -%]
-[% INCLUDE variantrow %]
-[% END -%]
-     </table>
-    </div>
-