Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

3 files changed, 26 insertions, 10 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index 75e8a0f52..21bc6de77 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -403,6 +403,15 @@ function bb_definitionList_unescapeBraces($match) {
 	return '<dt>' . str_replace('\]', ']', $match[1]) . '</dt>';
 }
 
+
+function bb_checklist($match) {
+	$str = $match[1];
+	$str = str_replace("[]", "<li><input type=\"checkbox\" disabled=\"disabled\">", $str);
+	$str = str_replace("[x]", "<li><input type=\"checkbox\" checked=\"checked\" disabled=\"disabled\">", $str);
+	return '<ul class="checklist" style="list-style-type: none;">' . $str . '</ul>';
+}
+
+
 /**
  * @brief Sanitize style properties from BBCode to HTML.
  *
@@ -787,14 +796,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 	$Text = preg_replace("/<br \/>\[\*\]/ism",'[*]',$Text);
 
 	$Text = str_replace("[*]", "<li>", $Text);
-	$Text = str_replace("[]", "<li><input type=\"checkbox\" disabled=\"disabled\">", $Text);
-	$Text = str_replace("[x]", "<li><input type=\"checkbox\" checked=\"checked\" disabled=\"disabled\">", $Text);
 
  	// handle nested lists
 	$endlessloop = 0;
 
 	while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) ||
-			((strpos($Text, "[/checklist]") !== false) && (strpos($Text, "[checklist]") !== false)) ||
 			((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) ||
 			((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) ||
 			((strpos($Text, "[/dl]") !== false) && (strpos($Text, "[dl")  !== false)) ||
@@ -806,7 +812,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '<ul class="listupperroman" style="list-style-type: upper-roman;">$2</ul>', $Text);
 		$Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$2</ul>', $Text);
 		$Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$2</ul>', $Text);
-		$Text = preg_replace("/\[checklist\](.*?)\[\/checklist\]/ism", '<ul class="checklist" style="list-style-type: none;">$1</ul>', $Text);
 		$Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text);
 		$Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text);
 		$Text = preg_replace("/\[\/li\]<br \/>\[li\]/ism",'[/li][li]',$Text);
@@ -818,7 +823,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		//   "[dl" <optional-whitespace> <optional-termStyles> "]" <matchGroup2> "[/dl]"
 		// where optional-termStyles are: "terms=" <optional-quote> <matchGroup1> <optional-quote>
 		$Text = preg_replace_callback('/\[dl[[:space:]]*(?:terms=(?:&quot;|")?([a-zA-Z]+)(?:&quot;|")?)?\](.*?)\[\/dl\]/ism', 'bb_definitionList', $Text);
+
+	}
+
+	if (strpos($Text,'[checklist]') !== false) {
+		$Text = preg_replace_callback("/\[checklist\](.*?)\[\/checklist\]/ism", 'bb_checklist', $Text);
 	}
+
 	if (strpos($Text,'[th]') !== false) {
 		$Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>', $Text);
 	}
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 26a0a72e8..54d501396 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -37,10 +37,8 @@
 				
 		{{/if}}
 				
-      <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();
-          adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
-      <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);
-          adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
+      <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+      <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
     </div>
     <h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
     <div class="clear"></div>
@@ -221,6 +219,8 @@
 
 		var editor = ace.edit("ace-editor");
 		editor.setTheme("ace/theme/github");
+		editor.setShowPrintMargin(false);
+		editor.getSession().setUseWrapMode('free');
 		editor.getSession().setMode("ace/mode/markdown");
 		editor.getSession().setValue(window.wiki_page_content);
 			window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
@@ -405,10 +405,11 @@
 				resource_id: window.wiki_resource_id
 			}, 
 			function (data) {
+				console.log(data);
 				if (data.success) {
 				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
 				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
-				$('.modal-dialog').width('80%');
+				$('.modal-dialog').addClass('modal-lg');
 				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
 				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
 					wiki_revert_page(compareCommit);
@@ -545,4 +546,4 @@
 						$('#new-wiki-button').hide();
 				{{/if}}
 		});
-</script>
\ No newline at end of file
+</script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
index fef5d93a5..9a313f767 100644
--- a/view/tpl/wiki_page_history.tpl
+++ b/view/tpl/wiki_page_history.tpl
@@ -1,4 +1,8 @@
 <style>
+  .diff {
+    width:100%;
+  }
+
   .diff td{
     padding:0 0.667em;
     vertical-align:top;