[Rt-commit] rt branch, 4.6/lifecycle-ui-dev, repushed
Craig Kaiser
craig at bestpractical.com
Fri Jan 3 13:29:33 EST 2020
The branch 4.6/lifecycle-ui-dev was deleted and repushed:
was 5bf358da38a08329cd78ebb5ef9be53b3f92e57c
now 5562e3f240fae9559c29b1a02ebb95fcb8490500
1: 5bf358da38 ! 1: 5562e3f240 Core lifecycle-UI
@@ -769,13 +769,11 @@
+<script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/static/js/farbtastic.js"></script>
+
+<form action="<%RT->Config->Get('WebPath')%>/Admin/Lifecycles/Modify.html" name="ModifyLifecycle" method="post" enctype="multipart/form-data">
-+ <div class="form-row">
-+ <input type="hidden" class="hidden" name="Name" value="<% $LifecycleObj->Name %>" />
-+ <input type="hidden" class="hidden" name="Type" value="<% $LifecycleObj->Type %>" />
-+ <& /Elements/Lifecycle/Graph, Lifecycle => $LifecycleObj->Name &>
-+ <div class="col-md-12">
-+ <& /Elements/Submit, Label => loc('Save Changes') &>
-+ </div>
++ <input type="hidden" class="hidden" name="Name" value="<% $LifecycleObj->Name %>" />
++ <input type="hidden" class="hidden" name="Type" value="<% $LifecycleObj->Type %>" />
++ <& /Elements/Lifecycle/Graph, Lifecycle => $LifecycleObj->Name &>
++ <div class="col-md-12">
++ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+</form>
+<%INIT>
@@ -960,44 +958,40 @@
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
-+<div class="lifecycle-ui svg-container" id="lifecycle-<% $id %>">
-+ <div class="row">
-+ <div class="col-md-12">
-+ <div id="lifeycycle-ui-edit-node" class="lifeycycle-ui-edit-node collapse card card-body">
-+ <input type="hidden" name="id" />
-+ <div class="row">
-+ <div class="col-md-3 label">
-+ <label for="name">Name:</label>
-+ </div>
-+ <div class="col-md-9 value">
-+ <input class="form-control" type="text" id="name" name="name" value="" />
-+ </div>
++<div class="lifecycle-ui" id="lifecycle-<% $id %>">
++ <div class="col-md-12">
++ <div id="lifeycycle-ui-edit-node" class="lifeycycle-ui-edit-node collapse card card-body">
++ <input type="hidden" name="id" />
++ <div class="row">
++ <div class="col-md-3 label">
++ <label for="name">Name:</label>
+ </div>
-+
-+ <div class="row">
-+ <div class="col-md-3 label">
-+ <label for="type">Type:</label>
-+ </div>
-+ <div class="col-md-9 value">
-+ <select class="selectpicker form-control" id="type" name="type">
-+ <option value="initial">Initial</option>
-+ <option value="active">Active</option>
-+ <option value="inactive">Inactive</option>
-+ </select>
-+ </div>
++ <div class="col-md-9 value">
++ <input class="form-control" type="text" id="name" name="name" value="" />
+ </div>
-+ <div class="row float-right">
-+ <div class="col-md-12">
-+ <button class="button btn btn-primary form-control" id="SaveNode">Save</button>
-+ </div>
++ </div>
++
++ <div class="row">
++ <div class="col-md-3 label">
++ <label for="type">Type:</label>
++ </div>
++ <div class="col-md-9 value">
++ <select class="selectpicker form-control" id="type" name="type">
++ <option value="initial">Initial</option>
++ <option value="active">Active</option>
++ <option value="inactive">Inactive</option>
++ </select>
++ </div>
++ </div>
++ <div class="row float-right">
++ <div class="col-md-12">
++ <button class="button btn btn-primary form-control" id="SaveNode">Save</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
-+ <svg class="svg-container">
-+ </svg>
-+ </div>
++ <svg></svg>
+
+ <script type="text/javascript">
+ jQuery(function () {
@@ -1318,17 +1312,8 @@
+ z-index: 99;
+}
+
-+.svg-container {
-+ display: inline-block;
-+ position: relative;
-+ width: 100%;
-+ padding-bottom: 40%; /* aspect ratio */
-+ vertical-align: top;
-+ overflow: hidden;
-+}
+.svg-content-responsive {
+ display: inline-block;
-+ position: absolute;
+}
+
+svg .rect {
@@ -1345,72 +1330,6 @@
@import "ticket-search.css";
@import "print.css";
+ at import "lifecycleui.css";
-
-diff --git a/share/static/css/elevator-light/main.css.orig b/share/static/css/elevator-light/main.css.orig
-new file mode 100644
---- /dev/null
-+++ b/share/static/css/elevator-light/main.css.orig
-@@
-+ at import "inter.css";
-+ at import "jquery-ui.css";
-+ at import "jquery-ui-timepicker-addon.css";
-+ at import "superfish.css";
-+ at import "superfish-navbar.css";
-+ at import "superfish-vertical.css";
-+ at import "tablesorter.css";
-+ at import "farbtastic.css";
-+ at import "bootstrap.css";
-+ at import "bootstrap-select.css";
-+ at import "bootstrap-combobox.css";
-+ at import "dropzone.css";
-+ at import "dropzone.customized.css";
-+
-+ at import "base.css";
-+ at import "collection.css";
-+ at import "forms.css";
-+ at import "misc.css";
-+ at import "nav.css";
-+ at import "ticket-form.css";
-+ at import "rights-editor.css";
-+ at import "theme-editor.css";
-+ at import "ticket.css";
-+ at import "accordion.css";
-+ at import "record.css";
-+ at import "admin.css";
-+ at import "articles.css";
-+ at import "assets.css";
-+ at import "portlets.css";
-+ at import "login.css";
-+ at import "history-folding.css";
-+ at import "history.css";
-+ at import "charts.css";
-+ at import "chosen.css";
-+ at import "ticket-timer.css";
-+ at import "keyboard-shortcuts.css";
-+ at import "shredder.css";
-+ at import "layout.css";
-+ at import "boxes.css";
-+ at import "dashboards.css";
-+ at import "ticket-lists.css";
-+ at import "ticket-search.css";
-+ at import "print.css";
-
-diff --git a/share/static/css/elevator-light/main.css.rej b/share/static/css/elevator-light/main.css.rej
-new file mode 100644
---- /dev/null
-+++ b/share/static/css/elevator-light/main.css.rej
-@@
-+***************
-+*** 42,44 ****
-+ @import "ticket-search.css";
-+ @import "print.css";
-+ @import "ckeditor5.css";
-+--- 42,46 ----
-+ @import "ticket-search.css";
-+ @import "print.css";
-+ @import "ckeditor5.css";
-++
-++ @import "lifecycleui.css";
diff --git a/share/static/js/d3.min.js b/share/static/js/d3.min.js
new file mode 100644
@@ -2082,12 +2001,16 @@
+ self = this;
+ if (!source || !target) return;
+
-+ var link = self.links.filter(function(l) { return (l.source === target && l.target === source); })[0];
++ var link = self.links.filter(function(l) { return (l.source.id === target.id && l.target.id === source.id); })[0];
++
+ if ( link ) {
+ link.start = true;
+ }
+ else {
-+ self.links.push({id: ++self.links_seq, source: source, target: target, start: false, end: true});
++ link = self.links.filter(function(l) { return (l.source.id === source.id && l.target.id === target.id); })[0];
++ if (!link ) {
++ self.links.push({id: ++self.links_seq, source: source, target: target, start: false, end: true});
++ }
+ }
+ }
+
More information about the rt-commit
mailing list