Changeset 881

Timestamp:

12/28/07 19:21:38 (4 years ago)

Author:

bogdanpasoi@…

Message:

Diff & calendar macro fixes.

Location:

trunk/www

Files:

• macros/macro_calendar.php (modified) (1 diff)
• static/css/screen.css (modified) (4 diffs)
• views/textblock_diff.php (modified) (2 diffs)

trunk/www/macros/macro_calendar.php

@@ -59 +59 @@
             $html .= '<div class="event">';
             $html .= '&raquo';
-                        $html .=  $event['link'] . (!$event['is_last'] ? ', ' : '');
+                        $html .=  $event['link'];
             $html .= '</div>';
                 }

trunk/www/static/css/screen.css

@@ -147 +147 @@
     width: 191px;
     float: left;
+    border-right: 1px solid #d0d0d0;
 }
 
@@ -692 +693 @@
     display: block;
 }
-
+    
 .diff .added {
     background-color: #DDFFDD;
@@ -699 +700 @@
 }
 
-.diff span {
+.diff .normal {
+    display: block;
+}
+.diff pre {
     margin: .2em .2em;
+    white-space: pre-wrap;       /* css-3 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
@@ -711 +720 @@
     background-color: #99EE99;
     text-decoration: none;
+    
 }
 

trunk/www/views/textblock_diff.php

@@ -16 +16 @@
         echo '<div class="diff">';
         foreach ($block as $op) {
-            echo '<span class="'.$op['type'].'">';
+            echo '<pre class="'.$op['type'].'">';
             foreach ($op['lines'] as $line) {
                 $output = "";
@@ -34 +34 @@
                 }
 
-                // make sure we display whitespace correctly
-                $output = str_replace('  ', '&nbsp;&nbsp;', $output);
-                echo $output.'<br/>';
+                $output = str_replace("\n", '', $output);
+                $output = str_replace("\r", '', $output);
+                echo $output."\n";
             }
-            echo '</span>';
+            echo '</pre>';
         }
         echo '</div>';