diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php index 4d16ef24..cadb9bb7 100644 --- a/codepot/src/codepot/views/code_diff.php +++ b/codepot/src/codepot/views/code_diff.php @@ -174,7 +174,7 @@ $this->load->view ( if (empty($file['content'])) { print ''; - print ''; + print ''; print htmlspecialchars ($this->lang->line('MSG_NO_DIFF')); print ''; print ''; diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index cbf798e6..97d47fc6 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -1,4 +1,6 @@ - + + + @@ -52,11 +54,11 @@ $(function () {
- + load->view ('taskbar'); ?> - + load->view ( @@ -75,7 +77,7 @@ $this->load->view ( ); ?> - +
@@ -244,7 +246,6 @@ $this->load->view ( print '
'; - print '
';
 		print '
';
 		print $this->lang->line('CODE_COMMIT');
 		print '
';
@@ -287,11 +288,11 @@ $this->load->view (
- + load->view ('footer'); ?> - +
diff --git a/codepot/src/codepot/views/file_home.php b/codepot/src/codepot/views/file_home.php index 729514a1..15c8b597 100644 --- a/codepot/src/codepot/views/file_home.php +++ b/codepot/src/codepot/views/file_home.php @@ -1,4 +1,6 @@ - + + + @@ -11,11 +13,11 @@
- + load->view ('taskbar'); ?> - + load->view ( @@ -36,7 +38,7 @@ $this->load->view ( ); ?> - +
lang->line('Files')?>
@@ -105,11 +107,11 @@ else
- + load->view ('footer'); ?> - +
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php index 161053ee..ed142133 100644 --- a/codepot/src/codepot/views/file_show.php +++ b/codepot/src/codepot/views/file_show.php @@ -21,7 +21,7 @@ function render_wiki() <?=htmlspecialchars($file->name)?> - +
diff --git a/codepot/src/codepot/views/issue_home.php b/codepot/src/codepot/views/issue_home.php index 6837f4c1..572cd12f 100644 --- a/codepot/src/codepot/views/issue_home.php +++ b/codepot/src/codepot/views/issue_home.php @@ -1,4 +1,6 @@ - + + + @@ -10,8 +12,9 @@ <?=htmlspecialchars($project->name)?> @@ -59,11 +63,11 @@ $(function () {
- + load->view ('taskbar'); ?> - + load->view ( @@ -84,7 +88,7 @@ $this->load->view ( ); ?> - +
lang->line('Issues')?>
@@ -100,9 +104,9 @@ $this->load->view ( $issue_status_array[''] = $this->lang->line('All'); $issue_priority_array[''] = $this->lang->line('All'); ?> -
+
- lang->line('Type'), 'type') + lang->line('Type'), 'issue_search_type') ?> load->view ( 'id="issue_search_type"') ?> - lang->line('Status'), 'status') + lang->line('Status'), 'issue_search_status') ?> status), 'id="status"') + set_value('status', $search->status), 'id="issue_search_status"') ?> - lang->line('Priority'), 'priority') + lang->line('Priority'), 'issue_search_priority') ?> load->view (
- lang->line('Owner'), 'owner') + lang->line('Owner'), 'issue_search_owner') ?> owner), @@ -137,7 +141,7 @@ $this->load->view (
- lang->line('Summary'), 'summary') + lang->line('Summary'), 'issue_search_summary') ?> summary), @@ -217,11 +221,11 @@ else
- + load->view ('footer'); ?> - +
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php index 4e3f64e1..dd71a443 100644 --- a/codepot/src/codepot/views/issue_show.php +++ b/codepot/src/codepot/views/issue_show.php @@ -146,7 +146,7 @@ $(function () { <?=htmlspecialchars($issue->id)?> - +
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php index 2f2960f4..f42a7e78 100644 --- a/codepot/src/codepot/views/project_home.php +++ b/codepot/src/codepot/views/project_home.php @@ -1,11 +1,11 @@ - + - + - - - + + + @@ -31,7 +31,7 @@ function render_wiki() <?=htmlspecialchars($caption)?> - +
@@ -75,11 +75,12 @@ foreach ($latest_projects as $project) $cap = "{$project->name} ($project->id)"; else $cap = $project->name; + $sum = $project->summary; //$sum = preg_replace("/(.{15}).+/u", "$1…", $project->summary); - //$sum = htmlspecialchars ($sum); + $sum = htmlspecialchars ($sum); $anc = anchor ("project/home/{$project->id}", - htmlspecialchars($cap), "title='{$project->summary}'"); + htmlspecialchars($cap), "title='$sum'"); print "
  • {$anc}
    • "; } ?> @@ -123,7 +124,7 @@ foreach ($latest_projects as $project) print ''; print ''; - print ''; + print ''; print ''; if ($log['action'] == 'revpropchange') @@ -196,7 +197,7 @@ foreach ($latest_projects as $project) print ''; print ''; - print ''; + print ''; print ''; $fmt = $this->lang->line ( 'MSG_LOG_'.strtoupper($log['action']).'_BY'); diff --git a/codepot/src/codepot/views/site_show.php b/codepot/src/codepot/views/site_show.php index e75d8109..8142e088 100644 --- a/codepot/src/codepot/views/site_show.php +++ b/codepot/src/codepot/views/site_show.php @@ -22,7 +22,7 @@ function render_wiki() <?=htmlspecialchars($site->name)?> (<?=$site->id?>) - +
    diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php index 029abcfa..ee9b8928 100644 --- a/codepot/src/codepot/views/taskbar.php +++ b/codepot/src/codepot/views/taskbar.php @@ -20,8 +20,9 @@ function show_taskbar ($con, $login) //print '
    '; - print form_open('main/signin'); + print form_open('main/signin', array('id' => 'taskbar_signin_form')); + print form_fieldset(); //print '
    '; $user_name = ""; @@ -40,7 +41,7 @@ function show_taskbar ($con, $login) print form_input ( 'user_name', set_value ('user_name', $user_name), - 'size=12 id="taskbar_user_name"' + 'size="12" id="taskbar_user_name"' ); print ' '; @@ -52,7 +53,7 @@ function show_taskbar ($con, $login) print form_password ( 'user_pass', set_value ('user_pass', $user_pass), - 'size=12 id="taskbar_user_pass"' + 'size="12" id="taskbar_user_pass"' ); print ' '; @@ -69,6 +70,7 @@ function show_taskbar ($con, $login) // print ''; //print '
    '; + print form_fieldset_close(); print form_close(); //print '
    '; diff --git a/codepot/src/codepot/views/wiki_home.php b/codepot/src/codepot/views/wiki_home.php index 8b85410c..a63a7126 100644 --- a/codepot/src/codepot/views/wiki_home.php +++ b/codepot/src/codepot/views/wiki_home.php @@ -1,4 +1,6 @@ - + + + @@ -11,11 +13,11 @@
    - + load->view ('taskbar'); ?> - + load->view ( @@ -36,7 +38,7 @@ $this->load->view ( ); ?> - +
    lang->line('Wikis')?>
    @@ -61,11 +63,11 @@ else
    - + load->view ('footer'); ?> - +
    diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php index 56bdfe61..fc8a0959 100644 --- a/codepot/src/codepot/views/wiki_show.php +++ b/codepot/src/codepot/views/wiki_show.php @@ -25,7 +25,7 @@ function render_wiki() } - +
    diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index 17c3af83..2d086022 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -492,3 +492,10 @@ pre.prettyprint .nocode a:hover { #taskbar_signin_button_panel a { color: #0073EA; } + +#taskbar_signin_form fieldset { + margin: 0; + padding: 0; + border: 0; + white-space: nowrap; +}