amalgame/commit

added motivation/evidence count, preparations for changing source/target concept in evaluater

diff --git a/api/mapping.pl b/api/mapping.pl
index 1a40b7a..d526786 100644
--- a/api/mapping.pl
+++ b/api/mapping.pl
@@ -263,8 +263,8 @@ html_correspondences([align(Source,Target,Evidence)|Cs], Relations) -->
 	html_correspondences(Cs, Relations).
 
 html_correspondence(Source, Target, Evidence, Relations) -->
-	{ %option(relation(Relation), Prov, '')
-	  Relation = ''
+	{ Relation = '',
+	  length(Evidence, EvLength)
 	},
 	html([div(class('yui3-g'),
 		  [ div(class('yui3-u-1-2'),
@@ -272,17 +272,22 @@ html_correspondence(Source, Target, Evidence, Relations) -->
 		    div(class('yui3-u-1-2'),
 			\html_resource_context(Target, Evidence))
 		  ]),
-	      div(class(evidences),
-		  \html_evidences(Evidence, Source, Target)
-		  ),
-	      div(class(relations),
-		  [ input([type(hidden), name(source), value(Source)]),
-		    input([type(hidden), name(target), value(Target)]),
-		    div(\html_relations(Relations, Relation)),
-		    div(class(comment), ['because: ',
+	      div(class([manualfixes, 'yui3-g']),
+		  [ input([type(text), id(source), class('yui3-u-1-5'),
+			   name(source), value(Source)]),
+		    div([class([relations, 'yui3-u-3-5'])],
+			\html_relations(Relations, Relation)),
+		    input([type(text), id(target), class('yui3-u-1-5'),
+			   name(target), value(Target)]),
+		    div(class([comment, 'yui3-u-4-5']), % fix me: howto do 5-5?
+			['because: ',
 			 input([type(text), name(comment)], [])
 			])
-		  ])
+		  ]),
+	      div(class(evcount),
+		  [ '~w individual motivations: '-(EvLength)]),
+	      div(class(evidences),
+		  \html_evidences(Evidence, Source, Target))
 	     ]).
 
 html_evidences([],_,_) --> !.
diff --git a/web/css/builder.css b/web/css/builder.css
index c7d3764..2f9bc2f 100644
--- a/web/css/builder.css
+++ b/web/css/builder.css
@@ -288,9 +288,17 @@ img.explain {
 #detail .yui3-widget-ft {
 	margin: 5px;
 }
-#detail .relations {
+#detail .manualfixes {
 	display: none;
 }
+#detail .manualfixes .relations {
+	display: inline-block;
+	text-align: center;
+}
+#detail .manualfixes .comment {
+	display: inline-block;
+	text-align: center;
+}
 #detail .options {
 	display: default;
 	text-align: right;
@@ -300,7 +308,7 @@ img.explain {
 	padding: 5px;
 }
 #detail .buttons .submit {
-	display: none;
+	display: inline-block;
 }
 #detail .oquote,
 #detail .cquote {
@@ -366,7 +374,7 @@ img.explain {
 
 .evidences {
 	overflow: auto;
-	border-width: 0px 0px 1px 0px;
+	border-width: 1px 0px 1px 0px;
 	border-style: solid;
 	border-color: #888;
 }
diff --git a/web/css/evaluater.css b/web/css/evaluater.css
index 602775f..8e31d35 100644
--- a/web/css/evaluater.css
+++ b/web/css/evaluater.css
@@ -96,7 +96,16 @@
 #detail .yui3-widget-ft {
 	margin: 5px;
 }
-#detail .relations {
+#detail .manualfixes {
+	display: block;
+	padding: 5px;
+}
+#detail .manualfixes .relations {
+	display: inline-block;
+	text-align: center;
+}
+#detail .manualfixes .comment {
+	display: inline-block;
 	text-align: center;
 }
 #detail .options {
@@ -114,9 +123,6 @@
 #detail .lang {
 	color: #777;
 }
-#detail .relations {
-	padding: 5px;
-}
 #detail .relation {
 	padding: 0 5px;
 }
diff --git a/web/js/builder.js b/web/js/builder.js
index 8280780..2f9d81c 100644
--- a/web/js/builder.js
+++ b/web/js/builder.js
@@ -104,7 +104,7 @@ YUI.add('builder', function(Y) {
 					evidences = Y.one(".evidences"),
 					contentHeight = oSelf._contentHeight(),
 					graphHeight = contentHeight - (bottom.get("offsetHeight")+10);
-					evHeight = 0.97 * contentHeight - 360;
+					evHeight = 0.97 * contentHeight - 380;
 
 				graph.setStyle("height", graphHeight);
 				graphWrapper.setStyle("height", graphHeight);