added prettyprint class to showdown.js.

changed many css class names
This commit is contained in:
hyung-hwan 2016-01-15 17:02:39 +00:00
parent 9c53e9f759
commit 6147924867
39 changed files with 704 additions and 689 deletions

View File

@ -255,7 +255,7 @@ cloc_command_path = "@CFGDIR@/cloc.pl"
; The first file found is shown. You can specify multiple file name ; The first file found is shown. You can specify multiple file name
; separated by a comma. ; separated by a comma.
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
code_folder_readme = "README.wiki,README.txt,README.wc,README.md,README" code_folder_readme = "README.md,README.wc,README.txt,README"
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Email address to use when sending notification emails ; Email address to use when sending notification emails

View File

@ -141,7 +141,7 @@ $this->load->view (
<div class="mainarea" id="code_blame_mainarea"> <div class="mainarea" id="code_blame_mainarea">
<div class="title-band" id="code_blame_title_band"> <div class="codepot-title-band" id="code_blame_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -256,7 +256,9 @@ $this->load->view (
</div> </div>
<div id='code_blame_metadata_body'> <div id='code_blame_metadata_body'>
<div><pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre></div> <div class='codepot-plain-text-view'>
<pre><?php print htmlspecialchars ($file['logmsg']); ?></pre>
</div>
<?php <?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && count($file['properties']) > 0)
@ -279,7 +281,7 @@ $this->load->view (
</div> </div>
</div> </div>
<div class="result" id="code_blame_result"> <div id="code_blame_result" class="codepot-relative-container-view codepot-styled-code-view" >
<?php <?php
$fileext = substr(strrchr($file['name'], '.'), 1); $fileext = substr(strrchr($file['name'], '.'), 1);
@ -294,14 +296,14 @@ $this->load->view (
$login['settings']->code_hide_line_num == 'Y') $prettyprint_linenums = ''; $login['settings']->code_hide_line_num == 'Y') $prettyprint_linenums = '';
?> ?>
<pre id="code_blame_result_code_container" class="line-numbered">
<?php <?php
// when producing line-numbered code, make sure to produce proper print '<pre id="code_blame_result_code_container" class="codepot-line-numbered">';
// when producing codepot-line-numbered code, make sure to produce proper
// line terminators. // line terminators.
// //
// the <code> </code> block requires \n after every line. // the <code> </code> block requires \n after every line.
// while the <span></span> block to contain revision numbers and authors // while the <span></span> block to contain revision numbers and authors
// doesn't require \n. It is because the css file sets the line-number span // doesn't require \n. It is because the css file sets the codepot-line-number span
// to display: block. // to display: block.
// //
// If you have new lines between <span></span> and <code></code>, there will // If you have new lines between <span></span> and <code></code>, there will
@ -311,7 +313,7 @@ $this->load->view (
$content = &$file['content']; $content = &$file['content'];
$len = count($content); $len = count($content);
print '<span class="line-number-block" id="code_blame_result_code_revision">'; print '<span class="codepot-line-number-block" id="code_blame_result_code_revision">';
$rev = ''; $rev = '';
for ($i = 0; $i < $len; $i++) for ($i = 0; $i < $len; $i++)
{ {
@ -336,7 +338,7 @@ $this->load->view (
} }
print '</span>'; print '</span>';
print '<span class="line-number-block" id="code_blame_result_code_author">'; print '<span class="codepot-line-number-block" id="code_blame_result_code_author">';
$rev = ''; $rev = '';
$author = ''; $author = '';
for ($i = 0; $i < $len; $i++) for ($i = 0; $i < $len; $i++)
@ -361,7 +363,7 @@ $this->load->view (
} }
print '</span>'; print '</span>';
printf ('<code class="line-numbered-code prettyprint %s %s" id="code_blame_result_code">', $prettyprint_linenums, $prettyprint_lang); printf ('<code class="codepot-line-numbered-code prettyprint %s %s" id="code_blame_result_code">', $prettyprint_linenums, $prettyprint_lang);
$charset = ''; $charset = '';
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && count($file['properties']) > 0)
@ -400,10 +402,10 @@ $this->load->view (
} }
print '</code>'; print '</code>';
print '</pre>';
?> ?>
</pre>
<div id="code_blame_mainarea_loc_info" class="infobox"> <div id="code_blame_mainarea_loc_info" class="codepot-infobox">
<div class="title">LOC</div> <div class="title">LOC</div>
<?php <?php
/* TODO: show this if it's enabled in the user settings */ /* TODO: show this if it's enabled in the user settings */
@ -416,7 +418,7 @@ $this->load->view (
</div> <!-- code_blame_mainarea --> </div> <!-- code_blame_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_blame_content --> </div> <!-- code_blame_content -->

View File

@ -183,7 +183,7 @@ $this->load->view (
<div class="mainarea" id="code_diff_mainarea"> <div class="mainarea" id="code_diff_mainarea">
<div class="title-band" id="code_diff_title_band"> <div class="codepot-title-band" id="code_diff_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -250,7 +250,9 @@ $this->load->view (
</div> </div>
<div id='code_diff_metadata_against_body'> <div id='code_diff_metadata_against_body'>
<pre class='pre-wrapped'><?php print htmlspecialchars ($file['against']['logmsg']); ?></pre> <div class='codepot-plain-text-view'>
<pre><?php print htmlspecialchars ($file['against']['logmsg']); ?></pre>
</div>
</div> </div>
</div> </div>
@ -286,7 +288,9 @@ $this->load->view (
</div> </div>
<div id='code_diff_metadata_body'> <div id='code_diff_metadata_body'>
<pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre> <div class='codepot-plain-text-view'>
<pre><?php print htmlspecialchars ($file['logmsg']); ?></pre>
</div>
</div> </div>
</div> </div>
@ -298,7 +302,7 @@ $this->load->view (
if ($fileext == "") $fileext = "html" if ($fileext == "") $fileext = "html"
?> ?>
<div id="code_diff_result" class="result"> <div id="code_diff_result" class="codepot-relative-container-view codepot-styled-code-view">
<?php <?php
function format_diff2 ($a, $b, $css_class) function format_diff2 ($a, $b, $css_class)
{ {
@ -360,7 +364,7 @@ $this->load->view (
stristr($http_user_agent, 'Opera') === FALSE); stristr($http_user_agent, 'Opera') === FALSE);
if (!$is_msie) $is_msie = (preg_match ("/^Mozilla.+\(Windows.+\) like Gecko$/", $http_user_agent) !== FALSE); if (!$is_msie) $is_msie = (preg_match ("/^Mozilla.+\(Windows.+\) like Gecko$/", $http_user_agent) !== FALSE);
print '<div style="width: 100%; overflow: hidden;" id="code_diff_full_code_view">'; print '<div id="code_diff_full_code_view">';
// //
// SHOW THE OLD FILE // SHOW THE OLD FILE
@ -390,9 +394,9 @@ $this->load->view (
print anchor ($nextanc, '<i class="fa fa-arrow-circle-right"></i>'); print anchor ($nextanc, '<i class="fa fa-arrow-circle-right"></i>');
print "</div>"; // navigator print "</div>"; // navigator
print '<pre id="code_diff_old_code" class="line-numbered">'; print '<pre id="code_diff_old_code" class="codepot-line-numbered">';
print '<span class="line-number-block">'; print '<span class="codepot-line-number-block">';
$actual_line_no = 1; $actual_line_no = 1;
foreach ($file['content'] as $x) foreach ($file['content'] as $x)
{ {
@ -417,13 +421,13 @@ $this->load->view (
} }
else else
{ {
if ($actual_line_no > 1) print "<span class='line-number-empty'>&nbsp;</span>"; if ($actual_line_no > 1) print "<span class='codepot-line-number-empty'>&nbsp;</span>";
$actual_line_no = $x['rev1lineno']; $actual_line_no = $x['rev1lineno'];
} }
} }
print '</span>'; print '</span>';
print '<code class="line-numbered-code prettyprint lang-{$fileext}" id="old-code">'; print '<code class="codepot-line-numbered-code prettyprint lang-{$fileext}">';
$actual_line_no = 1; $actual_line_no = 1;
foreach ($file['content'] as $x) foreach ($file['content'] as $x)
{ {
@ -456,12 +460,12 @@ $this->load->view (
//print "<span class='diffrow'> "; //print "<span class='diffrow'> ";
//print $x['rev1lineno']; //print $x['rev1lineno'];
//print " </span>\n"; //print " </span>\n";
if ($actual_line_no > 1) print "<span class='line-numbered-code-line-empty'>&nbsp;</span>\n"; // \n is required here unlike in the line-number-block if ($actual_line_no > 1) print "<span class='codepot-line-numbered-code-line-empty'>&nbsp;</span>\n"; // \n is required here unlike in the codepot-line-number-block
$actual_line_no = $x['rev1lineno']; $actual_line_no = $x['rev1lineno'];
} }
} }
print '</code>'; print '</code>';
print '<span class="line-number-clear"></span>'; print '<span class="codepot-line-number-clear"></span>';
print '</pre>'; print '</pre>';
print '</div>'; print '</div>';
@ -493,9 +497,9 @@ $this->load->view (
print anchor ($nextanc, '<i class="fa fa-arrow-circle-right"></i>'); print anchor ($nextanc, '<i class="fa fa-arrow-circle-right"></i>');
print "</div>"; // navigator print "</div>"; // navigator
print '<pre id="code_diff_new_code" class="line-numbered">'; print '<pre id="code_diff_new_code" class="codepot-line-numbered">';
print '<span class="line-number-block">'; print '<span class="codepot-line-number-block">';
$actual_line_no = 1; $actual_line_no = 1;
foreach ($file['content'] as $x) foreach ($file['content'] as $x)
{ {
@ -516,13 +520,13 @@ $this->load->view (
} }
else else
{ {
if ($actual_line_no > 1) print "<span class='line-number-empty'>&nbsp;</span>"; if ($actual_line_no > 1) print "<span class='codepot-line-number-empty'>&nbsp;</span>";
$actual_line_no = $x['rev2lineno']; $actual_line_no = $x['rev2lineno'];
} }
} }
print '</span>'; print '</span>';
print '<code class="line-numbered-code prettyprint lang-{$fileext}" id="new-code" class="line-numbered-code">'; print '<code class="codepot-line-numbered-code prettyprint lang-{$fileext}" class="codepot-line-numbered-code">';
$actual_line_no = 1; $actual_line_no = 1;
foreach ($file['content'] as $x) foreach ($file['content'] as $x)
{ {
@ -560,14 +564,14 @@ $this->load->view (
//print "<span class='diffrow'> "; //print "<span class='diffrow'> ";
//print $x['rev2lineno']; //print $x['rev2lineno'];
//print " </span>\n"; //print " </span>\n";
if ($actual_line_no > 1) print "<span class='line-numbered-code-line-empty'>&nbsp;</span>\n"; // \n is required here unlike in the line number block if ($actual_line_no > 1) print "<span class='codepot-line-numbered-code-line-empty'>&nbsp;</span>\n"; // \n is required here unlike in the line number block
$actual_line_no = $x['rev2lineno']; $actual_line_no = $x['rev2lineno'];
} }
} }
print '</code>'; print '</code>';
print '<span class="line-number-clear"></span>'; print '<span class="codepot-line-number-clear"></span>';
print '</pre>'; print '</pre>';
print '</div>'; print '</div>';
@ -581,7 +585,7 @@ $this->load->view (
</div> <!-- code_diff_mainarea --> </div> <!-- code_diff_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_diff_content --> </div> <!-- code_diff_content -->

View File

@ -268,7 +268,7 @@ $this->load->view (
<div class="mainarea" id="code_edit_mainarea"> <div class="mainarea" id="code_edit_mainarea">
<div class="title-band" id="code_edit_title_band"> <div class="codepot-title-band" id="code_edit_title_band">
<div class="title"> <div class="title">
<?php <?php
print anchor ( print anchor (
@ -310,7 +310,7 @@ $this->load->view (
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
<div id="code_edit_result" class="result"> <div id="code_edit_result" class="codepot-relative-container-view">
<?php <?php
/* /*
@ -368,7 +368,7 @@ $this->load->view (
</div> <!-- code_edit_mainarea --> </div> <!-- code_edit_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_edit_content --> </div> <!-- code_edit_content -->

View File

@ -172,7 +172,7 @@ $this->load->view (
<div class="mainarea" id="code_file_mainarea"> <div class="mainarea" id="code_file_mainarea">
<div class="title-band" id="code_file_title_band"> <div class="codepot-title-band" id="code_file_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -281,7 +281,9 @@ $this->load->view (
</div> </div>
<div id='code_file_metadata_body'> <div id='code_file_metadata_body'>
<pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre> <div class='codepot-plain-text-view'>
<pre><?php print htmlspecialchars ($file['logmsg']); ?></pre>
</div>
<?php <?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && count($file['properties']) > 0)
@ -309,7 +311,7 @@ $this->load->view (
</pre> </pre>
</div> </div>
<div class="result" id="code_file_result"> <div id="code_file_result" class="codepot-relative-container-view codepot-styled-code-view" >
<?php <?php
$fileext = substr(strrchr($file['name'], '.'), 1); $fileext = substr(strrchr($file['name'], '.'), 1);
@ -386,7 +388,7 @@ if ($login['settings'] != NULL &&
?> ?>
</pre> </pre>
<div id="code_file_mainarea_loc_info" class="infobox"> <div id="code_file_mainarea_loc_info" class="codepot-infobox">
<div class="title">LOC</div> <div class="title">LOC</div>
<?php <?php
/* TODO: show this if it's enabled in the user settings */ /* TODO: show this if it's enabled in the user settings */
@ -399,7 +401,7 @@ if ($login['settings'] != NULL &&
</div> <!-- code_file_mainarea --> </div> <!-- code_file_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_file_content --> </div> <!-- code_file_content -->

View File

@ -202,10 +202,10 @@ function showdown_render_wiki (inputid, outputid)
{ {
var sd = new showdown.Converter ({ var sd = new showdown.Converter ({
omitExtraWLInCodeBlocks: false, omitExtraWLInCodeBlocks: false,
noHeaderId: false, noHeaderId: true,
prefixHeaderId: false, prefixHeaderId: false,
parseImgDimensions: true, parseImgDimensions: true,
headerLevelStarT: 1, headerLevelStart: 1,
simplifiedAutoLink: false, simplifiedAutoLink: false,
literalMidWordUnderscores: false, literalMidWordUnderscores: false,
strikethrough: true, strikethrough: true,
@ -248,6 +248,7 @@ function render_readme()
elseif (strlen($readme_text) > 0 && substr_compare($readme_file, '.md', -3) === 0): elseif (strlen($readme_text) > 0 && substr_compare($readme_file, '.md', -3) === 0):
?> ?>
showdown_render_wiki ("code_folder_readme_text", "code_folder_readme"); showdown_render_wiki ("code_folder_readme_text", "code_folder_readme");
prettyPrint();
<?php endif; ?> <?php endif; ?>
} }
@ -488,7 +489,7 @@ $(function () {
} }
); );
$('#code_folder_mainarea_rename_form_div').dialog ( $('#code_folder_mainarea_rename_form').dialog (
{ {
title: '<?php print $this->lang->line('rename');?>', title: '<?php print $this->lang->line('rename');?>',
resizable: true, resizable: true,
@ -525,7 +526,7 @@ $(function () {
} }
form_data.append ('code_rename_file_count', xi); form_data.append ('code_rename_file_count', xi);
$('#code_folder_mainarea_rename_form_div').dialog('disable'); $('#code_folder_mainarea_rename_form').dialog('disable');
$.ajax({ $.ajax({
url: codepot_merge_path('<?php print site_url() ?>', '<?php print "/code/xhr_rename/{$project->id}/{$hex_headpath}"; ?>'), url: codepot_merge_path('<?php print site_url() ?>', '<?php print "/code/xhr_rename/{$project->id}/{$hex_headpath}"; ?>'),
type: 'POST', type: 'POST',
@ -537,8 +538,8 @@ $(function () {
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
rename_in_progress = false; rename_in_progress = false;
$('#code_folder_mainarea_rename_form_div').dialog('enable'); $('#code_folder_mainarea_rename_form').dialog('enable');
$('#code_folder_mainarea_rename_form_div').dialog('close'); $('#code_folder_mainarea_rename_form').dialog('close');
if (data == 'ok') if (data == 'ok')
{ {
// refresh the page to the head revision // refresh the page to the head revision
@ -552,8 +553,8 @@ $(function () {
error: function (jqXHR, textStatus, errorThrown) { error: function (jqXHR, textStatus, errorThrown) {
rename_in_progress = false; rename_in_progress = false;
$('#code_folder_mainarea_rename_form_div').dialog('enable'); $('#code_folder_mainarea_rename_form').dialog('enable');
$('#code_folder_mainarea_rename_form_div').dialog('close'); $('#code_folder_mainarea_rename_form').dialog('close');
var errmsg = ''; var errmsg = '';
if (errmsg == '' && errorThrown != null) errmsg = errorThrown; if (errmsg == '' && errorThrown != null) errmsg = errorThrown;
@ -571,7 +572,7 @@ $(function () {
}, },
'<?php print $this->lang->line('Cancel')?>': function () { '<?php print $this->lang->line('Cancel')?>': function () {
if (rename_in_progress) return; if (rename_in_progress) return;
$('#code_folder_mainarea_rename_form_div').dialog('close'); $('#code_folder_mainarea_rename_form').dialog('close');
} }
}, },
@ -637,10 +638,10 @@ $(function () {
} }
} }
$('#code_folder_mainarea_rename_form_div').dialog ('option', 'title', $('#code_folder_mainarea_rename_form').dialog ('option', 'title',
codepot_sprintf ("<?php print addslashes($this->lang->line('CODE_FMT_RENAME_X_SELECTED_FILES')) ?>", xi) codepot_sprintf ("<?php print addslashes($this->lang->line('CODE_FMT_RENAME_X_SELECTED_FILES')) ?>", xi)
); );
$('#code_folder_mainarea_rename_form_div').dialog('open'); $('#code_folder_mainarea_rename_form').dialog('open');
return false; // prevent the default behavior return false; // prevent the default behavior
}); });
@ -794,7 +795,7 @@ $this->load->view (
<div class="mainarea" id="code_folder_mainarea"> <div class="mainarea" id="code_folder_mainarea">
<div class="title-band" id="code_folder_title_band"> <div class="codepot-title-band" id="code_folder_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -907,7 +908,9 @@ $this->load->view (
</div> </div>
<div id='code_folder_metadata_body'> <div id='code_folder_metadata_body'>
<div><pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre></div> <div class='codepot-plain-text-view'>
<pre><?php print htmlspecialchars ($file['logmsg']); ?></pre>
</div>
<?php <?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0) if (array_key_exists('properties', $file) && count($file['properties']) > 0)
@ -1023,7 +1026,7 @@ $this->load->view (
?> ?>
</div> </div>
<div id="code_folder_result" class="result" > <div id="code_folder_result" class="codepot-relative-container-view" >
<?php <?php
function comp_files ($a, $b) function comp_files ($a, $b)
{ {
@ -1043,11 +1046,11 @@ $this->load->view (
{ {
usort ($file['content'], 'comp_files'); usort ($file['content'], 'comp_files');
print '<table id="code_folder_result_table" class="fit-width-result-table">'; print '<table id="code_folder_result_table" class="codepot-fit-width-table codepot-spacious-table">';
print '<tr class="heading">'; print '<tr class="heading">';
if (isset($login['id']) && $login['id'] != '') if (isset($login['id']) && $login['id'] != '')
{ {
print '<th align="middle"><input type="checkbox" id="code_folder_result_table_select_all", "select_all" /><label for="code_folder_result_table_select_all"><i class="fa fa-check"></i></label></th>'; print '<th align="middle"><input type="checkbox" id="code_folder_result_table_select_all" /><label for="code_folder_result_table_select_all"><i class="fa fa-check"></i></label></th>';
} }
print '<th>' . $this->lang->line('Name') . '</th>'; print '<th>' . $this->lang->line('Name') . '</th>';
print '<th>' . $this->lang->line('Revision') . '</th>'; print '<th>' . $this->lang->line('Revision') . '</th>';
@ -1091,9 +1094,9 @@ $this->load->view (
print '<td>'; print '<td>';
print htmlspecialchars($f['last_author']); print htmlspecialchars($f['last_author']);
print '</td>'; print '</td>';
print '<td><code>'; print '<td><tt>';
print strftime('%Y-%m-%d', $f['time_t']); print strftime('%Y-%m-%d', $f['time_t']);
print '</code></td>'; print '</tt></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; print '<td></td>';
@ -1127,9 +1130,9 @@ $this->load->view (
print '<td>'; print '<td>';
print htmlspecialchars($f['last_author']); print htmlspecialchars($f['last_author']);
print '</td>'; print '</td>';
print '<td><code>'; print '<td><tt>';
print strftime('%Y-%m-%d', $f['time_t']); print strftime('%Y-%m-%d', $f['time_t']);
print '</code></td>'; print '</tt></td>';
print '<td>'; print '<td>';
print anchor ("code/blame/{$project->id}/{$hexpath}{$revreq}", $blame_anchor_text); print anchor ("code/blame/{$project->id}/{$hexpath}{$revreq}", $blame_anchor_text);
@ -1151,11 +1154,8 @@ $this->load->view (
<?php <?php
if (strlen($readme_text) > 0) if (strlen($readme_text) > 0)
{ {
print '<div id="code_folder_readme">'; print '<div id="code_folder_readme" class="codepot-styled-text-view">';
// the pre division is gone when rendered as a wiki text. print '<pre id="code_folder_readme_text">';
// so is the pre-wrapped class. so let me put the class
// regardless of the text type.
print '<pre id="code_folder_readme_text" class="pre-wrapped">';
print htmlspecialchars($readme_text); print htmlspecialchars($readme_text);
print '</pre>'; print '</pre>';
print '</div>'; print '</div>';
@ -1192,7 +1192,7 @@ if (strlen($readme_text) > 0)
<div><textarea type='textarea' id='code_folder_mainarea_delete_message' name='code_folder_delete_message' style='width:100%;' ></textarea></div> <div><textarea type='textarea' id='code_folder_mainarea_delete_message' name='code_folder_delete_message' style='width:100%;' ></textarea></div>
</div> </div>
<div id="code_folder_mainarea_rename_form_div"> <div id="code_folder_mainarea_rename_form">
<div><?php print $this->lang->line('Message'); ?>:</div> <div><?php print $this->lang->line('Message'); ?>:</div>
<div><textarea type='textarea' id='code_folder_mainarea_rename_message' name='code_folder_rename_message' style='width:100%;' ></textarea></div> <div><textarea type='textarea' id='code_folder_mainarea_rename_message' name='code_folder_rename_message' style='width:100%;' ></textarea></div>
<div id="code_folder_mainarea_rename_file_div"> <div id="code_folder_mainarea_rename_file_div">
@ -1206,7 +1206,7 @@ if (strlen($readme_text) > 0)
</div> <!-- code_folder_mainarea --> </div> <!-- code_folder_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_folder_content --> </div> <!-- code_folder_content -->

View File

@ -51,7 +51,7 @@ $this->load->view (
<div class="mainarea" id="code_history_mainarea"> <div class="mainarea" id="code_history_mainarea">
<div class="title-band" id="code_history_title_band"> <div class="codepot-title-band" id="code_history_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -105,9 +105,9 @@ $this->load->view (
</div> <!-- code_history_graph --> </div> <!-- code_history_graph -->
<div id="code_history_result" class="result"> <div id="code_history_result" class="codepot-relative-container-view">
<table id="code_history_result_table" class="full-width-result-table"> <table id="code_history_result_table" class="codepot-full-width-table codepot-spacious-table">
<tr class='full-width-result-table-header'> <tr class='codepot-full-width-table-header'>
<th><?php print $this->lang->line('Revision')?></th> <th><?php print $this->lang->line('Revision')?></th>
<th><?php print $this->lang->line('Committer')?></th> <th><?php print $this->lang->line('Committer')?></th>
<th><?php print $this->lang->line('Date')?></th> <th><?php print $this->lang->line('Date')?></th>
@ -147,13 +147,13 @@ $this->load->view (
if (array_key_exists('author', $h)) print htmlspecialchars($h['author']); if (array_key_exists('author', $h)) print htmlspecialchars($h['author']);
print '</td>'; print '</td>';
print '<td class="commit-date-td"><code>'; print '<td class="commit-date-td"><tt>';
print strftime('%Y-%m-%d', strtotime($h['date'])); print strftime('%Y-%m-%d', strtotime($h['date']));
print '</code></td>'; print '</tt></td>';
print '<td class="commit-message-td">'; print '<td class="commit-message-td">';
print anchor ("code/revision/{$project->id}/{$xfullpath}/{$h['rev']}", htmlspecialchars($h['msg']), "class='commit-message'"); print anchor ("code/revision/{$project->id}/{$xfullpath}/{$h['rev']}", htmlspecialchars($h['msg']), "class='commit-message'");
//print '<pre class="pre-wrapped">'; //print '<pre>';
//print htmlspecialchars($h['msg']); //print htmlspecialchars($h['msg']);
//print '</pre>'; //print '</pre>';
print '</td>'; print '</td>';
@ -206,7 +206,7 @@ $this->load->view (
</div> <!-- code_history_mainarea --> </div> <!-- code_history_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_history_content --> </div> <!-- code_history_content -->

View File

@ -571,7 +571,7 @@ $this->load->view (
$history = $file['history']; $history = $file['history'];
?> ?>
<div class="title-band" id="code_revision_title_band"> <div class="codepot-title-band" id="code_revision_title_band">
<div class="title"> <div class="title">
<?php <?php
print anchor ( print anchor (
@ -671,15 +671,15 @@ $history = $file['history'];
</div> </div>
<div id="code_revision_metadata_body"> <div id="code_revision_metadata_body">
<pre id="code_revision_metadata_text" class="pre-wrapped"><?php print htmlspecialchars($history['msg']); ?></pre> <pre id="code_revision_metadata_text"><?php print htmlspecialchars($history['msg']); ?></pre>
</div> </div>
</div> </div>
<div id="code_revision_result" class="result"> <div id="code_revision_result" class="codepot-relative-container-view">
<div id="code_revision_result_files" class="collapsible-box"> <div id="code_revision_result_files" class="collapsible-box">
<div class="collapsible-box-header"><?php print $this->lang->line('Files')?></div> <div class="collapsible-box-header"><?php print $this->lang->line('Files')?></div>
<div id="code_revision_result_files_table_container" class="collapsible-box-panel"> <div id="code_revision_result_files_table_container" class="collapsible-box-panel">
<table id="code_revision_result_files_table" class="fit-width-result-table"> <table id="code_revision_result_files_table" class="codepot-fit-width-table codepot-spacious-table">
<?php <?php
/* /*
print '<tr class="heading">'; print '<tr class="heading">';
@ -723,7 +723,7 @@ $history = $file['history'];
<div id="code_revision_result_properties" class="collapsible-box"> <div id="code_revision_result_properties" class="collapsible-box">
<div class="collapsible-box-header"><?php print $this->lang->line('CODE_PROPERTIES');?></div> <div class="collapsible-box-header"><?php print $this->lang->line('CODE_PROPERTIES');?></div>
<div id="code_revision_result_properties_table_container" class="collapsible-box-panel"> <div id="code_revision_result_properties_table_container" class="collapsible-box-panel">
<table id="code_revision_result_properties_table" class="fit-width-result-table"> <table id="code_revision_result_properties_table" class="codepot-fit-width-table">
<?php <?php
$rowclasses = array ('odd', 'even'); $rowclasses = array ('odd', 'even');
$rowcount = 0; $rowcount = 0;
@ -870,7 +870,7 @@ $history = $file['history'];
<textarea type='textarea' id='code_revision_new_review_comment' name='code_new_review_comment' rows=24 cols=100 style='width:100%;'></textarea> <textarea type='textarea' id='code_revision_new_review_comment' name='code_new_review_comment' rows=24 cols=100 style='width:100%;'></textarea>
</div> </div>
<div id='code_revision_new_review_comment_preview' class='form_input_preview'> <div id='code_revision_new_review_comment_preview' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -898,7 +898,7 @@ for ($i = 0; $i < $review_count; )
<textarea type='textarea' id='code_revision_edit_review_comment_{$i}' name='code_edit_review_comment_{$i}' rows=24 cols=100 style='width:100%;'>{$text}</textarea> <textarea type='textarea' id='code_revision_edit_review_comment_{$i}' name='code_edit_review_comment_{$i}' rows=24 cols=100 style='width:100%;'>{$text}</textarea>
</div> </div>
<div id='code_revision_edit_review_comment_preview_{$i}' class='form_input_preview'> <div id='code_revision_edit_review_comment_preview_{$i}' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -912,7 +912,7 @@ for ($i = 0; $i < $review_count; )
</div> <!-- code_revision_mainarea --> </div> <!-- code_revision_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_revision_content --> </div> <!-- code_revision_content -->

View File

@ -110,7 +110,7 @@ $this->load->view (
<div class="mainarea" id="code_search_mainarea"> <div class="mainarea" id="code_search_mainarea">
<div class="title-band" id="code_search_title_band"> <div class="codepot-title-band" id="code_search_title_band">
<div class="title"> <div class="title">
<?php <?php
@ -247,7 +247,7 @@ $this->load->view (
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
<div id="code_search_mainarea_result" class="result"> <div id="code_search_result" class="codepot-relative-container-view">
<?php <?php
// this searching part should have been placed in SubversionModel. // this searching part should have been placed in SubversionModel.
@ -311,7 +311,7 @@ function search_and_show ($controller, $project, $path, $revision, $pattern, $in
$revreqroot = '/' . $controller->converter->AsciiToHex ('.') . $revreq; $revreqroot = '/' . $controller->converter->AsciiToHex ('.') . $revreq;
} }
print '<div class="code_search_result">'; print '<div class="codepot-styled-text-view">';
print '<div class="title">'; print '<div class="title">';
print anchor ( print anchor (
@ -330,21 +330,21 @@ function search_and_show ($controller, $project, $path, $revision, $pattern, $in
$fileext = substr(strrchr($file2['name'], '.'), 1); $fileext = substr(strrchr($file2['name'], '.'), 1);
if ($fileext == "") $fileext = "html"; if ($fileext == "") $fileext = "html";
print '<pre class="line-numbered">'; print '<pre class="codepot-line-numbered">';
print '<span class="line-number-block">'; print '<span class="codepot-line-number-block">';
foreach ($matchlines as $linenum => $line) foreach ($matchlines as $linenum => $line)
{ {
print "<span>{$linenum}</span>"; print "<span>{$linenum}</span>";
} }
print '</span>'; print '</span>';
print "<code class='line-numbered-code prettyprint lang-{$fileext}'>"; print "<code class='codepot-line-numbered-code prettyprint lang-{$fileext}'>";
foreach ($matchlines as $linenum => $line) foreach ($matchlines as $linenum => $line)
{ {
print htmlspecialchars($line); print htmlspecialchars($line);
print "\n"; print "\n";
} }
print '</code>'; print '</code>';
print '<span class="line-number-clear"></span>'; print '<span class="codepot-line-number-clear"></span>';
print '</pre>'; print '</pre>';
} }
@ -372,11 +372,11 @@ if (CODEPOT_ALLOW_SET_TIME_LIMIT) set_time_limit (0);
search_and_show ($this, $project, $file['fullpath'], $revision, $pattern, $invertedly, $case_insensitively, $is_regex, $recursively, $in_name, $wildcard_pattern); search_and_show ($this, $project, $file['fullpath'], $revision, $pattern, $invertedly, $case_insensitively, $is_regex, $recursively, $in_name, $wildcard_pattern);
?> ?>
</div> <!-- code_search_mainarea_result --> </div> <!-- code_search_result -->
</div> <!-- code_search_mainarea --> </div> <!-- code_search_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- code_search_content --> </div> <!-- code_search_content -->

View File

@ -57,7 +57,7 @@ $this->load->view (
<?php print htmlspecialchars($message) ?> <?php print htmlspecialchars($message) ?>
</div> </div>
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- project_error_content --> </div> <!-- project_error_content -->

View File

@ -259,7 +259,7 @@ $this->load->view (
<div class="mainarea" id="file_home_mainarea"> <div class="mainarea" id="file_home_mainarea">
<div class="title-band" id="file_home_title_band"> <div class="codepot-title-band" id="file_home_title_band">
<div class="title"><?php print $this->lang->line('Files')?></div> <div class="title"><?php print $this->lang->line('Files')?></div>
<div class="actions"> <div class="actions">
@ -277,7 +277,7 @@ $this->load->view (
<div style='clear: both'></div> <div style='clear: both'></div>
</div> </div>
<div id="file_home_result" class="result"> <div id="file_home_result" class="codepot-relative-container-view">
<?php <?php
if (empty($files)) if (empty($files))
{ {
@ -325,7 +325,7 @@ $this->load->view (
usort ($files, 'comp_files'); usort ($files, 'comp_files');
print '<table id="file_home_result_table" class="fit-width-result-table">'; print '<table id="file_home_result_table" class="codepot-fit-width-table codepot-spacious-table">';
print '<tr class="heading">'; print '<tr class="heading">';
print '<th>' . $this->lang->line('Tag') . '</th>'; print '<th>' . $this->lang->line('Tag') . '</th>';
print '<th>' . $this->lang->line('Name') . '</th>'; print '<th>' . $this->lang->line('Name') . '</th>';
@ -427,7 +427,7 @@ $this->load->view (
<div id='file_home_new_description_input'> <div id='file_home_new_description_input'>
<textarea type='textarea' id='file_home_new_description' name='file_home_new_description' rows=10 cols=80 style='width:100%;'></textarea> <textarea type='textarea' id='file_home_new_description' name='file_home_new_description' rows=10 cols=80 style='width:100%;'></textarea>
</div> </div>
<div id='file_home_new_description_preview' class='form_input_preview'> <div id='file_home_new_description_preview' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -438,7 +438,7 @@ $this->load->view (
</div> <!-- file_home_mainarea --> </div> <!-- file_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- file_home_content --> </div> <!-- file_home_content -->

View File

@ -596,7 +596,7 @@ $this->load->view (
<div class="mainarea" id="file_show_mainarea"> <div class="mainarea" id="file_show_mainarea">
<div class="title-band" id="file_show_title_band"> <div class="codepot-title-band" id="file_show_title_band">
<div class="title"><?php print htmlspecialchars($file->name)?></div> <div class="title"><?php print htmlspecialchars($file->name)?></div>
<div class="actions"> <div class="actions">
@ -655,7 +655,7 @@ $this->load->view (
</div> </div>
</div> </div>
<div id="file_show_result" class="result"> <div id="file_show_result" class="codepot-relative-container-view">
<div id="file_show_wiki"> <div id="file_show_wiki">
<pre id="file_show_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($file->description); ?></pre> <pre id="file_show_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($file->description); ?></pre>
</div> </div>
@ -678,7 +678,7 @@ $this->load->view (
<div id='file_show_edit_description_input'> <div id='file_show_edit_description_input'>
<textarea type='textarea' id='file_show_edit_description' name='file_show_edit_description' rows=24 cols=100 style='width:100%;'><?php print htmlspecialchars($file->description); ?></textarea> <textarea type='textarea' id='file_show_edit_description' name='file_show_edit_description' rows=24 cols=100 style='width:100%;'><?php print htmlspecialchars($file->description); ?></textarea>
</div> </div>
<div id='file_show_edit_description_preview' class='form_input_preview'> <div id='file_show_edit_description_preview' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -719,7 +719,7 @@ $this->load->view (
</div> <!-- file_show_mainarea --> </div> <!-- file_show_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- file_show_content --> </div> <!-- file_show_content -->

View File

@ -1,4 +1,4 @@
<div class="footer" id="codepot_footer"> <div class="codepot-footer" id="codepot_footer">
<?php if (CODEPOT_FOOTER == ''): ?> <?php if (CODEPOT_FOOTER == ''): ?>
Codepot <?php print CODEPOT_VERSION?> by Hyung-Hwan Chung Codepot <?php print CODEPOT_VERSION?> by Hyung-Hwan Chung

View File

@ -461,7 +461,7 @@ $this->load->view (
<!-- /////////////////////////////////////////////////////////////////////// --> <!-- /////////////////////////////////////////////////////////////////////// -->
<!-- <!--
<div class="sidebar" id="graph_main_sidebar"> <div class="codepot-sidebar" id="graph_main_sidebar">
<div class="collapsible-box"> <div class="collapsible-box">
<div class="collapsible-box-header"> <div class="collapsible-box-header">
</div> </div>
@ -480,7 +480,7 @@ $this->load->view (
<div class="mainarea" id="graph_main_mainarea"> <div class="mainarea" id="graph_main_mainarea">
<div class="title-band" id="graph_main_title_band"> <div class="codepot-title-band" id="graph_main_title_band">
<div class="title"><?php print htmlspecialchars($project->name);?></div> <div class="title"><?php print htmlspecialchars($project->name);?></div>
<div class="actions"> <div class="actions">
@ -507,7 +507,7 @@ $this->load->view (
</div> <!-- graph_main_mainarea --> </div> <!-- graph_main_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- graph_main_content --> </div> <!-- graph_main_content -->

View File

@ -309,7 +309,7 @@ $this->load->view (
<div class="mainarea" id="issue_home_mainarea"> <div class="mainarea" id="issue_home_mainarea">
<div class="title-band" id="issue_home_title_band"> <div class="codepot-title-band" id="issue_home_title_band">
<div class="title"><?php print $this->lang->line('Issues')?></div> <div class="title"><?php print $this->lang->line('Issues')?></div>
<div class="actions"> <div class="actions">
@ -322,7 +322,7 @@ $this->load->view (
<div style='clear: both;'></div> <div style='clear: both;'></div>
</div> </div>
<div id="issue_home_result" class="result"> <div id="issue_home_result" class="codepot-relative-container-view">
<?php <?php
if (empty($issues)) if (empty($issues))
{ {
@ -330,7 +330,7 @@ if (empty($issues))
} }
else else
{ {
print '<table id="issue_home_result_table" class="full-width-result-table">'; print '<table id="issue_home_result_table" class="codepot-full-width-table codepot-spacious-table">';
print '<tr class="heading">'; print '<tr class="heading">';
print '<th class="id">' . $this->lang->line('ID') . '</th>'; print '<th class="id">' . $this->lang->line('ID') . '</th>';
print '<th class="type">' . $this->lang->line('Type') . '</th>'; print '<th class="type">' . $this->lang->line('Type') . '</th>';
@ -418,7 +418,7 @@ else
<table id='issue_home_new_file_table'></table> <table id='issue_home_new_file_table'></table>
</div> </div>
</div> </div>
<div id='issue_home_new_description_preview' class='form_input_preview'> <div id='issue_home_new_description_preview' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -482,7 +482,7 @@ else
</div> <!-- issue_home_mainarea --> </div> <!-- issue_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- issue_home_content --> </div> <!-- issue_home_content -->

View File

@ -713,7 +713,7 @@ $this->load->view (
<div class="mainarea" id="issue_show_mainarea"> <div class="mainarea" id="issue_show_mainarea">
<div class="title-band" id="issue_show_title_band"> <div class="codepot-title-band" id="issue_show_title_band">
<div class="title"> <div class="title">
<?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?>: <?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?>:
<?php print htmlspecialchars($issue->summary)?> <?php print htmlspecialchars($issue->summary)?>
@ -780,9 +780,9 @@ $this->load->view (
</div> </div>
</div> </div>
<div id="issue_show_result" class="result"> <div id="issue_show_result" class="codepot-relative-container-view">
<div id="issue_show_description"> <div id="issue_show_description" class="codepot-styled-text-view">
<pre id="issue_show_description_pre" style="visibility: hidden"><?php print htmlspecialchars($issue->description); ?></pre> <pre id="issue_show_description_pre" style="visibility: hidden"><?php print htmlspecialchars($issue->description); ?></pre>
</div> <!-- issue_show_description --> </div> <!-- issue_show_description -->
@ -816,16 +816,8 @@ $this->load->view (
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
<div id="issue_show_changes_strip" class="codepot-infostrip">
<div id="issue_show_changes">
<?php <?php
$commentno = 0;
$msgfmt_changed_from_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z');
$msgfmt_changed_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_TO_Z');
$count = count($issue->changes);
print '<div class="infostrip">';
print '<span class="title">'; print '<span class="title">';
print $this->lang->line('Change log'); print $this->lang->line('Change log');
print '</span>'; print '</span>';
@ -840,16 +832,25 @@ $this->load->view (
print '<a id="issue_show_undo_change" href="#">'; print '<a id="issue_show_undo_change" href="#">';
print $this->lang->line('Undo'); print $this->lang->line('Undo');
print '</a>'; print '</a>';
print '</div>'; ?>
</div>
print '<table id="issue_show_changes_table" class="full-width-result-table">'; <div id="issue_show_changes">
<?php
$commentno = 0;
$msgfmt_changed_from_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z');
$msgfmt_changed_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_TO_Z');
$count = count($issue->changes);
print '<table id="issue_show_changes_table" class="codepot-full-width-table">';
while ($count > 1) while ($count > 1)
{ {
$new = $issue->changes[--$count]; $new = $issue->changes[--$count];
$old = $issue->changes[$count-1]; $old = $issue->changes[$count-1];
print '<tr>'; print '<tr>';
print '<td class="date">'; print '<td class="date">';
print codepot_dbdatetodispdate($new->updatedon); print codepot_dbdatetodispdate($new->updatedon);
print '</td>'; print '</td>';
@ -861,7 +862,7 @@ $this->load->view (
print '<td class="details">'; print '<td class="details">';
if ($new->comment != "") if ($new->comment != "")
{ {
print "<div id='issue_show_changes_comment_{$commentno}' class='issue_changes_comment'>"; print "<div id='issue_show_changes_comment_{$commentno}' class='codepot-styled-text-view'>";
print "<pre id='issue_show_changes_comment_pre_{$commentno}'>"; print "<pre id='issue_show_changes_comment_pre_{$commentno}'>";
print htmlspecialchars($new->comment); print htmlspecialchars($new->comment);
print '</pre>'; print '</pre>';
@ -971,7 +972,7 @@ $this->load->view (
<div id='issue_show_edit_description_input'> <div id='issue_show_edit_description_input'>
<textarea type='textarea' id='issue_show_edit_description' name='issue_show_edit_description' rows=24 cols=100 style='width:100%;'><?php print htmlspecialchars($issue->description); ?></textarea> <textarea type='textarea' id='issue_show_edit_description' name='issue_show_edit_description' rows=24 cols=100 style='width:100%;'><?php print htmlspecialchars($issue->description); ?></textarea>
</div> </div>
<div id='issue_show_edit_description_preview' class='form_input_preview'> <div id='issue_show_edit_description_preview' class='codepot-styled-text-preview'>
</div> </div>
</div> </div>
</div> </div>
@ -1085,7 +1086,7 @@ $this->load->view (
?> ?>
</div> </div>
<div id='issue_change_comment_preview' class='form_input_preview'></div> <div id='issue_change_comment_preview' class='codepot-styled-text-preview'></div>
<?php print form_close()?> <?php print form_close()?>
</div> <!-- issue_show_change_form --> </div> <!-- issue_show_change_form -->
@ -1098,7 +1099,7 @@ $this->load->view (
</div> <!-- issue_show_mainarea --> </div> <!-- issue_show_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- issue_show_content --> </div> <!-- issue_show_content -->

View File

@ -122,7 +122,7 @@ $this->load->view (
<div class="mainarea" id="log_mainarea"> <div class="mainarea" id="log_mainarea">
<div class="title-band" id="log_title_band"> <div class="codepot-title-band" id="log_title_band">
<div class="title"> <div class="title">
<?php print anchor ("site/log", $this->lang->line ('Change log')) ?> <?php print anchor ("site/log", $this->lang->line ('Change log')) ?>
@ -150,9 +150,9 @@ $this->load->view (
<div id="log_mainarea_result" class="result"> <div id="log_mainarea_result" class="codepot-relative-container-view">
<table id="log_mainarea_result_table" class="full-width-result-table"> <table id="log_mainarea_result_table" class="codepot-full-width-table codepot-spacious-table">
<?php <?php
$curdate = ''; $curdate = '';
$xdot = $this->converter->AsciiToHex ('.'); $xdot = $this->converter->AsciiToHex ('.');
@ -229,9 +229,9 @@ $this->load->view (
if ($log['action'] != 'revpropchange') if ($log['action'] != 'revpropchange')
{ {
print '<pre class="pre-wrapped message">'; print '<div class="codepot-plain-text-view"><pre>';
print htmlspecialchars ($code['message']); print htmlspecialchars ($code['message']);
print '</pre>'; print '</pre></div>';
} }
} }
else else
@ -296,7 +296,7 @@ $this->load->view (
</div> <!-- log_mainarea --> </div> <!-- log_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- log_content --> </div> <!-- log_content -->

View File

@ -109,7 +109,7 @@ $this->load->view (
</div> </div>
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- content --> </div> <!-- content -->

View File

@ -271,7 +271,7 @@ else
</div> <!-- project_catalog_mainarea --> </div> <!-- project_catalog_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- project_catalog_content --> </div> <!-- project_catalog_content -->

View File

@ -73,7 +73,7 @@ $this->load->view (
</div> <!-- mainarea --> </div> <!-- mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- project_delete_content --> </div> <!-- project_delete_content -->
<!----------------------------------------------------------------------------> <!---------------------------------------------------------------------------->

View File

@ -131,7 +131,7 @@ $this->load->view (
print form_textarea ($xdata); print form_textarea ($xdata);
?> ?>
</div> </div>
<div id='project_edit_mainarea_description_preview' class='form_input_preview'></div> <div id='project_edit_mainarea_description_preview' class='codepot-styled-text-preview'></div>
<div class='form_input_field'> <div class='form_input_field'>
<?php print form_label($this->lang->line('Commitable').': ', 'project_commitable')?> <?php print form_label($this->lang->line('Commitable').': ', 'project_commitable')?>
@ -177,7 +177,7 @@ $this->load->view (
</div> <!-- project_edit_mainarea --> </div> <!-- project_edit_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- project_edit_content --> </div> <!-- project_edit_content -->

View File

@ -29,8 +29,8 @@
function render_wiki() function render_wiki()
{ {
creole_render_wiki ( creole_render_wiki (
"project_home_mainarea_wiki_text", "project_home_result_wiki_text",
"project_home_mainarea_wiki", "project_home_result_wiki",
"<?php print site_url()?>/wiki/show/<?php print $project->id?>/", "<?php print site_url()?>/wiki/show/<?php print $project->id?>/",
"<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/" "<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/"
); );
@ -101,7 +101,7 @@ $this->load->view (
?> ?>
<!-- /////////////////////////////////////////////////////////////////////// --> <!-- /////////////////////////////////////////////////////////////////////// -->
<div class="sidebar" id="project_home_sidebar"> <div class="codepot-sidebar" id="project_home_sidebar">
<div id="project_home_sidebar_info_box" class="collapsible-box"> <div id="project_home_sidebar_info_box" class="collapsible-box">
@ -232,7 +232,7 @@ foreach ($urls as $url)
if ($log['action'] != 'revpropchange') if ($log['action'] != 'revpropchange')
{ {
print '<pre class="pre-wrapped message">'; print '<pre class="message">';
$sm = strtok (trim ($x['message']), "\r\n"); $sm = strtok (trim ($x['message']), "\r\n");
print htmlspecialchars ($sm); print htmlspecialchars ($sm);
print '</pre>'; print '</pre>';
@ -315,16 +315,16 @@ foreach ($urls as $url)
<?php print htmlspecialchars($project->name)?> <?php print htmlspecialchars($project->name)?>
</div> </div>
<div id="project_home_result" class="result"> <div id="project_home_result" class="codepot-static-container-view">
<div id="project_home_mainarea_wiki"> <div id="project_home_result_wiki" class="codepot-styled-text-view">
<pre id="project_home_mainarea_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($project->description); ?></pre> <pre id="project_home_result_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($project->description); ?></pre>
</div> <!-- project_home_mainarea_wiki --> </div> <!-- project_home_result_wiki -->
</div> </div>
</div> <!-- project_home_mainarea --> </div> <!-- project_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- project_home_content --> </div> <!-- project_home_content -->

View File

@ -68,7 +68,7 @@ foreach ($sites as $site)
</div> <!-- site_catalog_mainarea --> </div> <!-- site_catalog_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- site_catalog_content --> </div> <!-- site_catalog_content -->

View File

@ -73,7 +73,7 @@ $this->load->view (
</div> <!-- mainarea --> </div> <!-- mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- site_delete_content --> </div> <!-- site_delete_content -->

View File

@ -128,7 +128,7 @@ $this->load->view (
'class="text" id="site_edit_mainarea_text"') 'class="text" id="site_edit_mainarea_text"')
?> ?>
</div> </div>
<div id='site_edit_mainarea_text_preview' class='form_input_preview'></div> <div id='site_edit_mainarea_text_preview' class='codepot-styled-text-preview'></div>
<?php $caption = ($mode == 'update')? $this->lang->line('Update'): $this->lang->line('Create'); ?> <?php $caption = ($mode == 'update')? $this->lang->line('Update'): $this->lang->line('Create'); ?>
@ -138,7 +138,7 @@ $this->load->view (
</div> <!-- site_edit_mainarea --> </div> <!-- site_edit_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- site_edit_content --> </div> <!-- site_edit_content -->

View File

@ -107,7 +107,7 @@ $this->load->view (
<div class="sidebar" id="site_home_sidebar"> <div class="codepot-sidebar" id="site_home_sidebar">
<div id="site_home_sidebar_latest_projects_box" class="collapsible-box"> <div id="site_home_sidebar_latest_projects_box" class="collapsible-box">
<div id="site_home_sidebar_latest_projects_header" class="collapsible-box-header"> <div id="site_home_sidebar_latest_projects_header" class="collapsible-box-header">
@ -204,10 +204,10 @@ foreach ($latest_projects as $project)
if ($log['action'] != 'revpropchange') if ($log['action'] != 'revpropchange')
{ {
print '<pre class="pre-wrapped message">'; print '<div class="codepot-plain-text-view"><pre>';
$sm = strtok (trim ($x['message']), "\r\n"); $sm = strtok (trim ($x['message']), "\r\n");
print htmlspecialchars ($sm); print htmlspecialchars ($sm);
print '</pre>'; print '</pre></div>';
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -282,7 +282,7 @@ foreach ($latest_projects as $project)
<div class="mainarea" id="site_home_mainarea"> <div class="mainarea" id="site_home_mainarea">
<div id="site_home_result" class="result"> <div id="site_home_result" class="codepot-static-container-view">
<?php if ($issues && count($issues) > 0): ?> <?php if ($issues && count($issues) > 0): ?>
<div id="site_home_result_open_issues" class="collapsible-box"> <div id="site_home_result_open_issues" class="collapsible-box">
@ -327,10 +327,10 @@ foreach ($latest_projects as $project)
$pro = $issue->projectid; $pro = $issue->projectid;
$xid = $this->converter->AsciiToHex ((string)$issue->id); $xid = $this->converter->AsciiToHex ((string)$issue->id);
$owner = $issue->owner; $owner = $issue->owner;
$proissueanc = anchor ("issue/home/{$issue->projectid}", $pro); $proissueanc = anchor ("issue/home/{$issue->projectid}", $pro);
$anc = anchor ("issue/show/{$issue->projectid}/{$xid}", '#' . htmlspecialchars($issue->id)); $anc = anchor ("issue/show/{$issue->projectid}/{$xid}", '#' . htmlspecialchars($issue->id));
$status = htmlspecialchars( $status = htmlspecialchars(
array_key_exists($issue->status, $issue_status_array)? array_key_exists($issue->status, $issue_status_array)?
$issue_status_array[$issue->status]: $issue->status); $issue_status_array[$issue->status]: $issue->status);
@ -346,7 +346,7 @@ foreach ($latest_projects as $project)
</div> </div>
<?php endif; ?> <?php endif; ?>
<div id="site_home_result_wiki"> <div id="site_home_result_wiki" class="codepot-styled-text-view">
<pre id="site_home_result_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($site->text); ?></pre> <pre id="site_home_result_wiki_text" style="visibility: hidden"><?php print htmlspecialchars($site->text); ?></pre>
</div> <!-- site_home_text --> </div> <!-- site_home_text -->
@ -355,7 +355,7 @@ foreach ($latest_projects as $project)
</div> <!-- site_home_mainarea --> </div> <!-- site_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- site_home_content --> </div> <!-- site_home_content -->

View File

@ -25,8 +25,8 @@
function render_wiki() function render_wiki()
{ {
creole_render_wiki ( creole_render_wiki (
"site_show_mainarea_wiki_text", "site_show_result_wiki_text",
"site_show_mainarea_wiki", "site_show_result_wiki",
"<?php print site_url()?>/site/wiki/", "<?php print site_url()?>/site/wiki/",
"<?php print site_url()?>/site/image/" "<?php print site_url()?>/site/image/"
); );
@ -86,17 +86,19 @@ $this->load->view (
<?php print htmlspecialchars($site->name)?> (<?php print htmlspecialchars($site->id)?>) <?php print htmlspecialchars($site->name)?> (<?php print htmlspecialchars($site->id)?>)
</div> </div>
<div id="site_show_mainarea_wiki"> <div id="site_show_result" class="codepot-relative-container-view">
<pre id="site_show_mainarea_wiki_text" style="visibility: hidden"> <div id="site_show_result_wiki" class="codepot-styled-text-view">
<?php print htmlspecialchars($site->text); ?> <pre id="site_show_result_wiki_text" style="visibility: hidden">
</pre> <?php print htmlspecialchars($site->text); ?>
</div> <!-- site_show_mainarea_text --> </pre>
</div> <!-- site_show_result_wiki -->
</div>
<!-----------------------------------------------------------> <!----------------------------------------------------------->
</div> <!-- site_show_mainarea --> </div> <!-- site_show_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- site_show_content --> </div> <!-- site_show_content -->

View File

@ -117,7 +117,7 @@ $num_activities = 0;
</div> <!-- user_home_mainarea --> </div> <!-- user_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- user_home_content --> </div> <!-- user_home_content -->

View File

@ -91,7 +91,7 @@ $this->load->view (
</div> <!-- user_settings_mainarea --> </div> <!-- user_settings_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- user_settings_content --> </div> <!-- user_settings_content -->

View File

@ -74,7 +74,7 @@ $this->load->view (
</div> <!-- mainarea --> </div> <!-- mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- wiki_delete_content --> </div> <!-- wiki_delete_content -->

View File

@ -162,7 +162,7 @@ $this->load->view (
print form_textarea ($xdata); print form_textarea ($xdata);
?> ?>
</div> </div>
<div id='wiki_edit_text_preview' class='form_input_preview'></div> <div id='wiki_edit_text_preview' class='codepot-styled-text-preview'></div>
<?php if (!empty($wiki->attachments)): ?> <?php if (!empty($wiki->attachments)): ?>
<div class='form_input_label'> <div class='form_input_label'>
@ -224,7 +224,7 @@ $this->load->view (
</div> <!-- wiki_edit_mainarea --> </div> <!-- wiki_edit_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- content --> </div> <!-- content -->

View File

@ -445,7 +445,7 @@ $this->load->view (
<div class="mainarea" id="wiki_edit_mainarea"> <div class="mainarea" id="wiki_edit_mainarea">
<div class="title-band" id="wiki_edit_title_band"> <div class="codepot-title-band" id="wiki_edit_title_band">
<div class="title"><input type="text" name="wiki_name" value="<?php print addslashes($wiki->name); ?>" maxlength="80" size="40" id="wiki_edit_name" placeholder="<?php print $this->lang->line('Name'); ?>" /></div> <div class="title"><input type="text" name="wiki_name" value="<?php print addslashes($wiki->name); ?>" maxlength="80" size="40" id="wiki_edit_name" placeholder="<?php print $this->lang->line('Name'); ?>" /></div>
<div class="actions"> <div class="actions">
@ -495,8 +495,8 @@ $this->load->view (
<div id="wiki_edit_toolbar"> <div id="wiki_edit_toolbar">
</div> </div>
<div id="wiki_edit_result" class="result"> <div id="wiki_edit_result" class="codepot-relative-container-view">
<div id='wiki_edit_text_editor'></div> <div id='wiki_edit_text_editor' class="codepot-styled-text-view"></div>
</div> <!-- wiki_edit_result --> </div> <!-- wiki_edit_result -->
@ -504,7 +504,7 @@ $this->load->view (
</div> <!-- wiki_edit_mainarea --> </div> <!-- wiki_edit_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- content --> </div> <!-- content -->

View File

@ -90,7 +90,7 @@ $this->load->view (
<div class="mainarea" id="wiki_home_mainarea"> <div class="mainarea" id="wiki_home_mainarea">
<div class="title-band" id="wiki_home_title_band"> <div class="codepot-title-band" id="wiki_home_title_band">
<div class="title"><?php print $this->lang->line('Wikis');?></div> <div class="title"><?php print $this->lang->line('Wikis');?></div>
<div class="actions"> <div class="actions">
@ -104,7 +104,7 @@ $this->load->view (
<div style='clear: both'></div> <div style='clear: both'></div>
</div> </div>
<div id="wiki_home_result" class="result"> <div id="wiki_home_result" class="codepot-relative-container-view">
<?php <?php
if (empty($wikis)) if (empty($wikis))
{ {
@ -127,7 +127,7 @@ else
</div> <!-- wiki_home_mainarea --> </div> <!-- wiki_home_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- wiki_home_content --> </div> <!-- wiki_home_content -->

View File

@ -223,7 +223,7 @@ $this->load->view (
<div class="mainarea" id="wiki_show_mainarea"> <div class="mainarea" id="wiki_show_mainarea">
<div class="title-band" id="wiki_show_title_band"> <div class="codepot-title-band" id="wiki_show_title_band">
<div class="title"><?php print htmlspecialchars($wiki->name)?></div> <div class="title"><?php print htmlspecialchars($wiki->name)?></div>
<div class="actions"> <div class="actions">
@ -266,20 +266,20 @@ $this->load->view (
</div> </div>
</div> </div>
<div id="wiki_show_result" class="result"> <div id="wiki_show_result" class="codepot-relative-container-view">
<?php <?php
print '<div id="wiki_show_wiki" class="codepot-styled-text-view">';
if ($is_html) if ($is_html)
{ {
print $wiki->text; print $wiki->text;
} }
else else
{ {
print '<div id="wiki_show_wiki">';
print '<pre id="wiki_show_wiki_text" style="visibility: hidden">'; print '<pre id="wiki_show_wiki_text" style="visibility: hidden">';
print htmlspecialchars($wiki->text); print htmlspecialchars($wiki->text);
print '</pre>'; print '</pre>';
print '</div>';
} }
print '</div>';
?> ?>
</div> <!-- wiki_show_result --> </div> <!-- wiki_show_result -->
@ -295,7 +295,7 @@ $this->load->view (
</div> <!-- wiki_show_mainarea --> </div> <!-- wiki_show_mainarea -->
<div class='footer-pusher'></div> <!-- for sticky footer --> <div class='codepot-footer-pusher'></div> <!-- for sticky footer -->
</div> <!-- wiki_show_content --> </div> <!-- wiki_show_content -->

View File

@ -2,18 +2,6 @@
/*----------------------------------------------- /*-----------------------------------------------
* project source file view & blame view * project source file view & blame view
*-----------------------------------------------*/ *-----------------------------------------------*/
#code_folder_result,
#code_file_result,
#code_blame_result,
#code_revision_result,
#code_history_result,
#code_diff_result,
#code_search_result {
position: relative;
overflow: auto;
margin: 0.2em 0 0.2em 0;
}
#code_file_result_code, #code_file_result_code,
#code_blame_result_code_container { #code_blame_result_code_container {
border: none; border: none;
@ -174,39 +162,22 @@
white-space: normal; white-space: normal;
line-height: 1.2em; line-height: 1.2em;
background-color: #FAFAFA; background-color: #FAFAFA;
border: none; border: none;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
#code_folder_readme h1 {
border-bottom: 1px solid #DDD;
font-weight: bold;
line-height: 1.4em;
}
#code_folder_readme pre {
white-space: pre-wrap !important;
word-wrap: break-word !important;
background-color: #EEEEEE;
border: 1px solid #DFDFDF;
}
#code_folder_readme pre code {
white-space: pre-wrap !important;
word-wrap: break-word !important;
margin: 0 !important;
padding: 0 !important;
}
/*----------------------------------------------- /*-----------------------------------------------
* project source edit view * project source edit view
*-----------------------------------------------*/ *-----------------------------------------------*/
#code_edit_result_code { #code_edit_result_code {
font-family: consolas, monaco, "Andale Mono", monospace; font-family: "DejaVu Sans Mono", consolas, monaco, "Andale Mono", monospace;
overflow: auto; overflow: auto;
border: none; border: none;
white-space: pre; white-space: pre;
@ -219,10 +190,6 @@
line-height: 1.2em; line-height: 1.2em;
position: absolute !important; position: absolute !important;
/*top: 300;
bottom: 200;
left: 100;
right: 100;*/
} }
/*----------------------------------------------- /*-----------------------------------------------
@ -256,7 +223,7 @@
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */ white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */ white-space: -o-pre-wrap; /* Opera 7 */
font-family: consolas, monaco, "Andale Mono", monospace; font-family: "DejaVu Sans Mono", consolas, monaco, "Andale Mono", monospace;
} }
/*----------------------------------------------- /*-----------------------------------------------
@ -266,13 +233,14 @@
line-height: 1.2em; line-height: 1.2em;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;
} }
/*
#code_revision_result_files_table, #code_revision_result_files_table,
#code_revision_result_properties_table { #code_revision_result_properties_table {
padding: 0.5em 0 0.5em 0; padding: 0.5em 0 0.5em 0;
background: inherit; background: inherit;
line-height: 1.5em; line-height: 1.5em;
} }
*/
#code_revision_result_files_table td, #code_revision_result_files_table td,
#code_revision_result_properties_table td { #code_revision_result_properties_table td {
@ -362,17 +330,9 @@
box-sizing: border-box; box-sizing: border-box;
} }
#code_diff_old_code, #code_diff_full_code_view {
#code_diff_new_code {
border: none;
float; left;
margin: 0;
padding: 0;
line-height: 1.2em;
width: 100%; width: 100%;
-moz-box-sizing: border-box; overflow: hidden;
-webkit-box-sizing: border-box;
box-sizing: border-box;
} }
#code_diff_old_code_view, #code_diff_old_code_view,

File diff suppressed because it is too large Load Diff

View File

@ -95,12 +95,6 @@ li.issue-owner {
/*--------------------------------------------- /*---------------------------------------------
* issue home * issue home
*---------------------------------------------*/ *---------------------------------------------*/
#issue_home_result,
#issue_show_result {
position: relative;
overflow: auto;
margin: 0.2em 0 0.2em 0;
}
#issue_home_result_table tr { #issue_home_result_table tr {
vertical-align: text-top; vertical-align: text-top;
@ -215,21 +209,29 @@ li.issue-owner {
padding-top: 0.5em; padding-top: 0.5em;
} }
#issue_show_changes { #issue_show_changes_strip .infostrip {
margin-top: 1em;
padding-top: 0.5em;
padding-bottom: 0.5em;
overflow: auto;
}
#issue_show_changes .infostrip {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
#issue_show_changes .infostrip .title { #issue_show_changes_strip .title {
float: left; float: left;
} }
#issue_show_changes {
/*
margin-top: 1em;
padding-top: 0.5em;
padding-bottom: 0.5em;
*/
overflow: auto;
}
#issue_show_changes_table td {
padding: 0.3em 0.3em 0.3em 0.3em;
white-space: normal;
word-wrap: break-word;
}
#issue_show_changes_table td.date { #issue_show_changes_table td.date {
min-width: 5em; min-width: 5em;
width: 1px; width: 1px;
@ -247,49 +249,13 @@ li.issue-owner {
background-color: #F1F1FF; background-color: #F1F1FF;
} }
#issue_show_changes_table td.details .list ul {
padding: 0;
margin: 0.2em 0.5em 0.5em 1em;
}
#issue_show_changes_table td.details .list ul li { #issue_show_changes_table td.details .list ul li {
padding-bottom: 0.3em; padding: 0.1em;
}
#issue_show_changes_table .issue_changes_comment .prettyprint {
/* special pre-wrap rule to make the pretty-printed text to wrap
* in the issue comment listing. i didn't manage to get oveflow: auto
* or overflow: scroll to make make a scroll bar show up. */
white-space: -moz-pre-wrap;
white-space: -o-pre-wrap;
white-space: pre-wrap;
}
#issue_change_form {
font-size: 1em;
}
/* all these elements inside the form requires a lot of refinement.
* many of these are duplicates of elemenents in common.css */
#issue_change_form .form_input_preview {
background-color: #FFFFF0;
font-size: 1em;
padding: 0.2em 0.2em 0.2em 0.2em;
margin-bottom: 0.5em;
}
#issue_change_form .form_input_preview table {
font-size: 1em;
}
#issue_change_form .form_input_preview pre {
background-color: #F8F8FA;
/*padding: 0.2em 0.2em 0.2em 0.2em;*/
background-color: #F8F8FA;
border: none;
line-height: 1.2em;
padding: 0.3em;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
} }
#issue_change_comment_preview_button.ui-button { #issue_change_comment_preview_button.ui-button {

View File

@ -2,26 +2,6 @@
* wiki * wiki
*---------------------------------------------*/ *---------------------------------------------*/
#wiki_home_result,
#wiki_show_result {
position: relative;
overflow: auto;
margin: 0.2em 0 0.2em 0;
width: 100%;
}
#wiki_show_result pre {
white-space: pre-wrap !important;
}
#wiki_show_result table {
border-collapse: collapse;
}
#wiki_show_result table td {
border: 1px solid #B0B0B0;
}
#wiki_edit_result { #wiki_edit_result {
position: relative; position: relative;
overflow: visible !important; overflow: visible !important;
@ -148,7 +128,6 @@
padding: 0.2em 0.2em 0.2em 0.2em !important; padding: 0.2em 0.2em 0.2em 0.2em !important;
width: 100% !important; width: 100% !important;
border: none !important; border: none !important;
background-color: #F9F9F9 !important;
overflow-y: auto !important; overflow-y: auto !important;
overflow-x: visible !important; overflow-x: visible !important;
outline: none !important; outline: none !important;

View File

@ -1633,7 +1633,7 @@ showdown.subParser('githubCodeBlocks', function (text, options, globals) {
codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>'; codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + ' prettyprint lang-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
return showdown.subParser('hashBlock')(codeblock, options, globals); return showdown.subParser('hashBlock')(codeblock, options, globals);
}); });