Changeset 1090 for trunk

Timestamp:

12/22/09 19:58:35 (2 years ago)

Author:

bogdan2412

Message:

Small CSS fixes from live and a change to the round textblock delete regex.

Location:

trunk/www

Files:

• controllers/round.php (modified) (2 diffs)
• format/format.php (modified) (2 diffs)
• static/css/screen.css (modified) (14 diffs)

trunk/www/controllers/round.php

@@ -293 +293 @@
     $options = pager_init_options();
 
-    $textblock_list = textblock_grep('%"'.$round_id.'"%', '%', false, $options['first_entry'],
-                                     $options['display_entries']);
+    // This regexp tries to search for the round id inside of a macro
+    // and makes sure that it is preceded and succeded by a character
+    // which is not valid for a round identifier to avoid problems
+    // with ids that are included in each other
+    $regexp = "==[^\n]*[^a-z0-9_.-]".preg_quote($round_id)."[^a-z0-9_.-][^\n]*==";
+    $textblock_list = textblock_grep(
+        $regexp, '%', true,
+        $options['first_entry'], $options['display_entries']
+    );
+    $entries = textblock_grep_count($regexp, '%', true);
 
     for ($i = 0; $i < count ($textblock_list); ++$i) {
@@ -313 +321 @@
     $view['form_values'] = $values;
     $view['form_errors'] = $errors;
-    $entries = textblock_grep_count('%"'.$round_id.'"%', '%', false);
     $view['total_entries'] = $entries['cnt'];
     $view['first_entry'] = $options['first_entry'];

trunk/www/format/format.php

@@ -164 +164 @@
 
     $result = "";
-    $result .= "<div class=\"tiny-user\">";
+    $result .= "<span class=\"tiny-user\">";
     $result .= format_link($user_url,
                            format_user_avatar($user_name, 16, 16, false).$user_fullname,
@@ -172 +172 @@
                .format_link($user_url, $user_name)
                ."</span> ";
-    $result .= "</div>";
+    $result .= "</span>";
 
     return $result;

trunk/www/static/css/screen.css

@@ -69 +69 @@
     background-color: #B7D285;
     -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
@@ -403 +404 @@
     clear: right;
     padding-left: 0.5em;
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -moz-border-radius-topleft:8px;
-    -moz-border-radius-topright:8px;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
 }
 
@@ -476 +475 @@
     background: #f6f6f6 url(../images/documents_16.gif) no-repeat 5px center ;
     font-size:11px;
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -moz-border-radius-topleft:8px;
-    -moz-border-radius-topright:8px;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
     color:#555;
     line-height: 1.5em;
@@ -789 +786 @@
     margin: .5em;
     line-height: 2em;
-    width: 95%; /* IE FIX */
+    width: 99%; /* IE FIX */
 }
 
@@ -878 +875 @@
     padding: .5em;
     background-color: #f0f0f0;
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -moz-border-radius-topleft:8px;
-    -moz-border-radius-topright:8px;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
 }
 
@@ -900 +895 @@
 .vmenu li a {
     display: block;
-    width: 95%;
+    width: 98%;
     padding-left: .4em;
 }
@@ -1074 +1069 @@
     margin: 0;
     -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
 }
 
@@ -1157 +1153 @@
 
 /* User badges */
-div.tiny-user {
+.tiny-user {
     height: 24px;
-    display:inline;
-}
-
-div.tiny-user a {
+}
+
+.tiny-user a {
     text-decoration: none;
 }
 
-div.tiny-user .username {
+.tiny-user .username {
     font-weight:bold;
 }
 
-div.tiny-user img {
+.tiny-user img {
     border:1px solid #D8D6CB;
     background:#fff;
@@ -1198 +1193 @@
 /* monitor */
 table.monitor {
-    width: 95%; /* Fix IE */
-    margin: .5em 0 2em 0;
+    width: 99%; /* Fix IE */
+    margin: .5em auto 2em auto;
 }
 
@@ -1294 +1289 @@
 
 table.registered-users {
-    width: 95%;
+    width: 99%;
 }
 
@@ -1350 +1345 @@
     line-height: 1.2em;
     -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
 }
 
@@ -1411 +1407 @@
     padding: .2em;
     -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
 }
 
@@ -1427 +1424 @@
     background-color: #f6f6f6;
     -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
 }
 
@@ -1438 +1436 @@
     padding: 0.3em;
     display: table;
-    width: 95%;
+    width: 99%;
     margin: 0em auto;
     text-align: center;
     line-height: 2em;
     -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
 }