Fixes and MarkDown!

- Fix #22
- Fix #16

Changelog

@@ -1,6 +1,11 @@
 # Changelog
 
-### 0.3.3 (current master)
+### 0.4 (current master)
+ - Switching from text to html format removed all text (sorry about that...)
+ - Problem adding more than one entry possibly caused by updated jquery library.
+ - When switching from text to html the text is now parsed as MarkDown and vice-versa.
+
+### 0.3.3
  - Update to work both on ownCloud 5 and 6.
  - Fix wrong link to app installer when there were missing dependencies.
 

appinfo/info.xml

@@ -6,6 +6,6 @@
 	<author>Thomas Tanghus</author>
 	<require>4.93</require>
 	<shipped>false</shipped>
-	<version>0.3.3.1</version>
+	<version>0.4</version>
 	<description>Journal view from calendar</description>
 </info>

css/rte.css

@@ -4,4 +4,8 @@
 .rte-content { cursor:text;position:absolute; border-color:#000;border-style:solid; white-space: pre-wrap; word-wrap: break-word; padding: 0.2em; }
 .rte-content ul { list-style: circle inside; }
 .rte-content li { padding-left: 1em; }
-
+.rte-content h1 { font-size: 200%; }
+.rte-content h2 { font-size: 170%; }
+.rte-content h3 { font-size: 140%; }
+.rte-content h4 { font-size: 120%; }
+.rte-content h5 { font-size: 100%; }

index.php

@@ -19,9 +19,17 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+OCP\User::checkLoggedIn();
+
 $errors = array();
+$categories = array();
+$calendars = array();
+
 $l = new OC_L10N('journal');
-OCP\User::checkLoggedIn();
+
+// Version check
+list($version,) = \OCP\Util::getVersion();
 
 $required_apps = array(
     array('id' => 'tal', 'name' => 'TAL Page Templates'),
@@ -36,7 +44,7 @@
 }
 //http://localhost/owncloud5/settings/apps?appid=tal
 //http://localhost/owncloud5/index.php/settings/apps?installed
-if(count($errors) == 0) {
+if(count($errors) === 0) {
 	$categories = OCA\Journal\App::getCategories();
 	$calendars = array();
 	$singlecalendar = (bool)OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'single_calendar', false);
@@ -49,18 +57,19 @@
 	// Load a specific entry?
 	$id = isset($_GET['id']) ? $_GET['id'] : null;
 
-	// Version check
-	list($version,) = \OCP\Util::getVersion();
-
 	OCP\Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker');
 	OCP\Util::addScript('contacts','jquery.multi-autocomplete');
 	if($version < 6) {
 		OCP\Util::addScript('','oc-vcategories');
 	} else {
 		OCP\Util::addScript('','tags');
 	}
+	OCP\Util::addScript('journal', 'Markdown.Converter');
+	OCP\Util::addScript('journal', 'Markdown.Sanitizer');
+	OCP\Util::addScript('journal', 'markdown_dom_parser');
+	OCP\Util::addScript('journal', 'html2markdown');
 	OCP\Util::addScript('journal', 'jquery.rte');
-	OCP\Util::addScript('journal', 'jquery.textchange');
+	//OCP\Util::addScript('journal', 'jquery.textchange');
 	OCP\Util::addScript('journal', 'journal');
 	OCP\Util::addscript('tal','modernizr');
 	OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');