adding views for AND conference; adding mimimal mode useful for video…

… exporting
CovertLab · Sep 11, 2013 · 8b0ad41 · 8b0ad41
1 parent d9d5731
commit 8b0ad41
Show file tree

Hide file tree

Showing 4 changed files with 269 additions and 23 deletions.
diff --git a/.htaccess b/.htaccess
@@ -8,6 +8,7 @@ RewriteBase		/
 RewriteRule		^LeeEtAl2013$		viz.php#LeeEtAl2013 [NE,L,NC,R]
 RewriteRule		^LeeEtAl2013Fig1$	viz.php#LeeEtAl2013Fig1 [NE,L,NC,R]
 RewriteRule		^LeeEtAl2013FigS1$	viz.php#LeeEtAl2013FigS1 [NE,L,NC,R]
+
 RewriteRule		^cellGrowth$		viz.php#cellGrowth [NE,L,NC,R]
 RewriteRule		^cellCycle$			viz.php#cellCycle [NE,L,NC,R]
 RewriteRule		^replication$ 		viz.php#replication [NE,L,NC,R]
@@ -30,3 +31,8 @@ RewriteRule		^MatureProtExp$		viz.php#MatureProtExp [NE,L,NC,R]
 RewriteRule		^MatureRnaExp$		viz.php#MatureRnaExp [NE,L,NC,R]
 RewriteRule		^RepInit$			viz.php#RepInit [NE,L,NC,R]
 RewriteRule		^Translation$		viz.php#Translation [NE,L,NC,R]
+
+RewriteRule		^ANDFestival-1$		viz.php#ANDFestival-1 [NE,L,NC,R]
+RewriteRule		^ANDFestival-2$		viz.php#ANDFestival-2 [NE,L,NC,R]
+RewriteRule		^ANDFestival-3$		viz.php#ANDFestival-3 [NE,L,NC,R]
+RewriteRule		^ANDFestival-4$		viz.php#ANDFestival-4 [NE,L,NC,R]
diff --git a/css/WholeCellViz.css b/css/WholeCellViz.css
@@ -289,10 +289,10 @@ ul{
 #container {
 	z-index:1;
 	position:absolute;
-	top:65px;
+	top:66px;
 	left:0px;
 	right:0px;
-	bottom:34px;
+	bottom:27px;
 	padding:0px;
 	margin:0px;
 }
@@ -342,22 +342,22 @@ ul{
 .panel .ui-dialog-titlebar-close {
 	display: none;
 }
-.panel  .ui-dialog-titlebar .buttons{	
+.panel .ui-dialog-titlebar .buttons{	
 	position: absolute; 
 	right:4px;
 	top: 4px;
 }
-.panel  .ui-dialog-titlebar .buttons a{
+.panel .ui-dialog-titlebar .buttons a{
 	float:right;
 	padding: 1px;
 	height: 18px;
 	width: 19px;
 }
-.panel  .ui-dialog-titlebar .buttons a span {
+.panel .ui-dialog-titlebar .buttons a span {
 	display: block;
 	margin: 1px;	
 }
-.panel  .ui-dialog-titlebar .buttons a:hover{
+.panel .ui-dialog-titlebar .buttons a:hover{
 	padding: 0;
 }
 
@@ -410,6 +410,7 @@ ul{
 	border-bottom:none;
 	border-right:none;
 	border-left:none;
+	margin:0px;
 }
 
 #timeline .playPauseButton, #timeline .repeatButton, #timeline .speedButton, #timeline .showLabelsButton, #timeline .configButton{	

diff --git a/js/WholeCellViz-visualizations.js b/js/WholeCellViz-visualizations.js
@@ -212,7 +212,7 @@ var CellShapeVisualization = Visualization2D.extend({
 
 	drawCellMeasurements: function(data){
 		this.drawObject({
-			isLabel:true,
+			isLabel:false,
 			'strokeStyle': this.lineColor,
 			'fillStyle': this.lineColor,
 			'data': data,
@@ -296,7 +296,7 @@ var CellShapeVisualization = Visualization2D.extend({
 		});
 
 		this.drawObject({
-			isLabel:true,
+			isLabel:false,
 			'fillStyle': this.textColor,
 			'data': data,
 			drawFunc: function(self, ctx, data){