hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enabled prettyprinting in various wiki formatting pages

Browse Source
This commit is contained in:
hyung-hwan
2015-02-02 06:58:01 +00:00
parent 812bdf6547
commit cf220eb01a
12 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codepot/Makefile.in
View File

@ -595,10 +595,12 @@ install-data-hook:
$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo" $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo"
$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/files" $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/files"
$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/attachments" $(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/attachments"
$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/usericons"
$(INSTALL) -d "$(DESTDIR)@LOGDIR@" $(INSTALL) -d "$(DESTDIR)@LOGDIR@"
$(INSTALL) -d "$(DESTDIR)@CACHEDIR@" $(INSTALL) -d "$(DESTDIR)@CACHEDIR@"
uninstall-hook: uninstall-hook:
$(RMDIR) "$(DESTDIR)@DEPOTDIR@/usericons"
$(RMDIR) "$(DESTDIR)@DEPOTDIR@/attachments" $(RMDIR) "$(DESTDIR)@DEPOTDIR@/attachments"
$(RMDIR) "$(DESTDIR)@DEPOTDIR@/files" $(RMDIR) "$(DESTDIR)@DEPOTDIR@/files"
$(RMDIR) "$(DESTDIR)@DEPOTDIR@/svnrepo" $(RMDIR) "$(DESTDIR)@DEPOTDIR@/svnrepo"

11
codepot/src/codepot/views/file_edit.php
View File

@ -8,12 +8,17 @@
<script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script> <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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript"> <script type="text/javascript">
function render_wiki(input_text) function render_wiki(input_text)
@ -24,6 +29,8 @@ function render_wiki(input_text)
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/" "<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
); );
prettyPrint ();
} }
$(function () { $(function () {

9
codepot/src/codepot/views/file_show.php
View File

@ -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/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"> <script type="text/javascript">
function render_wiki() function render_wiki()
{ {
@ -17,6 +24,8 @@ function render_wiki()
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/" "<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
); );
prettyPrint ();
} }
</script> </script>

8
codepot/src/codepot/views/issue_edit.php
View File

@ -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/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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@ -22,6 +29,7 @@ function render_wiki(input_text)
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/" "<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
); );
prettyPrint ();
} }
$(function () { $(function () {

9
codepot/src/codepot/views/issue_show.php
View File

@ -7,6 +7,13 @@
<script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script> <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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@ -474,6 +481,8 @@ function render_wiki()
} }
} }
?> ?>
prettyPrint ();
} }
</script> </script>

9
codepot/src/codepot/views/project_edit.php
View File

@ -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/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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@ -21,6 +28,8 @@ function render_wiki(input_text)
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/" "<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
); );
prettyPrint ();
} }
$(function() { $(function() {

11
codepot/src/codepot/views/site_edit.php
View File

@ -9,12 +9,17 @@
<script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script> <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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript"> <script type="text/javascript">
function render_wiki(input_text) function render_wiki(input_text)
@ -25,6 +30,8 @@ function render_wiki(input_text)
"<?=site_url()?>/site/wiki/", "<?=site_url()?>/site/wiki/",
"<?=site_url()?>/site/image/" "<?=site_url()?>/site/image/"
); );
prettyPrint ();
} }
$(function () { $(function () {

9
codepot/src/codepot/views/site_show.php
View File

@ -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/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"> <script type="text/javascript">
function render_wiki() function render_wiki()
{ {
@ -17,6 +24,8 @@ function render_wiki()
"<?=site_url()?>/site/wiki/", "<?=site_url()?>/site/wiki/",
"<?=site_url()?>/site/image/" "<?=site_url()?>/site/image/"
); );
prettyPrint ();
} }
</script> </script>

2
codepot/src/codepot/views/taskbar.php
View File

@ -16,7 +16,7 @@ function show_taskbar ($con, $login)
// check a file system may be faster than checking the database. // check a file system may be faster than checking the database.
$icon_src = ''; $icon_src = '';
$icon_path = CODEPOT_USERICON_DIR . '/' . $login['id'] . '.png'; $icon_path = CODEPOT_USERICON_DIR . '/' . $login['id'] . '.png';
$icon_image = file_get_contents($icon_path); $icon_image = @file_get_contents($icon_path);
if ($icon_image) if ($icon_image)
{ {
$icon_src = sprintf ( $icon_src = sprintf (

9
codepot/src/codepot/views/wiki_edit.php
View File

@ -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/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" src="<?=base_url_make('/js/jquery.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@ -26,6 +33,8 @@ function render_wiki(input_text)
"<?=site_url()?>/wiki/show/<?=$project->id?>/", "<?=site_url()?>/wiki/show/<?=$project->id?>/",
"<?=site_url()?>/wiki/attachment/<?=$project->id?>/<?=$hexname?>/" "<?=site_url()?>/wiki/attachment/<?=$project->id?>/<?=$hexname?>/"
); );
prettyPrint ();
} }
var new_attachment_no = 0; var new_attachment_no = 0;

4
codepot/src/css/code.css
View File

@ -334,14 +334,14 @@
#code_diff_mainarea_result_fulldiffold { #code_diff_mainarea_result_fulldiffold {
border: none; border: none;
//padding-left: 10px; //padding-left: 10px;
//background: #F8FAF8; //background: #F8F8FA;
padding-left: 1px; padding-left: 1px;
} }
#code_diff_mainarea_result_fulldiffnew { #code_diff_mainarea_result_fulldiffnew {
border: none; border: none;
//padding-left: 10px; //padding-left: 10px;
background: #F8F8FA; background: #FEF8F8;
padding-left: 1px; padding-left: 1px;
} }

23
codepot/src/css/common.css
View File

@ -116,9 +116,6 @@ body {
padding-right: 5px; padding-right: 5px;
text-transform: uppercase; text-transform: uppercase;
} }
}
.content .projectbar { .content .projectbar {
/*margin: 0.1em 0em 0em 0em;*/ /*margin: 0.1em 0em 0em 0em;*/
padding: 0.5em 0.5em 0.5em 0.5em; padding: 0.5em 0.5em 0.5em 0.5em;
@ -266,14 +263,19 @@ body {
.content .mainarea pre { .content .mainarea pre {
/*padding: .3em .3em .3em .3em;*/ /*padding: .3em .3em .3em .3em;*/
border: 1px dashed #BBCCDD; /*border: 1px dashed #BBCCDD;*/
background-color: #F1F1FF; /*background-color: #F1F1FF;*/
border: none;
background-color: #F8F8FA;
overflow: auto; overflow: auto;
width: inherit; width: inherit;
} }
.content .mainarea pre.wiki { .content .mainarea pre.wiki {
white-space: pre-wrap; white-space: pre-wrap;
padding: 1em;
line-height: 1.5em;
font-size: 1.1em;
} }
.content .mainarea tt { .content .mainarea tt {
@ -364,11 +366,12 @@ body {
.content .mainarea pre.prettyprint { .content .mainarea pre.prettyprint {
/* anything that make prettyprint area different from other pres? */ /* anything that make prettyprint area different from other pres? */
/*background-color: #FFFFFF;*/ /*background-color: #FFFFFF;*/
background: white; /*border: 1px solid #ccc;*/
font-size: 12px; background-color: #F8F8FA;
line-height: 1.5; border: none;
border: 1px solid #ccc; font-size: 1.1em;
padding: 10px; line-height: 1.5em;
padding: 1em;
tab-size: 5; tab-size: 5;
-moz-tab-size: 5; -moz-tab-size: 5;