Changeset 252 for trunk/aktuality

Timestamp:

Oct 2, 2009, 7:53:41 AM (15 years ago)

Author:

george

Message:

• Upraveno: Upraven styl aktualit.

Location:

trunk/aktuality

Files:

• index.php (modified) (4 diffs)
• news.php (modified) (3 diffs)

trunk/aktuality/index.php

@@ -38 +38 @@
             if($Row['Name'] == '') $Author = $Row['Author'];
               else $Author = $Row['Name'];
-            $Output .= '<div style="border: thin dotted #97ADFF;  background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong>'.$Row['Title'].' ('.HumanDate($Row['Date']).', '.$Author.')</strong>';
+            $Output .= '<div class="Panel"><div class="Title">'.$Row['Title'].' ('.HumanDate($Row['Date']).', '.$Author.')';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
             { 
+              $Output .= '<div class="Action">';
               $Output .= '&nbsp;<a href="index.php?action=del&amp;category='.$Category.'&amp;id='.$Row['Id'].'">Smazat</a>';
               $Output .= '&nbsp;<a href="index.php?action=edit&amp;category='.$Category.'&amp;id='.$Row['Id'].'">Editovat</a>';
-            }
-            $Output .= '</div>'.$News->ModifyContent($Row['Content']).'<br />';
+              $Output .= '</div>';
+            }
+            $Output .= '</div><div class="Content">'.$News->ModifyContent($Row['Content']).'<br />';
             if($Row['Enclosure'] != '')
             { 
@@ -54 +56 @@
               }
             }
-            $Output .= '</div>';
+            $Output .= '</div></div>';
           } else $Output .= 'Položka nenalezena.';
         }
@@ -181 +183 @@
             if($Row['Name'] == '') $Author = $Row['Author'];
               else $Author = $Row['Name'];
-            $Output .= '<div style="border: thin dotted #97ADFF; background: #F6F7FF; margin-top: 5px; padding: 0px 5px 5px 5px;"><div style="padding-bottom: 1px; border-bottom-width: 1; border-bottom-style: solid; border-bottom-color: silver;"><strong><a href="?action=view&amp;id='.$Row['Id'].'">'.$Row['Title'].'</a> ('.HumanDate($Row['Date']).', '.$Author.')</strong>';
+            $Output .= '<div class="Panel"><div class="Title"><a href="?action=view&amp;id='.$Row['Id'].'">'.$Row['Title'].'</a> ('.HumanDate($Row['Date']).', '.$Author.')';
             if($this->System->Modules['User']->User['Id'] == $Row['User'])
             {
+              $Output .= '<div class="Action">';
               $Output .= '&nbsp;<a href="index.php?action=del&amp;category='.$Category.'&amp;id='.$Row['Id'].'">Smazat</a>';
               $Output .= '&nbsp;<a href="index.php?action=edit&amp;category='.$Category.'&amp;id='.$Row['Id'].'">Editovat</a>';
-            }
-            $Output .= '</div>'.$News->ModifyContent($Row['Content']).'<br />';
+              $Output .= '</div>';
+            }
+            $Output .= '</div><div class="Content">'.$News->ModifyContent($Row['Content']).'<br />';
             if($Row['Enclosure'] != '')
             {
@@ -197 +201 @@
               }
             }
-            $Output .= '</div>';
+            $Output .= '</div></div>';
           }
           $Output .= PagesList('?category='.$Category.'&amp;page=', $Page, $PageMax, $PerPage);

trunk/aktuality/news.php

@@ -49 +49 @@
     $DbResult = $Database->select('NewsCategory', '*', 'Id='.$Category);
     $Row = $DbResult->fetch_array();
-    $Output = '<table class="NewsBaseTable"><tr>';
-    $Output .= '<td>'.$Row['Caption'].'</td><td align="right">';
-    $Output .= '<a href="aktuality/index.php?category='.$Category.'">Zobrazit všechny aktuality</a>&nbsp;';
+    $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];      
+    $Output .= '<div class="Action"><a href="aktuality/index.php?category='.$Category.'">Zobrazit</a>';
     if($this->System->Modules['User']->CheckPermission('News', 'Insert', 'Group', $Category))
-      $Output .= '<a href="aktuality/index.php?action=add&amp;category='.$Category.'">Přidat aktualitu</a>&nbsp;';
-    $Output .= '</td></tr><tr><td colspan="2">';
+      $Output .= ' <a href="aktuality/index.php?action=add&amp;category='.$Category.'">Přidat</a>';
+    $Output .= '</div></div><div class="Content">';
     $DbResult = $Database->query('SELECT `News`.*, `User`.`Name` FROM `News` LEFT JOIN `User` ON `User`.`Id`=`News`.`User` WHERE (`News`.`Category`='.$Category.') AND (DATE_SUB(NOW(), INTERVAL '.$DaysAgo.' DAY) < `News`.`Date`) ORDER BY `News`.`Date` DESC LIMIT 0,'.$ItemCount);
     //echo($Database->error.'<br />');
@@ -86 +85 @@
       $Output .= '</table>';
     }
-    $Output .= '</td></tr></table>';
+    $Output .= '</div></div>';
     return($Output);
   }
@@ -157 +156 @@
       $I++;
     }
-    $Output .= '</table><input type="hidden" name="NewsCategoryCount" value="'.count($this->NewsSetting).'" /><input type="submit" value="Uložit" /></form></td></tr></table>';
+    $Output .= '</table><input type="hidden" name="NewsCategoryCount" value="'.count($this->NewsSetting).'" /><input type="submit" value="Uložit" /></form></td></tr></table><br>';
     return($Output);
   }