Corrected Button direction
authorveltr
Tue, 23 Apr 2013 11:29:33 +0200
changeset 48 91061f98104f
parent 47 902c4d0c318c
child 49 531a593a0294
Corrected Button direction
integ/iri/css/iri-creation-cinecard.css
integ/renkan/js/paper-renderer.js
--- a/integ/iri/css/iri-creation-cinecard.css	Tue Apr 23 10:51:33 2013 +0200
+++ b/integ/iri/css/iri-creation-cinecard.css	Tue Apr 23 11:29:33 2013 +0200
@@ -246,16 +246,6 @@
 	border-radius: 4px;
 }
 a.send {
-	background: #126ae3;
-	background: -moz-linear-gradient(top,  #126ae3 0%, #1899e1 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#126ae3), color-stop(100%,#1899e1));
-	background: -webkit-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
-	background: -o-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
-	background: -ms-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
-	background: linear-gradient(to bottom,  #126ae3 0%,#1899e1 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#126ae3', endColorstr='#1899e1',GradientType=0 ); /* IE6-9 */
-}
-a.send:hover {
 	background: #1899e1;
 	background: -moz-linear-gradient(top,  #1899e1 0%, #126ae3 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#1899e1), color-stop(100%,#126ae3));
@@ -265,7 +255,28 @@
 	background: linear-gradient(to bottom,  #1899e1 0%,#126ae3 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1899e1', endColorstr='#126ae3',GradientType=0 );
 }
+a.send:hover {
+	background: #126ae3;
+	background: -moz-linear-gradient(top,  #126ae3 0%, #1899e1 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#126ae3), color-stop(100%,#1899e1));
+	background: -webkit-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
+	background: -o-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
+	background: -ms-linear-gradient(top,  #126ae3 0%,#1899e1 100%);
+	background: linear-gradient(to bottom,  #126ae3 0%,#1899e1 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#126ae3', endColorstr='#1899e1',GradientType=0 ); /* IE6-9 */
+}
 a.cancel{
+    background: #7a7a7a;
+    background: -moz-linear-gradient(top,  #7a7a7a 0%, #555555 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7a7a7a), color-stop(100%,#555555));
+    background: -webkit-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
+    background: -o-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
+    background: -ms-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
+    background: linear-gradient(to bottom,  #7a7a7a 0%,#555555 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7a7a7a', endColorstr='#555555',GradientType=0 );
+}
+
+a.cancel:hover{
     background: #555555;
     background: -moz-linear-gradient(top,  #555555 0%, #7a7a7a 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#555555), color-stop(100%,#7a7a7a));
@@ -276,17 +287,6 @@
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#555555', endColorstr='#7a7a7a',GradientType=0 ); /* IE6-9 */
 }
 
-a.cancel:hover{
-    background: #7a7a7a;
-    background: -moz-linear-gradient(top,  #7a7a7a 0%, #555555 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7a7a7a), color-stop(100%,#555555));
-    background: -webkit-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
-    background: -o-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
-    background: -ms-linear-gradient(top,  #7a7a7a 0%,#555555 100%);
-    background: linear-gradient(to bottom,  #7a7a7a 0%,#555555 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7a7a7a', endColorstr='#555555',GradientType=0 );
-}
-
 .edit-cinecard {
 	position: relative;
 }
--- a/integ/renkan/js/paper-renderer.js	Tue Apr 23 10:51:33 2013 +0200
+++ b/integ/renkan/js/paper-renderer.js	Tue Apr 23 11:29:33 2013 +0200
@@ -238,17 +238,21 @@
     var old_act_btn = this.active_buttons;
     
     if (this.model.get("delete_scheduled")) {
-        var opacity = .33;
+        var opacity = .5;
         this.active_buttons = this.pending_delete_buttons;
+        this.circle.dashArray = [2,2];
     } else {
         var opacity = 1;
         this.active_buttons = this.normal_buttons;
+        this.circle.dashArray = null;
     }
     
-    if (this.selected && this.renderer.isEditable() && old_act_btn !== this.active_buttons) {
-        old_act_btn.forEach(function(b) {
-            b.hide();
-        });
+    if (this.selected && this.renderer.isEditable()) {
+        if (old_act_btn !== this.active_buttons) {
+            old_act_btn.forEach(function(b) {
+                b.hide();
+            });
+        }
         this.active_buttons.forEach(function(b) {
             b.show();
         });
@@ -534,7 +538,13 @@
         _handle = _v.divide(3),
         _color = this.model.get("color") || this.model.get("color") || (this.model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(this.renkan)).get("color");
     
-    var opacity = (this.model.get("delete_scheduled") || this.from_representation.model.get("delete_scheduled") || this.to_representation.model.get("delete_scheduled")) ? .33 : 1;
+    if (this.model.get("delete_scheduled") || this.from_representation.model.get("delete_scheduled") || this.to_representation.model.get("delete_scheduled")) {
+        var opacity = .5;
+        this.line.dashArray = [2, 2];
+    } else {
+        var opacity = 1;
+        this.line.dashArray = null;
+    }
     
     var old_act_btn = this.active_buttons;