[Rt-commit] rt branch, master, updated. rt-4.1.5-174-g1c53cbd

[Alex Vandiver]

The branch, master has been updated
       via  1c53cbd628ea46945ab66c8cb4483f0683b35432 (commit)
       via  7d4f0489343fc0f3aec128c34e32755ee94a5f57 (commit)
       via  3e96578c689b53cb519d209ebfcdb751339942ce (commit)
      from  fbcee7fa419de2740012632d9c82a88fa090bbe2 (commit)

Summary of changes:
 share/html/NoAuth/css/base/ticket.css              |  7 ++++
 share/html/Ticket/Display.html                     |  1 +
 .../Elements/ShowDependencyStatus}                 | 43 +++++++++++++---------
 3 files changed, 33 insertions(+), 18 deletions(-)
 copy share/html/{Dashboards/Elements/ShowDashboards => Ticket/Elements/ShowDependencyStatus} (71%)

- Log -----------------------------------------------------------------
commit 1c53cbd628ea46945ab66c8cb4483f0683b35432
Merge: fbcee7f 7d4f048
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 28 18:48:02 2012 -0500

    Merge branch '4.2/show-dependency-status'

diff --cc share/html/NoAuth/css/base/ticket.css
index 4865653,1714196..38893e7
--- a/share/html/NoAuth/css/base/ticket.css
+++ b/share/html/NoAuth/css/base/ticket.css
@@@ -143,89 -143,11 +143,96 @@@
      display: none;
  }
  
+ .dependency-status {
+     font-style: italic;
+ }
+ .dependency-status .summary {
+     font-weight: bold;
+     font-style: normal;
+ }
  
 +/* Color the titlebox tabs */
 +.ticket-info-cfs .titlebox .titlebox-title .left { background-color: #b32; color: #fff;}
 +.ticket-info-basics .titlebox .titlebox-title .left { background-color: #b32;  color: #fff;}
 +.ticket-info-people .titlebox .titlebox-title .left { background-color: #48c;  color: #fff;}
 +.ticket-info-requestor .titlebox .titlebox-title .left { white-space: nowrap; background-color: #48c;  color: #fff;}
 +.ticket-info-links .titlebox .titlebox-title .left { background-color: #316531;  color: #fff;}
 +.ticket-info-reminders .titlebox .titlebox-title .left { background-color: #369;  color: #fff;}
 +.ticket-info-dates .titlebox .titlebox-title .left { background-color: #633063;  color: #fff;}
 +.ticket-info-attachments .titlebox .titlebox-title .left { background-color: #993366;  color: #fff;}
 +
 +.ticket-summary .titlebox .titlebox-title .left a, .ticket-summary .titlebox .titlebox-title .left a:visited { color: #fff;}
 +
 +.unread-messages .titlebox , .unread-messages .titlebox .titlebox-title .left {
 +  border: 1px solid #99a;
 +  border-right: 2px solid #aab;
 +  border-bottom: 2px solid #aab;
 +
 +}
 +
 +
 +.unread-messages .titlebox {
 +  background-color: #dde;
 +}
 +
 +.unread-messages .titlebox .titlebox-title .left {
 +  background-color: #cce;
 +}
 +
 +.ticket-inactive {
 +  text-decoration: line-through;
 +  color: #666
 +}
 +
 +table.ticket-summary td.boxcontainer:first-child {
 +  width: 50%;
 +}
 +div.requestor-ticket-links {
 +    text-align: left;
 +    font-size: 0.8em;
 +    padding-top: 0.25em;
 +}
 +
 +.more-about-requestor-extra-field .label {
 +    display: inline-block;
 +    width: 8em;
 +    font-weight: bold;
 +    text-align: right;
 +}
 +
 +.more-about-requestor-extra-field .value {
 +    display: inline-block;
 +}
 +
 +.ticket-info-requestor .more-about-requestor-extra,
 +.ticket-info-requestor .comments-about-user,
 +.ticket-info-requestor .more-about-requestor-tickets,
 +.ticket-info-requestor .more-about-user-groups
 +{
 +    margin: 1em 0;
 +}
 +
 +.ticket-info-requestor .comments-about-user .label,
 +.ticket-info-requestor .more-about-user-groups .label,
 +.ticket-info-requestor .more-about-requestor-tickets .label
 +{
 +    display: block;
 +    font-weight: bold;
 +    text-align: left;
 +}
 +
 +.ticket-info-requestor .more-about-user-groups .value ul,
 +.ticket-info-requestor .more-about-requestor-tickets ul
 +{
 +    margin-top: 0;
 +    margin-bottom: 0;
 +}
 +
 +
 +/* textareas get to be bigger when we're in a table */
 +tr.edit-custom-field.cftype-Text textarea,
 +tr.edit-custom-field.cftype-Freeform input,
 +tr.edit-custom-field.cftype-Wikitext textarea
 +{
 +    width: 100%;
 +}
diff --cc share/html/Ticket/Display.html
index 9d86e4a,75db97f..4526534
mode 100644,100755..100644
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@@ -54,8 -54,9 +54,9 @@@
  
  <& /Elements/ListActions, actions => \@Actions &>
  <& Elements/ShowUpdateStatus, Ticket => $TicketObj &>
+ <& Elements/ShowDependencyStatus, Ticket => $TicketObj &>
  
 -% $m->callback( %ARGS, Ticket => $TicketObj, CallbackName => 'BeforeShowSummary' );
 +% $m->callback( %ARGS, Ticket => $TicketObj, Transactions => $transactions, Attachments => $attachments, CallbackName => 'BeforeShowSummary' );
  <div class="summary">
  <&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
  <& /Ticket/Elements/ShowSummary,  Ticket => $TicketObj, Attachments => $attachments &>

-----------------------------------------------------------------------