Changeset 828 for trunk

Timestamp:

Mar 20, 2015, 10:22:50 PM (10 years ago)

Author:

chronos

Message:

• Added: Single news items can be now shown as separate page. So they can cached by search engines also with date information. Also they can be accessed directly from News RSS channel.

Location:

trunk

Files:

• Modules/News/News.php (modified) (5 diffs)
• includes/Version.php (modified) (1 diff)
• style/style.css (modified) (3 diffs)

trunk/Modules/News/News.php

@@ -28 +28 @@
   function ShowBox()
   {
-    $Output = '<strong>'.T('System changes').':</strong><div class="NewsBox">';
-    $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`'.
+    $Output = '<strong><a href="'.$this->System->Link('/news/').'">'.T('News').':</a></strong><div class="NewsBox">';
+    $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`, `News`.`Id` '.
       ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
     while($DbRow = $DbResult->fetch_assoc())
-      $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
-    $Output .= '<a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
+    {
+      $Output .= '<h4><a href="'.$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']).'">'.$DbRow['Title'].'</a> ('.HumanDate($DbRow['Time']).')</h4>'.
+        ' <div>'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
+    }
     $Output .= '</div>';
     return($Output);
@@ -70 +72 @@
       else $Action = '';
     if($Action == 'add2') $Output = $this->SaveNew();
-    if($Action == 'add') $Output = $this->ShowAddForm();
+    else if($Action == 'add') $Output = $this->ShowAddForm();
+    else if($Action == 'item') $Output = $this->ShowItem();
     else $Output = $this->ShowList();
     return($Output);
@@ -85 +88 @@
       $Output .= ' <a href="?a=add">'.T('Add').'</a>';
     $Output .= '<div class="shoutbox">';
-    $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
+    $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
         '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
     while($Line = $DbResult->fetch_assoc())
-      $Output .= '<div><strong>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</strong><br/> '.$Line['Text'].' ('.$Line['User'].')</div>';
+    {
+      $Output .= '<h4><a href="?a=item&amp;i='.$Line['Id'].'">'.$Line['Title'].'</a> ('.HumanDate($Line['Time']).')</h4><div>'.$Line['Text'].' ('.$Line['User'].')</div>';
+    }
     $Output .= '</div>'.$PageList['Output'];
+    return($Output);
+  }
+
+  function ShowItem()
+  {
+    if(array_key_exists('i', $_GET))
+    {
+      $Output = '<h3>'.T('News').'</h3>';
+      $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
+        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id` = '.($_GET['i'] * 1));
+      if($DbResult->num_rows == 1)
+      {
+        $Line = $DbResult->fetch_assoc();
+        $Output .= '<h4>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</h4><div>'.$Line['Text'].' ('.$Line['User'].')</div>';
+      } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    $Output .= '<br/><a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
     return($Output);
   }
@@ -129 +151 @@
     $Items = array();
     $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, '.
-      '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text` '.
+      '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text`, `News`.`Id` '.
       'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
     while($DbRow = $DbResult->fetch_assoc())
@@ -136 +158 @@
      (
        'Title' => $DbRow['Title'],
-       'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
+       'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/?a=item&amp;i='.$DbRow['Id']),
        'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
        'Time' => $DbRow['UnixTime'],

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 827; // Subversion revision
+$Revision = 828; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2015-03-08';
+$ReleaseTime = '2015-03-20';

trunk/style/style.css

@@ -272 +272 @@
   border-bottom-width: 1px;
   border-bottom-color: #e0e0e0;
-  padding: 5px;
+  padding: 0px;
+}
+
+.shoutbox h4
+{
+  text-align: left;
+  margin: 5px 0px 0px 0px;
 }
 
@@ -355 +361 @@
 }
 
+.NewsBox h4
+{
+  text-align: left;
+  margin: 5px 0px 0px 0px;
+}
+
 .Home
 {
@@ -557 +569 @@
   width: 25%;
 }
+
+.Form
+{
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.Form tr .Left 
+{
+  text-align: right;
+  font-weight: normal;
+}