Changeset 1105

Timestamp:

01/17/10 18:03:54 (2 years ago)

Author:

bogdan2412

Message:

Changes from live.

• A fix for the roundtimer macro to make it work with Firefox and IE.
• Prettier (more detailed) changes page and rss.

Location:

trunk/www

Files:

• controllers/changes.php (modified) (2 diffs)
• format/format.php (modified) (2 diffs)
• macros/macro_roundtimer.php (modified) (1 diff)
• views/changes.php (modified) (2 diffs)
• views/revision_warning.php (modified) (1 diff)

trunk/www/controllers/changes.php

@@ -32 +32 @@
         $view['channel']['link'] = url_absolute(url_changes());
         $view['channel']['description'] = 'Ultimele modificari din wiki-ul http://infoarena.ro';
-        $view['channel']['language'] = 'ro-ro'; 
+        $view['channel']['language'] = 'ro-ro';
         $view['channel']['copyright'] = '2007 - asociatia infoarena';
 
@@ -39 +39 @@
         foreach ($revisions as $rev) {
             $item = array();
-            $item['title'] = sprintf("%s modificat de %s",
-                    $rev['title'] , $rev['user_name']);
+            $created = ($rev["timestamp"] == $rev["creation_timestamp"]);
+            $item['title'] = sprintf("%s (%s) %s de %s",
+                $rev['title'], $rev['name'], $created ? "creat" : "modificat", $rev['user_name']);
 
             $userlink = format_user_tiny($rev['user_name'], $rev['user_fullname']);
-            $pagelink = format_link(url_textblock($rev['name'], true), $rev['title']);
+            $pagelink = format_link(url_textblock($rev['name'], true), "{$rev['title']} ({$rev['name']})");
             $diffurl = url_textblock_diff($rev['name'], $rev['revision_id'] - 1, $rev['revision_id']);
-            $difflink = format_link($diffurl, "modificari");
+            $difflink = (!$created) ? " (".format_link($diffurl, "modificari").")" : "";
             $tstamp = format_date($rev['timestamp']);
-            $item['description'] = "La data de $tstamp pagina $pagelink a fost modificata de $userlink($difflink).";
+            $created_or_changed = $created ? "creata" : "modificata";
+            $item['description'] = "La data de $tstamp pagina $pagelink a fost $created_or_changed de $userlink$difflink.";
 
             $item['guid'] = sha1($rev['name'] . $rev['timestamp']);

trunk/www/format/format.php

@@ -171 +171 @@
     $result .= "<span class=\"username\">"
                .format_link($user_url, $user_name)
-               ."</span> ";
+               ."</span>";
     $result .= "</span>";
 
@@ -194 +194 @@
     $result .= "<span class=\"username\">"
                .format_link($user_url, $user_name)
-               ."</span> ";
+               ."</span>";
     $result .= "</div>";
 

trunk/www/macros/macro_roundtimer.php

@@ -76 +76 @@
         '"' . html_escape($timer_id) . '"' .
         ',"' . html_escape(format_date($round['start_time'],
-                                        "%Y-%m-%d %H:%M:%S %z")) . '"' .
+                                        "%Y/%m/%d %H:%M:%S %z")) . '"' .
         ',' . html_escape($params['duration']) .
         ',' . html_escape($units) .

trunk/www/views/changes.php

@@ -16 +16 @@
 
 <?php
+$created = ($rev["timestamp"] == $rev["creation_timestamp"]);
 $userlink = format_user_tiny($rev['user_name'], $rev['user_fullname']);
-$pagelink = format_link(url_absolute(url_textblock($rev['name'])), $rev['title']);
-$diffurl_params = array(
-        'action' => 'diff',
-        'rev_to' => $rev['revision_id'],
-        'rev_from' => $rev['revision_id'] - 1,
-);
-$difflink = format_link(url_textblock_diff(
-            $rev['name'],
-            $rev['revision_id'] - 1,
-            $rev['revision_id']),
-            "diff");
+$pagelink = format_link(url_textblock($rev['name'], true), "{$rev['title']} ({$rev['name']})");
+$diffurl = url_textblock_diff($rev['name'], $rev['revision_id'] - 1, $rev['revision_id']);
+$difflink = (!$created) ? " (".format_link($diffurl, "modificari").")" : "";
 $tstamp = format_date($rev['timestamp']);
+$created_or_changed = $created ? "creat" : "modificat";
 if (identity_can('textblock-view-ip', $rev) && $rev['remote_ip_info']) {
     $remote_ip = '('.$rev['remote_ip_info'].') ';
@@ -34 +28 @@
     $remote_ip = '';
 }
-echo "$tstamp: $userlink {$remote_ip}a modificat $pagelink ($difflink).";
+echo "$tstamp: $userlink $remote_ip a $created_or_changed $pagelink$difflink.";
 ?>
     </li>

trunk/www/views/revision_warning.php

@@ -2 +2 @@
     <?php
     if ($view['revision'] < $view['revision_count']) {
-        echo "Atenţie! Această pagina nu este actuală (este varianta de la ".html_escape($textblock['timestamp']).")</br>\n";
+        echo "Atenţie! Aceasta este o versiune veche a paginii";
     } else {
-        echo "Atenţie! Aceasta este ultima versiune a paginii, scrisă la ".html_escape($textblock['timestamp']).")</br>\n";
+        echo "Atenţie! Aceasta este ultima versiune a paginii";
     }
+    echo ", scrisă la " . html_escape($textblock['timestamp']) . ".<br />";
     if ($view['revision'] > 1) {
         echo format_link(url_textblock_revision($view['page_name'], $view['revision'] - 1), "Revizia anterioară");