[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-33-g26de28c

Thomas Sibley trs at bestpractical.com
Thu Sep 30 12:02:56 EDT 2010


The branch, 3.9-trunk has been updated
       via  26de28cb38f30b64d4d450e7d84c70d87970ace6 (commit)
       via  6286f7693764c41f777e3e2cc03a5742d3595097 (commit)
       via  658f4f47ecad84053220399339e7d15d7862a280 (commit)
      from  734691b95b339cb1e4e6a0fc1f1131acc9cbeb36 (commit)

Summary of changes:
 share/html/NoAuth/RichText/FCKeditor/UPGRADING     |    4 +++
 .../FCKeditor/editor/css/fck_editorarea.css        |    2 +-
 .../FCKeditor/editor/skins/default/fck_editor.css  |    5 ++-
 share/html/NoAuth/RichText/FCKeditor/fckconfig.js  |    2 +-
 share/html/NoAuth/css/base/ticket-form.css         |   14 ++++++++++-
 share/html/NoAuth/js/util.js                       |    4 +--
 share/html/Ticket/Update.html                      |   24 ++++++++++++++++---
 7 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 share/html/NoAuth/RichText/FCKeditor/UPGRADING

- Log -----------------------------------------------------------------
commit 658f4f47ecad84053220399339e7d15d7862a280
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Sep 30 11:55:48 2010 -0400

    Turn the message box light red when replying as an indication of who the
    message will be sent to

diff --git a/share/html/NoAuth/RichText/FCKeditor/UPGRADING b/share/html/NoAuth/RichText/FCKeditor/UPGRADING
new file mode 100644
index 0000000..71350fb
--- /dev/null
+++ b/share/html/NoAuth/RichText/FCKeditor/UPGRADING
@@ -0,0 +1,4 @@
+The files editor/css/fck_editorarea.css and editor/skins/default/fck_editor.css
+are modified, as there is no other way to effect the iframe styles FCKeditor
+uses.  Any updates to FCKeditor should preserve these changes, so check the
+history.
diff --git a/share/html/NoAuth/RichText/FCKeditor/editor/css/fck_editorarea.css b/share/html/NoAuth/RichText/FCKeditor/editor/css/fck_editorarea.css
index 8a328bb..3047aca 100644
--- a/share/html/NoAuth/RichText/FCKeditor/editor/css/fck_editorarea.css
+++ b/share/html/NoAuth/RichText/FCKeditor/editor/css/fck_editorarea.css
@@ -33,7 +33,7 @@
 
 body
 {
-	background-color: #ffffff;
+	background-color: transparent;
 	padding: 5px 5px 5px 5px;
 	margin: 0px;
 }
diff --git a/share/html/NoAuth/RichText/FCKeditor/editor/skins/default/fck_editor.css b/share/html/NoAuth/RichText/FCKeditor/editor/skins/default/fck_editor.css
index 436131e..8be49cb 100644
--- a/share/html/NoAuth/RichText/FCKeditor/editor/skins/default/fck_editor.css
+++ b/share/html/NoAuth/RichText/FCKeditor/editor/skins/default/fck_editor.css
@@ -27,9 +27,9 @@
 
 body
 {
-	padding: 1px;
+	padding: 0;
 	margin: 0;
-	background-color: #ffffff;
+	background-color: transparent;
 }
 
 #xEditingArea
@@ -332,6 +332,7 @@ body
     border: 1px solid #8f8f73;
     padding-left: 2px;
     padding-right: 2px;
+    background-color: white;
 }
 
 .SC_Panel, .SC_Panel TD
diff --git a/share/html/NoAuth/css/base/ticket-form.css b/share/html/NoAuth/css/base/ticket-form.css
index 1d615ce..763279c 100644
--- a/share/html/NoAuth/css/base/ticket-form.css
+++ b/share/html/NoAuth/css/base/ticket-form.css
@@ -72,6 +72,16 @@
     list-style: none;
 }
 
+.messagebox-container iframe {
+    background-color: white !important;
+}
+
+.messagebox-container.action-response textarea,
+.messagebox-container.action-response iframe
+{
+    background-color: #fcc !important;
+} 
+
 /*
 % if ( RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'}) ) {
 */
diff --git a/share/html/NoAuth/js/util.js b/share/html/NoAuth/js/util.js
index 1967102..db89ff4 100644
--- a/share/html/NoAuth/js/util.js
+++ b/share/html/NoAuth/js/util.js
@@ -212,7 +212,6 @@ function doOnLoad( js ) {
     jQuery(js);
 }
 
-
 jQuery(function() {
 		jQuery(".ui-datepicker:not(.withtime)").datepicker( {
             dateFormat: 'yy-mm-dd',
@@ -257,8 +256,7 @@ jQuery(function() {
 
         for (var i=0; i < allTextAreas.length; i++) {
             var textArea = allTextAreas[i];
-            if ( (textArea.getAttribute('class') == 'messagebox')
-              || (textArea.getAttribute('className') == 'messagebox')) {
+            if (jQuery(textArea).hasClass("messagebox")) {
                 // Turn the original plain text content into HTML
                 // if (encoded == 0) textArea.value = textArea.value .replace( /&/g, "&amp;") .replace( /</g, "&lt;") .replace( />/g, "&gt;") .replace( /\n/g, "\n<br />");
                 var FCKeditorEncoded = document.createElement('input');
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 035f047..42fb6f4 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -73,7 +73,7 @@
 <input type="hidden" class="hidden" name="id" value="<%$TicketObj->Id%>" /><br />
 % }
 <tr><td class="label"><&|/l&>Update Type</&>:</td>
-<td><select name="UpdateType">
+<td><select name="UpdateType" id="UpdateType">
 % if ($CanComment) {
 <option value="private" <% ($ARGS{'UpdateType'} &&  $ARGS{'UpdateType'} eq "private") ? qq[ selected="selected"] : !$ARGS{'UpdateType'}&&$CommentDefault |n %>><&|/l&>Comments (Not sent to requestors)</&></option>
 % }
@@ -81,6 +81,17 @@
 <option value="response" <% ($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq "response") ? qq[ selected="selected"] : !$ARGS{'UpdateType'}&&$ResponseDefault |n %>><&|/l&>Reply to requestors</&></option>
 % }
 </select> 
+
+<script type="text/javascript">
+    jQuery(function() {
+        jQuery("#UpdateType").change(function(ev) {
+            jQuery(".messagebox-container")
+                .removeClass("action-response action-private")
+                .addClass("action-"+ev.target.value);
+        });
+    });
+</script>
+
 % $m->callback( %ARGS, CallbackName => 'AfterUpdateType' );
 </td></tr>
 
@@ -146,7 +157,8 @@
 % $m->callback( %ARGS, CallbackName => 'AfterSubject' );
 </td></tr>
 
-<tr><td class="label" valign="top"><&|/l&>Message</&>:</td><td>
+<tr><td class="label" valign="top"><&|/l&>Message</&>:</td>
+<td class="messagebox-container action-<% $type %>">
 % $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
 % if (exists $ARGS{UpdateContent}) {
 % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
@@ -214,6 +226,10 @@ if ($Action ne 'Respond') {
     $ResponseDefault = qq[ selected="selected"];
 }
 
+my $type =             $ARGS{'UpdateType'} ? $ARGS{'UpdateType'} :
+           lc $ARGS{'Action'} eq 'respond' ? 'response'          :
+           lc $ARGS{'Action'} eq 'comment' ? 'private'           :
+                                             'none'              ;
 
 
 $CanRespond = 1 if ( $TicketObj->CurrentUserHasRight('ReplyToTicket') or

commit 6286f7693764c41f777e3e2cc03a5742d3595097
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Sep 30 12:00:24 2010 -0400

    This is not a time nor place for Comic Sans

diff --git a/share/html/NoAuth/RichText/FCKeditor/fckconfig.js b/share/html/NoAuth/RichText/FCKeditor/fckconfig.js
index 3678d8b..215347b 100644
--- a/share/html/NoAuth/RichText/FCKeditor/fckconfig.js
+++ b/share/html/NoAuth/RichText/FCKeditor/fckconfig.js
@@ -156,7 +156,7 @@ FCKConfig.EnableMoreFontColors = true ;
 FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
 
 FCKConfig.FontFormats	= 'p;h1;h2;h3;h4;h5;h6;pre;address;div' ;
-FCKConfig.FontNames		= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
+FCKConfig.FontNames		= 'Arial;Courier New;Tahoma;Times New Roman;Verdana' ;
 FCKConfig.FontSizes		= 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
 
 FCKConfig.StylesXmlPath		= FCKConfig.EditorPath + 'fckstyles.xml' ;

commit 26de28cb38f30b64d4d450e7d84c70d87970ace6
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Sep 30 12:05:54 2010 -0400

    Move the submit button above the PreviewScrips box on ticket update

diff --git a/share/html/NoAuth/css/base/ticket-form.css b/share/html/NoAuth/css/base/ticket-form.css
index 763279c..a6ec03e 100644
--- a/share/html/NoAuth/css/base/ticket-form.css
+++ b/share/html/NoAuth/css/base/ticket-form.css
@@ -54,7 +54,9 @@
     font-weight: normal;
 }
 
-#ticket-create-message .messagedetails, #previewscrips {
+#ticket-create-message .messagedetails,
+#ticket-update-message .messagedetails
+{
     margin-bottom: 0.5em;
 }
 
diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 42fb6f4..dd76dd7 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -177,13 +177,13 @@
   </table>
 </&>
 
+  <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>
+
 % if ($TicketObj->CurrentUserHasRight('ShowOutgoingEmail')) {
   <&|/Widgets/TitleBox, title => loc('Scrips and Recipients'), id => 'previewscrips' &>
     <& /Ticket/Elements/PreviewScrips, TicketObj => $TicketObj, %ARGS &>
   </&>
 % }
-
-  <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>
 </div>
 
 </form>

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


More information about the Rt-commit mailing list