[Bps-public-commit] rt-extension-lifecycleui branch, master, updated. 2e19ec3a31397c76b7034983b8d8b8ffab8fe9c4
Shawn Moore
shawn at bestpractical.com
Wed Sep 20 17:07:41 EDT 2017
The branch, master has been updated
via 2e19ec3a31397c76b7034983b8d8b8ffab8fe9c4 (commit)
via cc9d79fc345068fc322a7f45dc93a6f61f94bfa9 (commit)
via d76c6634ad6f14b2b51a6fa4d70e43c3b05e9c5c (commit)
from e321caf4ad8bd3b23a6f4c05bc70137062dbd060 (commit)
Summary of changes:
html/Elements/LifecycleInspector | 4 +-
html/Elements/LifecycleInspectorAction | 26 +++--
html/Elements/LifecycleInspectorCanvas | 153 +++++++++++++++++------------
html/Elements/LifecycleInspectorCircle | 50 +++++++---
html/Elements/LifecycleInspectorLine | 63 +++++++-----
html/Elements/LifecycleInspectorPolygon | 51 +++++++---
html/Elements/LifecycleInspectorStatus | 46 ++++++---
html/Elements/LifecycleInspectorText | 20 +++-
html/Elements/LifecycleInspectorTransition | 31 ++++--
static/css/lifecycleui-editor.css | 4 +
10 files changed, 306 insertions(+), 142 deletions(-)
- Log -----------------------------------------------------------------
commit d76c6634ad6f14b2b51a6fa4d70e43c3b05e9c5c
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Wed Sep 20 20:41:29 2017 +0000
Have each inspector use a table for its form
diff --git a/html/Elements/LifecycleInspectorAction b/html/Elements/LifecycleInspectorAction
index 9774a49..66a30b9 100644
--- a/html/Elements/LifecycleInspectorAction
+++ b/html/Elements/LifecycleInspectorAction
@@ -1,13 +1,23 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="action">
<li class="action" data-key="{{action._key}}">
- Label: <input type="text" name="label" value="{{action.label}}"></input><br><br>
- Update: <select name="update">
- {{#select action.update}}
- <option value=""><&|/l&>quick</&></option>
- <option value="Comment"><&|/l&>comment</&></option>
- <option value="Respond"><&|/l&>respond</&></option>
- {{/select}}
- </select><br>
+ <table>
+ <tr>
+ <td>Label:</td>
+ <td><input type="text" name="label" value="{{action.label}}"></input></td>
+ </tr>
+
+ <tr>
+ <td>Update:</td>
+ <td><select name="update">
+ {{#select action.update}}
+ <option value=""><&|/l&>quick</&></option>
+ <option value="Comment"><&|/l&>comment</&></option>
+ <option value="Respond"><&|/l&>respond</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+ </table>
+
<button class="delete"><&|/l&>Delete Action</&></button>
</li>
</script>
diff --git a/html/Elements/LifecycleInspectorCanvas b/html/Elements/LifecycleInspectorCanvas
index 1c54de7..5a454ca 100644
--- a/html/Elements/LifecycleInspectorCanvas
+++ b/html/Elements/LifecycleInspectorCanvas
@@ -1,65 +1,90 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="canvas">
<div class="canvas">
- Lifecycle: {{lifecycle.name}}<br><br>
- Type: {{lifecycle.type}}<br>
+ <table>
+ <tr>
+ <td>Lifecycle:</td>
+ <td>{{lifecycle.name}}</td>
+ </tr>
- {{#if lifecycle.is_ticket}}
- Lifecycle on Tickets: <select name="ticket_display">
- {{#select lifecycle.ticket_display}}
- <option value="hidden"><&|/l&>hidden</&>
- <option value="readonly"><&|/l&>read-only</&>
- <option value="interactive"><&|/l&>interactive</&>
- {{/select}}
- </select><br>
- {{/if}}
- <br>
+ <tr>
+ <td>Type:</td>
+ <td>{{lifecycle.type}}</td>
+ </tr>
- On Create: <select name="on_create">
- {{#select lifecycle.defaults.on_create}}
- <option value=""><&|/l&>(no value)</&></option>
- {{#each lifecycle.statuses}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
- {{/select}}
- </select><br>
+ {{#if lifecycle.is_ticket}}
+ <tr>
+ <td>Lifecycle on Tickets:</td>
+ <td><select name="ticket_display">
+ {{#select lifecycle.ticket_display}}
+ <option value="hidden"><&|/l&>hidden</&>
+ <option value="readonly"><&|/l&>read-only</&>
+ <option value="interactive"><&|/l&>interactive</&>
+ {{/select}}
+ </select></td>
+ </tr>
+ {{/if}}
- Approved: <select name="approved">
- {{#select lifecycle.defaults.approved}}
- <option value=""><&|/l&>(no value)</&></option>
- {{#each lifecycle.statuses}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
- {{/select}}
- </select><br>
+ <tr>
+ <td>On Create:</td>
+ <td><select name="on_create">
+ {{#select lifecycle.defaults.on_create}}
+ <option value=""><&|/l&>(no value)</&></option>
+ {{#each lifecycle.statuses}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+ {{/select}}
+ </select></td>
+ </tr>
- Denied: <select name="denied">
- {{#select lifecycle.defaults.denied}}
- <option value=""><&|/l&>(no value)</&></option>
- {{#each lifecycle.statuses}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
- {{/select}}
- </select><br>
+ <tr>
+ <td>Approved:</td>
+ <td><select name="approved">
+ {{#select lifecycle.defaults.approved}}
+ <option value=""><&|/l&>(no value)</&></option>
+ {{#each lifecycle.statuses}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+ {{/select}}
+ </select></td>
+ </tr>
- Reminder on Open: <select name="reminder_on_open">
- {{#select lifecycle.defaults.reminder_on_open}}
- <option value=""><&|/l&>(no value)</&></option>
- {{#each lifecycle.statuses}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
- {{/select}}
- </select><br>
+ <tr>
+ <td>Denied:</td>
+ <td><select name="denied">
+ {{#select lifecycle.defaults.denied}}
+ <option value=""><&|/l&>(no value)</&></option>
+ {{#each lifecycle.statuses}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+ {{/select}}
+ </select><td>
+ </tr>
+
+ <tr>
+ <td>Reminder on Open:</td>
+ <td><select name="reminder_on_open">
+ {{#select lifecycle.defaults.reminder_on_open}}
+ <option value=""><&|/l&>(no value)</&></option>
+ {{#each lifecycle.statuses}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+ {{/select}}
+ </select></td>
+ </tr>
+
+ <tr>
+ <td>Reminder on Resolve:</td>
+ <td><select name="reminder_on_resolve">
+ {{#select lifecycle.defaults.reminder_on_resolve}}
+ <option value=""><&|/l&>(no value)</&></option>
+ {{#each lifecycle.statuses}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+ {{/select}}
+ </select></td>
+ </tr>
+ </table>
- Reminder on Resolve: <select name="reminder_on_resolve">
- {{#select lifecycle.defaults.reminder_on_resolve}}
- <option value=""><&|/l&>(no value)</&></option>
- {{#each lifecycle.statuses}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
- {{/select}}
- </select><br>
- <br>
-
<ul class="toplevel">
<li><a href="javascript:void(0)" class="menu-item add-status"><&|/l&>Add Status</&></a></li>
<li class="has-children"><a href="javascript:void(0)" class="menu-item">Add Decoration...</a>
diff --git a/html/Elements/LifecycleInspectorCircle b/html/Elements/LifecycleInspectorCircle
index 72f0cfe..5028b02 100644
--- a/html/Elements/LifecycleInspectorCircle
+++ b/html/Elements/LifecycleInspectorCircle
@@ -1,16 +1,44 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="circle">
<div class="circle">
- Label: <input type="text" name="label" value="{{circle.label}}" /><br><br>
- Border: <input type="checkbox" name="renderStroke" {{#if circle.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style"> <span class="color-control" data-field="stroke"><span class="current-color" title="{{circle.stroke}}" style="background-color: {{circle.stroke}}"> </span> <button class="change-color"><&|/l&>Change</&></button></span><br>
- <div class="stroke-style">Style: <select name="strokeStyle">
- {{#select circle.strokeStyle}}
- <option value="solid"><&|/l&>solid</&></option>
- <option value="dashed"><&|/l&>dashed</&></option>
- <option value="dotted"><&|/l&>dotted</&></option>
- {{/select}}
- </select>
- </div>
- Fill: <input type="checkbox" name="renderFill" {{#if circle.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]"> <span class="color-control" data-field="fill"><span class="current-color" title="{{circle.fill}}" style="background-color: {{circle.fill}}"> </span> <button class="change-color"><&|/l&>Change</&></button></span><br>
+ <table>
+ <tr>
+ <td>Label:</td>
+ <td><input type="text" name="label" value="{{circle.label}}" /></td>
+ </tr>
+
+ <tr>
+ <td>Border:</td>
+ <td>
+ <input type="checkbox" name="renderStroke" {{#if circle.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style">
+ <span class="color-control" data-field="stroke">
+ <span class="current-color" title="{{circle.stroke}}" style="background-color: {{circle.stroke}}"> </span>
+ <button class="change-color"><&|/l&>Change</&></button>
+ </span>
+ </td>
+ </tr>
+
+ <tr class="stroke-style">
+ <td>Style:</td>
+ <td><select name="strokeStyle">
+ {{#select circle.strokeStyle}}
+ <option value="solid"><&|/l&>solid</&></option>
+ <option value="dashed"><&|/l&>dashed</&></option>
+ <option value="dotted"><&|/l&>dotted</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+
+ <tr>
+ <td>Fill:</td>
+ <td>
+ <input type="checkbox" name="renderFill" {{#if circle.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]">
+ <span class="color-control" data-field="fill">
+ <span class="current-color" title="{{circle.fill}}" style="background-color: {{circle.fill}}"> </span>
+ <button class="change-color"><&|/l&>Change</&></button>
+ </span>
+ </td>
+ </table>
+
<button class="clone"><&|/l&>Clone Circle</&></button><br>
<button class="delete"><&|/l&>Delete Circle</&></button>
</div>
diff --git a/html/Elements/LifecycleInspectorLine b/html/Elements/LifecycleInspectorLine
index 9a66c56..517f34a 100644
--- a/html/Elements/LifecycleInspectorLine
+++ b/html/Elements/LifecycleInspectorLine
@@ -1,29 +1,46 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="line">
<div class="line">
- Label: <input type="text" name="label" value="{{line.label}}" /><br><br>
- Start Marker: <select name="startMarker">
- {{#select line.startMarker}}
- <option value="none"><&|/l&>none</&></option>
- <option value="arrowhead"><&|/l&>arrowhead</&></option>
- <option value="diamond"><&|/l&>diamond</&></option>
- {{/select}}
- </select><br>
- End Marker: <select name="endMarker">
- {{#select line.endMarker}}
- <option value="none"><&|/l&>none</&></option>
- <option value="arrowhead"><&|/l&>arrowhead</&></option>
- <option value="diamond"><&|/l&>diamond</&></option>
- {{/select}}
- </select><br>
- Style: <select name="style">
- {{#select line.style}}
- <option value="solid"><&|/l&>solid</&></option>
- <option value="dashed"><&|/l&>dashed</&></option>
- <option value="dotted"><&|/l&>dotted</&></option>
- {{/select}}
- </select><br>
+ <table>
+ <tr>
+ <td>Label:</td>
+ <td><input type="text" name="label" value="{{line.label}}" /></td>
+ </tr>
+
+ <tr>
+ <td>Start Marker:</td>
+ <td><select name="startMarker">
+ {{#select line.startMarker}}
+ <option value="none"><&|/l&>none</&></option>
+ <option value="arrowhead"><&|/l&>arrowhead</&></option>
+ <option value="diamond"><&|/l&>diamond</&></option>
+ {{/select}}
+ </select><td>
+ </tr>
+
+ <tr>
+ <td>End Marker:</td>
+ <td><select name="endMarker">
+ {{#select line.endMarker}}
+ <option value="none"><&|/l&>none</&></option>
+ <option value="arrowhead"><&|/l&>arrowhead</&></option>
+ <option value="diamond"><&|/l&>diamond</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+
+ <tr>
+ <td>Style:</td>
+ <td><select name="style">
+ {{#select line.style}}
+ <option value="solid"><&|/l&>solid</&></option>
+ <option value="dashed"><&|/l&>dashed</&></option>
+ <option value="dotted"><&|/l&>dotted</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+ </table>
+
<button class="clone"><&|/l&>Clone Line</&></button><br>
<button class="delete"><&|/l&>Delete Line</&></button>
</div>
</script>
-
diff --git a/html/Elements/LifecycleInspectorPolygon b/html/Elements/LifecycleInspectorPolygon
index 3d9c054..5d18889 100644
--- a/html/Elements/LifecycleInspectorPolygon
+++ b/html/Elements/LifecycleInspectorPolygon
@@ -1,16 +1,45 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="polygon">
<div class="polygon">
- Label: <input type="text" name="label" value="{{polygon.label}}" /><br><br>
- Border: <input type="checkbox" name="renderStroke" {{#if polygon.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style"> <span class="color-control" data-field="stroke"><span class="current-color" title="{{polygon.stroke}}" style="background-color: {{polygon.stroke}}"> </span> <button class="change-color"><&|/l&>Change</&></button></span><br>
- <div class="stroke-style">Style: <select name="strokeStyle">
- {{#select polygon.strokeStyle}}
- <option value="solid"><&|/l&>solid</&></option>
- <option value="dashed"><&|/l&>dashed</&></option>
- <option value="dotted"><&|/l&>dotted</&></option>
- {{/select}}
- </select>
- </div>
- Fill: <input type="checkbox" name="renderFill" {{#if polygon.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]"> <span class="color-control" data-field="fill"><span class="current-color" title="{{polygon.fill}}" style="background-color: {{polygon.fill}}"> </span> <button class="change-color"><&|/l&>Change</&></button></span><br>
+ <table>
+ <tr>
+ <td>Label:</td>
+ <td><input type="text" name="label" value="{{polygon.label}}" /></td>
+ </tr>
+
+ <tr>
+ <td>Border:</td>
+ <td>
+ <input type="checkbox" name="renderStroke" {{#if polygon.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style">
+ <span class="color-control" data-field="stroke">
+ <span class="current-color" title="{{polygon.stroke}}" style="background-color: {{polygon.stroke}}"> </span>
+ <button class="change-color"><&|/l&>Change</&></button>
+ </span>
+ </td>
+ </tr>
+
+ <tr class="stroke-style">
+ <td>Style:</td>
+ <td><select name="strokeStyle">
+ {{#select polygon.strokeStyle}}
+ <option value="solid"><&|/l&>solid</&></option>
+ <option value="dashed"><&|/l&>dashed</&></option>
+ <option value="dotted"><&|/l&>dotted</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+
+ <tr>
+ <td>Fill:</td>
+ <td>
+ <input type="checkbox" name="renderFill" {{#if polygon.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]">
+ <span class="color-control" data-field="fill">
+ <span class="current-color" title="{{polygon.fill}}" style="background-color: {{polygon.fill}}"> </span>
+ <button class="change-color"><&|/l&>Change</&></button>
+ </span>
+ </td>
+ </tr>
+ </table>
+
<button class="clone"><&|/l&>Clone Polygon</&></button><br>
<button class="delete"><&|/l&>Delete Polygon</&></button>
</div>
diff --git a/html/Elements/LifecycleInspectorStatus b/html/Elements/LifecycleInspectorStatus
index 8aec7eb..5d91329 100644
--- a/html/Elements/LifecycleInspectorStatus
+++ b/html/Elements/LifecycleInspectorStatus
@@ -1,15 +1,37 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="status">
<div class="status">
- Status: <input type="text" name="name" maxlength=25 value="{{status.name}}"><br><br>
- Type: <select name="type">
- {{#select status.type}}
- <option value="initial"><&|/l&>initial</&></option>
- <option value="active"><&|/l&>active</&></option>
- <option value="inactive"><&|/l&>inactive</&></option>
- {{/select}}
- </select><br>
- <span title="<&|/l&>Can this status be selected on creation?</&>">Creation<span class="hint" >[?]</span>: <input type="checkbox" name="creation" {{#if status.creation}}checked=checked{{/if}}></span><br>
- Color: <span class="color-control" data-field="color"><span class="current-color" title="{{status.color}}" style="background-color: {{status.color}}"> </span> <button class="change-color"><&|/l&>Change</&></button></span><br>
+ <table>
+ <tr>
+ <td>Status:</td>
+ <td><input type="text" name="name" maxlength=25 value="{{status.name}}"></td>
+ </tr>
+
+ <tr>
+ <td>Type:</td>
+ <td><select name="type">
+ {{#select status.type}}
+ <option value="initial"><&|/l&>initial</&></option>
+ <option value="active"><&|/l&>active</&></option>
+ <option value="inactive"><&|/l&>inactive</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+
+ <tr>
+ <td><span title="<&|/l&>Can this status be selected on creation?</&>">Creation<span class="hint" >[?]</span>:</td>
+ <td><input type="checkbox" name="creation" {{#if status.creation}}checked=checked{{/if}}></td>
+ </tr>
+
+ <tr>
+ <td>Color:</td>
+ <td>
+ <span class="color-control" data-field="color">
+ <span class="current-color" title="{{status.color}}" style="background-color: {{status.color}}"> </span>
+ <button class="change-color"><&|/l&>Change</&></button>
+ </span>
+ </td>
+ </tr>
+ </table>
<ul class="toplevel">
<li><a href="javascript:void(0)" class="menu-item">Add Transition...</a>
diff --git a/html/Elements/LifecycleInspectorText b/html/Elements/LifecycleInspectorText
index 652dba3..d483b71 100644
--- a/html/Elements/LifecycleInspectorText
+++ b/html/Elements/LifecycleInspectorText
@@ -1,8 +1,22 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="text">
<div class="text">
- Text: <textarea name="text" rows=5 data-default="New label">{{text.text}}</textarea><br><br>
- Bold: <input type="checkbox" name="bold" {{#if text.bold}}checked=checked{{/if}}><br>
- Italic: <input type="checkbox" name="italic" {{#if text.italic}}checked=checked{{/if}}><br>
+ <table>
+ <tr>
+ <td>Text:</td>
+ <td><textarea name="text" rows=5 data-default="New label">{{text.text}}</textarea></td>
+ </tr>
+
+ <tr>
+ <td>Bold:</td>
+ <td><input type="checkbox" name="bold" {{#if text.bold}}checked=checked{{/if}}></td>
+ </tr>
+
+ <tr>
+ <td>Italic:</td>
+ <td><input type="checkbox" name="italic" {{#if text.italic}}checked=checked{{/if}}></td>
+ </tr>
+ </table>
+
<button class="clone"><&|/l&>Clone Label</&></button><br>
<button class="delete"><&|/l&>Delete Label</&></button>
</div>
diff --git a/html/Elements/LifecycleInspectorTransition b/html/Elements/LifecycleInspectorTransition
index dfc4d58..be6c3d4 100644
--- a/html/Elements/LifecycleInspectorTransition
+++ b/html/Elements/LifecycleInspectorTransition
@@ -1,20 +1,33 @@
<script type="text/x-template" class="lifecycle-inspector-template" data-type="transition">
<div class="transition">
- Transition from <a href="#" class="select-status" data-name="{{transition.from}}">{{transition.from}}</a> to <a href="#" class="select-status" data-name="{{transition.to}}">{{transition.to}}</a><br><br>
- Right: <input type="text" name="right" value="{{transition.right}}"><br>
- Style: <select name="style">
- {{#select transition.style}}
- <option value="solid"><&|/l&>solid</&></option>
- <option value="dashed"><&|/l&>dashed</&></option>
- <option value="dotted"><&|/l&>dotted</&></option>
- {{/select}}
- </select><br>
+ <table>
+ <tr>
+ <td colspan=2>Transition from <a href="#" class="select-status" data-name="{{transition.from}}">{{transition.from}}</a> to <a href="#" class="select-status" data-name="{{transition.to}}">{{transition.to}}</a></td>
+ </tr>
+
+ <tr>
+ <td>Right:</td>
+ <td><input type="text" name="right" value="{{transition.right}}"></td>
+ </tr>
+
+ <tr>
+ <td>Style:</td>
+ <td><select name="style">
+ {{#select transition.style}}
+ <option value="solid"><&|/l&>solid</&></option>
+ <option value="dashed"><&|/l&>dashed</&></option>
+ <option value="dotted"><&|/l&>dotted</&></option>
+ {{/select}}
+ </select></td>
+ </tr>
+ </table>
<ul class="actions">
{{#each transition.actions}}
{{> lifecycleui_action action=this lifecycle=../lifecycle}}
{{/each}}
</ul>
+
<button class="add-action"><&|/l&>Add Action</&></button><br>
<button class="delete"><&|/l&>Delete Transition</&></button>
</div>
diff --git a/static/css/lifecycleui-editor.css b/static/css/lifecycleui-editor.css
index f495cc7..0df6e6c 100644
--- a/static/css/lifecycleui-editor.css
+++ b/static/css/lifecycleui-editor.css
@@ -33,6 +33,10 @@
background: #EEE;
}
+.lifecycle-ui .inspector input[type=text] {
+ width: 10em;
+}
+
.lifecycle-ui .inspector .color-control span.current-color {
display: inline;
padding-left: 1em;
commit cc9d79fc345068fc322a7f45dc93a6f61f94bfa9
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Wed Sep 20 20:42:38 2017 +0000
Only show approval and reminder default dropdowns for tickets
These don't make sense for assets, and the core asset lifecycle only
specifies an on_create default anyway
diff --git a/html/Elements/LifecycleInspectorCanvas b/html/Elements/LifecycleInspectorCanvas
index 5a454ca..cdb3da9 100644
--- a/html/Elements/LifecycleInspectorCanvas
+++ b/html/Elements/LifecycleInspectorCanvas
@@ -36,6 +36,7 @@
</select></td>
</tr>
+ {{#if lifecycle.is_ticket}}
<tr>
<td>Approved:</td>
<td><select name="approved">
@@ -83,6 +84,7 @@
{{/select}}
</select></td>
</tr>
+ {{/if}}
</table>
<ul class="toplevel">
commit 2e19ec3a31397c76b7034983b8d8b8ffab8fe9c4
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Wed Sep 20 20:56:56 2017 +0000
Add loc tags where missing
diff --git a/html/Elements/LifecycleInspector b/html/Elements/LifecycleInspector
index ff655b3..12d4b32 100644
--- a/html/Elements/LifecycleInspector
+++ b/html/Elements/LifecycleInspector
@@ -1,7 +1,7 @@
<div class="inspector">
<div class="controls">
- <button class="undo">Undo</button>
- <button class="redo">Redo</button>
+ <button class="undo"><&|/l&>Undo</&></button>
+ <button class="redo"><&|/l&>Redo</&></button>
</div>
<div class="content">
</div>
diff --git a/html/Elements/LifecycleInspectorAction b/html/Elements/LifecycleInspectorAction
index 66a30b9..f7ed06a 100644
--- a/html/Elements/LifecycleInspectorAction
+++ b/html/Elements/LifecycleInspectorAction
@@ -2,12 +2,12 @@
<li class="action" data-key="{{action._key}}">
<table>
<tr>
- <td>Label:</td>
+ <td><&|/l&>Label</&>:</td>
<td><input type="text" name="label" value="{{action.label}}"></input></td>
</tr>
<tr>
- <td>Update:</td>
+ <td><&|/l&>Update</&>:</td>
<td><select name="update">
{{#select action.update}}
<option value=""><&|/l&>quick</&></option>
diff --git a/html/Elements/LifecycleInspectorCanvas b/html/Elements/LifecycleInspectorCanvas
index cdb3da9..bd2a9a9 100644
--- a/html/Elements/LifecycleInspectorCanvas
+++ b/html/Elements/LifecycleInspectorCanvas
@@ -2,18 +2,18 @@
<div class="canvas">
<table>
<tr>
- <td>Lifecycle:</td>
+ <td><&|/l&>Lifecycle</&>:</td>
<td>{{lifecycle.name}}</td>
</tr>
<tr>
- <td>Type:</td>
+ <td><&|/l&>Type</&>:</td>
<td>{{lifecycle.type}}</td>
</tr>
{{#if lifecycle.is_ticket}}
<tr>
- <td>Lifecycle on Tickets:</td>
+ <td><&|/l&>Lifecycle on Tickets</&>:</td>
<td><select name="ticket_display">
{{#select lifecycle.ticket_display}}
<option value="hidden"><&|/l&>hidden</&>
@@ -25,7 +25,7 @@
{{/if}}
<tr>
- <td>On Create:</td>
+ <td><&|/l&>On Create</&>:</td>
<td><select name="on_create">
{{#select lifecycle.defaults.on_create}}
<option value=""><&|/l&>(no value)</&></option>
@@ -38,7 +38,7 @@
{{#if lifecycle.is_ticket}}
<tr>
- <td>Approved:</td>
+ <td><&|/l&>Approved</&>:</td>
<td><select name="approved">
{{#select lifecycle.defaults.approved}}
<option value=""><&|/l&>(no value)</&></option>
@@ -50,7 +50,7 @@
</tr>
<tr>
- <td>Denied:</td>
+ <td><&|/l&>Denied</&>:</td>
<td><select name="denied">
{{#select lifecycle.defaults.denied}}
<option value=""><&|/l&>(no value)</&></option>
@@ -62,7 +62,7 @@
</tr>
<tr>
- <td>Reminder on Open:</td>
+ <td><&|/l&>Reminder on Open</&>:</td>
<td><select name="reminder_on_open">
{{#select lifecycle.defaults.reminder_on_open}}
<option value=""><&|/l&>(no value)</&></option>
@@ -74,7 +74,7 @@
</tr>
<tr>
- <td>Reminder on Resolve:</td>
+ <td><&|/l&>Reminder on Resolve</&>:</td>
<td><select name="reminder_on_resolve">
{{#select lifecycle.defaults.reminder_on_resolve}}
<option value=""><&|/l&>(no value)</&></option>
@@ -89,23 +89,23 @@
<ul class="toplevel">
<li><a href="javascript:void(0)" class="menu-item add-status"><&|/l&>Add Status</&></a></li>
- <li class="has-children"><a href="javascript:void(0)" class="menu-item">Add Decoration...</a>
+ <li class="has-children"><a href="javascript:void(0)" class="menu-item"><&|/l&>Add Decoration...</&></a>
<ul>
- <li><a href="javascript:void(0)" class="menu-item add-text">Add Label</a></li>
- <li><a href="javascript:void(0)" class="menu-item add-polygon" data-type="Triangle">Add Triangle</a></li>
- <li><a href="javascript:void(0)" class="menu-item add-polygon" data-type="Rectangle">Add Rectangle</a></li>
- <li><a href="javascript:void(0)" class="menu-item add-circle">Add Circle</a></li>
- <li><a href="javascript:void(0)" class="menu-item add-line">Add Line</a></li>
+ <li><a href="javascript:void(0)" class="menu-item add-text"><&|/l&>Add Label</&></a></li>
+ <li><a href="javascript:void(0)" class="menu-item add-polygon" data-type="Triangle"><&|/l&>Add Triangle</&></a></li>
+ <li><a href="javascript:void(0)" class="menu-item add-polygon" data-type="Rectangle"><&|/l&>Add Rectangle</&></a></li>
+ <li><a href="javascript:void(0)" class="menu-item add-circle"><&|/l&>Add Circle</&></a></li>
+ <li><a href="javascript:void(0)" class="menu-item add-line"><&|/l&>Add Line</&></a></li>
</ul>
</li>
- <li class="has-children"><a href="javascript:void(0)" class="menu-item">Select Status...</a>
+ <li class="has-children"><a href="javascript:void(0)" class="menu-item"><&|/l&>Select Status...</&></a>
<ul>
{{#each lifecycle.statuses}}
<li><a href="javascript:void(0)" class="menu-item select-status" data-name="{{this}}">{{this}}</a></li>
{{/each}}
</ul>
</li>
- <li class="has-children"><a href="javascript:void(0)" class="menu-item">Select Transition...</a>
+ <li class="has-children"><a href="javascript:void(0)" class="menu-item"><&|/l&>Select Transition...</&></a>
<ul>
{{#each lifecycle.statuses}}
<li class="has-children"><a href="javascript:void(0)" class="menu-item select-status" data-name="{{this}}"><&|/l, "{{this}}"&>from [_1]</&></a>
@@ -122,7 +122,7 @@
{{/each}}
</ul>
</li>
- <li class="has-children"><a href="javascript:void(0)" class="menu-item">Select Decoration...</a>
+ <li class="has-children"><a href="javascript:void(0)" class="menu-item"><&|/l&>Select Decoration...</&></a>
<ul>
{{#each lifecycle.decorations.text}}
<li><a href="javascript:void(0)" class="menu-item select-decoration" data-key="{{this._key}}">{{truncate this.text}}</a></li>
diff --git a/html/Elements/LifecycleInspectorCircle b/html/Elements/LifecycleInspectorCircle
index 5028b02..e38d7c2 100644
--- a/html/Elements/LifecycleInspectorCircle
+++ b/html/Elements/LifecycleInspectorCircle
@@ -2,12 +2,12 @@
<div class="circle">
<table>
<tr>
- <td>Label:</td>
+ <td><&|/l&>Label</&>:</td>
<td><input type="text" name="label" value="{{circle.label}}" /></td>
</tr>
<tr>
- <td>Border:</td>
+ <td><&|/l&>Border</&>:</td>
<td>
<input type="checkbox" name="renderStroke" {{#if circle.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style">
<span class="color-control" data-field="stroke">
@@ -18,7 +18,7 @@
</tr>
<tr class="stroke-style">
- <td>Style:</td>
+ <td><&|/l&>Style</&>:</td>
<td><select name="strokeStyle">
{{#select circle.strokeStyle}}
<option value="solid"><&|/l&>solid</&></option>
@@ -29,7 +29,7 @@
</tr>
<tr>
- <td>Fill:</td>
+ <td><&|/l&>Fill</&>:</td>
<td>
<input type="checkbox" name="renderFill" {{#if circle.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]">
<span class="color-control" data-field="fill">
diff --git a/html/Elements/LifecycleInspectorLine b/html/Elements/LifecycleInspectorLine
index 517f34a..4b4623d 100644
--- a/html/Elements/LifecycleInspectorLine
+++ b/html/Elements/LifecycleInspectorLine
@@ -2,12 +2,12 @@
<div class="line">
<table>
<tr>
- <td>Label:</td>
+ <td><&|/l&>Label</&>:</td>
<td><input type="text" name="label" value="{{line.label}}" /></td>
</tr>
<tr>
- <td>Start Marker:</td>
+ <td><&|/l&>Start Marker</&>:</td>
<td><select name="startMarker">
{{#select line.startMarker}}
<option value="none"><&|/l&>none</&></option>
@@ -18,7 +18,7 @@
</tr>
<tr>
- <td>End Marker:</td>
+ <td><&|/l&>End Marker</&>:</td>
<td><select name="endMarker">
{{#select line.endMarker}}
<option value="none"><&|/l&>none</&></option>
@@ -29,7 +29,7 @@
</tr>
<tr>
- <td>Style:</td>
+ <td><&|/l&>Style</&>:</td>
<td><select name="style">
{{#select line.style}}
<option value="solid"><&|/l&>solid</&></option>
diff --git a/html/Elements/LifecycleInspectorPolygon b/html/Elements/LifecycleInspectorPolygon
index 5d18889..7914820 100644
--- a/html/Elements/LifecycleInspectorPolygon
+++ b/html/Elements/LifecycleInspectorPolygon
@@ -2,12 +2,12 @@
<div class="polygon">
<table>
<tr>
- <td>Label:</td>
+ <td><&|/l&>Label</&>:</td>
<td><input type="text" name="label" value="{{polygon.label}}" /></td>
</tr>
<tr>
- <td>Border:</td>
+ <td><&|/l&>Border</&>:</td>
<td>
<input type="checkbox" name="renderStroke" {{#if polygon.renderStroke}}checked=checked{{/if}} data-show-hide=".color-control[data-field=stroke], .stroke-style">
<span class="color-control" data-field="stroke">
@@ -18,7 +18,7 @@
</tr>
<tr class="stroke-style">
- <td>Style:</td>
+ <td><&|/l&>Style</&>:</td>
<td><select name="strokeStyle">
{{#select polygon.strokeStyle}}
<option value="solid"><&|/l&>solid</&></option>
@@ -29,7 +29,7 @@
</tr>
<tr>
- <td>Fill:</td>
+ <td><&|/l&>Fill</&>:</td>
<td>
<input type="checkbox" name="renderFill" {{#if polygon.renderFill}}checked=checked{{/if}} data-show-hide=".color-control[data-field=fill]">
<span class="color-control" data-field="fill">
diff --git a/html/Elements/LifecycleInspectorStatus b/html/Elements/LifecycleInspectorStatus
index 5d91329..60bda1d 100644
--- a/html/Elements/LifecycleInspectorStatus
+++ b/html/Elements/LifecycleInspectorStatus
@@ -2,12 +2,12 @@
<div class="status">
<table>
<tr>
- <td>Status:</td>
+ <td><&|/l&>Status</&>:</td>
<td><input type="text" name="name" maxlength=25 value="{{status.name}}"></td>
</tr>
<tr>
- <td>Type:</td>
+ <td><&|/l&>Type</&>:</td>
<td><select name="type">
{{#select status.type}}
<option value="initial"><&|/l&>initial</&></option>
@@ -18,12 +18,12 @@
</tr>
<tr>
- <td><span title="<&|/l&>Can this status be selected on creation?</&>">Creation<span class="hint" >[?]</span>:</td>
+ <td><span title="<&|/l&>Can this status be selected on creation?</&>"><&|/l&>Creation</&><span class="hint" ><&|/l&>~[?~]</&></span>:</td>
<td><input type="checkbox" name="creation" {{#if status.creation}}checked=checked{{/if}}></td>
</tr>
<tr>
- <td>Color:</td>
+ <td><&|/l&>Color</&>:</td>
<td>
<span class="color-control" data-field="color">
<span class="current-color" title="{{status.color}}" style="background-color: {{status.color}}"> </span>
@@ -34,13 +34,13 @@
</table>
<ul class="toplevel">
- <li><a href="javascript:void(0)" class="menu-item">Add Transition...</a>
+ <li><a href="javascript:void(0)" class="menu-item"><&|/l&>Add Transition...</&></a>
<ul>
{{#each lifecycle.statuses}}
<li class="{{#if (canAddTransition ../status.name this ../lifecycle)}}{{else}}hidden{{/if}}"><a href="javascript:void(0)" class="menu-item add-transition" data-from="{{../status.name}}" data-to="{{this}}"><&|/l, "{{this}}"&>to [_1]</&></a></li>
{{/each}}
</ul>
- <li><a href="javascript:void(0)" class="menu-item">Select Transition...</a>
+ <li><a href="javascript:void(0)" class="menu-item"><&|/l&>Select Transition...</&></a>
<ul>
{{#each lifecycle.statuses}}
<li class="{{#if (canSelectTransition ../status.name this ../lifecycle)}}{{else}}hidden{{/if}}"><a href="#" class="menu-item select-transition" data-from="{{../status.name}}" data-to="{{this}}"><&|/l, "{{this}}"&>to [_1]</&></a></li>
diff --git a/html/Elements/LifecycleInspectorText b/html/Elements/LifecycleInspectorText
index d483b71..07fef43 100644
--- a/html/Elements/LifecycleInspectorText
+++ b/html/Elements/LifecycleInspectorText
@@ -2,17 +2,17 @@
<div class="text">
<table>
<tr>
- <td>Text:</td>
+ <td><&|/l&>Text</&>:</td>
<td><textarea name="text" rows=5 data-default="New label">{{text.text}}</textarea></td>
</tr>
<tr>
- <td>Bold:</td>
+ <td><&|/l&>Bold</&>:</td>
<td><input type="checkbox" name="bold" {{#if text.bold}}checked=checked{{/if}}></td>
</tr>
<tr>
- <td>Italic:</td>
+ <td><&|/l&>Italic</&>:</td>
<td><input type="checkbox" name="italic" {{#if text.italic}}checked=checked{{/if}}></td>
</tr>
</table>
diff --git a/html/Elements/LifecycleInspectorTransition b/html/Elements/LifecycleInspectorTransition
index be6c3d4..ad4ef62 100644
--- a/html/Elements/LifecycleInspectorTransition
+++ b/html/Elements/LifecycleInspectorTransition
@@ -2,16 +2,16 @@
<div class="transition">
<table>
<tr>
- <td colspan=2>Transition from <a href="#" class="select-status" data-name="{{transition.from}}">{{transition.from}}</a> to <a href="#" class="select-status" data-name="{{transition.to}}">{{transition.to}}</a></td>
+ <td colspan=2><&|/l_unsafe, '<a href="#" class="select-status" data-name="{{transition.from}}">{{transition.from}}</a>', '<a href="#" class="select-status" data-name="{{transition.to}}">{{transition.to}}' &>Transition from [_1] to [_2]</&></td>
</tr>
<tr>
- <td>Right:</td>
+ <td><&|/l&>Right</&>:</td>
<td><input type="text" name="right" value="{{transition.right}}"></td>
</tr>
<tr>
- <td>Style:</td>
+ <td><&|/l&>Style</&>:</td>
<td><select name="style">
{{#select transition.style}}
<option value="solid"><&|/l&>solid</&></option>
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list