[Rt-commit] rt branch, 4.2/rudder-fixes-for-rc3, updated. rt-4.2.0rc2-14-g9fc8fbe

Alex Vandiver alexmv at bestpractical.com
Wed Sep 25 13:03:25 EDT 2013


The branch, 4.2/rudder-fixes-for-rc3 has been updated
       via  9fc8fbe3caa934fc3a17baa0d16a72a09c6b076c (commit)
       via  15fd34c58a6aced93604743600ae7f80311d0cec (commit)
       via  9d2db6c4bd467e6ec9e1520a1b56932fe57ca006 (commit)
       via  c0d053cc78a6ccbb40dd008df3fd4b50d7add95e (commit)
       via  68c27d69cc27e53c311d7fe8e2f4cbc44cab9249 (commit)
      from  e097d3c632ba3b361ccd3fb5ef0990ef6073a47c (commit)

Summary of changes:
 share/html/Ticket/Modify.html            |  6 ++++--
 share/html/Ticket/Update.html            |  2 +-
 share/static/css/rudder/forms.css        |  2 +-
 share/static/css/rudder/history.css      | 30 ++++++++++++++++--------------
 share/static/css/rudder/misc.css         |  8 ++++----
 share/static/css/rudder/ticket-forms.css |  5 +++++
 share/static/css/rudder/ticket.css       |  2 +-
 7 files changed, 32 insertions(+), 23 deletions(-)

- Log -----------------------------------------------------------------
commit 68c27d69cc27e53c311d7fe8e2f4cbc44cab9249
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 25 12:19:49 2013 -0400

    Fix missing : in download CS

diff --git a/share/static/css/rudder/history.css b/share/static/css/rudder/history.css
index d655461..6c454f5 100644
--- a/share/static/css/rudder/history.css
+++ b/share/static/css/rudder/history.css
@@ -73,6 +73,6 @@ div.history-container {
 }
 
 .transaction div.downloadattachment .downloadcontenttype {
-    color #ccc;
+    color: #ccc;
     display: block;
-}
\ No newline at end of file
+}

commit c0d053cc78a6ccbb40dd008df3fd4b50d7add95e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 25 12:20:16 2013 -0400

    css_tidy changed files

diff --git a/share/static/css/rudder/forms.css b/share/static/css/rudder/forms.css
index b6d2898..ff285cd 100644
--- a/share/static/css/rudder/forms.css
+++ b/share/static/css/rudder/forms.css
@@ -75,7 +75,7 @@ button:active,
 input[type=reset]:active,
 input[type=submit]:active,
 input[class=button]:active {
-    background: #1D3B7D;
+    background: #1D3B7D
 }
 
 input[type=reset],
diff --git a/share/static/css/rudder/history.css b/share/static/css/rudder/history.css
index 6c454f5..b9949c3 100644
--- a/share/static/css/rudder/history.css
+++ b/share/static/css/rudder/history.css
@@ -1,5 +1,5 @@
 div.history-container {
-    border: 0;
+    border: 0
 }
 
 .history .transaction.message div.content {
@@ -9,22 +9,23 @@ div.history-container {
 }
 
 .history .transaction .metadata span.type {
-    margin:0;
+    margin: 0;
     font-size: 1.2em;
     margin-right: 1em;
     padding: 0.25em;
     border: none;
 }
-.history .transaction .metadata span.type a{
-    color: transparent ;
 
+.history .transaction .metadata span.type a {
+    color: transparent
 }
-.history .transaction .metadata span.type a#lasttrans{
-    display: inline;
-    
+
+.history .transaction .metadata span.type a#lasttrans {
+    display: inline
 }
-.history .transaction:hover .metadata span.type a{
-    color: white;
+
+.history .transaction:hover .metadata span.type a {
+    color: white
 }
 
 .history .transaction .metadata .date,
@@ -40,7 +41,7 @@ div.history-container {
     margin-top: 0.25em;
 }
 
-.transaction div.metadata span.actions  {
+.transaction div.metadata span.actions {
     background: #eee;
     color: #eee;
     display: inline-block;
@@ -49,10 +50,11 @@ div.history-container {
     padding-bottom: 0.5em;
     border-right: 1px solid #999;
     -moz-border-radius-bottomright: 0.5em;
-    -webkit-border-bottom-right-radius: 0.5em
+    -webkit-border-bottom-right-radius: 0.5em;
 }
+
 .transaction div.metadata span.actions a {
-    padding: 0.2em;
+    padding: 0.2em
 }
 
 .transaction div.downloadattachment {
diff --git a/share/static/css/rudder/misc.css b/share/static/css/rudder/misc.css
index 7752ad2..e47d0de 100644
--- a/share/static/css/rudder/misc.css
+++ b/share/static/css/rudder/misc.css
@@ -21,12 +21,12 @@ td.labeltop {
     min-width: 6em;
 }
 
-span.cflabel .type, td.cflabel .type {
-  font-weight: normal;
-  font-size: 0.8em;
+span.cflabel .type,
+td.cflabel .type {
+    font-weight: normal;
+    font-size: 0.8em;
 }
 
-
 table.myday h2 {
     display: inline
 }
diff --git a/share/static/css/rudder/ticket.css b/share/static/css/rudder/ticket.css
index 152f936..08efc92 100644
--- a/share/static/css/rudder/ticket.css
+++ b/share/static/css/rudder/ticket.css
@@ -8,7 +8,7 @@
 .ticket-info-reminders .titlebox-title .widget a,
 .ticket-info-dates .titlebox-title .widget a,
 .ticket-info-attachments .titlebox-title .widget a {
-    background-position: center -7px;
+    background-position: center -7px
 }
 
 .titlebox-title.inverse,

commit 9d2db6c4bd467e6ec9e1520a1b56932fe57ca006
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 25 12:57:26 2013 -0400

    Move Basics and their CFs into the same table to labels align

diff --git a/share/html/Ticket/Modify.html b/share/html/Ticket/Modify.html
index e9ef761..4e356de 100644
--- a/share/html/Ticket/Modify.html
+++ b/share/html/Ticket/Modify.html
@@ -56,8 +56,10 @@
 <input type="hidden" class="hidden" name="id" value="<% $TicketObj->Id %>" />
 
 <&| /Widgets/TitleBox, title => loc('Modify ticket #[_1]',$TicketObj->Id), class=>'ticket-info-basics' &>
-<& Elements/EditBasics, TicketObj => $TicketObj, defaults => \%ARGS &>
-<& /Elements/EditCustomFields, Object => $TicketObj, Grouping => 'Basics' &>
+<table>
+<& Elements/EditBasics, TicketObj => $TicketObj, defaults => \%ARGS, InTable => 1 &>
+<& /Elements/EditCustomFields, Object => $TicketObj, Grouping => 'Basics', InTable => 1 &>
+</table>
 </&>
 % $m->callback( CallbackName => 'AfterBasics', Ticket => $TicketObj );
 

commit 15fd34c58a6aced93604743600ae7f80311d0cec
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 25 12:59:09 2013 -0400

    Fix an AsTable/InTable mistake whch led to nested <table>s
    
    AsTable says "don't use <div>s, use <table> and <tr>" and InTable says
    "we're already in a table, omit the <table> but do use <tr>" Passing
    AsTable while already in a table led to nested <table> elements, and the
    labels not aligning.

diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 8ee6ba6..c3e8a41 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -135,7 +135,7 @@
 
 % $m->callback( %ARGS, CallbackName => 'AfterWorked', Ticket => $TicketObj );
 
-<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj, AsTable => 1 &>
+<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj, InTable => 1 &>
 
   </table>
   </&>

commit 9fc8fbe3caa934fc3a17baa0d16a72a09c6b076c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 25 13:01:12 2013 -0400

    Override font-weight: normal for ticket update and create, defined in base/ticket-form.css

diff --git a/share/static/css/rudder/ticket-forms.css b/share/static/css/rudder/ticket-forms.css
index a026c26..3167cc7 100644
--- a/share/static/css/rudder/ticket-forms.css
+++ b/share/static/css/rudder/ticket-forms.css
@@ -1,3 +1,8 @@
+#ticket-create-metadata .cflabel .name,
+#ticket-update-metadata .cflabel .name {
+    font-weight: inherit
+}
+
 .sidebyside #ticket-create-message .button[name="AddMoreAttach"],
 .sidebyside #ticket-update-message .button[name="AddMoreAttach"] {
     margin-right: -0.25em;

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


More information about the Rt-commit mailing list