image_annotation/commit

rename class label -> taglabel, to avoid conflicts with bootstrap's label class

authorJacco van Ossenbruggen
Mon May 19 09:34:21 2014 +0200
committerJacco van Ossenbruggen
Mon May 19 09:34:21 2014 +0200
commitbba017c6f92c56bf502887ed9add33c891348eae
tree816c3342ce2b0629bf3c64b7e941651e377c4adb
parent424edc57fbfa3011d69cc80445ba0e363e8d3c60
Diff style: patch stat
diff --git a/web/css/deniche-tags.css b/web/css/deniche-tags.css
index 137894d..57db911 100644
--- a/web/css/deniche-tags.css
+++ b/web/css/deniche-tags.css
@@ -38,7 +38,7 @@
 	text-align: right;
 	float: right;
 }
-.taglist .inline.label {
+.taglist .inline.taglabel {
 	padding: 0% 1%;
 	float: left;
 }
@@ -50,7 +50,8 @@
 .taglist .inline.screenName:after { content: ')'; }
 .taglist .inline.tagCreditLine:after { content: ': '; }
 
-.taglist .overlay.label, .taglist .simple.label {
+.taglist .overlay.taglabel, 
+.taglist .simple.taglabel {
 	width: 45%;
 	padding: 0% 1%;
 	float: right;
@@ -58,7 +59,7 @@
 .overlay {
 	text-align: right;
 }
-.overlay.title.label {
+.overlay.title.taglabel {
 	width: 100%;
 	margin-left: 1%;
 	font-size: 2.0em;
@@ -86,7 +87,7 @@
 	color: red;
 	text-decoration: none;
 }
-.taglist .label a {
+.taglist .taglabel a {
 	text-decoration: none;
 	color: #222;
 
diff --git a/web/css/object-annotation.css b/web/css/object-annotation.css
index 50406b3..675dbc2 100644
--- a/web/css/object-annotation.css
+++ b/web/css/object-annotation.css
@@ -164,7 +164,7 @@ body {
 	text-align: right;
 	float: right;
 }
-.taglist .inline.label {
+.taglist .inline.taglabel {
 	padding: 0% 1%;
 	float: left;
 }
@@ -176,7 +176,8 @@ body {
 .taglist .inline.screenName:after { content: ')'; }
 .taglist .inline.tagCreditLine:after { content: ': '; }
 
-.taglist .overlay.label, .taglist .simple.label {
+.taglist .overlay.taglabel, 
+.taglist .simple.taglabel {
 	width: 45%;
 	padding: 0% 1%;
 	float: right;
@@ -184,7 +185,7 @@ body {
 .overlay {
 	text-align: right;
 }
-.overlay.title.label {
+.overlay.title.taglabel {
 	width: 100%;
 	margin-left: 1%;
 	font-size: 2.0em;
@@ -212,7 +213,7 @@ body {
 	color: red;
 	text-decoration: none;
 }
-.taglist .label a {
+.taglist .taglabel a {
 	text-decoration: none;
 	color: #222;
 
diff --git a/web/js/annotation.js b/web/js/annotation.js
index eb41e62..e8e4cf3 100644
--- a/web/js/annotation.js
+++ b/web/js/annotation.js
@@ -177,7 +177,7 @@ YUI.add('annotation', function(Y) {
 			var tagNodes = this.tagList.all("li");
 			for (var i=o.index; i < o.index+o.range; i++) {
 				var node = tagNodes.item(i);
-				node.one('.label').detach('hover');
+				node.one('.taglabel').detach('hover');
 				node.remove();
 			}
 		},
@@ -197,7 +197,7 @@ YUI.add('annotation', function(Y) {
 				node.all('.judgeButton').addClass(tagStyle);
 				tagList.insert(node, index+i);
 				if (tagStyle == 'overlay')
-					node.one('.label').on('hover', this.onTagHover, this.onTagHover, this, tags[i]);
+					node.one('.taglabel').on('hover', this.onTagHover, this.onTagHover, this, tags[i]);
 				else if (tagStyle == 'inline') {
 					this.rebindButtons(node, tags[i]);
 				}
@@ -238,14 +238,14 @@ YUI.add('annotation', function(Y) {
 			  html += '<div class="tagremove disabled"><a href="javascript:{}">y</a></div>';
 			}
 			if (tagStyle == "overlay")
-				html += "<div class='overlay label'>" + label + "</div>";
+				html += "<div class='overlay taglabel'>" + label + "</div>";
 			else if (tagStyle == "simple")
-				html += "<div class='simple label'>" + label + "</div>";
+				html += "<div class='simple taglabel'>" + label + "</div>";
 			else if (tagStyle == "inline") {
 				var judgement_buttons = this.formatJudgmentButtons(tagrecord.getValue());
 				var buttons = '<div class="inline commentButtons">' + judgement_buttons + '</div>';
 				html += buttons;
-				html += "<span class='inline label'>" + label + "</span>";
+				html += "<span class='inline taglabel'>" + label + "</span>";
 			}
 			if (tagStyle != "overlay") {
 				var user   = this.get("user");
@@ -272,7 +272,7 @@ YUI.add('annotation', function(Y) {
 			var judgement_buttons = this.formatJudgmentButtons(tag);
 			var buttons = '<div class="commentButtons">' + judgement_buttons + '</div>';
 			var html = '<div class="overlay tagCreation">';
-			html +=	'<div class="overlay title label">';
+			html +=	'<div class="overlay title taglabel">';
 			if (link == '')
 				html += label;
 			else
@@ -357,7 +357,7 @@ YUI.add('annotation', function(Y) {
 			  if (this.enabled('deleteEnabled', my_rating)) {
 			    judgement_buttons += '<span class="metaremove"><a class="metaremove" alt="' + my_rating.annotation + '">x</a></span>';
 			  }
-			  judgement_buttons += '<span class="overlay rating-label">' + my_rating_label + '</span>';
+			  judgement_buttons += '<span class="overlay ratinglabel">' + my_rating_label + '</span>';
 			  judgement_buttons += '</div>';
 			}
 			return judgement_buttons;