Settings wasn't working

tanghus · Feb 25, 2014 · ba81c95 · ba81c95
1 parent 092c8fa
commit ba81c95
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,6 +6,6 @@
 	<author>Thomas Tanghus</author>
 	<require>4.93</require>
 	<shipped>false</shipped>
-	<version>0.3.3</version>
+	<version>0.3.3.1</version>
 	<description>Journal view from calendar</description>
 </info>
diff --git a/css/journal.css b/css/journal.css
@@ -50,7 +50,12 @@ input { font-size: 1em; font-weight: bold; }
 #actions { float: right; padding-right: 1em; }
 #actions a { display: inline-block; width: 16px; height: 16px; opacity: 0.5; padding: 0 0.3em; }
 #actions a:hover { opacity: 1; }
-.cog { float: right; }
+.cog {
+	float: right;
+	height: 16px;
+	padding: 10px;
+	width: 16px;
+}
 .drop { margin-right: 0.5em !important; }
 #settings_status { padding: 0.2em; font-weight: bold; float: left; border-radius: 3px; }
 #firstrun {

diff --git a/js/journal.js b/js/journal.js
@@ -561,7 +561,11 @@ OC.Journal = {
 						$('#entry,#metadata').show();
 						$('#firstrun').hide();
 					} else {
-						$('#description').rte('destroy');
+						try {
+							$('#description').rte('destroy');
+						} catch(e) {
+							console.warn(e);
+						}
 						$('#entry,#metadata').hide();
 						$('#firstrun').show();
 					}

diff --git a/settings.php b/settings.php
@@ -15,7 +15,7 @@
 $cid = OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'default_calendar', null);
 $single_calendar = OCP\Config::getUserValue(OCP\User::getUser(), 'journal', 'single_calendar', false);
 OCP\Util::addScript('journal', 'settings');
-$tmpl = new OC_TALTemplate('journal', 'settings');
+$tmpl = new OCA\TAL\Template('journal', 'settings');
 $tmpl->assign('calendars', $calendars);
 $tmpl->assign('single_calendar', $single_calendar);
 $tmpl->assign('cid', $cid);