Changeset 839 for trunk

Timestamp:

Jan 9, 2016, 11:53:58 PM (9 years ago)

Author:

chronos

Message:

• Modified: New news item can be added directly from news list. No need to have link from admin section.

Location:

trunk

Files:

• Modules/News/News.php (modified) (2 diffs)
• Modules/ShoutBox/ShoutBox.php (modified) (1 diff)
• admin/index.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/News/News.php

@@ -85 +85 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Output = '<h3>'.T('News').'</h3>'.$PageList['Output'];
+    $Output = '<h3>'.T('News').'</h3>';
     if($this->System->User->Licence(LICENCE_ADMIN))
       $Output .= ' <a href="?a=add">'.T('Add').'</a>';
+    $Output .= $PageList['Output'];
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
@@ -121 +122 @@
     {
       $Output = '<form action="?" method="POST">'.
+        '<fieldset><legend>'.T('New news').'</legend>'.
         T('User').': '.$this->System->User->Name.'('.$this->System->User->Id.')<br/> '.
         T('Title').': <input type="text" name="title" size="40"/><br/>'.
         T('Content').': <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
         '<input type="hidden" name="a" value="add2"/>'.
-        '<input type="submit" value="'.T('Save').'"/><br/>'.
+        '<input type="submit" value="'.T('Save').'"/><br/></fieldset>'.
         '</form>';
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    $Output .= $this->ShowList();
     return($Output);
   }

trunk/Modules/ShoutBox/ShoutBox.php

@@ -70 +70 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Output .= '<h3>'.T('Shoutbox').'</h3>'.$PageList['Output'];
+    $Output .= '<h3>'.T('Shoutbox').'</h3>';
     if($this->System->User->Licence(LICENCE_USER))
       $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
+    $Output .= $PageList['Output'];
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT * FROM `ShoutBox`  WHERE 1'.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);

trunk/admin/index.php

@@ -19 +19 @@
   '<a href="'.$System->Link('/log.php').'">Záznamy událostí</a><br/>'.
   '<small>Procházení všech systémových záznamů akcí a událostí</small><br/><br/>'.
-  '<a href="'.$System->Link('/news/?a=add').'">Přidání aktuality</a><br/>'.
-  '<small>Přidá aktualitu na hlavní stranu projektu</small><br/><br/>'.
   '<a href="'.$System->Link('/admin/?action=testing').'">Testování</a><br/>'.
   '<small>Testovací funkce</small><br/><br/>'.
@@ -126 +124 @@
 }
 
-function StripText($Text) {
+function StripText($Text)
+{
   $Text = strtolower($Text);
   $Text = str_replace(' ', '', $Text);
@@ -134 +133 @@
 function MergeSameText()
 {
-  global $System,$TranslationTree;
+  global $System, $TranslationTree;
+
   $Output = '';
   foreach($TranslationTree as $Group)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 838; // Subversion revision
+$Revision = 839; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
 $ReleaseTime = '2016-01-11';