From bf8c6549572063d3401302e21c97b534e5ed2dc6 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 8 Apr 2010 13:56:50 +0000 Subject: [PATCH] fixed a minor bug in handling wiki pages --- codepot/src/codepot/controllers/file.php | 7 ++-- .../codepot/language/english/common_lang.php | 1 + .../language/indonesian/common_lang.php | 1 + .../codepot/language/korean/common_lang.php | 1 + codepot/src/css/common.css | 32 +++++++++++++++---- codepot/src/css/issue.css | 4 +-- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/codepot/src/codepot/controllers/file.php b/codepot/src/codepot/controllers/file.php index 9df12f51..886d697e 100644 --- a/codepot/src/codepot/controllers/file.php +++ b/codepot/src/codepot/controllers/file.php @@ -97,8 +97,11 @@ class File extends Controller } else if ($file === NULL) { - redirect ('file/create/'. $projectid . '/' . - $this->converter->AsciiToHex($name)); + $data['project'] = $project; + $data['message'] = + $this->lang->line('MSG_NO_SUCH_FILE'). + " - {$name}"; + $this->load->view ($this->VIEW_ERROR, $data); } else { diff --git a/codepot/src/codepot/language/english/common_lang.php b/codepot/src/codepot/language/english/common_lang.php index f95220d2..4c7eebe1 100644 --- a/codepot/src/codepot/language/english/common_lang.php +++ b/codepot/src/codepot/language/english/common_lang.php @@ -89,6 +89,7 @@ $lang['MSG_NO_DIFF'] = 'No difference found'; $lang['MSG_NO_CODE_AVAIL'] = 'No source code available'; $lang['MSG_NO_FILES_AVAIL'] = 'No files available'; $lang['MSG_NO_ISSUES_AVAIL'] = 'No outstanding issues'; +$lang['MSG_NO_SUCH_FILE'] = 'No such file'; $lang['MSG_NO_SUCH_ISSUE'] = 'No such issue'; $lang['MSG_NO_SUCH_PROJECT'] = 'No such project'; $lang['MSG_NO_SUCH_WIKI_PAGE'] = 'No such wiki page'; diff --git a/codepot/src/codepot/language/indonesian/common_lang.php b/codepot/src/codepot/language/indonesian/common_lang.php index 34099dd4..fca53f29 100644 --- a/codepot/src/codepot/language/indonesian/common_lang.php +++ b/codepot/src/codepot/language/indonesian/common_lang.php @@ -88,6 +88,7 @@ $lang['MSG_NO_DIFF'] = 'Tidak ada bedanya'; $lang['MSG_NO_CODE_AVAIL'] = 'Tidak ada kode sumber tersedia'; $lang['MSG_NO_FILES_AVAIL'] = 'Tidak ada file tersedia'; $lang['MSG_NO_ISSUES_AVAIL'] = 'Tidak ada issue'; +$lang['MSG_NO_SUCH_FILE'] = 'No such file'; $lang['MSG_NO_SUCH_ISSUE'] = 'No such issue'; $lang['MSG_NO_SUCH_PROJECT'] = 'No such project'; $lang['MSG_NO_SUCH_WIKI_PAGE'] = 'No such wiki page'; diff --git a/codepot/src/codepot/language/korean/common_lang.php b/codepot/src/codepot/language/korean/common_lang.php index 8151711a..8bb96272 100644 --- a/codepot/src/codepot/language/korean/common_lang.php +++ b/codepot/src/codepot/language/korean/common_lang.php @@ -88,6 +88,7 @@ $lang['MSG_NO_DIFF'] = '차이점이 없습니다'; $lang['MSG_NO_CODE_AVAIL'] = '소스코드가 없습니다'; $lang['MSG_NO_FILES_AVAIL'] = '파일이 없습니다'; $lang['MSG_NO_ISSUES_AVAIL'] = '이슈항목이 없습니다'; +$lang['MSG_NO_SUCH_FILE'] = '파일이 없습니다'; $lang['MSG_NO_SUCH_ISSUE'] = '이슈항목이 없습니다'; $lang['MSG_NO_SUCH_PROJECT'] = '프로젝트가 없습니다'; $lang['MSG_NO_SUCH_WIKI_PAGE'] = '위키페이지가 없습니다'; diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index 57d2e857..ceb6a036 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -9,6 +9,26 @@ body { font-family: sans-serif; } +.content h1 { + font-size: 1.3em; + font-weight: bold; +} + +.content h2 { + font-size: 1.2em; + font-weight: bold; +} + +.content h3 { + font-size: 1.1em; + font-weight: bold; +} + +.content h4 { + font-size: 1.0em; + font-weight: bold; +} + .content ul { list-style: square; } @@ -78,10 +98,9 @@ body { } .content .projectbar .title { - font-size: 1.8em; + font-size: 1.6em; font-weight: bold; text-transform: uppercase; - margin-bottom: 0.1em; white-space: nowrap; } @@ -181,7 +200,7 @@ body { .content .mainarea form textarea { border: 1px solid #BBCCDD; - font-family: inherit; + font-family: monospace; font-size: inherit; } @@ -198,12 +217,11 @@ body { } .content .mainarea tt { + /* padding: .1em .1em .1em .1em; background-color: #F1F1FF; -} - -.content .mainarea tt:hover { - background-color: inherit; + */ + font-size: inherit; } .content .mainarea table { diff --git a/codepot/src/css/issue.css b/codepot/src/css/issue.css index ab701075..2ab7e367 100644 --- a/codepot/src/css/issue.css +++ b/codepot/src/css/issue.css @@ -107,7 +107,7 @@ display: block; padding: 1px; font-size: inherit; - font-family: inherit; + font-family: monospace; width: 100%; } @@ -177,7 +177,7 @@ display: block; padding: 1px; font-size: inherit; - font-family: inherit; + font-family: monospace; width: 100%; }