Changeset 305 for trunk

Timestamp:

Jan 30, 2011, 12:13:45 PM (14 years ago)

Author:

george

Message:

• Upraveno: Aktuality zobrazovány nyní jako dva sloupce v jednom panelu.

Location:

trunk

Files:

• aktuality/news.php (modified) (5 diffs)
• index.php (modified) (2 diffs)
• network.php (modified) (1 diff)
• sql/updates/305.sql (added)

trunk/aktuality/news.php

@@ -97 +97 @@
     while($NewsCategory = $DbResult->fetch_array())
     {
-      $this->NewsSetting[] = array('CategoryId' => $NewsCategory['Id'], 'Index' => $I, 'Enabled' => 1, 'ItemCount' => $this->System->Config['Web']['News']['Count'], 'DaysAgo' => $this->System->Config['Web']['News']['DaysAgo']);
+      $this->NewsSetting[] = array('CategoryId' => $NewsCategory['Id'], 'Index' => $I, 'Enabled' => 1, 'ItemCount' => $this->System->Config['Web']['News']['Count'], 'DaysAgo' => $this->System->Config['Web']['News']['DaysAgo'], 'Group' => $NewsCategory['Group']);
       $I++;
     }
@@ -130 +130 @@
     $Output .= '<div onmouseout="skryj(predchozi)">';
 
-    foreach($this->NewsSetting as $SettingItem)
-      if($SettingItem['Enabled'] == 1) $Output .= $this->ShowNews($SettingItem['CategoryId'], $SettingItem['ItemCount'], $SettingItem['DaysAgo']);
+    $ColumnCount = 2;
+    $Output .= '<table style="width: 100%"><tr>';
+    for($Column = 1; $Column <= $ColumnCount; $Column++)
+    {
+      $Output .= '<td style="vertical-align: top; width: '.round(100 / $ColumnCount).'%;">';
+      foreach($this->NewsSetting as $SettingItem)
+        if(($SettingItem['Enabled'] == 1) and ($SettingItem['Group'] == $Column)) 
+          $Output .= $this->ShowNews($SettingItem['CategoryId'], $SettingItem['ItemCount'], $SettingItem['DaysAgo']);
+      $Output .= '</td>';
+    }
+    $Output .= '</tr></table>';
 
     $Output .= '<a href="aktuality/subscription.php"><img class="RSSIcon" src="images/rss20.png" alt="Aktuality přes RSS" /></a>  <a href="aktuality/subscription.php">Automatické sledování novinek</a>';
@@ -142 +151 @@
     $Output = '<form action="?Action=CustomizeNewsSave" method="post">';
     $Output .= '<table width="100%" cellspacing="0" border="1"><tr><td><table cellspacing="0" width="100%">';
-    $Output .= '<tr><th>Kategorie</th><th>Pozice</th><th>Zobrazit</th><th>Max. počet</th><th>Posledních dnů</th></tr>';
+    $Output .= '<tr><th>Kategorie</th><th>Pozice</th><th>Zobrazit</th><th>Max. počet</th><th>Posledních dnů</th><th>Sloupec</th></tr>';
     $I = 0;
     foreach($this->NewsSetting as $SettingItem)
@@ -153 +162 @@
       '<td align="center"><input type="text" size="2" name="NewsCategoryCount'.$I.'" value="'.$SettingItem['ItemCount'].'" />'.
       '<input type="hidden" name="NewsCategoryId'.$I.'" value="'.$SettingItem['CategoryId'].'" /></td>'.
-    '<td align="center"><input type="text" size="3" name="NewsCategoryDaysAgo'.$I.'" value="'.$SettingItem['DaysAgo'].'" /></td></tr>';
+      '<td align="center"><input type="text" size="3" name="NewsCategoryDaysAgo'.$I.'" value="'.$SettingItem['DaysAgo'].'" /></td>'.
+      '<td><input type="text" size="3" name="NewsColumn'.$I.'" value="'.$SettingItem['Group'].'"/></td></tr>';
       $I++;
     }
@@ -169 +179 @@
       if(($_POST['NewsCategoryDaysAgo'.$I] * 1) < 0) $_POST['NewsCategoryIndex'.$I] = 0;
       if(($_POST['NewsCategoryCount'.$I] * 1) < 0) $_POST['NewsCategoryCount'.$I] = 0;
+      if(($_POST['NewsColumn'.$I] * 1) < 1) $_POST['NewsColumn'.$I] = 1;
       if(!array_key_exists('NewsCategoryEnabled'.$I, $_POST)) $_POST['NewsCategoryEnabled'.$I] = '';
-      $Setting[] = array('CategoryId' => $_POST['NewsCategoryId'.$I], 'Enabled' => $Checkbox[$_POST['NewsCategoryEnabled'.$I]], 'ItemCount' => ($_POST['NewsCategoryCount'.$I]*1), 'DaysAgo' => ($_POST['NewsCategoryDaysAgo'.$I]*1), 'Index' => ($_POST['NewsCategoryIndex'.$I]*1));
+      $Setting[] = array('CategoryId' => $_POST['NewsCategoryId'.$I], 'Enabled' => $Checkbox[$_POST['NewsCategoryEnabled'.$I]], 'ItemCount' => ($_POST['NewsCategoryCount'.$I]*1), 'DaysAgo' => ($_POST['NewsCategoryDaysAgo'.$I]*1), 'Index' => ($_POST['NewsCategoryIndex'.$I]*1),
+      'Group' => $_POST['NewsColumn'.$I]);
     }
     // Sort indexes

trunk/index.php

@@ -6 +6 @@
 {
   var $Dependencies = array('News');
-  var $FullTitle = '<strong>ZděchovNET</strong> - komunitní počítačová síť';
-  var $ShortTitle = 'Rozcestník';
+  var $FullTitle = 'Zděchovský rozcestník';
+  var $ShortTitle = '';
   
   function ShowLinks($GroupId)
@@ -124 +124 @@
     return($Output);
   }
-
-  function GetServerUptime()
-  {
-    $Data = explode(' ', exec('uptime'));
-    $Data = array_slice($Data, 3, -8);
-    $Uptime = '';
-    foreach($Data as $Item)
-    {
-      if(strpos($Item, ':')) $Uptime .= substr($Item, 0, -1).' hodin';
-      else $Uptime .= $Item.' ';
-    }
-    $Uptime = str_replace('2 days,', '2 dny a', $Uptime);
-    $Uptime = str_replace('3 days,', '3 dny a', $Uptime);
-    $Uptime = str_replace('4 days,', '4 dny a', $Uptime);
-    $Uptime = str_replace('days,', 'dní a', $Uptime);
-    $Uptime = str_replace('day,', 'den a', $Uptime);
-    $Uptime = str_replace('min,', 'minut', $Uptime);
-    return($Uptime);
-  }
-  
+   
   function Panel($Title, $Content, $Menu = array())
   {

trunk/network.php

@@ -73 +73 @@
         $Output .= '<a href="network/dostupnost.php">Měření dostupnosti zařízení</a><br />';
         $Output .= '<a href="network/subnet.php">Výpis registrovaných podsítí</a><br />';
-        $Output .= '<a href="tkr.php">Kanály kabelové televize</a>';
+        //$Output .= '<a href="tkr.php">Kanály kabelové televize</a>';
     }
     return($Output);