From 82102eab8b2a93e425026364f4d82de70a926e98 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Mon, 2 Feb 2015 02:36:34 +0000
Subject: [PATCH] added a codeBlock tag to creole and changed wiki-show and
 project-home pages to use prettify to render the codeBlock regiion

---
 codepot/src/codepot/views/project_home.php | 13 +++++++++++++
 codepot/src/codepot/views/wiki_show.php    | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php
index c8c1788a..3d0e507b 100644
--- a/codepot/src/codepot/views/project_home.php
+++ b/codepot/src/codepot/views/project_home.php
@@ -12,6 +12,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript">
 function render_wiki() 
 {
@@ -21,6 +28,8 @@ function render_wiki()
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
 	);
+
+	prettyPrint ();
 }
 </script>
 
@@ -125,6 +134,10 @@ foreach ($urls as $url)
 }
 ?>
 </ul>
+<pre>
+<?php //print_r ($urls); ?>
+<?php //print_r ($_SERVER); ?>
+</pre>
 </div>
 
 <div class="box">
diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php
index 4daa57dd..125cedc8 100644
--- a/codepot/src/codepot/views/wiki_show.php
+++ b/codepot/src/codepot/views/wiki_show.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <title><?=htmlspecialchars($wiki->name)?></title>
 </head>
 
@@ -18,13 +25,14 @@ $hexname = $this->converter->AsciiToHex ($wiki->name);
 <script type="text/javascript">
 function render_wiki()
 {
-
 	creole_render_wiki (
 		"wiki_show_mainarea_wiki_text", 
 		"wiki_show_mainarea_wiki", 
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment/<?=$project->id?>/<?=$hexname?>/"
 	);
+
+	prettyPrint ();
 }
 </script>