did some xhtml works
This commit is contained in:
parent
8b75ca4904
commit
7b08188e6a
@ -174,7 +174,7 @@ $this->load->view (
|
|||||||
if (empty($file['content']))
|
if (empty($file['content']))
|
||||||
{
|
{
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td colspan=2>';
|
print '<td colspan="2">';
|
||||||
print htmlspecialchars ($this->lang->line('MSG_NO_DIFF'));
|
print htmlspecialchars ($this->lang->line('MSG_NO_DIFF'));
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<html>
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
@ -52,11 +54,11 @@ $(function () {
|
|||||||
|
|
||||||
<div class="content" id="code_folder_content">
|
<div class="content" id="code_folder_content">
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
<?php $this->load->view ('taskbar'); ?>
|
<?php $this->load->view ('taskbar'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$this->load->view (
|
$this->load->view (
|
||||||
@ -75,7 +77,7 @@ $this->load->view (
|
|||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
<div class="mainarea" id="code_folder_mainarea">
|
<div class="mainarea" id="code_folder_mainarea">
|
||||||
|
|
||||||
@ -244,7 +246,6 @@ $this->load->view (
|
|||||||
|
|
||||||
print '<div id="code_folder_mainarea_result_info">';
|
print '<div id="code_folder_mainarea_result_info">';
|
||||||
|
|
||||||
print '<pre id="code_folder_mainarea_result_info_logmsg">';
|
|
||||||
print '<div class="title">';
|
print '<div class="title">';
|
||||||
print $this->lang->line('CODE_COMMIT');
|
print $this->lang->line('CODE_COMMIT');
|
||||||
print '</div>';
|
print '</div>';
|
||||||
@ -287,11 +288,11 @@ $this->load->view (
|
|||||||
</div> <!-- code_folder_mainarea -->
|
</div> <!-- code_folder_mainarea -->
|
||||||
|
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
<?php $this->load->view ('footer'); ?>
|
<?php $this->load->view ('footer'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ================================================================== -->
|
||||||
|
|
||||||
</div> <!-- code_folder_content -->
|
</div> <!-- code_folder_content -->
|
||||||
|
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<html>
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
@ -11,11 +13,11 @@
|
|||||||
|
|
||||||
<div class="content" id="file_home_content">
|
<div class="content" id="file_home_content">
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php $this->load->view ('taskbar'); ?>
|
<?php $this->load->view ('taskbar'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$this->load->view (
|
$this->load->view (
|
||||||
@ -36,7 +38,7 @@ $this->load->view (
|
|||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<div class="mainarea" id="file_home_mainarea">
|
<div class="mainarea" id="file_home_mainarea">
|
||||||
<div class="title"><?=$this->lang->line('Files')?></div>
|
<div class="title"><?=$this->lang->line('Files')?></div>
|
||||||
@ -105,11 +107,11 @@ else
|
|||||||
</div>
|
</div>
|
||||||
</div> <!-- file_home_mainarea -->
|
</div> <!-- file_home_mainarea -->
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php $this->load->view ('footer'); ?>
|
<?php $this->load->view ('footer'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
</div> <!-- file_home_content -->
|
</div> <!-- file_home_content -->
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ function render_wiki()
|
|||||||
<title><?=htmlspecialchars($file->name)?></title>
|
<title><?=htmlspecialchars($file->name)?></title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="file_show_content">
|
<div class="content" id="file_show_content">
|
||||||
|
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<html>
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
@ -10,8 +12,9 @@
|
|||||||
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
|
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
/* <![CDATA[ */
|
||||||
function AsciiToHex (x) {
|
function AsciiToHex (x) {
|
||||||
var r="";
|
var r="";
|
||||||
for(i=0; i<x.length; i++)
|
for(i=0; i<x.length; i++)
|
||||||
{
|
{
|
||||||
var tmp = x.charCodeAt(i).toString(16);
|
var tmp = x.charCodeAt(i).toString(16);
|
||||||
@ -50,6 +53,7 @@ $(function () {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
/* ]]> */
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<title><?=htmlspecialchars($project->name)?></title>
|
<title><?=htmlspecialchars($project->name)?></title>
|
||||||
@ -59,11 +63,11 @@ $(function () {
|
|||||||
|
|
||||||
<div class="content" id="issue_home_content">
|
<div class="content" id="issue_home_content">
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php $this->load->view ('taskbar'); ?>
|
<?php $this->load->view ('taskbar'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$this->load->view (
|
$this->load->view (
|
||||||
@ -84,7 +88,7 @@ $this->load->view (
|
|||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<div class="mainarea" id="issue_home_mainarea">
|
<div class="mainarea" id="issue_home_mainarea">
|
||||||
<div class="title"><?=$this->lang->line('Issues')?></div>
|
<div class="title"><?=$this->lang->line('Issues')?></div>
|
||||||
@ -100,9 +104,9 @@ $this->load->view (
|
|||||||
$issue_status_array[''] = $this->lang->line('All');
|
$issue_status_array[''] = $this->lang->line('All');
|
||||||
$issue_priority_array[''] = $this->lang->line('All');
|
$issue_priority_array[''] = $this->lang->line('All');
|
||||||
?>
|
?>
|
||||||
<form id="issue_search_form">
|
<form id="issue_search_form" action="">
|
||||||
<div>
|
<div>
|
||||||
<?=form_label ($this->lang->line('Type'), 'type')
|
<?=form_label ($this->lang->line('Type'), 'issue_search_type')
|
||||||
?>
|
?>
|
||||||
<?=form_dropdown('type',
|
<?=form_dropdown('type',
|
||||||
$issue_type_array,
|
$issue_type_array,
|
||||||
@ -110,14 +114,14 @@ $this->load->view (
|
|||||||
'id="issue_search_type"')
|
'id="issue_search_type"')
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?=form_label ($this->lang->line('Status'), 'status')
|
<?=form_label ($this->lang->line('Status'), 'issue_search_status')
|
||||||
?>
|
?>
|
||||||
<?=form_dropdown('status',
|
<?=form_dropdown('status',
|
||||||
$issue_status_array,
|
$issue_status_array,
|
||||||
set_value('status', $search->status), 'id="status"')
|
set_value('status', $search->status), 'id="issue_search_status"')
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?=form_label ($this->lang->line('Priority'), 'priority')
|
<?=form_label ($this->lang->line('Priority'), 'issue_search_priority')
|
||||||
?>
|
?>
|
||||||
<?=form_dropdown('priority',
|
<?=form_dropdown('priority',
|
||||||
$issue_priority_array,
|
$issue_priority_array,
|
||||||
@ -128,7 +132,7 @@ $this->load->view (
|
|||||||
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<?=form_label ($this->lang->line('Owner'), 'owner')
|
<?=form_label ($this->lang->line('Owner'), 'issue_search_owner')
|
||||||
?>
|
?>
|
||||||
<?=form_input('owner',
|
<?=form_input('owner',
|
||||||
set_value('owner', $search->owner),
|
set_value('owner', $search->owner),
|
||||||
@ -137,7 +141,7 @@ $this->load->view (
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<?=form_label ($this->lang->line('Summary'), 'summary')
|
<?=form_label ($this->lang->line('Summary'), 'issue_search_summary')
|
||||||
?>
|
?>
|
||||||
<?=form_input('summary',
|
<?=form_input('summary',
|
||||||
set_value('summary', $search->summary),
|
set_value('summary', $search->summary),
|
||||||
@ -217,11 +221,11 @@ else
|
|||||||
|
|
||||||
</div> <!-- issue_home_mainarea -->
|
</div> <!-- issue_home_mainarea -->
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
<?php $this->load->view ('footer'); ?>
|
<?php $this->load->view ('footer'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- ============================================================ -->
|
||||||
|
|
||||||
|
|
||||||
</div> <!-- issue_home_content -->
|
</div> <!-- issue_home_content -->
|
||||||
|
@ -146,7 +146,7 @@ $(function () {
|
|||||||
<title><?=htmlspecialchars($issue->id)?></title>
|
<title><?=htmlspecialchars($issue->id)?></title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="issue_show_content">
|
<div class="content" id="issue_show_content">
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
<html>
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css">
|
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
|
||||||
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css">
|
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
|
||||||
<script type="text/javascript" src="<?=base_url()?>/js/creole.js"></script>
|
<script type="text/javascript" src="<?=base_url()?>/js/creole.js"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@ -23,7 +23,7 @@ function render_wiki()
|
|||||||
<title><?=htmlspecialchars($project->name)?></title>
|
<title><?=htmlspecialchars($project->name)?></title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="project_home_content">
|
<div class="content" id="project_home_content">
|
||||||
|
|
||||||
@ -106,112 +106,117 @@ foreach ($urls as $url)
|
|||||||
<div class="boxtitle">
|
<div class="boxtitle">
|
||||||
<?= anchor ("/project/log/{$project->id}", $this->lang->line('Change log')) ?>
|
<?= anchor ("/project/log/{$project->id}", $this->lang->line('Change log')) ?>
|
||||||
</div>
|
</div>
|
||||||
<table id="project_home_sidebar_log_table">
|
|
||||||
<?php
|
<?php
|
||||||
$xdot = $this->converter->AsciiToHex ('.');
|
if (count($log_entries) > 0)
|
||||||
foreach ($log_entries as $log)
|
|
||||||
{
|
{
|
||||||
if ($log['type'] == 'code')
|
print '<table id="project_home_sidebar_log_table">';
|
||||||
|
|
||||||
|
$xdot = $this->converter->AsciiToHex ('.');
|
||||||
|
foreach ($log_entries as $log)
|
||||||
{
|
{
|
||||||
$x = $log['message'];
|
if ($log['type'] == 'code')
|
||||||
|
|
||||||
print '<tr class="odd">';
|
|
||||||
print '<td class="date">';
|
|
||||||
//print substr($x['time'], 5, 5);
|
|
||||||
print date ('m-d', strtotime($log['createdon']));
|
|
||||||
print '</td>';
|
|
||||||
print '<td class="object">';
|
|
||||||
print anchor (
|
|
||||||
"code/revision/{$x['repo']}/{$xdot}/{$x['rev']}",
|
|
||||||
"r{$x['rev']}");
|
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
print '<tr class="even">';
|
|
||||||
|
|
||||||
print '<td></td>';
|
|
||||||
print '<td colspan=1 class="details">';
|
|
||||||
print '<span class="description">';
|
|
||||||
if ($log['action'] == 'revpropchange')
|
|
||||||
{
|
{
|
||||||
$fmt = $this->lang->line ('MSG_LOG_REVPROP_CHANGE_BY');
|
$x = $log['message'];
|
||||||
print htmlspecialchars (sprintf($fmt, $x['propname'], $x['author']));
|
|
||||||
|
print '<tr class="odd">';
|
||||||
|
print '<td class="date">';
|
||||||
|
//print substr($x['time'], 5, 5);
|
||||||
|
print date ('m-d', strtotime($log['createdon']));
|
||||||
|
print '</td>';
|
||||||
|
print '<td class="object">';
|
||||||
|
print anchor (
|
||||||
|
"code/revision/{$x['repo']}/{$xdot}/{$x['rev']}",
|
||||||
|
"r{$x['rev']}");
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '<tr class="even">';
|
||||||
|
|
||||||
|
print '<td></td>';
|
||||||
|
print '<td colspan="1" class="details">';
|
||||||
|
print '<span class="description">';
|
||||||
|
if ($log['action'] == 'revpropchange')
|
||||||
|
{
|
||||||
|
$fmt = $this->lang->line ('MSG_LOG_REVPROP_CHANGE_BY');
|
||||||
|
print htmlspecialchars (sprintf($fmt, $x['propname'], $x['author']));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$fmt = $this->lang->line (
|
||||||
|
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
||||||
|
print htmlspecialchars (sprintf($fmt, $x['author']));
|
||||||
|
}
|
||||||
|
print '</span>';
|
||||||
|
|
||||||
|
if ($log['action'] != 'revpropchange')
|
||||||
|
{
|
||||||
|
print '<pre class="message">';
|
||||||
|
$sm = strtok (trim ($x['message']), "\r\n");
|
||||||
|
print htmlspecialchars ($sm);
|
||||||
|
print '</pre>';
|
||||||
|
}
|
||||||
|
print '</td>';
|
||||||
|
print '</tr>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
print '<tr class="odd">';
|
||||||
|
print '<td class="date">';
|
||||||
|
print date ('m-d', strtotime($log['createdon']));
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
print '<td class="object">';
|
||||||
|
$uri = '';
|
||||||
|
if ($log['type'] == 'project')
|
||||||
|
{
|
||||||
|
$uri = "/project/home/{$log['projectid']}";
|
||||||
|
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
||||||
|
}
|
||||||
|
else if ($log['type'] == 'wiki')
|
||||||
|
{
|
||||||
|
$hex = $this->converter->AsciiToHex ($log['message']);
|
||||||
|
$uri = "/wiki/show_r/{$log['projectid']}/{$hex}";
|
||||||
|
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
||||||
|
}
|
||||||
|
else if ($log['type'] == 'file')
|
||||||
|
{
|
||||||
|
$hex = $this->converter->AsciiToHex ($log['message']);
|
||||||
|
$uri = "/file/show/{$log['projectid']}/{$hex}";
|
||||||
|
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
||||||
|
}
|
||||||
|
else if ($log['type'] == 'issue')
|
||||||
|
{
|
||||||
|
$hex = $this->converter->AsciiToHex ($log['message']);
|
||||||
|
$uri = "/issue/show/{$log['projectid']}/{$hex}";
|
||||||
|
$trimmed = $this->lang->line('Issue') . " {$log['message']}";
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($uri != '')
|
||||||
|
print anchor ($uri, htmlspecialchars($trimmed));
|
||||||
|
else
|
||||||
|
print htmlspecialchars($trimmed);
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '<tr class="even">';
|
||||||
|
print '<td></td>';
|
||||||
|
print '<td colspan="1" class="details">';
|
||||||
|
print '<span class="description">';
|
||||||
$fmt = $this->lang->line (
|
$fmt = $this->lang->line (
|
||||||
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
||||||
print htmlspecialchars (sprintf($fmt, $x['author']));
|
print htmlspecialchars (sprintf($fmt, $log['userid']));
|
||||||
|
print '</span>';
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print '</span>';
|
|
||||||
|
|
||||||
if ($log['action'] != 'revpropchange')
|
|
||||||
{
|
|
||||||
print '<pre class="message">';
|
|
||||||
$sm = strtok (trim ($x['message']), "\r\n");
|
|
||||||
print htmlspecialchars ($sm);
|
|
||||||
print '</pre>';
|
|
||||||
}
|
|
||||||
print '</td>';
|
|
||||||
print '</tr>';
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
print '<tr class="odd">';
|
|
||||||
print '<td class="date">';
|
|
||||||
print date ('m-d', strtotime($log['createdon']));
|
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
print '<td class="object">';
|
print "</table>";
|
||||||
$uri = '';
|
|
||||||
if ($log['type'] == 'project')
|
|
||||||
{
|
|
||||||
$uri = "/project/home/{$log['projectid']}";
|
|
||||||
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
|
||||||
}
|
|
||||||
else if ($log['type'] == 'wiki')
|
|
||||||
{
|
|
||||||
$hex = $this->converter->AsciiToHex ($log['message']);
|
|
||||||
$uri = "/wiki/show_r/{$log['projectid']}/{$hex}";
|
|
||||||
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
|
||||||
}
|
|
||||||
else if ($log['type'] == 'file')
|
|
||||||
{
|
|
||||||
$hex = $this->converter->AsciiToHex ($log['message']);
|
|
||||||
$uri = "/file/show/{$log['projectid']}/{$hex}";
|
|
||||||
$trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']);
|
|
||||||
}
|
|
||||||
else if ($log['type'] == 'issue')
|
|
||||||
{
|
|
||||||
$hex = $this->converter->AsciiToHex ($log['message']);
|
|
||||||
$uri = "/issue/show/{$log['projectid']}/{$hex}";
|
|
||||||
$trimmed = $this->lang->line('Issue') . " {$log['message']}";
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($uri != '')
|
|
||||||
print anchor ($uri, htmlspecialchars($trimmed));
|
|
||||||
else
|
|
||||||
print htmlspecialchars($trimmed);
|
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
print '<tr class="even">';
|
|
||||||
print '<td></td>';
|
|
||||||
print '<td colspan=1 class="details">';
|
|
||||||
print '<span class="description">';
|
|
||||||
$fmt = $this->lang->line (
|
|
||||||
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
|
||||||
print htmlspecialchars (sprintf($fmt, $log['userid']));
|
|
||||||
print '</span>';
|
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
print '</tr>';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div> <!-- project_home_sidebar -->
|
</div> <!-- project_home_sidebar -->
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
<html>
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css">
|
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
|
||||||
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/site.css">
|
<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/site.css" />
|
||||||
|
|
||||||
<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
|
<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
|
||||||
<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
|
<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
|
||||||
@ -31,7 +31,7 @@ function render_wiki()
|
|||||||
<title><?=htmlspecialchars($caption)?></title>
|
<title><?=htmlspecialchars($caption)?></title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="site_home_content">
|
<div class="content" id="site_home_content">
|
||||||
|
|
||||||
@ -75,11 +75,12 @@ foreach ($latest_projects as $project)
|
|||||||
$cap = "{$project->name} ($project->id)";
|
$cap = "{$project->name} ($project->id)";
|
||||||
else $cap = $project->name;
|
else $cap = $project->name;
|
||||||
|
|
||||||
|
$sum = $project->summary;
|
||||||
//$sum = preg_replace("/(.{15}).+/u", "$1…", $project->summary);
|
//$sum = preg_replace("/(.{15}).+/u", "$1…", $project->summary);
|
||||||
//$sum = htmlspecialchars ($sum);
|
$sum = htmlspecialchars ($sum);
|
||||||
|
|
||||||
$anc = anchor ("project/home/{$project->id}",
|
$anc = anchor ("project/home/{$project->id}",
|
||||||
htmlspecialchars($cap), "title='{$project->summary}'");
|
htmlspecialchars($cap), "title='$sum'");
|
||||||
print "<li>{$anc}</li>";
|
print "<li>{$anc}</li>";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -123,7 +124,7 @@ foreach ($latest_projects as $project)
|
|||||||
print '<tr class="even">';
|
print '<tr class="even">';
|
||||||
|
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
print '<td colspan=2 class="details">';
|
print '<td colspan="2" class="details">';
|
||||||
print '<span class="description">';
|
print '<span class="description">';
|
||||||
|
|
||||||
if ($log['action'] == 'revpropchange')
|
if ($log['action'] == 'revpropchange')
|
||||||
@ -196,7 +197,7 @@ foreach ($latest_projects as $project)
|
|||||||
|
|
||||||
print '<tr class="even">';
|
print '<tr class="even">';
|
||||||
print '<td></td>';
|
print '<td></td>';
|
||||||
print '<td colspan=2 class="details">';
|
print '<td colspan="2" class="details">';
|
||||||
print '<span class="description">';
|
print '<span class="description">';
|
||||||
$fmt = $this->lang->line (
|
$fmt = $this->lang->line (
|
||||||
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
'MSG_LOG_'.strtoupper($log['action']).'_BY');
|
||||||
|
@ -22,7 +22,7 @@ function render_wiki()
|
|||||||
<title><?=htmlspecialchars($site->name)?> (<?=$site->id?>)</title>
|
<title><?=htmlspecialchars($site->name)?> (<?=$site->id?>)</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="site_show_content">
|
<div class="content" id="site_show_content">
|
||||||
|
|
||||||
|
@ -20,8 +20,9 @@ function show_taskbar ($con, $login)
|
|||||||
|
|
||||||
//print '<div id="taskbar_signin_panel">';
|
//print '<div id="taskbar_signin_panel">';
|
||||||
|
|
||||||
print form_open('main/signin');
|
print form_open('main/signin', array('id' => 'taskbar_signin_form'));
|
||||||
|
|
||||||
|
print form_fieldset();
|
||||||
//print '<div id="taskbar_signin_form_panel">';
|
//print '<div id="taskbar_signin_form_panel">';
|
||||||
|
|
||||||
$user_name = "";
|
$user_name = "";
|
||||||
@ -40,7 +41,7 @@ function show_taskbar ($con, $login)
|
|||||||
print form_input (
|
print form_input (
|
||||||
'user_name',
|
'user_name',
|
||||||
set_value ('user_name', $user_name),
|
set_value ('user_name', $user_name),
|
||||||
'size=12 id="taskbar_user_name"'
|
'size="12" id="taskbar_user_name"'
|
||||||
);
|
);
|
||||||
|
|
||||||
print ' ';
|
print ' ';
|
||||||
@ -52,7 +53,7 @@ function show_taskbar ($con, $login)
|
|||||||
print form_password (
|
print form_password (
|
||||||
'user_pass',
|
'user_pass',
|
||||||
set_value ('user_pass', $user_pass),
|
set_value ('user_pass', $user_pass),
|
||||||
'size=12 id="taskbar_user_pass"'
|
'size="12" id="taskbar_user_pass"'
|
||||||
);
|
);
|
||||||
|
|
||||||
print ' ';
|
print ' ';
|
||||||
@ -69,6 +70,7 @@ function show_taskbar ($con, $login)
|
|||||||
// print '</a>';
|
// print '</a>';
|
||||||
//print '</div>';
|
//print '</div>';
|
||||||
|
|
||||||
|
print form_fieldset_close();
|
||||||
print form_close();
|
print form_close();
|
||||||
|
|
||||||
//print '</div>';
|
//print '</div>';
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
<html>
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
@ -11,11 +13,11 @@
|
|||||||
|
|
||||||
<div class="content" id="wiki_home_content">
|
<div class="content" id="wiki_home_content">
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- =================================================================== -->
|
||||||
|
|
||||||
<?php $this->load->view ('taskbar'); ?>
|
<?php $this->load->view ('taskbar'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- =================================================================== -->
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$this->load->view (
|
$this->load->view (
|
||||||
@ -36,7 +38,7 @@ $this->load->view (
|
|||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- =================================================================== -->
|
||||||
|
|
||||||
<div class="mainarea" id="wiki_home_mainarea">
|
<div class="mainarea" id="wiki_home_mainarea">
|
||||||
<div class="title"><?=$this->lang->line('Wikis')?></div>
|
<div class="title"><?=$this->lang->line('Wikis')?></div>
|
||||||
@ -61,11 +63,11 @@ else
|
|||||||
</div>
|
</div>
|
||||||
</div> <!-- wiki_home_mainarea -->
|
</div> <!-- wiki_home_mainarea -->
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- =================================================================== -->
|
||||||
|
|
||||||
<?php $this->load->view ('footer'); ?>
|
<?php $this->load->view ('footer'); ?>
|
||||||
|
|
||||||
<!---------------------------------------------------------------------------->
|
<!-- =================================================================== -->
|
||||||
|
|
||||||
|
|
||||||
</div> <!-- wiki_home_content -->
|
</div> <!-- wiki_home_content -->
|
||||||
|
@ -25,7 +25,7 @@ function render_wiki()
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<body onLoad="render_wiki()">
|
<body onload="render_wiki()">
|
||||||
|
|
||||||
<div class="content" id="wiki_show_content">
|
<div class="content" id="wiki_show_content">
|
||||||
|
|
||||||
|
@ -492,3 +492,10 @@ pre.prettyprint .nocode a:hover {
|
|||||||
#taskbar_signin_button_panel a {
|
#taskbar_signin_button_panel a {
|
||||||
color: #0073EA;
|
color: #0073EA;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#taskbar_signin_form fieldset {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user