From 3caab920994c44039886dac57e352aef6ea2ec33 Mon Sep 17 00:00:00 2001 From: Matthieu Lalonde Date: Fri, 2 Nov 2012 20:43:17 -0400 Subject: [PATCH] Stuff for draggables --- resources/css/app.css | 47 +++++++++++++++++++++++++++++++++++ resources/js/app.js | 6 ++++- resources/js/views/client.js | 4 +++ resources/js/views/list.js | 5 ++++ resources/js/views/sidebar.js | 4 +++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/resources/css/app.css b/resources/css/app.css index d2df1c9..8560c88 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -446,4 +446,51 @@ div#screen canvas#processcanvas { background-repeat: no-repeat; background-position: 0 0; background-image: url(data:image/gif;base64,R0lGODlhDgAOAKUAADQyNJyanGxqbNTW1ExKTOzu7LS2tDw+PFRWVHx+fOTi5Pz+/MTCxDw6PKyqrHR2dFRSVPT29ERGRFxeXOzq7DQ2NGxubNze3ExOTPTy9Ly+vERCRFxaXIyOjOTm5MzKzLSytP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJBwAhACwAAAAADgAOAAAGYcCQcEgsGo/CDwICoYQSjGMCAPAsJIDOgjhoHCrOCwdgIE4/IGfI00AQMZItUVCJDDEE+dACsAsfAANCCwYZBxB6HwAICiELGxAADkUBABUZj4t6QxoTmAReIEiDC6WjR0EAIfkECQcAIwAsAAAAAA4ADgCFNDI0nJqcbGps1NbUTE5M7O7sjIqMREJEtLa0dHZ05OLkPDo8XFpc/Pr8xMbErKqsdHJ0lJKUTEpM7OrsNDY0bG5s3N7cVFJU9Pb0jI6MREZEvLq8fH585ObkPD48ZGJk/P78zMrMrK6s////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmnAkXBUaAyPSIUkMEEiBwcAAQRyjkQUACAwQmSqw8FCEyI0OQDEER0aDYSdxeVI0ICHAgpmSJDchRUAe0IQAG8jCkQHU0MhFAwjIAwKAgAPSAEGIw4AWQl/QkaBFA9GVogZBw6nRw0WR0EAIfkECQcAIAAsAAAAAA4ADgCFNDI0nJ6c1NbUXFpcvL68REZE7O7sbG5srKqszMrMVFJUPDo8/P787OrsZGZkxMbETE5M9Pb0fH58tLK0NDY0pKKk3NrcxMLETEpM9PL0dHZ0rK6szM7MVFZUPD48bGps////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmFAkHAIIhCPQ0YngBwKNBgAoNLcUACQBeWCFFAwCcaA23gQJYCE0AISd4gQDOP4oUSGGPnxALgLNQsZIA1zGR4Kc0Icag0QDAYOU0iNAB8LABqJRBNSFB0ImkcIfaFNoEhBACH5BAkHACEALAAAAAAOAA4AhTQyNKyqrGRmZNTW1ExKTISGhOzu7MzKzHR2dFRWVDw+PPz6/GxubLSytOTm5FRSVPT29NTS1FxeXERGRDQ2NKyurGxqbNze3ExOTJSWlPTy9MzOzHx+fFxaXERCRPz+/HRydP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZqwJBwOFwQj6HPJ5RxIEMDBGEC8mSQFQoA8wAAJsbhgEI4KCWKgobIARyEhsD6iCEsiREEZCgIIBkAe0JLHxEXcAoPd0kVHQp7BhYAfkMfHQAUAhYKAAiLQg0AHVoJAZ9CECAhCwunRHNPQQAh+QQJBwAiACwAAAAADgAOAIU0MjScnpxcXlzU1tRERkS8vrzs7uxsbmw8PjxUUlTMysz8+vysrqxkZmQ8Ojzc3txMTkzExsT09vR0dnQ0NjSsqqxkYmRMSkzEwsT08vREQkRUVlTMzsz8/vy0trRsamzk4uR8enz///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGYkCRcEgsFjsdI3EwuRAOGJEiOWQAAJDEdYJYDAeUCyf50FK8whBAMYw4AOehRELMGO5E5IIqRBIFDg4BQxkXFnwbABogQgYNABV/AnAWH28TfCIeHQUWFBQbFZlFC3RKp0RBACH5BAkHACUALAAAAAAOAA4AhTQyNJyanMzOzGRiZLS2tExKTOzu7KyqrNze3Hx+fFRWVMTCxDw+PGxubPz6/KSmpNTW1FRSVLSytOTm5FxeXMzKzDQ2NJyenNTS1GxqbLy+vExOTPT29KyurOTi5IyOjFxaXMTGxERGRHR2dPz+/P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZlwJJwSCwWSSQjETIqiBoLZccC2EQAgE9ySLoMKkkECECYeJTCiYXBMJQ4GQlnOKFgE8IDVgQZcg4KGCUkClQVRlsGIRUAEQhCBgkPDkUBABYDGQwAI1tEGhQWFhEHnkYOlGiqQkEAIfkECQcAIwAsAAAAAA4ADgCFNDI0nJqcbGps1NLUTE5M7OrsREJEtLa0hIaE3N7cXFpcPDo89Pb0xMLEdHZ03NrcVFZUTEpMjI6M5ObkZGJk/P78NDY0pKKkbG5s1NbUVFJUREZEvL685OLkXF5cPD48/Pr8zMrMlJKU////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmLAkXBILBYrFSMx44hsMA3lqLMhaAAASXLIGYwYyYQCcOAuPt7hZAERNhZYQ4YosDCElUhkOyp44BEXQg4Ac0MJBgAIWyEAGgl4IwkifCMBABYUAgQPUhx/FhplUiMgd6SoQQAh+QQJBwAmACwAAAAADgAOAIU0MjScmpxkYmTU1tRMSky0trR8enzs7uw8PjzEwsRUVlSMioz8+vxsbmzk4uQ8Ojy0srRUUlS8vryEgoT09vRERkTMysw0NjSkpqRsamzc3txMTky8urx8fnz08vREQkTExsRcWlyMjoz8/vx0dnTk5uT///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGa0CTcEgsFkcjI5FhmlQaiSKjIBCZQBEAQJQ0MRYXwIci1IQABaIBUIEMS5cQcVMZaYiZC1m4IXRNByMNAHsmJAADQxYRDxF/FgARdyYjCgAXEx5DAZcCHCYYHyIORRICFwojDIVGDExKsERBADs=); +} + +.ui-draggable-dragging { + z-index: 50000; +} + +@-webkit-keyframes pulse { + 0% {opacity: 0;color: #000;} + 25% {opacity: 0.25;} + 50% {opacity: 0.50;} + 75% {opacity: 0.75;} + 100% {opacity: 1;color: #fff;} +} + +.droppable { + -webkit-animation: pulse 1s infinite alternate; + -moz-animation: pulse 1s infinite alternate; + opacity: 0; + color: #FFF; + background-color: #4966B1;/* Old browsers */ + background: -moz-linear-gradient(top, #6086e5 0%, #6086e5 39%, #4966b1 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#6086e5), color-stop(39%,#6086e5), color-stop(100%,#4966b1)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #6086e5 0%,#6086e5 39%,#4966b1 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #6086e5 0%,#6086e5 39%,#4966b1 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #6086e5 0%,#6086e5 39%,#4966b1 100%); /* IE10+ */ + background: linear-gradient(to bottom, #6086e5 0%,#6086e5 39%,#4966b1 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6086e5', endColorstr='#4966b1',GradientType=0 ); /* IE6-9 */ + +} + +@-webkit-keyframes pulse-btn { + 0% {opacity: 0.75;} + 100% {opacity: 1;} +} + +.btn-primary { + -webkit-animation: pulse-btn 2s infinite alternate; + -moz-animation: pulse-btn 2s infinite alternate; +} + +.btn-primary:hover, +.btn-primary.hover, +.btn-primary:active, +.btn-primary.active { + -webkit-animation: none; + -moz-animation: none; + opacity: 1; } \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index 1e894f0..2c8740a 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -347,7 +347,11 @@ _ that._modalAbout = $(tmplModalAbout); that._modalAbout.on("hidden", function __fnEventAppModalAboutClosed(event) { - // FIXME: Doesn't seem to work + // FIXME: Doesn't seem to work after 50 >_< + if (window.history.length === 50) { + window.history.length = 0; + that.historyStart = 1; + } console.log(window.history.length, that.historyStart); if (window.history.length === that.historyStart) { that.navigate("", false); diff --git a/resources/js/views/client.js b/resources/js/views/client.js index 9c70cc6..2b6b880 100644 --- a/resources/js/views/client.js +++ b/resources/js/views/client.js @@ -119,6 +119,8 @@ _ that._initLayout(); } + that.Layout.panes.north.show(); + that.Layout.panes.center.show(); that.Views.List.show(); this.$el.show(); //console.debug(that.Server.client.collections.databases[that.Server.client.collections.databasesInfo.get("dmap_listing").at(0).id].get("dmap_listing")); @@ -128,6 +130,8 @@ _ var that = this ; + that.Layout.panes.north.hide(); + that.Layout.panes.center.hide(); that.Views.List.hide(); this.$el.hide(); } diff --git a/resources/js/views/list.js b/resources/js/views/list.js index 9010e6b..ae480ca 100644 --- a/resources/js/views/list.js +++ b/resources/js/views/list.js @@ -293,6 +293,8 @@ _ //this.$el.find("table:first").html("

" + this.type + "

"); + this.$el.find("tr").draggable(); + this.$el.find("td").draggable(); return this; } @@ -321,6 +323,7 @@ _ , bDeferRender: true , bStateSave: false//true , bScrollCollapse: true + , bJQueryUI: true , sHeightMatch: "auto" , sEmptyTable: "" //, bProcessing: true @@ -394,6 +397,8 @@ _ } that.$el.show(); + + that.resize(); } , hide: function () { diff --git a/resources/js/views/sidebar.js b/resources/js/views/sidebar.js index 7e3be2b..dce461c 100644 --- a/resources/js/views/sidebar.js +++ b/resources/js/views/sidebar.js @@ -75,6 +75,10 @@ _ $(event.target).parents("ul:first").find("> li:first-child").addClass("selected"); }, 10); }); + + this.$el.find("> ul > li:first").droppable({ + activeClass: "droppable" + }); } , select: function (serverModel) {