Changeset 839 for trunk

Timestamp:

Sep 18, 2016, 6:41:49 PM (8 years ago)

Author:

chronos

Message:

• Modified: Use TinyMCE editor for news content.

Location:

trunk

Files:

• Application/System.php (modified) (1 diff)
• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (5 diffs)

trunk/Application/System.php

@@ -28 +28 @@
   var $CommandLine;
   var $PageHeaders;
+  var $BaseView;
 
   function __construct()

trunk/Application/UpdateTrace.php

@@ -2031 +2031 @@
   $Manager->Execute('UPDATE `Service` SET `InternetSpeedMin`=`InternetSpeedMin`*1000;');
   $Manager->Execute('UPDATE `Service` SET `InternetSpeedMax`=`InternetSpeedMax`*1000;');
+}
+
+function UpdateTo838($Manager)
+{
+  $Manager->Execute('ALTER TABLE `News` CHANGE `Date` `Date` DATETIME NULL, CHANGE `TargetDate` `TargetDate` DATETIME NULL;');
 }
 
@@ -2126 +2131 @@
       818 => array('Revision' => 824, 'Function' => 'UpdateTo824'),
       824 => array('Revision' => 831, 'Function' => 'UpdateTo831'),
+      831 => array('Revision' => 838, 'Function' => 'UpdateTo838'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 834; // Subversion revision
-$DatabaseRevision = 831; // SQL structure revision
-$ReleaseTime = strtotime('2016-07-03');
+$Revision = 838; // Subversion revision
+$DatabaseRevision = 838; // SQL structure revision
+$ReleaseTime = strtotime('2016-09-18');

trunk/Modules/News/NewsPage.php

@@ -66 +66 @@
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category['Id']))
     {
+      $this->System->PageHeaders[] = array($this, 'GetPageHeader');
       $Output = '<strong>Vložení nové aktuality:</strong><br />';
       // TODO: Static reference to dynamic category item
@@ -121 +122 @@
         $Enclosures = substr($Enclosures, 1);
 
-        $_POST['content'] = str_replace("\n",'<br />',$_POST['content']);
         $this->Database->insert('News', array('Category' => $Category['Id'], 'Title' => $_POST['title'],
           'Content' => $_POST['content'], 'Date' => 'NOW()', 'IP' => $RemoteAddr,
@@ -133 +133 @@
   }
 
+  function GetPageHeader()
+  {
+    return('<script src="'.$this->System->Link('/Packages/TinyMCE/tinymce.min.js').'"></script>'.
+        "<script>tinymce.init({
+  selector: 'textarea',
+  force_p_newlines : false,
+  force_br_newlines : true,
+  convert_newlines_to_brs : false,
+  remove_linebreaks : true,
+  plugins: [
+    'advlist autolink lists link image charmap print preview anchor',
+    'searchreplace visualblocks code fullscreen',
+    'insertdatetime media table contextmenu paste code'
+  ],
+  toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
+  language: 'cs_CZ',
+});</script>");
+  }
+
   function ShowEdit()
   {
@@ -143 +162 @@
       if(($this->System->User->User['Id'] == $Row['User']))
       {
-        $Row['Content'] = str_replace('<br />', '', $Row['Content']);
+        $this->System->PageHeaders[] = array($this, 'GetPageHeader');
         $Output .= '<strong>Editace aktuality v kategorii '.$Category['Caption'].':</strong><br />';
         $Output .= '<form action="?action=update" method="post">'.
         '<input type="hidden" value="'.$_GET['id'].'" name="id">'.
         'Nadpis:<br /><input type="text" size="54" name="title" value="'.$Row['Title'].'"><br />'.
-        'Obsah:<br /><textarea name="content" rows="20" cols="40">'.$Row['Content'].'</textarea><br />'.
+        'Obsah:<br /><textarea name="content" rows="20" cols="40" style="width: 50%">'.$Row['Content'].'</textarea><br />'.
         'Odkaz:<br /><input type="text" size="54" name="link" value="'.$Row['Link'].'"><br />'.
         '<input type="hidden" name="category" value="'.$Category['Id'].'"><br />'.
@@ -172 +191 @@
         if($this->System->User->User['Id'] == $Row['User'])
         {
-          $_POST['content'] = str_replace("\n", '<br />', $_POST['content']);
           $this->Database->update('News', 'Id='.$_POST['id'], array('Title' => $_POST['title'],
             'Content' => $_POST['content'], 'Link' => $_POST['link']));