Move markitup to an include file and use for both board and thread

diff --git a/root/lib/inc/markitup.tt2 b/root/lib/inc/markitup.tt2
new file mode 100644 (file)
index 0000000..1713387
--- /dev/null
+++ b/root/lib/inc/markitup.tt2
@@ -0,0 +1,10 @@
+[%- site.stylesheets = ['markitup/skins/simple/style.css','markitup/sets/bbcode/style.css' ] %]
+<script type="text/javascript" src="/static/markitup/jquery.markitup.pack.js"></script>
+<script type="text/javascript" src="/static/markitup/sets/bbcode/set.js"></script>
+
+<script type="text/javascript">
+$(document).ready(function(){
+       mySettings.markupSet.pop();
+    $('.bbcode').markItUp(mySettings);
+});
+</script>

diff --git a/root/src/forum/board.tt2 b/root/src/forum/board.tt2
index f158e6548e3b6fd69275235d7be1fb00c27b2491..a0cdafe85de2e8a539707f21afff67931a31093e 100644 (file)
--- a/root/src/forum/board.tt2
+++ b/root/src/forum/board.tt2
@@ -48,9 +48,11 @@
 [% IF board.post %]
 <form action="[% c.uri_for('newThread',board.fbid) %]" method="post"><fieldset class="forum-post"> <legend>New Thread</legend>
        <p>Subject: <input type="text" name="subject" value=""></p>
-       <textarea rows="25" cols="60" name="message"></textarea>
+       <textarea rows="25" cols="60" name="message" class="bbcode"></textarea>
        <br>
        <input type="submit" name="cmd" value="Submit">
        <input type="submit" name="cmd" value="Preview">
 </fieldset></form>
+
+[% INCLUDE inc/markitup.tt2 %]
 [% END %]

diff --git a/root/src/forum/thread.tt2 b/root/src/forum/thread.tt2
index 4ea7eb74dcdff002bcc1ea4e408483242aa73ef8..5668f8a25e222c082be59dc4bf4841d76da4c251 100644 (file)
--- a/root/src/forum/thread.tt2
+++ b/root/src/forum/thread.tt2
@@ -79,10 +79,6 @@
 [% END %]
 
 [% IF thread.post %]
-[%- site.stylesheets = ['markitup/skins/simple/style.css','markitup/sets/bbcode/style.css' ] %]
-<script type="text/javascript" src="/static/markitup/jquery.markitup.pack.js"></script>
-<script type="text/javascript" src="/static/markitup/sets/bbcode/set.js"></script>
-
 <script type="text/javascript">
 $(document).ready(function(){
        $(".forum-post-header").append(
@@ -93,8 +89,7 @@ $(document).ready(function(){
                var oldtext = $("#replybox").val();
                $("#replybox").val(oldtext + "\n[quote=" + username + "]" + text + "[/quote]\n");
        });
-       mySettings.markupSet.pop();
-    $('.bbcode').markItUp(mySettings);
 });
 </script>
+[% INCLUDE inc/markitup.tt2 %]
 [% END %]