[Rt-commit] rt branch, 3.8-trunk, updated. b2631f27d0a9f8a31bcd8c5d0691c4452809a83d

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  b2631f27d0a9f8a31bcd8c5d0691c4452809a83d (commit)
       via  dc278e475b682c7bde0e87cfa8e12affe57dc337 (commit)
      from  8883ebecb19f06c660623e6a035f949e4eaacde8 (commit)

Summary of changes:
 share/html/Elements/ShowCustomFields               |    2 +-
 .../html/NoAuth/css/3.5-default/ticket-search.css  |   10 ++--
 share/html/NoAuth/css/web2/msie.css                |    6 +-
 share/html/NoAuth/css/web2/ticket-search.css       |   51 +++++++++-----------
 4 files changed, 32 insertions(+), 37 deletions(-)

- Log -----------------------------------------------------------------
commit dc278e475b682c7bde0e87cfa8e12affe57dc337
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Sep 1 12:34:45 2009 +0400

    don't tie Query Builder's css to the comp
    
    Query builder should be embedable and RTIR actually
    embeds it, but with old css we have to copy styles
    multiple times in RTIR

diff --git a/share/html/NoAuth/css/3.5-default/ticket-search.css b/share/html/NoAuth/css/3.5-default/ticket-search.css
index 0a2fab8..f483cab 100644
--- a/share/html/NoAuth/css/3.5-default/ticket-search.css
+++ b/share/html/NoAuth/css/3.5-default/ticket-search.css
@@ -49,18 +49,18 @@
   position: relative;
 }
 
-#comp-Search-Build #editquery, #comp-Search-Build #editsearches{
+#editquery, #editsearches{
   position: absolute;
   right: 1em;
   width: 40%;
 }
 
-#comp-Search-Build #editsearches {
+#editsearches {
   top: 24em;
 }
 
 
-#comp-Search-Build #pick-criteria {
+#pick-criteria {
   width: 58%;
 }
 
@@ -72,12 +72,12 @@
 }
 
 
-#comp-Search-Build #sorting.titlebox {
+#sorting.titlebox {
   width: 58%;
   margin-top: 4em;
 }
 
-#comp-Search-Build #formatbuttons {
+#formatbuttons .submit {
   width: 100%;
 }
 
diff --git a/share/html/NoAuth/css/web2/msie.css b/share/html/NoAuth/css/web2/msie.css
index bce6dbb..184ac1d 100644
--- a/share/html/NoAuth/css/web2/msie.css
+++ b/share/html/NoAuth/css/web2/msie.css
@@ -126,7 +126,7 @@ div#quickbar { height: 1.2em;
 }
 
 
-#comp-Search-Build #editquery {
+#editquery {
   margin-top: 0.2em;
   width: 39%;
   left: 60%;
@@ -230,10 +230,10 @@ table.queue-summary td, td.collection-as-table {
     margin-left: -0.2em;
 }
 
-#comp-Search-Build #pick-criteria td.label {
+#pick-criteria td.label {
      width: auto;
 }
 
-#comp-Search-Build #pick-criteria td.operator {
+#pick-criteria td.operator {
   width: 7.5em;
 }
diff --git a/share/html/NoAuth/css/web2/ticket-search.css b/share/html/NoAuth/css/web2/ticket-search.css
index 20bdf34..7a31d3e 100644
--- a/share/html/NoAuth/css/web2/ticket-search.css
+++ b/share/html/NoAuth/css/web2/ticket-search.css
@@ -49,65 +49,65 @@
     position: relative;
 }
 
-#comp-Search-Build #pick-criteria select {
- width: 8em;
+#pick-criteria select {
+    width: 8em;
 }
 
-#comp-Search-Build #pick-criteria tr {
- height: 1.5em;
+#pick-criteria tr {
+    height: 1.5em;
 }
 
-#comp-Search-Build #pick-criteria td.label {
+#pick-criteria td.label {
     font: message-box;    
     padding-right: 0.5em;
     width: 11em;
 }
 
-#comp-Search-Build #pick-criteria td.label * {
+#pick-criteria td.label * {
  width: 8.5em;
 }
 
-#comp-Search-Build #pick-criteria td.label select {
+#pick-criteria td.label select {
   text-align: right;
 }
 
-#comp-Search-Build #pick-criteria td.operator {
+#pick-criteria td.operator {
  padding-right: 0.5em;
  text-align: left;
  vertical-align: bottom;
  width: 7em;
 }
 
-#comp-Search-Build #pick-criteria td.operator select {
+#pick-criteria td.operator select {
  text-align: right;
 }
 
-#comp-Search-Build #pick-criteria td.value input,
-#comp-Search-Build #pick-criteria td.value select {
+#pick-criteria td.value input,
+#pick-criteria td.value select {
  width: 10em;
 }
 
-#comp-Search-Build #pick-criteria td.value #ValueOfDate {
+#pick-criteria td.value #ValueOfDate {
  width: 6em;
 }
 
 
-#comp-Search-Build #pick-criteria td.value #ValueOfTime {
+#pick-criteria td.value #ValueOfTime {
  width: 4em;
 
 }
 
-#comp-Search-Build #pick-criteria td.value #ValueOfTime-TimeUnits{
+#pick-criteria td.value #ValueOfTime-TimeUnits{
  width: 5.5em;
 }
 
-#comp-Search-Build #pick-criteria td.value {
+#pick-criteria td.value {
  padding-right: 0.5em;
  text-align: left;
  font: message-box;
 }
 
-#comp-Search-Build #editquery, #comp-Search-Build #editsearches{
+#editquery, #editsearches{
   position: absolute;
   margin-top: 0.2em;
   right: 1em;
@@ -116,45 +116,40 @@
 /*  margin-top: -1em; */
 }
 
-#comp-Search-Build #editquery {
+#editquery {
    top: 1.3em;
-}    
+}
 
 
-#comp-Search-Build #editsearches {
+#editsearches {
   top: 24em;
 }
 
 
-#comp-Search-Build #pick-criteria {
+#pick-criteria {
  width: 58%;
  padding-top: 0em;
  margin-top: 0em;
 }
 
-#comp-Search-Build #pick-criteria .titlebox-content {
+#pick-criteria .titlebox-content {
  overflow-x: auto;
 }
 
-
 #comp-Search-Build .submit {
  width: 58%;
-
 }
 
 
-#comp-Search-Build #sorting.titlebox {
+#sorting.titlebox {
  width: 55%;
  padding-right: 1em;
 }
 
 #comp-Search-Build #columns {
-
-
- 
 }
 
-#comp-Search-Build #formatbuttons {
+#display-options .submit {
  width: 100%;
 }
 

commit b2631f27d0a9f8a31bcd8c5d0691c4452809a83d
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Sep 1 15:40:22 2009 +0400

    we must escape content of a CF

diff --git a/share/html/Elements/ShowCustomFields b/share/html/Elements/ShowCustomFields
index d9b23ed..7053594 100644
--- a/share/html/Elements/ShowCustomFields
+++ b/share/html/Elements/ShowCustomFields
@@ -92,7 +92,7 @@ my $print_value = sub {
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );
     } else {
-        $m->print( $value->Content );
+        $m->out( $m->interp->apply_escapes( $value->Content, 'h' ) );
     }
     $m->out('</a>') if $linked;
 

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